Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 10573)
+++ trunk/data/defaultpresets.xml	(revision 10574)
@@ -3850,5 +3850,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Ice cream -->
-        <item name="Pub" icon="presets/pub.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Pub" icon="presets/food/pub.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=pub"
@@ -3870,5 +3870,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Pub -->
-        <item name="Beer Garden" icon="presets/biergarten.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Beer Garden" icon="presets/food/biergarten.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=biergarten"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=biergarten"
@@ -5833,5 +5833,5 @@
             <reference ref="name_leisure_pitch" />
         </item> <!-- Soccer -->
-        <item name="Australian Football" icon="presets/football.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Australian Football" icon="presets/sport/football.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=australian_football" />
             <space />
@@ -5839,5 +5839,5 @@
             <reference ref="name_leisure_pitch" />
         </item> <!-- Australian Football -->
-        <item name="American Football" icon="presets/football.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="American Football" icon="presets/sport/football.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=american_football" />
             <space />
@@ -5845,5 +5845,5 @@
             <reference ref="name_leisure_pitch" />
         </item> <!-- American Football -->
-        <item name="Canadian Football" icon="presets/football.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Canadian Football" icon="presets/sport/football.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=canadian_football" />
             <space />
@@ -5863,5 +5863,5 @@
             </optional>
         </item> <!-- Gaelic Games -->
-        <item name="Rugby League" icon="presets/football.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Rugby League" icon="presets/sport/football.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=rugby_league"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:sport=rugby_league" />
@@ -5870,5 +5870,5 @@
             <reference ref="name_leisure_pitch" />
         </item> <!-- Rugby League -->
-        <item name="Rugby Union" icon="presets/football.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Rugby Union" icon="presets/sport/football.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=rugby_union"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:sport=rugby_union" />
@@ -8015,5 +8015,5 @@
         </item> <!-- Garden Centre -->
         <separator/>
-        <item name="Do-It-Yourself Store" icon="presets/diy_store.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Do-It-Yourself Store" icon="presets/shop/diy_store.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=doityourself"