Index: trunk/styles/standard/elemstyles.xml
===================================================================
--- trunk/styles/standard/elemstyles.xml	(revision 1972)
+++ trunk/styles/standard/elemstyles.xml	(revision 1973)
@@ -406,5 +406,5 @@
 	<rule>
 		<condition k="barrier" v="turnstile"/>
-		<icon annotate="true" src="misc/no_icon.png"/>
+		<icon annotate="true" src="vehicle/turnstile.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -420,5 +420,5 @@
 	<rule>
 		<condition k="barrier" v="cycle_barrier"/>
-		<icon annotate="true" src="misc/no_icon.png"/>
+		<icon annotate="true" src="vehicle/cycle_barrier.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -426,5 +426,5 @@
 	<rule>
 		<condition k="barrier" v="lift_gate"/>
-		<icon annotate="true" src="misc/no_icon.png"/>
+		<icon annotate="true" src="vehicle/lift_gate.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -461,5 +461,5 @@
 	<rule>
 		<condition k="barrier" v="entrance"/>
-		<icon annotate="true" src="misc/no_icon.png"/>
+		<icon annotate="true" src="vehicle/entrance.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -501,5 +501,5 @@
 	<rule>
 		<condition k="barrier" v="sally_port"/>
-		<icon annotate="true" src="misc/no_icon.png"/>
+		<icon annotate="true" src="vehicle/sally_port.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -862,4 +862,11 @@
 		<area colour="turningcircle#c0c0c0"/>
 		<icon annotate="true" src="vehicle/turning_circle.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="highway" v="passing_place"/>
+		<icon annotate="true" src="vehicle/passing_place.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1258,4 +1265,12 @@
 
 	<rule>
+		<condition k="railway" v="buffer_stop"/>
+		<icon annotate="true" src="transport/buffer_stop.png"/>
+		<area colour="rail#404040"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="railway" v="platform"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
@@ -1338,4 +1353,11 @@
 	</rule>
 
+	<rule>
+		<condition k="aeroway" v="windsock"/>
+		<icon annotate="true" src="transport/airport/windsock.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
 <!--aerialway tags -->
 
@@ -1448,5 +1470,5 @@
 	<rule>
 		<condition k="power" v="pole"/>
-		<icon annotate="true" src="misc/no_icon.png"/>
+		<icon annotate="true" src="misc/landmark/power/pole.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1642,5 +1664,5 @@
 	<rule>
 		<condition k="man_made" v="watermill"/>
-		<icon annotate="true" src="misc/no_icon.png"/>
+		<icon annotate="true" src="misc/landmark/watermill.png"/>
 		<area colour="manmade#d8d8d8"/>
 		<scale_min>1</scale_min>
@@ -2393,4 +2415,12 @@
 		<area colour="amenity_light#f7efb7"/>
 		<icon annotate="true" src="leisure/bench.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="amenity" v="bbq"/>
+		<area colour="amenity_light#f7efb7"/>
+		<icon annotate="true" src="leisure/bbq.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3646,4 +3676,36 @@
 		<condition k="sport" v="canoe"/>
 		<area colour="sport#bde3cb"/>
+		<icon src="sport/canoe.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="chess"/>
+		<area colour="sport#bde3cb"/>
+		<icon src="sport/chess.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="climbing"/>
+		<area colour="sport#bde3cb"/>
+		<icon src="sport/climbing.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="cricket"/>
+		<area colour="sport#bde3cb"/>
+		<icon src="sport/cricket.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="cricket_nets"/>
+		<area colour="sport#bde3cb"/>
 		<icon src="misc/no_icon.png"/>
 		<scale_min>1</scale_min>
@@ -3652,5 +3714,21 @@
 
 	<rule>
-		<condition k="sport" v="climbing"/>
+		<condition k="sport" v="croquet"/>
+		<area colour="sport#bde3cb"/>
+		<icon src="sport/croquet.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="cycling"/>
+		<area colour="sport#bde3cb"/>
+		<icon src="sport/cycling.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="dog_racing"/>
 		<area colour="sport#bde3cb"/>
 		<icon src="misc/no_icon.png"/>
