Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 7974)
+++ trunk/data/defaultpresets.xml	(revision 7975)
@@ -1718,5 +1718,5 @@
             <reference ref="name_wikipedia" />
         </item> <!-- Dam -->
-        <item name="Groyne" icon="presets/groyne.png" type="node,way,closedway" preset_name_label="true">
+        <item name="Groyne" icon="presets/groyne.png" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=groyne"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=groyne"
@@ -1929,5 +1929,5 @@
         </item> <!-- Ferry Route -->
         <separator/>
-        <item name="Marina" icon="presets/marina.png" type="node,closedway" preset_name_label="true">
+        <item name="Marina" icon="styles/standard/nautical/marina.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=marina"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=marina"
@@ -1941,5 +1941,5 @@
             <text key="name" text="Name" />
         </item> <!-- Marina -->
-        <item name="Pier" icon="presets/pier.png" type="way,closedway" preset_name_label="true">
+        <item name="Pier" icon="presets/pier.png" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pier"