diff --git a/data/presets.yaml b/data/presets.yaml
index ce003e707..00a999d3a 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -7032,6 +7032,11 @@ en:
         name: Hifi Store
         # 'terms: audio,hi-fi,high fidelity,stereo,video'
         terms: '<translate with synonyms or related terms for ''Hifi Store'', separated by commas>'
+      shop/hobby:
+        # shop=hobby
+        name: Hobby Shop
+        # 'terms: manga,figurine,model'
+        terms: '<translate with synonyms or related terms for ''Hobby Shop'', separated by commas>'
       shop/houseware:
         # shop=houseware
         name: Houseware Store
diff --git a/data/presets/presets.json b/data/presets/presets.json
index e46a1bc51..96419636b 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1043,6 +1043,7 @@
     "shop/hearing_aids": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "hearing_aids"}, "name": "Hearing Aids Store"},
     "shop/herbalist": {"icon": "fas-leaf", "geometry": ["point", "area"], "tags": {"shop": "herbalist"}, "name": "Herbalist"},
     "shop/hifi": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["audio", "hi-fi", "high fidelity", "stereo", "video"], "tags": {"shop": "hifi"}, "name": "Hifi Store"},
+    "shop/hobby": {"icon": "fas-dragon", "geometry": ["point", "area"], "tags": {"shop": "hobby"}, "terms": ["manga", "figurine", "model"], "name": "Hobby Shop"},
     "shop/houseware": {"icon": "fas-blender", "geometry": ["point", "area"], "terms": ["home", "household", "kitchenware"], "tags": {"shop": "houseware"}, "name": "Houseware Store"},
     "shop/hunting": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "hunting"}, "terms": ["arrows", "bows", "bullets", "crossbows", "rifles", "traps"], "name": "Hunting Shop"},
     "shop/interior_decoration": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "interior_decoration"}, "name": "Interior Decoration Store"},
@@ -4027,6 +4028,7 @@
     "shop/hearing_aids/Neuroth": {"name": "Neuroth", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/NeurothAG/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q15836645", "shop": "hearing_aids"}, "addTags": {"brand": "Neuroth", "brand:wikidata": "Q15836645", "brand:wikipedia": "de:Neuroth AG", "name": "Neuroth", "shop": "hearing_aids"}, "countryCodes": ["at", "de"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/hifi/Bang & Olufsen": {"name": "Bang & Olufsen", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/bangolufsenusa/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q790020", "shop": "hifi"}, "addTags": {"brand": "Bang & Olufsen", "brand:wikidata": "Q790020", "brand:wikipedia": "en:Bang & Olufsen", "name": "Bang & Olufsen", "shop": "hifi"}, "terms": [], "matchScore": 2, "suggestion": true},
     "shop/hifi/Bose": {"name": "Bose", "icon": "maki-shop", "imageURL": "https://commons.wikimedia.org/w/index.php?title=Special%3ARedirect%2Ffile%2FBose%20logo.svg&width=100", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q328568", "shop": "hifi"}, "addTags": {"brand": "Bose", "brand:wikidata": "Q328568", "brand:wikipedia": "en:Bose Corporation", "name": "Bose", "shop": "hifi"}, "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/hobby/アニメイト": {"name": "アニメイト", "icon": "fas-dragon", "imageURL": "https://pbs.twimg.com/profile_images/1098862296787382272/pLo1nSbN_bigger.png", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1041890", "shop": "hobby"}, "addTags": {"brand": "アニメイト", "brand:en": "Animate", "brand:ja": "アニメイト", "brand:wikidata": "Q1041890", "brand:wikipedia": "ja:アニメイト", "name": "アニメイト", "name:en": "Animate", "name:ja": "アニメイト", "shop": "hobby"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/houseware/At Home": {"name": "At Home", "icon": "fas-blender", "imageURL": "https://graph.facebook.com/AtHomeStores/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5522290", "shop": "houseware"}, "addTags": {"brand": "At Home (store)", "brand:wikidata": "Q5522290", "name": "At Home", "shop": "houseware"}, "countryCodes": ["us"], "terms": ["garden ridge"], "matchScore": 2, "suggestion": true},
     "shop/houseware/Bed Bath & Beyond": {"name": "Bed Bath & Beyond", "icon": "fas-blender", "imageURL": "https://graph.facebook.com/BedBathAndBeyond/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q813782", "shop": "houseware"}, "addTags": {"brand": "Bed Bath & Beyond", "brand:wikidata": "Q813782", "brand:wikipedia": "en:Bed Bath & Beyond", "name": "Bed Bath & Beyond", "shop": "houseware"}, "countryCodes": ["ca", "mx", "nz", "us"], "terms": ["bed bath and beyond"], "matchScore": 2, "suggestion": true},
     "shop/houseware/Blokker": {"name": "Blokker", "icon": "fas-blender", "imageURL": "https://graph.facebook.com/BlokkerNL/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q884934", "shop": "houseware"}, "addTags": {"brand": "Blokker", "brand:wikidata": "Q884934", "brand:wikipedia": "en:Blokker Holding", "name": "Blokker", "shop": "houseware"}, "countryCodes": ["be", "nl"], "terms": [], "matchScore": 2, "suggestion": true},
diff --git a/data/presets/presets/shop/hobby.json b/data/presets/presets/shop/hobby.json
new file mode 100644
index 000000000..2d06d06ca
--- /dev/null
+++ b/data/presets/presets/shop/hobby.json
@@ -0,0 +1,16 @@
+{
+    "icon": "fas-dragon",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "hobby"
+    },
+    "terms": [
+        "manga",
+        "figurine",
+        "model"
+    ],
+    "name": "Hobby Shop"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 5bc6cebf8..1aee02ff2 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -980,6 +980,7 @@
     {"key": "shop", "value": "hearing_aids", "description": "🄿 Hearing Aids Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
     {"key": "shop", "value": "herbalist", "description": "🄿 Herbalist", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-leaf.svg?sanitize=true"},
     {"key": "shop", "value": "hifi", "description": "🄿 Hifi Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
+    {"key": "shop", "value": "hobby", "description": "🄿 Hobby Shop", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-dragon.svg?sanitize=true"},
     {"key": "shop", "value": "houseware", "description": "🄿 Houseware Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-blender.svg?sanitize=true"},
     {"key": "shop", "value": "hunting", "description": "🄿 Hunting Shop", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
     {"key": "shop", "value": "interior_decoration", "description": "🄿 Interior Decoration Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 30db9c28c..cb357a96c 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -8509,6 +8509,10 @@
                     "name": "Hifi Store",
                     "terms": "audio,hi-fi,high fidelity,stereo,video"
                 },
+                "shop/hobby": {
+                    "name": "Hobby Shop",
+                    "terms": "manga,figurine,model"
+                },
                 "shop/houseware": {
                     "name": "Houseware Store",
                     "terms": "home,household,kitchenware"