diff --git a/data/presets.yaml b/data/presets.yaml
index 143d5f70f..5f5be5dd9 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -512,6 +512,11 @@ en:
         label: Devices
         # devices field placeholder
         placeholder: '1, 2, 3...'
+      diameter:
+        # diameter=*
+        label: Diameter
+        # diameter field placeholder
+        placeholder: '5 mm, 10 cm, 15 in…'
       diaper:
         # diaper=*
         label: Diaper Changing Available
@@ -2170,6 +2175,9 @@ en:
           test: Test
           # usage=tourism
           tourism: Tourism
+      valve:
+        # valve=*
+        label: Type
       vending:
         # vending=*
         label: Types of Goods
@@ -5480,6 +5488,11 @@ en:
         name: Underground Pipeline
         # 'terms: oil,natural gas,water,sewer,sewage'
         terms: '<translate with synonyms or related terms for ''Underground Pipeline'', separated by commas>'
+      man_made/pipeline/valve:
+        # 'man_made=pipeline, pipeline=valve'
+        name: Pipeline Valve
+        # 'terms: oil,natural gas,water,sewer,sewage'
+        terms: '<translate with synonyms or related terms for ''Pipeline Valve'', separated by commas>'
       man_made/pumping_station:
         # man_made=pumping_station
         name: Pumping Station
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 5a9d1a63d..826568a8e 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -93,6 +93,7 @@
     "destination/ref_oneway": {"key": "destination:ref", "type": "semiCombo", "label": "Destination Road Numbers", "prerequisiteTag": {"key": "oneway", "value": "yes"}, "snake_case": false},
     "destination/symbol_oneway": {"key": "destination:symbol", "type": "semiCombo", "label": "Destination Symbols", "prerequisiteTag": {"key": "oneway", "value": "yes"}},
     "devices": {"key": "devices", "type": "number", "minValue": 0, "label": "Devices", "placeholder": "1, 2, 3..."},
+    "diameter": {"key": "diameter", "type": "combo", "label": "Diameter", "snake_case": false, "placeholder": "5 mm, 10 cm, 15 in…"},
     "diaper": {"key": "diaper", "type": "combo", "label": "Diaper Changing Available", "options": ["yes", "no", "room", "1", "2", "3", "4", "5"]},
     "diet_multi": {"key": "diet:", "type": "multiCombo", "label": "Diet Types"},
     "diplomatic": {"key": "diplomatic", "type": "combo", "label": "Type"},
@@ -387,6 +388,7 @@
     "trolley_wire": {"key": "trolley_wire", "type": "check", "label": "Overhead Trolley Wires"},
     "tunnel": {"key": "tunnel", "type": "typeCombo", "label": "Type", "placeholder": "Default"},
     "usage_rail": {"key": "usage", "type": "combo", "label": "Usage Type", "strings": {"options": {"main": "Main", "branch": "Branch", "industrial": "Industrial", "military": "Military", "test": "Test", "tourism": "Tourism"}}},
+    "valve": {"key": "valve", "type": "combo", "label": "Type"},
     "vending": {"key": "vending", "type": "semiCombo", "label": "Types of Goods"},
     "visibility": {"key": "visibility", "type": "combo", "label": "Visibility", "strings": {"options": {"house": "Up to 5m (16ft)", "street": "5 to 20m (16 to 65ft)", "area": "Over 20m (65ft)"}}},
     "volcano/status": {"key": "volcano:status", "type": "combo", "label": "Volcano Status", "strings": {"options": {"active": "Active", "dormant": "Dormant", "extinct": "Extinct"}}},
