diff --git a/icons/warehouse.json b/icons/warehouse.json
index b9edd3243..e4cdc2017 100644
--- a/icons/warehouse.json
+++ b/icons/warehouse.json
@@ -5,6 +5,11 @@
   ],
   "tags": [
     "storage",
+    "storehouse",
+    "depot",
+    "depository",
+    "repository",
+    "stockroom",
     "logistics",
     "building"
   ],
diff --git a/icons/warehouse.svg b/icons/warehouse.svg
index 9074b3412..060b66f69 100644
--- a/icons/warehouse.svg
+++ b/icons/warehouse.svg
@@ -9,8 +9,8 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <path d="M22 8.35V20a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V8.35A2 2 0 0 1 3.26 6.5l8-3.2a2 2 0 0 1 1.48 0l8 3.2A2 2 0 0 1 22 8.35Z" />
-  <path d="M6 18h12" />
-  <path d="M6 14h12" />
-  <rect width="12" height="12" x="6" y="10" />
+  <path d="M18 21V10a1 1 0 0 0-1-1H7a1 1 0 0 0-1 1v11" />
+  <path d="M22 19a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V8a2 2 0 0 1 1.132-1.803l7.95-3.974a2 2 0 0 1 1.837 0l7.948 3.974A2 2 0 0 1 22 8z" />
+  <path d="M6 13h12" />
+  <path d="M6 17h12" />
 </svg>