diff --git a/data/presets.yaml b/data/presets.yaml
index 85ae2a1fe..ad631900c 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -4358,6 +4358,11 @@ en:
         # building=construction
         name: Building Under Construction
         terms: '<translate with synonyms or related terms for ''Building Under Construction'', separated by commas>'
+      building/cowshed:
+        # building=cowshed
+        name: Cowshed
+        # 'terms: byre,cow barn,cow house,cow shed,cowbarn,cowhouse,dairy barn,milking barn'
+        terms: '<translate with synonyms or related terms for ''Cowshed'', separated by commas>'
       building/detached:
         # building=detached
         name: Detached House
@@ -4435,6 +4440,11 @@ en:
         # building=mosque
         name: Mosque Building
         terms: '<translate with synonyms or related terms for ''Mosque Building'', separated by commas>'
+      building/office:
+        # building=office
+        name: Office Building
+        # 'terms: business center,office block'
+        terms: '<translate with synonyms or related terms for ''Office Building'', separated by commas>'
       building/pavilion:
         # building=pavilion
         name: Pavilion Building
@@ -4493,6 +4503,11 @@ en:
         name: Static Mobile Home
         # 'terms: house trailer,manufactured home,mobile home,prefabricated home,residential caravan,static caravan,trailer home'
         terms: '<translate with synonyms or related terms for ''Static Mobile Home'', separated by commas>'
+      building/sty:
+        # building=sty
+        name: Pigsty
+        # 'terms: hog parlor,hog pen,pig ark,pig barn,pig parlor,pig pen,pig shed,pig shelter,pig-cote,piggery,pigpen,pigshed,sty'
+        terms: '<translate with synonyms or related terms for ''Pigsty'', separated by commas>'
       building/temple:
         # building=temple
         name: Temple Building
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 703038e1c..192f777fe 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -347,6 +347,7 @@
   "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/cowshed": {"icon": "temaki-barn", "geometry": ["area"], "tags": {"building": "cowshed"}, "matchScore": 0.5, "terms": ["byre", "cow barn", "cow house", "cow shed", "cowbarn", "cowhouse", "dairy barn", "milking barn"], "name": "Cowshed"},
   "building/detached": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "detached"}, "terms": ["home", "single", "family", "residence", "dwelling"], "matchScore": 0.5, "name": "Detached House"},
   "building/dormitory": {"icon": "maki-building", "fields": ["{building}", "smoking"], "geometry": ["area"], "tags": {"building": "dormitory"}, "matchScore": 0.5, "name": "Dormitory"},
   "building/farm_auxiliary": {"icon": "maki-farm", "geometry": ["area"], "tags": {"building": "farm_auxiliary"}, "terms": ["agriculture", "auxilary", "chicken coop", "farm auxiliary", "pigsty", "sty"], "matchScore": 0.5, "name": "Farm Building"},
