From e5275f5c7fb2c3c50792f0753318fae58e98d874 Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Tue, 26 Nov 2019 17:27:22 -0500
Subject: [PATCH] Update temaki to v2.2.0 (close #7069) Update cattle grid icon
 (close #6489) Update gate icons (close #6814) Update icons for bike lockers,
 lean-to, picnic shelter, public transport shelter, animal boarding, animal
 shelter, bicycle rental, boat rental, chain, turnstile, barn, firepit, water
 tower, and storage rental

---
 data/presets/presets.json                     | 54 +++++++++----------
 .../presets/amenity/animal_boarding.json      |  2 +-
 .../presets/amenity/animal_shelter.json       |  2 +-
 .../amenity/bicycle_parking/lockers.json      |  2 +-
 .../presets/amenity/bicycle_rental.json       |  2 +-
 data/presets/presets/amenity/boat_rental.json |  2 +-
 .../presets/amenity/shelter/lean_to.json      |  2 +-
 .../amenity/shelter/picnic_shelter.json       |  2 +-
 .../amenity/shelter/public_transport.json     |  2 +-
 data/presets/presets/barrier/cattle_grid.json |  2 +-
 data/presets/presets/barrier/chain.json       |  2 +-
 data/presets/presets/barrier/gate.json        |  2 +-
 .../presets/presets/barrier/kissing_gate.json |  2 +-
 data/presets/presets/barrier/turnstile.json   |  2 +-
 data/presets/presets/building/barn.json       |  2 +-
 data/presets/presets/leisure/firepit.json     |  2 +-
 .../presets/presets/man_made/water_tower.json |  2 +-
 data/presets/presets/shop/storage_rental.json |  2 +-
 data/taginfo.json                             | 34 ++++++------
 package.json                                  |  2 +-
 20 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/data/presets/presets.json b/data/presets/presets.json
index f371aea010..d6511a09da 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -65,9 +65,9 @@
     "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/scrapyard": {"icon": "maki-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", "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"},
+    "amenity/animal_boarding": {"icon": "temaki-dog_shelter", "fields": ["name", "operator", "address", "building_area", "opening_hours", "animal_boarding"], "moreFields": ["email", "fax", "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"},
     "amenity/animal_breeding": {"icon": "maki-veterinary", "fields": ["name", "operator", "address", "building_area", "opening_hours", "animal_breeding"], "moreFields": ["email", "fax", "level", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["breeding", "bull", "cat", "cow", "dog", "horse", "husbandry", "kitten", "livestock", "pet breeding", "puppy", "reptile"], "tags": {"amenity": "animal_breeding"}, "name": "Animal Breeding Facility"},
-    "amenity/animal_shelter": {"icon": "maki-veterinary", "fields": ["name", "operator", "address", "building_area", "opening_hours", "animal_shelter"], "moreFields": ["email", "fax", "level", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["adoption", "aspca", "cat", "dog", "horse", "kitten", "pet care", "pet rescue", "puppy", "raptor", "reptile", "rescue", "spca", "pound"], "tags": {"amenity": "animal_shelter"}, "name": "Animal Shelter"},
+    "amenity/animal_shelter": {"icon": "temaki-dog_shelter", "fields": ["name", "operator", "address", "building_area", "opening_hours", "animal_shelter"], "moreFields": ["email", "fax", "level", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["adoption", "aspca", "cat", "dog", "horse", "kitten", "pet care", "pet rescue", "puppy", "raptor", "reptile", "rescue", "spca", "pound"], "tags": {"amenity": "animal_shelter"}, "name": "Animal Shelter"},
     "amenity/arts_centre": {"icon": "maki-theatre", "fields": ["name", "address", "building_area", "opening_hours", "website"], "moreFields": ["charge_fee", "email", "fax", "fee", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "arts_centre"}, "name": "Arts Center"},
     "amenity/atm": {"icon": "maki-bank", "fields": ["operator", "network", "cash_in", "currency_multi", "drive_through"], "moreFields": ["brand", "covered", "height", "indoor", "level", "lit", "manufacturer", "name", "opening_hours", "wheelchair"], "geometry": ["point", "vertex"], "terms": ["money", "cash", "machine"], "tags": {"amenity": "atm"}, "name": "ATM"},
     "amenity/bank": {"icon": "maki-bank", "fields": ["name", "operator", "address", "building_area", "atm", "drive_through"], "moreFields": ["air_conditioning", "currency_multi", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "opening_hours", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["credit union", "check", "deposit", "fund", "investment", "repository", "reserve", "safe", "savings", "stock", "treasury", "trust", "vault"], "tags": {"amenity": "bank"}, "name": "Bank"},
@@ -77,12 +77,12 @@
     "amenity/bench": {"icon": "temaki-bench", "fields": ["backrest", "material", "seats", "colour"], "moreFields": ["access_simple", "height", "inscription", "level", "lit", "manufacturer", "operator"], "geometry": ["point", "vertex", "line"], "terms": ["seat", "chair"], "tags": {"amenity": "bench"}, "name": "Bench"},
     "amenity/bicycle_parking": {"icon": "maki-bicycle", "fields": ["bicycle_parking", "capacity", "operator", "operator/type", "covered", "access_simple", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["colour", "indoor", "level", "lit"], "geometry": ["point", "vertex", "area"], "terms": ["bike", "cycle parking", "cycling"], "tags": {"amenity": "bicycle_parking"}, "name": "Bicycle Parking"},
     "amenity/bicycle_parking/building": {"icon": "maki-bicycle", "fields": ["{amenity/bicycle_parking}", "opening_hours", "building_area"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "bicycle_parking", "bicycle_parking": "building"}, "reference": {"key": "bicycle_parking"}, "terms": ["Bike Parking Station", "cycle parking", "cycling", "Multi-Storey Bicycle Park", "Multi-Storey Bike Park"], "name": "Bicycle Parking Garage"},
-    "amenity/bicycle_parking/lockers": {"icon": "maki-bicycle", "geometry": ["point", "vertex", "area"], "tags": {"amenity": "bicycle_parking", "bicycle_parking": "lockers"}, "reference": {"key": "bicycle_parking"}, "terms": ["cycle locker", "cycling", "Bike Lockers"], "name": "Bicycle Lockers"},
+    "amenity/bicycle_parking/lockers": {"icon": "temaki-bicycle_box", "geometry": ["point", "vertex", "area"], "tags": {"amenity": "bicycle_parking", "bicycle_parking": "lockers"}, "reference": {"key": "bicycle_parking"}, "terms": ["cycle locker", "cycling", "Bike Lockers"], "name": "Bicycle Lockers"},
     "amenity/bicycle_parking/shed": {"icon": "maki-bicycle", "fields": ["{amenity/bicycle_parking}", "building_area"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "bicycle_parking", "bicycle_parking": "shed"}, "reference": {"key": "bicycle_parking"}, "terms": ["cycle shed", "cycling", "Bike Shed"], "name": "Bicycle Shed"},
-    "amenity/bicycle_rental": {"icon": "maki-bicycle", "fields": ["capacity", "network", "operator", "operator/type", "fee", "payment_multi_fee"], "moreFields": ["address", "covered", "email", "fax", "level", "opening_hours", "phone", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["bike", "bicycle", "bikeshare", "bike share", "bicycle share", "cycle dock", "cycle hub", "cycleshare", "cycling"], "tags": {"amenity": "bicycle_rental"}, "name": "Bicycle Rental"},
+    "amenity/bicycle_rental": {"icon": "temaki-bicycle_rental", "fields": ["capacity", "network", "operator", "operator/type", "fee", "payment_multi_fee"], "moreFields": ["address", "covered", "email", "fax", "level", "opening_hours", "phone", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["bike", "bicycle", "bikeshare", "bike share", "bicycle share", "cycle dock", "cycle hub", "cycleshare", "cycling"], "tags": {"amenity": "bicycle_rental"}, "name": "Bicycle Rental"},
     "amenity/bicycle_repair_station": {"icon": "maki-bicycle", "fields": ["operator", "brand", "opening_hours", "fee", "payment_multi_fee", "charge_fee", "service/bicycle"], "moreFields": ["colour", "covered", "indoor", "level", "manufacturer"], "geometry": ["point", "vertex"], "terms": ["bike chain", "bike multitool", "bike repair", "bike tools", "cycle pump", "cycle repair", "cycling"], "tags": {"amenity": "bicycle_repair_station"}, "name": "Bicycle Repair Tool Stand"},
     "amenity/biergarten": {"icon": "fas-beer", "fields": ["name", "address", "building", "outdoor_seating", "brewery"], "moreFields": ["{amenity/bar}"], "geometry": ["point", "area"], "tags": {"amenity": "biergarten"}, "terms": ["beer", "bier", "booze"], "name": "Biergarten"},
-    "amenity/boat_rental": {"icon": "temaki-boating", "fields": ["name", "operator", "operator/type", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["address", "email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "boat_rental"}, "name": "Boat Rental"},
+    "amenity/boat_rental": {"icon": "temaki-boat_rental", "fields": ["name", "operator", "operator/type", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["address", "email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "boat_rental"}, "name": "Boat Rental"},
     "amenity/bureau_de_change": {"icon": "temaki-money_hand", "fields": ["name", "operator", "payment_multi", "currency_multi", "address", "building_area"], "moreFields": ["email", "fax", "level", "opening_hours", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bureau de change", "money changer"], "tags": {"amenity": "bureau_de_change"}, "name": "Currency Exchange"},
     "amenity/cafe": {"icon": "maki-cafe", "fields": ["name", "cuisine", "address", "building_area", "outdoor_seating", "internet_access", "internet_access/fee"], "moreFields": ["air_conditioning", "bar", "capacity", "delivery", "diet_multi", "email", "fax", "internet_access/ssid", "level", "min_age", "not/name", "opening_hours", "payment_multi", "phone", "reservation", "smoking", "takeaway", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bistro", "coffee", "tea"], "tags": {"amenity": "cafe"}, "name": "Cafe"},
     "amenity/car_pooling": {"icon": "maki-car", "fields": ["name", "operator", "operator/type", "capacity", "address", "opening_hours", "lit"], "moreFields": ["email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_pooling"}, "name": "Car Pooling"},
@@ -211,9 +211,9 @@
     "amenity/school": {"icon": "temaki-school", "fields": ["name", "operator", "operator/type", "address", "religion", "denomination", "website"], "moreFields": ["charge_fee", "email", "fax", "fee", "internet_access", "internet_access/ssid", "level", "phone", "polling_station", "wheelchair"], "geometry": ["point", "area"], "terms": ["academy", "elementary school", "middle school", "high school"], "tags": {"amenity": "school"}, "name": "School Grounds"},
     "amenity/shelter": {"icon": "maki-shelter", "fields": ["name", "shelter_type", "building_area", "bench", "bin"], "moreFields": ["lit", "lockable", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["lean-to", "gazebo", "picnic"], "tags": {"amenity": "shelter"}, "name": "Shelter"},
     "amenity/shelter/gazebo": {"icon": "maki-shelter", "fields": ["name", "building_area", "bench", "lit"], "geometry": ["point", "area"], "tags": {"amenity": "shelter", "shelter_type": "gazebo"}, "name": "Gazebo"},
-    "amenity/shelter/lean_to": {"icon": "maki-shelter", "fields": ["name", "operator", "building_area"], "geometry": ["point", "area"], "tags": {"amenity": "shelter", "shelter_type": "lean_to"}, "name": "Lean-To"},
-    "amenity/shelter/picnic_shelter": {"icon": "maki-shelter", "fields": ["name", "shelter_type", "building_area", "lit", "bin"], "geometry": ["point", "area"], "tags": {"amenity": "shelter", "shelter_type": "picnic_shelter"}, "reference": {"key": "shelter_type", "value": "picnic_shelter"}, "terms": ["pavilion"], "name": "Picnic Shelter"},
-    "amenity/shelter/public_transport": {"icon": "maki-shelter", "fields": ["name", "shelter_type", "building_area", "bench", "lit"], "geometry": ["point", "area"], "terms": ["bus stop", "metro stop", "public transit shelter", "public transport shelter", "tram stop shelter", "waiting"], "tags": {"amenity": "shelter", "shelter_type": "public_transport"}, "reference": {"key": "shelter_type", "value": "public_transport"}, "name": "Transit Shelter"},
+    "amenity/shelter/lean_to": {"icon": "temaki-sleep_shelter", "fields": ["name", "operator", "building_area"], "geometry": ["point", "area"], "tags": {"amenity": "shelter", "shelter_type": "lean_to"}, "name": "Lean-To"},
+    "amenity/shelter/picnic_shelter": {"icon": "temaki-picnic_shelter", "fields": ["name", "shelter_type", "building_area", "lit", "bin"], "geometry": ["point", "area"], "tags": {"amenity": "shelter", "shelter_type": "picnic_shelter"}, "reference": {"key": "shelter_type", "value": "picnic_shelter"}, "terms": ["pavilion"], "name": "Picnic Shelter"},
+    "amenity/shelter/public_transport": {"icon": "temaki-transit_shelter", "fields": ["name", "shelter_type", "building_area", "bench", "lit"], "geometry": ["point", "area"], "terms": ["bus stop", "metro stop", "public transit shelter", "public transport shelter", "tram stop shelter", "waiting"], "tags": {"amenity": "shelter", "shelter_type": "public_transport"}, "reference": {"key": "shelter_type", "value": "public_transport"}, "name": "Transit Shelter"},
     "amenity/shower": {"icon": "temaki-shower", "fields": ["opening_hours", "access_simple", "fee", "payment_multi_fee", "charge_fee", "supervised", "building_area", "wheelchair"], "moreFields": ["address", "gender", "level", "operator"], "geometry": ["point", "vertex", "area"], "terms": ["rain closet"], "tags": {"amenity": "shower"}, "name": "Shower"},
     "amenity/smoking_area": {"icon": "fas-smoking", "fields": ["name", "shelter", "bin", "bench", "opening_hours"], "moreFields": ["covered", "level", "lit", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": [], "tags": {"amenity": "smoking_area"}, "name": "Smoking Area"},
     "amenity/social_centre": {"icon": "fas-handshake", "fields": ["name", "brand", "operator", "operator/type", "address", "building_area"], "moreFields": ["air_conditioning", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["event", "fraternal", "fraternity", "hall", "organization", "professional", "society", "sorority", "union", "vetern"], "tags": {"amenity": "social_centre"}, "name": "Social Center"},
@@ -297,14 +297,14 @@
     "barrier/bollard_line": {"icon": "temaki-silo", "fields": ["access", "bollard", "height", "material", "colour"], "geometry": ["line"], "tags": {"barrier": "bollard"}, "name": "Bollard Row"},
     "barrier/bollard": {"icon": "temaki-silo", "fields": ["access", "bollard", "height", "width", "material", "colour"], "geometry": ["point", "vertex"], "tags": {"barrier": "bollard"}, "name": "Bollard"},
     "barrier/border_control": {"icon": "maki-roadblock", "fields": ["access", "building_area"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["vertex", "area"], "tags": {"barrier": "border_control"}, "name": "Border Control"},
-    "barrier/cattle_grid": {"icon": "maki-barrier", "geometry": ["vertex"], "tags": {"barrier": "cattle_grid"}, "terms": ["cattle guard", "cattle stop", "livestock grid", "stock gate", "stock grid", "stock stop", "Texas gate", "vehicle pass"], "name": "Cattle Grid"},
-    "barrier/chain": {"icon": "maki-barrier", "fields": ["access"], "geometry": ["vertex", "line"], "tags": {"barrier": "chain"}, "name": "Chain"},
+    "barrier/cattle_grid": {"icon": "temaki-cattle_grid", "geometry": ["vertex"], "tags": {"barrier": "cattle_grid"}, "terms": ["cattle guard", "cattle stop", "livestock grid", "stock gate", "stock grid", "stock stop", "Texas gate", "vehicle pass"], "name": "Cattle Grid"},
+    "barrier/chain": {"icon": "temaki-rope_fence", "fields": ["access"], "geometry": ["vertex", "line"], "tags": {"barrier": "chain"}, "name": "Chain"},
     "barrier/city_wall": {"icon": "temaki-wall", "fields": ["height", "material"], "geometry": ["line", "area"], "tags": {"barrier": "city_wall"}, "name": "City Wall"},
     "barrier/cycle_barrier": {"icon": "maki-roadblock", "fields": ["access"], "geometry": ["vertex"], "tags": {"barrier": "cycle_barrier"}, "name": "Cycle Barrier"},
     "barrier/ditch": {"icon": "maki-roadblock", "geometry": ["line", "area"], "tags": {"barrier": "ditch"}, "name": "Trench", "matchScore": 0.25},
     "barrier/fence": {"icon": "maki-fence", "fields": ["fence_type", "height", "material"], "geometry": ["line"], "tags": {"barrier": "fence"}, "name": "Fence", "matchScore": 0.25},
     "barrier/fence/railing": {"icon": "temaki-railing", "geometry": ["line"], "tags": {"barrier": "fence", "fence_type": "railing"}, "terms": ["railing", "handrail", "guard rail"], "name": "Railing", "matchScore": 0.5},
-    "barrier/gate": {"icon": "maki-barrier", "fields": ["access", "opening_hours"], "geometry": ["vertex", "line"], "tags": {"barrier": "gate"}, "name": "Gate"},
+    "barrier/gate": {"icon": "temaki-gate", "fields": ["access", "opening_hours"], "geometry": ["vertex", "line"], "tags": {"barrier": "gate"}, "name": "Gate"},
     "barrier/guard_rail": {"icon": "temaki-guard_rail", "fields": ["material"], "geometry": ["line"], "tags": {"barrier": "guard_rail"}, "name": "Guard Rail", "terms": ["guardrail", "traffic barrier", "crash barrier", "median barrier", "roadside barrier", "Armco barrier"], "matchScore": 0.75},
     "barrier/hedge": {"fields": ["height"], "geometry": ["line", "area"], "tags": {"barrier": "hedge"}, "name": "Hedge", "matchScore": 0.25},
     "barrier/height_restrictor": {"icon": "temaki-car_wash", "fields": ["maxheight"], "geometry": ["vertex"], "tags": {"barrier": "height_restrictor"}, "name": "Height Restrictor"},
@@ -313,13 +313,13 @@
     "barrier/kerb/lowered": {"icon": "temaki-kerb-lowered", "fields": ["kerb", "{barrier/kerb}", "kerb/height"], "geometry": ["vertex", "line"], "tags": {"kerb": "lowered"}, "addTags": {"barrier": "kerb", "kerb": "lowered"}, "reference": {"key": "kerb", "value": "lowered"}, "terms": ["curb cut", "curb ramp", "kerb ramp", "dropped kerb", "pram ramp"], "matchScore": 0.55, "name": "Lowered Curb"},
     "barrier/kerb/raised": {"icon": "temaki-kerb-raised", "fields": ["kerb", "{barrier/kerb}", "kerb/height"], "geometry": ["vertex", "line"], "tags": {"kerb": "raised"}, "addTags": {"barrier": "kerb", "kerb": "raised"}, "reference": {"key": "kerb", "value": "raised"}, "terms": [], "matchScore": 0.55, "name": "Raised Curb"},
     "barrier/kerb/rolled": {"icon": "temaki-kerb-rolled", "fields": ["kerb", "{barrier/kerb}", "kerb/height"], "geometry": ["vertex", "line"], "tags": {"kerb": "rolled"}, "addTags": {"barrier": "kerb", "kerb": "rolled"}, "reference": {"key": "kerb", "value": "rolled"}, "terms": ["gutter"], "matchScore": 0.55, "name": "Rolled Curb"},
-    "barrier/kissing_gate": {"icon": "maki-barrier", "fields": ["access"], "geometry": ["vertex"], "tags": {"barrier": "kissing_gate"}, "name": "Kissing Gate"},
+    "barrier/kissing_gate": {"icon": "temaki-gate", "fields": ["access"], "geometry": ["vertex"], "tags": {"barrier": "kissing_gate"}, "name": "Kissing Gate"},
     "barrier/lift_gate": {"icon": "temaki-lift_gate", "fields": ["access"], "geometry": ["vertex", "line"], "tags": {"barrier": "lift_gate"}, "name": "Lift Gate"},
     "barrier/retaining_wall": {"icon": "temaki-wall", "fields": ["height", "material"], "geometry": ["line", "area"], "tags": {"barrier": "retaining_wall"}, "name": "Retaining Wall"},
     "barrier/sally_port": {"icon": "fas-dungeon", "geometry": ["vertex"], "tags": {"barrier": "sally_port"}, "terms": ["Postern", "castle side gate"], "name": "Sally Port"},
     "barrier/stile": {"icon": "maki-roadblock", "fields": ["access", "stile", "material"], "geometry": ["vertex"], "tags": {"barrier": "stile"}, "name": "Stile"},
     "barrier/toll_booth": {"icon": "maki-roadblock", "fields": ["access", "building_area", "payment_multi", "currency_multi"], "moreFields": ["address", "email", "fax", "opening_hours", "phone", "website"], "geometry": ["vertex", "area"], "tags": {"barrier": "toll_booth"}, "name": "Toll Booth"},
-    "barrier/turnstile": {"icon": "maki-roadblock", "fields": ["access"], "geometry": ["vertex"], "terms": ["baffle gate", "turnstyle"], "tags": {"barrier": "turnstile"}, "name": "Turnstile"},
+    "barrier/turnstile": {"icon": "temaki-turnstile", "fields": ["access"], "geometry": ["vertex"], "terms": ["baffle gate", "turnstyle"], "tags": {"barrier": "turnstile"}, "name": "Turnstile"},
     "barrier/wall": {"icon": "temaki-wall", "fields": ["wall", "height", "material"], "geometry": ["line", "area"], "tags": {"barrier": "wall"}, "name": "Wall", "matchScore": 0.25},
     "barrier/wall/noise_barrier": {"icon": "temaki-wall", "geometry": ["line", "area"], "tags": {"barrier": "wall", "wall": "noise_barrier"}, "terms": ["acoustical barrier", "noise wall", "noisewall", "sound barrier", "sound berm", "sound wall", "soundberm", "soundwall"], "name": "Noise Barrier", "matchScore": 0.27},
     "boundary/administrative": {"fields": ["name", "admin_level"], "geometry": ["line"], "tags": {"boundary": "administrative"}, "name": "Administrative Boundary", "matchScore": 0.5},
@@ -331,7 +331,7 @@
     "building/entrance": {"icon": "maki-entrance-alt1", "fields": [], "moreFields": [], "geometry": ["vertex"], "tags": {"building": "entrance"}, "name": "Entrance/Exit", "searchable": false},
     "building/train_station": {"icon": "maki-building", "geometry": ["point", "vertex", "area"], "tags": {"building": "train_station"}, "matchScore": 0.5, "name": "Train Station Building", "searchable": false},
     "building/apartments": {"icon": "maki-building", "geometry": ["area"], "tags": {"building": "apartments"}, "matchScore": 0.5, "name": "Apartment Building"},
-    "building/barn": {"icon": "maki-farm", "geometry": ["area"], "tags": {"building": "barn"}, "matchScore": 0.5, "name": "Barn"},
+    "building/barn": {"icon": "temaki-barn", "geometry": ["area"], "tags": {"building": "barn"}, "matchScore": 0.5, "name": "Barn"},
     "building/boathouse": {"icon": "maki-harbor", "geometry": ["area"], "tags": {"building": "boathouse"}, "matchScore": 0.5, "terms": [], "name": "Boathouse"},
     "building/bungalow": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "bungalow"}, "terms": ["home", "detached"], "matchScore": 0.5, "name": "Bungalow"},
     "building/cabin": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "cabin"}, "matchScore": 0.5, "name": "Cabin"},
@@ -640,7 +640,7 @@
     "leisure/disc_golf_course": {"icon": "temaki-disc_golf_basket", "fields": ["name", "operator", "access_simple", "fee", "payment_multi_fee", "charge_fee", "opening_hours"], "moreFields": ["address", "dog", "email", "fax", "lit", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"leisure": "disc_golf_course"}, "addTags": {"leisure": "disc_golf_course", "sport": "disc_golf"}, "terms": ["disk golf", "frisbee golf", "flying disc golf", "frolf", "ultimate"], "name": "Disc Golf Course"},
     "leisure/dog_park": {"icon": "maki-dog-park", "fields": ["name"], "moreFields": ["email", "fax", "phone", "website"], "geometry": ["point", "area"], "terms": [], "tags": {"leisure": "dog_park"}, "name": "Dog Park"},
     "leisure/escape_game": {"icon": "fas-puzzle-piece", "fields": ["name", "address", "building_area", "opening_hours", "website", "fee", "payment_multi_fee", "charge_fee", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["air_conditioning", "email", "fax", "level", "phone", "smoking", "wheelchair"], "geometry": ["point", "area"], "terms": ["escape game", "escape the room", "puzzle room", "quest room"], "tags": {"leisure": "escape_game"}, "name": "Escape Room"},
-    "leisure/firepit": {"icon": "maki-fire-station", "fields": ["access_simple"], "geometry": ["point", "area"], "tags": {"leisure": "firepit"}, "terms": ["fireplace", "campfire"], "name": "Firepit"},
+    "leisure/firepit": {"icon": "temaki-campfire", "fields": ["access_simple"], "geometry": ["point", "area"], "tags": {"leisure": "firepit"}, "terms": ["fireplace", "campfire"], "name": "Firepit"},
     "leisure/fishing": {"icon": "fas-fish", "fields": ["name", "access_simple", "fishing"], "geometry": ["vertex", "point", "area"], "tags": {"leisure": "fishing"}, "terms": ["angler"], "name": "Fishing Spot"},
     "leisure/fitness_centre": {"icon": "fas-dumbbell", "fields": ["name", "sport", "address", "building_area"], "moreFields": ["charge_fee", "email", "fax", "fee", "opening_hours", "payment_multi", "phone", "website"], "geometry": ["point", "area"], "tags": {"leisure": "fitness_centre"}, "terms": ["health", "gym", "leisure", "studio"], "name": "Gym / Fitness Center"},
     "leisure/fitness_centre/yoga": {"icon": "maki-pitch", "geometry": ["point", "area"], "terms": ["studio", "asanas", "modern yoga", "meditation"], "tags": {"leisure": "fitness_centre", "sport": "yoga"}, "reference": {"key": "sport", "value": "yoga"}, "name": "Yoga Studio"},
@@ -772,7 +772,7 @@
     "man_made/utility_pole": {"icon": "temaki-utility_pole", "fields": ["ref", "operator", "utility_semi", "height", "material"], "moreFields": ["colour", "manufacturer"], "geometry": ["point", "vertex"], "tags": {"man_made": "utility_pole"}, "name": "Utility Pole"},
     "man_made/wastewater_plant": {"icon": "temaki-waste", "fields": ["name", "operator", "address"], "moreFields": ["email", "fax", "phone", "website"], "geometry": ["point", "area"], "terms": ["sewage*", "water treatment plant", "reclamation plant"], "tags": {"man_made": "wastewater_plant"}, "name": "Wastewater Plant"},
     "man_made/water_tap": {"icon": "maki-drinking-water", "fields": ["ref", "operator", "drinking_water", "access_simple"], "geometry": ["point", "vertex"], "tags": {"man_made": "water_tap"}, "terms": ["drinking water", "water faucet", "water point", "water source", "water spigot"], "name": "Water Tap"},
-    "man_made/water_tower": {"icon": "maki-water", "fields": ["operator", "height"], "geometry": ["point", "area"], "tags": {"man_made": "water_tower"}, "name": "Water Tower"},
+    "man_made/water_tower": {"icon": "temaki-water_tower", "fields": ["operator", "height"], "geometry": ["point", "area"], "tags": {"man_made": "water_tower"}, "name": "Water Tower"},
     "man_made/water_well": {"icon": "maki-water", "fields": ["ref", "operator", "drinking_water", "pump", "access_simple"], "geometry": ["point", "area"], "tags": {"man_made": "water_well"}, "terms": ["aquifer", "drinking water", "water point", "water source"], "name": "Water Well"},
     "man_made/water_works": {"icon": "maki-water", "fields": ["name", "operator", "address"], "geometry": ["point", "area"], "tags": {"man_made": "water_works"}, "name": "Water Works"},
     "man_made/watermill": {"icon": "maki-watermill", "fields": ["building_area"], "geometry": ["point", "area"], "terms": ["water", "wheel", "mill"], "tags": {"man_made": "watermill"}, "name": "Watermill"},
@@ -1137,7 +1137,7 @@
     "shop/spices": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["chili", "cinnamon", "curry", "ginger", "herbs", "pepper", "saffron", "salt", "spice store", "spices", "turmeric", "wasabi"], "tags": {"shop": "spices"}, "name": "Spice Shop"},
     "shop/sports": {"icon": "fas-futbol", "fields": ["name", "operator", "sport", "{shop}"], "geometry": ["point", "area"], "tags": {"shop": "sports"}, "terms": ["athletics"], "name": "Sporting Goods Store"},
     "shop/stationery": {"icon": "fas-paperclip", "geometry": ["point", "area"], "terms": ["card", "paper"], "tags": {"shop": "stationery"}, "name": "Stationery Store"},
-    "shop/storage_rental": {"icon": "fas-warehouse", "geometry": ["point", "area"], "tags": {"shop": "storage_rental"}, "terms": ["garages"], "name": "Storage Rental"},
+    "shop/storage_rental": {"icon": "temaki-storage_rental", "geometry": ["point", "area"], "tags": {"shop": "storage_rental"}, "terms": ["garages"], "name": "Storage Rental"},
     "shop/supermarket": {"icon": "maki-grocery", "moreFields": ["{shop}", "diet_multi"], "geometry": ["point", "area"], "terms": ["grocery", "store", "shop"], "tags": {"shop": "supermarket"}, "name": "Supermarket"},
     "shop/swimming_pool": {"icon": "fas-swimmer", "geometry": ["point", "area"], "terms": ["hot tub equipment store", "hot tub maintenance store", "hot tub supply store", "pool shop", "pool store", "swimming pool equipment store", "swimming pool installation store", "swimming pool maintenance store", "swimming pool supply shop"], "tags": {"shop": "swimming_pool"}, "name": "Pool Supply Store"},
     "shop/tailor": {"icon": "maki-clothing-store", "geometry": ["point", "area"], "terms": ["clothes", "suit"], "tags": {"shop": "tailor"}, "name": "Tailor"},
@@ -1268,7 +1268,7 @@
     "waterway/water_point": {"icon": "maki-drinking-water", "fields": ["{amenity/water_point}"], "moreFields": ["{amenity/water_point}"], "geometry": ["area", "vertex", "point"], "tags": {"waterway": "water_point"}, "terms": ["water faucet", "water point", "water tap", "water source", "water spigot"], "name": "Marine Drinking Water"},
     "waterway/waterfall": {"icon": "maki-waterfall", "fields": ["name", "height", "width", "intermittent"], "geometry": ["vertex"], "terms": ["fall"], "tags": {"waterway": "waterfall"}, "name": "Waterfall"},
     "waterway/weir": {"icon": "maki-dam", "fields": ["name", "operator", "height", "material"], "moreFields": ["seamark/type"], "geometry": ["vertex", "line"], "terms": ["low-head dam", "low-rise dam", "wier"], "tags": {"waterway": "weir"}, "name": "Weir"},
-    "amenity/animal_boarding/PetsHotel": {"name": "PetsHotel", "icon": "maki-veterinary", "imageURL": "https://graph.facebook.com/PetSmart/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q67141961", "amenity": "animal_boarding"}, "addTags": {"amenity": "animal_boarding", "animal_boarding": "dog;cat", "brand": "PetsHotel", "brand:wikidata": "Q67141961", "name": "PetsHotel"}, "countryCodes": ["ca", "us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/animal_boarding/PetsHotel": {"name": "PetsHotel", "icon": "temaki-dog_shelter", "imageURL": "https://graph.facebook.com/PetSmart/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q67141961", "amenity": "animal_boarding"}, "addTags": {"amenity": "animal_boarding", "animal_boarding": "dog;cat", "brand": "PetsHotel", "brand:wikidata": "Q67141961", "name": "PetsHotel"}, "countryCodes": ["ca", "us"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/bank/ABANCA": {"name": "ABANCA", "icon": "maki-bank", "imageURL": "https://graph.facebook.com/SomosAbanca/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q9598744", "amenity": "bank"}, "addTags": {"amenity": "bank", "brand": "ABANCA", "brand:wikidata": "Q9598744", "brand:wikipedia": "es:Abanca", "name": "ABANCA", "official_name": "ABANCA Corporación Bancaria"}, "countryCodes": ["es"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/bank/ABN AMRO": {"name": "ABN AMRO", "icon": "maki-bank", "imageURL": "https://graph.facebook.com/abnamro/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q287471", "amenity": "bank"}, "addTags": {"amenity": "bank", "brand": "ABN AMRO", "brand:wikidata": "Q287471", "brand:wikipedia": "en:ABN AMRO", "name": "ABN AMRO", "official_name": "ABN AMRO Bank N.V."}, "countryCodes": ["nl"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/bank/ABSA": {"name": "ABSA", "icon": "maki-bank", "imageURL": "https://graph.facebook.com/AbsaSouthAfrica/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q331688", "amenity": "bank"}, "addTags": {"amenity": "bank", "brand": "ABSA", "brand:wikidata": "Q331688", "brand:wikipedia": "en:ABSA Group Limited", "name": "ABSA"}, "countryCodes": ["za"], "terms": [], "matchScore": 2, "suggestion": true},
@@ -1967,12 +1967,12 @@
     "amenity/bar/All Bar One": {"name": "All Bar One", "icon": "maki-bar", "imageURL": "https://pbs.twimg.com/profile_images/717013484467306497/vjG-lkGe_bigger.jpg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4728624", "amenity": "bar"}, "addTags": {"amenity": "bar", "brand": "All Bar One", "brand:wikidata": "Q4728624", "brand:wikipedia": "en:All Bar One", "name": "All Bar One"}, "countryCodes": ["gb"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/bar/Revolución de Cuba": {"name": "Revolución de Cuba", "icon": "maki-bar", "imageURL": "https://pbs.twimg.com/profile_images/1001476884482396160/3NEm7OnI_bigger.jpg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64024691", "amenity": "bar"}, "addTags": {"amenity": "bar", "brand": "Revolución de Cuba", "brand:wikidata": "Q64024691", "name": "Revolución de Cuba"}, "countryCodes": ["gb"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/bar/Revolution": {"name": "Revolution", "icon": "maki-bar", "imageURL": "https://graph.facebook.com/revolutionbars/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64024398", "amenity": "bar"}, "addTags": {"amenity": "bar", "brand": "Revolution", "brand:wikidata": "Q64024398", "name": "Revolution"}, "countryCodes": ["gb"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/bicycle_rental/Call a Bike": {"name": "Call a Bike", "icon": "maki-bicycle", "imageURL": "https://graph.facebook.com/callabikesharing/picture?type=large", "geometry": ["point", "vertex", "area"], "tags": {"brand:wikidata": "Q1060525", "amenity": "bicycle_rental"}, "addTags": {"amenity": "bicycle_rental", "brand": "Call a Bike", "brand:wikidata": "Q1060525", "brand:wikipedia": "en:Call a Bike", "name": "Call a Bike"}, "countryCodes": ["de"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/bicycle_rental/Grid": {"name": "Grid", "icon": "maki-bicycle", "imageURL": "https://graph.facebook.com/Gridbikes/picture?type=large", "geometry": ["point", "vertex", "area"], "tags": {"brand:wikidata": "Q62104168", "amenity": "bicycle_rental"}, "addTags": {"amenity": "bicycle_rental", "brand": "Grid", "brand:wikidata": "Q62104168", "name": "Grid"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/bicycle_rental/MiBici": {"name": "MiBici", "icon": "maki-bicycle", "imageURL": "https://graph.facebook.com/MiBiciPublica/picture?type=large", "geometry": ["point", "vertex", "area"], "tags": {"brand:wikidata": "Q60966987", "amenity": "bicycle_rental"}, "addTags": {"amenity": "bicycle_rental", "brand": "MiBici", "brand:wikidata": "Q60966987", "brand:wikipedia": "es:MiBici", "name": "MiBici"}, "countryCodes": ["mx"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/bicycle_rental/Swapfiets": {"name": "Swapfiets", "icon": "maki-bicycle", "imageURL": "https://graph.facebook.com/Swapfiets/picture?type=large", "geometry": ["point", "vertex", "area"], "tags": {"brand:wikidata": "Q62104374", "amenity": "bicycle_rental"}, "addTags": {"amenity": "bicycle_rental", "brand": "Swapfiets", "brand:wikidata": "Q62104374", "name": "Swapfiets"}, "countryCodes": ["be", "de", "dk", "nl"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/bicycle_rental/metropolradruhr": {"name": "metropolradruhr", "icon": "maki-bicycle", "imageURL": "https://graph.facebook.com/nextbike/picture?type=large", "geometry": ["point", "vertex", "area"], "tags": {"brand:wikidata": "Q62104274", "amenity": "bicycle_rental"}, "addTags": {"amenity": "bicycle_rental", "brand": "metropolradruhr", "brand:wikidata": "Q62104274", "name": "metropolradruhr"}, "countryCodes": ["de"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/bicycle_rental/nextbike": {"name": "nextbike", "icon": "maki-bicycle", "imageURL": "https://graph.facebook.com/nextbike/picture?type=large", "geometry": ["point", "vertex", "area"], "tags": {"brand:wikidata": "Q2351279", "amenity": "bicycle_rental"}, "addTags": {"amenity": "bicycle_rental", "brand": "nextbike", "brand:wikidata": "Q2351279", "brand:wikipedia": "de:Nextbike", "name": "nextbike"}, "countryCodes": ["at", "de"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/bicycle_rental/Call a Bike": {"name": "Call a Bike", "icon": "temaki-bicycle_rental", "imageURL": "https://graph.facebook.com/callabikesharing/picture?type=large", "geometry": ["point", "vertex", "area"], "tags": {"brand:wikidata": "Q1060525", "amenity": "bicycle_rental"}, "addTags": {"amenity": "bicycle_rental", "brand": "Call a Bike", "brand:wikidata": "Q1060525", "brand:wikipedia": "en:Call a Bike", "name": "Call a Bike"}, "countryCodes": ["de"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/bicycle_rental/Grid": {"name": "Grid", "icon": "temaki-bicycle_rental", "imageURL": "https://graph.facebook.com/Gridbikes/picture?type=large", "geometry": ["point", "vertex", "area"], "tags": {"brand:wikidata": "Q62104168", "amenity": "bicycle_rental"}, "addTags": {"amenity": "bicycle_rental", "brand": "Grid", "brand:wikidata": "Q62104168", "name": "Grid"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/bicycle_rental/MiBici": {"name": "MiBici", "icon": "temaki-bicycle_rental", "imageURL": "https://graph.facebook.com/MiBiciPublica/picture?type=large", "geometry": ["point", "vertex", "area"], "tags": {"brand:wikidata": "Q60966987", "amenity": "bicycle_rental"}, "addTags": {"amenity": "bicycle_rental", "brand": "MiBici", "brand:wikidata": "Q60966987", "brand:wikipedia": "es:MiBici", "name": "MiBici"}, "countryCodes": ["mx"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/bicycle_rental/Swapfiets": {"name": "Swapfiets", "icon": "temaki-bicycle_rental", "imageURL": "https://graph.facebook.com/Swapfiets/picture?type=large", "geometry": ["point", "vertex", "area"], "tags": {"brand:wikidata": "Q62104374", "amenity": "bicycle_rental"}, "addTags": {"amenity": "bicycle_rental", "brand": "Swapfiets", "brand:wikidata": "Q62104374", "name": "Swapfiets"}, "countryCodes": ["be", "de", "dk", "nl"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/bicycle_rental/metropolradruhr": {"name": "metropolradruhr", "icon": "temaki-bicycle_rental", "imageURL": "https://graph.facebook.com/nextbike/picture?type=large", "geometry": ["point", "vertex", "area"], "tags": {"brand:wikidata": "Q62104274", "amenity": "bicycle_rental"}, "addTags": {"amenity": "bicycle_rental", "brand": "metropolradruhr", "brand:wikidata": "Q62104274", "name": "metropolradruhr"}, "countryCodes": ["de"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/bicycle_rental/nextbike": {"name": "nextbike", "icon": "temaki-bicycle_rental", "imageURL": "https://graph.facebook.com/nextbike/picture?type=large", "geometry": ["point", "vertex", "area"], "tags": {"brand:wikidata": "Q2351279", "amenity": "bicycle_rental"}, "addTags": {"amenity": "bicycle_rental", "brand": "nextbike", "brand:wikidata": "Q2351279", "brand:wikipedia": "de:Nextbike", "name": "nextbike"}, "countryCodes": ["at", "de"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/bureau_de_change/CADECA": {"name": "CADECA", "icon": "temaki-money_hand", "imageURL": "https://graph.facebook.com/CadecaCasasdeCambioOficial/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q62122716", "amenity": "bureau_de_change"}, "addTags": {"amenity": "bureau_de_change", "brand": "CADECA", "brand:wikidata": "Q62122716", "name": "CADECA"}, "countryCodes": ["cu"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/bureau_de_change/Travelex": {"name": "Travelex", "icon": "temaki-money_hand", "imageURL": "https://graph.facebook.com/TravelexUK/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2337964", "amenity": "bureau_de_change"}, "addTags": {"amenity": "bureau_de_change", "brand": "Travelex", "brand:wikidata": "Q2337964", "brand:wikipedia": "en:Travelex", "name": "Travelex"}, "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/cafe/85°C": {"name": "85°C", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/85CBakeryCafe/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4644852", "amenity": "cafe"}, "addTags": {"alt_name": "85C", "amenity": "cafe", "brand": "85°C", "brand:wikidata": "Q4644852", "brand:wikipedia": "en:85C Bakery Cafe", "cuisine": "coffee_shop;chinese", "name": "85°C", "takeaway": "yes"}, "countryCodes": ["au", "us"], "terms": ["85 cafe", "85 degrees", "85 degrees c", "85 degrees celsius", "85c bakery cafe", "85c daily cafe", "85oc"], "matchScore": 2, "suggestion": true},
@@ -5091,9 +5091,9 @@
     "shop/stationery/Smiggle": {"name": "Smiggle", "icon": "fas-paperclip", "imageURL": "https://graph.facebook.com/smiggle/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7544536", "shop": "stationery"}, "addTags": {"brand": "Smiggle", "brand:wikidata": "Q7544536", "name": "Smiggle", "shop": "stationery"}, "countryCodes": ["at", "gb", "hk", "ie", "my", "nz", "sg"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/stationery/Staples": {"name": "Staples", "icon": "fas-paperclip", "imageURL": "https://graph.facebook.com/staples/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q785943", "shop": "stationery"}, "addTags": {"brand": "Staples", "brand:wikidata": "Q785943", "brand:wikipedia": "en:Staples Inc.", "name": "Staples", "shop": "stationery"}, "terms": [], "matchScore": 2, "suggestion": true},
     "shop/stationery/Комус": {"name": "Комус", "icon": "fas-paperclip", "imageURL": "https://graph.facebook.com/komusclub/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4230314", "shop": "stationery"}, "addTags": {"brand": "Комус", "brand:en": "Komus", "brand:wikidata": "Q4230314", "brand:wikipedia": "en:Komus (company)", "name": "Комус", "name:en": "Komus", "shop": "stationery"}, "countryCodes": ["ru"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/storage_rental/Extra Space Storage": {"name": "Extra Space Storage", "icon": "fas-warehouse", "imageURL": "https://graph.facebook.com/extraspace/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5422162", "shop": "storage_rental"}, "addTags": {"brand": "Extra Space Storage", "brand:wikidata": "Q5422162", "brand:wikipedia": "en:Extra Space Storage", "name": "Extra Space Storage", "shop": "storage_rental"}, "countryCodes": ["us"], "terms": ["extra space"], "matchScore": 2, "suggestion": true},
-    "shop/storage_rental/Public Storage": {"name": "Public Storage", "icon": "fas-warehouse", "imageURL": "https://graph.facebook.com/PublicStorage/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1156045", "shop": "storage_rental"}, "addTags": {"brand": "Public Storage", "brand:wikidata": "Q1156045", "brand:wikipedia": "en:Public Storage", "name": "Public Storage", "shop": "storage_rental"}, "countryCodes": ["ca", "us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/storage_rental/U-Haul": {"name": "U-Haul", "icon": "fas-warehouse", "imageURL": "https://graph.facebook.com/uhaul/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7862902", "shop": "storage_rental"}, "addTags": {"brand": "U-Haul", "brand:wikidata": "Q7862902", "brand:wikipedia": "en:U-Haul", "name": "U-Haul", "shop": "storage_rental"}, "countryCodes": ["ca", "us"], "terms": ["uhaul neighborhood dealer"], "matchScore": 2, "suggestion": true},
+    "shop/storage_rental/Extra Space Storage": {"name": "Extra Space Storage", "icon": "temaki-storage_rental", "imageURL": "https://graph.facebook.com/extraspace/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5422162", "shop": "storage_rental"}, "addTags": {"brand": "Extra Space Storage", "brand:wikidata": "Q5422162", "brand:wikipedia": "en:Extra Space Storage", "name": "Extra Space Storage", "shop": "storage_rental"}, "countryCodes": ["us"], "terms": ["extra space"], "matchScore": 2, "suggestion": true},
+    "shop/storage_rental/Public Storage": {"name": "Public Storage", "icon": "temaki-storage_rental", "imageURL": "https://graph.facebook.com/PublicStorage/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1156045", "shop": "storage_rental"}, "addTags": {"brand": "Public Storage", "brand:wikidata": "Q1156045", "brand:wikipedia": "en:Public Storage", "name": "Public Storage", "shop": "storage_rental"}, "countryCodes": ["ca", "us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/storage_rental/U-Haul": {"name": "U-Haul", "icon": "temaki-storage_rental", "imageURL": "https://graph.facebook.com/uhaul/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7862902", "shop": "storage_rental"}, "addTags": {"brand": "U-Haul", "brand:wikidata": "Q7862902", "brand:wikipedia": "en:U-Haul", "name": "U-Haul", "shop": "storage_rental"}, "countryCodes": ["ca", "us"], "terms": ["uhaul neighborhood dealer"], "matchScore": 2, "suggestion": true},
     "shop/supermarket/8 à Huit": {"name": "8 à Huit", "icon": "maki-grocery", "imageURL": "https://graph.facebook.com/fashion8a8/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2818601", "shop": "supermarket"}, "addTags": {"brand": "8 à Huit", "brand:wikidata": "Q2818601", "brand:wikipedia": "fr:8 à Huit", "name": "8 à Huit", "shop": "supermarket"}, "terms": [], "matchScore": 2, "suggestion": true},
     "shop/supermarket/99 Ranch Market": {"name": "99 Ranch Market", "icon": "maki-grocery", "imageURL": "https://graph.facebook.com/99RanchMarket/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4646307", "shop": "supermarket"}, "addTags": {"brand": "99 Ranch Market", "brand:wikidata": "Q4646307", "brand:wikipedia": "en:99 Ranch Market", "cuisine": "asian", "name": "99 Ranch Market", "name:en": "99 Ranch Market", "name:zh-Hans": "大华超级市场", "name:zh-Hant": "大華超級市場", "shop": "supermarket"}, "countryCodes": ["us"], "terms": ["99 ranch", "ranch 99"], "matchScore": 2, "suggestion": true},
     "shop/supermarket/A&O": {"name": "A&O", "icon": "maki-grocery", "imageURL": "https://graph.facebook.com/www.aeo.it/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3600279", "shop": "supermarket"}, "addTags": {"brand": "A&O", "brand:wikidata": "Q3600279", "brand:wikipedia": "it:A&O", "name": "A&O", "shop": "supermarket"}, "countryCodes": ["it"], "terms": [], "matchScore": 2, "suggestion": true},
diff --git a/data/presets/presets/amenity/animal_boarding.json b/data/presets/presets/amenity/animal_boarding.json
index 519afc83bd..2c3efd4232 100644
--- a/data/presets/presets/amenity/animal_boarding.json
+++ b/data/presets/presets/amenity/animal_boarding.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-veterinary",
+    "icon": "temaki-dog_shelter",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/amenity/animal_shelter.json b/data/presets/presets/amenity/animal_shelter.json
index f3ac8bcb4f..986de58b67 100644
--- a/data/presets/presets/amenity/animal_shelter.json
+++ b/data/presets/presets/amenity/animal_shelter.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-veterinary",
+    "icon": "temaki-dog_shelter",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/amenity/bicycle_parking/lockers.json b/data/presets/presets/amenity/bicycle_parking/lockers.json
index ba78e01879..4d5c751316 100644
--- a/data/presets/presets/amenity/bicycle_parking/lockers.json
+++ b/data/presets/presets/amenity/bicycle_parking/lockers.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-bicycle",
+    "icon": "temaki-bicycle_box",
     "geometry": [
         "point",
         "vertex",
diff --git a/data/presets/presets/amenity/bicycle_rental.json b/data/presets/presets/amenity/bicycle_rental.json
index d76175bd8d..a6286a5c5d 100644
--- a/data/presets/presets/amenity/bicycle_rental.json
+++ b/data/presets/presets/amenity/bicycle_rental.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-bicycle",
+    "icon": "temaki-bicycle_rental",
     "fields": [
         "capacity",
         "network",
diff --git a/data/presets/presets/amenity/boat_rental.json b/data/presets/presets/amenity/boat_rental.json
index b7c4be7242..8652643e6d 100644
--- a/data/presets/presets/amenity/boat_rental.json
+++ b/data/presets/presets/amenity/boat_rental.json
@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-boating",
+    "icon": "temaki-boat_rental",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/amenity/shelter/lean_to.json b/data/presets/presets/amenity/shelter/lean_to.json
index db6e3e75ab..9a0563010e 100644
--- a/data/presets/presets/amenity/shelter/lean_to.json
+++ b/data/presets/presets/amenity/shelter/lean_to.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shelter",
+    "icon": "temaki-sleep_shelter",
     "fields": [
         "name",
         "operator",
diff --git a/data/presets/presets/amenity/shelter/picnic_shelter.json b/data/presets/presets/amenity/shelter/picnic_shelter.json
index ff048a1a84..bd4211b6e7 100644
--- a/data/presets/presets/amenity/shelter/picnic_shelter.json
+++ b/data/presets/presets/amenity/shelter/picnic_shelter.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shelter",
+    "icon": "temaki-picnic_shelter",
     "fields": [
         "name",
         "shelter_type",
diff --git a/data/presets/presets/amenity/shelter/public_transport.json b/data/presets/presets/amenity/shelter/public_transport.json
index 0394719a12..3dc28cc2d8 100644
--- a/data/presets/presets/amenity/shelter/public_transport.json
+++ b/data/presets/presets/amenity/shelter/public_transport.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shelter",
+    "icon": "temaki-transit_shelter",
     "fields": [
         "name",
         "shelter_type",
diff --git a/data/presets/presets/barrier/cattle_grid.json b/data/presets/presets/barrier/cattle_grid.json
index 7dfbfc0fa4..f264630818 100644
--- a/data/presets/presets/barrier/cattle_grid.json
+++ b/data/presets/presets/barrier/cattle_grid.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-barrier",
+    "icon": "temaki-cattle_grid",
     "geometry": [
         "vertex"
     ],
diff --git a/data/presets/presets/barrier/chain.json b/data/presets/presets/barrier/chain.json
index 6145addc62..7cf75e74b0 100644
--- a/data/presets/presets/barrier/chain.json
+++ b/data/presets/presets/barrier/chain.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-barrier",
+    "icon": "temaki-rope_fence",
     "fields": [
         "access"
     ],
diff --git a/data/presets/presets/barrier/gate.json b/data/presets/presets/barrier/gate.json
index 8c2cceeb73..5bcad4b4b8 100644
--- a/data/presets/presets/barrier/gate.json
+++ b/data/presets/presets/barrier/gate.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-barrier",
+    "icon": "temaki-gate",
     "fields": [
         "access",
         "opening_hours"
diff --git a/data/presets/presets/barrier/kissing_gate.json b/data/presets/presets/barrier/kissing_gate.json
index c6569cd70e..622cbc44dc 100644
--- a/data/presets/presets/barrier/kissing_gate.json
+++ b/data/presets/presets/barrier/kissing_gate.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-barrier",
+    "icon": "temaki-gate",
     "fields": [
         "access"
     ],
diff --git a/data/presets/presets/barrier/turnstile.json b/data/presets/presets/barrier/turnstile.json
index df3a2ef7bb..8da4a0db0c 100644
--- a/data/presets/presets/barrier/turnstile.json
+++ b/data/presets/presets/barrier/turnstile.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-roadblock",
+    "icon": "temaki-turnstile",
     "fields": [
         "access"
     ],
diff --git a/data/presets/presets/building/barn.json b/data/presets/presets/building/barn.json
index 93bed9e47c..780f32e91a 100644
--- a/data/presets/presets/building/barn.json
+++ b/data/presets/presets/building/barn.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-farm",
+    "icon": "temaki-barn",
     "geometry": [
         "area"
     ],
diff --git a/data/presets/presets/leisure/firepit.json b/data/presets/presets/leisure/firepit.json
index cbe1652585..59f46b5cba 100644
--- a/data/presets/presets/leisure/firepit.json
+++ b/data/presets/presets/leisure/firepit.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-fire-station",
+    "icon": "temaki-campfire",
     "fields": [
         "access_simple"
     ],
diff --git a/data/presets/presets/man_made/water_tower.json b/data/presets/presets/man_made/water_tower.json
index 225e3b2544..a16f17adc4 100644
--- a/data/presets/presets/man_made/water_tower.json
+++ b/data/presets/presets/man_made/water_tower.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-water",
+    "icon": "temaki-water_tower",
     "fields": [
         "operator",
         "height"
diff --git a/data/presets/presets/shop/storage_rental.json b/data/presets/presets/shop/storage_rental.json
index 1c3148e0b6..c0aa71cd04 100644
--- a/data/presets/presets/shop/storage_rental.json
+++ b/data/presets/presets/shop/storage_rental.json
@@ -1,5 +1,5 @@
 {
-    "icon": "fas-warehouse",
+    "icon": "temaki-storage_rental",
     "geometry": [
         "point",
         "area"
diff --git a/data/taginfo.json b/data/taginfo.json
index da2f76aa92..d55527d0f4 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -68,9 +68,9 @@
     {"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": "scrapyard", "description": "🄿 Scrap Yard (unsearchable), 🄳 ➜ landuse=industrial + industrial=scrap_yard", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/car-15.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@master/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"},
+    {"key": "amenity", "value": "animal_boarding", "description": "🄿 Animal Boarding Facility", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/dog_shelter.svg"},
     {"key": "amenity", "value": "animal_breeding", "description": "🄿 Animal Breeding Facility", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/veterinary-15.svg"},
-    {"key": "amenity", "value": "animal_shelter", "description": "🄿 Animal Shelter", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/veterinary-15.svg"},
+    {"key": "amenity", "value": "animal_shelter", "description": "🄿 Animal Shelter", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/dog_shelter.svg"},
     {"key": "amenity", "value": "arts_centre", "description": "🄿 Arts Center", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/theatre-15.svg"},
     {"key": "amenity", "value": "atm", "description": "🄿 ATM", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/bank-15.svg"},
     {"key": "amenity", "value": "bank", "description": "🄿 Bank", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/bank-15.svg"},
@@ -80,12 +80,12 @@
     {"key": "amenity", "value": "bench", "description": "🄿 Bench", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/bench.svg"},
     {"key": "amenity", "value": "bicycle_parking", "description": "🄿 Bicycle Parking", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/bicycle-15.svg"},
     {"key": "bicycle_parking", "value": "building", "description": "🄿 Bicycle Parking Garage", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/bicycle-15.svg"},
-    {"key": "bicycle_parking", "value": "lockers", "description": "🄿 Bicycle Lockers", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/bicycle-15.svg"},
+    {"key": "bicycle_parking", "value": "lockers", "description": "🄿 Bicycle Lockers", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/bicycle_box.svg"},
     {"key": "bicycle_parking", "value": "shed", "description": "🄿 Bicycle Shed", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/bicycle-15.svg"},
-    {"key": "amenity", "value": "bicycle_rental", "description": "🄿 Bicycle Rental", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/bicycle-15.svg"},
+    {"key": "amenity", "value": "bicycle_rental", "description": "🄿 Bicycle Rental", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/bicycle_rental.svg"},
     {"key": "amenity", "value": "bicycle_repair_station", "description": "🄿 Bicycle Repair Tool Stand", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/bicycle-15.svg"},
     {"key": "amenity", "value": "biergarten", "description": "🄿 Biergarten", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-beer.svg"},
-    {"key": "amenity", "value": "boat_rental", "description": "🄿 Boat Rental", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/boating.svg"},
+    {"key": "amenity", "value": "boat_rental", "description": "🄿 Boat Rental", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/boat_rental.svg"},
     {"key": "amenity", "value": "bureau_de_change", "description": "🄿 Currency Exchange", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/money_hand.svg"},
     {"key": "amenity", "value": "cafe", "description": "🄿 Cafe", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/cafe-15.svg"},
     {"key": "amenity", "value": "car_pooling", "description": "🄿 Car Pooling", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/car-15.svg"},
@@ -209,9 +209,9 @@
     {"key": "amenity", "value": "school", "description": "🄿 School Grounds", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/school.svg"},
     {"key": "amenity", "value": "shelter", "description": "🄿 Shelter", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shelter-15.svg"},
     {"key": "shelter_type", "value": "gazebo", "description": "🄿 Gazebo", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shelter-15.svg"},
-    {"key": "shelter_type", "value": "lean_to", "description": "🄿 Lean-To", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shelter-15.svg"},
-    {"key": "shelter_type", "value": "picnic_shelter", "description": "🄿 Picnic Shelter", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shelter-15.svg"},
-    {"key": "shelter_type", "value": "public_transport", "description": "🄿 Transit Shelter", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shelter-15.svg"},
+    {"key": "shelter_type", "value": "lean_to", "description": "🄿 Lean-To", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/sleep_shelter.svg"},
+    {"key": "shelter_type", "value": "picnic_shelter", "description": "🄿 Picnic Shelter", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/picnic_shelter.svg"},
+    {"key": "shelter_type", "value": "public_transport", "description": "🄿 Transit Shelter", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/transit_shelter.svg"},
     {"key": "amenity", "value": "shower", "description": "🄿 Shower", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/shower.svg"},
     {"key": "amenity", "value": "smoking_area", "description": "🄿 Smoking Area", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-smoking.svg"},
     {"key": "amenity", "value": "social_centre", "description": "🄿 Social Center", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-handshake.svg"},
@@ -293,14 +293,14 @@
     {"key": "barrier", "value": "block", "description": "🄿 Block", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-cube.svg"},
     {"key": "barrier", "value": "bollard", "description": "🄿 Bollard Row, 🄿 Bollard", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/silo.svg"},
     {"key": "barrier", "value": "border_control", "description": "🄿 Border Control", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/roadblock-15.svg"},
-    {"key": "barrier", "value": "cattle_grid", "description": "🄿 Cattle Grid", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/barrier-15.svg"},
-    {"key": "barrier", "value": "chain", "description": "🄿 Chain", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/barrier-15.svg"},
+    {"key": "barrier", "value": "cattle_grid", "description": "🄿 Cattle Grid", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/cattle_grid.svg"},
+    {"key": "barrier", "value": "chain", "description": "🄿 Chain", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/rope_fence.svg"},
     {"key": "barrier", "value": "city_wall", "description": "🄿 City Wall", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/wall.svg"},
     {"key": "barrier", "value": "cycle_barrier", "description": "🄿 Cycle Barrier", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/roadblock-15.svg"},
     {"key": "barrier", "value": "ditch", "description": "🄿 Trench", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/roadblock-15.svg"},
     {"key": "barrier", "value": "fence", "description": "🄿 Fence", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/fence-15.svg"},
     {"key": "fence_type", "value": "railing", "description": "🄿 Railing", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/railing.svg"},
-    {"key": "barrier", "value": "gate", "description": "🄿 Gate", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/barrier-15.svg"},
+    {"key": "barrier", "value": "gate", "description": "🄿 Gate", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/gate.svg"},
     {"key": "barrier", "value": "guard_rail", "description": "🄿 Guard Rail", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/guard_rail.svg"},
     {"key": "barrier", "value": "hedge", "description": "🄿 Hedge", "object_types": ["way", "area"]},
     {"key": "barrier", "value": "height_restrictor", "description": "🄿 Height Restrictor", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/car_wash.svg"},
@@ -309,13 +309,13 @@
     {"key": "kerb", "value": "lowered", "description": "🄿 Lowered Curb", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/kerb-lowered.svg"},
     {"key": "kerb", "value": "raised", "description": "🄿 Raised Curb", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/kerb-raised.svg"},
     {"key": "kerb", "value": "rolled", "description": "🄿 Rolled Curb", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/kerb-rolled.svg"},
-    {"key": "barrier", "value": "kissing_gate", "description": "🄿 Kissing Gate", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/barrier-15.svg"},
+    {"key": "barrier", "value": "kissing_gate", "description": "🄿 Kissing Gate", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/gate.svg"},
     {"key": "barrier", "value": "lift_gate", "description": "🄿 Lift Gate", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/lift_gate.svg"},
     {"key": "barrier", "value": "retaining_wall", "description": "🄿 Retaining Wall", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/wall.svg"},
     {"key": "barrier", "value": "sally_port", "description": "🄿 Sally Port", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-dungeon.svg"},
     {"key": "barrier", "value": "stile", "description": "🄿 Stile", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/roadblock-15.svg"},
     {"key": "barrier", "value": "toll_booth", "description": "🄿 Toll Booth", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/roadblock-15.svg"},
-    {"key": "barrier", "value": "turnstile", "description": "🄿 Turnstile", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/roadblock-15.svg"},
+    {"key": "barrier", "value": "turnstile", "description": "🄿 Turnstile", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/turnstile.svg"},
     {"key": "barrier", "value": "wall", "description": "🄿 Wall", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/wall.svg"},
     {"key": "wall", "value": "noise_barrier", "description": "🄿 Noise Barrier", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/wall.svg"},
     {"key": "boundary", "value": "administrative", "description": "🄿 Administrative Boundary", "object_types": ["way"]},
@@ -326,7 +326,7 @@
     {"key": "building", "value": "entrance", "description": "🄿 Entrance/Exit (unsearchable), 🄳 ➜ entrance=*", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/entrance-alt1-15.svg"},
     {"key": "building", "value": "train_station", "description": "🄿 Train Station Building (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
     {"key": "building", "value": "apartments", "description": "🄿 Apartment Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
-    {"key": "building", "value": "barn", "description": "🄿 Barn", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/farm-15.svg"},
+    {"key": "building", "value": "barn", "description": "🄿 Barn", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/barn.svg"},
     {"key": "building", "value": "boathouse", "description": "🄿 Boathouse", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/harbor-15.svg"},
     {"key": "building", "value": "bungalow", "description": "🄿 Bungalow", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/home-15.svg"},
     {"key": "building", "value": "cabin", "description": "🄿 Cabin", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/home-15.svg"},
@@ -622,7 +622,7 @@
     {"key": "leisure", "value": "disc_golf_course", "description": "🄿 Disc Golf Course", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/disc_golf_basket.svg"},
     {"key": "leisure", "value": "dog_park", "description": "🄿 Dog Park", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/dog-park-15.svg"},
     {"key": "leisure", "value": "escape_game", "description": "🄿 Escape Room", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-puzzle-piece.svg"},
-    {"key": "leisure", "value": "firepit", "description": "🄿 Firepit", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/fire-station-15.svg"},
+    {"key": "leisure", "value": "firepit", "description": "🄿 Firepit", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/campfire.svg"},
     {"key": "leisure", "value": "fishing", "description": "🄿 Fishing Spot", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-fish.svg"},
     {"key": "leisure", "value": "fitness_centre", "description": "🄿 Gym / Fitness Center", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-dumbbell.svg"},
     {"key": "sport", "value": "yoga", "description": "🄿 Yoga Studio", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/pitch-15.svg"},
@@ -747,7 +747,7 @@
     {"key": "man_made", "value": "utility_pole", "description": "🄿 Utility Pole", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/utility_pole.svg"},
     {"key": "man_made", "value": "wastewater_plant", "description": "🄿 Wastewater Plant", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/waste.svg"},
     {"key": "man_made", "value": "water_tap", "description": "🄿 Water Tap", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/drinking-water-15.svg"},
-    {"key": "man_made", "value": "water_tower", "description": "🄿 Water Tower", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"},
+    {"key": "man_made", "value": "water_tower", "description": "🄿 Water Tower", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/water_tower.svg"},
     {"key": "man_made", "value": "water_well", "description": "🄿 Water Well", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"},
     {"key": "man_made", "value": "water_works", "description": "🄿 Water Works", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"},
     {"key": "man_made", "value": "watermill", "description": "🄿 Watermill", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/watermill-15.svg"},
@@ -1080,7 +1080,7 @@
     {"key": "shop", "value": "spices", "description": "🄿 Spice Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
     {"key": "shop", "value": "sports", "description": "🄿 Sporting Goods Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-futbol.svg"},
     {"key": "shop", "value": "stationery", "description": "🄿 Stationery Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-paperclip.svg"},
-    {"key": "shop", "value": "storage_rental", "description": "🄿 Storage Rental", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-warehouse.svg"},
+    {"key": "shop", "value": "storage_rental", "description": "🄿 Storage Rental", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/storage_rental.svg"},
     {"key": "shop", "value": "supermarket", "description": "🄿 Supermarket", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/grocery-15.svg"},
     {"key": "shop", "value": "swimming_pool", "description": "🄿 Pool Supply Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-swimmer.svg"},
     {"key": "shop", "value": "tailor", "description": "🄿 Tailor", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/clothing-store-15.svg"},
diff --git a/package.json b/package.json
index 4457497b4d..255dec09f3 100644
--- a/package.json
+++ b/package.json
@@ -101,7 +101,7 @@
     "smash": "0.0",
     "static-server": "^2.2.1",
     "svg-sprite": "1.5.0",
-    "temaki": "~2.1.0",
+    "temaki": "~2.2.0",
     "uglify-js": "~3.6.6"
   },
   "greenkeeper": {