diff --git a/data/presets.yaml b/data/presets.yaml
index 66664ef62..4b23babcd 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -3618,6 +3618,11 @@ en:
         name: Bottle Return Machine
         # 'terms: bottle return'
         terms: '<translate with synonyms or related terms for ''Bottle Return Machine'', separated by commas>'
+      amenity/vending_machine/bread:
+        # 'amenity=vending_machine, vending=bread'
+        name: Bread Vending Machine
+        # 'terms: baguette,bread'
+        terms: '<translate with synonyms or related terms for ''Bread Vending Machine'', separated by commas>'
       amenity/vending_machine/cigarettes:
         # 'amenity=vending_machine, vending=cigarettes'
         name: Cigarette Vending Machine
@@ -3638,6 +3643,11 @@ en:
         name: Drink Vending Machine
         # 'terms: drink,soda,beverage,juice,pop'
         terms: '<translate with synonyms or related terms for ''Drink Vending Machine'', separated by commas>'
+      amenity/vending_machine/eggs:
+        # 'amenity=vending_machine, vending=eggs'
+        name: Egg Vending Machine
+        # 'terms: egg'
+        terms: '<translate with synonyms or related terms for ''Egg Vending Machine'', separated by commas>'
       amenity/vending_machine/electronics:
         # 'amenity=vending_machine, vending=electronics'
         name: Electronics Vending Machine
@@ -3673,6 +3683,11 @@ en:
         name: Ice Cream Vending Machine
         # 'terms: chocolate,ice cream,frozen,popsicle,vanilla'
         terms: '<translate with synonyms or related terms for ''Ice Cream Vending Machine'', separated by commas>'
+      amenity/vending_machine/ice_cubes:
+        # 'amenity=vending_machine, vending=ice_cubes'
+        name: Ice Vending Machine
+        # 'terms: cubes,ice'
+        terms: '<translate with synonyms or related terms for ''Ice Vending Machine'', separated by commas>'
       amenity/vending_machine/newspapers:
         # 'amenity=vending_machine, vending=newspapers'
         name: Newspaper Vending Machine
diff --git a/data/presets/presets.json b/data/presets/presets.json
index dc4935f06..73b29995a 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -240,23 +240,26 @@
     "amenity/vehicle_inspection": {"icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["car inspection"], "tags": {"amenity": "vehicle_inspection"}, "name": "Vehicle Inspection"},
     "amenity/vending_machine": {"icon": "temaki-vending_machine", "fields": ["vending", "operator", "payment_multi", "currency_multi"], "moreFields": ["blind", "brand", "covered", "height", "indoor", "level", "manufacturer"], "geometry": ["point"], "terms": [], "tags": {"amenity": "vending_machine"}, "matchScore": 0.9, "name": "Vending Machine"},
     "amenity/vending_machine/bottle_return": {"icon": "temaki-vending_machine", "fields": ["vending", "operator"], "geometry": ["point"], "terms": ["bottle return"], "tags": {"amenity": "vending_machine", "vending": "bottle_return"}, "reference": {"key": "vending", "value": "bottle_return"}, "name": "Bottle Return Machine"},
-    "amenity/vending_machine/cigarettes": {"icon": "temaki-vending_machine", "moreFields": ["{amenity/vending_machine}", "min_age"], "geometry": ["point"], "terms": ["cigarette"], "tags": {"amenity": "vending_machine", "vending": "cigarettes"}, "reference": {"key": "vending", "value": "cigarettes"}, "name": "Cigarette Vending Machine"},
-    "amenity/vending_machine/coffee": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["coffee"], "tags": {"amenity": "vending_machine", "vending": "coffee"}, "reference": {"key": "vending", "value": "coffee"}, "name": "Coffee Vending Machine"},
-    "amenity/vending_machine/condoms": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["condom"], "tags": {"amenity": "vending_machine", "vending": "condoms"}, "reference": {"key": "vending", "value": "condoms"}, "name": "Condom Vending Machine"},
-    "amenity/vending_machine/drinks": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["drink", "soda", "beverage", "juice", "pop"], "tags": {"amenity": "vending_machine", "vending": "drinks"}, "reference": {"key": "vending", "value": "drinks"}, "name": "Drink Vending Machine"},
+    "amenity/vending_machine/bread": {"icon": "temaki-vending_bread", "geometry": ["point"], "terms": ["baguette", "bread"], "tags": {"amenity": "vending_machine", "vending": "bread"}, "reference": {"key": "vending", "value": "bread"}, "name": "Bread Vending Machine"},
+    "amenity/vending_machine/cigarettes": {"icon": "temaki-vending_cigarettes", "moreFields": ["{amenity/vending_machine}", "min_age"], "geometry": ["point"], "terms": ["cigarette"], "tags": {"amenity": "vending_machine", "vending": "cigarettes"}, "reference": {"key": "vending", "value": "cigarettes"}, "name": "Cigarette Vending Machine"},
+    "amenity/vending_machine/coffee": {"icon": "temaki-vending_hot_drink", "geometry": ["point"], "terms": ["coffee"], "tags": {"amenity": "vending_machine", "vending": "coffee"}, "reference": {"key": "vending", "value": "coffee"}, "name": "Coffee Vending Machine"},
+    "amenity/vending_machine/condoms": {"icon": "temaki-vending_love", "geometry": ["point"], "terms": ["condom"], "tags": {"amenity": "vending_machine", "vending": "condoms"}, "reference": {"key": "vending", "value": "condoms"}, "name": "Condom Vending Machine"},
+    "amenity/vending_machine/drinks": {"icon": "temaki-vending_cold_drink", "geometry": ["point"], "terms": ["drink", "soda", "beverage", "juice", "pop"], "tags": {"amenity": "vending_machine", "vending": "drinks"}, "reference": {"key": "vending", "value": "drinks"}, "name": "Drink Vending Machine"},
+    "amenity/vending_machine/eggs": {"icon": "temaki-vending_eggs", "geometry": ["point"], "terms": ["egg"], "tags": {"amenity": "vending_machine", "vending": "eggs"}, "reference": {"key": "vending", "value": "eggs"}, "name": "Egg Vending Machine"},
     "amenity/vending_machine/electronics": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["cable", "charger", "earbud", "headphone", "phone", "tablet"], "tags": {"amenity": "vending_machine", "vending": "electronics"}, "reference": {"key": "vending", "value": "electronics"}, "name": "Electronics Vending Machine"},