diff --git a/data/presets/fields/diameter.json b/data/presets/fields/diameter.json
new file mode 100644
index 000000000..59b20198a
--- /dev/null
+++ b/data/presets/fields/diameter.json
@@ -0,0 +1,7 @@
+{
+    "key": "diameter",
+    "type": "combo",
+    "label": "Diameter",
+    "snake_case": false,
+    "placeholder": "5 mm, 10 cm, 15 in…"
+}
diff --git a/data/presets/fields/valve.json b/data/presets/fields/valve.json
new file mode 100644
index 000000000..c1afedca9
--- /dev/null
+++ b/data/presets/fields/valve.json
@@ -0,0 +1,5 @@
+{
+    "key": "valve",
+    "type": "combo",
+    "label": "Type"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 8af03e0d5..512755400 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -709,8 +709,9 @@
     "man_made/petroleum_well": {"icon": "temaki-storage_tank", "geometry": ["point"], "terms": ["drilling rig", "oil derrick", "oil drill", "oil horse", "oil rig", "oil pump", "petroleum well", "pumpjack"], "tags": {"man_made": "petroleum_well"}, "name": "Oil Well"},
     "man_made/pier": {"icon": "temaki-pedestrian", "fields": ["name", "surface", "floating", "width", "access", "lit"], "moreFields": ["access", "fishing", "incline", "{highway/footway}"], "geometry": ["line", "area"], "terms": ["berth", "dock", "jetty", "landing", "promenade", "wharf"], "tags": {"man_made": "pier"}, "addTags": {"highway": "footway", "man_made": "pier"}, "name": "Pier"},
     "man_made/pier/floating": {"icon": "temaki-pedestrian", "geometry": ["line", "area"], "terms": ["berth", "dock", "jetty", "landing", "promenade", "wharf"], "tags": {"man_made": "pier", "floating": "yes"}, "addTags": {"highway": "footway", "man_made": "pier", "floating": "yes"}, "name": "Floating Pier"},
-    "man_made/pipeline": {"icon": "iD-pipeline-line", "fields": ["location", "operator", "substance", "layer"], "geometry": ["line"], "terms": ["oil", "natural gas", "water", "sewer", "sewage"], "tags": {"man_made": "pipeline"}, "name": "Pipeline"},
+    "man_made/pipeline": {"icon": "iD-pipeline-line", "fields": ["operator", "location", "substance", "layer", "diameter"], "geometry": ["line"], "terms": ["oil", "natural gas", "water", "sewer", "sewage"], "tags": {"man_made": "pipeline"}, "name": "Pipeline"},
     "man_made/pipeline/underground": {"icon": "iD-pipeline-line", "geometry": ["line"], "terms": ["oil", "natural gas", "water", "sewer", "sewage"], "tags": {"man_made": "pipeline", "location": "underground"}, "addTags": {"man_made": "pipeline", "location": "underground", "layer": "-1"}, "name": "Underground Pipeline"},
+    "man_made/pipeline/valve": {"geometry": ["vertex"], "fields": ["ref", "operator", "valve", "location", "diameter"], "moreFields": ["colour", "manufacturer", "material"], "terms": ["oil", "natural gas", "water", "sewer", "sewage"], "tags": {"man_made": "pipeline", "pipeline": "valve"}, "name": "Pipeline Valve"},
     "man_made/pumping_station": {"icon": "maki-water", "geometry": ["point", "area"], "tags": {"man_made": "pumping_station"}, "name": "Pumping Station"},
     "man_made/silo": {"icon": "temaki-silo", "fields": ["crop", "building_area"], "geometry": ["point", "area"], "terms": ["grain", "corn", "wheat"], "tags": {"man_made": "silo"}, "name": "Silo"},
     "man_made/storage_tank": {"icon": "temaki-storage_tank", "fields": ["content", "operator", "material", "building_area", "height", "capacity"], "moreFields": ["layer", "location", "manufacturer"], "geometry": ["point", "area"], "terms": ["water", "oil", "gas", "petrol"], "tags": {"man_made": "storage_tank"}, "name": "Storage Tank"},
@@ -761,7 +762,7 @@
     "natural/spring": {"icon": "maki-water", "fields": ["name", "intermittent"], "geometry": ["point", "vertex"], "tags": {"natural": "spring"}, "terms": [], "name": "Spring"},
     "natural/stone": {"icon": "temaki-boulder1", "fields": ["name"], "geometry": ["point", "area"], "tags": {"natural": "stone"}, "terms": ["boulder", "stone", "rock"], "name": "Unattached Stone / Boulder"},
     "natural/tree_row": {"icon": "maki-park", "fields": ["leaf_type", "leaf_cycle", "denotation"], "geometry": ["line"], "tags": {"natural": "tree_row"}, "terms": [], "name": "Tree Row"},
-    "natural/tree": {"icon": "maki-park", "fields": ["leaf_type_singular", "leaf_cycle_singular", "denotation"], "geometry": ["point", "vertex"], "tags": {"natural": "tree"}, "terms": [], "name": "Tree"},
+    "natural/tree": {"icon": "maki-park", "fields": ["leaf_type_singular", "leaf_cycle_singular", "denotation", "diameter"], "geometry": ["point", "vertex"], "tags": {"natural": "tree"}, "terms": [], "name": "Tree"},
     "natural/valley": {"icon": "maki-triangle-stroked", "fields": ["name", "elevation", "description"], "geometry": ["vertex", "point", "line"], "tags": {"natural": "valley"}, "terms": ["canyon", "dale", "dell", "dene", "depression", "glen", "gorge", "gully", "gulley", "gultch", "hollow", "ravine", "rift", "vale"], "name": "Valley"},
     "natural/volcano": {"icon": "maki-volcano", "fields": ["name", "elevation", "volcano/status", "volcano/type"], "geometry": ["point", "vertex"], "tags": {"natural": "volcano"}, "terms": ["mountain", "crater"], "name": "Volcano"},
     "natural/water": {"icon": "maki-water", "fields": ["name", "water", "intermittent"], "moreFields": ["fishing", "salt", "tidal"], "geometry": ["area"], "tags": {"natural": "water"}, "name": "Water"},
diff --git a/data/presets/presets/man_made/pipeline.json b/data/presets/presets/man_made/pipeline.json
index d198ffc10..153a57b2a 100644
--- a/data/presets/presets/man_made/pipeline.json
+++ b/data/presets/presets/man_made/pipeline.json
@@ -1,10 +1,11 @@
 {
     "icon": "iD-pipeline-line",
     "fields": [
-        "location",
         "operator",
+        "location",
         "substance",
-        "layer"
+        "layer",
+        "diameter"
     ],
     "geometry": [
         "line"
diff --git a/data/presets/presets/man_made/pipeline/valve.json b/data/presets/presets/man_made/pipeline/valve.json
new file mode 100644
index 000000000..b888f4ee0
--- /dev/null
+++ b/data/presets/presets/man_made/pipeline/valve.json
@@ -0,0 +1,29 @@
+{
+    "geometry": [
+        "vertex"
+    ],
+    "fields": [
+        "ref",
+        "operator",
+        "valve",
+        "location",
+        "diameter"
+    ],
+    "moreFields": [
+        "colour",
+        "manufacturer",
+        "material"
+    ],
+    "terms": [
+        "oil",
+        "natural gas",
+        "water",
+        "sewer",
+        "sewage"
+    ],
+    "tags": {
+        "man_made": "pipeline",
+        "pipeline": "valve"
+    },
+    "name": "Pipeline Valve"
+}
diff --git a/data/presets/presets/natural/tree.json b/data/presets/presets/natural/tree.json
index a05a64d1a..022c8a563 100644
--- a/data/presets/presets/natural/tree.json
+++ b/data/presets/presets/natural/tree.json
@@ -3,7 +3,8 @@
     "fields": [
         "leaf_type_singular",
         "leaf_cycle_singular",
-        "denotation"
+        "denotation",
+        "diameter"
     ],
     "geometry": [
         "point",
diff --git a/data/taginfo.json b/data/taginfo.json
index ee8058e74..c6295e735 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -684,6 +684,7 @@
     {"key": "floating", "value": "yes", "description": "🄿 Floating Pier", "object_types": ["way", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/pedestrian.svg?sanitize=true"},
     {"key": "man_made", "value": "pipeline", "description": "🄿 Pipeline", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/pipeline-line.svg?sanitize=true"},
     {"key": "location", "value": "underground", "description": "🄿 Underground Pipeline, 🄿 Underground Power Cable", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/pipeline-line.svg?sanitize=true"},
+    {"key": "pipeline", "value": "valve", "description": "🄿 Pipeline Valve", "object_types": ["node"]},
     {"key": "man_made", "value": "pumping_station", "description": "🄿 Pumping Station", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/water-15.svg?sanitize=true"},
     {"key": "man_made", "value": "silo", "description": "🄿 Silo", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/silo.svg?sanitize=true"},
     {"key": "man_made", "value": "storage_tank", "description": "🄿 Storage Tank", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/storage_tank.svg?sanitize=true"},
@@ -1315,6 +1316,7 @@
     {"key": "destination:ref", "description": "🄵 Destination Road Numbers"},
     {"key": "destination:symbol", "description": "🄵 Destination Symbols"},
     {"key": "devices", "description": "🄵 Devices"},
+    {"key": "diameter", "description": "🄵 Diameter"},
     {"key": "diaper", "description": "🄵 Diaper Changing Available"},
     {"key": "diet:", "description": "🄵 Diet Types"},
     {"key": "diplomatic", "description": "🄵 Type"},
@@ -1727,6 +1729,7 @@
     {"key": "usage", "value": "military", "description": "🄵 Usage Type"},
     {"key": "usage", "value": "test", "description": "🄵 Usage Type"},
     {"key": "usage", "value": "tourism", "description": "🄵 Usage Type"},
+    {"key": "valve", "description": "🄵 Type"},
     {"key": "vending", "description": "🄵 Types of Goods"},
     {"key": "visibility", "value": "house", "description": "🄵 Visibility"},
     {"key": "visibility", "value": "street", "description": "🄵 Visibility"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 7ce705251..14df92e52 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2856,6 +2856,10 @@
                     "label": "Devices",
                     "placeholder": "1, 2, 3..."
                 },
+                "diameter": {
+                    "label": "Diameter",
+                    "placeholder": "5 mm, 10 cm, 15 in…"
+                },
                 "diaper": {
                     "label": "Diaper Changing Available"
                 },
@@ -4224,6 +4228,9 @@
                         "tourism": "Tourism"
                     }
                 },
+                "valve": {
+                    "label": "Type"
+                },
                 "vending": {
                     "label": "Types of Goods"
                 },
@@ -7168,6 +7175,10 @@
                     "name": "Underground Pipeline",
                     "terms": "oil,natural gas,water,sewer,sewage"
                 },
+                "man_made/pipeline/valve": {
+                    "name": "Pipeline Valve",
+                    "terms": "oil,natural gas,water,sewer,sewage"
+                },
                 "man_made/pumping_station": {
                     "name": "Pumping Station",
                     "terms": ""