Index: trunk/styles/standard/elemstyles.xml
===================================================================
--- trunk/styles/standard/elemstyles.xml	(revision 714)
+++ trunk/styles/standard/elemstyles.xml	(revision 716)
@@ -16,4 +16,140 @@
 
 <rules>
+
+	<!-- mark some specials that should be fixed - they are already the default and therefore shouldn't be tagged -->
+    <rule>
+       <condition k="oneway" v="yes"/>
+	   <!-- no line or area, as this is a highway=xy, railway=xy, .... -->
+       <icon annotate="true" src="misc/deprecated.png" />
+       <scale_min>1</scale_min>
+       <scale_max>40000</scale_max>
+     </rule>
+    <rule>
+       <condition k="oneway" v="1"/>
+	   <!-- no line or area, as this is a highway=xy, railway=xy, .... -->
+       <icon annotate="true" src="misc/deprecated.png" />
+       <scale_min>1</scale_min>
+       <scale_max>40000</scale_max>
+     </rule>
+    <rule>
+       <condition k="oneway" v="-1"/>
+	   <!-- no line or area, as this is a highway=xy, railway=xy, .... -->
+       <icon annotate="true" src="misc/deprecated.png" />
+       <scale_min>1</scale_min>
+       <scale_max>40000</scale_max>
+     </rule>
+    <rule>
+       <condition k="oneway" v="true"/>
+	   <!-- no line or area, as this is a highway=xy, railway=xy, .... -->
+       <icon annotate="true" src="misc/deprecated.png" />
+       <scale_min>1</scale_min>
+       <scale_max>40000</scale_max>
+     </rule>
+    <rule>
+       <condition k="oneway" v="no"/>
+       <line width="2" realwidth="5" dashed="true" colour="#ff0000"/>
+       <icon annotate="true" src="misc/deprecated.png" />
+       <scale_min>1</scale_min>
+       <scale_max>40000</scale_max>
+     </rule>
+    <rule>
+       <condition k="oneway" v="false"/>
+       <line width="2" realwidth="5" dashed="true" colour="#ff0000"/>
+       <icon annotate="true" src="misc/deprecated.png" />
+       <scale_min>1</scale_min>
+       <scale_max>40000</scale_max>
+     </rule>
+    <rule>
+       <condition k="bridge" v="yes"/>
+	   <!-- no line or area, as this is a highway=xy, railway=xy, .... -->
+       <icon annotate="true" src="vehicle/viaduct.png" />
+       <scale_min>1</scale_min>
+       <scale_max>40000</scale_max>
+     </rule>
+    <rule>
+       <condition k="bridge" v="true"/>
+	   <!-- no line or area, as this is a highway=xy, railway=xy, .... -->
+       <icon annotate="true" src="vehicle/viaduct.png" />
+       <scale_min>1</scale_min>
+       <scale_max>40000</scale_max>
+     </rule>
+    <rule>
+       <condition k="bridge" v="false"/>
+       <line width="2" realwidth="5" dashed="true" colour="#ff0000"/>
+       <icon annotate="true" src="misc/deprecated.png" />
+       <scale_min>1</scale_min>
+       <scale_max>40000</scale_max>
+     </rule>
+    <rule>
+       <condition k="bridge" v="no"/>
+       <line width="2" realwidth="5" dashed="true" colour="#ff0000"/>
+       <icon annotate="true" src="misc/deprecated.png" />
+       <scale_min>1</scale_min>
+       <scale_max>40000</scale_max>
+     </rule>
+    <rule>
+       <condition k="bridge" v="viaduct"/>
+	   <!-- no line or area, as this is a highway=xy, railway=xy, .... -->
+       <icon annotate="true" src="vehicle/viaduct.png" />
+       <scale_min>1</scale_min>
+       <scale_max>40000</scale_max>
+     </rule>
+    <rule>
+       <condition k="bridge" v="aqueduct"/>
+	   <!-- no line or area, as this is a highway=xy, railway=xy, .... -->
+       <icon annotate="true" src="nautical/aqueduct.png" />
+       <scale_min>1</scale_min>
+       <scale_max>40000</scale_max>
+     </rule>
+    <rule>
+       <condition k="bridge" v="swing"/>
+	   <!-- no line or area, as this is a highway=xy, railway=xy, .... -->
+       <icon annotate="true" src="nautical/viaduct.png" />
+       <scale_min>1</scale_min>
+       <scale_max>40000</scale_max>
+     </rule>
+    <rule>
+       <condition k="tunnel" v="yes"/>
+	   <!-- no line or area, as this is a highway=xy, railway=xy, .... -->
+		<icon annotate="true" src="vehicle/tunnel.png" />
+       <scale_min>1</scale_min>
+       <scale_max>40000</scale_max>
+     </rule>
+    <rule>
+       <condition k="tunnel" v="true"/>
+	   <!-- no line or area, as this is a highway=xy, railway=xy, .... -->
+		<icon annotate="true" src="vehicle/tunnel.png" />
+       <scale_min>1</scale_min>
+       <scale_max>40000</scale_max>
+     </rule>
+    <rule>
+       <condition k="tunnel" v="false"/>
+       <line width="2" realwidth="5" dashed="true" colour="#ff0000"/>
+       <icon annotate="true" src="misc/deprecated.png" />
+       <scale_min>1</scale_min>
+       <scale_max>40000</scale_max>
+     </rule>
+    <rule>
+       <condition k="tunnel" v="no"/>
+       <line width="2" realwidth="5" dashed="true" colour="#ff0000"/>
+       <icon annotate="true" src="misc/deprecated.png" />
+       <scale_min>1</scale_min>
+       <scale_max>40000</scale_max>
+     </rule>
+    <rule>
+       <condition k="cutting" v="false"/>
+       <line width="2" realwidth="5" dashed="true" colour="#ff0000"/>
+       <icon annotate="true" src="misc/deprecated.png" />
+       <scale_min>1</scale_min>
+       <scale_max>40000</scale_max>
+     </rule>
+    <rule>
+       <condition k="embankment" v="false"/>
+       <line width="2" realwidth="5" dashed="true" colour="#ff0000"/>
+       <icon annotate="true" src="misc/deprecated.png" />
+       <scale_min>1</scale_min>
+       <scale_max>40000</scale_max>
+     </rule>
+
 <!--restrictions tags -->
 <!--the restrictions rules should be placed before the path rule! -->
