Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 10438)
+++ /trunk/data/defaultpresets.xml	(revision 10439)
@@ -2318,5 +2318,5 @@
     </group> <!-- Water -->
     <group name="Shipping" icon="presets/ferry.png">
-        <item name="Ferry Terminal" icon="presets/ferry.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Ferry Terminal" icon="presets/ferry.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=ferry_terminal"
@@ -2331,5 +2331,5 @@
             <combo key="cargo" text="Cargo" values="passengers,vehicle,bicycle,hgv,passengers;vehicle" values_context="cargo" />
         </item> <!-- Ferry Terminal -->
-        <item name="Ferry Route" icon="presets/ferry.png" type="way,closedway,relation" preset_name_label="true">
+        <item name="Ferry Route" icon="presets/ferry.svg" type="way,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:route=ferry"
@@ -3342,5 +3342,5 @@
             </optional>
         </item> <!-- Station -->
-        <item name="Railway Halt" icon="styles/standard/transport/railway_small.png" type="node" preset_name_label="true">
+        <item name="Railway Halt" icon="presets/station.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=halt"
Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 10438)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 10439)
@@ -2740,6 +2740,5 @@
 }
 node[amenity=ferry_terminal] {
-    icon-image: "nautical/ferry.png";
-    icon-width: 16;
+    icon-image: "nautical/ferry.svg";
     set icon_z17;
 }
@@ -3290,5 +3289,5 @@
 }
 node[railway=halt] {
-    icon-image: "transport/railway_small.png";
+    icon-image: "presets/station16.png";
     set icon_z17;
 }
@@ -3659,6 +3658,5 @@
 }
 node[public_transport=stop_position][ferry=yes] {
-    icon-image: "nautical/ferry.png";
-    icon-width: 16;
+    icon-image: "nautical/ferry.svg";
     set icon_z17;
 }