diff --git a/data/presets/presets.json b/data/presets/presets.json
index e3f20a012..d7a2724ee 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -32,7 +32,7 @@
   "aerialway/chair_lift": {"icon": "temaki-chairlift", "geometry": ["line"], "fields": ["name", "oneway_yes", "aerialway/occupancy", "aerialway/capacity", "aerialway/duration", "aerialway/bubble", "aerialway/heating"], "tags": {"aerialway": "chair_lift"}, "terms": ["aerial cable", "skiing", "snowboarding"], "name": "Chair Lift"},
   "aerialway/drag_lift": {"icon": "temaki-drag_lift", "geometry": ["line"], "fields": ["name", "aerialway/capacity", "aerialway/duration"], "tags": {"aerialway": "drag_lift"}, "terms": ["skiing", "snowboarding", "surface cable"], "name": "Drag Lift"},
   "aerialway/gondola": {"icon": "maki-aerialway", "geometry": ["line"], "fields": ["name", "oneway", "aerialway/occupancy", "aerialway/capacity", "aerialway/duration", "aerialway/bubble", "aerialway/heating"], "tags": {"aerialway": "gondola"}, "terms": ["aerial cable", "lift", "skiing", "snowboarding"], "name": "Gondola"},
-  "aerialway/goods": {"geometry": ["line"], "fields": ["name", "aerialway/capacity", "aerialway/duration"], "tags": {"aerialway": "goods"}, "terms": ["aerial cable"], "name": "Goods Aerialway"},
+  "aerialway/goods": {"icon": "temaki-goods_lift", "geometry": ["line"], "fields": ["name", "aerialway/capacity", "aerialway/duration"], "tags": {"aerialway": "goods"}, "terms": ["aerial cable"], "name": "Goods Aerialway"},
   "aerialway/j-bar": {"icon": "temaki-j_bar_lift", "geometry": ["line"], "fields": ["name", "aerialway/capacity", "aerialway/duration"], "tags": {"aerialway": "j-bar"}, "terms": ["drag lift", "skiing", "snowboarding", "surface cable", "jaybar", "jbar"], "name": "J-Bar Lift"},
   "aerialway/magic_carpet": {"geometry": ["line"], "fields": ["name", "aerialway/capacity", "aerialway/duration", "aerialway/heating"], "tags": {"aerialway": "magic_carpet"}, "terms": ["conveyor belt", "skiing", "snowboarding", "surface lift"], "name": "Magic Carpet Lift"},
   "aerialway/mixed_lift": {"icon": "maki-aerialway", "geometry": ["line"], "fields": ["name", "oneway_yes", "aerialway/occupancy", "aerialway/capacity", "aerialway/duration", "aerialway/bubble", "aerialway/heating"], "tags": {"aerialway": "mixed_lift"}, "terms": ["aerial cable", "skiing", "snowboarding"], "name": "Mixed Lift"},
@@ -61,7 +61,7 @@
   "amenity/ferry_terminal": {"icon": "maki-ferry", "fields": ["name", "network", "operator", "address", "building_area"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "ferry_terminal"}, "matchScore": 0.95, "name": "Ferry Station / Terminal", "searchable": false, "replacement": "public_transport/station_ferry"},
   "amenity/nursing_home": {"icon": "maki-wheelchair", "fields": ["name", "operator", "address", "building_area", "social_facility", "social_facility_for", "opening_hours", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "nursing_home"}, "reference": {"key": "social_facility", "value": "nursing_home"}, "name": "Nursing Home", "searchable": false},
   "amenity/recycling": {"icon": "maki-recycling", "fields": ["recycling_type", "recycling_accepts", "collection_times"], "geometry": ["point", "area"], "tags": {"amenity": "recycling"}, "name": "Recycling", "searchable": false},
