diff --git a/data/presets.yaml b/data/presets.yaml
index f54ab3487..3fc8bfc35 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -7317,7 +7317,7 @@ en:
       shop/farm:
         # shop=farm
         name: Produce Stand
-        # 'terms: farm shop,farm stand'
+        # 'terms: baked goods,farm shop,farm stand,fresh food,fruits,greengrocer,organics,vegetables'
         terms: '<translate with synonyms or related terms for ''Produce Stand'', separated by commas>'
       shop/fashion:
         # shop=fashion
diff --git a/data/presets/presets.json b/data/presets/presets.json
index aa2152163..325a931c1 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1045,7 +1045,7 @@
     "shop/erotic": {"icon": "maki-shop", "fields": ["{shop}", "min_age"], "geometry": ["point", "area"], "terms": ["sex", "porn"], "tags": {"shop": "erotic"}, "name": "Erotic Store"},
     "shop/erotic/lgbtq": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["sex", "porn"], "tags": {"shop": "erotic", "lgbtq": "primary"}, "name": "LGBTQ+ Erotic Store"},
     "shop/fabric": {"icon": "fas-tape", "geometry": ["point", "area"], "terms": ["sew"], "tags": {"shop": "fabric"}, "name": "Fabric Store"},
-    "shop/farm": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["farm shop", "farm stand"], "tags": {"shop": "farm"}, "name": "Produce Stand"},
+    "shop/farm": {"icon": "fas-apple-alt", "geometry": ["point", "area"], "terms": ["baked goods", "farm shop", "farm stand", "fresh food", "fruits", "greengrocer", "organics", "vegetables"], "tags": {"shop": "farm"}, "name": "Produce Stand"},
     "shop/fashion_accessories": {"icon": "maki-shop", "fields": ["name", "clothes", "{shop}"], "geometry": ["point", "area"], "tags": {"shop": "fashion_accessories"}, "terms": ["bag", "cologne", "fragrance", "hat", "jewellery", "purfume", "purse", "scarf", "sunglasses", "umbrella", "wallet", "watch"], "name": "Fashion Accessories Store"},
     "shop/fireplace": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["fireplace", "stove", "masonry heater"], "tags": {"shop": "fireplace"}, "name": "Fireplace Store"},
     "shop/fishing": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "fishing"}, "terms": ["bait", "fishing line", "flies", "fly", "lure", "reel", "rod", "tackle"], "name": "Fishing Shop"},
diff --git a/data/presets/presets/shop/farm.json b/data/presets/presets/shop/farm.json
index 5be1cc712..8e64a36b8 100644
--- a/data/presets/presets/shop/farm.json
+++ b/data/presets/presets/shop/farm.json
@@ -1,12 +1,18 @@
 {
-    "icon": "maki-shop",
+    "icon": "fas-apple-alt",
     "geometry": [
         "point",
         "area"
     ],
     "terms": [
+        "baked goods",
         "farm shop",
-        "farm stand"
+        "farm stand",
+        "fresh food",
+        "fruits",
+        "greengrocer",
+        "organics",
+        "vegetables"
     ],
     "tags": {
         "shop": "farm"
diff --git a/data/taginfo.json b/data/taginfo.json
index f9167a47c..8b7270bb6 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -988,7 +988,7 @@
     {"key": "shop", "value": "electronics", "description": "🄿 Electronics Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-plug.svg"},
     {"key": "shop", "value": "erotic", "description": "🄿 Erotic Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
     {"key": "shop", "value": "fabric", "description": "🄿 Fabric Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-tape.svg"},
-    {"key": "shop", "value": "farm", "description": "🄿 Produce Stand", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
+    {"key": "shop", "value": "farm", "description": "🄿 Produce Stand", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-apple-alt.svg"},
     {"key": "shop", "value": "fashion_accessories", "description": "🄿 Fashion Accessories Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
     {"key": "shop", "value": "fireplace", "description": "🄿 Fireplace Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
     {"key": "shop", "value": "fishing", "description": "🄿 Fishing Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index d1f66c484..49aa6694d 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -9067,7 +9067,7 @@
                 },
                 "shop/farm": {
                     "name": "Produce Stand",
-                    "terms": "farm shop,farm stand"
+                    "terms": "baked goods,farm shop,farm stand,fresh food,fruits,greengrocer,organics,vegetables"
                 },
                 "shop/fashion_accessories": {
                     "name": "Fashion Accessories Store",
diff --git a/svg/fontawesome/fas-apple-alt.svg b/svg/fontawesome/fas-apple-alt.svg
new file mode 100644
index 000000000..6ad147cd2
--- /dev/null
+++ b/svg/fontawesome/fas-apple-alt.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="apple-alt" class="svg-inline--fa fa-apple-alt fa-w-14" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path fill="currentColor" d="M350.85 129c25.97 4.67 47.27 18.67 63.92 42 14.65 20.67 24.64 46.67 29.96 78 4.67 28.67 4.32 57.33-1 86-7.99 47.33-23.97 87-47.94 119-28.64 38.67-64.59 58-107.87 58-10.66 0-22.3-3.33-34.96-10-8.66-5.33-18.31-8-28.97-8s-20.3 2.67-28.97 8c-12.66 6.67-24.3 10-34.96 10-43.28 0-79.23-19.33-107.87-58-23.97-32-39.95-71.67-47.94-119-5.32-28.67-5.67-57.33-1-86 5.32-31.33 15.31-57.33 29.96-78 16.65-23.33 37.95-37.33 63.92-42 15.98-2.67 37.95-.33 65.92 7 23.97 6.67 44.28 14.67 60.93 24 16.65-9.33 36.96-17.33 60.93-24 27.98-7.33 49.96-9.67 65.94-7zm-54.94-41c-9.32 8.67-21.65 15-36.96 19-10.66 3.33-22.3 5-34.96 5l-14.98-1c-1.33-9.33-1.33-20 0-32 2.67-24 10.32-42.33 22.97-55 9.32-8.67 21.65-15 36.96-19 10.66-3.33 22.3-5 34.96-5l14.98 1 1 15c0 12.67-1.67 24.33-4.99 35-3.99 15.33-10.31 27.67-18.98 37z"></path></svg>
\ No newline at end of file