Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 7820)
+++ /trunk/data/defaultpresets.xml	(revision 7821)
@@ -1236,5 +1236,5 @@
             <reference ref="optional_maxwidth" />
         </item> <!-- Cycle Barrier -->
-        <item name="Cattle Grid" icon="presets/cattle_grid.png" type="node" preset_name_label="true">
+        <item name="Cattle Grid" icon="styles/standard/vehicle/cattle_grid.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=cattle_grid"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=cattle_grid"
@@ -1317,5 +1317,5 @@
             </optional>
         </item> <!-- Fence -->
-        <item name="Guard Rail" type="way" preset_name_label="true">
+        <item name="Guard Rail" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=guard_rail"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=guard_rail" />
@@ -1355,5 +1355,5 @@
             <reference ref="optional_height" />
         </item> <!-- Retaining Wall -->
-        <item name="Ditch" name_context="Barrier" type="way" preset_name_label="true">
+        <item name="Ditch" name_context="Barrier" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=ditch"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:barrier=ditch"
@@ -1383,5 +1383,5 @@
             <reference ref="optional_maxwidth" />
         </item> <!-- Entrance (Barrier Opening) -->
-        <item name="Gate" icon="presets/gate.png" type="node" preset_name_label="true">
+        <item name="Gate" icon="styles/standard/vehicle/gate.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=gate"
@@ -1455,5 +1455,5 @@
             <reference ref="optional_maxwidth" />
         </item> <!-- Kissing Gate -->
-        <item name="Chain" icon="styles/standard/vehicle/chain.svg" type="node,way" preset_name_label="true">
+        <item name="Chain" icon="styles/standard/vehicle/chain.svg" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=chain"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=chain" />
@@ -1462,5 +1462,5 @@
             <reference ref="optional_maxwidth" />
         </item> <!-- Chain -->
-        <item name="Stile" icon="presets/stile.png" type="node" preset_name_label="true">
+        <item name="Stile" icon="styles/standard/vehicle/stile.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=stile" />
             <space />
Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 7820)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 7821)
@@ -331,5 +331,6 @@
 }
 node[barrier=bollard] {
-    icon-image: "vehicle/restriction/bollard.png";
+    icon-image: "presets/bollard.png";
+    icon-width: 16;
     set icon_z17;
     text: auto;
@@ -349,4 +350,5 @@
 way[barrier=block],
 way[barrier=chain],
+way[barrier=ditch],
 way[barrier=kerb] {
     width: 2;
@@ -357,5 +359,6 @@
 node[barrier=guard_rail],
 node[barrier=city_wall],
-node[barrier=retaining_wall] {
+node[barrier=retaining_wall],
+node[barrier=ditch] {
     icon-image: "misc/deprecated.png";
     set icon_z17;
@@ -378,5 +381,5 @@
 }
 node[barrier=stile] {
-    icon-image: "vehicle/stile.png";
+    icon-image: "vehicle/stile.svg";
     set icon_z17;
     text: auto;