Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 7723)
+++ /trunk/data/defaultpresets.xml	(revision 7724)
@@ -4417,7 +4417,7 @@
     </group> <!-- Facilities -->
   </group>  <!-- Facilities -->
-  <group name="Sports" icon="presets/soccer.png">
+  <group name="Sports" icon="styles/standard/sport/soccer.png">
     <group name="Sport Facilities" icon="presets/stadium.png">
-        <item name="Stadium" icon="presets/stadium.png" type="node,closedway" preset_name_label="true">
+        <item name="Stadium" icon="styles/standard/sport/stadium.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=stadium"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=stadium"
@@ -4432,5 +4432,5 @@
             <reference ref="optional_sport" />
         </item> <!-- Stadium -->
-        <item name="Sports Centre" icon="presets/sports_centre.png" type="node,closedway" preset_name_label="true">
+        <item name="Sports Centre" icon="styles/standard/sport/centre.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=sports_centre"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=sports_centre"
@@ -4444,5 +4444,5 @@
             <reference ref="optional_sport" />
         </item> <!-- Sports Centre -->
-        <item name="Pitch" icon="presets/pitch.png" type="node,closedway" preset_name_label="true">
+        <item name="Pitch" icon="styles/standard/sport/pitch.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=pitch"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=pitch"
@@ -4459,5 +4459,5 @@
             <reference ref="optional_sport" />
         </item> <!-- Pitch -->
-        <item name="Racetrack" icon="presets/stadium.png" type="node,way,closedway,relation" preset_name_label="true">
+        <item name="Racetrack" icon="styles/standard/sport/track.png" type="node,way,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=track"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=track"
@@ -4483,5 +4483,5 @@
             <reference ref="name_oh" />
         </item> <!-- Golf Course -->
-        <item name="Miniature Golf" icon="presets/golf.png" type="node,closedway" preset_name_label="true">
+        <item name="Miniature Golf" icon="styles/standard/sport/miniature_golf.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=miniature_golf"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=miniature_golf"
@@ -4540,5 +4540,5 @@
             <combo key="leisure" text="Type" values="sports_centre" />
         </item> <!-- Climbing -->
-        <item name="Canoeing/Kayaking" icon="presets/canoe.png" type="node,way,closedway" preset_name_label="true">
+        <item name="Canoeing/Kayaking" icon="styles/standard/sport/canoe.svg" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=canoe" />
             <space />
@@ -4546,5 +4546,5 @@
             <text key="name" text="Name" />
         </item> <!-- Canoeing/Kayaking -->
-        <item name="Cycling" icon="presets/cycling.png" type="node,closedway" preset_name_label="true">
+        <item name="Cycling" icon="styles/standard/sport/cycling.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cycling" />
             <space />
@@ -4567,5 +4567,5 @@
             <reference ref="riding_surface" />
         </item> <!-- Equestrian -->
-        <item name="Horse Racing" icon="presets/equestrian.png" type="node,closedway" preset_name_label="true">
+        <item name="Horse Racing" icon="styles/standard/sport/riding.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=horse_racing" />
             <space />
@@ -4597,5 +4597,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" default="pitch" values_context="racing" />
         </item> <!-- Skateboard -->
-        <item name="Swimming" icon="presets/swimming.png" type="node,closedway" preset_name_label="true">
+        <item name="Swimming" icon="styles/standard/sport/pool.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=swimming"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=swimming" />
@@ -4613,5 +4613,5 @@
             <text key="name" text="Name" />
         </item> <!-- Scuba Diving -->
-        <item name="Skiing" icon="presets/skiing_downhill.png" type="node,way,closedway" preset_name_label="true">
+        <item name="Skiing" icon="styles/standard/sport/skiing.png" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Piste_Maps"
@@ -4637,6 +4637,6 @@
         </item> <!-- Shooting -->
     </group> <!-- Sport -->
-    <group name="Sport (Ball)" icon="presets/soccer.png">
-        <item name="Soccer" icon="presets/soccer.png" type="node,closedway" preset_name_label="true">
+    <group name="Sport (Ball)" icon="styles/standard/sport/soccer.png">
+        <item name="Soccer" icon="styles/standard/sport/soccer.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=soccer"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=soccer"
@@ -4647,5 +4647,5 @@
             <reference ref="name_leisure_pitch" />
         </item> <!-- Soccer -->
-        <item name="Australian Football" icon="presets/soccer.png" type="node,closedway" preset_name_label="true">
+        <item name="Australian Football" icon="presets/football.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=australian_football" />
             <space />
@@ -4665,5 +4665,5 @@
             <reference ref="name_leisure_pitch" />
         </item> <!-- Canadian Football -->
