Index: trunk/resources/data/defaultpresets.xml
===================================================================
--- trunk/resources/data/defaultpresets.xml	(revision 16717)
+++ trunk/resources/data/defaultpresets.xml	(revision 16718)
@@ -5211,4 +5211,18 @@
             </optional>
         </item> <!-- Crane -->
+        <item name="Goods conveyor" icon="presets/landmark/goods_conveyor.svg" type="way" preset_name_label="true">
+            <link wiki="Tag:man_made=goods_conveyor" />
+            <space />
+            <key key="man_made" value="goods_conveyor" />
+            <optional>
+                <reference ref="name_operator" />
+                <combo key="resource" text="Resource" values="aggregate,bauxite,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" />
+                <checkgroup columns="3">
+                    <check key="covered" text="Covered" />
+                    <check key="bridge" text="Bridge" disable_off="true" />
+                    <check key="tunnel" text="Tunnel" disable_off="true" />
+                </checkgroup>
+            </optional>
+        </item> <!-- Goods conveyor -->
         <item name="Mineshaft" icon="presets/landmark/mine.svg" type="node,closedway" preset_name_label="true">
             <link wiki="Tag:man_made=mineshaft" />
Index: trunk/resources/images/presets/landmark/goods_conveyor.svg
===================================================================
--- trunk/resources/images/presets/landmark/goods_conveyor.svg	(revision 16718)
+++ trunk/resources/images/presets/landmark/goods_conveyor.svg	(revision 16718)
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="15"
+   height="8"
+   viewBox="0 0 15 8"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="goods_conveyor9.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="6.4747889"
+     inkscape:cy="10.622134"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="1680"
+     inkscape:window-height="987"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     viewbox-height="16"
+     showguides="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4136"
+       originx="0"
+       originy="0"
+       spacingx="1"
+       spacingy="1" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1045.3622)">
+    <rect
+       style="opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="rect833"
+       width="15"
+       height="5.0000172"
+       x="0"
+       y="1048.3622"
+       ry="2.4553807" />
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="rect835"
+       width="13"
+       height="3.0000174"
+       x="1"
+       y="1049.3622"
+       ry="1.4776903" />
+    <circle
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="path851"
+       cx="2.5000005"
+       cy="1050.8622"
+       r="1.2672001" />
+    <circle
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="path851-0"
+       cx="12.500001"
+       cy="1050.8622"
+       r="1.2672001" />
+    <circle
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="path851-5"
+       cx="7.5000005"
+       cy="1050.8622"
+       r="1.2672001" />
+    <path
+       style="fill:#aa4400;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 3.5,1048.3622 c 0,0 0.1829812,-0.8041 0.5,-1 0.2835503,-0.1752 0.6920402,0.1276 1,0 0.435521,-0.1804 0.6175768,-0.7244 1,-1 0.6046642,-0.4358 1.2565192,-0.9472 2,-1 1.0514407,-0.075 2.283797,0.2266 3,1 0.466907,0.5042 0.5,2 0.5,2 z"
+       id="path838"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="caaaaacc" />
+  </g>
+</svg>
Index: trunk/resources/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/resources/styles/standard/elemstyles.mapcss	(revision 16717)
+++ trunk/resources/styles/standard/elemstyles.mapcss	(revision 16718)
@@ -1477,4 +1477,8 @@
     icon-image: "presets/landmark/crane.svg";
     set icon_z17;
+}
+way[man_made=goods_conveyor] {
+    width: 2;
+    color: manmade#d8d8d8;
 }
 node[man_made=adit] {