diff --git a/data/presets/presets.json b/data/presets/presets.json
index fcc41731e..d4cb5cd37 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -337,11 +337,11 @@
     "building/bungalow": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "bungalow"}, "terms": ["home", "detached"], "matchScore": 0.5, "name": "Bungalow"},
     "building/cabin": {"icon": "temaki-cabin", "geometry": ["area"], "tags": {"building": "cabin"}, "matchScore": 0.5, "name": "Cabin"},
     "building/carport": {"icon": "fas-warehouse", "fields": ["{building}", "capacity"], "geometry": ["area"], "tags": {"building": "carport"}, "matchScore": 0.5, "terms": ["covered parking space", "garage", "car", "porch"], "name": "Carport"},
-    "building/cathedral": {"icon": "maki-place-of-worship", "geometry": ["area"], "tags": {"building": "cathedral"}, "matchScore": 0.5, "name": "Cathedral Building"},
+    "building/cathedral": {"icon": "fas-church", "geometry": ["area"], "tags": {"building": "cathedral"}, "matchScore": 0.5, "name": "Cathedral Building"},
     "building/chapel": {"icon": "maki-place-of-worship", "geometry": ["area"], "tags": {"building": "chapel"}, "matchScore": 0.5, "name": "Chapel Building"},
-    "building/church": {"icon": "maki-place-of-worship", "geometry": ["area"], "tags": {"building": "church"}, "matchScore": 0.5, "name": "Church Building"},
+    "building/church": {"icon": "fas-church", "geometry": ["area"], "tags": {"building": "church"}, "matchScore": 0.5, "name": "Church Building"},
     "building/civic": {"icon": "maki-building", "fields": ["{building}", "smoking"], "moreFields": ["{building}", "polling_station"], "geometry": ["area"], "tags": {"building": "civic"}, "matchScore": 0.5, "name": "Civic Building"},
-    "building/college": {"icon": "maki-building", "moreFields": ["{building}", "polling_station"], "geometry": ["area"], "terms": ["university"], "tags": {"building": "college"}, "matchScore": 0.5, "name": "College Building"},
+    "building/college": {"icon": "fas-school", "moreFields": ["{building}", "polling_station"], "geometry": ["area"], "terms": ["university"], "tags": {"building": "college"}, "matchScore": 0.5, "name": "College Building"},
     "building/commercial": {"icon": "maki-suitcase", "fields": ["{building}", "smoking"], "geometry": ["area"], "tags": {"building": "commercial"}, "matchScore": 0.5, "name": "Commercial Building"},
     "building/construction": {"icon": "maki-building", "geometry": ["area"], "tags": {"building": "construction"}, "matchScore": 0.5, "name": "Building Under Construction"},
     "building/detached": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "detached"}, "terms": ["home", "single", "family", "residence", "dwelling"], "matchScore": 0.5, "name": "Detached House"},
@@ -353,21 +353,21 @@
     "building/grandstand": {"icon": "maki-building", "geometry": ["area"], "tags": {"building": "grandstand"}, "terms": ["tribune", "stand", "stands", "bleachers"], "matchScore": 0.5, "name": "Grandstand"},
     "building/greenhouse": {"icon": "maki-garden-centre", "geometry": ["area"], "tags": {"building": "greenhouse"}, "matchScore": 0.5, "name": "Greenhouse"},
     "building/hangar": {"icon": "fas-warehouse", "fields": ["name"], "geometry": ["area"], "tags": {"building": "hangar"}, "matchScore": 0.5, "name": "Hangar Building"},
-    "building/hospital": {"icon": "maki-building", "geometry": ["area"], "tags": {"building": "hospital"}, "matchScore": 0.5, "name": "Hospital Building"},
-    "building/hotel": {"icon": "maki-building", "fields": ["{building}", "smoking"], "geometry": ["area"], "tags": {"building": "hotel"}, "matchScore": 0.5, "name": "Hotel Building"},
+    "building/hospital": {"icon": "fas-hospital-alt", "geometry": ["area"], "tags": {"building": "hospital"}, "matchScore": 0.5, "name": "Hospital Building"},
+    "building/hotel": {"icon": "fas-hotel", "fields": ["{building}", "smoking"], "geometry": ["area"], "tags": {"building": "hotel"}, "matchScore": 0.5, "name": "Hotel Building"},
     "building/house": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "house"}, "terms": ["home", "family", "residence", "dwelling"], "matchScore": 0.5, "name": "House"},
     "building/houseboat": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "houseboat"}, "terms": ["home", "family", "residence", "dwelling"], "matchScore": 0.5, "name": "Houseboat"},
     "building/hut": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "hut"}, "matchScore": 0.5, "name": "Hut"},
     "building/industrial": {"icon": "maki-industry", "geometry": ["area"], "tags": {"building": "industrial"}, "matchScore": 0.5, "name": "Industrial Building"},
