Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 10428)
+++ /trunk/data/defaultpresets.xml	(revision 10429)
@@ -3210,5 +3210,5 @@
         </item> <!-- Stop Area -->
         <separator/>
-        <item name="Stop Position" type="node" icon="presets/barrier.png" preset_name_label="true">
+        <item name="Stop Position" type="node" icon="styles/standard/transport/railway_small.png" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Stop_position" />
             <space />
@@ -3238,5 +3238,5 @@
             <check key="ferry" text="Ferry" />
         </item> <!-- Stop Position -->
-        <item name="Platform" type="node,way,closedway,multipolygon" icon="presets/platform_bus.png" preset_name_label="true">
+        <item name="Platform" type="node,way,closedway,multipolygon" icon="styles/standard/transport/platform.svg" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Platform" />
             <space />
@@ -3249,26 +3249,6 @@
             <reference ref="wheelchair" />
             <combo key="tactile_paving" text="Tactile Paving" values="yes,no,incorrect" />
-            <optional>
-                <text key="ref" text="Reference" />
-                <text key="uic_ref" text="UIC reference" />
-                <text key="uic_name" text="UIC name" />
-                <text key="operator" text="Operator" />
-                <text key="network" text="Network" />
-                <space/>
-                <check key="bus" text="Bus" />
-                <check key="highway" value_on="platform" text="Highway platform (legacy)" />
-                <check key="tram" text="Tram" />
-                <check key="train" text="Train" />
-                <check key="railway" value_on="platform" text="Railway platform (legacy)" />
-                <check key="trolleybus" text="Trolleybus" />
-                <check key="share_taxi" text="Share taxi" />
-                <check key="subway" text="Subway" />
-                <check key="monorail" text="Monorail" />
-                <check key="funicular" text="funicular" />
-                <check key="aerialway" text="aerialway" />
-                <check key="ferry" text="ferry" />
-            </optional>
         </item> <!-- Platform -->
-        <item name="Station" name_context="railway" type="node,closedway,multipolygon" icon="styles/standard/transport/railway_station.png" preset_name_label="true">
+        <item name="Station" name_context="railway" type="node,closedway,multipolygon" icon="styles/standard/transport/station.svg" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:public_transport=station"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:public_transport=station"
@@ -3356,5 +3336,5 @@
             </optional>
         </item> <!-- Station -->
-        <item name="Railway Halt" icon="presets/station.png" type="node" preset_name_label="true">
+        <item name="Railway Halt" icon="styles/standard/transport/railway_small.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"
@@ -3367,5 +3347,5 @@
             </optional>
         </item> <!-- Railway Halt -->
-        <item name="Tram Stop" icon="presets/tram.png" type="node" preset_name_label="true">
+        <item name="Tram Stop" icon="styles/standard/transport/tram.png" type="node" preset_name_label="true">
            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop"
Index: /trunk/data/validator/geometry.mapcss
===================================================================
--- /trunk/data/validator/geometry.mapcss	(revision 10428)
+++ /trunk/data/validator/geometry.mapcss	(revision 10429)
@@ -81,4 +81,5 @@
 /* {0} on a way, should be a node */
 way[entrance],
+way[railway=subway_entrance],
 way[man_made=survey_point],
 way[power=transformer],
Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 10428)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 10429)
@@ -3278,76 +3278,12 @@
 }
 
-/*************************/
-/* public_transport tags */
-/*************************/
-
-node[public_transport=stop_position] {
-    icon-image: "transport/railway_small.png";
-    set icon_z17;
-}
-node[highway=bus_stop] {
-    icon-image: "transport/bus_small.png";
-    set icon_z17;
-}
-node[public_transport=stop_position][bus=yes] {
-    icon-image: "transport/bus_small.png";
-    set icon_z17;
-}
-node[public_transport=stop_position][aerial=yes] {
-    icon-image: "transport/aerialway.png";
-    set icon_z17;
-}
-node[public_transport=stop_position][ferry=yes] {
-    icon-image: "transport/ferry.png";
-    set icon_z17;
-}
-node[public_transport=stop_position][tram=yes] {
-    icon-image: "transport/tram.png";
-    set icon_z17;
-}
-node[public_transport=stop_position][train=yes] {
-    icon-image: "transport/railway_small.png";
-    set icon_z17;
-}
-area[public_transport=platform]:closed {
-    fill-color: service#809bc0;
-}
-way[public_transport=platform]!:closed {
-    width: 3;
-    color: service#809bc0;
-    dashes: 12,3;
-}
-node[public_transport=platform] {
-    icon-image: "transport/bus_small.png";
-    set icon_z17;
-}
-node[public_transport=platform][bus=yes] {
-    icon-image: "transport/bus_small.png";
-    set icon_z17;
-}
-node[public_transport=platform][aerial=yes] {
-    icon-image: "transport/aerialway/station.png";
-    set icon_z17;
-}
-node[public_transport=platform][ferry=yes] {
-    icon-image: "transport/ferry.png";
-    set icon_z17;
-}
-node[public_transport=platform][tram=yes],
-node[public_transport=platform][train=yes] {
-    icon-image: "transport/railway_station.png";
-    set icon_z17;
-}
-
 /****************/
 /* railway tags */
 /****************/
 
-area[railway=station],
-area[railway=tram_station],
-area[railway=subway_entrance] {
+area[railway=station] {
     fill-color: railwaypoint#f7efb7;
 }
-node[railway=station], node[railway=tram_station] {
+node[railway=station] {
     icon-image: "transport/railway_station.png";
     set icon_z17;
@@ -3679,4 +3615,69 @@
 node[aerialway=goods] {
     icon-image: "misc/deprecated.png";
+    set icon_z17;
+}
+
+/*************************/
+/* public_transport tags */
+/*************************/
+
+node[highway=bus_stop] {
+    icon-image: "transport/bus_small.png";
+    set icon_z17;
+}
+node[public_transport=stop_position] {
+    icon-image: "transport/railway_small.png";
+    set icon_z17;
+}
+node[public_transport=stop_position][train=yes] {
+    icon-image: "transport/train.svg";
+    set icon_z17;
+}
+node[public_transport=stop_position][subway=yes] {
+    icon-image: "transport/railway/subway.svg";
+    set icon_z17;
+}
+node[public_transport=stop_position][monorail=yes] {
+    icon-image: "transport/railway/monorail.svg";
+    set icon_z17;
+}
+node[public_transport=stop_position][tram=yes] {
+    icon-image: "transport/railway/tram.svg";
+    set icon_z17;
+}
+node[public_transport=stop_position][bus=yes] {
+    icon-image: "transport/bus.svg";
+    set icon_z17;
+}
+node[public_transport=stop_position][trolleybus=yes] {
+    icon-image: "transport/trolleybus.svg";
+    set icon_z17;
+}
+node[public_transport=stop_position][aerialway=yes] {
+    icon-image: "transport/aerialway/station.png";
+    set icon_z17;
+}
+node[public_transport=stop_position][ferry=yes] {
+    icon-image: "nautical/ferry.png";
+    icon-width: 16;
+    set icon_z17;
+}
+area[public_transport=platform]:closed {
+    fill-color: service#809bc0;
+}
+way[public_transport=platform]!:closed {
+    width: 3;
+    color: service#809bc0;
+    dashes: 12,3;
+}
+node[public_transport=platform] {
+    icon-image: "transport/platform.svg";
+    set icon_z17;
+}
+area[public_transport=station] {
+    fill-color: railwaypoint#f7efb7;
+}
+node[public_transport=station] {
+    icon-image: "transport/station.svg";
     set icon_z17;
 }