@@ -364,6 +365,7 @@
   "building/industrial": {"icon": "maki-industry", "geometry": ["area"], "tags": {"building": "industrial"}, "matchScore": 0.5, "name": "Industrial 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/office": {"icon": "maki-suitcase", "fields": ["{building}", "smoking"], "geometry": ["area"], "tags": {"building": "office"}, "matchScore": 0.5, "terms": ["business center", "office block"], "name": "Office 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"},
@@ -377,6 +379,7 @@
   "building/stable": {"icon": "temaki-horse_shelter", "geometry": ["area"], "tags": {"building": "stable"}, "terms": ["horse shelter"], "matchScore": 0.5, "name": "Stable"},
   "building/stadium": {"icon": "maki-stadium", "fields": ["{building}", "smoking"], "geometry": ["area"], "tags": {"building": "stadium"}, "matchScore": 0.5, "name": "Stadium Building"},
   "building/static_caravan": {"icon": "temaki-manufactured_home", "geometry": ["area"], "tags": {"building": "static_caravan"}, "terms": ["house trailer", "manufactured home", "mobile home", "prefabricated home", "residential caravan", "static caravan", "trailer home"], "matchScore": 0.5, "name": "Static Mobile Home"},
+  "building/sty": {"icon": "temaki-barn", "geometry": ["area"], "tags": {"building": "sty"}, "matchScore": 0.5, "terms": ["hog parlor", "hog pen", "pig ark", "pig barn", "pig parlor", "pig pen", "pig shed", "pig shelter", "pig-cote", "piggery", "pigpen", "pigshed", "sty"], "name": "Pigsty"},
   "building/temple": {"icon": "maki-place-of-worship", "geometry": ["area"], "tags": {"building": "temple"}, "matchScore": 0.5, "name": "Temple Building"},
   "building/terrace": {"icon": "temaki-row_houses", "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"},
diff --git a/data/presets/presets/building/cowshed.json b/data/presets/presets/building/cowshed.json
new file mode 100644
index 000000000..34f8d115d
--- /dev/null
+++ b/data/presets/presets/building/cowshed.json
@@ -0,0 +1,21 @@
+{
+    "icon": "temaki-barn",
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "building": "cowshed"
+    },
+    "matchScore": 0.5,
+    "terms": [
+        "byre",
+        "cow barn",
+        "cow house",
+        "cow shed",
+        "cowbarn",
+        "cowhouse",
+        "dairy barn",
+        "milking barn"
+    ],
+    "name": "Cowshed"
+}
diff --git a/data/presets/presets/building/office.json b/data/presets/presets/building/office.json
new file mode 100644
index 000000000..06d76a089
--- /dev/null
+++ b/data/presets/presets/building/office.json
@@ -0,0 +1,19 @@
+{
+    "icon": "maki-suitcase",
+    "fields": [
+        "{building}",
+        "smoking"
+    ],
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "building": "office"
+    },
+    "matchScore": 0.5,
+    "terms": [
+        "business center",
+        "office block"
+    ],
+    "name": "Office Building"
+}
diff --git a/data/presets/presets/building/sty.json b/data/presets/presets/building/sty.json
new file mode 100644
index 000000000..a79930615
--- /dev/null
+++ b/data/presets/presets/building/sty.json
@@ -0,0 +1,26 @@
+{
+    "icon": "temaki-barn",
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "building": "sty"
+    },
+    "matchScore": 0.5,
+    "terms": [
+        "hog parlor",
+        "hog pen",
+        "pig ark",
+        "pig barn",
+        "pig parlor",
+        "pig pen",
+        "pig shed",
+        "pig shelter",
+        "pig-cote",
+        "piggery",
+        "pigpen",
+        "pigshed",
+        "sty"
+    ],
+    "name": "Pigsty"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 3b760b870..7a076b9ea 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -343,6 +343,7 @@
     {"key": "building", "value": "college", "description": "🄿 College Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/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": "cowshed", "description": "🄿 Cowshed", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/barn.svg"},
     {"key": "building", "value": "detached", "description": "🄿 Detached House", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/home-15.svg"},
     {"key": "building", "value": "dormitory", "description": "🄿 Dormitory", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
     {"key": "building", "value": "farm_auxiliary", "description": "🄿 Farm Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/farm-15.svg"},
@@ -360,6 +361,7 @@
     {"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/openstreetmap/iD@develop/svg/fontawesome/fas-school.svg"},
     {"key": "building", "value": "mosque", "description": "🄿 Mosque Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-mosque.svg"},
+    {"key": "building", "value": "office", "description": "🄿 Office Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.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"},
@@ -373,6 +375,7 @@
     {"key": "building", "value": "stable", "description": "🄿 Stable", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/horse_shelter.svg"},
     {"key": "building", "value": "stadium", "description": "🄿 Stadium Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/stadium-15.svg"},
     {"key": "building", "value": "static_caravan", "description": "🄿 Static Mobile Home", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/manufactured_home.svg"},
+    {"key": "building", "value": "sty", "description": "🄿 Pigsty", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/barn.svg"},
     {"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/ideditor/temaki/icons/row_houses.svg"},
     {"key": "building", "value": "transportation", "description": "🄿 Transportation Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 01547ea70..0c49b56db 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -6338,6 +6338,10 @@
                     "name": "Building Under Construction",
                     "terms": ""
                 },
+                "building/cowshed": {
+                    "name": "Cowshed",
+                    "terms": "byre,cow barn,cow house,cow shed,cowbarn,cowhouse,dairy barn,milking barn"
+                },
                 "building/detached": {
                     "name": "Detached House",
                     "terms": "home,single,family,residence,dwelling"
@@ -6406,6 +6410,10 @@
                     "name": "Mosque Building",
                     "terms": ""
                 },
+                "building/office": {
+                    "name": "Office Building",
+                    "terms": "business center,office block"
+                },
                 "building/pavilion": {
                     "name": "Pavilion Building",
                     "terms": "sports"
@@ -6458,6 +6466,10 @@
                     "name": "Static Mobile Home",
                     "terms": "house trailer,manufactured home,mobile home,prefabricated home,residential caravan,static caravan,trailer home"
                 },
+                "building/sty": {
+                    "name": "Pigsty",
+                    "terms": "hog parlor,hog pen,pig ark,pig barn,pig parlor,pig pen,pig shed,pig shelter,pig-cote,piggery,pigpen,pigshed,sty"
+                },
                 "building/temple": {
                     "name": "Temple Building",
                     "terms": ""