Index: /trunk/styles/standard/elemstyles.xml
===================================================================
--- /trunk/styles/standard/elemstyles.xml	(revision 716)
+++ /trunk/styles/standard/elemstyles.xml	(revision 717)
@@ -322,4 +322,16 @@
 		<scale_max>50000</scale_max>
 	</rule>
+	<rule>
+		<condition k="barrier" v="gate" />
+		<icon annotate="true" src="vehicle/gate.png" />
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+	<rule>
+		<condition k="barrier" v="speed_bump" />
+		<icon annotate="true" src="misc/no_icon.png" />
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
 
 <!-- highway tags -->
@@ -857,4 +869,12 @@
 
 	<rule>
+		<condition k="railway" v="tram_station" />
+		<area colour="#f7efb7"/>
+		<icon annotate="true" src="transport/railway.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+	
+	<rule>
 		<condition k="railway" v="tram_stop" />
 		<icon annotate="true" src="transport/railway_small.png" />
@@ -863,4 +883,12 @@
 	</rule>
 
+    <rule>
+        <condition k="railway" v="subway_entrance"/>
+		<area colour="#f7efb7"/>
+		<icon annotate="true" src="transport/underground.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+    </rule>
+    
 	<rule>
 		<condition k="railway" v="viaduct" />
@@ -915,12 +943,4 @@
         <line width="1" colour="#606060" dashed="true"/>
 		<icon annotate="true" src="misc/deprecated.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-    </rule>
-    
-    <rule>
-        <condition k="railway" v="subway_entrance"/>
-		<area colour="#f7efb7"/>
-		<icon annotate="true" src="transport/underground.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1071,5 +1091,5 @@
     
 	<rule>
-		<condition k="aerialway" v="gondola"/>
+		<condition k="aerialway" v="station"/>
 		<line width="1" colour="#663300" dashed="true"/>
 		<icon annotate="true" src="misc/no_icon.png" />
@@ -1133,5 +1153,5 @@
 		<condition k="power" v="line" />
         <line width="1" colour="#eeeeee" />
-		<icon annotate="true" src="misc/landmark/power.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1480,5 +1500,5 @@
 	<rule>
 		<condition k="amenity" v="ice_cream" />
-		<icon annotate="true" src="misc/proposed.png" />
+		<icon annotate="true" src="food/icecream.png" />
 		<area colour="#ecba52"/>
 		<scale_min>1</scale_min>
@@ -1529,5 +1549,5 @@
 		<condition k="amenity" v="car_wash" />
 		<area colour="#f7efb7"/>
-		<icon annotate="true" src="misc/proposed.png" />
+		<icon annotate="true" src="transport/car.png" />
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1696,5 +1716,5 @@
 		<condition k="amenity" v="crematorium" />
 		<area colour="#f7efb7"/>
-		<icon annotate="true" src="misc/proposed.png" />
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1743,5 +1763,5 @@
 	<rule>
 		<condition k="amenity" v="kindergarten" />
-		<icon annotate="true" src="misc/proposed.png" />
+		<icon annotate="true" src="misc/no_icon.png" />
 		<area colour="#f7efb7"/>
         <scale_min>1</scale_min>
@@ -1766,15 +1786,7 @@
 
 	<rule>
-		<condition k="amenity" v="sheltered_housing" />
-        <area colour="#eeeeee" />
-		<icon annotate="true" src="misc/proposed.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
 		<condition k="amenity" v="nursery" />
         <area colour="#eeeeee" />
-		<icon annotate="true" src="misc/proposed.png" />
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1784,5 +1796,5 @@
 		<condition k="amenity" v="dentist" />
         <area colour="#eeeeee" />
-		<icon annotate="true" src="misc/proposed.png" />
+		<icon annotate="true" src="misc/no_icon.png" />
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1888,5 +1900,5 @@
 		<condition k="amenity" v="park_bench" />
 		<area colour="#f7efb7"/>
-		<icon annotate="true" src="misc/proposed.png" />
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1896,5 +1908,5 @@
 		<condition k="amenity" v="shelter" />
 		<area colour="#f7efb7"/>
-		<icon annotate="true" src="misc/proposed.png" />
+		<icon annotate="true" src="accomodation/shelter.png" />
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1978,4 +1990,245 @@
 		<condition k="shop" v="kiosk" />
 		<icon annotate="true" src="shopping/kiosk.png" />
