diff --git a/icons/cigarette-off.json b/icons/cigarette-off.json
index bb1ef2494..aaf8a9f7f 100644
--- a/icons/cigarette-off.json
+++ b/icons/cigarette-off.json
@@ -2,7 +2,8 @@
   "$schema": "../icon.schema.json",
   "contributors": [
     "karsa-mistmere",
-    "ericfennis"
+    "ericfennis",
+    "jguddas"
   ],
   "tags": [
     "smoking",
diff --git a/icons/cigarette-off.svg b/icons/cigarette-off.svg
index 03b267536..85b0d3e8c 100644
--- a/icons/cigarette-off.svg
+++ b/icons/cigarette-off.svg
@@ -9,11 +9,10 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <line x1="2" x2="22" y1="2" y2="22" />
-  <path d="M12 12H2v4h14" />
-  <path d="M22 12v4" />
-  <path d="M18 12h-.5" />
-  <path d="M7 12v4" />
+  <path d="M12 12H3a1 1 0 0 0-1 1v2a1 1 0 0 0 1 1h13" />
   <path d="M18 8c0-2.5-2-2.5-2-5" />
+  <path d="m2 2 20 20" />
+  <path d="M21 12a1 1 0 0 1 1 1v2a1 1 0 0 1-.5.866" />
   <path d="M22 8c0-2.5-2-2.5-2-5" />
+  <path d="M7 12v4" />
 </svg>
diff --git a/icons/cigarette.json b/icons/cigarette.json
index 80b39c43c..63ecc09cc 100644
--- a/icons/cigarette.json
+++ b/icons/cigarette.json
@@ -2,7 +2,8 @@
   "$schema": "../icon.schema.json",
   "contributors": [
     "karsa-mistmere",
-    "ericfennis"
+    "ericfennis",
+    "jguddas"
   ],
   "tags": [
     "smoking"
diff --git a/icons/cigarette.svg b/icons/cigarette.svg
index eade38501..3a798f178 100644
--- a/icons/cigarette.svg
+++ b/icons/cigarette.svg
@@ -9,9 +9,9 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <path d="M18 12H2v4h16" />
-  <path d="M22 12v4" />
-  <path d="M7 12v4" />
+  <path d="M17 12H3a1 1 0 0 0-1 1v2a1 1 0 0 0 1 1h14" />
   <path d="M18 8c0-2.5-2-2.5-2-5" />
+  <path d="M21 16a1 1 0 0 0 1-1v-2a1 1 0 0 0-1-1" />
   <path d="M22 8c0-2.5-2-2.5-2-5" />
+  <path d="M7 12v4" />
 </svg>