diff --git a/.gitignore b/.gitignore
index 74f7d8fb0..6e4a2ea9c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 .next
 .obsidian
 .now
+.idea
 node_modules
 dist
 build
diff --git a/icons/lamp-ceiling.svg b/icons/lamp-ceiling.svg
new file mode 100644
index 000000000..8673f7352
--- /dev/null
+++ b/icons/lamp-ceiling.svg
@@ -0,0 +1,15 @@
+<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="M12 2v5" />
+  <path d="M6 7h12l4 9H2l4-9Z" />
+  <path d="M9.17 16a3 3 0 1 0 5.66 0" />
+</svg>
diff --git a/icons/lamp-desk.svg b/icons/lamp-desk.svg
new file mode 100644
index 000000000..536a803a4
--- /dev/null
+++ b/icons/lamp-desk.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="m14 5-3 3 2 7 8-8-7-2Z" />
+  <path d="m14 5-3 3-3-3 3-3 3 3Z" />
+  <path d="M9.5 6.5 4 12l3 6" />
+  <path d="M3 22v-2c0-1.1.9-2 2-2h4a2 2 0 0 1 2 2v2H3Z" />
+</svg>
diff --git a/icons/lamp-floor.svg b/icons/lamp-floor.svg
new file mode 100644
index 000000000..a05143988
--- /dev/null
+++ b/icons/lamp-floor.svg
@@ -0,0 +1,15 @@
+<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="M9 2h6l3 7H6l3-7Z" />
+  <path d="M12 9v13" />
+  <path d="M9 22h6" />
+</svg>
diff --git a/icons/lamp-wall-down.svg b/icons/lamp-wall-down.svg
new file mode 100644
index 000000000..2197096ed
--- /dev/null
+++ b/icons/lamp-wall-down.svg
@@ -0,0 +1,15 @@
+<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="M11 13h6l3 7H8l3-7Z" />
+  <path d="M14 13V8a2 2 0 0 0-2-2H8" />
+  <path d="M4 9h2a2 2 0 0 0 2-2V5a2 2 0 0 0-2-2H4v6Z" />
+</svg>
diff --git a/icons/lamp-wall-up.svg b/icons/lamp-wall-up.svg
new file mode 100644
index 000000000..b3f1a3e92
--- /dev/null
+++ b/icons/lamp-wall-up.svg
@@ -0,0 +1,15 @@
+<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="M11 4h6l3 7H8l3-7Z" />
+  <path d="M14 11v5a2 2 0 0 1-2 2H8" />
+  <path d="M4 15h2a2 2 0 0 1 2 2v2a2 2 0 0 1-2 2H4v-6Z" />
+</svg>
diff --git a/icons/lamp.svg b/icons/lamp.svg
new file mode 100644
index 000000000..4c0a674c5
--- /dev/null
+++ b/icons/lamp.svg
@@ -0,0 +1,15 @@
+<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="M8 2h8l4 10H4L8 2Z" />
+  <path d="M12 12v6" />
+  <path d="M8 22v-2c0-1.1.9-2 2-2h4a2 2 0 0 1 2 2v2H8Z" />
+</svg>
diff --git a/tags.json b/tags.json
index 9a0a14420..8a220c135 100644
--- a/tags.json
+++ b/tags.json
@@ -1705,6 +1705,47 @@
     "settings",
     "mouse"
   ],
+  "lamp": [
+    "lighting",
+    "household",
+    "home",
+    "furniture"
+  ],
+  "lamp-ceiling": [
+    "lighting",
+    "household",
+    "home",
+    "furniture"
+  ],
+  "lamp-desk": [
+    "lighting",
+    "household",
+    "office",
+    "desk",
+    "home",
+    "furniture"
+  ],
+  "lamp-floor": [
+    "lighting",
+    "household",
+    "floor",      
+    "home",
+    "furniture"
+  ],
+  "lamp-wall-down": [
+    "lighting",
+    "household",
+    "wall",
+    "home",
+    "furniture"
+  ],
+  "lamp-wall-up": [
+    "lighting",
+    "household",
+    "wall",
+    "home",
+    "furniture"
+  ],
   "landmark": [
     "bank",
     "building",