-  "amenity/register_office": {"icon": "maki-town-hall", "fields": ["name", "address", "building_area", "opening_hours", "operator"], "geometry": ["point", "area"], "tags": {"amenity": "register_office"}, "reference": {"key": "government", "value": "register_office"}, "name": "Register Office", "searchable": false},
+  "amenity/register_office": {"icon": "temaki-town_hall", "fields": ["name", "address", "building_area", "opening_hours", "operator"], "geometry": ["point", "area"], "tags": {"amenity": "register_office"}, "reference": {"key": "government", "value": "register_office"}, "name": "Register Office", "searchable": false},
   "amenity/scrapyard": {"icon": "temaki-junk_car", "fields": ["name", "operator", "address", "opening_hours"], "geometry": ["point", "area"], "tags": {"amenity": "scrapyard"}, "reference": {"key": "industrial", "value": "scrap_yard"}, "name": "Scrap Yard", "searchable": false},
   "amenity/swimming_pool": {"icon": "fas-swimmer", "geometry": ["point", "vertex", "area"], "tags": {"amenity": "swimming_pool"}, "reference": {"key": "leisure", "value": "swimming_pool"}, "name": "Swimming Pool", "searchable": false},
   "amenity/animal_boarding": {"icon": "maki-veterinary", "fields": ["name", "operator", "address", "building_area", "opening_hours", "animal_boarding"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["boarding", "cat", "cattery", "dog", "horse", "kennel", "kitten", "pet", "pet boarding", "pet care", "pet hotel", "puppy", "reptile"], "tags": {"amenity": "animal_boarding"}, "name": "Animal Boarding Facility"},
@@ -153,7 +153,7 @@
   "amenity/nightclub/lgbtq": {"icon": "maki-bar", "geometry": ["point", "area"], "tags": {"amenity": "nightclub", "lgbtq": "primary"}, "terms": ["gay nightclub", "lesbian nightclub", "lgbtq nightclub", "lgbt nightclub", "lgb nightclub"], "name": "LGBTQ+ Nightclub"},
   "amenity/parking_entrance": {"icon": "maki-entrance-alt1", "fields": ["ref", "access_simple", "address", "level"], "geometry": ["vertex"], "tags": {"amenity": "parking_entrance"}, "name": "Parking Garage Entrance / Exit"},
   "amenity/parking_space": {"icon": "temaki-parking_space", "fields": ["parking_space", "capacity"], "geometry": ["area", "point", "vertex"], "tags": {"amenity": "parking_space"}, "addTags": {"amenity": "parking_space", "capacity": "1"}, "terms": ["parking spot", "parking stall"], "matchScore": 0.95, "name": "Parking Space"},
-  "amenity/parking_space/disabled": {"icon": "temaki-parking_space", "geometry": ["area", "point", "vertex"], "tags": {"amenity": "parking_space", "parking_space": "disabled"}, "addTags": {"amenity": "parking_space", "parking_space": "disabled", "capacity": "1"}, "terms": ["disability", "disabled parking stall", "handicap parking spot", "wheelchair"], "matchScore": 0.95, "name": "Accessible Parking Space"},
+  "amenity/parking_space/disabled": {"icon": "temaki-accessible_space", "geometry": ["area", "point", "vertex"], "tags": {"amenity": "parking_space", "parking_space": "disabled"}, "addTags": {"amenity": "parking_space", "parking_space": "disabled", "capacity": "1"}, "terms": ["disability", "disabled parking stall", "handicap parking spot", "wheelchair"], "matchScore": 0.95, "name": "Accessible Parking Space"},
   "amenity/parking": {"icon": "temaki-car_parked", "fields": ["operator", "operator/type", "parking", "capacity_parking", "capacity/disabled_parking", "access_simple", "fee", "payment_multi_fee", "charge_fee", "surface"], "moreFields": ["address", "covered", "email", "fax", "maxstay", "name", "opening_hours", "park_ride", "phone", "ref", "supervised", "website", "wheelchair"], "geometry": ["area", "point", "vertex"], "tags": {"amenity": "parking"}, "terms": ["automobile parking", "car lot", "car parking", "rv parking", "truck parking", "vehicle parking"], "name": "Parking Lot"},
   "amenity/parking/multi-storey": {"icon": "temaki-car_structure", "fields": ["name", "{amenity/parking}", "building"], "moreFields": ["{amenity/parking}", "height", "building/levels"], "geometry": ["area"], "tags": {"amenity": "parking", "parking": "multi-storey"}, "addTags": {"building": "parking", "amenity": "parking", "parking": "multi-storey"}, "reference": {"key": "parking", "value": "multi-storey"}, "terms": ["car", "indoor parking", "multistorey car park", "parkade", "parking building", "parking deck", "parking garage", "parking ramp", "parking structure"], "name": "Multilevel Parking Garage"},
   "amenity/parking/park_ride": {"icon": "temaki-sign_and_car", "geometry": ["area", "point", "vertex"], "tags": {"amenity": "parking", "park_ride": "yes"}, "reference": {"key": "park_ride", "value": "yes"}, "terms": ["commuter parking lot", "incentive parking lot", "metro parking lot", "park and pool lot", "park and ride lot", "P+R", "public transport parking lot", "public transit parking lot", "train parking lot"], "matchScore": 0.95, "name": "Park & Ride Lot"},
@@ -167,7 +167,7 @@
   "amenity/place_of_worship/christian": {"icon": "maki-religious-christian", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["christian", "abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "oratory", "parish", "sacellum", "sanctuary", "shrine", "tabernacle", "temple"], "tags": {"amenity": "place_of_worship", "religion": "christian"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Christian Church"},
   "amenity/place_of_worship/christian/jehovahs_witness": {"icon": "maki-place-of-worship", "geometry": ["point", "area"], "terms": ["christian", "church", "house of God", "house of prayer", "house of worship"], "tags": {"amenity": "place_of_worship", "religion": "christian", "denomination": "jehovahs_witness"}, "reference": {"key": "denomination", "value": "jehovahs_witness"}, "name": "Kingdom Hall of Jehovah's Witnesses"},
   "amenity/place_of_worship/christian/la_luz_del_mundo": {"icon": "maki-place-of-worship", "geometry": ["point", "area"], "terms": ["christian", "church", "house of God", "house of prayer", "house of worship", "the light of the world church"], "tags": {"amenity": "place_of_worship", "religion": "christian", "denomination": "la_luz_del_mundo"}, "reference": {"key": "denomination", "value": "la_luz_del_mundo"}, "name": "La Luz del Mundo Temple"},
-  "amenity/place_of_worship/christian/quaker": {"icon": "maki-place-of-worship", "geometry": ["point", "area"], "terms": ["christian", "church", "house of God", "house of prayer", "house of worship"], "tags": {"amenity": "place_of_worship", "religion": "christian", "denomination": "quaker"}, "reference": {"key": "denomination", "value": "quaker"}, "name": "Quaker Friends Meeting House"},
+  "amenity/place_of_worship/christian/quaker": {"icon": "temaki-quakerism", "geometry": ["point", "area"], "terms": ["christian", "church", "house of God", "house of prayer", "house of worship"], "tags": {"amenity": "place_of_worship", "religion": "christian", "denomination": "quaker"}, "reference": {"key": "denomination", "value": "quaker"}, "name": "Quaker Friends Meeting House"},
   "amenity/place_of_worship/hindu": {"icon": "temaki-hinduism", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["kovil", "devasthana", "mandir", "kshetram", "alayam", "shrine", "temple"], "tags": {"amenity": "place_of_worship", "religion": "hindu"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Hindu Temple"},
   "amenity/place_of_worship/jewish": {"icon": "maki-religious-jewish", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["jewish"], "tags": {"amenity": "place_of_worship", "religion": "jewish"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Jewish Synagogue"},
   "amenity/place_of_worship/muslim": {"icon": "maki-religious-muslim", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["islam", "islamic center", "muslim"], "tags": {"amenity": "place_of_worship", "religion": "muslim"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Muslim Mosque"},
@@ -240,8 +240,8 @@
   "amenity/toilets": {"icon": "maki-toilet", "fields": ["toilets/disposal", "access_simple", "gender", "changing_table", "wheelchair", "building_area"], "moreFields": ["charge_fee", "fee", "level", "opening_hours", "operator", "payment_multi_fee", "toilets/handwashing", "toilets/position"], "geometry": ["point", "vertex", "area"], "terms": ["bathroom", "restroom", "outhouse", "privy", "head", "lavatory", "latrine", "water closet", "WC", "W.C."], "tags": {"amenity": "toilets"}, "name": "Toilets"},
   "amenity/toilets/disposal/flush": {"icon": "fas-toilet", "fields": ["toilets/disposal", "{amenity/toilets}"], "moreFields": ["{amenity/toilets}"], "geometry": ["point", "vertex", "area"], "terms": ["bathroom", "head", "lavatory", "privy", "restroom", "water closet", "WC", "W.C."], "tags": {"amenity": "toilets", "toilets:disposal": "flush"}, "reference": {"key": "toilets:disposal", "value": "flush"}, "name": "Flush Toilets"},
   "amenity/toilets/disposal/pitlatrine": {"icon": "tnp-2009541", "fields": ["toilets/disposal", "{amenity/toilets}", "toilets/handwashing"], "moreFields": ["{amenity/toilets}"], "geometry": ["point", "vertex", "area"], "terms": ["head", "lavatory", "long drop", "outhouse", "pit toilet", "privy"], "tags": {"amenity": "toilets", "toilets:disposal": "pitlatrine"}, "reference": {"key": "toilets:disposal", "value": "pitlatrine"}, "name": "Pit Latrine"},
-  "amenity/townhall": {"icon": "maki-town-hall", "fields": ["name", "operator", "townhall/type", "address", "building_area"], "moreFields": ["baby_feeding", "email", "fax", "gnis/feature_id", "phone", "polling_station", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["village", "city", "government", "courthouse", "municipal"], "tags": {"amenity": "townhall"}, "name": "Town Hall"},
-  "amenity/townhall/city": {"icon": "maki-town-hall", "geometry": ["point", "area"], "terms": ["council", "courthouse", "government", "mayor", "municipality"], "tags": {"amenity": "townhall", "townhall:type": "city"}, "name": "City Hall"},
+  "amenity/townhall": {"icon": "temaki-town_hall", "fields": ["name", "operator", "townhall/type", "address", "building_area"], "moreFields": ["baby_feeding", "email", "fax", "gnis/feature_id", "phone", "polling_station", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["village", "city", "government", "courthouse", "municipal"], "tags": {"amenity": "townhall"}, "name": "Town Hall"},
+  "amenity/townhall/city": {"icon": "temaki-capitol", "geometry": ["point", "area"], "terms": ["council", "courthouse", "government", "mayor", "municipality"], "tags": {"amenity": "townhall", "townhall:type": "city"}, "name": "City Hall"},
   "amenity/toy_library": {"icon": "fas-chess-knight", "fields": ["operator", "address", "building_area", "opening_hours"], "moreFields": ["level", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["game", "toy"], "tags": {"amenity": "toy_library"}, "name": "Toy Library"},
   "amenity/university": {"icon": "maki-college", "fields": ["{amenity/college}"], "moreFields": ["{amenity/college}"], "geometry": ["area", "point"], "terms": ["college", "graduate school", "PhD program", "master's degree program"], "tags": {"amenity": "university"}, "name": "University Grounds"},
   "amenity/vehicle_inspection": {"icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "gnis/feature_id", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["car inspection"], "tags": {"amenity": "vehicle_inspection"}, "name": "Vehicle Inspection"},
@@ -399,7 +399,7 @@
   "craft/brewery": {"icon": "temaki-storage_fermenter", "fields": ["{craft}", "product"], "moreFields": ["{craft}", "min_age"], "geometry": ["point", "area"], "terms": ["alcohol", "beer", "beverage", "bier", "booze", "cider"], "tags": {"craft": "brewery"}, "name": "Brewery"},
   "craft/carpenter": {"icon": "temaki-tools", "geometry": ["point", "area"], "terms": ["woodworker"], "tags": {"craft": "carpenter"}, "name": "Carpenter"},
   "craft/carpet_layer": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "carpet_layer"}, "name": "Carpet Layer"},
-  "craft/caterer": {"icon": "maki-restaurant", "fields": ["name", "cuisine", "{craft}"], "geometry": ["point", "area"], "tags": {"craft": "caterer"}, "name": "Caterer"},
+  "craft/caterer": {"icon": "temaki-catering", "fields": ["name", "cuisine", "{craft}"], "geometry": ["point", "area"], "tags": {"craft": "caterer"}, "name": "Caterer"},
   "craft/chimney_sweeper": {"icon": "temaki-chimney", "geometry": ["point", "area"], "tags": {"craft": "chimney_sweeper"}, "name": "Chimney Sweeper"},
   "craft/cleaning": {"icon": "temaki-vacuum", "geometry": ["point", "area"], "tags": {"craft": "cleaning"}, "name": "Cleaning Service"},
   "craft/clockmaker": {"icon": "temaki-clock", "geometry": ["point", "area"], "tags": {"craft": "clockmaker"}, "name": "Clockmaker"},
@@ -429,7 +429,7 @@
   "craft/saddler": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "saddler"}, "name": "Saddler"},
   "craft/sailmaker": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "sailmaker"}, "name": "Sailmaker"},
   "craft/sawmill": {"icon": "maki-logging", "geometry": ["point", "area"], "terms": ["lumber"], "tags": {"craft": "sawmill"}, "name": "Sawmill"},
-  "craft/scaffolder": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "scaffolder"}, "name": "Scaffolder"},
+  "craft/scaffolder": {"icon": "temaki-scaffold", "geometry": ["point", "area"], "tags": {"craft": "scaffolder"}, "name": "Scaffolder"},
   "craft/sculptor": {"icon": "maki-art-gallery", "geometry": ["point", "area"], "tags": {"craft": "sculptor"}, "name": "Sculptor"},
   "craft/shoemaker": {"icon": "maki-shoe", "geometry": ["point", "area"], "terms": ["cobbler"], "tags": {"craft": "shoemaker"}, "name": "Shoemaker"},
   "craft/signmaker": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "signmaker"}, "name": "Signmaker"},
@@ -869,10 +869,10 @@
   "office/financial": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "financial"}, "terms": [], "name": "Financial Office"},
   "office/forestry": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "forestry"}, "terms": ["forest", "ranger"], "name": "Forestry Office"},
   "office/foundation": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "foundation"}, "terms": [], "name": "Foundation Office"},
