Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 9048)
+++ trunk/data/defaultpresets.xml	(revision 9049)
@@ -5634,25 +5634,4 @@
             </optional>
         </item> <!-- Bunker Silo -->
-        <item name="Pipeline" icon="presets/path.png" type="way" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
-                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=pipeline"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=pipeline"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=pipeline" />
-            <space />
-            <key key="man_made" value="pipeline" />
-            <text key="name" text="Name" />
-            <text key="ref" text="Reference" />
-            <reference ref="operator_substance" />
-            <combo key="location" text="Location" values="underground,underwater,overground" values_context="pipeline" />
-        </item> <!-- Pipeline -->
-        <item name="Pipeline Marker" icon="styles/standard/misc/pipeline_marker.svg" type="node" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:pipeline=marker" />
-            <space />
-            <key key="pipeline" value="marker" />
-            <text key="ref" text="Reference" />
-            <reference ref="operator_substance" />
-            <reference ref="support" />
-        </item> <!-- Pipeline Marker -->
         <item name="Crane" icon="presets/crane.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane"
@@ -5710,4 +5689,33 @@
             <key key="man_made" value="embankment" />
         </item> <!-- Embankment -->
+        <separator/>
+        <item name="Pipeline" icon="presets/path.png" type="way" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
+                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=pipeline"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=pipeline"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=pipeline" />
+            <space />
+            <key key="man_made" value="pipeline" />
+            <text key="name" text="Name" />
+            <text key="ref" text="Reference" />
+            <reference ref="operator_substance" />
+            <combo key="location" text="Location" values="underground,underwater,overground" values_context="pipeline" />
+        </item> <!-- Pipeline -->
+        <item name="Pipeline Marker" icon="styles/standard/misc/pipeline_marker.svg" type="node" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:pipeline=marker" />
+            <space />
+            <key key="pipeline" value="marker" />
+            <text key="ref" text="Reference" />
+            <reference ref="operator_substance" />
+            <reference ref="support" />
+        </item> <!-- Pipeline Marker -->
+        <item name="Pipeline Valve" icon="styles/standard/misc/valve.svg" type="node" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:pipeline=valve" />
+            <space />
+            <key key="pipeline" value="valve" />
+            <text key="ref" text="Reference" />
+            <reference ref="operator_substance" />
+        </item> <!-- Pipeline Valve -->
         <separator/>
         <item name="Water Tower" icon="styles/standard/misc/landmark/water_tower.svg" type="node,closedway" preset_name_label="true">
Index: trunk/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/styles/standard/elemstyles.mapcss	(revision 9048)
+++ trunk/styles/standard/elemstyles.mapcss	(revision 9049)
@@ -1403,4 +1403,9 @@
 node[pipeline=marker] {
     icon-image: "misc/pipeline_marker.svg";
+    set icon_z17;
+    text: auto;
+}
+node[pipeline=valve] {
+    icon-image: "misc/valve.svg";
     set icon_z17;
     text: auto;