diff --git a/data/presets/forms.json b/data/presets/forms.json
index 2f0b77256..9a1d96c67 100644
--- a/data/presets/forms.json
+++ b/data/presets/forms.json
@@ -84,5 +84,9 @@
     "layer": {
         "key": "layer",
         "type": "combo"
+    },
+    "water": {
+        "key": "water",
+        "type": "combo"
     }
 }
diff --git a/data/presets/presets.json b/data/presets/presets.json
index a7f49d414..3e331adf6 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -62,7 +62,6 @@
         "name": "water",
         "match": {
             "type": [
-                "point",
                 "area"
             ],
             "tags": {
@@ -70,6 +69,70 @@
             },
             "terms": []
         },
+        "form": [
+            "water"
+        ],
+        "icon": ""
+    },
+    {
+        "name": "lake",
+        "match": {
+            "type": [
+                "area"
+            ],
+            "tags": {
+                "natural": "water",
+                "water": "lake"
+            },
+            "terms": [
+                "lakelet",
+                "loch",
+                "mere"
+            ]
+        },
+        "form": [
+            "water"
+        ],
+        "icon": ""
+    },
+    {
+        "name": "pond",
+        "match": {
+            "type": [
+                "area"
+            ],
+            "tags": {
+                "natural": "water",
+                "water": "pond"
+            },
+            "terms": [
+                "lakelet",
+                "millpond",
+                "tarn",
+                "pool",
+                "mere"
+            ]
+        },
+        "form": [
+            "water"
+        ],
+        "icon": ""
+    },
+    {
+        "name": "reservoir",
+        "match": {
+            "type": [
+                "area"
+            ],
+            "tags": {
+                "natural": "water",
+                "water": "reservoir"
+            },
+            "terms": []
+        },
+        "form": [
+            "water"
+        ],
         "icon": ""
     },
     {
diff --git a/data/presets/presets/natural/water.json b/data/presets/presets/natural/water.json
index 3fbc96e5d..13104086f 100644
--- a/data/presets/presets/natural/water.json
+++ b/data/presets/presets/natural/water.json
@@ -2,7 +2,6 @@
     "name": "water",
     "match": {
         "type": [
-            "point",
             "area"
         ],
         "tags": {
@@ -10,5 +9,8 @@
         },
         "terms": []
     },
+    "form": [
+        "water"
+    ],
     "icon": ""
 }
\ No newline at end of file
diff --git a/data/presets/presets/natural/water/lake.json b/data/presets/presets/natural/water/lake.json
new file mode 100644
index 000000000..f95f13fd3
--- /dev/null
+++ b/data/presets/presets/natural/water/lake.json
@@ -0,0 +1,18 @@
+{
+    "name": "lake",
+    "match": {
+        "type": [
+            "area"
+        ],
+        "tags": {
+            "natural": "water",
+            "water": "lake"
+        },
+        "terms": [
+            "lakelet",
+            "loch",
+            "mere"
+        ]
+    },
+    "icon": ""
+}
\ No newline at end of file
diff --git a/data/presets/presets/natural/water/pond.json b/data/presets/presets/natural/water/pond.json
new file mode 100644
index 000000000..aa617a50f
--- /dev/null
+++ b/data/presets/presets/natural/water/pond.json
@@ -0,0 +1,20 @@
+{
+    "name": "pond",
+    "match": {
+        "type": [
+            "area"
+        ],
+        "tags": {
+            "natural": "water",
+            "water": "pond"
+        },
+        "terms": [
+            "lakelet",
+            "millpond",
+            "tarn",
+            "pool",
+            "mere"
+        ]
+    },
+    "icon": ""
+}
\ No newline at end of file
diff --git a/data/presets/presets/natural/water/reservoir.json b/data/presets/presets/natural/water/reservoir.json
new file mode 100644
index 000000000..3ae542adf
--- /dev/null
+++ b/data/presets/presets/natural/water/reservoir.json
@@ -0,0 +1,15 @@
+{
+    "name": "reservoir",
+    "match": {
+        "type": [
+            "area"
+        ],
+        "tags": {
+            "natural": "water",
+            "water": "reservoir"
+        },
+        "terms": [
+        ]
+    },
+    "icon": ""
+}
\ No newline at end of file
diff --git a/data/presets/presets/order.json b/data/presets/presets/order.json
index 4e2a05329..379f895c2 100644
--- a/data/presets/presets/order.json
+++ b/data/presets/presets/order.json
@@ -2,6 +2,9 @@
     "amenity/cafe",
     "leisure/park",
     "natural/water",
+    "natural/water/lake",
+    "natural/water/pond",
+    "natural/water/reservoir",
     "natural/wetland",
     "natural/wood",
     "natural/coastline",