diff --git a/data/presets/presets.json b/data/presets/presets.json
index 375e85b4c..b57fad410 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -931,7 +931,7 @@
     "shop/garden_centre": {"icon": "maki-garden-centre", "geometry": ["point", "area"], "terms": ["landscape", "mulch", "shrub", "tree"], "tags": {"shop": "garden_centre"}, "name": "Garden Center"},
     "shop/gas": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["cng", "lpg", "natural gas", "propane", "refill", "tank"], "tags": {"shop": "gas"}, "name": "Bottled Gas Shop"},
     "shop/gift": {"icon": "maki-gift", "geometry": ["point", "area"], "terms": ["souvenir"], "tags": {"shop": "gift"}, "name": "Gift Shop"},
-    "shop/greengrocer": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["fruit", "produce", "vegetable"], "tags": {"shop": "greengrocer"}, "name": "Greengrocer"},
+    "shop/greengrocer": {"icon": "fas-carrot", "geometry": ["point", "area"], "terms": ["fruit", "produce", "vegetable"], "tags": {"shop": "greengrocer"}, "name": "Greengrocer"},
     "shop/hairdresser_supply": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["barber", "shampoo", "conditioner"], "tags": {"shop": "hairdresser_supply"}, "name": "Hairdresser Supply Store"},
     "shop/hairdresser": {"icon": "temaki-beauty_salon", "geometry": ["point", "area"], "terms": ["barber"], "tags": {"shop": "hairdresser"}, "name": "Hairdresser"},
     "shop/hardware": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"shop": "hardware"}, "name": "Hardware Store"},
@@ -2968,7 +2968,7 @@
     "shop/gift/Card Factory": {"name": "Card Factory", "icon": "maki-gift", "geometry": ["point", "area"], "tags": {"shop": "gift", "brand:wikidata": "Q5038192"}, "addTags": {"brand": "Card Factory", "brand:wikidata": "Q5038192", "brand:wikipedia": "en:Card Factory", "name": "Card Factory", "shop": "gift"}, "removeTags": {"brand": "Card Factory", "brand:wikidata": "Q5038192", "brand:wikipedia": "en:Card Factory", "name": "Card Factory", "shop": "gift"}, "matchScore": 2, "suggestion": true},
     "shop/gift/Hallmark": {"name": "Hallmark", "icon": "maki-gift", "geometry": ["point", "area"], "tags": {"shop": "gift", "brand:wikidata": "Q1521910"}, "addTags": {"brand": "Hallmark", "brand:wikidata": "Q1521910", "brand:wikipedia": "en:Hallmark Cards", "name": "Hallmark", "shop": "gift"}, "removeTags": {"brand": "Hallmark", "brand:wikidata": "Q1521910", "brand:wikipedia": "en:Hallmark Cards", "name": "Hallmark", "shop": "gift"}, "matchScore": 2, "suggestion": true},
     "shop/gift/Nanu-Nana": {"name": "Nanu-Nana", "icon": "maki-gift", "geometry": ["point", "area"], "tags": {"shop": "gift", "brand:wikidata": "Q1720245"}, "addTags": {"brand": "Nanu-Nana", "brand:wikidata": "Q1720245", "brand:wikipedia": "de:Nanu-Nana", "name": "Nanu-Nana", "shop": "gift"}, "removeTags": {"brand": "Nanu-Nana", "brand:wikidata": "Q1720245", "brand:wikipedia": "de:Nanu-Nana", "name": "Nanu-Nana", "shop": "gift"}, "matchScore": 2, "suggestion": true},
