diff --git a/data/presets.yaml b/data/presets.yaml
index fb93cbb62..e9f9b1665 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -8233,7 +8233,7 @@ en:
       shop/model:
         # shop=model
         name: Model Shop
-        # 'terms: Toys,Games,Crafts'
+        # 'terms: hobby,model building,model figures,model kits,model store,scale models'
         terms: '<translate with synonyms or related terms for ''Model Shop'', separated by commas>'
       shop/money_lender:
         # shop=money_lender
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 93459b1fd..e82019937 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1155,7 +1155,7 @@
   "shop/medical_supply": {"icon": "fas-crutch", "geometry": ["point", "area"], "tags": {"shop": "medical_supply"}, "name": "Medical Supply Store"},
   "shop/military_surplus": {"icon": "temaki-military", "geometry": ["point", "area"], "terms": ["armor", "army-navy store", "army surplus", "navy surplus", "tactical gear", "war surplus shop", "weapons"], "tags": {"shop": "military_surplus"}, "name": "Military Surplus Store"},
   "shop/mobile_phone": {"icon": "fas-mobile-alt", "geometry": ["point", "area"], "tags": {"shop": "mobile_phone"}, "name": "Mobile Phone Store"},
-  "shop/model": {"icon": "fas-dice", "geometry": ["point", "area"], "tags": {"shop": "model"}, "terms": ["Toys", "Games", "Crafts"], "name": "Model Shop"},
+  "shop/model": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "model"}, "terms": ["hobby", "model building", "model figures", "model kits", "model store", "scale models"], "name": "Model Shop"},
   "shop/money_lender": {"icon": "temaki-money_hand", "fields": ["{shop}", "currency_multi"], "geometry": ["point", "area"], "tags": {"shop": "money_lender"}, "name": "Money Lender"},
   "shop/motorcycle_repair": {"icon": "temaki-motorcycle_repair", "fields": ["{shop}", "service/vehicle"], "geometry": ["point", "area"], "terms": ["auto", "bike", "garage", "motorcycle", "repair", "service"], "tags": {"shop": "motorcycle_repair"}, "name": "Motorcycle Repair Shop"},
   "shop/motorcycle": {"icon": "fas-motorcycle", "fields": ["name", "brand", "{shop}"], "geometry": ["point", "area"], "terms": ["bike"], "tags": {"shop": "motorcycle"}, "name": "Motorcycle Dealership"},
diff --git a/data/presets/presets/shop/model.json b/data/presets/presets/shop/model.json
index 84c0a89a9..f27b3e060 100644
--- a/data/presets/presets/shop/model.json
+++ b/data/presets/presets/shop/model.json
@@ -1,9 +1,19 @@
 {
-    "icon": "fas-dice",
-    "geometry": ["point", "area"],
+    "icon": "maki-shop",
+    "geometry": [
+        "point",
+        "area"
+    ],
     "tags": {
         "shop": "model"
     },
-    "terms": ["Toys", "Games", "Crafts"],
+    "terms": [
+        "hobby",
+        "model building",
+        "model figures",
+        "model kits",
+        "model store",
+        "scale models"
+    ],
     "name": "Model Shop"
 }
diff --git a/data/taginfo.json b/data/taginfo.json
index 83b766d96..bc2dacdf5 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1100,7 +1100,7 @@
     {"key": "shop", "value": "medical_supply", "description": "🄿 Medical Supply Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-crutch.svg"},
     {"key": "shop", "value": "military_surplus", "description": "🄿 Military Surplus Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/military.svg"},
     {"key": "shop", "value": "mobile_phone", "description": "🄿 Mobile Phone Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-mobile-alt.svg"},
-    {"key": "shop", "value": "model", "description": "🄿 Model Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-dice.svg"},
+    {"key": "shop", "value": "model", "description": "🄿 Model Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
     {"key": "shop", "value": "money_lender", "description": "🄿 Money Lender", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/money_hand.svg"},
     {"key": "shop", "value": "motorcycle_repair", "description": "🄿 Motorcycle Repair Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/motorcycle_repair.svg"},
     {"key": "shop", "value": "motorcycle", "description": "🄿 Motorcycle Dealership", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-motorcycle.svg"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 7ab2932e2..035a67642 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -9751,7 +9751,7 @@
                 },
                 "shop/model": {
                     "name": "Model Shop",
-                    "terms": "Toys,Games,Crafts"
+                    "terms": "hobby,model building,model figures,model kits,model store,scale models"
                 },
                 "shop/money_lender": {
                     "name": "Money Lender",