diff --git a/data/presets/amenity/bicycle_parking/shed.json b/data/presets/amenity/bicycle_parking/shed.json
index f8fa3d03..43d577a8 100644
--- a/data/presets/amenity/bicycle_parking/shed.json
+++ b/data/presets/amenity/bicycle_parking/shed.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-bicycle",
+    "icon": "temaki-bicycle_shed",
     "fields": [
         "{amenity/bicycle_parking}",
         "building_area"
diff --git a/data/presets/attraction/maze.json b/data/presets/attraction/maze.json
index 5e6f3fc5..9835c940 100644
--- a/data/presets/attraction/maze.json
+++ b/data/presets/attraction/maze.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-amusement-park",
+    "icon": "temaki-maze",
     "moreFields": [
         "{attraction}",
         "max_age",
diff --git a/data/presets/building/hut.json b/data/presets/building/hut.json
index 5693655d..c524fe91 100644
--- a/data/presets/building/hut.json
+++ b/data/presets/building/hut.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-home",
+    "icon": "temaki-hut",
     "geometry": [
         "area"
     ],
diff --git a/data/presets/craft/shoemaker.json b/data/presets/craft/shoemaker.json
index cb696656..cc656230 100644
--- a/data/presets/craft/shoemaker.json
+++ b/data/presets/craft/shoemaker.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shoe",
+    "icon": "temaki-hammer_shoe",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/leisure/fitness_station.json b/data/presets/leisure/fitness_station.json
index e78f5dd0..8f131fcb 100644
--- a/data/presets/leisure/fitness_station.json
+++ b/data/presets/leisure/fitness_station.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-pitch",
+    "icon": "temaki-horizontal_bar",
     "fields": [
         "fitness_station",
         "ref",
diff --git a/data/presets/leisure/fitness_station/balance_beam.json b/data/presets/leisure/fitness_station/balance_beam.json
index dc0d02bd..571622e1 100644
--- a/data/presets/leisure/fitness_station/balance_beam.json
+++ b/data/presets/leisure/fitness_station/balance_beam.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-pitch",
+    "icon": "temaki-balance_beam",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/leisure/fitness_station/horizontal_bar.json b/data/presets/leisure/fitness_station/horizontal_bar.json
index 323c8868..74feeee5 100644
--- a/data/presets/leisure/fitness_station/horizontal_bar.json
+++ b/data/presets/leisure/fitness_station/horizontal_bar.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-pitch",
+    "icon": "temaki-horizontal_bar",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/man_made/obelisk.json b/data/presets/man_made/obelisk.json
index 7531d472..4e0c6fdd 100644
--- a/data/presets/man_made/obelisk.json
+++ b/data/presets/man_made/obelisk.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-monument",
+    "icon": "temaki-obelisk",
     "fields": [
         "name",
         "inscription",
diff --git a/data/presets/natural/cape.json b/data/presets/natural/cape.json
index 2130ed5b..42bdf85e 100644
--- a/data/presets/natural/cape.json
+++ b/data/presets/natural/cape.json
@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-beach",
+    "icon": "temaki-cape_landform",
     "fields": [
         "name",
         "ele_node",
diff --git a/data/presets/natural/reef.json b/data/presets/natural/reef.json
index edaa3962..95b0bf65 100644
--- a/data/presets/natural/reef.json
+++ b/data/presets/natural/reef.json
@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-beach",
+    "icon": "temaki-coral_reef",
     "geometry": [
         "area",
         "point"
diff --git a/data/presets/playground/balancebeam.json b/data/presets/playground/balancebeam.json
index 7e7364e7..82dc3791 100644
--- a/data/presets/playground/balancebeam.json
+++ b/data/presets/playground/balancebeam.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-playground",
+    "icon": "temaki-balance_beam",
     "geometry": [
         "point",
         "line"
diff --git a/data/presets/playground/horizontal_bar.json b/data/presets/playground/horizontal_bar.json
index bf0bb5a1..b522621b 100644
--- a/data/presets/playground/horizontal_bar.json
+++ b/data/presets/playground/horizontal_bar.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-pitch",
+    "icon": "temaki-horizontal_bar",
     "geometry": [
         "point"
     ],
diff --git a/data/presets/playground/sandpit.json b/data/presets/playground/sandpit.json
index f391c9d4..91b06d4f 100644
--- a/data/presets/playground/sandpit.json
+++ b/data/presets/playground/sandpit.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-playground",
+    "icon": "temaki-sandbox",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/playground/springy.json b/data/presets/playground/springy.json
index 7b4d029b..caace8f6 100644
--- a/data/presets/playground/springy.json
+++ b/data/presets/playground/springy.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-playground",
+    "icon": "temaki-spring_rider",
     "geometry": [
         "point"
     ],
diff --git a/data/presets/shop/clothes/underwear.json b/data/presets/shop/clothes/underwear.json
index 65b1cb55..4eea770a 100644
--- a/data/presets/shop/clothes/underwear.json
+++ b/data/presets/shop/clothes/underwear.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-clothing-store",
+    "icon": "temaki-bikini",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/shop/shoe_repair.json b/data/presets/shop/shoe_repair.json
index 600d5592..ef55e71b 100644
--- a/data/presets/shop/shoe_repair.json
+++ b/data/presets/shop/shoe_repair.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shoe",
+    "icon": "temaki-hammer_shoe",
     "geometry": [
         "point",
         "area"