@@ -3660,13 +3738,29 @@
 
 	<rule>
-		<condition k="sport" v="cricket"/>
-		<area colour="sport#bde3cb"/>
-		<icon src="sport/cricket.png"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="sport" v="cricket_nets"/>
+		<condition k="sport" v="equestrian"/>
+		<area colour="sport#bde3cb"/>
+		<icon src="sport/riding.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="football"/>
+		<area colour="sport#bde3cb"/>
+		<icon src="sport/football.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="golf"/>
+		<area colour="sport#bde3cb"/>
+		<icon src="sport/golf.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="gymnastics"/>
 		<area colour="sport#bde3cb"/>
 		<icon src="misc/no_icon.png"/>
@@ -3676,21 +3770,37 @@
 
 	<rule>
-		<condition k="sport" v="croquet"/>
-		<area colour="sport#bde3cb"/>
-		<icon src="sport/croquet.png"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="sport" v="cycling"/>
-		<area colour="sport#bde3cb"/>
-		<icon src="sport/cycling.png"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="sport" v="dog_racing"/>
+		<condition k="sport" v="hockey"/>
+		<area colour="sport#bde3cb"/>
+		<icon src="sport/hockey.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="horse_racing"/>
+		<area colour="sport#bde3cb"/>
+		<icon src="sport/riding.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="motor"/>
+		<area colour="sport#bde3cb"/>
+		<icon src="vehicle/motorbike.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="multi"/>
+		<area colour="sport#bde3cb"/>
+		<icon src="sport/multi.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="pelota"/>
 		<area colour="sport#bde3cb"/>
 		<icon src="misc/no_icon.png"/>
@@ -3700,13 +3810,13 @@
 
 	<rule>
-		<condition k="sport" v="equestrian"/>
-		<area colour="sport#bde3cb"/>
-		<icon src="sport/riding.png"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="sport" v="football"/>
+		<condition k="sport" v="racquet"/>
+		<area colour="sport#bde3cb"/>
+		<icon src="sport/racquetball.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="rugby"/>
 		<area colour="sport#bde3cb"/>
 		<icon src="sport/football.png"/>
@@ -3716,13 +3826,5 @@
 
 	<rule>
-		<condition k="sport" v="golf"/>
-		<area colour="sport#bde3cb"/>
-		<icon src="sport/golf.png"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="sport" v="gymnastics"/>
+		<condition k="sport" v="skating"/>
 		<area colour="sport#bde3cb"/>
 		<icon src="misc/no_icon.png"/>
@@ -3732,71 +3834,7 @@
 
 	<rule>
-		<condition k="sport" v="hockey"/>
-		<area colour="sport#bde3cb"/>
-		<icon src="sport/hockey.png"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="sport" v="horse_racing"/>
-		<area colour="sport#bde3cb"/>
-		<icon src="sport/riding.png"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="sport" v="motor"/>
-		<area colour="sport#bde3cb"/>
-		<icon src="vehicle/motorbike.png"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="sport" v="multi"/>
-		<area colour="sport#bde3cb"/>
-		<icon src="sport/multi.png"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="sport" v="pelota"/>
-		<area colour="sport#bde3cb"/>
-		<icon src="misc/no_icon.png"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="sport" v="racquet"/>
-		<area colour="sport#bde3cb"/>
-		<icon src="sport/racquetball.png"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="sport" v="rugby"/>
-		<area colour="sport#bde3cb"/>
-		<icon src="sport/football.png"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="sport" v="skating"/>
-		<area colour="sport#bde3cb"/>
-		<icon src="misc/no_icon.png"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
 		<condition k="sport" v="skateboard"/>
 		<area colour="sport#bde3cb"/>
-		<icon src="misc/no_icon.png"/>
+		<icon src="sport/skateboard.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3902,5 +3940,5 @@
 		<condition k="sport" v="rowing"/>
 		<area colour="sport#bde3cb"/>
-		<icon annotate="true" src="misc/no_icon.png"/>
+		<icon annotate="true" src="sport/rowing.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>