Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 3489)
+++ trunk/data/defaultpresets.xml	(revision 3493)
@@ -639,5 +639,5 @@
             <text key="ref" text="Number" default="" delete_if_empty="true" />
         </item>
-        <item name="Services" icon="presets/car_service.png" type="node,closedway,relation">
+        <item name="Services" icon="styles/standard/vehicle/services.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
             <label text="Edit Service Station" />
@@ -684,5 +684,5 @@
             <combo key="direction" text="Direction" values="clockwise" default="" delete_if_empty="true" />
         </item>
-        <item name="Pedestrian Crossing" icon="presets/zebracrossing.png" type="node">
+        <item name="Pedestrian Crossing" icon="styles/standard/vehicle/zebra_crossing.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
@@ -1142,5 +1142,5 @@
         </item>
         <separator/>
-        <item name="Slipway" icon="presets/slipway.png" type="node">
+        <item name="Slipway" icon="styles/standard/nautical/slipway.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
@@ -1157,5 +1157,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Dock" icon="presets/empty.png" type="node,closedway">
+        <item name="Dock" icon="presets/boatyard.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
             <label text="Edit Dock" />
@@ -1415,5 +1415,5 @@
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
-        <item name="Tyres" icon="presets/empty.png" type="node,closedway">
+        <item name="Tyres" icon="styles/standard/vehicle/tyres.png" type="node,closedway">
             <label text="Edit Tyres" />
             <key key="shop" value="tyres" />
@@ -1449,5 +1449,5 @@
     </group> <!-- Car -->
     <group name="Motorcycle" icon="presets/motorbike.png">
-        <item name="Parking" icon="presets/bike_parking.png" type="node,closedway">
+        <item name="Parking" icon="styles/standard/vehicle/parking/motorbike.png" type="node,closedway">
             <label text="Edit Motorcycle Parking" />
             <key key="amenity" value="motorcycle_parking" />
@@ -1479,5 +1479,5 @@
     </group> <!-- Motorcycle -->
     <group name="Bicycle" icon="presets/bike.png">
-        <item name="Parking" icon="presets/bike_parking.png" type="node,closedway">
+        <item name="Parking" icon="styles/standard/vehicle/parking/bicycle.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
             <label text="Edit Bicycle Parking" />
@@ -2158,5 +2158,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Playground" icon="presets/playground.png" type="node,closedway">
+        <item name="Playground" icon="styles/standard/leisure/playground.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
             <label text="Edit Playground" />
@@ -2447,5 +2447,5 @@
     </group>
     <group name="Motorsport" icon="presets/motorbike.png">
-        <item name="Motorsport" icon="presets/empty.png" type="node,closedway">
+        <item name="Motorsport" icon="styles/standard/sport/motor.png" type="node,closedway">
             <label text="Edit Motorsport" />
             <key key="sport" value="motor" />
@@ -2459,5 +2459,5 @@
             <combo key="leisure" text="type" values="pitch,sports_centre,track" default="" delete_if_empty="true" />
         </item>
-        <item name="Motocross" icon="presets/empty.png" type="node,closedway">
+        <item name="Motocross" icon="styles/standard/sport/motocross.png" type="node,closedway">
             <label text="Edit Motocross" />
             <key key="sport" value="motocross" />
@@ -2523,5 +2523,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Police" icon="presets/police.png" type="node,closedway,relation">
+        <item name="Police" icon="styles/standard/service/police.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=police"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
@@ -2538,5 +2538,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Post Office" icon="presets/letter.png" type="node,closedway,relation">
+        <item name="Post Office" icon="styles/standard/service/post_office.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
             <label text="Edit Post Office" />
@@ -2750,5 +2750,5 @@
             <text key="note" text="Note" default="" delete_if_empty="true" />
         </item>
-        <item name="Post Box" icon="presets/letter.png" type="node">
+        <item name="Post Box" icon="styles/standard/service/post_box.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_box" />
             <key key="amenity" value="post_box" />
@@ -2822,6 +2822,6 @@
         </item>
     </group> <!-- Amenities -->
-    <group name="Food" icon="presets/shopping.png">
-        <item name="Supermarket" icon="presets/shopping.png" type="node,closedway">
+    <group name="Food" icon="styles/standard/shop/supermarket.png">
+        <item name="Supermarket" icon="styles/standard/shop/supermarket.png" type="node,closedway">
             <label text="Edit Supermarket" />
             <key key="shop" value="supermarket" />
@@ -2829,5 +2829,5 @@
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
-        <item name="Convenience Store" icon="presets/empty.png" type="node,closedway">
+        <item name="Convenience Store" icon="styles/standard/shop/supermarket.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
             <label text="Edit Convenience Store" />
@@ -2857,5 +2857,5 @@
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
-        <item name="Organic" icon="presets/empty.png" type="node,closedway">
+        <item name="Organic" icon="presets/fruits.png" type="node,closedway">
             <label text="Edit Organic Shop" />
             <key key="shop" value="organic" />
@@ -3044,5 +3044,5 @@
     </group> <!-- Shops -->
     <group name="Cash" icon="presets/dollar.png">
-        <item name="Bank" icon="presets/bank.png" type="node,closedway">
+        <item name="Bank" icon="styles/standard/money/bank.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
             <label text="Edit Bank" />
@@ -3053,5 +3053,5 @@
             <check key="atm" text="Automated Teller Machine" default="on" delete_if_empty="true" />
         </item>
-        <item name="Money Exchange" icon="presets/coins.png" type="node,closedway">
+        <item name="Money Exchange" icon="styles/standard/money/exchange.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
             <label text="Edit Money Exchange" />
@@ -3060,5 +3060,5 @@
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
-        <item name="Automated Teller Machine" icon="presets/cash.png" type="node">
+        <item name="Automated Teller Machine" icon="styles/standard/money/atm.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
             <label text="Edit Automated Teller Machine" />
@@ -3089,5 +3089,5 @@
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
-        <item name="Hospital" icon="presets/hospital.png" type="node,closedway">
+        <item name="Hospital" icon="styles/standard/health/hospital.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
             <label text="Edit Hospital" />
@@ -3102,5 +3102,5 @@
             <text key="opening_hours" text="Opening Hours" default="" delete_if_empty="true" />
         </item>
-        <item name="Emergency Access Point" icon="presets/emergency_access_point.png" type="node,closedway">
+        <item name="Emergency Access Point" icon="styles/standard/service/emergency_access_point.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
@@ -3253,5 +3253,5 @@
             <text key="ele" text="Elevation" default="" delete_if_empty="true" />
         </item>
-        <item name="Cave Entrance" icon="presets/empty.png" type="node,closedway">
+        <item name="Cave Entrance" icon="presets/tunnel.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
             <label text="Edit Cave Entrance" />