-  "office/government": {"icon": "maki-town-hall", "fields": ["name", "government", "{office}"], "geometry": ["point", "area"], "tags": {"office": "government"}, "terms": [], "name": "Government Office"},
+  "office/government": {"icon": "temaki-town_hall", "fields": ["name", "government", "{office}"], "geometry": ["point", "area"], "tags": {"office": "government"}, "terms": [], "name": "Government Office"},
   "office/government/prosecutor": {"icon": "maki-suitcase", "fields": ["{office}", "operator"], "geometry": ["point", "area"], "terms": ["attorney general", "district attorney", "prosecution"], "tags": {"office": "government", "government": "prosecutor"}, "reference": {"key": "government", "value": "prosecutor"}, "name": "Public Prosecutor's Office"},
-  "office/government/register_office": {"icon": "maki-town-hall", "fields": ["{office}", "operator"], "geometry": ["point", "area"], "terms": ["clerk", "marriage", "death", "birth", "certificate"], "tags": {"office": "government", "government": "register_office"}, "reference": {"key": "government", "value": "register_office"}, "name": "Register Office"},
-  "office/government/tax": {"icon": "maki-town-hall", "fields": ["{office}", "operator"], "geometry": ["point", "area"], "terms": ["fiscal authorities", "revenue office", "tax office"], "tags": {"office": "government", "government": "tax"}, "reference": {"key": "government", "value": "tax"}, "name": "Tax and Revenue Office"},
+  "office/government/register_office": {"icon": "temaki-town_hall", "fields": ["{office}", "operator"], "geometry": ["point", "area"], "terms": ["clerk", "marriage", "death", "birth", "certificate"], "tags": {"office": "government", "government": "register_office"}, "reference": {"key": "government", "value": "register_office"}, "name": "Register Office"},
+  "office/government/tax": {"icon": "temaki-town_hall", "fields": ["{office}", "operator"], "geometry": ["point", "area"], "terms": ["fiscal authorities", "revenue office", "tax office"], "tags": {"office": "government", "government": "tax"}, "reference": {"key": "government", "value": "tax"}, "name": "Tax and Revenue Office"},
   "office/guide": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "guide"}, "terms": ["dive guide", "mountain guide", "tour guide"], "name": "Tour Guide Office"},
   "office/insurance": {"icon": "temaki-briefcase_shield", "moreFields": ["brand", "{office}"], "geometry": ["point", "area"], "tags": {"office": "insurance"}, "terms": [], "name": "Insurance Office"},
   "office/it": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "it"}, "terms": ["computer", "information", "software", "technology"], "name": "Information Technology Office"},
