Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 10706)
+++ trunk/data/defaultpresets.xml	(revision 10707)
@@ -5350,5 +5350,5 @@
             <combo key="seats" text="Amount of Seats" values="2,3,4,5,6,7,8,9,10" />
         </item> <!-- Bench -->
-        <item name="Shelter" icon="presets/accommodation/shelter.png" type="node,closedway" preset_name_label="true">
+        <item name="Shelter" icon="presets/accommodation/shelter.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=shelter"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=shelter"
@@ -5368,6 +5368,6 @@
                 <list_entry value="picnic_shelter" icon="presets/accommodation/shelter_picnic_brown.png" />
                 <list_entry value="public_transport" icon="presets/accommodation/shelter_public_transport_brown.png" />
-                <list_entry value="weather_shelter" icon="presets/accommodation/shelter.png" />
-                <list_entry value="wildlife_hide" icon="presets/accommodation/shelter.png" />
+                <list_entry value="weather_shelter" icon="presets/accommodation/shelter.svg" />
+                <list_entry value="wildlife_hide" icon="presets/accommodation/shelter.svg" />
             </combo>
         </item> <!-- Shelter -->
@@ -6003,5 +6003,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="racing" />
         </item> <!-- Motorsport -->
-        <item name="Kart Racing" icon="presets/sports/karting.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Kart Racing" icon="presets/sport/karting.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=karting"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=karting" />
@@ -6375,5 +6375,5 @@
             <text key="name" text="Name" />
         </item> <!-- Wastewater Treatment Plant -->
-        <item name="Watermill" icon="presets/landmark/watermill.png" type="node,closedway" preset_name_label="true">
+        <item name="Watermill" icon="presets/landmark/watermill.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=watermill"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=watermill"
@@ -7356,5 +7356,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Greengrocer -->
-        <item name="Farm Stand" icon="presets/shop/apple.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Farm Stand" icon="presets/shop/groceries/apple.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=farm"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=farm"
@@ -9016,5 +9016,5 @@
             <text key="name" text="Name" />
             <combo key="reef" text="Type" values="coral,oyster,rock,sand" />
-        </item> <!-- Islet -->
+        </item> <!-- Reef -->
     </group> <!-- Geography -->
     <group name="Nature" icon="presets/landmark/trees.svg">