-    "building/kindergarten": {"icon": "maki-building", "geometry": ["area"], "terms": ["kindergarden", "pre-school"], "tags": {"building": "kindergarten"}, "matchScore": 0.5, "name": "Preschool/Kindergarten Building"},
-    "building/mosque": {"icon": "maki-place-of-worship", "geometry": ["area"], "tags": {"building": "mosque"}, "matchScore": 0.5, "name": "Mosque Building"},
+    "building/kindergarten": {"icon": "fas-school", "geometry": ["area"], "terms": ["kindergarden", "pre-school"], "tags": {"building": "kindergarten"}, "matchScore": 0.5, "name": "Preschool/Kindergarten Building"},
+    "building/mosque": {"icon": "fas-mosque", "geometry": ["area"], "tags": {"building": "mosque"}, "matchScore": 0.5, "name": "Mosque Building"},
     "building/pavilion": {"icon": "maki-building", "fields": ["{building}", "smoking"], "geometry": ["area"], "terms": ["sports"], "tags": {"building": "pavilion"}, "matchScore": 0.5, "name": "Pavilion Building"},
     "building/public": {"icon": "maki-building", "fields": ["{building}", "smoking"], "moreFields": ["{building}", "polling_station"], "geometry": ["area"], "tags": {"building": "public"}, "matchScore": 0.5, "name": "Public Building"},
     "building/residential": {"icon": "maki-residential-community", "geometry": ["area"], "tags": {"building": "residential"}, "matchScore": 0.5, "name": "Residential Building"},
     "building/retail": {"icon": "maki-commercial", "fields": ["{building}", "smoking"], "geometry": ["area"], "tags": {"building": "retail"}, "matchScore": 0.5, "name": "Retail Building"},
     "building/roof": {"icon": "maki-shelter", "fields": ["{building}", "layer"], "geometry": ["area"], "tags": {"building": "roof"}, "matchScore": 0.5, "name": "Roof"},
     "building/ruins": {"icon": "temaki-ruins", "geometry": ["area"], "tags": {"building": "ruins"}, "matchScore": 0.5, "name": "Building Ruins"},
-    "building/school": {"icon": "maki-building", "moreFields": ["{building}", "polling_station"], "geometry": ["area"], "terms": ["academy", "elementary school", "middle school", "high school"], "tags": {"building": "school"}, "matchScore": 0.5, "name": "School Building"},
+    "building/school": {"icon": "fas-school", "moreFields": ["{building}", "polling_station"], "geometry": ["area"], "terms": ["academy", "elementary school", "middle school", "high school"], "tags": {"building": "school"}, "matchScore": 0.5, "name": "School Building"},
     "building/semidetached_house": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "semidetached_house"}, "terms": ["home", "double", "duplex", "twin", "family", "residence", "dwelling"], "matchScore": 0.5, "name": "Semi-Detached House"},
     "building/service": {"icon": "maki-building", "geometry": ["area"], "tags": {"building": "service"}, "matchScore": 0.5, "name": "Service Building"},
     "building/shed": {"icon": "fas-warehouse", "fields": ["{building}", "lockable"], "geometry": ["area"], "tags": {"building": "shed"}, "matchScore": 0.5, "name": "Shed"},
@@ -377,7 +377,7 @@
     "building/temple": {"icon": "maki-place-of-worship", "geometry": ["area"], "tags": {"building": "temple"}, "matchScore": 0.5, "name": "Temple Building"},
     "building/terrace": {"icon": "maki-building", "geometry": ["area"], "tags": {"building": "terrace"}, "terms": ["home", "terrace", "brownstone", "family", "residence", "dwelling"], "matchScore": 0.5, "name": "Row Houses"},
     "building/transportation": {"icon": "maki-building", "fields": ["{building}", "smoking"], "geometry": ["area"], "tags": {"building": "transportation"}, "matchScore": 0.5, "name": "Transportation Building"},
