diff --git a/icons/clipboard-pen-line.svg b/icons/clipboard-pen-line.svg
index fef6be762..8496a3878 100644
--- a/icons/clipboard-pen-line.svg
+++ b/icons/clipboard-pen-line.svg
@@ -13,5 +13,5 @@
   <path d="M8 4H6a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2v-.5" />
   <path d="M16 4h2a2 2 0 0 1 1.73 1" />
   <path d="M8 18h1" />
-  <path d="M18.4 9.6a2 2 0 0 1 3 3L17 17l-4 1 1-4Z" />
+  <path d="M21.378 12.626a1 1 0 0 0-3.004-3.004l-4.01 4.012a2 2 0 0 0-.506.854l-.837 2.87a.5.5 0 0 0 .62.62l2.87-.837a2 2 0 0 0 .854-.506z" />
 </svg>
diff --git a/icons/clipboard-pen.svg b/icons/clipboard-pen.svg
index 0af81acd3..ad20a0e5c 100644
--- a/icons/clipboard-pen.svg
+++ b/icons/clipboard-pen.svg
@@ -10,7 +10,7 @@
   stroke-linejoin="round"
 >
   <rect width="8" height="4" x="8" y="2" rx="1" />
-  <path d="M10.4 12.6a2 2 0 0 1 3 3L8 21l-4 1 1-4Z" />
   <path d="M16 4h2a2 2 0 0 1 2 2v14a2 2 0 0 1-2 2h-5.5" />
   <path d="M4 13.5V6a2 2 0 0 1 2-2h2" />
+  <path d="M13.378 15.626a1 1 0 1 0-3.004-3.004l-5.01 5.012a2 2 0 0 0-.506.854l-.837 2.87a.5.5 0 0 0 .62.62l2.87-.837a2 2 0 0 0 .854-.506z" />
 </svg>
diff --git a/icons/file-pen-line.svg b/icons/file-pen-line.svg
index 882cd0877..5c5d93ba5 100644
--- a/icons/file-pen-line.svg
+++ b/icons/file-pen-line.svg
@@ -9,7 +9,7 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <path d="m18 5-3-3H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2" />
+  <path d="m18 5-2.414-2.414A2 2 0 0 0 14.172 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2" />
+  <path d="M21.378 12.626a1 1 0 0 0-3.004-3.004l-4.01 4.012a2 2 0 0 0-.506.854l-.837 2.87a.5.5 0 0 0 .62.62l2.87-.837a2 2 0 0 0 .854-.506z" />
   <path d="M8 18h1" />
-  <path d="M18.4 9.6a2 2 0 1 1 3 3L17 17l-4 1 1-4Z" />
 </svg>
diff --git a/icons/file-pen.svg b/icons/file-pen.svg
index 62e51856e..e9e46cf4c 100644
--- a/icons/file-pen.svg
+++ b/icons/file-pen.svg
@@ -9,7 +9,7 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <path d="M12 22h6a2 2 0 0 0 2-2V7l-5-5H6a2 2 0 0 0-2 2v10" />
+  <path d="M12.5 22H18a2 2 0 0 0 2-2V7l-5-5H6a2 2 0 0 0-2 2v9.5" />
   <path d="M14 2v4a2 2 0 0 0 2 2h4" />
-  <path d="M10.4 12.6a2 2 0 1 1 3 3L8 21l-4 1 1-4Z" />
+  <path d="M13.378 15.626a1 1 0 1 0-3.004-3.004l-5.01 5.012a2 2 0 0 0-.506.854l-.837 2.87a.5.5 0 0 0 .62.62l2.87-.837a2 2 0 0 0 .854-.506z" />
 </svg>
