Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 10822)
+++ trunk/data/defaultpresets.xml	(revision 10825)
@@ -1695,5 +1695,5 @@
             </optional>
         </item> <!-- Fence -->
-        <item name="Guard Rail" type="way,closedway" preset_name_label="true">
+        <item name="Guard Rail" icon="presets/barrier/guard_rail.svg" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=guard_rail"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:barrier=guard_rail"
@@ -1738,5 +1738,5 @@
             <reference ref="optional_height" />
         </item> <!-- Retaining Wall -->
-        <item name="Jersey Barrier" type="node,way,closedway" preset_name_label="true">
+        <item name="Jersey Barrier" icon="presets/barrier/jersey_barrier.svg"  type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=jersey_barrier" />
             <key key="barrier" value="jersey_barrier" />
@@ -5376,5 +5376,5 @@
                 <list_entry value="lean_to" icon="presets/accommodation/shelter_lean_to.svg" />
                 <list_entry value="picnic_shelter" icon="presets/accommodation/shelter_picnic.svg" />
-                <list_entry value="public_transport" icon="prespresets/accommodation/shelter_public_transport.svg" />
+                <list_entry value="public_transport" icon="presets/accommodation/shelter_public_transport.svg" />
                 <list_entry value="weather_shelter" icon="presets/accommodation/shelter.svg" />
                 <list_entry value="wildlife_hide" icon="presets/accommodation/shelter.svg" />
@@ -6311,5 +6311,5 @@
         </item> <!-- Embankment -->
         <separator/>
-        <item name="Pipeline" icon="presets/misc/route.svg" type="way" preset_name_label="true">
+        <item name="Pipeline" icon="presets/landmark/pipeline.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=pipeline"
@@ -8598,5 +8598,5 @@
         <reference ref="link_contact_address" />
     </item> <!-- Roofer -->
-    <item name="Beekeeper" type="node,closedway,multipolygon" preset_name_label="true">
+    <item name="Beekeeper" icon="presets/craft/beekeeper.svg" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:craft=beekeeper" />
         <space />