@@ -1020,7 +1020,7 @@
   "railway/switch": {"icon": "temaki-junction", "geometry": ["vertex"], "tags": {"railway": "switch"}, "terms": ["switch", "points"], "name": "Railway Switch"},
   "railway/train_wash": {"icon": "maki-rail", "geometry": ["point", "vertex", "area"], "fields": ["operator", "building_area"], "tags": {"railway": "wash"}, "terms": ["wash", "clean"], "name": "Train Wash"},
   "railway/tram": {"icon": "temaki-tram", "fields": ["{railway/light_rail}"], "moreFields": ["{railway/light_rail}"], "geometry": ["line"], "tags": {"railway": "tram"}, "terms": ["electric street railway", "light rail", "streetcar", "tramway", "trolley"], "name": "Tram Track"},
-  "railway/yard": {"icon": "maki-rail", "fields": ["name", "operator"], "moreFields": ["gnis/feature_id"], "geometry": ["point"], "tags": {"railway": "yard"}, "terms": ["freight car stop", "freight train station", "rail freight station", "railroad yard", "railway yard"], "name": "Rail Yard"},
+  "railway/yard": {"icon": "temaki-freight_car", "fields": ["name", "operator"], "moreFields": ["gnis/feature_id"], "geometry": ["point"], "tags": {"railway": "yard"}, "terms": ["freight car stop", "freight train station", "rail freight station", "railroad yard", "railway yard"], "name": "Rail Yard"},
   "relation": {"icon": "iD-relation", "fields": ["name", "relation"], "geometry": ["relation"], "tags": {}, "name": "Relation"},
   "route/ferry": {"icon": "maki-ferry", "geometry": ["line"], "fields": ["name", "operator", "duration", "access", "toll", "to", "from"], "moreFields": ["charge_toll", "dog", "interval", "maxheight", "maxweight", "network", "network/type", "opening_hours", "ref_route", "wheelchair"], "tags": {"route": "ferry"}, "terms": ["boat", "merchant vessel", "ship", "water bus", "water shuttle", "water taxi"], "name": "Ferry Route"},
   "seamark/beacon_isolated_danger": {"fields": ["ref", "operator", "seamark/beacon_isolated_danger/shape", "seamark/type"], "geometry": ["point", "vertex"], "terms": ["beacon isolated danger", "isolated danger beacon", "iala"], "tags": {"seamark:type": "beacon_isolated_danger"}, "name": "Danger Beacon"},
@@ -1084,7 +1084,7 @@
   "shop/craft": {"icon": "fas-cut", "geometry": ["point", "area"], "tags": {"shop": "craft"}, "terms": ["art*", "paint*", "frame"], "name": "Arts & Crafts Store"},
   "shop/curtain": {"icon": "temaki-curtains", "geometry": ["point", "area"], "terms": ["drape*", "window"], "tags": {"shop": "curtain"}, "name": "Curtain Store"},
   "shop/dairy": {"icon": "fas-cheese", "geometry": ["point", "area"], "terms": ["milk", "egg", "cheese"], "tags": {"shop": "dairy"}, "name": "Dairy Store"},
