Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 15525)
+++ /trunk/data/defaultpresets.xml	(revision 15526)
@@ -4873,12 +4873,4 @@
             <text key="pressure" text="Pressure (bar)" />
         </item> <!-- Pipeline -->
-        <item name="Pipeline Marker" icon="presets/misc/pipeline_marker.svg" type="node" preset_name_label="true">
-            <link 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="presets/misc/valve.svg" type="node" preset_name_label="true">
             <link wiki="Tag:pipeline=valve" />
@@ -4892,4 +4884,16 @@
             <reference ref="ref_operator" />
         </item> <!-- Pipeline Valve -->
+        <item name="Marker" icon="presets/misc/pipeline_marker.svg" type="node" preset_name_label="true">
+            <link wiki="Key:marker" />
+            <space />
+            <combo key="marker" text="Type" values="aerial,ground,pedestal,plate,post,stone" match="key" />
+            <combo key="utility" text="Utility" values="chemical,gas,heating,hydrant,oil,power,sewerage,street_lighting,telecom,television,waste,water" />
+            <optional>
+                <reference ref="ref_operator" />
+                <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" values_context="marker />
+                <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,blue,brown,gray,green,orange,purple,red,silver,white,yellow,#CD853F" />
+                <combo key="location" text="Location" values="underground,overground" values_context="pipeline" />
+            </optional>
+        </item> <!-- Marker -->
         <item name="Manhole" icon="presets/misc/manhole.svg" type="node" preset_name_label="true">
             <link wiki="Key:manhole" />
Index: /trunk/data/validator/combinations.mapcss
===================================================================
--- /trunk/data/validator/combinations.mapcss	(revision 15525)
+++ /trunk/data/validator/combinations.mapcss	(revision 15526)
@@ -288,5 +288,10 @@
 }
 
-/* {0.key} together with {1.key}, #17630, #17604 */
+/* {0.key} together with {1.key}, #18267, #17630, #17604 */
+node[marker][cover],
+node[marker][voltage],
+node[marker][pressure],
+node[marker][diameter],
+node[marker][substance],
 *[building:part][building],
 *[addr:street][addr:place][outside("CZ,DK")] {
Index: /trunk/data/validator/deprecated.mapcss
===================================================================
--- /trunk/data/validator/deprecated.mapcss	(revision 15525)
+++ /trunk/data/validator/deprecated.mapcss	(revision 15526)
@@ -1819,2 +1819,11 @@
   group: tr("deprecated tagging");
 }
+
+/* #18267 */
+node[pipeline=marker],
+node[power=marker],
+node[cable=marker] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "marker=* + utility=*";
+  group: tr("deprecated tagging");
+}
Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 15525)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 15526)
@@ -1504,5 +1504,5 @@
     color: pipeline#660000;
 }
-node[pipeline=marker] {
+node[marker] {
     icon-image: "presets/misc/pipeline_marker.svg";
     set icon_z17;