diff --git a/data/presets/fields/height.json b/data/presets/fields/height.json
new file mode 100644
index 000000000..2640c1982
--- /dev/null
+++ b/data/presets/fields/height.json
@@ -0,0 +1,5 @@
+{
+    "key": "height",
+    "type": "number",
+    "label": "Height (meters)"
+}
diff --git a/data/presets/fields/tower/construction.json b/data/presets/fields/tower/construction.json
new file mode 100644
index 000000000..8166ec014
--- /dev/null
+++ b/data/presets/fields/tower/construction.json
@@ -0,0 +1,6 @@
+{
+    "key": "tower:construction",
+    "type": "combo",
+    "label": "Tower construction",
+    "placeholder": "Guyed, Lattice, Concealed, ..."
+}
diff --git a/data/presets/fields/towertype.json b/data/presets/fields/tower/type.json
similarity index 100%
rename from data/presets/fields/towertype.json
rename to data/presets/fields/tower/type.json
diff --git a/data/presets/presets/man_made/mast.json b/data/presets/presets/man_made/mast.json
index 9ce0c49f7..b498ad29b 100644
--- a/data/presets/presets/man_made/mast.json
+++ b/data/presets/presets/man_made/mast.json
@@ -1,4 +1,10 @@
 {
+    "icon": "lighthouse",
+    "fields": [
+        "tower/type",
+        "tower/construction",
+        "height"
+    ],
     "geometry": [
         "point"
     ],
diff --git a/data/presets/presets/man_made/tower.json b/data/presets/presets/man_made/tower.json
index e2285df23..f60381e5d 100644
--- a/data/presets/presets/man_made/tower.json
+++ b/data/presets/presets/man_made/tower.json
@@ -1,6 +1,9 @@
 {
+    "icon": "lighthouse",
     "fields": [
-        "towertype"
+        "tower/type",
+        "tower/construction",
+        "height"
     ],
     "geometry": [
         "point",