diff --git a/data/presets/presets.json b/data/presets/presets.json
index abfffb008..16c175e0c 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -975,6 +975,25 @@
             "address"
         ]
     },
+    {
+        "name": "toilets",
+        "match": {
+            "type": [
+                "point",
+                "area"
+            ],
+            "terms": [],
+            "tags": {
+                "amenity": "toilets"
+            }
+        },
+        "icon": "",
+        "form": [
+            "operator",
+            "building",
+            "address"
+        ]
+    },
     {
         "name": "hotel",
         "match": {
diff --git a/data/presets/presets/amenity/toilets.json b/data/presets/presets/amenity/toilets.json
new file mode 100644
index 000000000..a1cc316c7
--- /dev/null
+++ b/data/presets/presets/amenity/toilets.json
@@ -0,0 +1,20 @@
+{
+    "name": "toilets",
+    "match": {
+        "type": [
+            "point",
+            "area"
+        ],
+        "terms": [
+        ],
+        "tags": {
+            "amenity": "toilets"
+        }
+    },
+    "icon": "",
+    "form": [
+        "operator",
+        "building",
+        "address"
+    ]
+}
\ No newline at end of file
diff --git a/data/presets/presets/order.json b/data/presets/presets/order.json
index 528c0433a..0efa87fe5 100644
--- a/data/presets/presets/order.json
+++ b/data/presets/presets/order.json
@@ -40,6 +40,7 @@
     "amenity/fire_station",
     "amenity/police",
     "amenity/library",
+    "amenity/toilets",
     "tourism/hotel",
     "tourism/museum",
     "amenity/townhall",