Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 3497)
+++ trunk/data/defaultpresets.xml	(revision 3498)
@@ -939,5 +939,5 @@
             <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 />
@@ -1086,5 +1086,5 @@
             <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" />
@@ -1341,4 +1341,9 @@
             <label text="Edit Pylon" text_context="aerialway" />
             <key key="aerialway" value="pylon" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Goods" name_context="aerialway" icon="presets/empty.png" type="node">
+            <label text="Edit Goods" text_context="aerialway" />
+            <key key="aerialway" value="goods" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
@@ -2671,5 +2676,5 @@
             <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" />
@@ -3303,5 +3308,5 @@
             <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" />