Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 3617)
+++ /trunk/data/defaultpresets.xml	(revision 3618)
@@ -2264,5 +2264,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Embassy" icon="presets/empty.png" type="node,closedway,relation">
+        <item name="Embassy" icon="presets/embassy.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
             <label text="Edit Embassy" />
@@ -2578,5 +2578,5 @@
             <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
         </item>
-        <item name="Athletics" icon="presets/empty.png" type="node,closedway">
+        <item name="Athletics" icon="presets/athletics.png" type="node,closedway">
             <label text="Edit Athletics" />
             <key key="sport" value="athletics" />
@@ -2632,5 +2632,5 @@
             <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
         </item>
-        <item name="Skating" icon="presets/empty.png" type="node,closedway">
+        <item name="Skating" icon="presets/skating.png" type="node,closedway">
             <label text="Edit Skating" />
             <key key="sport" value="skating" />
@@ -2764,5 +2764,5 @@
             <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
         </item>
-        <item name="Pelota" icon="presets/empty.png" type="node,closedway">
+        <item name="Pelota" icon="presets/pelota.png" type="node,closedway">
             <label text="Edit Pelota" />
             <key key="sport" value="pelota" />
@@ -2796,5 +2796,5 @@
             <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
         </item>
-        <item name="Karting" icon="presets/empty.png" type="node,closedway">
+        <item name="Karting" icon="presets/karting.png" type="node,closedway">
             <label text="Edit Karting" />
             <key key="sport" value="karting" />
@@ -2808,5 +2808,5 @@
             <combo key="leisure" text="type" values="pitch,sports_centre,track" default="" delete_if_empty="true" />
         </item>
-        <item name="Safety Training" icon="presets/empty.png" type="node,closedway">
+        <item name="Safety Training" icon="presets/safety_training.png" type="node,closedway">
             <label text="Edit Safety Training" />
             <key key="sport" value="safety_training" />
@@ -2831,5 +2831,5 @@
   <group name="Man Made" icon="presets/works.png">
     <group name="Man Made" icon="presets/works.png">
-        <item name="Building" icon="presets/empty.png" type="closedway,relation">
+        <item name="Building" icon="styles/standard/misc/landmark/building.png" type="node,closedway,relation">
             <key key="building" value="yes" />
         </item>
Index: /trunk/styles/standard/elemstyles.xml
===================================================================
--- /trunk/styles/standard/elemstyles.xml	(revision 3617)
+++ /trunk/styles/standard/elemstyles.xml	(revision 3618)
@@ -2279,5 +2279,5 @@
 	<rule>
 		<condition k="amenity" v="embassy"/>
-		<icon annotate="true" src="service.png"/>
+		<icon annotate="true" src="service/administration/embassy.png"/>
 		<area colour="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
@@ -4031,4 +4031,132 @@
 		<condition k="sport" v="athletics"/>
 		<area colour="sport#bde3cb"/>
+		<icon src="sport/athletics.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="soccer"/>
+		<area colour="sport#bde3cb"/>
+		<icon src="sport/soccer.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="australian_football"/>
+		<area colour="sport#bde3cb"/>
+		<icon src="sport/soccer.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="american_football"/>
+		<area colour="sport#bde3cb"/>
+		<icon src="sport/soccer.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="canadian_football"/>
+		<area colour="sport#bde3cb"/>
+		<icon src="sport/soccer.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="gaelic_football"/>
+		<area colour="sport#bde3cb"/>
+		<icon src="sport/soccer.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="rugby_league"/>
+		<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="rugby_union"/>
+		<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="baseball"/>
+		<area colour="sport#bde3cb"/>
+		<icon src="sport/baseball.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="basketball"/>
+		<area colour="sport#bde3cb"/>
+		<icon src="sport/basketball.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="boules"/>
+		<area colour="sport#bde3cb"/>
+		<icon src="sport/boule.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="bowls"/>
+		<area colour="sport#bde3cb"/>
+		<icon src="sport/boule.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<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>
@@ -4037,132 +4165,4 @@
 
 	<rule>
-		<condition k="sport" v="soccer"/>
-		<area colour="sport#bde3cb"/>
-		<icon src="sport/soccer.png"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="sport" v="australian_football"/>
-		<area colour="sport#bde3cb"/>
-		<icon src="sport/soccer.png"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="sport" v="american_football"/>
-		<area colour="sport#bde3cb"/>
-		<icon src="sport/soccer.png"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="sport" v="canadian_football"/>
-		<area colour="sport#bde3cb"/>
-		<icon src="sport/soccer.png"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="sport" v="gaelic_football"/>
-		<area colour="sport#bde3cb"/>
-		<icon src="sport/soccer.png"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="sport" v="rugby_league"/>
-		<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="rugby_union"/>
-		<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="baseball"/>
-		<area colour="sport#bde3cb"/>
-		<icon src="sport/baseball.png"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="sport" v="basketball"/>
-		<area colour="sport#bde3cb"/>
-		<icon src="sport/basketball.png"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="sport" v="boules"/>
-		<area colour="sport#bde3cb"/>
-		<icon src="sport/boule.png"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="sport" v="bowls"/>
-		<area colour="sport#bde3cb"/>
-		<icon src="sport/boule.png"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<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>
-		<scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
 		<condition k="sport" v="croquet"/>
 		<area colour="sport#bde3cb"/>
@@ -4231,5 +4231,5 @@
 		<condition k="sport" v="karting"/>
 		<area colour="sport#bde3cb"/>
-		<icon src="misc/no_icon.png"/>
+		<icon src="sport/karting.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -4263,5 +4263,5 @@
 		<condition k="sport" v="pelota"/>
 		<area colour="sport#bde3cb"/>
-		<icon src="misc/no_icon.png"/>
+		<icon src="sport/pelota.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -4279,5 +4279,5 @@
 		<condition k="sport" v="skating"/>
 		<area colour="sport#bde3cb"/>
-		<icon src="misc/no_icon.png"/>
+		<icon src="sport/skating.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -4429,15 +4429,7 @@
 
 	<rule>
-		<condition k="sport" v="karting"/>
-		<area colour="sport#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="safety_training"/>
 		<area colour="sport#bde3cb"/>
-		<icon annotate="true" src="misc/no_icon.png"/>
+		<icon annotate="true" src="sport/safety_training.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>