Index: data/defaultpresets.xml
===================================================================
--- data/defaultpresets.xml	(révision 3398)
+++ data/defaultpresets.xml	(copie de travail)
@@ -716,7 +716,7 @@
         <item name="Incline Steep" icon="presets/incline_steep.png" type="node,way">
             <key key="highway" value="incline_steep" />
         </item>
-        <item name="Grit Bin" type="node">
+        <item name="Grit Bin" icon="styles/standard/misc/grit_bin.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dgrit_bin" />
             <key key="amenity" value="grit_bin" />
         </item>
@@ -755,7 +755,7 @@
             <check key="horse" text="Horse" default="off" delete_if_empty="true" />
             <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
         </item> <!-- bollard -->
-        <item name="Cycle Barrier" icon="presets/empty.png" type="node">
+        <item name="Cycle Barrier" icon="styles/standard/vehicle/cycle_barrier.png" type="node">
             <link href="http://de.wikipedia.org/wiki/Umlaufgitter" />
             <key key="barrier" value="cycle_barrier" />
         </item> <!-- cycle_barrier -->
@@ -836,7 +836,7 @@
         <separator/>
 
         <!-- *** access *** -->
-        <item name="Entrance" icon="presets/empty.png" type="node">
+        <item name="Entrance" icon="styles/standard/vehicle/entrance.png" type="node">
             <label text="Edit Entrance" />
             <space />
             <key key="barrier" value="entrance" />
@@ -885,7 +885,7 @@
             <check key="motorcycle" text="Motorcycle" default="off" delete_if_empty="true" />
             <check key="motorcar" text="Motorcar" default="off" delete_if_empty="true" />
         </item> <!-- hampshire_gate -->
-        <item name="Bump Gate" icon="presets/empty.png" type="node">
+        <item name="Bump Gate" icon="styles/standard/vehicle/bump.png" type="node">
             <label text="Edit Bump Gate" />
             <space />
             <key key="barrier" value="bump_gate" />
@@ -925,7 +925,7 @@
             <check key="foot" text="Foot" default="on" delete_if_empty="true" />
             <check key="bicycle" text="Bicycle" default="off" delete_if_empty="true" />
         </item> <!-- turnstile -->
-        <item name="Sally Port" icon="presets/empty.png" type="node">
+        <item name="Sally Port" icon="styles/standard/vehicle/sally_port.png" type="node">
             <label text="Edit Sally Port" />
             <space />
             <key key="barrier" value="sally_port" />
@@ -1045,7 +1045,7 @@
             <key key="natural" value="mud" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Beach" icon="presets/empty.png" type="node,closedway,relation">
+        <item name="Beach" icon="styles/standard/rendering/beach.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
             <label text="Edit Beach" />
             <key key="natural" value="beach" />
@@ -1606,7 +1606,7 @@
             <key key="tourism" value="guest_house" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Chalet" icon="presets/empty.png" type="node,closedway">
+        <item name="Chalet" icon="styles/standard/accommodation/chalet.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
             <label text="Edit Chalet" />
             <key key="tourism" value="chalet" />
@@ -1957,13 +1957,13 @@
         </item>
     </group>
     <group name="Sport" icon="presets/rowing.png">
-        <item name="Multi" icon="presets/empty.png" type="node,closedway">
+        <item name="Multi" icon="styles/standard/sport/multi.png" type="node,closedway">
             <label text="Edit Multi" />
             <key key="sport" value="multi" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
             <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
         </item>
-        <item name="10pin" icon="presets/empty.png" type="node,closedway">
+        <item name="10pin" icon="styles/standard/sport/10pin.png" type="node,closedway">
             <label text="Edit 10pin" />
             <key key="sport" value="10pin" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
@@ -1975,13 +1975,13 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
             <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
         </item>
-        <item name="Archery" icon="presets/empty.png" type="node,closedway">
+        <item name="Archery" icon="styles/standard/sport/archery.png" type="node,closedway">
             <label text="Edit Archery" />
             <key key="sport" value="archery" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
             <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
         </item>
-        <item name="Climbing" icon="presets/empty.png" type="node,closedway">
+        <item name="Climbing" icon="styles/standard/sport/climbing.png" type="node,closedway">
             <label text="Edit Climbing" />
             <key key="sport" value="climbing" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
@@ -2035,7 +2035,7 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
             <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
         </item>
-        <item name="Skateboard" icon="presets/empty.png" type="node,closedway">
+        <item name="Skateboard" icon="styles/standard/sport/skateboard.png" type="node,closedway">
             <label text="Edit Skateboard" />
             <key key="sport" value="skateboard" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
@@ -2149,7 +2149,7 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
             <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
         </item>
-        <item name="Croquet" icon="presets/empty.png" type="node,closedway">
+        <item name="Croquet" icon="styles/standard/sport/croquet.png" type="node,closedway">
             <label text="Edit Croquet" />
             <key key="sport" value="croquet" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
@@ -2258,13 +2258,13 @@
             <key key="amenity" value="school" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="University" icon="presets/empty.png" type="node,closedway,relation">
