Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 9305)
+++ /trunk/data/defaultpresets.xml	(revision 9306)
@@ -948,5 +948,5 @@
     </group> <!-- Streets -->
     <group name="Ways" icon="styles/standard/transport/way/way_unclassified.svg">
-        <item name="Track" icon="presets/track1.png" type="way,closedway" preset_name_label="true">
+        <item name="Track" icon="styles/standard/transport/way/track.svg" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:highway=track"
@@ -978,5 +978,5 @@
             </optional>
         </item> <!-- Track -->
-        <item name="Path" icon="presets/path.png" type="way,closedway" preset_name_label="true">
+        <item name="Path" icon="styles/standard/transport/way/path.svg" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path"
@@ -1016,5 +1016,5 @@
         </item> <!-- Path -->
         <separator/>
-        <item name="Dedicated Bridleway" icon="presets/equestrian.png" type="way" preset_name_label="true">
+        <item name="Dedicated Bridleway" icon="styles/standard/transport/way/dedicated_bridleway.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:highway=bridleway"
@@ -1032,5 +1032,5 @@
             </optional>
         </item> <!-- Dedicated Bridleway -->
-        <item name="Cycle Lane/Track" type="way" preset_name_label="true">
+        <item name="Cycle Lane/Track" icon="styles/standard/transport/way/cycle_lane_track.svg" type="way" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Bicycle"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Bicycle"
@@ -1056,5 +1056,5 @@
             </optional>
         </item> <!-- Cycle Lane/Track -->
-        <item name="Dedicated Cycleway" icon="presets/cycleway.png" type="way" preset_name_label="true">
+        <item name="Dedicated Cycleway" icon="styles/standard/transport/way/dedicated_cycleway.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
@@ -1074,5 +1074,5 @@
             </optional>
         </item> <!-- Dedicated Cycleway -->
-        <item name="Segregated Foot- and Cycleway" icon="presets/foot_and_cycleway_segregated.png" type="way" preset_name_label="true">
+        <item name="Segregated Foot- and Cycleway" icon="styles/standard/transport/way/segregated_foot_cycleway.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
@@ -1088,5 +1088,5 @@
             </optional>
         </item> <!-- Segregated Foot- and Cycleway -->
-        <item name="Combined Foot- and Cycleway" icon="presets/foot_and_cycleway_combined.png" type="way" preset_name_label="true">
+        <item name="Combined Foot- and Cycleway" icon="styles/standard/transport/way/combined_foot_cycleway.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
@@ -1103,5 +1103,5 @@
             </optional>
         </item> <!-- Combined Foot- and Cycleway -->
-        <item name="Dedicated Footway" icon="presets/footway.png" type="way" preset_name_label="true">
+        <item name="Dedicated Footway" icon="styles/standard/transport/way/dedicated_footway.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:highway=footway"
@@ -1127,5 +1127,5 @@
             </optional>
         </item> <!-- Dedicated Footway -->
-        <item name="Steps" icon="presets/steps.png" type="way" preset_name_label="true">
+        <item name="Steps" icon="styles/standard/transport/way/steps.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=steps"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
@@ -2313,7 +2313,7 @@
     </group> <!-- Shipping -->
   </group> <!-- Water -->
-  <group name="Transport" icon="presets/railway.svg">
-    <group name="Railway" icon="presets/railway.svg">
-        <item name="Rail" icon="presets/railway.svg" type="way" preset_name_label="true">
+  <group name="Transport" icon="styles/standard/transport/railway/rail.svg">
+    <group name="Railway" icon="styles/standard/transport/railway/rail.svg">
+        <item name="Rail" icon="styles/standard/transport/railway/rail.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=rail"
@@ -2331,5 +2331,5 @@
             </optional>
         </item> <!-- Rail -->
-        <item name="Narrow Gauge Rail" icon="presets/railway.svg" type="way" preset_name_label="true">
+        <item name="Narrow Gauge Rail" icon="styles/standard/transport/railway/narrow_gauge_rail.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=light_rail"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=light_rail"
@@ -2341,5 +2341,5 @@
             </optional>
         </item> <!-- Narrow Gauge Rail -->
-        <item name="Monorail" icon="presets/railway.svg" type="way" preset_name_label="true">
+        <item name="Monorail" icon="styles/standard/transport/railway/monorail.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=monorail"
@@ -2352,5 +2352,5 @@
             </optional>
         </item> <!-- Monorail -->
-        <item name="Preserved" icon="presets/rail_preserved.png" type="way" preset_name_label="true">
+        <item name="Preserved" icon="styles/standard/transport/railway/preserved.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=preserved"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=preserved"
@@ -2363,5 +2363,5 @@
             </optional>
         </item> <!-- Preserved -->
-        <item name="Light Rail" icon="presets/rail_light.png" type="way" preset_name_label="true">
+        <item name="Light Rail" icon="styles/standard/transport/railway/light_rail.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=light_rail" />
             <key key="railway" value="light_rail" />
@@ -2370,5 +2370,5 @@
             </optional>
         </item> <!-- Light Rail -->
-        <item name="Subway" icon="presets/rail_light.png" type="way" preset_name_label="true">
+        <item name="Subway" icon="styles/standard/transport/railway/subway.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=subway"
@@ -2382,5 +2382,5 @@
             </optional>
         </item> <!-- Subway -->