-    "shop/greengrocer/Produce Junction": {"name": "Produce Junction", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "greengrocer", "brand:wikidata": "Q60583541"}, "addTags": {"brand": "Produce Junction", "brand:wikidata": "Q60583541", "name": "Produce Junction", "shop": "greengrocer"}, "removeTags": {"brand": "Produce Junction", "brand:wikidata": "Q60583541", "name": "Produce Junction", "shop": "greengrocer"}, "matchScore": 2, "suggestion": true},
+    "shop/greengrocer/Produce Junction": {"name": "Produce Junction", "icon": "fas-carrot", "geometry": ["point", "area"], "tags": {"shop": "greengrocer", "brand:wikidata": "Q60583541"}, "addTags": {"brand": "Produce Junction", "brand:wikidata": "Q60583541", "name": "Produce Junction", "shop": "greengrocer"}, "removeTags": {"brand": "Produce Junction", "brand:wikidata": "Q60583541", "name": "Produce Junction", "shop": "greengrocer"}, "matchScore": 2, "suggestion": true},
     "shop/hairdresser_supply/Sally Beauty Supply": {"name": "Sally Beauty Supply", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "hairdresser_supply", "brand:wikidata": "Q7405065"}, "addTags": {"brand": "Sally Beauty Supply", "brand:wikidata": "Q7405065", "brand:wikipedia": "en:Sally Beauty Holdings", "name": "Sally Beauty Supply", "shop": "hairdresser_supply"}, "removeTags": {"brand": "Sally Beauty Supply", "brand:wikidata": "Q7405065", "brand:wikipedia": "en:Sally Beauty Holdings", "name": "Sally Beauty Supply", "shop": "hairdresser_supply"}, "matchScore": 2, "suggestion": true},
     "shop/hairdresser/Fantastic Sams": {"name": "Fantastic Sams", "icon": "temaki-beauty_salon", "geometry": ["point", "area"], "tags": {"shop": "hairdresser", "brand:wikidata": "Q5434222"}, "addTags": {"brand": "Fantastic Sams", "brand:wikidata": "Q5434222", "brand:wikipedia": "en:Fantastic Sams", "name": "Fantastic Sams", "shop": "hairdresser"}, "removeTags": {"brand": "Fantastic Sams", "brand:wikidata": "Q5434222", "brand:wikipedia": "en:Fantastic Sams", "name": "Fantastic Sams", "shop": "hairdresser"}, "matchScore": 2, "suggestion": true},
     "shop/hairdresser/First Choice Haircutters": {"name": "First Choice Haircutters", "icon": "temaki-beauty_salon", "geometry": ["point", "area"], "tags": {"shop": "hairdresser", "brand:wikidata": "Q5452622"}, "addTags": {"brand": "First Choice Haircutters", "brand:wikidata": "Q5452622", "brand:wikipedia": "en:First Choice Haircutters", "name": "First Choice Haircutters", "shop": "hairdresser"}, "removeTags": {"brand": "First Choice Haircutters", "brand:wikidata": "Q5452622", "brand:wikipedia": "en:First Choice Haircutters", "name": "First Choice Haircutters", "shop": "hairdresser"}, "matchScore": 2, "suggestion": true},
diff --git a/data/presets/presets/shop/greengrocer.json b/data/presets/presets/shop/greengrocer.json
index 600ef0330..50815f8bb 100644
--- a/data/presets/presets/shop/greengrocer.json
+++ b/data/presets/presets/shop/greengrocer.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "fas-carrot",
     "geometry": [
         "point",
         "area"
diff --git a/data/taginfo.json b/data/taginfo.json
index 114faf017..ba74763e7 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -874,7 +874,7 @@
     {"key": "shop", "value": "garden_centre", "description": "🄿 Garden Center", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/garden-centre-15.svg?sanitize=true"},
     {"key": "shop", "value": "gas", "description": "🄿 Bottled Gas Shop", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
     {"key": "shop", "value": "gift", "description": "🄿 Gift Shop", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/gift-15.svg?sanitize=true"},
-    {"key": "shop", "value": "greengrocer", "description": "🄿 Greengrocer", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
+    {"key": "shop", "value": "greengrocer", "description": "🄿 Greengrocer", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-carrot.svg?sanitize=true"},
     {"key": "shop", "value": "hairdresser_supply", "description": "🄿 Hairdresser Supply Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
     {"key": "shop", "value": "hairdresser", "description": "🄿 Hairdresser", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/beauty_salon.svg?sanitize=true"},
     {"key": "shop", "value": "hardware", "description": "🄿 Hardware Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/tools.svg?sanitize=true"},
diff --git a/svg/fontawesome/fas-carrot.svg b/svg/fontawesome/fas-carrot.svg
new file mode 100644
index 000000000..ee083b950
--- /dev/null
+++ b/svg/fontawesome/fas-carrot.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="carrot" class="svg-inline--fa fa-carrot fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="currentColor" d="M298.2 156.6c-52.7-25.7-114.5-10.5-150.2 32.8l55.2 55.2c6.3 6.3 6.3 16.4 0 22.6-3.1 3.1-7.2 4.7-11.3 4.7s-8.2-1.6-11.3-4.7L130.4 217 2.3 479.7c-2.9 6-3.1 13.3 0 19.7 5.4 11.1 18.9 15.7 30 10.3l133.6-65.2-49.2-49.2c-6.3-6.2-6.3-16.4 0-22.6 6.3-6.2 16.4-6.2 22.6 0l57 57 102-49.8c24-11.7 44.5-31.3 57.1-57.1 30.1-61.7 4.5-136.1-57.2-166.2zm92.1-34.9C409.8 81 399.7 32.9 360 0c-50.3 41.7-52.5 107.5-7.9 151.9l8 8c44.4 44.6 110.3 42.4 151.9-7.9-32.9-39.7-81-49.8-121.7-30.3z"></path></svg>
\ No newline at end of file