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"
Index: trunk/data/validator/geometry.mapcss
===================================================================
--- trunk/data/validator/geometry.mapcss	(revision 7974)
+++ trunk/data/validator/geometry.mapcss	(revision 7975)
@@ -5,4 +5,5 @@
 node[footway],
 node[man_made=embankment],
+node[man_made=groyne],
 node[aerialway=cable_car],
 node[aerialway=gondola],
@@ -17,9 +18,9 @@
 node[aerialway=goods],
 node[waterway=river],
-node[waterway=riverbank],
 node[waterway=canal],
 node[waterway=wadi],
 node[waterway=stream],
 node[waterway=ditch],
+node[waterway=drain],
 node[natural=coastline],
 node[natural=ridge],
@@ -49,4 +50,5 @@
 node[waterway=riverbank],
 node[man_made=bridge],
+node[man_made=breakwater],
 node[power=plant],
 node[source:outline] {
Index: trunk/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/styles/standard/elemstyles.mapcss	(revision 7974)
+++ trunk/styles/standard/elemstyles.mapcss	(revision 7975)
@@ -1279,9 +1279,4 @@
     color: manmade#d8d8d8;
 }
-node[man_made=groyne] {
-    icon-image: "nautical/groyne.png";
-    set icon_z17;
-    text: auto;
-}
 node[man_made=lighthouse] {
     icon-image: "misc/landmark/lighthouse.png";
@@ -1335,4 +1330,6 @@
     color: pipeline#660000;
 }
+node[man_made=breakwater],
+node[man_made=groyne],
 node[man_made=embankment],
 node[man_made=pipeline] {
@@ -1495,5 +1492,13 @@
     text: auto;
 }
-area[leisure=slipway],
+way[leisure=slipway] {
+    width: 2;
+    color: leisure#c7f1a3;
+}
+node[leisure=slipway] {
+    icon-image: "nautical/slipway.png";
+    set icon_z17;
+    text: auto;
+}
 area[leisure=fishing],
 area[leisure=nature_reserve],
@@ -1504,9 +1509,4 @@
 area[leisure=firepit] {
     fill-color: leisure#c7f1a3;
-}
-node[leisure=slipway] {
-    icon-image: "nautical/slipway.png";
-    set icon_z17;
-    text: auto;
 }
 node[leisure=fishing] {