diff --git a/data/presets/presets.json b/data/presets/presets.json
index 0503fdbf2..e0836af1d 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1,4 +1,42 @@
 [
+    {
+        "name": "airport",
+        "match": {
+            "type": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "airplane",
+                "airport",
+                "aerodrome"
+            ],
+            "tags": {
+                "aeroway": "aerodrome"
+            }
+        },
+        "icon": "airport",
+        "form": []
+    },
+    {
+        "name": "helipad",
+        "match": {
+            "type": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "helicopter",
+                "helipad",
+                "heliport"
+            ],
+            "tags": {
+                "aeroway": "helipad"
+            }
+        },
+        "icon": "heliport",
+        "form": []
+    },
     {
         "name": "cafe",
         "match": {
@@ -1247,7 +1285,7 @@
             "terms": []
         },
         "form": [],
-        "icon": ""
+        "icon": "cemetery"
     },
     {
         "name": "commercial",
diff --git a/data/presets/presets/landuse/cemetery.json b/data/presets/presets/landuse/cemetery.json
index 3738832c8..7b5940267 100644
--- a/data/presets/presets/landuse/cemetery.json
+++ b/data/presets/presets/landuse/cemetery.json
@@ -12,5 +12,5 @@
     },
     "form": [
     ],
-    "icon": ""
+    "icon": "cemetery"
 }
\ No newline at end of file