-    "building/university": {"icon": "maki-building", "moreFields": ["{building}", "polling_station"], "geometry": ["area"], "terms": ["college"], "tags": {"building": "university"}, "matchScore": 0.5, "name": "University Building"},
+    "building/university": {"icon": "fas-school", "moreFields": ["{building}", "polling_station"], "geometry": ["area"], "terms": ["college"], "tags": {"building": "university"}, "matchScore": 0.5, "name": "University Building"},
     "building/warehouse": {"icon": "maki-warehouse", "geometry": ["area"], "tags": {"building": "warehouse"}, "matchScore": 0.5, "name": "Warehouse"},
     "club": {"icon": "fas-handshake", "fields": ["name", "club", "operator", "address", "building_area", "opening_hours"], "moreFields": ["access_simple", "building/levels_building", "email", "fax", "gnis/feature_id", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "max_age", "min_age", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"club": "*"}, "terms": ["social"], "name": "Club"},
     "club/sport": {"icon": "maki-pitch", "fields": ["name", "sport", "{club}"], "geometry": ["point", "area"], "tags": {"club": "sport"}, "terms": ["athletics club", "sporting club", "sports association", "sports society"], "name": "Sports Club"},
@@ -435,7 +435,7 @@
     "craft/window_construction": {"icon": "temaki-window", "geometry": ["point", "area"], "terms": ["glass"], "tags": {"craft": "window_construction"}, "name": "Window Construction"},
     "craft/winery": {"icon": "maki-alcohol-shop", "moreFields": ["{craft}", "min_age"], "geometry": ["point", "area"], "tags": {"craft": "winery"}, "name": "Winery"},
     "cycleway/asl": {"icon": "maki-bicycle", "fields": ["ref", "direction_vertex", "width"], "geometry": ["vertex"], "tags": {"cycleway": "asl"}, "terms": ["advanced stop box", "asl", "bicycle box", "bike box", "bikebox", "cycle box", "cycle stop marking"], "name": "Advanced Stop Line"},
-    "demolished/building": {"fields": ["name", "address"], "geometry": ["area"], "tags": {"demolished:building": "*"}, "name": "Recently Demolished Building", "searchable": false},
+    "demolished/building": {"icon": "fas-house-damage", "fields": ["name", "address"], "geometry": ["area"], "tags": {"demolished:building": "*"}, "name": "Recently Demolished Building", "searchable": false},
     "disused/railway": {"fields": ["disused/railway"], "geometry": ["point", "vertex", "line", "area"], "tags": {"disused:railway": "*"}, "matchScore": 0.05, "searchable": false, "name": "Disused Railway Feature"},
     "emergency/designated": {"fields": ["emergency_combo"], "geometry": ["line"], "tags": {"emergency": "designated"}, "name": "Emergency Access Designated", "searchable": false, "matchScore": 0.01},
     "emergency/destination": {"fields": ["emergency_combo"], "geometry": ["line"], "tags": {"emergency": "destination"}, "name": "Emergency Access Destination", "searchable": false, "matchScore": 0.01},
diff --git a/data/presets/presets/building/cathedral.json b/data/presets/presets/building/cathedral.json
index bbe8c9b46..49fb23743 100644
--- a/data/presets/presets/building/cathedral.json
+++ b/data/presets/presets/building/cathedral.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-place-of-worship",
+    "icon": "fas-church",
     "geometry": [
         "area"
     ],
diff --git a/data/presets/presets/building/church.json b/data/presets/presets/building/church.json
index 925b17a56..ffb066b0f 100644
--- a/data/presets/presets/building/church.json
+++ b/data/presets/presets/building/church.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-place-of-worship",
+    "icon": "fas-church",
     "geometry": [
         "area"
     ],