@@ -35,5 +171,5 @@
 		<condition k="bicycle" v="designated"/>
 		<line width="1" realwidth="2" colour="#ff00ff"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="sports/bicycle.png" />
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -77,5 +213,5 @@
 		<condition k="horse" v="designated"/>
 		<line width="1" realwidth="2" colour="#c08000" />
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon src="sports/riding.png" />
 		<scale_min>1</scale_min>
 		<scale_max>30000</scale_max>
@@ -118,61 +254,61 @@
 
 	<rule>
-		<condition k="noexit" v="no" />
-		<icon src="misc/no_icon.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="maxweight" v="no" />
-		<icon src="misc/no_icon.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="maxheight" v="no" />
-		<icon src="misc/no_icon.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="maxwidth" v="no" />
-		<icon src="misc/no_icon.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="maxlength" v="no" />
-		<icon src="misc/no_icon.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="maxspeed" v="no" />
-		<icon src="misc/no_icon.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="minspeed" v="no" />
-		<icon src="misc/no_icon.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="maxstay" v="no" />
-		<icon src="misc/no_icon.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="toll" v="no" />
+		<condition k="noexit" v="yes" />
+		<icon src="vehicle/restrictions/dead_end.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="maxweight" v="yes" />
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="maxheight" v="yes" />
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="maxwidth" v="yes" />
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="maxlength" v="yes" />
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="maxspeed" v="yes" />
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="minspeed" v="yes" />
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="maxstay" v="yes" />
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="toll" v="yes" />
 		<icon src="misc/no_icon.png" />
         <scale_min>1</scale_min>
@@ -182,5 +318,5 @@
 	<rule>
 		<condition k="barrier" v="bollard" />
-		<icon annotate="true" src="misc/proposed.png" />
+		<icon annotate="true" src="vehicle/restrictions/bollard.png" />
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -191,5 +327,5 @@
 		<condition k="highway" v="motorway"/>
         <line width="3" realwidth="8" colour="#809bc0"  width_bg="5" colour_bg="#FFFF00"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>200000000</scale_max>
@@ -199,5 +335,5 @@
 		<condition k="highway" v="motorway_link"/>
         <line width="3" colour="#809bc0"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -207,5 +343,5 @@
 		<condition k="highway" v="trunk"/>
 		<line width="3" colour="#7fc97f"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>20000</scale_max>