-        <item name="Tram" icon="presets/tram.png" type="way" preset_name_label="true">
+        <item name="Tram" icon="styles/standard/transport/railway/tram.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram"
@@ -2395,5 +2395,5 @@
             </optional>
         </item> <!-- Tram -->
-        <item name="Bus Guideway" icon="presets/busway.png" type="way" preset_name_label="true">
+        <item name="Bus Guideway" icon="styles/standard/transport/railway/bus_guideway.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_guideway"
@@ -2413,5 +2413,5 @@
         </item> <!-- Bus Guideway -->
         <separator/>
-        <item name="Disused Rail" icon="presets/railway.svg" type="way" preset_name_label="true">
+        <item name="Disused Rail" icon="styles/standard/transport/railway/disused_rail.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=disused"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=disused"
@@ -2422,5 +2422,5 @@
             </optional>
         </item> <!-- Disused Rail -->
-        <item name="Abandoned Rail" icon="presets/railway.svg" type="way" preset_name_label="true">
+        <item name="Abandoned Rail" icon="styles/standard/transport/railway/abandoned_rail.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=abandoned"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=abandoned"
@@ -2434,5 +2434,5 @@
         </item> <!-- Abandoned Rail -->
         <separator/>
-        <item name="Level Crossing" icon="presets/level_crossing.png" type="node" preset_name_label="true">
+        <item name="Level Crossing" icon="styles/standard/transport/railway/level_crossing.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing"
                   bg.href="http://wiki.openstreetmap.org/wiki/Bg:Tag:railway=level_crossing"
@@ -2456,5 +2456,5 @@
             </optional>
         </item> <!-- Level Crossing -->
-        <item name="Crossing" icon="styles/standard/vehicle/crossing.png" type="node" preset_name_label="true">
+        <item name="Crossing" icon="styles/standard/transport/railway/crossing.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
                   bg.href="http://wiki.openstreetmap.org/wiki/Bg:Key:crossing"
@@ -2475,5 +2475,5 @@
             </optional>
         </item> <!-- Crossing -->
-        <item name="Turntable" icon="presets/turntable.png" type="node,closedway" preset_name_label="true">
+        <item name="Turntable" icon="styles/standard/transport/railway/turntable.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=turntable"
@@ -2483,5 +2483,5 @@
             <key key="railway" value="turntable" />
         </item> <!-- Turntable -->
-        <item name="Buffer Stop" icon="styles/standard/transport/buffer_stop.png" type="node" preset_name_label="true">
+        <item name="Buffer Stop" icon="styles/standard/transport/railway/buffer_stop.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=buffer_stop"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=buffer_stop"
@@ -2489,5 +2489,5 @@
             <key key="railway" value="buffer_stop" />
         </item> <!-- Buffer Stop -->
-        <item name="Railway Switch" icon="presets/railway_switch.svg" type="node" preset_name_label="true">
+        <item name="Railway Switch" icon="styles/standard/transport/railway/switch.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=switch"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=switch"
@@ -2497,5 +2497,5 @@
             <text key="operator" text="Operator" />
         </item> <!-- Railway Switch -->
-        <item name="Railway Signal" icon="styles/standard/vehicle/railway_signal.svg" type="node" preset_name_label="true">
+        <item name="Railway Signal" icon="styles/standard/transport/railway/signal.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=signal"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=signal" />
@@ -2504,5 +2504,5 @@
             <text key="operator" text="Operator" />
         </item> <!-- Railway Signal -->
-        <item name="Railway milestone" icon="styles/standard/vehicle/milestone.svg" type="node" preset_name_label="true">
+        <item name="Railway milestone" icon="styles/standard/transport/railway/milestone.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=milestone" />
             <key key="railway" value="milestone" />
Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 9305)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 9306)
@@ -646,9 +646,4 @@
     color: foot#00ff00;
     dashes: 2,2;
-}
-node[highway=steps] {
-    icon-image: "transport/steps.png";
-    set icon_z17;
-    text: auto;
 }
 way[highway=bus_guideway] {
@@ -3477,10 +3472,10 @@
 }
 node[railway=crossing] {
-    icon-image: "vehicle/crossing.png";
+    icon-image: "transport/railway/crossing.svg";
     set icon_z17;
     text: auto;
 }
 node[railway=level_crossing] {
-    icon-image: "presets/level_crossing.png";
+    icon-image: "transport/railway/level_crossing.svg";
     icon-width: 16;
     set icon_z17;
@@ -3553,10 +3548,10 @@
 }
 node[railway=turntable] {
-    icon-image: "transport/turntable.png";
+    icon-image: "transport/railway/turntable.svg";
     set icon_z17;
     text: auto;
 }
 node[railway=buffer_stop] {
-    icon-image: "transport/buffer_stop.png";
+    icon-image: "transport/railway/buffer_stop.svg";
     set icon_z17;
     text: auto;
@@ -3575,5 +3570,5 @@
 }
 node[railway=switch] {
-    icon-image: "presets/railway_switch.svg";
+    icon-image: "transport/railway/switch.svg";
     icon-width: 16;
     set icon_z17;
@@ -3581,10 +3576,10 @@
 }
 node[railway=signal] {
-    icon-image: "vehicle/railway_signal.svg";
+    icon-image: "transport/railway/signal.svg";
     set icon_z17;
     text: auto;
 }
 node[railway=milestone] {
-    icon-image: "vehicle/milestone.svg";
+    icon-image: "transport/railway/milestone.svg";
     set icon_z17;
     text: auto;