Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 7959)
+++ /trunk/data/defaultpresets.xml	(revision 7960)
@@ -4974,5 +4974,5 @@
             </optional>
         </item> <!-- Entrance -->
-        <item name="Tower" icon="presets/tower.png" type="node,closedway" preset_name_label="true">
+        <item name="Tower" icon="styles/standard/misc/landmark/tower.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=tower"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=tower"
@@ -4998,5 +4998,5 @@
         </item> <!-- Flagpole -->
         <separator/>
-        <item name="Works" icon="presets/works.png" type="node,closedway" preset_name_label="true">
+        <item name="Works" icon="styles/standard/misc/landmark/works.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=works"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=works"
@@ -5016,5 +5016,5 @@
             <text key="height" text="Height (meters)" />
         </item> <!-- Chimney -->
-        <item name="Windmill" icon="presets/windmill.png" type="node,closedway" preset_name_label="true">
+        <item name="Windmill" icon="styles/standard/misc/landmark/windmill.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=windmill"
@@ -5103,5 +5103,5 @@
         </item> <!-- Embankment -->
         <separator/>
-        <item name="Water Tower" icon="presets/water_tower.png" type="node,closedway" preset_name_label="true">
+        <item name="Water Tower" icon="styles/standard/misc/landmark/water_tower.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=water_tower"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=water_tower"
@@ -5160,5 +5160,5 @@
             <text key="name" text="Name" />
         </item> <!-- Fountain -->
-        <item name="Water Well" icon="presets/water_well.png" type="node" preset_name_label="true">
+        <item name="Water Well" icon="presets/water_well.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=water_well"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=water_well"
@@ -5183,5 +5183,5 @@
             <text key="name" text="Name" />
         </item> <!-- Lighthouse -->
-        <item name="Beacon" icon="styles/standard/misc/landmark/beacon.png" type="node" preset_name_label="true">
+        <item name="Beacon" icon="styles/standard/misc/landmark/beacon.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=beacon"
@@ -5236,5 +5236,5 @@
             </checkgroup>
         </item> <!-- Monitoring Station -->
-        <item name="Survey Point" icon="presets/survey_point.png" type="node" preset_name_label="true">
+        <item name="Survey Point" icon="styles/standard/misc/landmark/survey_point.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=survey_point"
@@ -5302,5 +5302,5 @@
             <reference ref="optional_bridge" />
         </item> <!-- Movable Bridge -->
-        <item name="Bridge Support" icon="presets/bridge.png" type="node,closedway" preset_name_label="true">
+        <item name="Bridge Support" icon="styles/standard/bridge/support.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:bridge:support" />
             <space />
@@ -5718,6 +5718,6 @@
         </item> <!-- Power Cable -->
     </group> <!-- Power -->
-    <group name="Historic Places" icon="presets/State_Tourist.png">
-        <item name="Castle" icon="presets/State_Tourist.png" type="node,closedway" preset_name_label="true">
+    <group name="Historic Places" icon="styles/standard/sightseeing/castle.svg">
+        <item name="Castle" icon="styles/standard/sightseeing/castle.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:historic=castle"
Index: /trunk/data/validator/geometry.mapcss
===================================================================
--- /trunk/data/validator/geometry.mapcss	(revision 7959)
+++ /trunk/data/validator/geometry.mapcss	(revision 7960)
@@ -1,7 +1,8 @@
 /* {0} on a node, should be a way */
 node[oneway],
-node[bridge?],
+node[bridge],
 node[sidewalk],
 node[footway],
+node[man_made=embankment],
 node[aerialway=cable_car],
 node[aerialway=gondola],
@@ -47,4 +48,5 @@
 node[natural=bare_rock],
 node[waterway=riverbank],
+node[man_made=bridge],
 node[source:outline] {
   throwWarning: tr("{0} on a node. Should be drawn as an area.", "{0.tag}");
@@ -58,4 +60,6 @@
 
 /* {0} on a way, should be a node */
+way[entrance],
+way[man_made=survey_point],
 way[natural=peak],
 way[natural=saddle],
Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 7959)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 7960)
@@ -1211,13 +1211,12 @@
 area[man_made=beacon],
 area[man_made=bridge],
+area[bridge:support],
 area[man_made=chimney],
 area[man_made=crane],
-area[man_made=flagpole],
 area[man_made=gasometer],
 area[man_made=bunker_silo],
 area[man_made=lighthouse],
 area[man_made=monitoring_station],
-area[man_made=mineshaft],
-area[man_made=adit] {
+area[man_made=mineshaft] {
     fill-color: manmade#d8d8d8;
 }
@@ -1227,4 +1226,14 @@
     text: auto;
 }
+node[man_made=bridge] {
+    icon-image: "misc/deprecated.png";
+    set icon_z17;
+    text: auto;
+}
+node[bridge:support] {
+    icon-image: "bridge/support.svg";
+    set icon_z17;
+    text: auto;
+}
 node[man_made=chimney] {
     icon-image: "misc/landmark/chimney.png";
@@ -1243,5 +1252,6 @@
 }
 node[man_made=gasometer] {
-    icon-image: "misc/landmark/gasometer.png";
+    icon-image: "presets/gasometer.png";
+    icon-width: 16;
     set icon_z17;
     text: auto;
@@ -1322,4 +1332,5 @@
     color: pipeline#660000;
 }
+node[man_made=embankment],
 node[man_made=pipeline] {
     icon-image: "misc/deprecated.png";
@@ -1334,5 +1345,4 @@
 area[man_made=reservoir_covered],
 area[man_made=surveillance],
-area[man_made=survey_point],
 area[man_made=tower],
 area[man_made=wastewater_plant],
@@ -1351,5 +1361,6 @@
 }
 node[man_made=surveillance] {
-    icon-image: "misc/surveillance.png";
+    icon-image: "presets/surveillance.png";
+    icon-width: 16;
     set icon_z17;
     text: auto;
@@ -2879,5 +2890,5 @@
 area[historic=ruins],
 area[historic=battlefield],
-area[historic=palaeontological_site],
+area[geological=palaeontological_site],
 area[historic=wayside_cross],
 area[historic=wayside_shrine],
@@ -2886,5 +2897,5 @@
 }
 node[historic=castle] {
-    icon-image: "sightseeing/castle.png";
+    icon-image: "sightseeing/castle.svg";
     set icon_z17;
     text: auto;
@@ -2915,5 +2926,5 @@
     text: auto;
 }
-node[historic=palaeontological_site] {
+node[geological=palaeontological_site] {
     icon-image: "historic/palaeontological_site.png";
     set icon_z17;