diff --git a/data/presets/presets.json b/data/presets/presets.json
index 4e33c4cb3..abfa66fc0 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -281,7 +281,7 @@
"amenity/veterinary": {"icon": "temaki-veterinary_care", "fields": ["name", "operator", "address", "building_area", "opening_hours", "opening_hours/covid19"], "moreFields": ["charge_fee", "email", "fax", "fee", "gnis/feature_id", "level", "payment_multi_fee", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["pet clinic", "veterinarian", "animal hospital", "pet doctor"], "tags": {"amenity": "veterinary"}, "name": "Veterinary"},
"amenity/waste_basket": {"icon": "maki-waste-basket", "fields": ["operator", "waste", "collection_times", "material", "colour"], "moreFields": ["covered", "indoor", "manufacturer"], "geometry": ["point", "vertex"], "tags": {"amenity": "waste_basket"}, "terms": ["bin", "garbage", "rubbish", "litter", "trash"], "name": "Waste Basket"},
"amenity/waste_disposal": {"icon": "fas-dumpster", "fields": ["operator", "waste", "collection_times", "access_simple"], "moreFields": ["brand", "colour", "height", "manufacturer", "material"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "waste_disposal"}, "terms": ["garbage", "rubbish", "litter", "trash"], "name": "Garbage Dumpster"},
- "amenity/waste_transfer_station": {"icon": "maki-waste-basket", "fields": ["name", "operator", "operator/type", "waste", "address", "opening_hours", "opening_hours/covid19", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["dump", "garbage", "recycling", "rubbish", "scrap", "trash"], "tags": {"amenity": "waste_transfer_station"}, "name": "Waste Transfer Station"},
+ "amenity/waste_transfer_station": {"icon": "fas-trash-restore", "fields": ["name", "operator", "operator/type", "waste", "address", "opening_hours", "opening_hours/covid19", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["dump", "garbage", "recycling", "rubbish", "scrap", "trash"], "tags": {"amenity": "waste_transfer_station"}, "name": "Waste Transfer Station"},
"amenity/waste/dog_excrement": {"icon": "maki-waste-basket", "fields": ["collection_times"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "waste_basket", "waste": "dog_excrement"}, "reference": {"key": "waste", "value": "dog_excrement"}, "terms": ["bin", "garbage", "rubbish", "litter", "trash", "poo", "dog"], "name": "Dog Excrement Bin"},
"amenity/water_point": {"icon": "maki-drinking-water", "fields": ["operator", "access_simple", "fee", "payment_multi_fee", "charge_fee", "opening_hours", "opening_hours/covid19"], "moreFields": ["covered", "drinking_water", "lit", "ref"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "water_point"}, "terms": ["water faucet", "water point", "water tap", "water source", "water spigot"], "name": "RV Drinking Water"},
"amenity/watering_place": {"icon": "maki-drinking-water", "fields": ["operator", "fee", "payment_multi_fee", "charge_fee", "opening_hours", "opening_hours/covid19"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "watering_place"}, "name": "Animal Watering Place"},
@@ -403,14 +403,14 @@
"craft": {"icon": "temaki-tools", "fields": ["name", "craft", "operator", "address", "building_area", "opening_hours", "opening_hours/covid19", "phone", "website"], "moreFields": ["air_conditioning", "building/levels_building", "ele", "email", "fax", "gnis/feature_id", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "product", "ref/vatin", "wheelchair"], "geometry": ["point", "area"], "tags": {"craft": "*"}, "terms": [], "name": "Craft"},
"craft/locksmith": {"icon": "maki-marker-stroked", "geometry": ["point", "area"], "tags": {"craft": "locksmith"}, "reference": {"key": "shop", "value": "locksmith"}, "name": "Locksmith", "searchable": false},
"craft/tailor": {"icon": "temaki-needle_and_spool", "geometry": ["point", "area"], "tags": {"craft": "tailor"}, "reference": {"key": "shop", "value": "tailor"}, "name": "Tailor", "searchable": false},
- "craft/agricultural_engines": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "agricultural_engines"}, "terms": ["combines", "farm equipment", "harvesters", "tractors"], "name": "Agricultural Engines Mechanic"},
+ "craft/agricultural_engines": {"icon": "fas-tools", "geometry": ["point", "area"], "tags": {"craft": "agricultural_engines"}, "terms": ["combines", "farm equipment", "harvesters", "tractors"], "name": "Agricultural Engines Mechanic"},
"craft/basket_maker": {"icon": "temaki-vase", "geometry": ["point", "area"], "tags": {"craft": "basket_maker"}, "name": "Basket Maker"},
"craft/beekeeper": {"icon": "maki-farm", "geometry": ["point", "area"], "tags": {"craft": "beekeeper"}, "name": "Beekeeper"},
"craft/blacksmith": {"icon": "temaki-anvil_and_hammer", "geometry": ["point", "area"], "tags": {"craft": "blacksmith"}, "name": "Blacksmith"},
"craft/boatbuilder": {"icon": "temaki-boat_repair", "geometry": ["point", "area"], "tags": {"craft": "boatbuilder"}, "matchScore": 0.6, "name": "Boat Builder"},
"craft/bookbinder": {"icon": "maki-library", "geometry": ["point", "area"], "terms": ["book repair"], "tags": {"craft": "bookbinder"}, "name": "Bookbinder"},
"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/carpenter": {"icon": "fas-hammer", "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": "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"},
@@ -420,14 +420,14 @@
"craft/distillery": {"icon": "temaki-storage_fermenter", "fields": ["{craft}", "product"], "moreFields": ["{craft}", "min_age"], "geometry": ["point", "area"], "terms": ["alcohol", "beverage", "bourbon", "booze", "brandy", "gin", "hooch", "liquor", "mezcal", "moonshine", "rum", "scotch", "spirits", "still", "tequila", "vodka", "whiskey", "whisky"], "tags": {"craft": "distillery"}, "name": "Distillery"},
"craft/dressmaker": {"icon": "temaki-dress", "geometry": ["point", "area"], "terms": ["seamstress"], "tags": {"craft": "dressmaker"}, "name": "Dressmaker"},
"craft/electrician": {"icon": "temaki-power", "geometry": ["point", "area"], "terms": ["power", "wire"], "tags": {"craft": "electrician"}, "name": "Electrician"},
- "craft/electronics_repair": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "electronics_repair"}, "name": "Electronics Repair Shop"},
+ "craft/electronics_repair": {"icon": "fas-screwdriver", "geometry": ["point", "area"], "tags": {"craft": "electronics_repair"}, "name": "Electronics Repair Shop"},
"craft/floorer": {"icon": "temaki-brick_trowel", "geometry": ["point", "area"], "tags": {"craft": "floorer"}, "name": "Floorer"},
"craft/gardener": {"icon": "maki-garden-centre", "geometry": ["point", "area"], "terms": ["landscaper", "grounds keeper"], "tags": {"craft": "gardener"}, "name": "Gardener"},
"craft/glaziery": {"icon": "temaki-window", "geometry": ["point", "area"], "terms": ["glass", "stained-glass", "window"], "tags": {"craft": "glaziery"}, "name": "Glaziery"},
"craft/handicraft": {"icon": "temaki-vase", "geometry": ["point", "area"], "tags": {"craft": "handicraft"}, "name": "Handicraft Workspace"},
"craft/hvac": {"icon": "temaki-tools", "geometry": ["point", "area"], "terms": ["heat*", "vent*", "air conditioning"], "tags": {"craft": "hvac"}, "name": "HVAC Workplace"},
"craft/insulator": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "insulation"}, "name": "Insulator"},
- "craft/joiner": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "joiner"}, "terms": ["furniture"], "name": "Joiner"},
+ "craft/joiner": {"icon": "fas-hammer", "geometry": ["point", "area"], "tags": {"craft": "joiner"}, "terms": ["furniture"], "name": "Joiner"},
"craft/key_cutter": {"icon": "fas-key", "geometry": ["point", "area"], "tags": {"craft": "key_cutter"}, "name": "Key Cutter"},
"craft/metal_construction": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "metal_construction"}, "name": "Metalworker"},
"craft/painter": {"icon": "fas-paint-roller", "geometry": ["point", "area"], "tags": {"craft": "painter"}, "name": "Painter"},
@@ -438,7 +438,7 @@
"craft/plumber": {"icon": "temaki-plumber", "geometry": ["point", "area"], "terms": ["pipe"], "tags": {"craft": "plumber"}, "name": "Plumber"},
"craft/pottery": {"icon": "temaki-vase", "geometry": ["point", "area"], "terms": ["ceramic", "kiln", "pot", "vase"], "tags": {"craft": "pottery"}, "name": "Pottery Maker"},
"craft/rigger": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "rigger"}, "name": "Rigger"},
- "craft/roofer": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "roofer"}, "name": "Roofer"},
+ "craft/roofer": {"icon": "fas-hammer", "geometry": ["point", "area"], "tags": {"craft": "roofer"}, "name": "Roofer"},
"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"},
@@ -917,7 +917,7 @@
"office/quango": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "quango"}, "terms": ["ngo", "non government", "non-government", "organization", "organisation", "quasi autonomous", "quasi-autonomous"], "name": "Quasi-NGO Office"},
"office/religion": {"icon": "maki-suitcase", "fields": ["{office}", "religion", "denomination"], "geometry": ["point", "area"], "tags": {"office": "religion"}, "terms": [], "name": "Religious Office"},
"office/research": {"icon": "fas-flask", "geometry": ["point", "area"], "tags": {"office": "research"}, "terms": ["R and D", "research and development", "research lab", "r&d", "rnd"], "name": "Research Office"},
- "office/surveyor": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "surveyor"}, "terms": [], "name": "Surveyor Office"},
+ "office/surveyor": {"icon": "fas-vest", "geometry": ["point", "area"], "tags": {"office": "surveyor"}, "terms": [], "name": "Surveyor Office"},
"office/tax_advisor": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "tax_advisor"}, "terms": ["tax", "tax consultant"], "name": "Tax Advisor Office"},
"office/telecommunication": {"icon": "maki-telephone", "geometry": ["point", "area"], "tags": {"office": "telecommunication"}, "terms": ["communication", "internet service provider", "isp", "network", "telephone", "voice"], "name": "Telecom Office"},
"office/therapist": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "therapist"}, "terms": ["therapy"], "name": "Therapist Office"},
@@ -1105,7 +1105,7 @@
"shop/chemist": {"icon": "fas-shopping-basket", "geometry": ["point", "area"], "tags": {"shop": "chemist"}, "terms": ["apothecary", "beauty", "drug store", "drugstore", "gift", "hair", "med*", "pharmacy", "prescription", "tooth"], "name": "Drugstore"},
"shop/chocolate": {"icon": "maki-confectionery", "geometry": ["point", "area"], "tags": {"shop": "chocolate"}, "terms": ["cocoa"], "name": "Chocolate Store"},
"shop/clothes": {"icon": "maki-clothing-store", "fields": ["name", "clothes", "{shop}"], "geometry": ["point", "area"], "tags": {"shop": "clothes"}, "terms": ["blouses", "boutique", "bras", "clothes", "dresses", "fashion", "pants", "shirts", "shorts", "skirts", "slacks", "socks", "suits", "underwear"], "name": "Clothing Store"},
- "shop/clothes/second_hand": {"icon": "maki-clothing-store", "geometry": ["point", "area"], "tags": {"shop": "clothes", "second_hand": "only"}, "terms": ["blouses", "clothes", "consignment", "dresses", "pants", "second hand", "shirts", "shorts", "skirts", "slacks", "suits", "used"], "name": "Secondhand Clothing Store"},
+ "shop/clothes/second_hand": {"icon": "fas-tshirt", "geometry": ["point", "area"], "tags": {"shop": "clothes", "second_hand": "only"}, "terms": ["blouses", "clothes", "consignment", "dresses", "pants", "second hand", "shirts", "shorts", "skirts", "slacks", "suits", "used"], "name": "Secondhand Clothing Store"},
"shop/clothes/underwear": {"icon": "maki-clothing-store", "geometry": ["point", "area"], "tags": {"shop": "clothes", "clothes": "underwear"}, "reference": {"key": "clothes", "value": "underwear"}, "terms": ["boutique", "bras", "brassieres", "briefs", "boxers", "fashion", "lingerie", "panties", "slips", "socks", "stockings", "underclothes", "undergarments", "underpants", "undies"], "name": "Underwear Store"},
"shop/clothes/wedding": {"icon": "temaki-gown", "geometry": ["point", "area"], "tags": {"shop": "clothes", "clothes": "wedding"}, "reference": {"key": "clothes", "value": "wedding"}, "terms": ["boutique", "bridal", "bride", "bridegroom", "bridesmaid", "groom", "groomsman", "tuxedo", "wedding dress", "wedding gown"], "name": "Wedding Clothes Store"},
"shop/coffee": {"icon": "temaki-coffee", "geometry": ["point", "area"], "tags": {"shop": "coffee"}, "name": "Coffee Store"},
diff --git a/data/presets/presets/amenity/waste_transfer_station.json b/data/presets/presets/amenity/waste_transfer_station.json
index a1f327704..b30329b8b 100644
--- a/data/presets/presets/amenity/waste_transfer_station.json
+++ b/data/presets/presets/amenity/waste_transfer_station.json
@@ -1,5 +1,5 @@
{
- "icon": "maki-waste-basket",
+ "icon": "fas-trash-restore",
"fields": [
"name",
"operator",
diff --git a/data/presets/presets/craft/agricultural_engines.json b/data/presets/presets/craft/agricultural_engines.json
index a6f3b2468..ca7b50c2f 100644
--- a/data/presets/presets/craft/agricultural_engines.json
+++ b/data/presets/presets/craft/agricultural_engines.json
@@ -1,5 +1,5 @@
{
- "icon": "temaki-tools",
+ "icon": "fas-tools",
"geometry": [
"point",
"area"
diff --git a/data/presets/presets/craft/carpenter.json b/data/presets/presets/craft/carpenter.json
index d74ca5bd2..4fbad0f14 100644
--- a/data/presets/presets/craft/carpenter.json
+++ b/data/presets/presets/craft/carpenter.json
@@ -1,5 +1,5 @@
{
- "icon": "temaki-tools",
+ "icon": "fas-hammer",
"geometry": [
"point",
"area"
diff --git a/data/presets/presets/craft/electronics_repair.json b/data/presets/presets/craft/electronics_repair.json
index 465fd42e9..c0567bcb7 100644
--- a/data/presets/presets/craft/electronics_repair.json
+++ b/data/presets/presets/craft/electronics_repair.json
@@ -1,5 +1,5 @@
{
- "icon": "temaki-tools",
+ "icon": "fas-screwdriver",
"geometry": [
"point",
"area"
diff --git a/data/presets/presets/craft/joiner.json b/data/presets/presets/craft/joiner.json
index 8d2d44bab..540409f1a 100644
--- a/data/presets/presets/craft/joiner.json
+++ b/data/presets/presets/craft/joiner.json
@@ -1,5 +1,5 @@
{
- "icon": "temaki-tools",
+ "icon": "fas-hammer",
"geometry": [
"point",
"area"
diff --git a/data/presets/presets/craft/roofer.json b/data/presets/presets/craft/roofer.json
index 859c15ecb..1247d759c 100644
--- a/data/presets/presets/craft/roofer.json
+++ b/data/presets/presets/craft/roofer.json
@@ -1,5 +1,5 @@
{
- "icon": "temaki-tools",
+ "icon": "fas-hammer",
"geometry": [
"point",
"area"
diff --git a/data/presets/presets/office/surveyor.json b/data/presets/presets/office/surveyor.json
index ab5cf17d6..1ed911850 100644
--- a/data/presets/presets/office/surveyor.json
+++ b/data/presets/presets/office/surveyor.json
@@ -1,5 +1,5 @@
{
- "icon": "maki-suitcase",
+ "icon": "fas-vest",
"geometry": [
"point",
"area"
diff --git a/data/presets/presets/shop/clothes/second_hand.json b/data/presets/presets/shop/clothes/second_hand.json
index 241843671..907be1818 100644
--- a/data/presets/presets/shop/clothes/second_hand.json
+++ b/data/presets/presets/shop/clothes/second_hand.json
@@ -1,5 +1,5 @@
{
- "icon": "maki-clothing-store",
+ "icon": "fas-tshirt",
"geometry": [
"point",
"area"
diff --git a/data/taginfo.json b/data/taginfo.json
index eb5d380b6..ad456e1d8 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -279,7 +279,7 @@
{"key": "amenity", "value": "veterinary", "description": "🄿 Veterinary", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/veterinary_care.svg"},
{"key": "amenity", "value": "waste_basket", "description": "🄿 Waste Basket", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/waste-basket-15.svg"},
{"key": "amenity", "value": "waste_disposal", "description": "🄿 Garbage Dumpster", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-dumpster.svg"},
- {"key": "amenity", "value": "waste_transfer_station", "description": "🄿 Waste Transfer Station", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/waste-basket-15.svg"},
+ {"key": "amenity", "value": "waste_transfer_station", "description": "🄿 Waste Transfer Station", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-trash-restore.svg"},
{"key": "waste", "value": "dog_excrement", "description": "🄿 Dog Excrement Bin", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/waste-basket-15.svg"},
{"key": "amenity", "value": "water_point", "description": "🄿 RV Drinking Water", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/drinking-water-15.svg"},
{"key": "amenity", "value": "watering_place", "description": "🄿 Animal Watering Place", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/drinking-water-15.svg"},
@@ -399,14 +399,14 @@
{"key": "craft", "description": "🄿 Craft, 🄵 Type", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tools.svg"},
{"key": "craft", "value": "locksmith", "description": "🄿 Locksmith (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/marker-stroked-15.svg"},
{"key": "craft", "value": "tailor", "description": "🄿 Tailor (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/needle_and_spool.svg"},
- {"key": "craft", "value": "agricultural_engines", "description": "🄿 Agricultural Engines Mechanic", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tools.svg"},
+ {"key": "craft", "value": "agricultural_engines", "description": "🄿 Agricultural Engines Mechanic", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-tools.svg"},
{"key": "craft", "value": "basket_maker", "description": "🄿 Basket Maker", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/vase.svg"},
{"key": "craft", "value": "beekeeper", "description": "🄿 Beekeeper", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/farm-15.svg"},
{"key": "craft", "value": "blacksmith", "description": "🄿 Blacksmith", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/anvil_and_hammer.svg"},
{"key": "craft", "value": "boatbuilder", "description": "🄿 Boat Builder", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/boat_repair.svg"},
{"key": "craft", "value": "bookbinder", "description": "🄿 Bookbinder", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/library-15.svg"},
{"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": "carpenter", "description": "🄿 Carpenter", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-hammer.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/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"},
@@ -416,14 +416,14 @@
{"key": "craft", "value": "distillery", "description": "🄿 Distillery", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/storage_fermenter.svg"},
{"key": "craft", "value": "dressmaker", "description": "🄿 Dressmaker", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/dress.svg"},
{"key": "craft", "value": "electrician", "description": "🄿 Electrician", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/power.svg"},
- {"key": "craft", "value": "electronics_repair", "description": "🄿 Electronics Repair Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tools.svg"},
+ {"key": "craft", "value": "electronics_repair", "description": "🄿 Electronics Repair Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-screwdriver.svg"},
{"key": "craft", "value": "floorer", "description": "🄿 Floorer", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/brick_trowel.svg"},
{"key": "craft", "value": "gardener", "description": "🄿 Gardener", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/garden-centre-15.svg"},
{"key": "craft", "value": "glaziery", "description": "🄿 Glaziery", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/window.svg"},
{"key": "craft", "value": "handicraft", "description": "🄿 Handicraft Workspace", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/vase.svg"},
{"key": "craft", "value": "hvac", "description": "🄿 HVAC Workplace", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tools.svg"},
{"key": "craft", "value": "insulation", "description": "🄿 Insulator", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tools.svg"},
- {"key": "craft", "value": "joiner", "description": "🄿 Joiner", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tools.svg"},
+ {"key": "craft", "value": "joiner", "description": "🄿 Joiner", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-hammer.svg"},
{"key": "craft", "value": "key_cutter", "description": "🄿 Key Cutter", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-key.svg"},
{"key": "craft", "value": "metal_construction", "description": "🄿 Metalworker", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tools.svg"},
{"key": "craft", "value": "painter", "description": "🄿 Painter", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-paint-roller.svg"},
@@ -434,7 +434,7 @@
{"key": "craft", "value": "plumber", "description": "🄿 Plumber", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/plumber.svg"},
{"key": "craft", "value": "pottery", "description": "🄿 Pottery Maker", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/vase.svg"},
{"key": "craft", "value": "rigger", "description": "🄿 Rigger", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tools.svg"},
- {"key": "craft", "value": "roofer", "description": "🄿 Roofer", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tools.svg"},
+ {"key": "craft", "value": "roofer", "description": "🄿 Roofer", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-hammer.svg"},
{"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"},
@@ -895,7 +895,7 @@
{"key": "office", "value": "quango", "description": "🄿 Quasi-NGO Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"},
{"key": "office", "value": "religion", "description": "🄿 Religious Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"},
{"key": "office", "value": "research", "description": "🄿 Research Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-flask.svg"},
- {"key": "office", "value": "surveyor", "description": "🄿 Surveyor Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"},
+ {"key": "office", "value": "surveyor", "description": "🄿 Surveyor Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-vest.svg"},
{"key": "office", "value": "tax_advisor", "description": "🄿 Tax Advisor Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"},
{"key": "office", "value": "telecommunication", "description": "🄿 Telecom Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/telephone-15.svg"},
{"key": "office", "value": "therapist", "description": "🄿 Therapist Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"},
diff --git a/svg/fontawesome/fas-hammer.svg b/svg/fontawesome/fas-hammer.svg
new file mode 100644
index 000000000..7f2c70953
--- /dev/null
+++ b/svg/fontawesome/fas-hammer.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/svg/fontawesome/fas-screwdriver.svg b/svg/fontawesome/fas-screwdriver.svg
new file mode 100644
index 000000000..4d6f10025
--- /dev/null
+++ b/svg/fontawesome/fas-screwdriver.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/svg/fontawesome/fas-tools.svg b/svg/fontawesome/fas-tools.svg
new file mode 100644
index 000000000..5f5e5a3a1
--- /dev/null
+++ b/svg/fontawesome/fas-tools.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/svg/fontawesome/fas-trash-restore.svg b/svg/fontawesome/fas-trash-restore.svg
new file mode 100644
index 000000000..a39576579
--- /dev/null
+++ b/svg/fontawesome/fas-trash-restore.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/svg/fontawesome/fas-tshirt.svg b/svg/fontawesome/fas-tshirt.svg
new file mode 100644
index 000000000..706c3ceb9
--- /dev/null
+++ b/svg/fontawesome/fas-tshirt.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/svg/fontawesome/fas-vest.svg b/svg/fontawesome/fas-vest.svg
new file mode 100644
index 000000000..e29771dfe
--- /dev/null
+++ b/svg/fontawesome/fas-vest.svg
@@ -0,0 +1 @@
+
\ No newline at end of file