Index: trunk/styles/standard/elemstyles.xml
===================================================================
--- trunk/styles/standard/elemstyles.xml	(revision 543)
+++ trunk/styles/standard/elemstyles.xml	(revision 544)
@@ -2215,5 +2215,13 @@
 	<rule>
 		<condition k="historic" v="museum" />
-		<icon annotate="true" src="vehicle/caution.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<!-- was never approved anyway, shop=laundry was approved instead -->
+	<rule>
+		<condition k="shop" v="laundromat" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2230,5 +2238,5 @@
 	<rule>
 		<condition k="leisure" v="zoo" />
-		<icon annotate="true" src="vehicle/caution.png" />
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2238,5 +2246,5 @@
 	<rule>
 		<condition k="amenity" v="sheltered_housing" />
-		<icon annotate="true" src="vehicle/caution.png" />
+		<icon annotate="true" src="misc/proposed.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2245,5 +2253,5 @@
 	<rule>
 		<condition k="amenity" v="nursery" />
-		<icon annotate="true" src="vehicle/caution.png" />
+		<icon annotate="true" src="misc/proposed.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2252,5 +2260,5 @@
 	<rule>
 		<condition k="amenity" v="shelter" />
-		<icon annotate="true" src="vehicle/caution.png" />
+		<icon annotate="true" src="misc/proposed.png" />
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -2258,13 +2266,6 @@
 	
 	<rule>
-		<condition k="shop" v="laundromat" />
-		<icon annotate="true" src="vehicle/caution.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
 		<condition k="shop" v="beverages" />
-		<icon annotate="true" src="vehicle/caution.png" />
+		<icon annotate="true" src="misc/proposed.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2273,5 +2274,5 @@
 	<rule>
 		<condition k="shop" v="bakery" />
-		<icon annotate="true" src="vehicle/caution.png" />
+		<icon annotate="true" src="misc/proposed.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2280,5 +2281,5 @@
 	<rule>
 		<condition k="shop" v="chemist" />
-		<icon annotate="true" src="vehicle/caution.png" />
+		<icon annotate="true" src="misc/proposed.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2287,5 +2288,5 @@
 	<rule>
 		<condition k="shop" v="motorcycle" />
-		<icon annotate="true" src="vehicle/caution.png" />
+		<icon annotate="true" src="misc/proposed.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2294,5 +2295,5 @@
 	<rule>
 		<condition k="shop" v="car_repair" />
-		<icon annotate="true" src="vehicle/caution.png" />
+		<icon annotate="true" src="misc/proposed.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2301,5 +2302,5 @@
 	<rule>
 		<condition k="shop" v="mall" />
-		<icon annotate="true" src="vehicle/caution.png" />
+		<icon annotate="true" src="misc/proposed.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2308,5 +2309,5 @@
 	<rule>
 		<condition k="historic" v="church" />
-		<icon annotate="true" src="vehicle/caution.png" />
+		<icon annotate="true" src="misc/proposed.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2315,5 +2316,5 @@
 	<rule>
 		<condition k="barrier" v="bollard" />
-		<icon annotate="true" src="vehicle/caution.png" />
+		<icon annotate="true" src="misc/proposed.png" />
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -2321,5 +2322,5 @@
 	<rule>
 		<condition k="building" v="yes"/>
-		<icon annotate="true" src="vehicle/caution.png" />
+		<icon annotate="true" src="misc/proposed.png" />
 		<area colour="#bde3cb"/>
 		<scale_min>1</scale_min>