diff --git a/icons/folder-pen.svg b/icons/folder-pen.svg
index 6f3f1b7d7..9f8373762 100644
--- a/icons/folder-pen.svg
+++ b/icons/folder-pen.svg
@@ -9,6 +9,6 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <path d="M8.4 10.6a2 2 0 0 1 3 3L6 19l-4 1 1-4Z" />
   <path d="M2 11.5V5a2 2 0 0 1 2-2h3.9c.7 0 1.3.3 1.7.9l.8 1.2c.4.6 1 .9 1.7.9H20a2 2 0 0 1 2 2v10a2 2 0 0 1-2 2h-9.5" />
+  <path d="M11.378 13.626a1 1 0 1 0-3.004-3.004l-5.01 5.012a2 2 0 0 0-.506.854l-.837 2.87a.5.5 0 0 0 .62.62l2.87-.837a2 2 0 0 0 .854-.506z" />
 </svg>
diff --git a/icons/notebook-pen.svg b/icons/notebook-pen.svg
index 7b7da3311..b90c54bf8 100644
--- a/icons/notebook-pen.svg
+++ b/icons/notebook-pen.svg
@@ -14,5 +14,5 @@
   <path d="M2 10h4" />
   <path d="M2 14h4" />
   <path d="M2 18h4" />
-  <path d="M18.4 2.6a2.17 2.17 0 0 1 3 3L16 11l-4 1 1-4Z" />
+  <path d="M21.378 5.626a1 1 0 1 0-3.004-3.004l-5.01 5.012a2 2 0 0 0-.506.854l-.837 2.87a.5.5 0 0 0 .62.62l2.87-.837a2 2 0 0 0 .854-.506z" />
 </svg>
diff --git a/icons/pen-line.json b/icons/pen-line.json
index 366bc5808..6be7b3a61 100644
--- a/icons/pen-line.json
+++ b/icons/pen-line.json
@@ -4,7 +4,8 @@
     "colebemis",
     "csandman",
     "mittalyashu",
