diff --git a/data/presets/amenity/restaurant/barbeque.json b/data/presets/amenity/restaurant/barbeque.json
new file mode 100644
index 00000000..c389dee6
--- /dev/null
+++ b/data/presets/amenity/restaurant/barbeque.json
@@ -0,0 +1,29 @@
+{
+    "icon": "maki-restaurant-bbq",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "bar",
+        "bbq",
+        "canteen",
+        "dine",
+        "dining",
+        "dinner",
+        "drive-in",
+        "eat",
+        "grill",
+        "lunch",
+        "table"
+    ],
+    "tags": {
+        "amenity": "restaurant",
+        "cuisine": "barbeque"
+    },
+    "reference": {
+        "key": "cuisine",
+        "value": "barbeque"
+    },
+    "name": "Barbeque Restaurant"
+}
diff --git a/data/presets/barrier/toll_booth.json b/data/presets/barrier/toll_booth.json
index 262a4d97..97381ba2 100644
--- a/data/presets/barrier/toll_booth.json
+++ b/data/presets/barrier/toll_booth.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-roadblock",
+    "icon": "maki-toll",
     "fields": [
         "access",
         "building_area",
diff --git a/data/presets/highway/rest_area.json b/data/presets/highway/rest_area.json
index 3e023e59..5f6b5a6c 100644
--- a/data/presets/highway/rest_area.json
+++ b/data/presets/highway/rest_area.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-car",
+    "icon": "maki-highway-rest-area",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/leisure/track/cycling.json b/data/presets/leisure/track/cycling.json
index df7af1dd..5afaf4f1 100644
--- a/data/presets/leisure/track/cycling.json
+++ b/data/presets/leisure/track/cycling.json
@@ -1,5 +1,5 @@
 {
-    "icon": "fas-biking",
+    "icon": "maki-racetrack-cycling",
     "fields": [
         "name",
         "surface",
diff --git a/data/presets/leisure/track/horse_racing.json b/data/presets/leisure/track/horse_racing.json
index f040f503..03e78016 100644
--- a/data/presets/leisure/track/horse_racing.json
+++ b/data/presets/leisure/track/horse_racing.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-horse-riding",
+    "icon": "maki-racetrack-horse",
     "fields": [
         "name",
         "surface",
diff --git a/data/presets/leisure/track/running.json b/data/presets/leisure/track/running.json
index 3b63a4d7..2c09500f 100644
--- a/data/presets/leisure/track/running.json
+++ b/data/presets/leisure/track/running.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-pitch",
+    "icon": "fas-running",
     "fields": [
         "name",
         "surface",
diff --git a/data/presets/man_made/tower/observation.json b/data/presets/man_made/tower/observation.json
index e5998200..ac69ea03 100644
--- a/data/presets/man_made/tower/observation.json
+++ b/data/presets/man_made/tower/observation.json
@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-tower",
+    "icon": "maki-observation-tower",
     "moreFields": [
         "{man_made/tower}",
         "opening_hours",
diff --git a/data/presets/natural/hot_spring.json b/data/presets/natural/hot_spring.json
index c85381c8..d6537d60 100644
--- a/data/presets/natural/hot_spring.json
+++ b/data/presets/natural/hot_spring.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-water",
+    "icon": "maki-hot-spring",
     "fields": [
         "name",
         "intermittent"