Index: trunk/resources/data/defaultpresets.xml
===================================================================
--- trunk/resources/data/defaultpresets.xml	(revision 17027)
+++ trunk/resources/data/defaultpresets.xml	(revision 17028)
@@ -5453,4 +5453,11 @@
             </optional>
         </item> <!-- Goods conveyor -->
+        <item name="Pumping station" icon="presets/misc/pumping_station.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:man_made=pumping_station" />
+            <space />
+            <key key="man_made" value="pumping_station" />
+            <reference ref="name_ref" />
+            <reference ref="operator_substance" />
+        </item> <!-- Pumping station -->
         <item name="Mineshaft" icon="presets/landmark/mine.svg" type="node,closedway" preset_name_label="true">
             <link wiki="Tag:man_made=mineshaft" />
@@ -5713,6 +5720,5 @@
             <space />
             <key key="man_made" value="pipeline" />
-            <text key="name" text="Name" />
-            <text key="ref" text="Reference" />
+            <reference ref="name_ref" />
             <reference ref="operator_substance" />
             <combo key="location" text="Location" values="underground,underwater,overground" values_context="pipeline" />
Index: trunk/resources/images/presets/misc/pumping_station.svg
===================================================================
--- trunk/resources/images/presets/misc/pumping_station.svg	(revision 17028)
+++ trunk/resources/images/presets/misc/pumping_station.svg	(revision 17028)
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   sodipodi:docname="pumping_station5.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   version="1.1"
+   id="svg2"
+   viewBox="0 0 16 16"
+   height="16"
+   width="16">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     viewbox-height="16"
+     inkscape:window-maximized="1"
+     inkscape:window-y="-8"
+     inkscape:window-x="-8"
+     inkscape:window-height="987"
+     inkscape:window-width="1680"
+     units="px"
+     showgrid="true"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="px"
+     inkscape:cy="6.8046774"
+     inkscape:cx="5.4688825"
+     inkscape:zoom="34.516383"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     showguides="false">
+    <inkscape:grid
+       spacingy="1"
+       spacingx="1"
+       originy="0"
+       originx="0"
+       id="grid4136"
+       type="xygrid" />
+  </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
+     transform="translate(0,-1037.3622)"
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <path
+       sodipodi:nodetypes="ccccc"
+       id="path848"
+       d="M 3,1049.3622 H 0 v 3 h 8 c -1.66665,-0.5236 -3.3332798,-0.4657 -5,-3 z"
+       style="fill:#006885;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:#006885;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 13,1041.3622 h 3 v -3 H 8 c 1.66665,0.5236 3.33328,0.4657 5,3 z"
+       id="path848-4"
+       sodipodi:nodetypes="ccccc" />
+    <circle
+       r="6.5714293"
+       cy="1045.3622"
+       cx="8"
+       id="path831"
+       style="fill:#c1cfd7;stroke:#006885;stroke-width:0.857142;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill-opacity:1" />
+    <circle
+       r="1.5714295"
+       style="fill:none;stroke:#006885;stroke-width:0.857141;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path831-3"
+       cx="8"
+       cy="1045.3622" />
+    <path
+       sodipodi:nodetypes="cc"
+       id="path874"
+       d="m 8.8674175,1048.3843 c -0.3784809,0.8095 -0.9035585,1.3955 -1.3977476,1.9006"
+       style="fill:none;stroke:#006885;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:none;stroke:#006885;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 7.4770221,1042.3784 c 0.3785,-0.8095 0.9036,-1.3955 1.3978,-1.9006"
+       id="path874-3"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#006885;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 5.9610293,1047.7379 c -0.8834931,0.1341 -1.6623311,0.022 -2.3567217,-0.1088"
+       id="path874-7"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       id="path874-3-2"
+       d="m 10.228755,1042.9585 c 0.883503,-0.1341 1.662354,-0.022 2.35675,0.1088"
+       style="fill:none;stroke:#006885;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:none;stroke:#006885;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 5.0060584,1044.4704 c -0.531066,-0.7187 -0.7957745,-1.4597 -1.0041018,-2.1349"
+       id="path874-37"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       id="path874-3-23"
+       d="m 10.940711,1046.1155 c 0.531057,0.7187 0.795755,1.4597 1.004077,2.1349"
+       style="fill:none;stroke:#006885;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:#c1cfd7;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 16,1039.3622 h -4.394531 c 0.666248,0.4135 0.809516,0.5721 1.296875,1 H 16 Z"
+       id="path841"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       id="path841-7"
+       d="m 0,1051.3622 h 4.3946 c -0.6663,-0.4135 -0.8096,-0.5721 -1.2969,-1 H 0 Z"
+       style="fill:#c1cfd7;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  </g>
+</svg>
Index: trunk/resources/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/resources/styles/standard/elemstyles.mapcss	(revision 17027)
+++ trunk/resources/styles/standard/elemstyles.mapcss	(revision 17028)
@@ -1395,4 +1395,5 @@
 area[man_made=lighthouse],
 area[man_made=monitoring_station],
+area[man_made=pumping_station],
 area[man_made=mineshaft] {
     fill-color: manmade#d8d8d8;
@@ -1473,4 +1474,8 @@
 node[man_made=monitoring_station] {
     icon-image: "presets/misc/monitoring_station.svg";
+    set icon_z17;
+}
+node[man_made=pumping_station] {
+    icon-image: "presets/misc/pumping_station.svg";
     set icon_z17;
 }