diff --git a/data/presets/presets.json b/data/presets/presets.json
index bc00eef50..b4a94b6a6 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1450,6 +1450,7 @@
             "name": "Ice Cream Shop"
         },
         "amenity/internet_cafe": {
+            "icon": "poi-mast",
             "fields": [
                 "operator",
                 "address",
@@ -5323,6 +5324,7 @@
             "name": "Residential Road"
         },
         "highway/rest_area": {
+            "icon": "car",
             "geometry": [
                 "point",
                 "vertex",
@@ -5521,6 +5523,7 @@
             "name": "Parking Aisle"
         },
         "highway/services": {
+            "icon": "car",
             "geometry": [
                 "point",
                 "vertex",
@@ -6799,6 +6802,7 @@
             "name": "Bird Hide"
         },
         "leisure/bowling_alley": {
+            "icon": "poi-bowling",
             "fields": [
                 "operator",
                 "address",
@@ -7376,6 +7380,7 @@
             "name": "Playground"
         },
         "leisure/resort": {
+            "icon": "lodging",
             "fields": [
                 "operator",
                 "address",
@@ -7727,6 +7732,7 @@
             "name": "Observation Tower"
         },
         "man_made/petroleum_well": {
+            "icon": "poi-storage-tank",
             "geometry": [
                 "point"
             ],
@@ -7773,6 +7779,7 @@
             "name": "Pipeline"
         },
         "man_made/pumping_station": {
+            "icon": "water",
             "geometry": [
                 "point",
                 "area"
@@ -8035,6 +8042,7 @@
             "name": "Bare Rock"
         },
         "natural/bay": {
+            "icon": "poi-beach",
             "geometry": [
                 "point",
                 "area"
@@ -8253,6 +8261,7 @@
             "name": "Scrub"
         },
         "natural/spring": {
+            "icon": "water",
             "geometry": [
                 "point",
                 "vertex"
@@ -8946,6 +8955,7 @@
             "name": "Hamlet"
         },
         "place/island": {
+            "icon": "mountain",
             "geometry": [
                 "point",
                 "area"
@@ -8966,6 +8976,7 @@
             "name": "Island"
         },
         "place/isolated_dwelling": {
+            "icon": "home",
             "geometry": [
                 "point",
                 "area"
@@ -8976,7 +8987,7 @@
             "name": "Isolated Dwelling"
         },
         "place/locality": {
-            "icon": "marker",
+            "icon": "triangle-stroked",
             "geometry": [
                 "point",
                 "area"
diff --git a/data/presets/presets/amenity/internet_cafe.json b/data/presets/presets/amenity/internet_cafe.json
index 8133fc505..cae2b31e5 100644
--- a/data/presets/presets/amenity/internet_cafe.json
+++ b/data/presets/presets/amenity/internet_cafe.json
@@ -1,4 +1,5 @@
 {
+    "icon": "poi-mast",
     "fields": [
         "operator",
         "address",
diff --git a/data/presets/presets/highway/rest_area.json b/data/presets/presets/highway/rest_area.json
index 5ce9e4c91..69e808bc2 100644
--- a/data/presets/presets/highway/rest_area.json
+++ b/data/presets/presets/highway/rest_area.json
@@ -1,4 +1,5 @@
 {
+    "icon": "car",
     "geometry": [
         "point",
         "vertex",
diff --git a/data/presets/presets/highway/services.json b/data/presets/presets/highway/services.json
index e2203c813..f460df847 100644
--- a/data/presets/presets/highway/services.json
+++ b/data/presets/presets/highway/services.json
@@ -1,4 +1,5 @@
 {
+    "icon": "car",
     "geometry": [
         "point",
         "vertex",
@@ -13,4 +14,4 @@
         "service station"
     ],
     "name": "Service Area"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/leisure/resort.json b/data/presets/presets/leisure/resort.json
index e37c283d1..dd1010b02 100644
--- a/data/presets/presets/leisure/resort.json
+++ b/data/presets/presets/leisure/resort.json
@@ -1,4 +1,5 @@
 {
+    "icon": "lodging",
     "fields": [
         "operator",
         "address",
diff --git a/data/presets/presets/man_made/petroleum_well.json b/data/presets/presets/man_made/petroleum_well.json
index 8f6f2cfd3..c79db8111 100644
--- a/data/presets/presets/man_made/petroleum_well.json
+++ b/data/presets/presets/man_made/petroleum_well.json
@@ -1,4 +1,5 @@
 {
+    "icon": "poi-storage-tank",
     "geometry": [
         "point"
     ],
diff --git a/data/presets/presets/man_made/pumping_station.json b/data/presets/presets/man_made/pumping_station.json
index b7903e281..b69c5ff77 100644
--- a/data/presets/presets/man_made/pumping_station.json
+++ b/data/presets/presets/man_made/pumping_station.json
@@ -1,5 +1,6 @@
 {
-   "geometry": [
+    "icon": "water",
+    "geometry": [
         "point",
         "area"
     ],
diff --git a/data/presets/presets/natural/bay.json b/data/presets/presets/natural/bay.json
index e16f45dc0..db45ab42c 100644
--- a/data/presets/presets/natural/bay.json
+++ b/data/presets/presets/natural/bay.json
@@ -1,4 +1,5 @@
 {
+    "icon": "poi-beach",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/natural/spring.json b/data/presets/presets/natural/spring.json
index 3e7c70085..447110579 100644
--- a/data/presets/presets/natural/spring.json
+++ b/data/presets/presets/natural/spring.json
@@ -1,4 +1,5 @@
 {
+    "icon": "water",
     "geometry": [
         "point",
         "vertex"
diff --git a/data/presets/presets/place/island.json b/data/presets/presets/place/island.json
index fd847e745..5557b65fa 100644
--- a/data/presets/presets/place/island.json
+++ b/data/presets/presets/place/island.json
@@ -1,4 +1,5 @@
 {
+    "icon": "mountain",
     "geometry": [
         "point",
         "area"
@@ -17,4 +18,4 @@
         "place": "island"
     },
     "name": "Island"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/place/isolated_dwelling.json b/data/presets/presets/place/isolated_dwelling.json
index 91ce14d76..2f1c330fe 100644
--- a/data/presets/presets/place/isolated_dwelling.json
+++ b/data/presets/presets/place/isolated_dwelling.json
@@ -1,4 +1,5 @@
 {
+    "icon": "home",
     "geometry": [
         "point",
         "area"
@@ -7,4 +8,4 @@
         "place": "isolated_dwelling"
     },
     "name": "Isolated Dwelling"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/place/locality.json b/data/presets/presets/place/locality.json
index 58a5bd0d5..002695c6d 100644
--- a/data/presets/presets/place/locality.json
+++ b/data/presets/presets/place/locality.json
@@ -1,5 +1,5 @@
 {
-    "icon": "marker",
+    "icon": "triangle-stroked",
     "geometry": [
         "point",
         "area"