-  "shop/deli": {"icon": "maki-restaurant", "geometry": ["point", "area"], "terms": ["lunch", "meat", "sandwich"], "tags": {"shop": "deli"}, "name": "Deli"},
+  "shop/deli": {"icon": "temaki-meat", "geometry": ["point", "area"], "terms": ["lunch", "meat", "sandwich"], "tags": {"shop": "deli"}, "name": "Deli"},
   "shop/department_store": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "department_store"}, "name": "Department Store"},
   "shop/doityourself": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"shop": "doityourself"}, "name": "DIY Store"},
   "shop/doors": {"icon": "fas-door-open", "geometry": ["point", "area"], "tags": {"shop": "doors"}, "name": "Door Shop"},
@@ -1153,7 +1153,7 @@
   "shop/pastry": {"icon": "maki-bakery", "geometry": ["point", "area"], "tags": {"shop": "pastry"}, "terms": ["patisserie", "cake shop", "cakery"], "name": "Pastry Shop"},
   "shop/pawnbroker": {"icon": "temaki-money_hand", "geometry": ["point", "area"], "tags": {"shop": "pawnbroker"}, "name": "Pawn Shop"},
   "shop/perfumery": {"icon": "temaki-perfume", "geometry": ["point", "area"], "tags": {"shop": "perfumery"}, "terms": ["cologne", "fragrance", "purfume"], "name": "Perfume Store"},
-  "shop/pet_grooming": {"icon": "maki-dog-park", "geometry": ["point", "area"], "terms": ["cat", "dog"], "tags": {"shop": "pet_grooming"}, "name": "Pet Grooming Store"},
+  "shop/pet_grooming": {"icon": "temaki-pet_grooming", "geometry": ["point", "area"], "terms": ["cat", "dog"], "tags": {"shop": "pet_grooming"}, "name": "Pet Grooming Store"},
   "shop/pet": {"icon": "maki-dog-park", "geometry": ["point", "area"], "terms": ["animal", "cat", "dog", "fish", "kitten", "puppy", "reptile"], "tags": {"shop": "pet"}, "name": "Pet Store"},
   "shop/photo": {"icon": "fas-camera-retro", "geometry": ["point", "area"], "terms": ["camera", "film", "lens", "photo"], "tags": {"shop": "photo"}, "name": "Photography Store"},
   "shop/pottery": {"icon": "temaki-vase", "geometry": ["point", "area"], "terms": ["ceramic", "pot", "vase"], "tags": {"shop": "pottery"}, "name": "Pottery Store"},
