diff --git a/css/50_misc.css b/css/50_misc.css
index 823b77004..882a09047 100644
--- a/css/50_misc.css
+++ b/css/50_misc.css
@@ -211,17 +211,14 @@ path.casing.tag-status {
 
 
 /* Buildings */
-path.stroke.tag-building,
-path.stroke.tag-amenity-shelter {
+path.stroke.tag-building {
     stroke: rgb(224, 110, 95);
 }
-path.fill.tag-building,
-path.fill.tag-amenity-shelter {
+path.fill.tag-building {
     stroke: rgba(224, 110, 95, 0.3);
     fill: rgba(224, 110, 95, 0.3);
 }
-.preset-icon-fill-area.tag-building,
-.preset-icon-fill-area.tag-amenity-shelter {
+.preset-icon-fill-area.tag-building {
     border-color: rgb(224, 110, 95);
     background-color: rgba(224, 110, 95, 0.3);
 }
@@ -263,4 +260,4 @@ path.stroke.tag-man_made-pier {
     stroke-width: 1;
     stroke-linecap: butt;
     stroke-dasharray: 3, 3;
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index e0b7ef5a4..14d76779e 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -127,7 +127,7 @@
     "amenity/restaurant": {"icon": "maki-restaurant", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "capacity", "takeaway", "delivery", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "coffee", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant"}, "name": "Restaurant"},
     "amenity/sanitary_dump_station": {"icon": "temaki-storage_tank", "fields": ["operator", "access_simple", "fee", "water_point"], "geometry": ["point", "vertex", "area"], "terms": ["Motor Home", "Camper", "Sanitary", "Dump Station", "Elsan", "CDP", "CTDP", "Chemical Toilet"], "tags": {"amenity": "sanitary_dump_station"}, "name": "RV Toilet Disposal"},
     "amenity/school": {"icon": "maki-school", "fields": ["name", "operator", "address", "religion", "denomination"], "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", "bin"], "geometry": ["point", "vertex", "area"], "terms": ["lean-to", "gazebo", "picnic"], "tags": {"amenity": "shelter"}, "name": "Shelter"},
+    "amenity/shelter": {"icon": "maki-shelter", "fields": ["name", "shelter_type", "building_area", "bench", "bin"], "geometry": ["point", "vertex", "area"], "terms": ["lean-to", "gazebo", "picnic"], "tags": {"amenity": "shelter"}, "name": "Shelter"},
     "amenity/shower": {"icon": "temaki-shower", "fields": ["operator", "opening_hours", "fee", "supervised", "building_area"], "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"], "geometry": ["point", "vertex", "area"], "terms": [], "tags": {"amenity": "smoking_area"}, "name": "Smoking Area"},
     "amenity/social_facility": {"icon": "temaki-social_facility", "fields": ["name", "operator", "address", "building_area", "social_facility", "social_facility_for", "opening_hours", "wheelchair"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "social_facility"}, "name": "Social Facility"},
diff --git a/data/presets/presets/amenity/shelter.json b/data/presets/presets/amenity/shelter.json
index c3e2f2114..3d8ccd9ab 100644
--- a/data/presets/presets/amenity/shelter.json
+++ b/data/presets/presets/amenity/shelter.json
@@ -3,6 +3,8 @@
     "fields": [
         "name",
         "shelter_type",
+        "building_area",
+        "bench",
         "bin"
     ],
     "geometry": [
diff --git a/modules/renderer/features.js b/modules/renderer/features.js
index d7d382af7..e8cb1008d 100644
--- a/modules/renderer/features.js
+++ b/modules/renderer/features.js
@@ -123,7 +123,6 @@ export function rendererFeatures(context) {
         return (
             !!entity.tags['building:part'] ||
             (!!entity.tags.building && entity.tags.building !== 'no') ||
-            entity.tags.amenity === 'shelter' ||
             entity.tags.parking === 'multi-storey' ||
             entity.tags.parking === 'sheds' ||
             entity.tags.parking === 'carports' ||