+		<area colour="#00005f"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="shop" v="beverages" />
+		<icon annotate="true" src="misc/no_icon.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="shopping/rental/library.png" />
+		<area colour="#00005f"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="shop" v="car" />
+		<icon annotate="true" src="transport/car.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="transport/car.png" />
+		<area colour="#00005f"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="shop" v="car_repair" />
+		<icon annotate="true" src="transport/car.png" />
+		<area colour="#00005f"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="shop" v="chemist" />
+		<icon annotate="true" src="misc/no_icon.png" />
+		<area colour="#00005f"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="shop" v="clothes" />
+		<icon annotate="true" src="misc/no_icon.png" />
+		<area colour="#00005f"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="shop" v="computer" />
+		<icon annotate="true" src="misc/no_icon.png" />
+		<area colour="#00005f"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="shop" v="cycle_repair" />
+		<icon annotate="true" src="sports/bicycle.png" />
+		<area colour="#00005f"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="shop" v="department_store" />
+		<icon annotate="true" src="misc/no_icon.png" />
+		<area colour="#00005f"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="shop" v="electronics" />
+		<icon annotate="true" src="misc/no_icon.png" />
+		<area colour="#00005f"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="shop" v="furniture" />
+		<icon annotate="true" src="misc/no_icon.png" />
+		<area colour="#00005f"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="shop" v="florist" />
+		<icon annotate="true" src="misc/no_icon.png" />
+		<area colour="#00005f"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="shop" v="groceries" />
+		<icon annotate="true" src="shopping/groceries/fruits.png" />
+		<area colour="#00005f"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="shop" v="garden_centre" />
+		<icon annotate="true" src="misc/no_icon.png" />
+		<area colour="#00005f"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="shop" v="hairdresser" />
+		<icon annotate="true" src="misc/no_icon.png" />
+		<area colour="#00005f"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="shop" v="hardware" />
+		<icon annotate="true" src="misc/no_icon.png" />
+		<area colour="#00005f"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="shop" v="hifi" />
+		<icon annotate="true" src="misc/no_icon.png" />
+		<area colour="#00005f"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="shop" v="jewelry" />
+		<icon annotate="true" src="misc/no_icon.png" />
+		<area colour="#00005f"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="shop" v="mall" />
+		<icon annotate="true" src="misc/no_icon.png" />
+		<area colour="#00005f"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="shop" v="motorcycle" />
+		<icon annotate="true" src="vehicle/motorbike.png" />
+		<area colour="#00005f"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="shop" v="newsagent" />
+		<icon annotate="true" src="shopping/kiosk.png" />
+		<area colour="#00005f"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="shop" v="organic" />
+		<icon annotate="true" src="shopping/groceries/fruits.png" />
+		<area colour="#00005f"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="shop" v="optician" />
+		<icon annotate="true" src="misc/no_icon.png" />
+		<area colour="#00005f"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="shop" v="shoes" />
+		<icon annotate="true" src="misc/no_icon.png" />
+		<area colour="#00005f"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="shop" v="tailor" />
+		<icon annotate="true" src="misc/no_icon.png" />
+		<area colour="#00005f"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="shop" v="travel_agency" />
+		<icon annotate="true" src="misc/no_icon.png" />
+		<area colour="#00005f"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="shop" v="toys" />
+		<icon annotate="true" src="misc/no_icon.png" />
+		<area colour="#00005f"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="shop" v="video" />
+		<icon annotate="true" src="misc/no_icon.png" />
+		<area colour="#00005f"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<!-- duplicate of shopping_centre? -->
+	<rule>
+		<condition k="shop" v="shopping_center" />
+		<icon annotate="true" src="misc/no_icon.png" />
 		<area colour="#00005f"/>
         <scale_min>1</scale_min>
@@ -2155,4 +2408,12 @@
 	<rule>
 		<condition k="historic" v="wayside_cross" />
+		<icon annotate="true" src="misc/no_icon.png" />
+        <area colour="#663300" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+	
+	<rule>
+		<condition k="historic" v="wayside_shrine" />
 		<icon annotate="true" src="misc/no_icon.png" />
         <area colour="#663300" />
@@ -2874,4 +3135,108 @@
 	</rule>
 
+	<rule>
+		<condition k="sport" v="paintball" />
+		<area colour="#bde3cb"/>
+		<icon annotate="true" src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+	
+	<rule>
+		<condition k="sport" v="squash" />
+		<area colour="#bde3cb"/>
+		<icon annotate="true" src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+	
+	<rule>
+		<condition k="sport" v="shooting" />
+		<area colour="#bde3cb"/>
+		<icon annotate="true" src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+	
+	<rule>
+		<condition k="sport" v="volleyball" />
+		<area colour="#bde3cb"/>
+		<icon annotate="true" src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+	
+	<rule>
+		<condition k="sport" v="beachvolleyball" />
+		<area colour="#bde3cb"/>
+		<icon annotate="true" src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+	
+	<rule>
+		<condition k="sport" v="bowling" />
+		<area colour="#bde3cb"/>
+		<icon annotate="true" src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+	
+	<rule>
+		<condition k="sport" v="handball" />
+		<area colour="#bde3cb"/>
+		<icon annotate="true" src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+	
+	<rule>
+		<condition k="sport" v="rowing" />
+		<area colour="#bde3cb"/>
+		<icon annotate="true" src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+	
+	<rule>
+		<condition k="sport" v="sailing" />
+		<area colour="#bde3cb"/>
+		<icon annotate="true" src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+	
+	<rule>
+		<condition k="sport" v="diving" />
+		<area colour="#bde3cb"/>
+		<icon annotate="true" src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+	
+	<rule>
+		<condition k="sport" v="badminton" />
+		<area colour="#bde3cb"/>
+		<icon annotate="true" src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+	
+	<rule>
+		<condition k="sport" v="archery" />
+		<area colour="#bde3cb"/>
+		<icon annotate="true" src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+	
+	<rule>
+		<condition k="sport" v="fishing" />
+		<area colour="#bde3cb"/>
+		<icon annotate="true" src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+	
 <!--abutters tags -->
 