@@ -215,5 +351,5 @@
 		<condition k="highway" v="trunk_link"/>
         <line width="3" colour="#7fc97f"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>20000</scale_max>
@@ -223,5 +359,5 @@
 		<condition k="highway" v="primary"/>
 		<line width="3" realwidth="8" colour="#fb805f"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>700000</scale_max>
@@ -231,5 +367,5 @@
 		<condition k="highway" v="primary_link"/>
         <line width="3" colour="#fb805f"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>40000</scale_max>
@@ -239,5 +375,5 @@
 		<condition k="highway" v="secondary"/>
 		<line width="3" realwidth="6" colour="#fdbf6f"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>300000</scale_max>
@@ -247,5 +383,5 @@
         <condition k="highway" v="tertiary"/>
         <line width="2" realwidth="5" colour="#f7f496"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>30000</scale_max>
@@ -255,5 +391,5 @@
 		<condition k="highway" v="unclassified"/>
 		<line width="2" realwidth="5" colour="#c0c0c0"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>40000</scale_max>
@@ -271,5 +407,5 @@
 		<condition k="highway" v="unsurfaced"/>
 		<line width="1" realwidth="3" colour="#c0c0c0"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>40000</scale_max>
@@ -279,5 +415,5 @@
         <condition k="highway" v="track"/>
         <line width="1" realwidth="3" colour="#006600"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>20000</scale_max>
@@ -287,5 +423,5 @@
 		<condition k="highway" v="residential"/>
 		<line width="2" realwidth="5" colour="#c0c0c0"/> 
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>40000</scale_max>
@@ -295,5 +431,5 @@
 		<condition k="highway" v="living_street"/>
 		<line width="1" realwidth="3" colour="#c0c0c0"/> 
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>40000</scale_max>
@@ -303,5 +439,5 @@
         <condition k="highway" v="service"/>
         <line width="1" realwidth="3" colour="#809bc0"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>20000</scale_max>
@@ -311,5 +447,5 @@
 		<condition k="highway" v="bridleway"/>
 		<line width="1" realwidth="2" colour="#c08000" />
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>30000</scale_max>
@@ -319,5 +455,5 @@
 		<condition k="highway" v="cycleway"/>
 		<line width="1" realwidth="2" colour="#ff00ff"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -327,5 +463,5 @@
 		<condition k="highway" v="footway"/>
 		<line width="1" realwidth="1" colour="#00ff00" />
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>10000</scale_max>
@@ -335,5 +471,5 @@
 		<condition k="highway" v="path"/>
 		<line width="1" realwidth="1" colour="#00ff00" />
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
 		<scale_min>1</scale_min>
 		<scale_max>10000</scale_max>
@@ -343,5 +479,5 @@
 		<condition k="highway" v="pedestrian"/>
 		<line width="3" realwidth="5" colour="#00ff00"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>10000</scale_max>
@@ -359,5 +495,5 @@
         <condition k="highway" v="bus_guideway"/>
         <line width="1" realwidth="1" colour="#00ff00"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>10000</scale_max>
@@ -436,5 +572,6 @@
 	<rule>
 		<condition k="highway" v="viaduct" />
-		<icon annotate="true" src="vehicle/viaduct.png" />
+		<line width="2" realwidth="5" dashed="true" colour="#ff0000"/>
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -489,5 +626,5 @@
 		<condition k="junction" v="roundabout" />
         <area width="1" colour="#eeeeee" />
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -499,5 +636,5 @@
 		<condition k="cycleway" v="lane"/>
 		<line width="1" realwidth="2" colour="#ff00ff"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -507,5 +644,5 @@
 		<condition k="cycleway" v="track"/>
 		<line width="1" realwidth="2" colour="#ff00ff"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -515,5 +652,5 @@
 		<condition k="cycleway" v="opposite_lane"/>
 		<line width="1" realwidth="2" colour="#ff00ff"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -523,5 +660,5 @@
 		<condition k="cycleway" v="opposite_track"/>
 		<line width="1" realwidth="2" colour="#ff00ff"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -531,5 +668,5 @@
 		<condition k="cycleway" v="opposite"/>
 		<line width="1" realwidth="2" colour="#ff00ff"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -541,5 +678,5 @@
 		<condition k="tracktype" v="grade1"/>
         <line width="1" realwidth="3" dashed="true" colour="#006600"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -549,5 +686,5 @@
 		<condition k="tracktype" v="grade2"/>
         <line width="1" realwidth="3" dashed="true" colour="#006600"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -557,5 +694,5 @@
 		<condition k="tracktype" v="grade3"/>
         <line width="1" realwidth="3" dashed="true" colour="#006600"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -565,5 +702,5 @@
 		<condition k="tracktype" v="grade4"/>
         <line width="1" realwidth="3" dashed="true" colour="#006600"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -573,5 +710,5 @@
 		<condition k="tracktype" v="grade5"/>
         <line width="1" realwidth="3" dashed="true" colour="#006600"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -582,21 +719,21 @@
 		<condition k="waterway" v="river"/>
         <line width="2" realwidth="10" colour="#0000ff" width_bg="3" colour_bg="#00001f"/>