-    "ericfennis"
+    "ericfennis",
+    "karsa-mistmere"
   ],
   "tags": [
     "pencil",
diff --git a/icons/pen-line.svg b/icons/pen-line.svg
index e99d3e374..5f98e66d9 100644
--- a/icons/pen-line.svg
+++ b/icons/pen-line.svg
@@ -10,5 +10,5 @@
   stroke-linejoin="round"
 >
   <path d="M12 20h9" />
-  <path d="M16.5 3.5a2.12 2.12 0 0 1 3 3L7 19l-4 1 1-4Z" />
+  <path d="M16.376 3.622a1 1 0 0 1 3.002 3.002L7.368 18.635a2 2 0 0 1-.855.506l-2.872.838a.5.5 0 0 1-.62-.62l.838-2.872a2 2 0 0 1 .506-.854z" />
 </svg>
diff --git a/icons/pen-off.json b/icons/pen-off.json
new file mode 100644
index 000000000..c384abef3
--- /dev/null
+++ b/icons/pen-off.json
@@ -0,0 +1,45 @@
+{
+  "$schema": "../icon.schema.json",
+  "contributors": [
+    "colebemis",
+    "csandman",
+    "mittalyashu",
+    "ericfennis",
+    "karsa-mistmere"
+  ],
+  "tags": [
+    "disabled",
+    "inactive",
+    "non-editable",
+    "locked",
+    "read-only",
+    "unmodifiable",
+    "frozen",
+    "restricted",
+    "pencil",
+    "change",
+    "create",
+    "draw",
+    "writer",
+    "writing",
+    "biro",
+    "ink",
+    "marker",
+    "felt tip",
+    "stationery",
+    "artist"
+  ],
+  "categories": [
+    "text",
+    "design",
+    "tools"
+  ],
+  "aliases": [
+    {
+      "name": "edit-2",
+      "deprecated": true,
+      "deprecationReason": "alias.name",
+      "toBeRemovedInVersion": "v1.0"
+    }
+  ]
+}
diff --git a/icons/pen-off.svg b/icons/pen-off.svg
new file mode 100644
index 000000000..db9e6148d
--- /dev/null
+++ b/icons/pen-off.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="m10 10-6.157 6.162a2 2 0 0 0-.5.833l-1.322 4.36a.5.5 0 0 0 .622.624l4.358-1.323a2 2 0 0 0 .83-.5L14 13.982" />
+  <path d="m12.829 7.172 4.359-4.346a1 1 0 1 1 3.986 3.986l-4.353 4.353" />
+  <path d="m2 2 20 20" />
+</svg>
diff --git a/icons/pen.json b/icons/pen.json
index bc5bc539f..76e2a1455 100644
--- a/icons/pen.json
+++ b/icons/pen.json
@@ -4,7 +4,8 @@
     "colebemis",
     "csandman",
     "mittalyashu",
-    "ericfennis"
+    "ericfennis",
+    "karsa-mistmere"
   ],
   "tags": [
     "pencil",
diff --git a/icons/pen.svg b/icons/pen.svg
index 51b12c239..e878a0aa1 100644
--- a/icons/pen.svg
+++ b/icons/pen.svg
@@ -9,5 +9,5 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <path d="M17 3a2.85 2.83 0 1 1 4 4L7.5 20.5 2 22l1.5-5.5Z" />
+  <path d="M21.174 6.812a1 1 0 0 0-3.986-3.987L3.842 16.174a2 2 0 0 0-.5.83l-1.321 4.352a.5.5 0 0 0 .623.622l4.353-1.32a2 2 0 0 0 .83-.497z" />
 </svg>
diff --git a/icons/pencil-line.json b/icons/pencil-line.json
index dae13dacd..027874f0d 100644
--- a/icons/pencil-line.json
+++ b/icons/pencil-line.json
@@ -5,7 +5,8 @@
     "csandman",
     "mittalyashu",
     "ericfennis",
-    "danielbayley"
+    "danielbayley",
+    "karsa-mistmere"
   ],
   "tags": [
     "pencil",
diff --git a/icons/pencil-line.svg b/icons/pencil-line.svg
index 0526e1261..e629076fa 100644
--- a/icons/pencil-line.svg
+++ b/icons/pencil-line.svg
@@ -10,6 +10,6 @@
   stroke-linejoin="round"
 >
   <path d="M12 20h9" />
-  <path d="M16.5 3.5a2.12 2.12 0 0 1 3 3L7 19l-4 1 1-4Z" />
+  <path d="M16.376 3.622a1 1 0 0 1 3.002 3.002L7.368 18.635a2 2 0 0 1-.855.506l-2.872.838a.5.5 0 0 1-.62-.62l.838-2.872a2 2 0 0 1 .506-.854z" />
   <path d="m15 5 3 3" />
 </svg>
diff --git a/icons/pencil-off.json b/icons/pencil-off.json
new file mode 100644
index 000000000..4c0ecc816
--- /dev/null
+++ b/icons/pencil-off.json
@@ -0,0 +1,36 @@
+{
+  "$schema": "../icon.schema.json",
+  "contributors": [
+    "ericfennis",
+    "wojtekmaj",
+    "mittalyashu",
+    "danielbayley",
+    "karsa-mistmere"
+  ],
+  "tags": [
+    "disabled",
+    "inactive",
+    "non-editable",
+    "locked",
+    "read-only",
+    "unmodifiable",
+    "frozen",
+    "restricted",
+    "rubber",
+    "edit",
+    "create",
+    "draw",
+    "sketch",
+    "draft",
+    "writer",
+    "writing",
+    "stationery",
+    "artist"
+  ],
+  "categories": [
+    "design",
+    "cursors",
+    "tools",
+    "text"
+  ]
+}
diff --git a/icons/pencil-off.svg b/icons/pencil-off.svg
new file mode 100644
index 000000000..56e5a70e5
--- /dev/null
+++ b/icons/pencil-off.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="m10 10-6.157 6.162a2 2 0 0 0-.5.833l-1.322 4.36a.5.5 0 0 0 .622.624l4.358-1.323a2 2 0 0 0 .83-.5L14 13.982" />
+  <path d="m12.829 7.172 4.359-4.346a1 1 0 1 1 3.986 3.986l-4.353 4.353" />
+  <path d="m15 5 4 4" />
+  <path d="m2 2 20 20" />
+</svg>
diff --git a/icons/pencil-ruler.json b/icons/pencil-ruler.json
index 032994cc0..cb59a69b5 100644
--- a/icons/pencil-ruler.json
+++ b/icons/pencil-ruler.json
@@ -1,7 +1,8 @@
 {
   "$schema": "../icon.schema.json",
   "contributors": [
-    "danielbayley"
+    "danielbayley",
+    "karsa-mistmere"
   ],
   "tags": [
     "edit",
diff --git a/icons/pencil-ruler.svg b/icons/pencil-ruler.svg
index 799aa9a2e..dea8e414d 100644
--- a/icons/pencil-ruler.svg
+++ b/icons/pencil-ruler.svg
@@ -9,10 +9,10 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <path d="m15 5 4 4" />
   <path d="M13 7 8.7 2.7a2.41 2.41 0 0 0-3.4 0L2.7 5.3a2.41 2.41 0 0 0 0 3.4L7 13" />
   <path d="m8 6 2-2" />
-  <path d="m2 22 5.5-1.5L21.17 6.83a2.82 2.82 0 0 0-4-4L3.5 16.5Z" />
   <path d="m18 16 2-2" />
   <path d="m17 11 4.3 4.3c.94.94.94 2.46 0 3.4l-2.6 2.6c-.94.94-2.46.94-3.4 0L11 17" />
+  <path d="M21.174 6.812a1 1 0 0 0-3.986-3.987L3.842 16.174a2 2 0 0 0-.5.83l-1.321 4.352a.5.5 0 0 0 .623.622l4.353-1.32a2 2 0 0 0 .83-.497z" />
+  <path d="m15 5 4 4" />
 </svg>
diff --git a/icons/pencil.json b/icons/pencil.json
index d690c0d1b..71f9c23ad 100644
--- a/icons/pencil.json
+++ b/icons/pencil.json
@@ -4,7 +4,8 @@
     "ericfennis",
     "wojtekmaj",
     "mittalyashu",
-    "danielbayley"
+    "danielbayley",
+    "karsa-mistmere"
   ],
   "tags": [
     "rubber",
diff --git a/icons/pencil.svg b/icons/pencil.svg
index 9065f87f1..7384498e8 100644
--- a/icons/pencil.svg
+++ b/icons/pencil.svg
@@ -9,6 +9,6 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <path d="M17 3a2.85 2.83 0 1 1 4 4L7.5 20.5 2 22l1.5-5.5Z" />
+  <path d="M21.174 6.812a1 1 0 0 0-3.986-3.987L3.842 16.174a2 2 0 0 0-.5.83l-1.321 4.352a.5.5 0 0 0 .623.622l4.353-1.32a2 2 0 0 0 .83-.497z" />
   <path d="m15 5 4 4" />
 </svg>
diff --git a/icons/square-pen.svg b/icons/square-pen.svg
index 11bd351f4..20855d75b 100644
--- a/icons/square-pen.svg
+++ b/icons/square-pen.svg
@@ -10,5 +10,5 @@
   stroke-linejoin="round"
 >
   <path d="M12 3H5a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7" />
-  <path d="M18.375 2.625a2.121 2.121 0 1 1 3 3L12 15l-4 1 1-4Z" />
+  <path d="M18.375 2.625a1 1 0 0 1 3 3l-9.013 9.014a2 2 0 0 1-.853.505l-2.873.84a.5.5 0 0 1-.62-.62l.84-2.873a2 2 0 0 1 .506-.852z" />
 </svg>