diff --git a/data/presets/advertising/column.json b/data/presets/advertising/column.json
index c823e386..c925ccc5 100644
--- a/data/presets/advertising/column.json
+++ b/data/presets/advertising/column.json
@@ -1,5 +1,5 @@
 {
-    "icon": "roentgen-advertising_column",
+    "icon": "temaki-storage_tank",
     "fields": [
         "{advertising}"
     ],
diff --git a/data/presets/amenity/food_court.json b/data/presets/amenity/food_court.json
index b67194e1..1c64ab75 100644
--- a/data/presets/amenity/food_court.json
+++ b/data/presets/amenity/food_court.json
@@ -1,5 +1,5 @@
 {
-    "icon": "roentgen-food_court",
+    "icon": "maki-restaurant",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/golf/tee.json b/data/presets/golf/tee.json
index 0eb96a11..c88a8ba6 100644
--- a/data/presets/golf/tee.json
+++ b/data/presets/golf/tee.json
@@ -1,5 +1,5 @@
 {
-    "icon": "roentgen-golf_tee",
+    "icon": "maki-golf",
     "fields": [
         "tee",
         "surface"
diff --git a/data/presets/leisure/fitness_station/horizontal_ladder.json b/data/presets/leisure/fitness_station/horizontal_ladder.json
index c4842213..77b1171e 100644
--- a/data/presets/leisure/fitness_station/horizontal_ladder.json
+++ b/data/presets/leisure/fitness_station/horizontal_ladder.json
@@ -1,5 +1,5 @@
 {
-    "icon": "roentgen-horizontal_ladder",
+    "icon": "maki-pitch",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/leisure/fitness_station/rings.json b/data/presets/leisure/fitness_station/rings.json
index 8428731c..f8b0251c 100644
--- a/data/presets/leisure/fitness_station/rings.json
+++ b/data/presets/leisure/fitness_station/rings.json
@@ -1,5 +1,5 @@
 {
-    "icon": "roentgen-rings",
+    "icon": "maki-pitch",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/playground/hopscotch.json b/data/presets/playground/hopscotch.json
index d296118b..1a27f385 100644
--- a/data/presets/playground/hopscotch.json
+++ b/data/presets/playground/hopscotch.json
@@ -1,5 +1,5 @@
 {
-    "icon": "roentgen-hopscotch",
+    "icon": "maki-playground",
     "geometry": [
         "point",
         "line",
diff --git a/data/presets/public_transport/station_bus.json b/data/presets/public_transport/station_bus.json
index 9d5b0094..0b136c87 100644
--- a/data/presets/public_transport/station_bus.json
+++ b/data/presets/public_transport/station_bus.json
@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-board_bus",
+    "icon": "temaki-bus",
     "fields": [
         "{public_transport/station}"
     ],
diff --git a/data/presets/public_transport/station_ferry.json b/data/presets/public_transport/station_ferry.json
index 3a69851e..52edd223 100644
--- a/data/presets/public_transport/station_ferry.json
+++ b/data/presets/public_transport/station_ferry.json
@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-board_ferry",
+    "icon": "temaki-ferry",
     "fields": [
         "{public_transport/station}"
     ],
diff --git a/data/presets/public_transport/station_light_rail.json b/data/presets/public_transport/station_light_rail.json
index d5ab8a8e..18d4953b 100644
--- a/data/presets/public_transport/station_light_rail.json
+++ b/data/presets/public_transport/station_light_rail.json
@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-board_light_rail",
+    "icon": "temaki-light_rail",
     "fields": [
         "{public_transport/station}"
     ],
diff --git a/data/presets/public_transport/station_monorail.json b/data/presets/public_transport/station_monorail.json
index f1d10343..bab24a90 100644
--- a/data/presets/public_transport/station_monorail.json
+++ b/data/presets/public_transport/station_monorail.json
@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-board_monorail",
+    "icon": "temaki-monorail",
     "fields": [
         "{public_transport/station}"
     ],
diff --git a/data/presets/public_transport/station_subway.json b/data/presets/public_transport/station_subway.json
index eaccb51d..92af563f 100644
--- a/data/presets/public_transport/station_subway.json
+++ b/data/presets/public_transport/station_subway.json
@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-board_subway",
+    "icon": "temaki-subway",
     "fields": [
         "{public_transport/station}"
     ],
diff --git a/data/presets/public_transport/station_train.json b/data/presets/public_transport/station_train.json
index c9067e0a..7a6fb6fc 100644
--- a/data/presets/public_transport/station_train.json
+++ b/data/presets/public_transport/station_train.json
@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-board_train",
+    "icon": "temaki-train",
     "fields": [
         "{public_transport/station}"
     ],
diff --git a/data/presets/public_transport/station_tram.json b/data/presets/public_transport/station_tram.json
index 8334906e..3919d740 100644
--- a/data/presets/public_transport/station_tram.json
+++ b/data/presets/public_transport/station_tram.json
@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-board_tram",
+    "icon": "temaki-tram",
     "fields": [
         "{public_transport/station}"
     ],
diff --git a/data/presets/railway/_station.json b/data/presets/railway/_station.json
index 73680a42..815857c1 100644
--- a/data/presets/railway/_station.json
+++ b/data/presets/railway/_station.json
@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-board_train",
+    "icon": "temaki-train",
     "fields": [
         "{public_transport/station}"
     ],
diff --git a/data/presets/shop/mall.json b/data/presets/shop/mall.json
index d356ce34..00b43c07 100644
--- a/data/presets/shop/mall.json
+++ b/data/presets/shop/mall.json
@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-shopping_mall",
+    "icon": "maki-shop",
     "geometry": [
         "point",
         "area"