diff --git a/data/presets/presets.json b/data/presets/presets.json
index ba163eb62..de6ef4697 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1522,6 +1522,7 @@
             "name": "Library"
         },
         "amenity/marketplace": {
+            "icon": "shop",
             "fields": [
                 "operator",
                 "address",
@@ -2109,6 +2110,7 @@
             "name": "Restaurant"
         },
         "amenity/sanitary_dump_station": {
+            "icon": "poi-storage-tank",
             "fields": [
                 "operator",
                 "access_toilets",
@@ -4071,7 +4073,7 @@
             "name": "HVAC"
         },
         "craft/insulator": {
-            "icon": "marker-stroked",
+            "icon": "poi-tool",
             "fields": [
                 "operator",
                 "address",
@@ -6481,6 +6483,7 @@
             "name": "Nuclear Explosion Site"
         },
         "landuse/military/obstacle_course": {
+            "icon": "pitch",
             "geometry": [
                 "point",
                 "area"
@@ -6731,6 +6734,7 @@
             "name": "Vineyard"
         },
         "leisure": {
+            "icon": "pitch",
             "fields": [
                 "leisure"
             ],
@@ -6802,7 +6806,7 @@
             "name": "Bowling Alley"
         },
         "leisure/common": {
-            "icon": "pitch",
+            "icon": "poi-foot",
             "geometry": [
                 "point",
                 "area"
@@ -7695,6 +7699,7 @@
             "name": "Mast"
         },
         "man_made/observation": {
+            "icon": "poi-tower",
             "geometry": [
                 "point",
                 "area"
@@ -7884,6 +7889,7 @@
             "name": "Survey Point"
         },
         "man_made/tower": {
+            "icon": "poi-tower",
             "fields": [
                 "tower/type",
                 "tower/construction",
@@ -8986,6 +8992,7 @@
             "name": "Neighborhood"
         },
         "place/square": {
+            "icon": "poi-foot",
             "geometry": [
                 "point",
                 "area"
@@ -11759,6 +11766,7 @@
             "name": "Wine Shop"
         },
         "tourism": {
+            "icon": "attraction",
             "fields": [
                 "tourism"
             ],
@@ -12207,6 +12215,7 @@
             "name": "Theme Park"
         },
         "tourism/viewpoint": {
+            "icon": "attraction",
             "geometry": [
                 "point",
                 "vertex"
@@ -12973,6 +12982,7 @@
             "name": "Riverbank"
         },
         "waterway/sanitary_dump_station": {
+            "icon": "poi-storage-tank",
             "fields": [
                 "operator",
                 "access_toilets",
diff --git a/data/presets/presets/amenity/marketplace.json b/data/presets/presets/amenity/marketplace.json
index 1b91ce0e1..dffd4fe95 100644
--- a/data/presets/presets/amenity/marketplace.json
+++ b/data/presets/presets/amenity/marketplace.json
@@ -1,4 +1,5 @@
 {
+    "icon": "shop",
     "fields": [
         "operator",
         "address",
diff --git a/data/presets/presets/amenity/sanitary_dump_station.json b/data/presets/presets/amenity/sanitary_dump_station.json
index 3263b8d9b..77c057d55 100644
--- a/data/presets/presets/amenity/sanitary_dump_station.json
+++ b/data/presets/presets/amenity/sanitary_dump_station.json
@@ -1,4 +1,5 @@
 {
+    "icon": "poi-storage-tank",
     "fields": [
         "operator",
         "access_toilets",
diff --git a/data/presets/presets/craft/insulator.json b/data/presets/presets/craft/insulator.json
index fd6ad73f3..a37427766 100644
--- a/data/presets/presets/craft/insulator.json
+++ b/data/presets/presets/craft/insulator.json
@@ -1,5 +1,5 @@
 {
-    "icon": "marker-stroked",
+    "icon": "poi-tool",
     "fields": [
         "operator",
         "address",
diff --git a/data/presets/presets/landuse/military/obstacle_course.json b/data/presets/presets/landuse/military/obstacle_course.json
index b17bfca61..79d98123f 100644
--- a/data/presets/presets/landuse/military/obstacle_course.json
+++ b/data/presets/presets/landuse/military/obstacle_course.json
@@ -1,4 +1,5 @@
 {
+    "icon": "pitch",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/leisure.json b/data/presets/presets/leisure.json
index b21ef8a46..eefb20ee2 100644
--- a/data/presets/presets/leisure.json
+++ b/data/presets/presets/leisure.json
@@ -1,4 +1,5 @@
 {
+    "icon": "pitch",
     "fields": [
         "leisure"
     ],
diff --git a/data/presets/presets/leisure/common.json b/data/presets/presets/leisure/common.json
index ad5fbc139..1e7c71340 100644
--- a/data/presets/presets/leisure/common.json
+++ b/data/presets/presets/leisure/common.json
@@ -1,5 +1,5 @@
 {
-    "icon": "pitch",
+    "icon": "poi-foot",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/place/square.json b/data/presets/presets/place/square.json
index b08ef8ec9..85db207d2 100644
--- a/data/presets/presets/place/square.json
+++ b/data/presets/presets/place/square.json
@@ -1,4 +1,5 @@
 {
+    "icon": "poi-foot",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/tourism.json b/data/presets/presets/tourism.json
index 88534c627..2e830d6fe 100644
--- a/data/presets/presets/tourism.json
+++ b/data/presets/presets/tourism.json
@@ -1,4 +1,5 @@
 {
+    "icon": "attraction",
     "fields": [
         "tourism"
     ],
@@ -11,4 +12,4 @@
         "tourism": "*"
     },
     "name": "Tourism"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/tourism/viewpoint.json b/data/presets/presets/tourism/viewpoint.json
index 950b8e672..1ea6b8c44 100644
--- a/data/presets/presets/tourism/viewpoint.json
+++ b/data/presets/presets/tourism/viewpoint.json
@@ -1,4 +1,5 @@
 {
+    "icon": "attraction",
     "geometry": [
         "point",
         "vertex"
@@ -7,4 +8,4 @@
         "tourism": "viewpoint"
     },
     "name": "Viewpoint"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/waterway/sanitary_dump_station.json b/data/presets/presets/waterway/sanitary_dump_station.json
index 5a715d8a1..e81bbc1c8 100644
--- a/data/presets/presets/waterway/sanitary_dump_station.json
+++ b/data/presets/presets/waterway/sanitary_dump_station.json
@@ -1,4 +1,5 @@
 {
+    "icon": "poi-storage-tank",
     "fields": [
         "operator",
         "access_toilets",