Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 7716)
+++ /trunk/data/defaultpresets.xml	(revision 7717)
@@ -1240,5 +1240,5 @@
             <reference ref="optional_maxwidth" />
         </item> <!-- Bus Trap -->
-        <item name="Spikes" icon="presets/empty.png" type="node" preset_name_label="true">
+        <item name="Spikes" icon="styles/standard/vehicle/spikes.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:barrier"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:barrier"
@@ -1705,5 +1705,5 @@
             <key key="man_made" value="groyne" />
         </item> <!-- Groyne -->
-        <item name="Breakwater" icon="presets/groyne.png" type="way,closedway" preset_name_label="true">
+        <item name="Breakwater" icon="presets/breakwater.png" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=breakwater"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=breakwater"
@@ -7161,5 +7161,5 @@
             <text key="name" text="Name" />
         </item> <!-- Meadow -->
-        <item name="Orchard" icon="presets/landuse.png" type="closedway,relation" preset_name_label="true">
+        <item name="Orchard" icon="styles/standard/misc/landuse/orchard.svg" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=orchard"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=orchard"
Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 7716)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 7717)
@@ -432,9 +432,13 @@
     text: auto;
 }
+node[barrier=spikes] {
+    icon-image: "vehicle/spikes.svg";
+    set icon_z17;
+    text: auto;
+}
 node[barrier=fence],
 node[barrier=kissing_gate],
 node[barrier=bump_gate],
 node[barrier=portcullis],
-node[barrier=spikes],
 node[barrier=bus_trap],
 node[barrier=drawbridge],
@@ -1122,5 +1126,4 @@
 area[man_made=gasometer],
 area[man_made=bunker_silo],
-area[man_made=groyne],
 area[man_made=lighthouse],
 area[man_made=monitoring_station],
@@ -1158,4 +1161,18 @@
     set icon_z17;
     text: auto;
+}
+area[man_made=groyne]:closed {
+    fill-color: manmade#d8d8d8;
+}
+way[man_made=groyne] {
+    width: 2;
+    color: manmade#d8d8d8;
+}
+area[man_made=breakwater]:closed {
+    fill-color: manmade#d8d8d8;
+}
+way[man_made=breakwater] {
+    width: 2;
+    color: manmade#d8d8d8;
 }
 node[man_made=groyne] {