diff --git a/data/locales.js b/data/locales.js
index 01a0c3d8f..08592cf6e 100644
--- a/data/locales.js
+++ b/data/locales.js
@@ -514,6 +514,9 @@ locale.en = {
             "amenity/school": {
                 "name": "School"
             },
+            "amenity/swimming_pool": {
+                "name": "Swimming Pool"
+            },
             "amenity/telephone": {
                 "name": "Telephone"
             },
@@ -643,6 +646,9 @@ locale.en = {
             "leisure": {
                 "name": "Leisure"
             },
+            "leisure/garden": {
+                "name": "Garden"
+            },
             "leisure/golf_course": {
                 "name": "Golf Course"
             },
@@ -670,6 +676,9 @@ locale.en = {
             "leisure/playground": {
                 "name": "Playground"
             },
+            "leisure/swimming_pool": {
+                "name": "Swimming Pool"
+            },
             "man_made": {
                 "name": "Man Made"
             },
diff --git a/data/presets.yaml b/data/presets.yaml
index 589676914..b891f0fa2 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -196,6 +196,8 @@ en:
         name: Restaurant
       amenity/school: 
         name: School
+      amenity/swimming_pool:
+        name: Swimming Pool
       amenity/telephone:
         name: Telephone
       amenity/toilets:
@@ -282,6 +284,8 @@ en:
         name: Vineyard
       leisure: 
         name: Leisure
+      leisure/garden:
+        name: Garden
       leisure/golf_course: 
         name: Golf Course
       leisure/park: 
@@ -300,7 +304,9 @@ en:
         name: Tennis Court
       leisure/playground: 
         name: Playground
-      man_made: 
+      leisure/swimming_pool:
+        name: Swimming Pool
+      man_made:
         name: Man Made
       man_made/lighthouse: 
         name: Lighthouse
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 1cd04e3b2..bd66bb4d4 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -57,10 +57,6 @@
         "key": "construction",
         "type": "combo"
     },
-    "country": {
-        "key": "country",
-        "type": "combo"
-    },
     "crossing": {
         "key": "crossing",
         "type": "combo"
diff --git a/data/presets/presets.json b/data/presets/presets.json
index b112eb807..21de35460 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -689,6 +689,18 @@
             "amenity": "school"
         }
     },
+    "amenity/swimming_pool": {
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "tags": {
+            "amenity": "swimming_pool"
+        },
+        "icon": "swimming",
+        "searchable": false
+    },
     "amenity/telephone": {
         "geometry": [
             "point",
@@ -1323,6 +1335,17 @@
             "leisure": "*"
         }
     },
+    "leisure/garden": {
+        "icon": "garden",
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "tags": {
+            "leisure": "garden"
+        }
+    },
     "leisure/golf_course": {
         "icon": "golf",
         "fields": [
@@ -1478,6 +1501,17 @@
             "sport"
         ]
     },
+    "leisure/swimming_pool": {
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "tags": {
+            "leisure": "swimming_pool"
+        },
+        "icon": "swimming"
+    },
     "man_made": {
         "fields": [
             "man_made"
diff --git a/data/presets/presets/amenity/swimming_pool.json b/data/presets/presets/amenity/swimming_pool.json
new file mode 100644
index 000000000..7cc329dc0
--- /dev/null
+++ b/data/presets/presets/amenity/swimming_pool.json
@@ -0,0 +1,12 @@
+{
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "tags": {
+        "amenity": "swimming_pool"
+    },
+    "icon": "swimming",
+    "searchable": false
+}
\ No newline at end of file
diff --git a/data/presets/presets/leisure/garden.json b/data/presets/presets/leisure/garden.json
new file mode 100644
index 000000000..ebd8cee10
--- /dev/null
+++ b/data/presets/presets/leisure/garden.json
@@ -0,0 +1,11 @@
+{
+    "icon": "garden",
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "tags": {
+        "leisure": "garden"
+    }
+}
\ No newline at end of file
diff --git a/data/presets/presets/leisure/swimming_pool.json b/data/presets/presets/leisure/swimming_pool.json
new file mode 100644
index 000000000..47f2ca841
--- /dev/null
+++ b/data/presets/presets/leisure/swimming_pool.json
@@ -0,0 +1,11 @@
+{
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "tags": {
+        "leisure": "swimming_pool"
+    },
+    "icon": "swimming"
+}
\ No newline at end of file