diff --git a/amenity-points.mss b/amenity-points.mss
index a5533d89a8..0b4231e999 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -84,8 +84,10 @@
   }
 
   [feature = 'amenity_bus_station'][zoom >= 16] {
-    point-file: url('symbols/bus_station.n.16.png');
-    point-placement: interior;
+    marker-file: url('symbols/bus_station.14.svg');
+    marker-fill: @transportation-icon;
+    marker-placement: interior;
+    marker-clip: false;
   }
 
   [feature = 'amenity_taxi'][zoom >= 17] {
@@ -1726,6 +1728,10 @@
       [feature = 'highway_bus_stop'] {
         text-dy: 9;
       }
+      [feature = 'amenity_bus_station'] {
+        text-size: 10;
+        text-face-name: @bold-fonts;
+      }
     }
   }
 
diff --git a/symbols/bus_station.14.svg b/symbols/bus_station.14.svg
new file mode 100644
index 0000000000..a467e88203
--- /dev/null
+++ b/symbols/bus_station.14.svg
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg2"
+   height="14"
+   width="14"
+   version="1.1">
+  <metadata
+     id="metadata9">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs7" />
+  <rect
+     style="visibility:hidden;fill:none;stroke:none"
+     id="canvas"
+     y="2"
+     x="0"
+     height="12"
+     width="12" />
+  <g
+     style="display:inline"
+     id="layer2">
+    <path
+       id="bus-stop"
+       d="m 0,0 0,14 14,0 0,-14 z m 6,2 2,0 c 2,0 3,2 3,4 l 0,5 -0.65625,0 c 0,0 0.0039,1 -0.8125,1 C 8.8645921,12 8.75,11 8.75,11 l -3.5,0 c 0,0 -0.09212,1 -0.78125,1 -0.7116011,0 -0.8125,-1 -0.8125,-1 L 3,11 3,6 C 3,4 4,2 6,2 Z M 5,3 C 4,4 4,5 4,8 l 6,0 C 10,5 10,4 9,3 Z m -1,6 0,1 2,0 0,-1 z m 4,0 0,1 2,0 0,-1 z"
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none" />
+    <g
+       transform="translate(-8.9068966,-5.6)"
+       id="g4204">
+      <rect
+         width="14"
+         height="14"
+         x="0"
+         y="0"
+         id="canvas-5"
+         style="visibility:hidden;fill:none;stroke:none" />
+    </g>
+  </g>
+</svg>
diff --git a/symbols/bus_station.n.16.png b/symbols/bus_station.n.16.png
deleted file mode 100644
index 5224dd119f..0000000000
Binary files a/symbols/bus_station.n.16.png and /dev/null differ