diff --git a/data/presets.yaml b/data/presets.yaml
index 45bda88bf..679a263b7 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1394,7 +1394,7 @@ en:
       amenity/pharmacy:
         # amenity=pharmacy
         name: Pharmacy
-        # 'terms: drug,medicine'
+        # 'terms: drug*,med*,prescription'
         terms: '<translate with synonyms or related terms for ''Pharmacy'', separated by commas>'
       amenity/place_of_worship:
         # amenity=place_of_worship
@@ -3209,8 +3209,9 @@ en:
         terms: '<translate with synonyms or related terms for ''Cheese Store'', separated by commas>'
       shop/chemist:
         # shop=chemist
-        name: Chemist
-        terms: '<translate with synonyms or related terms for ''Chemist'', separated by commas>'
+        name: Drugstore
+        # 'terms: med*,drug*,gift'
+        terms: '<translate with synonyms or related terms for ''Drugstore'', separated by commas>'
       shop/chocolate:
         # shop=chocolate
         name: Chocolate Store
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 1f59e0393..b992531f2 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1289,8 +1289,9 @@
             "amenity": "pharmacy"
         },
         "terms": [
-            "drug",
-            "medicine"
+            "drug*",
+            "med*",
+            "prescription"
         ],
         "name": "Pharmacy"
     },
@@ -8288,7 +8289,7 @@
         "name": "Cheese Store"
     },
     "shop/chemist": {
-        "icon": "chemist",
+        "icon": "grocery",
         "fields": [
             "operator",
             "address",
@@ -8302,7 +8303,12 @@
         "tags": {
             "shop": "chemist"
         },
-        "name": "Chemist"
+        "terms": [
+            "med*",
+            "drug*",
+            "gift"
+        ],
+        "name": "Drugstore"
     },
     "shop/chocolate": {
         "icon": "shop",
@@ -33779,7 +33785,7 @@
             "shop": "chemist"
         },
         "name": "dm",
-        "icon": "chemist",
+        "icon": "grocery",
         "geometry": [
             "point",
             "area"
@@ -33798,7 +33804,7 @@
             "shop": "chemist"
         },
         "name": "Müller",
-        "icon": "chemist",
+        "icon": "grocery",
         "geometry": [
             "point",
             "area"
@@ -33817,7 +33823,7 @@
             "shop": "chemist"
         },
         "name": "Schlecker",
-        "icon": "chemist",
+        "icon": "grocery",
         "geometry": [
             "point",
             "area"
@@ -33836,7 +33842,7 @@
             "shop": "chemist"
         },
         "name": "Etos",
-        "icon": "chemist",
+        "icon": "grocery",
         "geometry": [
             "point",
             "area"
@@ -33855,7 +33861,7 @@
             "shop": "chemist"
         },
         "name": "Bipa",
-        "icon": "chemist",
+        "icon": "grocery",
         "geometry": [
             "point",
             "area"
@@ -33874,7 +33880,7 @@
             "shop": "chemist"
         },
         "name": "Rossmann",
-        "icon": "chemist",
+        "icon": "grocery",
         "geometry": [
             "point",
             "area"
@@ -33893,7 +33899,7 @@
             "shop": "chemist"
         },
         "name": "DM Drogeriemarkt",
-        "icon": "chemist",
+        "icon": "grocery",
         "geometry": [
             "point",
             "area"
@@ -33912,7 +33918,7 @@
             "shop": "chemist"
         },
         "name": "Ihr Platz",
-        "icon": "chemist",
+        "icon": "grocery",
         "geometry": [
             "point",
             "area"
@@ -33931,7 +33937,7 @@
             "shop": "chemist"
         },
         "name": "Douglas",
-        "icon": "chemist",
+        "icon": "grocery",
         "geometry": [
             "point",
             "area"
@@ -33950,7 +33956,7 @@
             "shop": "chemist"
         },
         "name": "Kruidvat",
-        "icon": "chemist",
+        "icon": "grocery",
         "geometry": [
             "point",
             "area"
diff --git a/data/presets/presets/amenity/pharmacy.json b/data/presets/presets/amenity/pharmacy.json
index f4a1b5597..6c7a0a046 100644
--- a/data/presets/presets/amenity/pharmacy.json
+++ b/data/presets/presets/amenity/pharmacy.json
@@ -15,8 +15,9 @@
         "amenity": "pharmacy"
     },
     "terms": [
-        "drug",
-        "medicine"
+        "drug*",
+        "med*",
+        "prescription"
     ],
     "name": "Pharmacy"
 }
diff --git a/data/presets/presets/shop/chemist.json b/data/presets/presets/shop/chemist.json
index fec98e1c4..f2f710ffc 100644
--- a/data/presets/presets/shop/chemist.json
+++ b/data/presets/presets/shop/chemist.json
@@ -1,5 +1,5 @@
 {
-    "icon": "chemist",
+    "icon": "grocery",
     "fields": [
         "operator",
         "address",
@@ -13,5 +13,10 @@
     "tags": {
         "shop": "chemist"
     },
-    "name": "Chemist"
+    "terms": [
+        "med*",
+        "drug*",
+        "gift"
+    ],
+    "name": "Drugstore"
 }
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 8c4ee4d27..e0a345bfa 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1814,7 +1814,7 @@
             },
             "amenity/pharmacy": {
                 "name": "Pharmacy",
-                "terms": "drug,medicine"
+                "terms": "drug*,med*,prescription"
             },
             "amenity/place_of_worship": {
                 "name": "Place of Worship",
@@ -3481,8 +3481,8 @@
                 "terms": ""
             },
             "shop/chemist": {
-                "name": "Chemist",
-                "terms": ""
+                "name": "Drugstore",
+                "terms": "med*,drug*,gift"
             },
             "shop/chocolate": {
                 "name": "Chocolate Store",