diff --git a/icons/faucet.json b/icons/faucet.json
new file mode 100644
index 000000000..76e39c06d
--- /dev/null
+++ b/icons/faucet.json
@@ -0,0 +1,43 @@
+{
+  "$schema": "../icon.schema.json",
+  "contributors": [
+    "danielbayley",
+    "karsa-mistmere"
+  ],
+  "use-cases": [
+    "Indicating water sources on maps",
+    "Controlling faucets in smart home apps",
+    "Representing kitchen or bathroom plumbing fixtures",
+    "Showing drinking water amenities in travel apps"
+  ],
+  "tags": [
+    "tap",
+    "spigot",
+    "water",
+    "drinking",
+    "fresh",
+    "source",
+    "pipes",
+    "plumbing",
+    "plumber",
+    "sink",
+    "basin",
+    "kitchen",
+    "bathroom",
+    "washroom",
+    "fixture",
+    "valve",
+    "flow",
+    "drinkable",
+    "potable",
+    "amenities",
+    "utilities",
+    "hydration"
+  ],
+  "categories": [
+    "food-beverage",
+    "home",
+    "navigation",
+    "travel"
+  ]
+}
diff --git a/icons/faucet.svg b/icons/faucet.svg
new file mode 100644
index 000000000..c0e5ec8c1
--- /dev/null
+++ b/icons/faucet.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="M10.083 5.428 5.57 4.083a2 2 0 10.001 3.834l4.512-1.345" />
+  <path d="M12 8v3" />
+  <path d="m13.917 5.428 4.511-1.345a2 2 0 110 3.834l-4.51-1.345" />
+  <path d="M18 17v-4.006" />
+  <path d="M22 11v8" />
+  <path d="M22 12h-3a1 1 0 00-1 .994h-2.539a4 4 0 00-6.915-.012L7 13a5 5 0 00-5 5v1a1 1 0 001 1h2a1 1 0 001-1v-1a1 1 0 01.995-1l1.552.018a4 4 0 006.907 0L18 17a1 1 0 001 1h3" />
+  <circle cx="12" cy="6" r="2" />
+</svg>
diff --git a/lab/faucet.json b/lab/faucet.json
deleted file mode 100644
index dcf87a692..000000000
--- a/lab/faucet.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "$schema": "../icon.schema.json",
-  "contributors": [
-    "danielbayley"
-  ],
-  "tags": [
-    "tap",
-    "spigot",
-    "water",
-    "drinking",
-    "fresh",
-    "source",
-    "pipes",
-    "plumbing",
-    "plumber"
-  ],
-  "categories": [
-    "food-beverage",
-    "home",
-    "maps"
-  ]
-}
diff --git a/lab/faucet.svg b/lab/faucet.svg
deleted file mode 100644
index fb75be81b..000000000
--- a/lab/faucet.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<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="M10.22 4.9 5.4 6H5a2 2 0 0 1 0-4h.4l4.86 1" />
-  <circle cx="12" cy="4" r="2" />
-  <path d="m13.78 4.9 4.8 1h.4a2 2 0 0 0 0-4h-.4l-4.92 1" />
-  <path d="M12 6v3" />
-  <rect width="4" height="6" x="18" y="10" />
-  <path d="M22 9v8" />
-  <path d="M18 11h-2.6a3.87 3.87 0 0 0-6.8 0H7c-2.8 0-5 2.2-5 5v1h4v-1c0-.6.4-1 1-1h1.6a3.87 3.87 0 0 0 6.8 0H18" />
-  <path d="M3.5 17S2 19 2 20a2 2 0 0 0 4 0c0-1-1.5-3-1.5-3" />
-</svg>