Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 7976)
+++ trunk/data/defaultpresets.xml	(revision 7977)
@@ -2140,5 +2140,5 @@
             </optional>
         </item> <!-- Level Crossing -->
-        <item name="Crossing" icon="presets/crossing.png" type="node" preset_name_label="true">
+        <item name="Crossing" icon="styles/standard/vehicle/crossing.png" 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"
@@ -2743,5 +2743,5 @@
             </optional>
         </item> <!-- Subway Entrance -->
-        <item name="Ticket Machine" icon="presets/vending_machine.png" type="node" preset_name_label="true">
+        <item name="Ticket Machine" icon="styles/standard/transport/ticket-machine.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=vending_machine"
Index: trunk/data/validator/geometry.mapcss
===================================================================
--- trunk/data/validator/geometry.mapcss	(revision 7976)
+++ trunk/data/validator/geometry.mapcss	(revision 7977)
@@ -17,4 +17,15 @@
 node[aerialway=rope_tow],
 node[aerialway=goods],
+node[aeroway=taxiway],
+node[aeroway=runway],
+node[railway=rail],
+node[railway=narrow_gauge],
+node[railway=monorail],
+node[railway=preserved],
+node[railway=light_rail],
+node[railway=subway],
+node[railway=tram],
+node[railway=disused],
+node[railway=abandoned],
 node[waterway=river],
 node[waterway=canal],
@@ -51,4 +62,5 @@
 node[man_made=bridge],
 node[man_made=breakwater],
+node[aeroway=apron],
 node[power=plant],
 node[source:outline] {
@@ -66,4 +78,5 @@
 way[man_made=survey_point],
 way[power=pole],
+way[amenity=vending_machine],
 way[natural=peak],
 way[natural=saddle],
Index: trunk/data/validator/highway.mapcss
===================================================================
--- trunk/data/validator/highway.mapcss	(revision 7976)
+++ trunk/data/validator/highway.mapcss	(revision 7977)
@@ -38,5 +38,7 @@
 }
 
-way[highway=crossing], way[railway=crossing] {
+way[highway=crossing],
+way[railway=crossing],
+way[railway=level_crossing] {
   throwWarning: tr("wrong crossing tag on a way");
   assertMatch: "way highway=crossing";
Index: trunk/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/styles/standard/elemstyles.mapcss	(revision 7976)
+++ trunk/styles/standard/elemstyles.mapcss	(revision 7977)
@@ -2160,6 +2160,5 @@
 area[amenity=car_wash],
 area[amenity=taxi],
-area[amenity=fuel],
-area[amenity=charging_station] {
+area[amenity=fuel] {
     fill-color: amenity_traffic#f7efb7;
 }
@@ -2642,6 +2641,5 @@
 area[amenity=shelter],
 area[amenity=marketplace],
-area[amenity=wlan],
-area[amenity=vending_machine] {
+area[amenity=wlan] {
     fill-color: amenity_light#f7efb7;
 }
@@ -3157,7 +3155,7 @@
 /****************/
 
-area[railway=station], area[railway=tram_station],
-area[railway=subway_entrance],
-area[railway=crossing], area[railway=level_crossing] {
+area[railway=station],
+area[railway=tram_station],
+area[railway=subway_entrance] {
     fill-color: railwaypoint#f7efb7;
 }
@@ -3183,10 +3181,11 @@
 }
 node[railway=crossing] {
-    icon-image: "vehicle/crossing_small.png";
+    icon-image: "vehicle/crossing.png";
     set icon_z17;
     text: auto;
 }
 node[railway=level_crossing] {
-    icon-image: "vehicle/crossing.png";
+    icon-image: "presets/level_crossing.png";
+    icon-width: 16;
     set icon_z17;
     text: auto;
@@ -3254,6 +3253,5 @@
     dashes: 9,9;
 }
-area[railway=turntable],
-area[railway=buffer_stop] {
+area[railway=turntable] {
     fill-color: rail#404040;
 }
@@ -3279,4 +3277,10 @@
     color: rail#404040;
     dashes: 9,9;
+}
+node[railway=switch] {
+    icon-image: "presets/railway_switch.png";
+    icon-width: 16;
+    set icon_z17;
+    text: auto;
 }
 node[railway=rail], node[railway=tram], node[railway=light_rail],
@@ -3320,10 +3324,7 @@
 /****************/
 
-area[aeroway=aerodrome]:closed {
+area[aeroway=aerodrome] {
     fill-color: aeroway#660000;
-}
-way[aeroway=aerodrome] {
     width: 2;
-    color: aeroway#660000;
     dashes: 9,9;
 }
@@ -3356,9 +3357,4 @@
     color: aeroway_dark#330000;
 }
-node[aeroway=runway] {
-    icon-image: "transport/airport/runway.png";
-    set icon_z17;
-    text: auto;
-}
 area[aeroway=taxiway]:closed {
     fill-color: aeroway#660000;
@@ -3368,14 +3364,12 @@
     color: aeroway#660000;
 }
+area[aeroway=apron],
+area[aeroway=hangar] {
+    fill-color: aeroway_light#990000;
+}
+node[aeroway=apron],
+node[aeroway=runway],
 node[aeroway=taxiway] {
-    icon-image: "transport/airport/taxiway.png";
-    set icon_z17;
-    text: auto;
-}
-area[aeroway=apron], area[aeroway=hangar] {
-    fill-color: aeroway_light#990000;
-}
-node[aeroway=apron] {
-    icon-image: "transport/airport/apron.png";
+    icon-image: "misc/deprecated.png";
     set icon_z17;
     text: auto;