diff --git a/data/presets.yaml b/data/presets.yaml
index 50674c555..4ae6f70a4 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -309,6 +309,9 @@ en:
       description:
         # 'description=*'
         label: Description
+      dock:
+        # 'dock=*'
+        label: Type
       drive_through:
         # 'drive_through=*'
         label: Drive-Through
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 6ae44fcbc..0d8840a21 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -408,6 +408,11 @@
         "type": "textarea",
         "label": "Description"
     },
+    "dock": {
+        "key": "dock",
+        "type": "combo",
+        "label": "Type"
+    },
     "drive_through": {
         "key": "drive_through",
         "type": "check",
diff --git a/data/presets/fields/dock.json b/data/presets/fields/dock.json
new file mode 100644
index 000000000..97fb471e4
--- /dev/null
+++ b/data/presets/fields/dock.json
@@ -0,0 +1,5 @@
+{
+    "key": "dock",
+    "type": "combo",
+    "label": "Type"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 71331cbc1..3b48bb535 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -971,8 +971,12 @@
         "name": "Fast Food"
     },
     "amenity/ferry_terminal": {
+        "icon": "ferry",
         "fields": [
-            "operator"
+            "network",
+            "operator",
+            "address",
+            "building_area"
         ],
         "geometry": [
             "point",
@@ -2193,6 +2197,7 @@
         "name": "Waste Basket"
     },
     "amenity/water_point": {
+        "icon": "water",
         "geometry": [
             "area",
             "vertex",
@@ -10372,6 +10377,7 @@
         "name": "Waterway"
     },
     "waterway/boatyard": {
+        "icon": "harbor",
         "fields": [
             "operator"
         ],
@@ -10425,6 +10431,11 @@
         "name": "Ditch"
     },
     "waterway/dock": {
+        "icon": "harbor",
+        "fields": [
+            "dock",
+            "operator"
+        ],
         "geometry": [
             "area",
             "vertex",
@@ -10580,6 +10591,7 @@
         "name": "Stream"
     },
     "waterway/water_point": {
+        "icon": "water",
         "geometry": [
             "area",
             "vertex",
diff --git a/data/presets/presets/amenity/ferry_terminal.json b/data/presets/presets/amenity/ferry_terminal.json
index 7b68cf820..3e9c9ca99 100644
--- a/data/presets/presets/amenity/ferry_terminal.json
+++ b/data/presets/presets/amenity/ferry_terminal.json
@@ -1,6 +1,10 @@
 {
-    "fields":[
-       "operator"
+    "icon": "ferry",
+    "fields": [
+        "network",
+        "operator",
+        "address",
+        "building_area"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/amenity/water_point.json b/data/presets/presets/amenity/water_point.json
index 4b6c384bc..0cdce3f52 100644
--- a/data/presets/presets/amenity/water_point.json
+++ b/data/presets/presets/amenity/water_point.json
@@ -1,4 +1,5 @@
 {
+    "icon": "water",
     "geometry": [
         "area",
         "vertex",
diff --git a/data/presets/presets/waterway/boatyard.json b/data/presets/presets/waterway/boatyard.json
index 8bab3cac1..f0cb2ac69 100644
--- a/data/presets/presets/waterway/boatyard.json
+++ b/data/presets/presets/waterway/boatyard.json
@@ -1,5 +1,6 @@
 {
-    "fields":[
+     "icon": "harbor",
+     "fields":[
         "operator"
     ],
     "geometry": [
diff --git a/data/presets/presets/waterway/dock.json b/data/presets/presets/waterway/dock.json
index 0de5fdaef..ce19ea41f 100644
--- a/data/presets/presets/waterway/dock.json
+++ b/data/presets/presets/waterway/dock.json
@@ -1,4 +1,9 @@
 {
+    "icon": "harbor",
+    "fields": [
+        "dock",
+        "operator"
+    ],
     "geometry": [
         "area",
         "vertex",
diff --git a/data/presets/presets/waterway/water_point.json b/data/presets/presets/waterway/water_point.json
index 33de2eb9e..ddebec811 100644
--- a/data/presets/presets/waterway/water_point.json
+++ b/data/presets/presets/waterway/water_point.json
@@ -1,5 +1,6 @@
 {
-    "geometry": [
+     "icon": "water",
+     "geometry": [
         "area",
         "vertex",
         "point"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 6d8f15dad..b43ff25b5 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -883,6 +883,9 @@
             "description": {
                 "label": "Description"
             },
+            "dock": {
+                "label": "Type"
+            },
             "drive_through": {
                 "label": "Drive-Through"
             },