-		<icon annotate="true" src="misc/no_icon.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<!--rule>
+		<icon annotate="true" src="misc/deprecated.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="waterway" v="riverbank"/>
         <line width="1" colour="#00005f" width_bg="1" colour_bg="#00001f"/>
-	<icon annotate="true" src="misc/no_icon.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule-->
+		<icon annotate="true" src="misc/deprecated.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
 
 	<rule>
 		<condition k="waterway" v="canal"/>
         <line width="2" colour="#0000ff" width_bg="2" colour_bg="#00001f"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -606,5 +743,5 @@
         <condition k="waterway" v="stream"/>
         <line width="1" colour="#6600cc" />
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -614,5 +751,5 @@
         <condition k="waterway" v="drain"/>
         <line width="1" colour="#0000ff"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -643,5 +780,6 @@
 	<rule>
 		<condition k="waterway" v="aqueduct" />
-		<icon annotate="true" src="nautical/aqueduct.png" />
+		<line width="2" realwidth="5" dashed="true" colour="#ff0000"/>
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -686,5 +824,5 @@
 	<rule>
 		<condition k="waterway" v="dam" />
-		<icon annotate="true" src="nautical.png" />
+		<icon annotate="true" src="misc/no_icon.png" />
         <line width="2" colour="#D8D8D8" />
 		<!-- it's not possible to have both line and area, line seems more likely -->
@@ -693,4 +831,13 @@
 	</rule>
 
+	<rule>
+		<condition k="waterway" v="waterfall" />
+		<icon annotate="true" src="misc/no_icon.png" />
+        <line width="2" colour="#D8D8D8" />
+		<!-- it's not possible to have both line and area, line seems more likely -->
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+	
 <!-- railway tags -->
 	<rule>
@@ -718,6 +865,6 @@
 	<rule>
 		<condition k="railway" v="viaduct" />
-		<line width="3" colour="#808080" dashed="true"/>
-		<icon annotate="true" src="vehicle/viaduct.png" />
+		<line width="2" realwidth="5" dashed="true" colour="#ff0000"/>
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -743,5 +890,5 @@
 		<condition k="railway" v="rail"/>
 		<line width="2" colour="#808080" dashed="true"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -751,5 +898,5 @@
         <condition k="railway" v="tram"/>
         <line width="1" colour="#808080" dashed="true"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -759,5 +906,5 @@
         <condition k="railway" v="light_rail"/>
         <line width="2" colour="#808080" dashed="true"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -767,5 +914,5 @@
         <condition k="railway" v="subway"/>
         <line width="1" colour="#606060" dashed="true"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -783,5 +930,5 @@
         <condition k="railway" v="preserved"/>
         <line width="1" colour="#202020" dashed="true"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -791,5 +938,5 @@
         <condition k="railway" v="disused"/>
         <line width="1" colour="#202020" dashed="true"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -799,5 +946,5 @@
         <condition k="railway" v="abandoned"/>
         <line width="1" colour="#202020" dashed="true"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -807,5 +954,5 @@
         <condition k="railway" v="narrow_gauge"/>
         <line width="1" colour="#202020" dashed="true"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -815,5 +962,5 @@
         <condition k="railway" v="monorail"/>
         <line width="1" colour="#202020" dashed="true"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -830,5 +977,5 @@
 	<rule>
 		<condition k="service" v="yard" />
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -837,5 +984,5 @@
 	<rule>
 		<condition k="service" v="siding" />
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -844,5 +991,5 @@
 	<rule>
 		<condition k="service" v="spur" />
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -877,5 +1024,5 @@
         <condition k="aeroway" v="runway"/>
         <line width="3" colour="#330000" />
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="transport/airport.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -885,5 +1032,5 @@
         <condition k="aeroway" v="taxiway"/>
         <line width="2" colour="#660000" />
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="transport/airport.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -893,5 +1040,5 @@
         <condition k="aeroway" v="apron"/>
         <area colour="#990000" />
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="transport/airport.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -901,5 +1048,5 @@
     <rule>
         <condition k="aerialway" v="cable_car"/>