diff --git a/data/presets/presets/building/college.json b/data/presets/presets/building/college.json
index 04f1c85e7..dfcdebd31 100644
--- a/data/presets/presets/building/college.json
+++ b/data/presets/presets/building/college.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-building",
+    "icon": "fas-school",
     "moreFields": [
         "{building}",
         "polling_station"
diff --git a/data/presets/presets/building/hospital.json b/data/presets/presets/building/hospital.json
index c3591736d..021a16c84 100644
--- a/data/presets/presets/building/hospital.json
+++ b/data/presets/presets/building/hospital.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-building",
+    "icon": "fas-hospital-alt",
     "geometry": [
         "area"
     ],
diff --git a/data/presets/presets/building/hotel.json b/data/presets/presets/building/hotel.json
index 374f410c1..4e03f55ac 100644
--- a/data/presets/presets/building/hotel.json
+++ b/data/presets/presets/building/hotel.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-building",
+    "icon": "fas-hotel",
     "fields": [
         "{building}",
         "smoking"
diff --git a/data/presets/presets/building/kindergarten.json b/data/presets/presets/building/kindergarten.json
index 5992b057c..f5aa65612 100644
--- a/data/presets/presets/building/kindergarten.json
+++ b/data/presets/presets/building/kindergarten.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-building",
+    "icon": "fas-school",
     "geometry": [
         "area"
     ],
diff --git a/data/presets/presets/building/mosque.json b/data/presets/presets/building/mosque.json
index fae5306b8..3847de5a8 100644
--- a/data/presets/presets/building/mosque.json
+++ b/data/presets/presets/building/mosque.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-place-of-worship",
+    "icon": "fas-mosque",
     "geometry": [
         "area"
     ],
diff --git a/data/presets/presets/building/school.json b/data/presets/presets/building/school.json
index e2607c44c..daff0625d 100644
--- a/data/presets/presets/building/school.json
+++ b/data/presets/presets/building/school.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-building",
+    "icon": "fas-school",
     "moreFields": [
         "{building}",
         "polling_station"
diff --git a/data/presets/presets/building/university.json b/data/presets/presets/building/university.json
index 3d47ecd80..b16325286 100644
--- a/data/presets/presets/building/university.json
+++ b/data/presets/presets/building/university.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-building",
+    "icon": "fas-school",
     "moreFields": [
         "{building}",
         "polling_station"
diff --git a/data/presets/presets/demolished/_building.json b/data/presets/presets/demolished/_building.json
index 17a4a084c..693b8b663 100644
--- a/data/presets/presets/demolished/_building.json
+++ b/data/presets/presets/demolished/_building.json
@@ -1,4 +1,5 @@
 {
+    "icon": "fas-house-damage",
     "fields": [
         "name",
         "address"
diff --git a/data/taginfo.json b/data/taginfo.json
index 92f0df013..0a38bde1d 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -332,11 +332,11 @@
     {"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/ideditor/temaki/icons/cabin.svg"},
     {"key": "building", "value": "carport", "description": "🄿 Carport", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-warehouse.svg"},
-    {"key": "building", "value": "cathedral", "description": "🄿 Cathedral Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/place-of-worship-15.svg"},
+    {"key": "building", "value": "cathedral", "description": "🄿 Cathedral Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-church.svg"},
     {"key": "building", "value": "chapel", "description": "🄿 Chapel Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/place-of-worship-15.svg"},
-    {"key": "building", "value": "church", "description": "🄿 Church Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/place-of-worship-15.svg"},
+    {"key": "building", "value": "church", "description": "🄿 Church Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-church.svg"},
     {"key": "building", "value": "civic", "description": "🄿 Civic Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
-    {"key": "building", "value": "college", "description": "🄿 College Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
+    {"key": "building", "value": "college", "description": "🄿 College Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-school.svg"},
     {"key": "building", "value": "commercial", "description": "🄿 Commercial Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"},
     {"key": "building", "value": "construction", "description": "🄿 Building Under Construction", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
     {"key": "building", "value": "detached", "description": "🄿 Detached House", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/home-15.svg"},
@@ -348,21 +348,21 @@
     {"key": "building", "value": "grandstand", "description": "🄿 Grandstand", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
     {"key": "building", "value": "greenhouse", "description": "🄿 Greenhouse", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/garden-centre-15.svg"},
     {"key": "building", "value": "hangar", "description": "🄿 Hangar Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-warehouse.svg"},
-    {"key": "building", "value": "hospital", "description": "🄿 Hospital Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
-    {"key": "building", "value": "hotel", "description": "🄿 Hotel Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
+    {"key": "building", "value": "hospital", "description": "🄿 Hospital Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-hospital-alt.svg"},
+    {"key": "building", "value": "hotel", "description": "🄿 Hotel Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-hotel.svg"},
     {"key": "building", "value": "house", "description": "🄿 House", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/home-15.svg"},
     {"key": "building", "value": "houseboat", "description": "🄿 Houseboat", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/home-15.svg"},
     {"key": "building", "value": "hut", "description": "🄿 Hut", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/home-15.svg"},
     {"key": "building", "value": "industrial", "description": "🄿 Industrial Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/industry-15.svg"},
-    {"key": "building", "value": "kindergarten", "description": "🄿 Preschool/Kindergarten Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
-    {"key": "building", "value": "mosque", "description": "🄿 Mosque Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/place-of-worship-15.svg"},
+    {"key": "building", "value": "kindergarten", "description": "🄿 Preschool/Kindergarten Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-school.svg"},
+    {"key": "building", "value": "mosque", "description": "🄿 Mosque Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-mosque.svg"},
     {"key": "building", "value": "pavilion", "description": "🄿 Pavilion Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
     {"key": "building", "value": "public", "description": "🄿 Public Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
     {"key": "building", "value": "residential", "description": "🄿 Residential Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/residential-community-15.svg"},
     {"key": "building", "value": "retail", "description": "🄿 Retail Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/commercial-15.svg"},
     {"key": "building", "value": "roof", "description": "🄿 Roof", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shelter-15.svg"},
     {"key": "building", "value": "ruins", "description": "🄿 Building Ruins", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/ruins.svg"},
-    {"key": "building", "value": "school", "description": "🄿 School Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
+    {"key": "building", "value": "school", "description": "🄿 School Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-school.svg"},
     {"key": "building", "value": "semidetached_house", "description": "🄿 Semi-Detached House", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/home-15.svg"},
     {"key": "building", "value": "service", "description": "🄿 Service Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
     {"key": "building", "value": "shed", "description": "🄿 Shed", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-warehouse.svg"},
@@ -372,7 +372,7 @@
     {"key": "building", "value": "temple", "description": "🄿 Temple Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/place-of-worship-15.svg"},
     {"key": "building", "value": "terrace", "description": "🄿 Row Houses", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
     {"key": "building", "value": "transportation", "description": "🄿 Transportation Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
-    {"key": "building", "value": "university", "description": "🄿 University Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
+    {"key": "building", "value": "university", "description": "🄿 University Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-school.svg"},
     {"key": "building", "value": "warehouse", "description": "🄿 Warehouse", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/warehouse-15.svg"},
     {"key": "club", "description": "🄿 Club, 🄵 Type", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-handshake.svg"},
     {"key": "club", "value": "sport", "description": "🄿 Sports Club", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/pitch-15.svg"},
@@ -430,7 +430,7 @@
     {"key": "craft", "value": "window_construction", "description": "🄿 Window Construction", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/window.svg"},
     {"key": "craft", "value": "winery", "description": "🄿 Winery", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/alcohol-shop-15.svg"},
     {"key": "cycleway", "value": "asl", "description": "🄿 Advanced Stop Line", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/bicycle-15.svg"},
-    {"key": "demolished:building", "description": "🄿 Recently Demolished Building (unsearchable)", "object_types": ["area"]},
+    {"key": "demolished:building", "description": "🄿 Recently Demolished Building (unsearchable)", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-house-damage.svg"},
     {"key": "disused:railway", "description": "🄿 Disused Railway Feature (unsearchable), 🄵 Type", "object_types": ["node", "way", "area"]},
     {"key": "emergency", "value": "designated", "description": "🄿 Emergency Access Designated (unsearchable)", "object_types": ["way"]},
     {"key": "emergency", "value": "destination", "description": "🄿 Emergency Access Destination (unsearchable)", "object_types": ["way"]},
diff --git a/svg/fontawesome/fas-church.svg b/svg/fontawesome/fas-church.svg
new file mode 100644
index 000000000..9947a275b
--- /dev/null
+++ b/svg/fontawesome/fas-church.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="church" class="svg-inline--fa fa-church fa-w-20" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><path fill="currentColor" d="M464.46 246.68L352 179.2V128h48c8.84 0 16-7.16 16-16V80c0-8.84-7.16-16-16-16h-48V16c0-8.84-7.16-16-16-16h-32c-8.84 0-16 7.16-16 16v48h-48c-8.84 0-16 7.16-16 16v32c0 8.84 7.16 16 16 16h48v51.2l-112.46 67.48A31.997 31.997 0 0 0 160 274.12V512h96v-96c0-35.35 28.65-64 64-64s64 28.65 64 64v96h96V274.12c0-11.24-5.9-21.66-15.54-27.44zM0 395.96V496c0 8.84 7.16 16 16 16h112V320L19.39 366.54A32.024 32.024 0 0 0 0 395.96zm620.61-29.42L512 320v192h112c8.84 0 16-7.16 16-16V395.96c0-12.8-7.63-24.37-19.39-29.42z"></path></svg>
\ No newline at end of file
diff --git a/svg/fontawesome/fas-hospital-alt.svg b/svg/fontawesome/fas-hospital-alt.svg
new file mode 100644
index 000000000..e514b9441
--- /dev/null
+++ b/svg/fontawesome/fas-hospital-alt.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="hospital-alt" class="svg-inline--fa fa-hospital-alt fa-w-18" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path fill="currentColor" d="M544 96H416V32c0-17.7-14.3-32-32-32H192c-17.7 0-32 14.3-32 32v64H32c-17.7 0-32 14.3-32 32v368c0 8.8 7.2 16 16 16h544c8.8 0 16-7.2 16-16V128c0-17.7-14.3-32-32-32zM160 436c0 6.6-5.4 12-12 12h-40c-6.6 0-12-5.4-12-12v-40c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40zm0-128c0 6.6-5.4 12-12 12h-40c-6.6 0-12-5.4-12-12v-40c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40zm160 128c0 6.6-5.4 12-12 12h-40c-6.6 0-12-5.4-12-12v-40c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40zm0-128c0 6.6-5.4 12-12 12h-40c-6.6 0-12-5.4-12-12v-40c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40zm16-170c0 3.3-2.7 6-6 6h-26v26c0 3.3-2.7 6-6 6h-20c-3.3 0-6-2.7-6-6v-26h-26c-3.3 0-6-2.7-6-6v-20c0-3.3 2.7-6 6-6h26V86c0-3.3 2.7-6 6-6h20c3.3 0 6 2.7 6 6v26h26c3.3 0 6 2.7 6 6v20zm144 298c0 6.6-5.4 12-12 12h-40c-6.6 0-12-5.4-12-12v-40c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40zm0-128c0 6.6-5.4 12-12 12h-40c-6.6 0-12-5.4-12-12v-40c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40z"></path></svg>
\ No newline at end of file
diff --git a/svg/fontawesome/fas-hotel.svg b/svg/fontawesome/fas-hotel.svg
new file mode 100644
index 000000000..d46d5ed2e
--- /dev/null
+++ b/svg/fontawesome/fas-hotel.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="hotel" class="svg-inline--fa fa-hotel fa-w-18" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path fill="currentColor" d="M560 64c8.84 0 16-7.16 16-16V16c0-8.84-7.16-16-16-16H16C7.16 0 0 7.16 0 16v32c0 8.84 7.16 16 16 16h15.98v384H16c-8.84 0-16 7.16-16 16v32c0 8.84 7.16 16 16 16h240v-80c0-8.8 7.2-16 16-16h32c8.8 0 16 7.2 16 16v80h240c8.84 0 16-7.16 16-16v-32c0-8.84-7.16-16-16-16h-16V64h16zm-304 44.8c0-6.4 6.4-12.8 12.8-12.8h38.4c6.4 0 12.8 6.4 12.8 12.8v38.4c0 6.4-6.4 12.8-12.8 12.8h-38.4c-6.4 0-12.8-6.4-12.8-12.8v-38.4zm0 96c0-6.4 6.4-12.8 12.8-12.8h38.4c6.4 0 12.8 6.4 12.8 12.8v38.4c0 6.4-6.4 12.8-12.8 12.8h-38.4c-6.4 0-12.8-6.4-12.8-12.8v-38.4zm-128-96c0-6.4 6.4-12.8 12.8-12.8h38.4c6.4 0 12.8 6.4 12.8 12.8v38.4c0 6.4-6.4 12.8-12.8 12.8h-38.4c-6.4 0-12.8-6.4-12.8-12.8v-38.4zM179.2 256h-38.4c-6.4 0-12.8-6.4-12.8-12.8v-38.4c0-6.4 6.4-12.8 12.8-12.8h38.4c6.4 0 12.8 6.4 12.8 12.8v38.4c0 6.4-6.4 12.8-12.8 12.8zM192 384c0-53.02 42.98-96 96-96s96 42.98 96 96H192zm256-140.8c0 6.4-6.4 12.8-12.8 12.8h-38.4c-6.4 0-12.8-6.4-12.8-12.8v-38.4c0-6.4 6.4-12.8 12.8-12.8h38.4c6.4 0 12.8 6.4 12.8 12.8v38.4zm0-96c0 6.4-6.4 12.8-12.8 12.8h-38.4c-6.4 0-12.8-6.4-12.8-12.8v-38.4c0-6.4 6.4-12.8 12.8-12.8h38.4c6.4 0 12.8 6.4 12.8 12.8v38.4z"></path></svg>
\ No newline at end of file
diff --git a/svg/fontawesome/fas-house-damage.svg b/svg/fontawesome/fas-house-damage.svg
new file mode 100644
index 000000000..248a905e9
--- /dev/null
+++ b/svg/fontawesome/fas-house-damage.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="house-damage" class="svg-inline--fa fa-house-damage fa-w-18" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path fill="currentColor" d="M288 114.96L69.47 307.71c-1.62 1.46-3.69 2.14-5.47 3.35V496c0 8.84 7.16 16 16 16h149.23L192 439.19l104.11-64-60.16-119.22L384 392.75l-104.11 64L319.81 512H496c8.84 0 16-7.16 16-16V311.1c-1.7-1.16-3.72-1.82-5.26-3.2L288 114.96zm282.69 121.32L512 184.45V48c0-8.84-7.16-16-16-16h-64c-8.84 0-16 7.16-16 16v51.69L314.75 10.31C307.12 3.45 297.56.01 288 0s-19.1 3.41-26.7 10.27L5.31 236.28c-6.57 5.91-7.12 16.02-1.21 22.6l21.4 23.82c5.9 6.57 16.02 7.12 22.6 1.21L277.42 81.63c6.05-5.33 15.12-5.33 21.17 0L527.91 283.9c6.57 5.9 16.69 5.36 22.6-1.21l21.4-23.82c5.9-6.57 5.36-16.69-1.22-22.59z"></path></svg>
\ No newline at end of file
diff --git a/svg/fontawesome/fas-mosque.svg b/svg/fontawesome/fas-mosque.svg
new file mode 100644
index 000000000..5e502e19e
--- /dev/null
+++ b/svg/fontawesome/fas-mosque.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="mosque" class="svg-inline--fa fa-mosque fa-w-20" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><path fill="currentColor" d="M0 480c0 17.67 14.33 32 32 32h64c17.67 0 32-14.33 32-32V160H0v320zm579.16-192c17.86-17.39 28.84-37.34 28.84-58.91 0-52.86-41.79-93.79-87.92-122.9-41.94-26.47-80.63-57.77-111.96-96.22L400 0l-8.12 9.97c-31.33 38.45-70.01 69.76-111.96 96.22C233.79 135.3 192 176.23 192 229.09c0 21.57 10.98 41.52 28.84 58.91h358.32zM608 320H192c-17.67 0-32 14.33-32 32v128c0 17.67 14.33 32 32 32h32v-64c0-17.67 14.33-32 32-32s32 14.33 32 32v64h64v-72c0-48 48-72 48-72s48 24 48 72v72h64v-64c0-17.67 14.33-32 32-32s32 14.33 32 32v64h32c17.67 0 32-14.33 32-32V352c0-17.67-14.33-32-32-32zM64 0S0 32 0 96v32h128V96c0-64-64-96-64-96z"></path></svg>
\ No newline at end of file
diff --git a/svg/fontawesome/fas-school.svg b/svg/fontawesome/fas-school.svg
new file mode 100644
index 000000000..21bd5c636
--- /dev/null
+++ b/svg/fontawesome/fas-school.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="school" class="svg-inline--fa fa-school fa-w-20" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><path fill="currentColor" d="M0 224v272c0 8.84 7.16 16 16 16h80V192H32c-17.67 0-32 14.33-32 32zm360-48h-24v-40c0-4.42-3.58-8-8-8h-16c-4.42 0-8 3.58-8 8v64c0 4.42 3.58 8 8 8h48c4.42 0 8-3.58 8-8v-16c0-4.42-3.58-8-8-8zm137.75-63.96l-160-106.67a32.02 32.02 0 0 0-35.5 0l-160 106.67A32.002 32.002 0 0 0 128 138.66V512h128V368c0-8.84 7.16-16 16-16h96c8.84 0 16 7.16 16 16v144h128V138.67c0-10.7-5.35-20.7-14.25-26.63zM320 256c-44.18 0-80-35.82-80-80s35.82-80 80-80 80 35.82 80 80-35.82 80-80 80zm288-64h-64v320h80c8.84 0 16-7.16 16-16V224c0-17.67-14.33-32-32-32z"></path></svg>
\ No newline at end of file