diff --git a/data/presets/presets.json b/data/presets/presets.json
index ae23e1651..15b44a5ab 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -545,6 +545,22 @@
             "postbox"
         ]
     },
+    {
+        "name": "post office",
+        "icon": "post",
+        "fields": [
+            "operator",
+            "collection_times"
+        ],
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "tags": {
+            "amenity": "post_office"
+        }
+    },
     {
         "name": "pub",
         "icon": "beer",
@@ -1116,6 +1132,17 @@
         },
         "terms": []
     },
+    {
+        "name": "basin",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "landuse": "basin"
+        },
+        "terms": []
+    },
     {
         "name": "cemetery",
         "icon": "cemetery",
@@ -1347,6 +1374,22 @@
         },
         "terms": []
     },
+    {
+        "name": "american football field",
+        "icon": "america-football",
+        "fields": [
+            "surface"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "leisure": "pitch",
+            "sport": "american_football"
+        },
+        "terms": []
+    },
     {
         "name": "baseball diamond",
         "icon": "baseball",
@@ -1453,6 +1496,17 @@
             "man_made": "pier"
         }
     },
+    {
+        "name": "water tower",
+        "icon": "water",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "man_made": "water_tower"
+        }
+    },
     {
         "name": "natural",
         "fields": [
@@ -1783,6 +1837,19 @@
             "place": "village"
         }
     },
+    {
+        "name": "substation",
+        "fields": [
+            "operator"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "power": "substation"
+        }
+    },
     {
         "name": "railway",
         "fields": [
@@ -1867,6 +1934,23 @@
         },
         "terms": []
     },
+    {
+        "name": "butcher",
+        "icon": "slaughterhouse",
+        "fields": [
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "terms": [],
+        "tags": {
+            "shop": "butcher"
+        }
+    },
     {
         "name": "supermarket",
         "icon": "grocery",
diff --git a/data/presets/presets/amenity/post_office.json b/data/presets/presets/amenity/post_office.json
new file mode 100644
index 000000000..d17e2d012
--- /dev/null
+++ b/data/presets/presets/amenity/post_office.json
@@ -0,0 +1,16 @@
+{
+    "name": "post office",
+    "icon": "post",
+    "fields": [
+        "operator",
+        "collection_times"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "tags": {
+        "amenity": "post_office"
+    }
+}