-		<line width="2" colour="#707070" dashed="true"/>
+		<line width="1" colour="#663300" dashed="true"/>
 		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
@@ -909,5 +1056,5 @@
     <rule>
         <condition k="aerialway" v="chair_lift"/>
-		<line width="2" colour="#707070" dashed="true"/>
+		<line width="1" colour="#663300" dashed="true"/>
 		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
@@ -917,5 +1064,5 @@
     <rule>
         <condition k="aerialway" v="drag_lift"/>
-		<line width="2" colour="#707070" dashed="true"/>
+		<line width="1" colour="#663300" dashed="true"/>
 		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
@@ -925,5 +1072,5 @@
 	<rule>
 		<condition k="aerialway" v="gondola"/>
-		<line width="2" colour="#707070" dashed="true"/>
+		<line width="1" colour="#663300" dashed="true"/>
 		<icon annotate="true" src="misc/no_icon.png" />
 		<scale_min>1</scale_min>
@@ -936,5 +1083,5 @@
 		<condition k="piste:difficulty" v="easy"/>
 		<line width="6" colour="#0000FF"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon src="sports/skiing.png" />
 		<scale_min>1</scale_min>
 		<scale_max>30000</scale_max>
@@ -944,5 +1091,5 @@
 		<condition k="piste:difficulty" v="intermediate"/>
 		<line width="6" colour="#FF0000"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon src="sports/skiing.png" />
 		<scale_min>1</scale_min>
 		<scale_max>30000</scale_max>
@@ -952,5 +1099,5 @@
 		<condition k="piste:difficulty" v="advanced"/>
 		<line width="6" colour="#606060"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon src="sports/skiing.png" />
 		<scale_min>1</scale_min>
 		<scale_max>30000</scale_max>
@@ -960,5 +1107,5 @@
 		<condition k="piste:difficulty" v="freeride"/>
 		<line width="6" colour="#FFFF00"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon src="sports/skiing.png" />
 		<scale_min>1</scale_min>
 		<scale_max>30000</scale_max>
@@ -968,5 +1115,5 @@
 		<condition k="piste:difficulty" v="novice"/>
 		<line width="6" colour="#00FF00"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon src="sports/skiing.png" />
 		<scale_min>1</scale_min>
 		<scale_max>300000</scale_max>
@@ -1124,5 +1271,5 @@
 		<condition k="man_made" v="pipeline" />
         <line width="2" colour="#660000" />
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1325,5 +1472,5 @@
 	<rule>
 		<condition k="amenity" v="bar" />
-		<icon annotate="true" src="misc/proposed.png" />
+		<icon annotate="true" src="food/bar.png" />
 		<area colour="#ecba52"/>
         <scale_min>1</scale_min>
@@ -1445,5 +1592,5 @@
 	<rule>
 		<condition k="amenity" v="drinking_water" />
-		<icon annotate="true" src="misc/drinking_water.png" />
+		<icon annotate="true" src="food/drinking_water.png" />
 		<area colour="#00005f"/>
         <scale_min>1</scale_min>