-        <item name="Gaelic Games" icon="presets/soccer.png" type="node,closedway" preset_name_label="true">
+        <item name="Gaelic Games" icon="styles/standard/sport/soccer.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=gaelic_games" />
             <space />
@@ -4691,5 +4691,5 @@
             <reference ref="name_leisure_pitch" />
         </item> <!-- Rugby Union -->
-        <item name="Baseball" icon="presets/baseball.png" type="node,closedway" preset_name_label="true">
+        <item name="Baseball" icon="styles/standard/sport/baseball.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=baseball" />
             <space />
@@ -4739,5 +4739,5 @@
             <reference ref="name_leisure_pitch" />
         </item> <!-- Lawn Bowling -->
-        <item name="Cricket" icon="presets/cricket.png" type="node,closedway" preset_name_label="true">
+        <item name="Cricket" icon="styles/standard/sport/cricket.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cricket" />
             <space />
@@ -4745,5 +4745,5 @@
             <reference ref="name_leisure_pitch" />
         </item> <!-- Cricket -->
-        <item name="Cricket Nets" icon="presets/cricket.png" type="node,closedway" preset_name_label="true">
+        <item name="Cricket Nets" icon="styles/standard/sport/cricket.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cricket_nets" />
             <space />
@@ -4772,5 +4772,5 @@
             <reference ref="name_leisure_pitch" />
         </item> <!-- Pelota -->
-        <item name="Racquetball" icon="presets/racquetball.png" type="node,closedway" preset_name_label="true">
+        <item name="Racquetball" icon="styles/standard/sport/racquetball.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=racquet"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=racquet" />
@@ -4787,5 +4787,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
         </item> <!-- Table Tennis/Ping-Pong -->
-        <item name="Tennis" icon="presets/tennis.png" type="node,closedway" preset_name_label="true">
+        <item name="Tennis" icon="styles/standard/sport/tennis.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=tennis" />
             <space />
@@ -4851,5 +4851,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="aerialway" />
         </item> <!-- Model Aerodrome -->
-        <item name="RC Car" icon="presets/car.png" type="node,closedway" preset_name_label="true">
+        <item name="RC Car" icon="styles/standard/transport/car.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=rc_car"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:sport"
Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 7723)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 7724)
@@ -1449,5 +1449,5 @@
 }
 node[leisure=miniature_golf] {
-    icon-image: "sport/golf.png";
+    icon-image: "sport/miniature_golf.svg";
     set icon_z17;
     text: auto;
@@ -1619,5 +1619,5 @@
 node[shop=car],
 node[shop=car_dealer] {
-    icon-image: "transport/car.png";
+    icon-image: "vehicle.png";
     set icon_z17;
     text: auto;
@@ -3328,5 +3328,5 @@
 area[sport=american_football],
 area[sport=canadian_football],
-area[sport=gaelic_football],
+area[sport=gaelic_games],
 area[sport=rugby_league],
 area[sport=rugby_union] {
@@ -3349,12 +3349,12 @@
 }
 node[sport=soccer],
+node[sport=gaelic_games] {
+    icon-image: "sport/soccer.png";
+    set icon_z17;
+    text: auto;
+}
 node[sport=australian_football],
 node[sport=american_football],
 node[sport=canadian_football],
-node[sport=gaelic_football] {
-    icon-image: "sport/soccer.png";
-    set icon_z17;
-    text: auto;
-}
 node[sport=rugby_league],
 node[sport=rugby_union] {
@@ -3396,5 +3396,5 @@
 }
 node[sport=canoe] {
-    icon-image: "sport/canoe.png";
+    icon-image: "sport/canoe.svg";
     set icon_z17;
     text: auto;
@@ -3416,5 +3416,5 @@
 }
 node[sport=cricket_nets] {
-    icon-image: "misc/no_icon.png";
+    icon-image: "sport/cricket.png";
     set icon_z17;
     text: auto;
@@ -3448,5 +3448,6 @@
 }
 node[sport=equestrian] {
-    icon-image: "sport/riding.png";
+    icon-image: "presets/equestrian.png";
+    icon-width: 16;
     set icon_z17;
     text: auto;
@@ -3458,5 +3459,6 @@
 }
 node[sport=gymnastics] {
-    icon-image: "sport/multi.png";
+    icon-image: "presets/gymnastics.png";
+    icon-width: 16;
     set icon_z17;
     text: auto;
@@ -3571,5 +3573,6 @@
 }
 node[sport=shooting] {
-    icon-image: "misc/no_icon.png";
+    icon-image: "presets/range.png";
+    icon-width: 16;
     set icon_z17;
     text: auto;