+        <item name="University" icon="styles/standard/education/university.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
             <label text="Edit University" />
             <key key="amenity" value="university" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="College" icon="presets/empty.png" type="node,closedway,relation">
+        <item name="College" icon="styles/standard/education/college.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
             <label text="Edit College" />
             <key key="amenity" value="college" />
@@ -2394,7 +2394,7 @@
             <key key="man_made" value="crane" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Beacon" icon="presets/empty.png" type="node">
+        <item name="Beacon" icon="styles/standard/misc/landmark/beacon.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
             <label text="Edit Beacon" />
             <key key="man_made" value="beacon" />
@@ -2573,7 +2573,7 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
             <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="Chemist" icon="presets/empty.png" type="node,closedway">
+        <item name="Chemist" icon="styles/standard/shop/chemist.png" type="node,closedway">
             <label text="Edit Chemist" />
             <key key="shop" value="chemist" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
@@ -2619,7 +2619,7 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
             <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="Florist" icon="presets/empty.png" type="node,closedway">
+        <item name="Florist" icon="styles/standard/shop/florist.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
             <label text="Edit Florist" />
             <key key="shop" value="florist" />
@@ -2639,37 +2639,37 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
             <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="Beverages" icon="presets/empty.png" type="node,closedway">
+        <item name="Beverages" icon="styles/standard/shop/beverages.png" type="node,closedway">
             <label text="Edit Beverages Shop" />
             <key key="shop" value="beverages" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
             <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="Computer" icon="presets/empty.png" type="node,closedway">
+        <item name="Computer" icon="styles/standard/shop/computer.png" type="node,closedway">
             <label text="Edit Computer Shop" />
             <key key="shop" value="computer" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
             <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="Electronics" icon="presets/empty.png" type="node,closedway">
+        <item name="Electronics" icon="styles/standard/shop/electronics.png" type="node,closedway">
             <label text="Edit Electronics Shop" />
             <key key="shop" value="electronics" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
             <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="Hifi" icon="presets/empty.png" type="node,closedway">
+        <item name="Hifi" icon="styles/standard/shop/hifi.png" type="node,closedway">
             <label text="Edit Hifi Shop" />
             <key key="shop" value="hifi" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
             <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="Furniture" icon="presets/empty.png" type="node,closedway">
+        <item name="Furniture" icon="styles/standard/shop/furniture.png" type="node,closedway">
             <label text="Edit Furniture Shop" />
             <key key="shop" value="furniture" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
             <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="Garden Centre" icon="presets/empty.png" type="node,closedway">
+        <item name="Garden Centre" icon="styles/standard/shop/garden_centre.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
             <label text="Edit Garden Centre" />
             <key key="shop" value="garden_centre" />
@@ -2696,25 +2696,25 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
             <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="Hairdresser" icon="presets/empty.png" type="node,closedway">
+        <item name="Hairdresser" icon="styles/standard/shop/hairdresser.png" type="node,closedway">
             <label text="Edit Hairdresser" />
             <key key="shop" value="hairdresser" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
             <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="Shoes" icon="presets/empty.png" type="node,closedway">
+        <item name="Shoes" icon="styles/standard/shop/shoes.png" type="node,closedway">
             <label text="Edit Shoe Shop" />
             <key key="shop" value="shoes" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
             <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="Toys" icon="presets/empty.png" type="node,closedway">
+        <item name="Toys" icon="styles/standard/shop/toys.png" type="node,closedway">
             <label text="Edit Toy Shop" />
             <key key="shop" value="toys" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
             <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="Video" icon="presets/empty.png" type="node,closedway">
+        <item name="Video" icon="styles/standard/shop/video.png" type="node,closedway">
             <label text="Edit Video Shop" />
             <key key="shop" value="video" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
@@ -2747,7 +2747,7 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
             <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="Optician" icon="presets/empty.png" type="node,closedway">
+        <item name="Optician" icon="styles/standard/shop/optician.png" type="node,closedway">
             <label text="Edit Optician" />
             <key key="shop" value="optician" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
@@ -2795,14 +2795,14 @@
         </item>
     </group> <!-- Cash -->
     <group name="Health" icon="presets/pharmacy.png">
-        <item name="Doctors" icon="presets/empty.png" type="node,closedway">
+        <item name="Doctors" icon="styles/standard/health/doctor.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
             <label text="Edit Doctors" />
             <key key="amenity" value="doctors" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
             <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="Dentist" icon="presets/empty.png" type="node,closedway">
+        <item name="Dentist" icon="styles/standard/health/dentist.png" type="node,closedway">
             <label text="Edit Dentist" />
             <key key="amenity" value="dentist" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
@@ -3021,7 +3021,7 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
             <combo key="wood" text="Type" values="coniferous,deciduous,mixed" default="" delete_if_empty="true" />
         </item>
-        <item name="Nature Reserve" icon="presets/empty.png" type="node,closedway,relation">
+        <item name="Nature Reserve" icon="styles/standard/leisure/nature_reserve.png" type="node,closedway,relation">
             <label text="Edit Nature Reserve" />
             <key key="leisure" value="nature_reserve" />
             <text key="name" text="Name" default="" delete_if_empty="true" />