@@ -2375,5 +2522,5 @@
 		<condition k="route" v="bus"/>
         <line width="1" colour="#809bc0" dashed="true"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+        <icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2383,5 +2530,5 @@
 		<condition k="route" v="ferry"/>
         <line width="1" colour="#809bc0" dashed="true"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+        <icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2391,5 +2538,5 @@
 		<condition k="route" v="flight"/>
         <line width="1" colour="#809bc0" dashed="true"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+        <icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2399,5 +2546,5 @@
 		<condition k="route" v="ncn"/>
         <line width="1" colour="#809bc0" dashed="true"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+        <icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2407,5 +2554,5 @@
 		<condition k="route" v="subsea"/>
         <line width="1" colour="#809bc0" dashed="true"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+        <icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2415,5 +2562,5 @@
 		<condition k="route" v="ski"/>
         <line width="1" colour="#809bc0" dashed="true"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+        <icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2423,5 +2570,5 @@
 		<condition k="route" v="tour"/>
         <line width="1" colour="#809bc0" dashed="true"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+        <icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2431,5 +2578,5 @@
 		<condition k="route" v="pub_crawl"/>
         <line width="1" colour="#809bc0" dashed="true"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+        <icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2441,5 +2588,5 @@
 		<condition k="boundary" v="national"/>
         <line width="1" colour="#8de3cb" dashed="true"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+        <icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2449,5 +2596,5 @@
 		<condition k="boundary" v="administrative"/>
         <line width="1" colour="#8de3cb" dashed="true"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+        <icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2457,5 +2604,5 @@
 		<condition k="boundary" v="civil"/>
         <line width="1" colour="#8de3cb" dashed="true"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+        <icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2465,5 +2612,5 @@
 		<condition k="boundary" v="political"/>
         <line width="1" colour="#8de3cb" dashed="true"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+        <icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2473,5 +2620,5 @@
 		<condition k="boundary" v="national_park"/>
         <line width="1" colour="#8de3cb" dashed="true"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+        <icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2740,4 +2887,5 @@
 	</rule>
 
+	<!-- this will badly display otherwise well tagged footways and alike, so comment it out until we have better ways to display this in JOSM!
 	<rule>
 		<condition k="surface" v="paved"/>
@@ -2763,4 +2911,5 @@
         <scale_max>40000</scale_max>
     </rule>
+	-->
 
 <!--name tags -->
@@ -2771,5 +2920,5 @@
 	<rule>
 		<condition k="place" v="continent" />
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="places/settlement/capital.png" />
 		<area colour="#8de3cb"/>
         <scale_min>1</scale_min>
@@ -2779,5 +2928,5 @@
 	<rule>
 		<condition k="place" v="country" />
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="places/settlement/capital.png" />
 		<area colour="#8de3cb"/>
         <scale_min>1</scale_min>
@@ -2787,5 +2936,5 @@
 	<rule>
 		<condition k="place" v="state" />
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="places/settlement/capital.png" />
 		<area colour="#8de3cb"/>
         <scale_min>1</scale_min>
@@ -2795,5 +2944,5 @@
 	<rule>
 		<condition k="place" v="region" />
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="places/settlement/capital.png" />
 		<area colour="#8de3cb"/>
         <scale_min>1</scale_min>
@@ -2803,5 +2952,5 @@
 	<rule>
 		<condition k="place" v="county" />
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="places/settlement/capital.png" />
 		<area colour="#8de3cb"/>
         <scale_min>1</scale_min>
@@ -2874,4 +3023,11 @@
 
 	<rule>
+		<condition k="openGeoDB:type" v="Kreis" />
+		<icon annotate="true" src="places/settlement/town.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="openGeoDB:type" v="Gemeinde" />
 		<icon annotate="true" src="places/settlement/town.png" />
@@ -2880,4 +3036,11 @@
 	</rule>
 
+	<rule>
+		<condition k="openGeoDB:type" v="Ort" />
+		<icon annotate="true" src="places/settlement/town.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
 <!--annotation tags -->
 
@@ -2892,12 +3055,4 @@
 
 	<rule>
-		<condition k="shop" v="bicycle" />
-		<icon annotate="true" src="misc/proposed.png" />
-		<area colour="#00005f"/>
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
 		<condition k="shop" v="books" />
 		<icon annotate="true" src="misc/proposed.png" />
@@ -2909,4 +3064,12 @@
 	<rule>
 		<condition k="shop" v="car" />
+		<icon annotate="true" src="misc/proposed.png" />
+		<area colour="#00005f"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="shop" v="car_dealer" />
 		<icon annotate="true" src="misc/proposed.png" />
 		<area colour="#00005f"/>
@@ -3175,12 +3338,4 @@
 	</rule>
 
-	<rule>
-		<condition k="waterway" v="waterfall" />
-		<icon annotate="true" src="misc/proposed.png" />
-        <line width="2" colour="#D8D8D8" />
-		<!-- it's not possible to have both line and area, line seems more likely -->
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
 	<rule>
 		<condition k="sport" v="paintball" />
