diff --git a/data/deprecated.json b/data/deprecated.json
index 59200f557..4496618c7 100644
--- a/data/deprecated.json
+++ b/data/deprecated.json
@@ -236,13 +236,21 @@
       "old": {"company": "consulting"},
       "replace": {"office": "consulting"}
     },
+    {
+      "old": {"craft": "catering"},
+      "replace": {"craft": "caterer"}
+    },
     {
       "old": {"craft": "glass"},
       "replace": {"craft": "glaziery"}
     },
     {
-      "old": {"craft": "catering"},
-      "replace": {"craft": "caterer"}
+      "old": {"craft": "jeweler"},
+      "replace": {"shop": "jewelry"}
+    },
+    {
+      "old": {"craft": "optician"},
+      "replace": {"shop": "optician"}
     },
     {
       "old": {"craft": "sculpter"},
diff --git a/data/presets.yaml b/data/presets.yaml
index 04d11c519..ec72c075c 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -4363,9 +4363,6 @@ en:
         # craft=insulation
         name: Insulator
         terms: '<translate with synonyms or related terms for ''Insulator'', separated by commas>'
-      craft/jeweler:
-        # craft=jeweler
-        name: Jeweler
       craft/joiner:
         # craft=joiner
         name: Joiner
@@ -4382,9 +4379,6 @@ en:
         # craft=metal_construction
         name: Metal Construction
         terms: '<translate with synonyms or related terms for ''Metal Construction'', separated by commas>'
-      craft/optician:
-        # craft=optician
-        name: Optician
       craft/painter:
         # craft=painter
         name: Painter
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 2cf145209..ca074e762 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -379,9 +379,7 @@
     "club": {"icon": "fas-handshake", "fields": ["name", "club", "operator", "address", "building_area", "opening_hours"], "moreFields": ["access_simple", "building/levels_building", "email", "fax", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "max_age", "min_age", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"club": "*"}, "terms": ["social"], "name": "Club"},
     "club/sport": {"icon": "maki-pitch", "fields": ["name", "sport", "{club}"], "geometry": ["point", "area"], "tags": {"club": "sport"}, "terms": ["athletics club", "sporting club", "sports association", "sports society"], "name": "Sports Club"},
     "craft": {"icon": "temaki-tools", "fields": ["name", "craft", "operator", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "building/levels_building", "email", "fax", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "phone", "product", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"craft": "*"}, "terms": [], "name": "Craft"},
-    "craft/jeweler": {"icon": "maki-marker-stroked", "geometry": ["point", "area"], "tags": {"craft": "jeweler"}, "reference": {"key": "shop", "value": "jewelry"}, "name": "Jeweler", "searchable": false, "replacement": "shop/jewelry"},
     "craft/locksmith": {"icon": "maki-marker-stroked", "geometry": ["point", "area"], "tags": {"craft": "locksmith"}, "reference": {"key": "shop", "value": "locksmith"}, "name": "Locksmith", "searchable": false},
-    "craft/optician": {"icon": "maki-marker-stroked", "geometry": ["point", "area"], "tags": {"craft": "optician"}, "reference": {"key": "shop", "value": "optician"}, "name": "Optician", "searchable": false, "replacement": "shop/optician"},
     "craft/tailor": {"icon": "maki-clothing-store", "geometry": ["point", "area"], "tags": {"craft": "tailor"}, "reference": {"key": "shop", "value": "tailor"}, "name": "Tailor", "searchable": false},
     "craft/agricultural_engines": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "agricultural_engines"}, "name": "Argricultural Engines Mechanic"},
     "craft/basket_maker": {"icon": "maki-art-gallery", "geometry": ["point", "area"], "tags": {"craft": "basket_maker"}, "name": "Basket Maker"},
diff --git a/data/presets/presets/craft/_jeweler.json b/data/presets/presets/craft/_jeweler.json
deleted file mode 100644
index cf950666f..000000000
--- a/data/presets/presets/craft/_jeweler.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "icon": "maki-marker-stroked",
-    "geometry": [
-        "point",
-        "area"
-    ],
-    "tags": {
-        "craft": "jeweler"
-    },
-    "reference": {
-        "key": "shop",
-        "value": "jewelry"
-    },
-    "name": "Jeweler",
-    "searchable": false,
-    "replacement": "shop/jewelry"
-}
diff --git a/data/presets/presets/craft/_optician.json b/data/presets/presets/craft/_optician.json
deleted file mode 100644
index d608d1278..000000000
--- a/data/presets/presets/craft/_optician.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "icon": "maki-marker-stroked",
-    "geometry": [
-        "point",
-        "area"
-    ],
-    "tags": {
-        "craft": "optician"
-    },
-    "reference": {
-        "key": "shop",
-        "value": "optician"
-    },
-    "name": "Optician",
-    "searchable": false,
-    "replacement": "shop/optician"
-}
diff --git a/data/taginfo.json b/data/taginfo.json
index 435b217b2..136561160 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -374,9 +374,7 @@
     {"key": "club", "description": "🄿 Club, 🄵 Type", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-handshake.svg"},
     {"key": "club", "value": "sport", "description": "🄿 Sports Club", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/pitch-15.svg"},
     {"key": "craft", "description": "🄿 Craft, 🄵 Type", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/tools.svg"},
-    {"key": "craft", "value": "jeweler", "description": "🄿 Jeweler (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/marker-stroked-15.svg"},
     {"key": "craft", "value": "locksmith", "description": "🄿 Locksmith (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/marker-stroked-15.svg"},
-    {"key": "craft", "value": "optician", "description": "🄿 Optician (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/marker-stroked-15.svg"},
     {"key": "craft", "value": "tailor", "description": "🄿 Tailor (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/clothing-store-15.svg"},
     {"key": "craft", "value": "agricultural_engines", "description": "🄿 Argricultural Engines Mechanic", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/tools.svg"},
     {"key": "craft", "value": "basket_maker", "description": "🄿 Basket Maker", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/art-gallery-15.svg"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index d1d2e90b7..4b3bf392c 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -6133,15 +6133,9 @@
                     "name": "Craft",
                     "terms": ""
                 },
-                "craft/jeweler": {
-                    "name": "Jeweler"
-                },
                 "craft/locksmith": {
                     "name": "Locksmith"
                 },
-                "craft/optician": {
-                    "name": "Optician"
-                },
                 "craft/tailor": {
                     "name": "Tailor"
                 },