diff --git a/icons/bolt.json b/icons/bolt.json
new file mode 100644
index 000000000..4a2092e6f
--- /dev/null
+++ b/icons/bolt.json
@@ -0,0 +1,22 @@
+{
+  "$schema": "../icon.schema.json",
+  "tags": [
+    "nut",
+    "screw",
+    "settings",
+    "preferences",
+    "configuration",
+    "controls",
+    "edit",
+    "diy",
+    "fixed",
+    "build",
+    "contruction",
+    "parts"
+  ],
+  "categories": [
+    "account",
+    "tools",
+    "home"
+  ]
+}
\ No newline at end of file
diff --git a/icons/bolt.svg b/icons/bolt.svg
new file mode 100644
index 000000000..303b8681c
--- /dev/null
+++ b/icons/bolt.svg
@@ -0,0 +1,14 @@
+<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="M21 16V8a2 2 0 0 0-1-1.73l-7-4a2 2 0 0 0-2 0l-7 4A2 2 0 0 0 3 8v8a2 2 0 0 0 1 1.73l7 4a2 2 0 0 0 2 0l7-4A2 2 0 0 0 21 16z" />
+  <circle cx="12" cy="12" r="4" />
+</svg>
diff --git a/icons/drill.json b/icons/drill.json
new file mode 100644
index 000000000..c06da8468
--- /dev/null
+++ b/icons/drill.json
@@ -0,0 +1,21 @@
+{
+  "$schema": "../icon.schema.json",
+  "contributors": [
+    "danielbayley"
+  ],
+  "tags": [
+    "power",
+    "bit",
+    "head",
+    "hole",
+    "diy",
+    "toolbox",
+    "build",
+    "construction"
+  ],
+  "categories": [
+    "tools",
+    "home",
+    "devices"
+  ]
+}
\ No newline at end of file
diff --git a/icons/drill.svg b/icons/drill.svg
new file mode 100644
index 000000000..b20ba5dad
--- /dev/null
+++ b/icons/drill.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"
+>
+  <path d="M14 9c0 .6-.4 1-1 1H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9c.6 0 1 .4 1 1Z" />
+  <path d="M18 6h4" />
+  <path d="M14 4h3a1 1 0 0 1 1 1v2a1 1 0 0 1-1 1h-3" />
+  <path d="m5 10-2 8" />
+  <path d="M12 10v3c0 .6-.4 1-1 1H8" />
+  <path d="m7 18 2-8" />
+  <path d="M5 22c-1.7 0-3-1.3-3-3 0-.6.4-1 1-1h7c.6 0 1 .4 1 1v2c0 .6-.4 1-1 1Z" />
+</svg>
diff --git a/icons/hammer.json b/icons/hammer.json
index d3b684477..408812ba9 100644
--- a/icons/hammer.json
+++ b/icons/hammer.json
@@ -5,9 +5,15 @@
     "ericfennis"
   ],
   "tags": [
-    "mallet"
+    "mallet",
+    "nails",
+    "diy",
+    "toolbox",
+    "build",
+    "construction"
   ],
   "categories": [
-    "tools"
+    "tools",
+    "home"
   ]
 }
\ No newline at end of file
diff --git a/icons/wrench.json b/icons/wrench.json
index 74caf197d..1560f140b 100644
--- a/icons/wrench.json
+++ b/icons/wrench.json
@@ -7,13 +7,17 @@
   ],
   "tags": [
     "account",
-    "tool",
     "settings",
-    "spanner"
+    "spanner",
+    "diy",
+    "toolbox",
+    "build",
+    "construction"
   ],
   "categories": [
     "account",
     "development",
-    "tools"
+    "tools",
+    "home"
   ]
 }
\ No newline at end of file