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";