@@ -3046,251 +3411,4 @@
 
 <!--"work in progress" tags -->
-	<rule>
-		<condition k="shop" v="beverages" />
-		<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" />
-		<area colour="#00005f"/>
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<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"/>
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="shop" v="car_repair" />
-		<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="chemist" />
-		<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="clothes" />
-		<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="computer" />
-		<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="cycle_repair" />
-		<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="department_store" />
-		<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="electronics" />
-		<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="furniture" />
-		<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="florist" />
-		<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="food" />
-		<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="garden_centre" />
-		<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="hairdresser" />
-		<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="hardware" />
-		<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="hifi" />
-		<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="jewelry" />
-		<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="mall" />
-		<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="motorcycle" />
-		<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="newsagent" />
-		<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="organic" />
-		<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="optician" />
-		<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="shoes" />
-		<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="tailor" />
-		<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="travel_agency" />
-		<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="toys" />
-		<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="video" />
-		<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="shopping_center" />
-		<icon annotate="true" src="misc/proposed.png" />
-		<area colour="#00005f"/>
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="historic" v="church" />
-		<icon annotate="true" src="misc/proposed.png" />
-        <area colour="#663300" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
 
 	<!-- keep this generic rules at the end of the file, so more specialised rules fit first -->
@@ -3304,5 +3422,5 @@
 	<rule>
 		<condition k="building" v="true"/>
-		<icon annotate="true" src="misc/proposed.png" />
+		<icon annotate="true" src="misc/no_icon.png" />
 		<area colour="#cb9999"/>
 		<scale_min>1</scale_min>
@@ -3311,5 +3429,5 @@
 	<rule>
 		<condition k="building" v="church"/>
-		<icon annotate="true" src="misc/proposed.png" />
+		<icon annotate="true" src="misc/no_icon.png" />
 		<area colour="#cb9999"/>
 		<scale_min>1</scale_min>
@@ -3318,5 +3436,5 @@
 	<rule>
 		<condition k="building" v="museum"/>
-		<icon annotate="true" src="misc/proposed.png" />
+		<icon annotate="true" src="misc/no_icon.png" />
 		<area colour="#cb9999"/>
 		<scale_min>1</scale_min>
@@ -3325,5 +3443,5 @@
 	<rule>
 		<condition k="building" v="tower"/>
-		<icon annotate="true" src="misc/proposed.png" />
+		<icon annotate="true" src="misc/no_icon.png" />
 		<area colour="#cb9999"/>
 		<scale_min>1</scale_min>
@@ -3332,30 +3450,8 @@
 	<rule>
 		<condition k="building" v="station"/>
-		<icon annotate="true" src="misc/proposed.png" />
+		<icon annotate="true" src="misc/no_icon.png" />
 		<area colour="#cb9999"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="sport" v="paintball" />
-		<area colour="#bde3cb"/>
-		<icon annotate="true" src="misc/proposed.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-	<rule>
-		<condition k="sport" v="squash" />
-		<area colour="#bde3cb"/>
-		<icon annotate="true" src="misc/proposed.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-	<rule>
-		<condition k="railway" v="tram_station" />
-		<area colour="#f7efb7"/>
-		<icon annotate="true" src="transport/railway.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
 	</rule>
 
Index: /trunk/styles/standard/overview.xsl
===================================================================
--- /trunk/styles/standard/overview.xsl	(revision 716)
+++ /trunk/styles/standard/overview.xsl	(revision 717)
@@ -339,6 +339,6 @@
 	<xsl:call-template name="topic">
 		<xsl:with-param name="key" select="'barrier'"/>
-		<xsl:with-param name="column" select="2"/>
-		<xsl:with-param name="row" select="40"/>
+		<xsl:with-param name="column" select="3"/>
+		<xsl:with-param name="row" select="35"/>
     </xsl:call-template>
 	
@@ -463,5 +463,5 @@
 		<xsl:with-param name="key" select="'route'"/>
 		<xsl:with-param name="column" select="5"/>
-		<xsl:with-param name="row" select="30"/>
+		<xsl:with-param name="row" select="33"/>
     </xsl:call-template>
 	
@@ -484,5 +484,5 @@
 		<xsl:with-param name="key" select="'waterway'"/>
 		<xsl:with-param name="column" select="6"/>
-		<xsl:with-param name="row" select="24"/>
+		<xsl:with-param name="row" select="25"/>
     </xsl:call-template>