diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index a669921d65..efe66440bf 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -21,14 +21,21 @@ jobs:
         uses: tj-actions/changed-files@v35
         with:
           files: icons/*
-      - uses: actions/setup-node@v3.8.1
-      - name: Install simple-git (safer and faster than installing all deps)
-        run: npm install simple-git
-      - env:
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 8
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 18
+          cache: 'pnpm'
+      - name: Install deps
+        run: pnpm install --ignore-scripts
+      - name: Generate annotations
+        run: node ./scripts/updateContributors.mjs
+        env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           FETCH_DEPTH: ${{ github.event.pull_request.commits }}
           CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}
-        run: node ./scripts/updateContributors.mjs
       - name: Generate annotations
         env:
           ANNOTATION_SEVERITY: notice
diff --git a/icons/alarm-smoke.json b/icons/alarm-smoke.json
new file mode 100644
index 0000000000..48c37d40a3
--- /dev/null
+++ b/icons/alarm-smoke.json
@@ -0,0 +1,21 @@
+{
+  "$schema": "../icon.schema.json",
+  "contributors": [
+    "danielbayley"
+  ],
+  "tags": [
+    "fire",
+    "alert",
+    "warning",
+    "detector",
+    "carbon monoxide",
+    "safety",
+    "equipment",
+    "amenities"
+  ],
+  "categories": [
+    "home",
+    "devices",
+    "travel"
+  ]
+}
\ No newline at end of file
diff --git a/icons/alarm-smoke.svg b/icons/alarm-smoke.svg
new file mode 100644
index 0000000000..701b039eda
--- /dev/null
+++ b/icons/alarm-smoke.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="M4 8a2 2 0 0 1-2-2V3h20v3a2 2 0 0 1-2 2Z" />
+  <path d="m19 8-.8 3c-.1.6-.6 1-1.2 1H7c-.6 0-1.1-.4-1.2-1L5 8" />
+  <path d="M16 21c0-2.5 2-2.5 2-5" />
+  <path d="M11 21c0-2.5 2-2.5 2-5" />
+  <path d="M6 21c0-2.5 2-2.5 2-5" />
+</svg>
diff --git a/icons/axe.json b/icons/axe.json
index 07dcfcce4a..01391c36a2 100644
--- a/icons/axe.json
+++ b/icons/axe.json
@@ -8,7 +8,18 @@
     "karsa-mistmere"
   ],
   "tags": [
-    "hatchet"
+    "hatchet",
+    "weapon",
+    "chop",
+    "sharp",
+    "equipment",
+    "fireman",
+    "firefighter",
+    "brigade",
+    "lumberjack",
+    "woodcutter",
+    "logger",
+    "forestry"
   ],
   "categories": [
     "tools",
diff --git a/icons/bell-electric.json b/icons/bell-electric.json
new file mode 100644
index 0000000000..9304dfdd88
--- /dev/null
+++ b/icons/bell-electric.json
@@ -0,0 +1,32 @@
+{
+  "$schema": "../icon.schema.json",
+  "contributors": [
+    "danielbayley"
+  ],
+  "tags": [
+    "fire alarm",
+    "flames",
+    "smoke",
+    "firefighter",
+    "fireman",
+    "department",
+    "brigade",
+    "station",
+    "emergency",
+    "alert",
+    "safety",
+    "school bell",
+    "period break",
+    "recess",
+    "doorbell",
+    "entrance",
+    "entry",
+    "ring",
+    "reception"
+  ],
+  "categories": [
+    "devices",
+    "notifications",
+    "home"
+  ]
+}
\ No newline at end of file
diff --git a/icons/bell-electric.svg b/icons/bell-electric.svg
new file mode 100644
index 0000000000..2fd1aa5dba
--- /dev/null
+++ b/icons/bell-electric.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="M18.8 4A6.3 8.7 0 0 1 20 9" />
+  <path d="M9 9h.01" />
+  <circle cx="9" cy="9" r="7" />
+  <rect width="10" height="6" x="4" y="16" rx="2" />
+  <path d="M14 19c3 0 4.6-1.6 4.6-1.6" />
+  <circle cx="20" cy="16" r="2" />
+</svg>
diff --git a/icons/cctv.json b/icons/cctv.json
new file mode 100644
index 0000000000..7155ea9074
--- /dev/null
+++ b/icons/cctv.json
@@ -0,0 +1,22 @@
+{
+  "$schema": "../icon.schema.json",
+  "contributors": [
+    "danielbayley"
+  ],
+  "tags": [
+    "camera",
+    "surveillance",
+    "recording",
+    "film",
+    "videotape",
+    "crime",
+    "watching"
+  ],
+  "categories": [
+    "security",
+    "devices",
+    "communication",
+    "connectivity",
+    "photography"
+  ]
+}
\ No newline at end of file
diff --git a/icons/cctv.svg b/icons/cctv.svg
new file mode 100644
index 0000000000..0ea6297069
--- /dev/null
+++ b/icons/cctv.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="M7 9h.01" />
+  <path d="M16.75 12H22l-3.5 7-3.09-4.32" />
+  <path d="M18 9.5l-4 8-10.39-5.2a2.92 2.92 0 0 1-1.3-3.91L3.69 5.6a2.92 2.92 0 0 1 3.92-1.3Z" />
+  <path d="M2 19h3.76a2 2 0 0 0 1.8-1.1L9 15" />
+  <path d="M2 21v-4" />
+</svg>
diff --git a/icons/fire-extinguisher.json b/icons/fire-extinguisher.json
new file mode 100644
index 0000000000..44b7f10932
--- /dev/null
+++ b/icons/fire-extinguisher.json
@@ -0,0 +1,32 @@
+{
+  "$schema": "../icon.schema.json",
+  "contributors": [
+    "danielbayley"
+  ],
+  "tags": [
+    "flames",
+    "smoke",
+    "foam",
+    "water",
+    "spray",
+    "hose",
+    "firefighter",
+    "fireman",
+    "department",
+    "brigade",
+    "station",
+    "emergency",
+    "suppress",
+    "compressed",
+    "tank",
+    "cylinder",
+    "safety",
+    "equipment",
+    "amenities"
+  ],
+  "categories": [
+    "home",
+    "tools",
+    "travel"
+  ]
+}
\ No newline at end of file
diff --git a/icons/fire-extinguisher.svg b/icons/fire-extinguisher.svg
new file mode 100644
index 0000000000..0ee8d11057
--- /dev/null
+++ b/icons/fire-extinguisher.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="M15 6.5V3a1 1 0 0 0-1-1h-2a1 1 0 0 0-1 1v3.5" />
+  <path d="M9 18h8" />
+  <path d="M18 3h-3" />
+  <path d="M11 3a6 6 0 0 0-6 6v11" />
+  <path d="M5 13h4" />
+  <path d="M17 10a4 4 0 0 0-8 0v10a2 2 0 0 0 2 2h4a2 2 0 0 0 2-2Z" />
+</svg>
diff --git a/icons/flame.json b/icons/flame.json
index e08a5f4d50..1f68cfb1de 100644
--- a/icons/flame.json
+++ b/icons/flame.json
@@ -7,7 +7,17 @@
   ],
   "tags": [
     "fire",
-    "lit"
+    "lit",
+    "burning",
+    "spark",
+    "embers",
+    "smoke",
+    "firefighter",
+    "fireman",
+    "department",
+    "brigade",
+    "station",
+    "emergency"
   ],
   "categories": [
     "weather",