@@ -4565,8 +4565,8 @@
   "shop/craft/Jo-Ann": {"name": "Jo-Ann", "icon": "fas-cut", "imageURL": "https://graph.facebook.com/JoAnn/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6203968", "shop": "craft"}, "addTags": {"brand": "Jo-Ann", "brand:wikidata": "Q6203968", "brand:wikipedia": "en:Jo-Ann Stores", "name": "Jo-Ann", "shop": "craft"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
   "shop/craft/Michaels": {"name": "Michaels", "icon": "fas-cut", "imageURL": "https://graph.facebook.com/Michaels/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6835667", "shop": "craft"}, "addTags": {"brand": "Michaels", "brand:wikidata": "Q6835667", "brand:wikipedia": "en:Michaels", "name": "Michaels", "shop": "craft"}, "countryCodes": ["ca", "us"], "terms": [], "matchScore": 2, "suggestion": true},
   "shop/craft/Woodcraft": {"name": "Woodcraft", "icon": "fas-cut", "imageURL": "https://graph.facebook.com/WoodcraftWoodworking/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q22026341", "shop": "craft"}, "addTags": {"brand": "Woodcraft", "brand:wikidata": "Q22026341", "brand:wikipedia": "en:Woodcraft Supply", "name": "Woodcraft", "shop": "craft"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-  "shop/deli/ほっともっと": {"name": "ほっともっと", "icon": "maki-restaurant", "imageURL": "https://graph.facebook.com/hottomotto/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q10850949", "shop": "deli"}, "addTags": {"brand": "ほっともっと", "brand:en": "Hotto Motto", "brand:ja": "ほっともっと", "brand:wikidata": "Q10850949", "brand:wikipedia": "ja:ほっともっと", "name": "ほっともっと", "name:en": "Hotto Motto", "name:ja": "ほっともっと", "shop": "deli"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
-  "shop/deli/京樽": {"name": "京樽", "icon": "maki-restaurant", "imageURL": "https://graph.facebook.com/kyotaru.sushi/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q11374503", "shop": "deli"}, "addTags": {"brand": "京樽", "brand:en": "Kyotaru", "brand:ja": "京樽", "brand:wikidata": "Q11374503", "brand:wikipedia": "ja:京樽", "name": "京樽", "name:en": "Kyotaru", "name:ja": "京樽", "shop": "deli"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
+  "shop/deli/ほっともっと": {"name": "ほっともっと", "icon": "temaki-meat", "imageURL": "https://graph.facebook.com/hottomotto/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q10850949", "shop": "deli"}, "addTags": {"brand": "ほっともっと", "brand:en": "Hotto Motto", "brand:ja": "ほっともっと", "brand:wikidata": "Q10850949", "brand:wikipedia": "ja:ほっともっと", "name": "ほっともっと", "name:en": "Hotto Motto", "name:ja": "ほっともっと", "shop": "deli"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
+  "shop/deli/京樽": {"name": "京樽", "icon": "temaki-meat", "imageURL": "https://graph.facebook.com/kyotaru.sushi/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q11374503", "shop": "deli"}, "addTags": {"brand": "京樽", "brand:en": "Kyotaru", "brand:ja": "京樽", "brand:wikidata": "Q11374503", "brand:wikipedia": "ja:京樽", "name": "京樽", "name:en": "Kyotaru", "name:ja": "京樽", "shop": "deli"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
   "shop/department_store/Barneys New York": {"name": "Barneys New York", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/BarneysNY/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q59465", "shop": "department_store"}, "addTags": {"brand": "Barneys New York", "brand:wikidata": "Q59465", "brand:wikipedia": "en:Barneys New York", "name": "Barneys New York", "shop": "department_store"}, "countryCodes": ["us"], "terms": ["barneys"], "matchScore": 2, "suggestion": true},
   "shop/department_store/Beales": {"name": "Beales", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/LoveBeales/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4876141", "shop": "department_store"}, "addTags": {"brand": "Beales", "brand:wikidata": "Q4876141", "brand:wikipedia": "en:Beales (department store)", "name": "Beales", "shop": "department_store"}, "countryCodes": ["gb"], "terms": [], "matchScore": 2, "suggestion": true},
   "shop/department_store/Bealls (Florida-based)": {"name": "Bealls (Florida-based)", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/BeallsCorp/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4876153", "shop": "department_store"}, "addTags": {"brand": "Bealls", "brand:wikidata": "Q4876153", "brand:wikipedia": "en:Bealls (Florida)", "name": "Bealls", "shop": "department_store"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
diff --git a/data/presets/presets/aerialway/goods.json b/data/presets/presets/aerialway/goods.json
index 18ccf4b4d..1aa2cd144 100644
--- a/data/presets/presets/aerialway/goods.json
+++ b/data/presets/presets/aerialway/goods.json
@@ -1,4 +1,5 @@
 {
+    "icon": "temaki-goods_lift",
     "geometry": [
         "line"
     ],
diff --git a/data/presets/presets/amenity/_register_office.json b/data/presets/presets/amenity/_register_office.json
index 969a82b58..0cbc14516 100644
--- a/data/presets/presets/amenity/_register_office.json
+++ b/data/presets/presets/amenity/_register_office.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-town-hall",
+    "icon": "temaki-town_hall",
     "fields": [
         "name",
         "address",
diff --git a/data/presets/presets/amenity/parking_space/disabled.json b/data/presets/presets/amenity/parking_space/disabled.json
index 776c6661a..0ace1a9ed 100644
--- a/data/presets/presets/amenity/parking_space/disabled.json
+++ b/data/presets/presets/amenity/parking_space/disabled.json
@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-parking_space",
+    "icon": "temaki-accessible_space",
     "geometry": [
         "area",
         "point",
diff --git a/data/presets/presets/amenity/place_of_worship/christian/quaker.json b/data/presets/presets/amenity/place_of_worship/christian/quaker.json
index d6e5c09bb..5ff9fe7be 100644
--- a/data/presets/presets/amenity/place_of_worship/christian/quaker.json
+++ b/data/presets/presets/amenity/place_of_worship/christian/quaker.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-place-of-worship",
+    "icon": "temaki-quakerism",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/amenity/townhall.json b/data/presets/presets/amenity/townhall.json
index 198057898..fd549a3f2 100644
--- a/data/presets/presets/amenity/townhall.json
+++ b/data/presets/presets/amenity/townhall.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-town-hall",
+    "icon": "temaki-town_hall",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/amenity/townhall/city.json b/data/presets/presets/amenity/townhall/city.json
index 9fee4907e..20e0cf25b 100644
--- a/data/presets/presets/amenity/townhall/city.json
+++ b/data/presets/presets/amenity/townhall/city.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-town-hall",
+    "icon": "temaki-capitol",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/craft/caterer.json b/data/presets/presets/craft/caterer.json
index 5c38f4ea3..226aba76a 100644
--- a/data/presets/presets/craft/caterer.json
+++ b/data/presets/presets/craft/caterer.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-restaurant",
+    "icon": "temaki-catering",
     "fields": [
         "name",
         "cuisine",
diff --git a/data/presets/presets/craft/scaffolder.json b/data/presets/presets/craft/scaffolder.json
index e9ef693cf..d86eb9958 100644
--- a/data/presets/presets/craft/scaffolder.json
+++ b/data/presets/presets/craft/scaffolder.json
@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-tools",
+    "icon": "temaki-scaffold",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/office/government.json b/data/presets/presets/office/government.json
index 249d69d5e..2a138778f 100644
--- a/data/presets/presets/office/government.json
+++ b/data/presets/presets/office/government.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-town-hall",
+    "icon": "temaki-town_hall",
     "fields": [
         "name",
         "government",
diff --git a/data/presets/presets/office/government/register_office.json b/data/presets/presets/office/government/register_office.json
index bfe40e06d..45d50421d 100644
--- a/data/presets/presets/office/government/register_office.json
+++ b/data/presets/presets/office/government/register_office.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-town-hall",
+    "icon": "temaki-town_hall",
     "fields": [
         "{office}",
         "operator"
diff --git a/data/presets/presets/office/government/tax.json b/data/presets/presets/office/government/tax.json
index cc10ddcd6..88205401e 100644
--- a/data/presets/presets/office/government/tax.json
+++ b/data/presets/presets/office/government/tax.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-town-hall",
+    "icon": "temaki-town_hall",
     "fields": [
         "{office}",
         "operator"
diff --git a/data/presets/presets/railway/yard.json b/data/presets/presets/railway/yard.json
index 86c82789b..d959aa0b8 100644
--- a/data/presets/presets/railway/yard.json
+++ b/data/presets/presets/railway/yard.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-rail",
+    "icon": "temaki-freight_car",
     "fields": [
         "name",
         "operator"
diff --git a/data/presets/presets/shop/deli.json b/data/presets/presets/shop/deli.json
index bc2b7d5ac..2db092053 100644
--- a/data/presets/presets/shop/deli.json
+++ b/data/presets/presets/shop/deli.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-restaurant",
+    "icon": "temaki-meat",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/shop/pet_grooming.json b/data/presets/presets/shop/pet_grooming.json
index e7ab84a44..601c1b54c 100644
--- a/data/presets/presets/shop/pet_grooming.json
+++ b/data/presets/presets/shop/pet_grooming.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-dog-park",
+    "icon": "temaki-pet_grooming",
     "geometry": [
         "point",
         "area"
diff --git a/data/taginfo.json b/data/taginfo.json
index f82618d6d..a04fdaa5d 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -36,7 +36,7 @@
     {"key": "aerialway", "value": "chair_lift", "description": "🄿 Chair Lift", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/chairlift.svg"},
     {"key": "aerialway", "value": "drag_lift", "description": "🄿 Drag Lift", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/drag_lift.svg"},
     {"key": "aerialway", "value": "gondola", "description": "🄿 Gondola", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/aerialway-15.svg"},
-    {"key": "aerialway", "value": "goods", "description": "🄿 Goods Aerialway", "object_types": ["way"]},
+    {"key": "aerialway", "value": "goods", "description": "🄿 Goods Aerialway", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/goods_lift.svg"},
     {"key": "aerialway", "value": "j-bar", "description": "🄿 J-Bar Lift", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/j_bar_lift.svg"},
     {"key": "aerialway", "value": "magic_carpet", "description": "🄿 Magic Carpet Lift", "object_types": ["way"]},
     {"key": "aerialway", "value": "mixed_lift", "description": "🄿 Mixed Lift", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/aerialway-15.svg"},
@@ -65,7 +65,7 @@
     {"key": "amenity", "value": "ferry_terminal", "description": "🄿 Ferry Station / Terminal (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/ferry-15.svg"},
     {"key": "amenity", "value": "nursing_home", "description": "🄿 Nursing Home (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/wheelchair-15.svg"},
     {"key": "amenity", "value": "recycling", "description": "🄿 Recycling (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/recycling-15.svg"},
-    {"key": "amenity", "value": "register_office", "description": "🄿 Register Office (unsearchable), 🄳 ➜ office=government + government=register_office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/town-hall-15.svg"},
+    {"key": "amenity", "value": "register_office", "description": "🄿 Register Office (unsearchable), 🄳 ➜ office=government + government=register_office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/town_hall.svg"},
     {"key": "amenity", "value": "scrapyard", "description": "🄿 Scrap Yard (unsearchable), 🄳 ➜ landuse=industrial + industrial=scrap_yard", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/junk_car.svg"},
     {"key": "amenity", "value": "swimming_pool", "description": "🄿 Swimming Pool (unsearchable), 🄳 ➜ leisure=swimming_pool", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-swimmer.svg"},
     {"key": "amenity", "value": "animal_boarding", "description": "🄿 Animal Boarding Facility", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/veterinary-15.svg"},
@@ -155,7 +155,7 @@
     {"key": "amenity", "value": "nightclub", "description": "🄿 Nightclub", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/bar-15.svg"},
     {"key": "amenity", "value": "parking_entrance", "description": "🄿 Parking Garage Entrance / Exit", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/entrance-alt1-15.svg"},
     {"key": "amenity", "value": "parking_space", "description": "🄿 Parking Space", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/parking_space.svg"},
-    {"key": "parking_space", "value": "disabled", "description": "🄿 Accessible Parking Space", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/parking_space.svg"},
+    {"key": "parking_space", "value": "disabled", "description": "🄿 Accessible Parking Space", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/accessible_space.svg"},
     {"key": "amenity", "value": "parking", "description": "🄿 Parking Lot", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/car_parked.svg"},
     {"key": "parking", "value": "multi-storey", "description": "🄿 Multilevel Parking Garage, 🄵 Type", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/car_structure.svg"},
     {"key": "park_ride", "value": "yes", "description": "🄿 Park & Ride Lot", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/sign_and_car.svg"},
@@ -169,7 +169,7 @@
     {"key": "religion", "value": "christian", "description": "🄿 Christian Church", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/religious-christian-15.svg"},
     {"key": "denomination", "value": "jehovahs_witness", "description": "🄿 Kingdom Hall of Jehovah's Witnesses", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/place-of-worship-15.svg"},
     {"key": "denomination", "value": "la_luz_del_mundo", "description": "🄿 La Luz del Mundo Temple", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/place-of-worship-15.svg"},
-    {"key": "denomination", "value": "quaker", "description": "🄿 Quaker Friends Meeting House", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/place-of-worship-15.svg"},
+    {"key": "denomination", "value": "quaker", "description": "🄿 Quaker Friends Meeting House", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/quakerism.svg"},
     {"key": "religion", "value": "hindu", "description": "🄿 Hindu Temple", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/hinduism.svg"},
     {"key": "religion", "value": "jewish", "description": "🄿 Jewish Synagogue", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/religious-jewish-15.svg"},
     {"key": "religion", "value": "muslim", "description": "🄿 Muslim Mosque", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/religious-muslim-15.svg"},
@@ -238,8 +238,8 @@
     {"key": "amenity", "value": "toilets", "description": "🄿 Toilets", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/toilet-15.svg"},
     {"key": "toilets:disposal", "value": "flush", "description": "🄿 Flush Toilets, 🄵 Disposal", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-toilet.svg"},
     {"key": "toilets:disposal", "value": "pitlatrine", "description": "🄿 Pit Latrine, 🄵 Disposal", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/the-noun-project/2009541.svg"},
-    {"key": "amenity", "value": "townhall", "description": "🄿 Town Hall", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/town-hall-15.svg"},
-    {"key": "townhall:type", "value": "city", "description": "🄿 City Hall", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/town-hall-15.svg"},
+    {"key": "amenity", "value": "townhall", "description": "🄿 Town Hall", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/town_hall.svg"},
+    {"key": "townhall:type", "value": "city", "description": "🄿 City Hall", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/capitol.svg"},
     {"key": "amenity", "value": "toy_library", "description": "🄿 Toy Library", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-chess-knight.svg"},
     {"key": "amenity", "value": "university", "description": "🄿 University Grounds", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/college-15.svg"},
     {"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"},
@@ -395,7 +395,7 @@
     {"key": "craft", "value": "brewery", "description": "🄿 Brewery", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/storage_fermenter.svg"},
     {"key": "craft", "value": "carpenter", "description": "🄿 Carpenter", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tools.svg"},
     {"key": "craft", "value": "carpet_layer", "description": "🄿 Carpet Layer", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tools.svg"},
-    {"key": "craft", "value": "caterer", "description": "🄿 Caterer", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/restaurant-15.svg"},
+    {"key": "craft", "value": "caterer", "description": "🄿 Caterer", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/catering.svg"},
     {"key": "craft", "value": "chimney_sweeper", "description": "🄿 Chimney Sweeper", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/chimney.svg"},
     {"key": "craft", "value": "cleaning", "description": "🄿 Cleaning Service", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/vacuum.svg"},
     {"key": "craft", "value": "clockmaker", "description": "🄿 Clockmaker", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/clock.svg"},
@@ -425,7 +425,7 @@
     {"key": "craft", "value": "saddler", "description": "🄿 Saddler", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tools.svg"},
     {"key": "craft", "value": "sailmaker", "description": "🄿 Sailmaker", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tools.svg"},
     {"key": "craft", "value": "sawmill", "description": "🄿 Sawmill", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/logging-15.svg"},
-    {"key": "craft", "value": "scaffolder", "description": "🄿 Scaffolder", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tools.svg"},
+    {"key": "craft", "value": "scaffolder", "description": "🄿 Scaffolder", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/scaffold.svg"},
     {"key": "craft", "value": "sculptor", "description": "🄿 Sculptor", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/art-gallery-15.svg"},
     {"key": "craft", "value": "shoemaker", "description": "🄿 Shoemaker", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shoe-15.svg"},
     {"key": "craft", "value": "signmaker", "description": "🄿 Signmaker", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tools.svg"},
@@ -847,10 +847,10 @@
     {"key": "office", "value": "financial", "description": "🄿 Financial Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"},
     {"key": "office", "value": "forestry", "description": "🄿 Forestry Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"},
     {"key": "office", "value": "foundation", "description": "🄿 Foundation Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"},
-    {"key": "office", "value": "government", "description": "🄿 Government Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/town-hall-15.svg"},
+    {"key": "office", "value": "government", "description": "🄿 Government Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/town_hall.svg"},
     {"key": "government", "value": "prosecutor", "description": "🄿 Public Prosecutor's Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"},
-    {"key": "government", "value": "register_office", "description": "🄿 Register Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/town-hall-15.svg"},
-    {"key": "government", "value": "tax", "description": "🄿 Tax and Revenue Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/town-hall-15.svg"},
+    {"key": "government", "value": "register_office", "description": "🄿 Register Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/town_hall.svg"},
+    {"key": "government", "value": "tax", "description": "🄿 Tax and Revenue Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/town_hall.svg"},
     {"key": "office", "value": "guide", "description": "🄿 Tour Guide Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"},
     {"key": "office", "value": "insurance", "description": "🄿 Insurance Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/briefcase_shield.svg"},
     {"key": "office", "value": "it", "description": "🄿 Information Technology Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"},
@@ -968,7 +968,7 @@
     {"key": "railway", "value": "switch", "description": "🄿 Railway Switch", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/junction.svg"},
     {"key": "railway", "value": "wash", "description": "🄿 Train Wash", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/rail-15.svg"},
     {"key": "railway", "value": "tram", "description": "🄿 Tram Track", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tram.svg"},
-    {"key": "railway", "value": "yard", "description": "🄿 Rail Yard", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/rail-15.svg"},
+    {"key": "railway", "value": "yard", "description": "🄿 Rail Yard", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/freight_car.svg"},
     {"key": "route", "value": "ferry", "description": "🄿 Ferry Route", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/ferry-15.svg"},
     {"key": "seamark:type", "value": "beacon_isolated_danger", "description": "🄿 Danger Beacon", "object_types": ["node"]},
     {"key": "seamark:type", "value": "beacon_lateral", "description": "🄿 Channel Beacon", "object_types": ["node"]},
@@ -1030,7 +1030,7 @@
     {"key": "shop", "value": "craft", "description": "🄿 Arts & Crafts Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-cut.svg"},
     {"key": "shop", "value": "curtain", "description": "🄿 Curtain Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/curtains.svg"},
     {"key": "shop", "value": "dairy", "description": "🄿 Dairy Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-cheese.svg"},
-    {"key": "shop", "value": "deli", "description": "🄿 Deli", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/restaurant-15.svg"},
+    {"key": "shop", "value": "deli", "description": "🄿 Deli", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/meat.svg"},
     {"key": "shop", "value": "department_store", "description": "🄿 Department Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
     {"key": "shop", "value": "doityourself", "description": "🄿 DIY Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tools.svg"},
     {"key": "shop", "value": "doors", "description": "🄿 Door Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-door-open.svg"},
@@ -1098,7 +1098,7 @@
     {"key": "shop", "value": "pastry", "description": "🄿 Pastry Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/bakery-15.svg"},
     {"key": "shop", "value": "pawnbroker", "description": "🄿 Pawn Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/money_hand.svg"},
     {"key": "shop", "value": "perfumery", "description": "🄿 Perfume Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/perfume.svg"},
-    {"key": "shop", "value": "pet_grooming", "description": "🄿 Pet Grooming Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/dog-park-15.svg"},
+    {"key": "shop", "value": "pet_grooming", "description": "🄿 Pet Grooming Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/pet_grooming.svg"},
     {"key": "shop", "value": "pet", "description": "🄿 Pet Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/dog-park-15.svg"},
     {"key": "shop", "value": "photo", "description": "🄿 Photography Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-camera-retro.svg"},
     {"key": "shop", "value": "pottery", "description": "🄿 Pottery Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/vase.svg"},
diff --git a/package.json b/package.json
index 33d42c3d3..7faceb841 100644
--- a/package.json
+++ b/package.json
@@ -69,7 +69,7 @@
     "@fortawesome/free-brands-svg-icons": "~5.12.0",
     "@fortawesome/free-regular-svg-icons": "~5.12.0",
     "@fortawesome/free-solid-svg-icons": "~5.12.0",
-    "@ideditor/temaki": "~3.20.0",
+    "@ideditor/temaki": "~3.21.0",
     "@mapbox/maki": "^6.0.0",
     "@rollup/plugin-buble": "^0.21.0",
     "@rollup/plugin-commonjs": "^11.0.1",