diff --git a/icons/castle.json b/icons/castle.json
new file mode 100644
index 000000000..d25279f8b
--- /dev/null
+++ b/icons/castle.json
@@ -0,0 +1,15 @@
+{
+  "$schema": "../icon.schema.json",
+  "tags": [
+    "fortress",
+    "stronghold",
+    "palace",
+    "chateau",
+    "building"
+  ],
+  "categories": [
+    "buildings",
+    "gaming",
+    "maps"
+  ]
+}
diff --git a/icons/castle.svg b/icons/castle.svg
new file mode 100644
index 000000000..d31df7391
--- /dev/null
+++ b/icons/castle.svg
@@ -0,0 +1,21 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="M22 20v-9H2v9a2 2 0 0 0 2 2h16a2 2 0 0 0 2-2Z" />
+  <path d="M18 11V4H6v7" />
+  <path d="M15 22v-4a3 3 0 0 0-3-3v0a3 3 0 0 0-3 3v4" />
+  <path d="M22 11V9" />
+  <path d="M2 11V9" />
+  <path d="M6 4V2" />
+  <path d="M18 4V2" />
+  <path d="M10 4V2" />
+  <path d="M14 4V2" />
+</svg>
diff --git a/icons/church.json b/icons/church.json
new file mode 100644
index 000000000..f7c95edfe
--- /dev/null
+++ b/icons/church.json
@@ -0,0 +1,11 @@
+{
+  "$schema": "../icon.schema.json",
+  "tags": [
+    "temple",
+    "building"
+  ],
+  "categories": [
+    "buildings",
+    "maps"
+  ]
+}
diff --git a/icons/church.svg b/icons/church.svg
new file mode 100644
index 000000000..deeeb6e75
--- /dev/null
+++ b/icons/church.svg
@@ -0,0 +1,17 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="m18 7 4 2v11a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V9l4-2" />
+  <path d="M14 22v-4a2 2 0 0 0-2-2v0a2 2 0 0 0-2 2v4" />
+  <path d="M18 22V5l-6-3-6 3v17" />
+  <path d="M12 7v5" />
+  <path d="M10 9h4" />
+</svg>
diff --git a/icons/hotel.json b/icons/hotel.json
new file mode 100644
index 000000000..6b7f38258
--- /dev/null
+++ b/icons/hotel.json
@@ -0,0 +1,14 @@
+{
+  "$schema": "../icon.schema.json",
+  "tags": [
+    "building",
+    "hostel",
+    "motel",
+    "inn"
+  ],
+  "categories": [
+    "buildings",
+    "maps",
+    "travel"
+  ]
+}
diff --git a/icons/hotel.svg b/icons/hotel.svg
new file mode 100644
index 000000000..c715eb9f6
--- /dev/null
+++ b/icons/hotel.svg
@@ -0,0 +1,21 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="M18 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V4a2 2 0 0 0-2-2Z" />
+  <path d="m9 16 .348-.24c1.465-1.013 3.84-1.013 5.304 0L15 16" />
+  <path d="M8 7h.01" />
+  <path d="M16 7h.01" />
+  <path d="M12 7h.01" />
+  <path d="M12 11h.01" />
+  <path d="M16 11h.01" />
+  <path d="M8 11h.01" />
+  <path d="M10 22v-6.5m4 0V22" />
+</svg>
diff --git a/icons/school-2.json b/icons/school-2.json
new file mode 100644
index 000000000..946f5b43d
--- /dev/null
+++ b/icons/school-2.json
@@ -0,0 +1,13 @@
+{
+  "$schema": "../icon.schema.json",
+  "tags": [
+    "building",
+    "education",
+    "childhood",
+    "university"
+  ],
+  "categories": [
+    "buildings",
+    "maps"
+  ]
+}
diff --git a/icons/school-2.svg b/icons/school-2.svg
new file mode 100644
index 000000000..9c0c0b081
--- /dev/null
+++ b/icons/school-2.svg
@@ -0,0 +1,19 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <circle cx="12" cy="10" r="1" />
+  <path d="M22 20V8h-4l-6-4-6 4H2v12a2 2 0 0 0 2 2h16a2 2 0 0 0 2-2Z" />
+  <path d="M6 17v.01" />
+  <path d="M6 13v.01" />
+  <path d="M18 17v.01" />
+  <path d="M18 13v.01" />
+  <path d="M14 22v-5a2 2 0 0 0-2-2v0a2 2 0 0 0-2 2v5" />
+</svg>
diff --git a/icons/school.json b/icons/school.json
new file mode 100644
index 000000000..946f5b43d
--- /dev/null
+++ b/icons/school.json
@@ -0,0 +1,13 @@
+{
+  "$schema": "../icon.schema.json",
+  "tags": [
+    "building",
+    "education",
+    "childhood",
+    "university"
+  ],
+  "categories": [
+    "buildings",
+    "maps"
+  ]
+}
diff --git a/icons/school.svg b/icons/school.svg
new file mode 100644
index 000000000..fed884dbb
--- /dev/null
+++ b/icons/school.svg
@@ -0,0 +1,18 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="m4 6 8-4 8 4" />
+  <path d="m18 10 4 2v8a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2v-8l4-2" />
+  <path d="M14 22v-4a2 2 0 0 0-2-2v0a2 2 0 0 0-2 2v4" />
+  <path d="M18 5v17" />
+  <path d="M6 5v17" />
+  <circle cx="12" cy="9" r="2" />
+</svg>
diff --git a/icons/store.json b/icons/store.json
new file mode 100644
index 000000000..a5adbfaf1
--- /dev/null
+++ b/icons/store.json
@@ -0,0 +1,14 @@
+{
+  "$schema": "../icon.schema.json",
+  "tags": [
+    "shop",
+    "supermarket",
+    "stand",
+    "boutique",
+    "building"
+  ],
+  "categories": [
+    "buildings",
+    "maps"
+  ]
+}
diff --git a/icons/store.svg b/icons/store.svg
new file mode 100644
index 000000000..92c29622a
--- /dev/null
+++ b/icons/store.svg
@@ -0,0 +1,17 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="m2 7 4.41-4.41A2 2 0 0 1 7.83 2h8.34a2 2 0 0 1 1.42.59L22 7"/>
+  <path d="M4 12v8a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2v-8"/>
+  <path d="M15 22v-4a2 2 0 0 0-2-2h-2a2 2 0 0 0-2 2v4"/>
+  <path d="M2 7h20"/>
+  <path d="M22 7v3a2 2 0 0 1-2 2v0a2.7 2.7 0 0 1-1.59-.63.7.7 0 0 0-.82 0A2.7 2.7 0 0 1 16 12a2.7 2.7 0 0 1-1.59-.63.7.7 0 0 0-.82 0A2.7 2.7 0 0 1 12 12a2.7 2.7 0 0 1-1.59-.63.7.7 0 0 0-.82 0A2.7 2.7 0 0 1 8 12a2.7 2.7 0 0 1-1.59-.63.7.7 0 0 0-.82 0A2.7 2.7 0 0 1 4 12v0a2 2 0 0 1-2-2V7"/>
+</svg>
diff --git a/icons/warehouse.json b/icons/warehouse.json
new file mode 100644
index 000000000..746e55c19
--- /dev/null
+++ b/icons/warehouse.json
@@ -0,0 +1,12 @@
+{
+  "$schema": "../icon.schema.json",
+  "tags": [
+    "storage",
+    "logistics",
+    "building"
+  ],
+  "categories": [
+    "buildings",
+    "maps"
+  ]
+}
diff --git a/icons/warehouse.svg b/icons/warehouse.svg
new file mode 100644
index 000000000..9074b3412
--- /dev/null
+++ b/icons/warehouse.svg
@@ -0,0 +1,16 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  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" />
+</svg>