Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 3496)
+++ /trunk/data/defaultpresets.xml	(revision 3497)
@@ -2104,5 +2104,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="Archaeological Site" icon="presets/historic.png" type="node,closedway">
+        <item name="Archaeological Site" icon="styles/standard/sightseeing/archaeological.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
@@ -2146,5 +2146,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Boundary Stone" icon="presets/wayside_shrine.png" type="node,closedway">
+        <item name="Boundary Stone" icon="styles/standard/historic/boundary_stone.png" type="node,closedway">
             <label text="Edit Boundary Stone" />
             <key key="historic" value="boundary_stone" />
@@ -2863,5 +2863,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="Alcohol" icon="presets/empty.png" type="node,closedway">
+        <item name="Alcohol" icon="styles/standard/shop/beverages.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
             <label text="Edit Alcohol Shop" />
@@ -3426,5 +3426,5 @@
             <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,shia,sunni" default="" delete_if_empty="true" />
         </item>
-        <item name="Retail" icon="presets/shopping.png" type="node,closedway,relation">
+        <item name="Retail" icon="styles/standard/shop/supermarket.png" type="node,closedway,relation">
             <label text="Edit Retail Landuse" />
             <space />
@@ -3505,5 +3505,5 @@
             </optional>
         </item>
-        <item name="Address Interpolation" icon="presets/addresses.png" type="way">
+        <item name="Address Interpolation" icon="presets/interpolation.png" type="way">
            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
                  de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
@@ -3512,5 +3512,5 @@
             <combo key="addr:interpolation" text="Numbering scheme" values="odd,even,all,alphabetic" default="odd" />
         </item>
-        <item name="Contact" icon="presets/empty.png" type="node,way,closedway,relation">
+        <item name="Contact" icon="presets/contact.png" type="node,way,closedway,relation">
             <label text="Edit Contact information" />
             <space />
@@ -3526,5 +3526,5 @@
     </group> <!-- Annotation -->
     <group name="Relations" icon="presets/relations.png">
-        <item name="Multipolygon" icon="presets/empty.png" type="relation">
+        <item name="Multipolygon" icon="presets/multipolygon.png" type="relation">
             <link href="http://wiki.openstreetmap.org/wiki/Relation:multipolygon"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"