-    "amenity/vending_machine/elongated_coin": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["coin", "crush", "elongated", "flatten", "penny", "souvenir"], "tags": {"amenity": "vending_machine", "vending": "elongated_coin"}, "reference": {"key": "vending", "value": "elongated_coin"}, "name": "Flat Coin Vending Machine"},
-    "amenity/vending_machine/excrement_bags": {"icon": "temaki-vending_machine", "fields": ["{amenity/vending_machine}"], "geometry": ["point"], "terms": ["excrement bags", "poop", "waste", "dog", "animal"], "tags": {"amenity": "vending_machine", "vending": "excrement_bags"}, "reference": {"key": "vending", "value": "excrement_bags"}, "name": "Excrement Bag Dispenser"},
-    "amenity/vending_machine/feminine_hygiene": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["condom", "tampon", "pad", "woman", "women", "menstrual hygiene products", "personal care"], "tags": {"amenity": "vending_machine", "vending": "feminine_hygiene"}, "reference": {"key": "vending", "value": "feminine_hygiene"}, "name": "Feminine Hygiene Vending Machine"},
+    "amenity/vending_machine/elongated_coin": {"icon": "temaki-vending_flat_coin", "geometry": ["point"], "terms": ["coin", "crush", "elongated", "flatten", "penny", "souvenir"], "tags": {"amenity": "vending_machine", "vending": "elongated_coin"}, "reference": {"key": "vending", "value": "elongated_coin"}, "name": "Flat Coin Vending Machine"},
+    "amenity/vending_machine/excrement_bags": {"icon": "temaki-vending_pet_waste", "fields": ["{amenity/vending_machine}"], "geometry": ["point"], "terms": ["excrement bags", "poop", "waste", "dog", "animal"], "tags": {"amenity": "vending_machine", "vending": "excrement_bags"}, "reference": {"key": "vending", "value": "excrement_bags"}, "name": "Excrement Bag Dispenser"},
+    "amenity/vending_machine/feminine_hygiene": {"icon": "temaki-vending_venus", "geometry": ["point"], "terms": ["condom", "tampon", "pad", "woman", "women", "menstrual hygiene products", "personal care"], "tags": {"amenity": "vending_machine", "vending": "feminine_hygiene"}, "reference": {"key": "vending", "value": "feminine_hygiene"}, "name": "Feminine Hygiene Vending Machine"},
     "amenity/vending_machine/food": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["food"], "tags": {"amenity": "vending_machine", "vending": "food"}, "reference": {"key": "vending", "value": "food"}, "name": "Food Vending Machine"},
     "amenity/vending_machine/fuel": {"icon": "maki-fuel", "geometry": ["point"], "terms": ["petrol", "fuel", "gasoline", "propane", "diesel", "lng", "cng", "biodiesel"], "tags": {"amenity": "vending_machine", "vending": "fuel"}, "reference": {"key": "vending", "value": "fuel"}, "name": "Gas Pump", "matchScore": 0.5},
-    "amenity/vending_machine/ice_cream": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["chocolate", "ice cream", "frozen", "popsicle", "vanilla"], "tags": {"amenity": "vending_machine", "vending": "ice_cream"}, "reference": {"key": "vending", "value": "ice_cream"}, "name": "Ice Cream Vending Machine"},
+    "amenity/vending_machine/ice_cream": {"icon": "temaki-vending_ice_cream", "geometry": ["point"], "terms": ["chocolate", "ice cream", "frozen", "popsicle", "vanilla"], "tags": {"amenity": "vending_machine", "vending": "ice_cream"}, "reference": {"key": "vending", "value": "ice_cream"}, "name": "Ice Cream Vending Machine"},
+    "amenity/vending_machine/ice_cubes": {"icon": "temaki-vending_ice", "geometry": ["point"], "terms": ["cubes", "ice"], "tags": {"amenity": "vending_machine", "vending": "ice_cubes"}, "reference": {"key": "vending", "value": "ice_cubes"}, "name": "Ice Vending Machine"},
     "amenity/vending_machine/newspapers": {"icon": "temaki-vending_newspaper", "fields": ["vending", "operator", "fee", "payment_multi_fee", "charge_fee", "currency_multi"], "geometry": ["point"], "terms": ["newspaper"], "tags": {"amenity": "vending_machine", "vending": "newspapers"}, "reference": {"key": "vending", "value": "newspapers"}, "name": "Newspaper Vending Machine"},
