Index: trunk/styles/standard/elemstyles.xml
===================================================================
--- trunk/styles/standard/elemstyles.xml	(revision 780)
+++ trunk/styles/standard/elemstyles.xml	(revision 785)
@@ -56,5 +56,5 @@
        <condition k="bridge" v="swing"/>
 	   <!-- no line or area, as this is a highway=xy, railway=xy, .... -->
-       <icon annotate="true" src="nautical/viaduct.png" />
+       <icon annotate="true" src="vehicle/viaduct.png" />
        <scale_min>1</scale_min>
        <scale_max>40000</scale_max>
@@ -1984,5 +1984,5 @@
 	<rule>
 		<condition k="shop" v="chemist" />
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="shopping/chemist.png" />
 		<area colour="#00005f"/>
         <scale_min>1</scale_min>
@@ -2000,5 +2000,5 @@
 	<rule>
 		<condition k="shop" v="computer" />
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="shopping/computer.png" />
 		<area colour="#00005f"/>
         <scale_min>1</scale_min>
@@ -2024,5 +2024,5 @@
 	<rule>
 		<condition k="shop" v="electronics" />
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="shopping/electronics.png" />
 		<area colour="#00005f"/>
         <scale_min>1</scale_min>
@@ -2056,5 +2056,5 @@
 	<rule>
 		<condition k="shop" v="garden_centre" />
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="shopping/garden_centre.png" />
 		<area colour="#00005f"/>
         <scale_min>1</scale_min>
@@ -2072,5 +2072,5 @@
 	<rule>
 		<condition k="shop" v="hardware" />
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="shopping/diy_store.png" />
 		<area colour="#00005f"/>
         <scale_min>1</scale_min>
@@ -2080,5 +2080,5 @@
 	<rule>
 		<condition k="shop" v="hifi" />
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="shopping/hifi.png" />
 		<area colour="#00005f"/>
         <scale_min>1</scale_min>
@@ -2088,5 +2088,5 @@
 	<rule>
 		<condition k="shop" v="jewelry" />
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="shopping/jewelry.png" />
 		<area colour="#00005f"/>
         <scale_min>1</scale_min>
@@ -2096,5 +2096,5 @@
 	<rule>
 		<condition k="shop" v="mall" />
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="shopping/mall.png" />
 		<area colour="#00005f"/>
         <scale_min>1</scale_min>
@@ -2152,5 +2152,5 @@
 	<rule>
 		<condition k="shop" v="travel_agency" />
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="places/island.png" />
 		<area colour="#00005f"/>
         <scale_min>1</scale_min>
@@ -2160,5 +2160,5 @@
 	<rule>
 		<condition k="shop" v="toys" />
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="shopping/toys.png" />
 		<area colour="#00005f"/>
         <scale_min>1</scale_min>
@@ -2168,5 +2168,5 @@
 	<rule>
 		<condition k="shop" v="video" />
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="shopping/video.png" />
 		<area colour="#00005f"/>
         <scale_min>1</scale_min>
@@ -2177,5 +2177,5 @@
 	<rule>
 		<condition k="shop" v="shopping_center" />
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="shopping/mall.png" />
 		<area colour="#00005f"/>
         <scale_min>1</scale_min>
@@ -2861,5 +2861,5 @@
 		<condition k="sport" v="baseball" />
 		<area colour="#bde3cb"/>
-		<icon src="misc/no_icon.png" />
+		<icon src="sports/baseball.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2901,5 +2901,5 @@
 		<condition k="sport" v="cricket" />
 		<area colour="#bde3cb"/>
-		<icon src="misc/no_icon.png" />
+		<icon src="sports/cricket.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -3109,4 +3109,12 @@
 		<condition k="sport" v="volleyball" />
 		<area colour="#bde3cb"/>
+		<icon annotate="true" src="sports/volleyball.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>
@@ -3115,5 +3123,5 @@
 	
 	<rule>
-		<condition k="sport" v="beachvolleyball" />
+		<condition k="sport" v="bowling" />
 		<area colour="#bde3cb"/>
 		<icon annotate="true" src="misc/no_icon.png" />
@@ -3123,5 +3131,5 @@
 	
 	<rule>
-		<condition k="sport" v="bowling" />
+		<condition k="sport" v="handball" />
 		<area colour="#bde3cb"/>
 		<icon annotate="true" src="misc/no_icon.png" />
@@ -3131,5 +3139,5 @@
 	
 	<rule>
-		<condition k="sport" v="handball" />
+		<condition k="sport" v="rowing" />
 		<area colour="#bde3cb"/>
 		<icon annotate="true" src="misc/no_icon.png" />
@@ -3139,5 +3147,5 @@
 	
 	<rule>
-		<condition k="sport" v="rowing" />
+		<condition k="sport" v="sailing" />
 		<area colour="#bde3cb"/>
 		<icon annotate="true" src="misc/no_icon.png" />
@@ -3147,5 +3155,13 @@
 	
 	<rule>
-		<condition k="sport" v="sailing" />
+		<condition k="sport" v="diving" />
+		<area colour="#bde3cb"/>
+		<icon annotate="true" src="sports/diving.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" />
@@ -3155,5 +3171,5 @@
 	
 	<rule>
-		<condition k="sport" v="diving" />
+		<condition k="sport" v="archery" />
 		<area colour="#bde3cb"/>
 		<icon annotate="true" src="misc/no_icon.png" />
@@ -3163,23 +3179,7 @@
 	
 	<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" />
+		<icon annotate="true" src="sports/fishing.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>