diff --git a/data/presets/presets.json b/data/presets/presets.json
index 4d4d759ed..a35cc220c 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -4855,7 +4855,7 @@
             "name": "Farm House"
         },
         "building/garage": {
-            "icon": "maki-warehouse",
+            "icon": "fas-warehouse",
             "fields": [
                 "name",
                 "capacity"
@@ -4870,7 +4870,7 @@
             "name": "Garage"
         },
         "building/garages": {
-            "icon": "maki-warehouse",
+            "icon": "fas-warehouse",
             "fields": [
                 "name",
                 "capacity"
@@ -8950,6 +8950,7 @@
             "name": "Forest"
         },
         "landuse/garages": {
+            "icon": "fas-warehouse",
             "geometry": [
                 "area"
             ],
diff --git a/data/presets/presets/building/garage.json b/data/presets/presets/building/garage.json
index 552b84ea6..8cc77f8b5 100644
--- a/data/presets/presets/building/garage.json
+++ b/data/presets/presets/building/garage.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-warehouse",
+    "icon": "fas-warehouse",
     "fields": [
         "name",
         "capacity"
diff --git a/data/presets/presets/building/garages.json b/data/presets/presets/building/garages.json
index 219ddec93..79a6d7933 100644
--- a/data/presets/presets/building/garages.json
+++ b/data/presets/presets/building/garages.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-warehouse",
+    "icon": "fas-warehouse",
     "fields": [
         "name",
         "capacity"
diff --git a/data/presets/presets/landuse/garages.json b/data/presets/presets/landuse/garages.json
index 72575fdd9..00e78d4bc 100644
--- a/data/presets/presets/landuse/garages.json
+++ b/data/presets/presets/landuse/garages.json
@@ -1,4 +1,5 @@
 {
+    "icon": "fas-warehouse",
     "geometry": [
         "area"
     ],
diff --git a/data/taginfo.json b/data/taginfo.json
index ca6a6e0bf..883910bf9 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -2132,7 +2132,7 @@
             "object_types": [
                 "area"
             ],
-            "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/warehouse-15.svg?sanitize=true"
+            "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-warehouse.svg?sanitize=true"
         },
         {
             "key": "building",
@@ -2141,7 +2141,7 @@
             "object_types": [
                 "area"
             ],
-            "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/warehouse-15.svg?sanitize=true"
+            "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-warehouse.svg?sanitize=true"
         },
         {
             "key": "building",
@@ -3920,7 +3920,8 @@
             "description": "Garage Landuse",
             "object_types": [
                 "area"
-            ]
+            ],
+            "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-warehouse.svg?sanitize=true"
         },
         {
             "key": "landuse",
diff --git a/svg/fontawesome/fas-warehouse.svg b/svg/fontawesome/fas-warehouse.svg
new file mode 100644
index 000000000..c246f37ee
--- /dev/null
+++ b/svg/fontawesome/fas-warehouse.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" data-prefix="fas" data-icon="warehouse" class="svg-inline--fa fa-warehouse fa-w-20" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><path fill="currentColor" d="M504 352H136.4c-4.4 0-8 3.6-8 8l-.1 48c0 4.4 3.6 8 8 8H504c4.4 0 8-3.6 8-8v-48c0-4.4-3.6-8-8-8zm0 96H136.1c-4.4 0-8 3.6-8 8l-.1 48c0 4.4 3.6 8 8 8h368c4.4 0 8-3.6 8-8v-48c0-4.4-3.6-8-8-8zm0-192H136.6c-4.4 0-8 3.6-8 8l-.1 48c0 4.4 3.6 8 8 8H504c4.4 0 8-3.6 8-8v-48c0-4.4-3.6-8-8-8zm106.5-139L338.4 3.7a48.15 48.15 0 0 0-36.9 0L29.5 117C11.7 124.5 0 141.9 0 161.3V504c0 4.4 3.6 8 8 8h80c4.4 0 8-3.6 8-8V256c0-17.6 14.6-32 32.6-32h382.8c18 0 32.6 14.4 32.6 32v248c0 4.4 3.6 8 8 8h80c4.4 0 8-3.6 8-8V161.3c0-19.4-11.7-36.8-29.5-44.3z"></path></svg>
\ No newline at end of file