-    "amenity/vending_machine/parcel_pickup_dropoff": {"icon": "temaki-vending_machine", "fields": ["vending", "operator", "payment_multi", "currency_multi"], "geometry": ["point"], "terms": ["mail", "parcel", "pickup"], "tags": {"amenity": "vending_machine", "vending": "parcel_pickup;parcel_mail_in"}, "reference": {"key": "vending", "value": "parcel_pickup;parcel_mail_in"}, "name": "Parcel Pickup/Dropoff Locker"},
-    "amenity/vending_machine/parcel_pickup": {"icon": "temaki-vending_machine", "fields": ["vending", "operator"], "geometry": ["point"], "terms": ["amazon", "locker", "mail", "parcel", "pickup"], "tags": {"amenity": "vending_machine", "vending": "parcel_pickup"}, "reference": {"key": "vending", "value": "parcel_pickup"}, "name": "Parcel Pickup Locker"},
-    "amenity/vending_machine/parking_tickets": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["parking", "ticket"], "tags": {"amenity": "vending_machine", "vending": "parking_tickets"}, "reference": {"key": "vending", "value": "parking_tickets"}, "matchScore": 0.94, "name": "Parking Ticket Vending Machine"},
-    "amenity/vending_machine/public_transport_tickets": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["bus", "train", "ferry", "rail", "ticket", "transportation"], "tags": {"amenity": "vending_machine", "vending": "public_transport_tickets"}, "reference": {"key": "vending", "value": "public_transport_tickets"}, "name": "Transit Ticket Vending Machine"},
-    "amenity/vending_machine/stamps": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["mail", "postage", "stamp"], "tags": {"amenity": "vending_machine", "vending": "stamps"}, "reference": {"key": "vending", "value": "stamps"}, "name": "Postage Vending Machine"},
+    "amenity/vending_machine/parcel_pickup_dropoff": {"icon": "temaki-vending_lockers", "fields": ["vending", "operator", "payment_multi", "currency_multi"], "geometry": ["point"], "terms": ["mail", "parcel", "pickup"], "tags": {"amenity": "vending_machine", "vending": "parcel_pickup;parcel_mail_in"}, "reference": {"key": "vending", "value": "parcel_pickup;parcel_mail_in"}, "name": "Parcel Pickup/Dropoff Locker"},
+    "amenity/vending_machine/parcel_pickup": {"icon": "temaki-vending_lockers", "fields": ["vending", "operator"], "geometry": ["point"], "terms": ["amazon", "locker", "mail", "parcel", "pickup"], "tags": {"amenity": "vending_machine", "vending": "parcel_pickup"}, "reference": {"key": "vending", "value": "parcel_pickup"}, "name": "Parcel Pickup Locker"},
+    "amenity/vending_machine/parking_tickets": {"icon": "temaki-vending_tickets", "geometry": ["point"], "terms": ["parking", "ticket"], "tags": {"amenity": "vending_machine", "vending": "parking_tickets"}, "reference": {"key": "vending", "value": "parking_tickets"}, "matchScore": 0.94, "name": "Parking Ticket Vending Machine"},
+    "amenity/vending_machine/public_transport_tickets": {"icon": "temaki-vending_tickets", "geometry": ["point"], "terms": ["bus", "train", "ferry", "rail", "ticket", "transportation"], "tags": {"amenity": "vending_machine", "vending": "public_transport_tickets"}, "reference": {"key": "vending", "value": "public_transport_tickets"}, "name": "Transit Ticket Vending Machine"},
+    "amenity/vending_machine/stamps": {"icon": "temaki-vending_stamps", "geometry": ["point"], "terms": ["mail", "postage", "stamp"], "tags": {"amenity": "vending_machine", "vending": "stamps"}, "reference": {"key": "vending", "value": "stamps"}, "name": "Postage Vending Machine"},
     "amenity/vending_machine/sweets": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["candy", "gum", "chip", "pretzel", "cookie", "cracker"], "tags": {"amenity": "vending_machine", "vending": "sweets"}, "reference": {"key": "vending", "value": "sweets"}, "name": "Snack Vending Machine"},
     "amenity/veterinary": {"icon": "temaki-veterinary_care", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["charge_fee", "email", "fax", "fee", "level", "payment_multi_fee", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["pet clinic", "veterinarian", "animal hospital", "pet doctor"], "tags": {"amenity": "veterinary"}, "name": "Veterinary"},
     "amenity/waste_basket": {"icon": "maki-waste-basket", "fields": ["operator", "waste", "collection_times", "material", "colour"], "moreFields": ["covered", "indoor", "manufacturer"], "geometry": ["point", "vertex"], "tags": {"amenity": "waste_basket"}, "terms": ["bin", "garbage", "rubbish", "litter", "trash"], "name": "Waste Basket"},
@@ -3085,26 +3088,26 @@
     "amenity/vehicle_inspection/Autovision": {"name": "Autovision", "icon": "maki-car", "imageURL": "https://graph.facebook.com/AutovisionFrance/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64224842", "amenity": "vehicle_inspection"}, "addTags": {"amenity": "vehicle_inspection", "brand": "Autovision", "brand:wikidata": "Q64224842", "name": "Autovision"}, "countryCodes": ["fr"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/vehicle_inspection/Dekra": {"name": "Dekra", "icon": "maki-car", "imageURL": "https://pbs.twimg.com/profile_images/3238634623/8ccb79c10c4bfb652432961fe776c6c3_bigger.jpeg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q383711", "amenity": "vehicle_inspection"}, "addTags": {"amenity": "vehicle_inspection", "brand": "Dekra", "brand:wikidata": "Q383711", "brand:wikipedia": "en:Dekra", "name": "Dekra", "official_name": "Dekra Automotive"}, "countryCodes": ["de", "fr"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/vehicle_inspection/Sécuritest": {"name": "Sécuritest", "icon": "maki-car", "imageURL": "https://graph.facebook.com/218871841874062/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64224992", "amenity": "vehicle_inspection"}, "addTags": {"amenity": "vehicle_inspection", "brand": "Sécuritest", "brand:wikidata": "Q64224992", "name": "Sécuritest"}, "countryCodes": ["fr"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/vending_machine/parcel_pickup/Amazon Locker": {"name": "Amazon Locker", "icon": "temaki-vending_machine", "imageURL": "https://graph.facebook.com/amazon/picture?type=large", "geometry": ["point"], "tags": {"brand:wikidata": "Q16974764", "amenity": "vending_machine", "vending": "parcel_pickup"}, "addTags": {"amenity": "vending_machine", "brand": "Amazon Locker", "brand:wikidata": "Q16974764", "brand:wikipedia": "en:Amazon Locker", "name": "Amazon Locker", "vending": "parcel_pickup"}, "reference": {"key": "vending", "value": "parcel_pickup"}, "countryCodes": ["de", "us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/vending_machine/parcel_pickup/Amazon Locker": {"name": "Amazon Locker", "icon": "temaki-vending_lockers", "imageURL": "https://graph.facebook.com/amazon/picture?type=large", "geometry": ["point"], "tags": {"brand:wikidata": "Q16974764", "amenity": "vending_machine", "vending": "parcel_pickup"}, "addTags": {"amenity": "vending_machine", "brand": "Amazon Locker", "brand:wikidata": "Q16974764", "brand:wikipedia": "en:Amazon Locker", "name": "Amazon Locker", "vending": "parcel_pickup"}, "reference": {"key": "vending", "value": "parcel_pickup"}, "countryCodes": ["de", "us"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/vending_machine/AmeriGas": {"name": "AmeriGas", "icon": "temaki-vending_machine", "imageURL": "https://graph.facebook.com/AmeriGas/picture?type=large", "geometry": ["point"], "tags": {"brand:wikidata": "Q23130318", "amenity": "vending_machine"}, "addTags": {"amenity": "vending_machine", "brand": "AmeriGas", "brand:wikidata": "Q23130318", "fuel:lpg": "yes", "name": "AmeriGas", "vending": "gas"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/vending_machine/public_transport_tickets/Automat ŚKUP": {"name": "Automat ŚKUP", "icon": "temaki-vending_machine", "geometry": ["point"], "tags": {"brand:wikidata": "Q24945427", "amenity": "vending_machine", "vending": "public_transport_tickets"}, "addTags": {"amenity": "vending_machine", "brand": "Automat ŚKUP", "brand:wikidata": "Q24945427", "brand:wikipedia": "pl:Śląska Karta Usług Publicznych", "name": "Automat ŚKUP", "vending": "public_transport_tickets"}, "reference": {"key": "vending", "value": "public_transport_tickets"}, "countryCodes": ["pl"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/vending_machine/public_transport_tickets/BKK-automata": {"name": "BKK-automata", "icon": "temaki-vending_machine", "imageURL": "https://graph.facebook.com/bkkbudapest/picture?type=large", "geometry": ["point"], "tags": {"brand:wikidata": "Q608917", "amenity": "vending_machine", "vending": "public_transport_tickets"}, "addTags": {"amenity": "vending_machine", "brand": "BKK-automata", "brand:wikidata": "Q608917", "brand:wikipedia": "hu:Budapesti Közlekedési Központ", "name": "BKK-automata", "vending": "public_transport_tickets"}, "reference": {"key": "vending", "value": "public_transport_tickets"}, "countryCodes": ["hu"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/vending_machine/public_transport_tickets/Automat ŚKUP": {"name": "Automat ŚKUP", "icon": "temaki-vending_tickets", "geometry": ["point"], "tags": {"brand:wikidata": "Q24945427", "amenity": "vending_machine", "vending": "public_transport_tickets"}, "addTags": {"amenity": "vending_machine", "brand": "Automat ŚKUP", "brand:wikidata": "Q24945427", "brand:wikipedia": "pl:Śląska Karta Usług Publicznych", "name": "Automat ŚKUP", "vending": "public_transport_tickets"}, "reference": {"key": "vending", "value": "public_transport_tickets"}, "countryCodes": ["pl"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/vending_machine/public_transport_tickets/BKK-automata": {"name": "BKK-automata", "icon": "temaki-vending_tickets", "imageURL": "https://graph.facebook.com/bkkbudapest/picture?type=large", "geometry": ["point"], "tags": {"brand:wikidata": "Q608917", "amenity": "vending_machine", "vending": "public_transport_tickets"}, "addTags": {"amenity": "vending_machine", "brand": "BKK-automata", "brand:wikidata": "Q608917", "brand:wikipedia": "hu:Budapesti Közlekedési Központ", "name": "BKK-automata", "vending": "public_transport_tickets"}, "reference": {"key": "vending", "value": "public_transport_tickets"}, "countryCodes": ["hu"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/vending_machine/electronics/Best Buy Express": {"name": "Best Buy Express", "icon": "temaki-vending_machine", "imageURL": "https://graph.facebook.com/bestbuy/picture?type=large", "geometry": ["point"], "tags": {"brand:wikidata": "Q533415", "amenity": "vending_machine", "vending": "electronics"}, "addTags": {"amenity": "vending_machine", "brand": "Best Buy Express", "brand:wikidata": "Q533415", "name": "Best Buy Express", "vending": "electronics"}, "reference": {"key": "vending", "value": "electronics"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/vending_machine/Blue Rhino": {"name": "Blue Rhino", "icon": "temaki-vending_machine", "imageURL": "https://graph.facebook.com/BlueRhino/picture?type=large", "geometry": ["point"], "tags": {"brand:wikidata": "Q65681213", "amenity": "vending_machine"}, "addTags": {"amenity": "vending_machine", "brand": "Blue Rhino", "brand:wikidata": "Q65681213", "fuel:lpg": "yes", "name": "Blue Rhino", "vending": "gas"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/vending_machine/CVS Pharmacy": {"name": "CVS Pharmacy", "icon": "temaki-vending_machine", "imageURL": "https://graph.facebook.com/CVS/picture?type=large", "geometry": ["point"], "tags": {"brand:wikidata": "Q2078880", "amenity": "vending_machine"}, "addTags": {"amenity": "vending_machine", "brand": "CVS Pharmacy", "brand:wikidata": "Q2078880", "brand:wikipedia": "en:CVS Pharmacy", "name": "CVS Pharmacy", "short_name": "CVS", "vending": "chemist"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/vending_machine/parcel_pickup_dropoff/DHL Packstation": {"name": "DHL Packstation", "icon": "temaki-vending_machine", "geometry": ["point"], "tags": {"brand:wikidata": "Q1766703", "amenity": "vending_machine", "vending": "parcel_pickup;parcel_mail_in"}, "addTags": {"amenity": "vending_machine", "brand": "Packstation", "brand:wikidata": "Q1766703", "brand:wikipedia": "en:Packstation", "name": "DHL Packstation", "vending": "parcel_pickup;parcel_mail_in"}, "reference": {"key": "vending", "value": "parcel_pickup;parcel_mail_in"}, "countryCodes": ["de"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/vending_machine/parcel_pickup_dropoff/DHL Packstation": {"name": "DHL Packstation", "icon": "temaki-vending_lockers", "geometry": ["point"], "tags": {"brand:wikidata": "Q1766703", "amenity": "vending_machine", "vending": "parcel_pickup;parcel_mail_in"}, "addTags": {"amenity": "vending_machine", "brand": "Packstation", "brand:wikidata": "Q1766703", "brand:wikipedia": "en:Packstation", "name": "DHL Packstation", "vending": "parcel_pickup;parcel_mail_in"}, "reference": {"key": "vending", "value": "parcel_pickup;parcel_mail_in"}, "countryCodes": ["de"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/vending_machine/DHL Paketbox": {"name": "DHL Paketbox", "icon": "temaki-vending_machine", "geometry": ["point"], "tags": {"brand:wikidata": "Q2046604", "amenity": "vending_machine"}, "addTags": {"amenity": "vending_machine", "brand": "Paketbox", "brand:wikidata": "Q2046604", "brand:wikipedia": "de:Paketbox", "name": "DHL Paketbox", "vending": "parcel_mail_in"}, "countryCodes": ["de"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/vending_machine/excrement_bags/Dog-Station": {"name": "Dog-Station", "icon": "temaki-vending_machine", "geometry": ["point"], "tags": {"brand:wikidata": "Q63720061", "amenity": "vending_machine", "vending": "excrement_bags"}, "addTags": {"amenity": "vending_machine", "brand": "Dog-Station", "brand:wikidata": "Q63720061", "name": "Dog-Station", "vending": "excrement_bags"}, "reference": {"key": "vending", "value": "excrement_bags"}, "countryCodes": ["at", "de", "dk"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/vending_machine/Home City Ice": {"name": "Home City Ice", "icon": "temaki-vending_machine", "imageURL": "https://graph.facebook.com/HomeCityIceJobs/picture?type=large", "geometry": ["point"], "tags": {"brand:wikidata": "Q5888287", "amenity": "vending_machine"}, "addTags": {"amenity": "vending_machine", "brand": "Home City Ice", "brand:wikidata": "Q5888287", "name": "Home City Ice", "vending": "ice_cubes"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/vending_machine/public_transport_tickets/KKM": {"name": "KKM", "icon": "temaki-vending_machine", "geometry": ["point"], "tags": {"brand:wikidata": "Q57515549", "amenity": "vending_machine", "vending": "public_transport_tickets"}, "addTags": {"amenity": "vending_machine", "brand": "KKM", "brand:wikidata": "Q57515549", "name": "KKM", "vending": "public_transport_tickets"}, "reference": {"key": "vending", "value": "public_transport_tickets"}, "countryCodes": ["pl"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/vending_machine/parcel_pickup_dropoff/Paczkomat InPost": {"name": "Paczkomat InPost", "icon": "temaki-vending_machine", "imageURL": "https://graph.facebook.com/paczkomaty/picture?type=large", "geometry": ["point"], "tags": {"brand:wikidata": "Q3182097", "amenity": "vending_machine", "vending": "parcel_pickup;parcel_mail_in"}, "addTags": {"amenity": "vending_machine", "brand": "InPost", "brand:wikidata": "Q3182097", "brand:wikipedia": "pl:InPost", "name": "Paczkomat InPost", "vending": "parcel_pickup;parcel_mail_in"}, "reference": {"key": "vending", "value": "parcel_pickup;parcel_mail_in"}, "countryCodes": ["pl"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/vending_machine/parking_tickets/ParkPlus (Calgary)": {"name": "ParkPlus (Calgary)", "icon": "temaki-vending_machine", "imageURL": "https://graph.facebook.com/CalgaryParkingAuthority/picture?type=large", "geometry": ["point"], "tags": {"brand:wikidata": "Q63719595", "amenity": "vending_machine", "vending": "parking_tickets"}, "addTags": {"amenity": "vending_machine", "brand": "ParkPlus", "brand:wikidata": "Q63719595", "name": "ParkPlus", "vending": "parking_tickets"}, "reference": {"key": "vending", "value": "parking_tickets"}, "countryCodes": ["ca"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/vending_machine/excrement_bags/Dog-Station": {"name": "Dog-Station", "icon": "temaki-vending_pet_waste", "geometry": ["point"], "tags": {"brand:wikidata": "Q63720061", "amenity": "vending_machine", "vending": "excrement_bags"}, "addTags": {"amenity": "vending_machine", "brand": "Dog-Station", "brand:wikidata": "Q63720061", "name": "Dog-Station", "vending": "excrement_bags"}, "reference": {"key": "vending", "value": "excrement_bags"}, "countryCodes": ["at", "de", "dk"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/vending_machine/ice_cubes/Home City Ice": {"name": "Home City Ice", "icon": "temaki-vending_ice", "imageURL": "https://graph.facebook.com/HomeCityIceJobs/picture?type=large", "geometry": ["point"], "tags": {"brand:wikidata": "Q5888287", "amenity": "vending_machine", "vending": "ice_cubes"}, "addTags": {"amenity": "vending_machine", "brand": "Home City Ice", "brand:wikidata": "Q5888287", "name": "Home City Ice", "vending": "ice_cubes"}, "reference": {"key": "vending", "value": "ice_cubes"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/vending_machine/public_transport_tickets/KKM": {"name": "KKM", "icon": "temaki-vending_tickets", "geometry": ["point"], "tags": {"brand:wikidata": "Q57515549", "amenity": "vending_machine", "vending": "public_transport_tickets"}, "addTags": {"amenity": "vending_machine", "brand": "KKM", "brand:wikidata": "Q57515549", "name": "KKM", "vending": "public_transport_tickets"}, "reference": {"key": "vending", "value": "public_transport_tickets"}, "countryCodes": ["pl"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/vending_machine/parcel_pickup_dropoff/Paczkomat InPost": {"name": "Paczkomat InPost", "icon": "temaki-vending_lockers", "imageURL": "https://graph.facebook.com/paczkomaty/picture?type=large", "geometry": ["point"], "tags": {"brand:wikidata": "Q3182097", "amenity": "vending_machine", "vending": "parcel_pickup;parcel_mail_in"}, "addTags": {"amenity": "vending_machine", "brand": "InPost", "brand:wikidata": "Q3182097", "brand:wikipedia": "pl:InPost", "name": "Paczkomat InPost", "vending": "parcel_pickup;parcel_mail_in"}, "reference": {"key": "vending", "value": "parcel_pickup;parcel_mail_in"}, "countryCodes": ["pl"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/vending_machine/parking_tickets/ParkPlus (Calgary)": {"name": "ParkPlus (Calgary)", "icon": "temaki-vending_tickets", "imageURL": "https://graph.facebook.com/CalgaryParkingAuthority/picture?type=large", "geometry": ["point"], "tags": {"brand:wikidata": "Q63719595", "amenity": "vending_machine", "vending": "parking_tickets"}, "addTags": {"amenity": "vending_machine", "brand": "ParkPlus", "brand:wikidata": "Q63719595", "name": "ParkPlus", "vending": "parking_tickets"}, "reference": {"key": "vending", "value": "parking_tickets"}, "countryCodes": ["ca"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/vending_machine/Redbox": {"name": "Redbox", "icon": "temaki-vending_machine", "imageURL": "https://graph.facebook.com/redbox/picture?type=large", "geometry": ["point"], "tags": {"brand:wikidata": "Q7305489", "amenity": "vending_machine"}, "addTags": {"amenity": "vending_machine", "brand": "Redbox", "brand:wikidata": "Q7305489", "brand:wikipedia": "en:Redbox", "name": "Redbox", "vending": "movies"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/vending_machine/Reddy Ice": {"name": "Reddy Ice", "icon": "temaki-vending_machine", "imageURL": "https://graph.facebook.com/RealReddyIce/picture?type=large", "geometry": ["point"], "tags": {"brand:wikidata": "Q7305666", "amenity": "vending_machine"}, "addTags": {"amenity": "vending_machine", "brand": "Reddy Ice", "brand:wikidata": "Q7305666", "brand:wikipedia": "en:Reddy Ice", "name": "Reddy Ice", "vending": "ice_cubes"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/vending_machine/excrement_bags/Robidog": {"name": "Robidog", "icon": "temaki-vending_machine", "geometry": ["point"], "tags": {"brand:wikidata": "Q2159689", "amenity": "vending_machine", "vending": "excrement_bags"}, "addTags": {"amenity": "vending_machine", "brand": "Robidog", "brand:wikidata": "Q2159689", "brand:wikipedia": "de:Robidog", "name": "Robidog", "vending": "excrement_bags"}, "reference": {"key": "vending", "value": "excrement_bags"}, "countryCodes": ["ch"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/vending_machine/parcel_pickup_dropoff/Smartpost": {"name": "Smartpost", "icon": "temaki-vending_machine", "geometry": ["point"], "tags": {"brand:wikidata": "Q7543889", "amenity": "vending_machine", "vending": "parcel_pickup;parcel_mail_in"}, "addTags": {"amenity": "vending_machine", "brand": "Smartpost", "brand:wikidata": "Q7543889", "brand:wikipedia": "fi:SmartPOST", "name": "Smartpost", "vending": "parcel_pickup;parcel_mail_in"}, "reference": {"key": "vending", "value": "parcel_pickup;parcel_mail_in"}, "countryCodes": ["fi"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/vending_machine/cigarettes/Tobaccoland": {"name": "Tobaccoland", "icon": "temaki-vending_machine", "geometry": ["point"], "tags": {"brand:wikidata": "Q1439872", "amenity": "vending_machine", "vending": "cigarettes"}, "addTags": {"amenity": "vending_machine", "brand": "Tobaccoland", "brand:wikidata": "Q1439872", "brand:wikipedia": "de:Tobaccoland Automatengesellschaft", "name": "Tobaccoland", "vending": "cigarettes"}, "reference": {"key": "vending", "value": "cigarettes"}, "countryCodes": ["de"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/vending_machine/drinks/コカ・コーラ": {"name": "コカ・コーラ", "icon": "temaki-vending_machine", "imageURL": "https://pbs.twimg.com/profile_images/1149007644918784001/b5PBpHkK_bigger.jpg", "geometry": ["point"], "tags": {"brand:wikidata": "Q2813", "amenity": "vending_machine", "vending": "drinks"}, "addTags": {"amenity": "vending_machine", "brand": "コカ・コーラ", "brand:en": "Coca-Cola", "brand:ja": "コカ・コーラ", "brand:wikidata": "Q2813", "brand:wikipedia": "ja:コカ・コーラ", "drink": "cola", "name": "コカ・コーラ", "name:en": "Coca-Cola", "name:ja": "コカ・コーラ", "vending": "drinks"}, "reference": {"key": "vending", "value": "drinks"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/vending_machine/ice_cubes/Reddy Ice": {"name": "Reddy Ice", "icon": "temaki-vending_ice", "imageURL": "https://graph.facebook.com/RealReddyIce/picture?type=large", "geometry": ["point"], "tags": {"brand:wikidata": "Q7305666", "amenity": "vending_machine", "vending": "ice_cubes"}, "addTags": {"amenity": "vending_machine", "brand": "Reddy Ice", "brand:wikidata": "Q7305666", "brand:wikipedia": "en:Reddy Ice", "name": "Reddy Ice", "vending": "ice_cubes"}, "reference": {"key": "vending", "value": "ice_cubes"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/vending_machine/excrement_bags/Robidog": {"name": "Robidog", "icon": "temaki-vending_pet_waste", "geometry": ["point"], "tags": {"brand:wikidata": "Q2159689", "amenity": "vending_machine", "vending": "excrement_bags"}, "addTags": {"amenity": "vending_machine", "brand": "Robidog", "brand:wikidata": "Q2159689", "brand:wikipedia": "de:Robidog", "name": "Robidog", "vending": "excrement_bags"}, "reference": {"key": "vending", "value": "excrement_bags"}, "countryCodes": ["ch"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/vending_machine/parcel_pickup_dropoff/Smartpost": {"name": "Smartpost", "icon": "temaki-vending_lockers", "geometry": ["point"], "tags": {"brand:wikidata": "Q7543889", "amenity": "vending_machine", "vending": "parcel_pickup;parcel_mail_in"}, "addTags": {"amenity": "vending_machine", "brand": "Smartpost", "brand:wikidata": "Q7543889", "brand:wikipedia": "fi:SmartPOST", "name": "Smartpost", "vending": "parcel_pickup;parcel_mail_in"}, "reference": {"key": "vending", "value": "parcel_pickup;parcel_mail_in"}, "countryCodes": ["fi"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/vending_machine/cigarettes/Tobaccoland": {"name": "Tobaccoland", "icon": "temaki-vending_cigarettes", "geometry": ["point"], "tags": {"brand:wikidata": "Q1439872", "amenity": "vending_machine", "vending": "cigarettes"}, "addTags": {"amenity": "vending_machine", "brand": "Tobaccoland", "brand:wikidata": "Q1439872", "brand:wikipedia": "de:Tobaccoland Automatengesellschaft", "name": "Tobaccoland", "vending": "cigarettes"}, "reference": {"key": "vending", "value": "cigarettes"}, "countryCodes": ["de"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/vending_machine/drinks/コカ・コーラ": {"name": "コカ・コーラ", "icon": "temaki-vending_cold_drink", "imageURL": "https://pbs.twimg.com/profile_images/1149007644918784001/b5PBpHkK_bigger.jpg", "geometry": ["point"], "tags": {"brand:wikidata": "Q2813", "amenity": "vending_machine", "vending": "drinks"}, "addTags": {"amenity": "vending_machine", "brand": "コカ・コーラ", "brand:en": "Coca-Cola", "brand:ja": "コカ・コーラ", "brand:wikidata": "Q2813", "brand:wikipedia": "ja:コカ・コーラ", "drink": "cola", "name": "コカ・コーラ", "name:en": "Coca-Cola", "name:ja": "コカ・コーラ", "vending": "drinks"}, "reference": {"key": "vending", "value": "drinks"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/vending_machine/ポッカサッポロ": {"name": "ポッカサッポロ", "icon": "temaki-vending_machine", "imageURL": "https://pbs.twimg.com/profile_images/937822527543377920/j8-XeRV8_bigger.jpg", "geometry": ["point"], "tags": {"brand:wikidata": "Q7208665", "amenity": "vending_machine"}, "addTags": {"amenity": "vending_machine", "brand": "ポッカサッポロ", "brand:en": "Pokka Sapporo", "brand:ja": "ポッカサッポロ", "brand:wikidata": "Q7208665", "brand:wikipedia": "ja:ポッカサッポロフード&ビバレッジ", "name": "ポッカサッポロ", "name:en": "Pokka Sapporo", "name:ja": "ポッカサッポロ", "vending": "water;food"}, "countryCodes": ["jp"], "terms": ["pokka sapporo"], "matchScore": 2, "suggestion": true},
     "amenity/veterinary/Banfield Pet Hospital": {"name": "Banfield Pet Hospital", "icon": "temaki-veterinary_care", "imageURL": "https://graph.facebook.com/BanfieldPetHospital/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2882416", "amenity": "veterinary"}, "addTags": {"amenity": "veterinary", "brand": "Banfield Pet Hospital", "brand:wikidata": "Q2882416", "brand:wikipedia": "en:Banfield Pet Hospital", "name": "Banfield Pet Hospital"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/veterinary/VCA Animal Hospital": {"name": "VCA Animal Hospital", "icon": "temaki-veterinary_care", "imageURL": "https://graph.facebook.com/VCAAnimalHospitals/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7906620", "amenity": "veterinary"}, "addTags": {"amenity": "veterinary", "brand": "VCA Animal Hospital", "brand:wikidata": "Q7906620", "brand:wikipedia": "en:VCA Animal Hospitals", "name": "VCA Animal Hospital"}, "countryCodes": ["ca", "us"], "terms": [], "matchScore": 2, "suggestion": true},
diff --git a/data/presets/presets/amenity/vending_machine/bread.json b/data/presets/presets/amenity/vending_machine/bread.json
new file mode 100644
index 000000000..46a59f400
--- /dev/null
+++ b/data/presets/presets/amenity/vending_machine/bread.json
@@ -0,0 +1,19 @@
+{
+    "icon": "temaki-vending_bread",
+    "geometry": [
+        "point"
+    ],
+    "terms": [
+        "baguette",
+        "bread"
+    ],
+    "tags": {
+        "amenity": "vending_machine",
+        "vending": "bread"
+    },
+    "reference": {
+        "key": "vending",
+        "value": "bread"
+    },
+    "name": "Bread Vending Machine"
+}
diff --git a/data/presets/presets/amenity/vending_machine/cigarettes.json b/data/presets/presets/amenity/vending_machine/cigarettes.json
index 6a0cc1b8f..c17723e46 100644
--- a/data/presets/presets/amenity/vending_machine/cigarettes.json
+++ b/data/presets/presets/amenity/vending_machine/cigarettes.json
@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-vending_machine",
+    "icon": "temaki-vending_cigarettes",
     "moreFields": [
         "{amenity/vending_machine}",
         "min_age"
diff --git a/data/presets/presets/amenity/vending_machine/coffee.json b/data/presets/presets/amenity/vending_machine/coffee.json
index 6fa3a4b23..665d4e48b 100644
--- a/data/presets/presets/amenity/vending_machine/coffee.json
+++ b/data/presets/presets/amenity/vending_machine/coffee.json
@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-vending_machine",
+    "icon": "temaki-vending_hot_drink",
     "geometry": [
         "point"
     ],
diff --git a/data/presets/presets/amenity/vending_machine/condoms.json b/data/presets/presets/amenity/vending_machine/condoms.json
index 7bc922c96..1cd458cb0 100644
--- a/data/presets/presets/amenity/vending_machine/condoms.json
+++ b/data/presets/presets/amenity/vending_machine/condoms.json
@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-vending_machine",
+    "icon": "temaki-vending_love",
     "geometry": [
         "point"
     ],
diff --git a/data/presets/presets/amenity/vending_machine/drinks.json b/data/presets/presets/amenity/vending_machine/drinks.json
index 8dd2d96e6..b72ab707e 100644
--- a/data/presets/presets/amenity/vending_machine/drinks.json
+++ b/data/presets/presets/amenity/vending_machine/drinks.json
@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-vending_machine",
+    "icon": "temaki-vending_cold_drink",
     "geometry": [
         "point"
     ],
diff --git a/data/presets/presets/amenity/vending_machine/eggs.json b/data/presets/presets/amenity/vending_machine/eggs.json
new file mode 100644
index 000000000..9c0921ccb
--- /dev/null
+++ b/data/presets/presets/amenity/vending_machine/eggs.json
@@ -0,0 +1,18 @@
+{
+    "icon": "temaki-vending_eggs",
+    "geometry": [
+        "point"
+    ],
+    "terms": [
+        "egg"
+    ],
+    "tags": {
+        "amenity": "vending_machine",
+        "vending": "eggs"
+    },
+    "reference": {
+        "key": "vending",
+        "value": "eggs"
+    },
+    "name": "Egg Vending Machine"
+}
diff --git a/data/presets/presets/amenity/vending_machine/elongated_coin.json b/data/presets/presets/amenity/vending_machine/elongated_coin.json
index 9cd80225b..8fe571b4c 100644
--- a/data/presets/presets/amenity/vending_machine/elongated_coin.json
+++ b/data/presets/presets/amenity/vending_machine/elongated_coin.json
@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-vending_machine",
+    "icon": "temaki-vending_flat_coin",
     "geometry": [
         "point"
     ],
diff --git a/data/presets/presets/amenity/vending_machine/excrement_bags.json b/data/presets/presets/amenity/vending_machine/excrement_bags.json
index 216cf5c48..3345a3eaa 100644
--- a/data/presets/presets/amenity/vending_machine/excrement_bags.json
+++ b/data/presets/presets/amenity/vending_machine/excrement_bags.json
@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-vending_machine",
+    "icon": "temaki-vending_pet_waste",
     "fields": [
         "{amenity/vending_machine}"
     ],
diff --git a/data/presets/presets/amenity/vending_machine/feminine_hygiene.json b/data/presets/presets/amenity/vending_machine/feminine_hygiene.json
index d636434b8..98c765afe 100644
--- a/data/presets/presets/amenity/vending_machine/feminine_hygiene.json
+++ b/data/presets/presets/amenity/vending_machine/feminine_hygiene.json
@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-vending_machine",
+    "icon": "temaki-vending_venus",
     "geometry": [
         "point"
     ],
diff --git a/data/presets/presets/amenity/vending_machine/ice_cream.json b/data/presets/presets/amenity/vending_machine/ice_cream.json
index 9cc7e7dd7..27370deef 100644
--- a/data/presets/presets/amenity/vending_machine/ice_cream.json
+++ b/data/presets/presets/amenity/vending_machine/ice_cream.json
@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-vending_machine",
+    "icon": "temaki-vending_ice_cream",
     "geometry": [
         "point"
     ],
diff --git a/data/presets/presets/amenity/vending_machine/ice_cubes.json b/data/presets/presets/amenity/vending_machine/ice_cubes.json
new file mode 100644
index 000000000..2f72e76ec
--- /dev/null
+++ b/data/presets/presets/amenity/vending_machine/ice_cubes.json
@@ -0,0 +1,19 @@
+{
+    "icon": "temaki-vending_ice",
+    "geometry": [
+        "point"
+    ],
+    "terms": [
+        "cubes",
+        "ice"
+    ],
+    "tags": {
+        "amenity": "vending_machine",
+        "vending": "ice_cubes"
+    },
+    "reference": {
+        "key": "vending",
+        "value": "ice_cubes"
+    },
+    "name": "Ice Vending Machine"
+}
diff --git a/data/presets/presets/amenity/vending_machine/parcel_pickup.json b/data/presets/presets/amenity/vending_machine/parcel_pickup.json
index 01765c072..36e8456d6 100644
--- a/data/presets/presets/amenity/vending_machine/parcel_pickup.json
+++ b/data/presets/presets/amenity/vending_machine/parcel_pickup.json
@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-vending_machine",
+    "icon": "temaki-vending_lockers",
     "fields": [
         "vending",
         "operator"
diff --git a/data/presets/presets/amenity/vending_machine/parcel_pickup_dropoff.json b/data/presets/presets/amenity/vending_machine/parcel_pickup_dropoff.json
index 7c20ccf84..e89be9397 100644
--- a/data/presets/presets/amenity/vending_machine/parcel_pickup_dropoff.json
+++ b/data/presets/presets/amenity/vending_machine/parcel_pickup_dropoff.json
@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-vending_machine",
+    "icon": "temaki-vending_lockers",
     "fields": [
         "vending",
         "operator",
diff --git a/data/presets/presets/amenity/vending_machine/parking_tickets.json b/data/presets/presets/amenity/vending_machine/parking_tickets.json
index 01aac7e3f..2645e8dc5 100644
--- a/data/presets/presets/amenity/vending_machine/parking_tickets.json
+++ b/data/presets/presets/amenity/vending_machine/parking_tickets.json
@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-vending_machine",
+    "icon": "temaki-vending_tickets",
     "geometry": [
         "point"
     ],
diff --git a/data/presets/presets/amenity/vending_machine/public_transport_tickets.json b/data/presets/presets/amenity/vending_machine/public_transport_tickets.json
index a3960ce94..2dada72eb 100644
--- a/data/presets/presets/amenity/vending_machine/public_transport_tickets.json
+++ b/data/presets/presets/amenity/vending_machine/public_transport_tickets.json
@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-vending_machine",
+    "icon": "temaki-vending_tickets",
     "geometry": [
         "point"
     ],
diff --git a/data/presets/presets/amenity/vending_machine/stamps.json b/data/presets/presets/amenity/vending_machine/stamps.json
index 67565bd09..fecf0575f 100644
--- a/data/presets/presets/amenity/vending_machine/stamps.json
+++ b/data/presets/presets/amenity/vending_machine/stamps.json
@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-vending_machine",
+    "icon": "temaki-vending_stamps",
     "geometry": [
         "point"
     ],
diff --git a/data/taginfo.json b/data/taginfo.json
index 9518c688a..2acddf41c 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -237,23 +237,26 @@
     {"key": "amenity", "value": "vehicle_inspection", "description": "🄿 Vehicle Inspection", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/car-15.svg"},
     {"key": "amenity", "value": "vending_machine", "description": "🄿 Vending Machine", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/vending_machine.svg"},
     {"key": "vending", "value": "bottle_return", "description": "🄿 Bottle Return Machine", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/vending_machine.svg"},
-    {"key": "vending", "value": "cigarettes", "description": "🄿 Cigarette Vending Machine", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/vending_machine.svg"},
-    {"key": "vending", "value": "coffee", "description": "🄿 Coffee Vending Machine", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/vending_machine.svg"},
-    {"key": "vending", "value": "condoms", "description": "🄿 Condom Vending Machine", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/vending_machine.svg"},
-    {"key": "vending", "value": "drinks", "description": "🄿 Drink Vending Machine", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/vending_machine.svg"},
+    {"key": "vending", "value": "bread", "description": "🄿 Bread Vending Machine", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/vending_bread.svg"},
+    {"key": "vending", "value": "cigarettes", "description": "🄿 Cigarette Vending Machine", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/vending_cigarettes.svg"},
+    {"key": "vending", "value": "coffee", "description": "🄿 Coffee Vending Machine", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/vending_hot_drink.svg"},
+    {"key": "vending", "value": "condoms", "description": "🄿 Condom Vending Machine", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/vending_love.svg"},
+    {"key": "vending", "value": "drinks", "description": "🄿 Drink Vending Machine", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/vending_cold_drink.svg"},
+    {"key": "vending", "value": "eggs", "description": "🄿 Egg Vending Machine", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/vending_eggs.svg"},
     {"key": "vending", "value": "electronics", "description": "🄿 Electronics Vending Machine", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/vending_machine.svg"},
-    {"key": "vending", "value": "elongated_coin", "description": "🄿 Flat Coin Vending Machine", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/vending_machine.svg"},
-    {"key": "vending", "value": "excrement_bags", "description": "🄿 Excrement Bag Dispenser", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/vending_machine.svg"},
-    {"key": "vending", "value": "feminine_hygiene", "description": "🄿 Feminine Hygiene Vending Machine", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/vending_machine.svg"},
+    {"key": "vending", "value": "elongated_coin", "description": "🄿 Flat Coin Vending Machine", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/vending_flat_coin.svg"},
+    {"key": "vending", "value": "excrement_bags", "description": "🄿 Excrement Bag Dispenser", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/vending_pet_waste.svg"},
+    {"key": "vending", "value": "feminine_hygiene", "description": "🄿 Feminine Hygiene Vending Machine", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/vending_venus.svg"},
     {"key": "vending", "value": "food", "description": "🄿 Food Vending Machine", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/vending_machine.svg"},
     {"key": "vending", "value": "fuel", "description": "🄿 Gas Pump", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/fuel-15.svg"},
-    {"key": "vending", "value": "ice_cream", "description": "🄿 Ice Cream Vending Machine", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/vending_machine.svg"},
+    {"key": "vending", "value": "ice_cream", "description": "🄿 Ice Cream Vending Machine", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/vending_ice_cream.svg"},
+    {"key": "vending", "value": "ice_cubes", "description": "🄿 Ice Vending Machine", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/vending_ice.svg"},
     {"key": "vending", "value": "newspapers", "description": "🄿 Newspaper Vending Machine", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/vending_newspaper.svg"},
-    {"key": "vending", "value": "parcel_pickup;parcel_mail_in", "description": "🄿 Parcel Pickup/Dropoff Locker", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/vending_machine.svg"},
-    {"key": "vending", "value": "parcel_pickup", "description": "🄿 Parcel Pickup Locker", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/vending_machine.svg"},
-    {"key": "vending", "value": "parking_tickets", "description": "🄿 Parking Ticket Vending Machine", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/vending_machine.svg"},
-    {"key": "vending", "value": "public_transport_tickets", "description": "🄿 Transit Ticket Vending Machine", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/vending_machine.svg"},
-    {"key": "vending", "value": "stamps", "description": "🄿 Postage Vending Machine", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/vending_machine.svg"},
+    {"key": "vending", "value": "parcel_pickup;parcel_mail_in", "description": "🄿 Parcel Pickup/Dropoff Locker", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/vending_lockers.svg"},
+    {"key": "vending", "value": "parcel_pickup", "description": "🄿 Parcel Pickup Locker", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/vending_lockers.svg"},
+    {"key": "vending", "value": "parking_tickets", "description": "🄿 Parking Ticket Vending Machine", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/vending_tickets.svg"},
+    {"key": "vending", "value": "public_transport_tickets", "description": "🄿 Transit Ticket Vending Machine", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/vending_tickets.svg"},
+    {"key": "vending", "value": "stamps", "description": "🄿 Postage Vending Machine", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/vending_stamps.svg"},
     {"key": "vending", "value": "sweets", "description": "🄿 Snack Vending Machine", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/vending_machine.svg"},
     {"key": "amenity", "value": "veterinary", "description": "🄿 Veterinary", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/veterinary_care.svg"},
     {"key": "amenity", "value": "waste_basket", "description": "🄿 Waste Basket", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/waste-basket-15.svg"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index da8b8df29..50b9aa94e 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -5895,6 +5895,10 @@
                     "name": "Bottle Return Machine",
                     "terms": "bottle return"
                 },
+                "amenity/vending_machine/bread": {
+                    "name": "Bread Vending Machine",
+                    "terms": "baguette,bread"
+                },
                 "amenity/vending_machine/cigarettes": {
                     "name": "Cigarette Vending Machine",
                     "terms": "cigarette"
@@ -5911,6 +5915,10 @@
                     "name": "Drink Vending Machine",
                     "terms": "drink,soda,beverage,juice,pop"
                 },
+                "amenity/vending_machine/eggs": {
+                    "name": "Egg Vending Machine",
+                    "terms": "egg"
+                },
                 "amenity/vending_machine/electronics": {
                     "name": "Electronics Vending Machine",
                     "terms": "cable,charger,earbud,headphone,phone,tablet"
@@ -5939,6 +5947,10 @@
                     "name": "Ice Cream Vending Machine",
                     "terms": "chocolate,ice cream,frozen,popsicle,vanilla"
                 },
+                "amenity/vending_machine/ice_cubes": {
+                    "name": "Ice Vending Machine",
+                    "terms": "cubes,ice"
+                },
                 "amenity/vending_machine/newspapers": {
                     "name": "Newspaper Vending Machine",
                     "terms": "newspaper"