diff --git a/packages/excalidraw/tests/__snapshots__/contextmenu.test.tsx.snap b/packages/excalidraw/tests/__snapshots__/contextmenu.test.tsx.snap
index 6c258c621..32e5f6d07 100644
--- a/packages/excalidraw/tests/__snapshots__/contextmenu.test.tsx.snap
+++ b/packages/excalidraw/tests/__snapshots__/contextmenu.test.tsx.snap
@@ -1221,7 +1221,7 @@ exports[`contextMenu element > selecting 'Add to library' in context menu adds e
   "version": 3,
   "versionNonce": 1150084233,
   "width": 20,
-  "x": -10,
+  "x": -7,
   "y": 0,
 }
 `;
@@ -1274,7 +1274,7 @@ exports[`contextMenu element > selecting 'Add to library' in context menu adds e
             "strokeWidth": 2,
             "type": "rectangle",
             "width": 20,
-            "x": -10,
+            "x": -7,
             "y": 0,
           },
           "inserted": {
@@ -2097,7 +2097,7 @@ exports[`contextMenu element > selecting 'Copy styles' in context menu copies st
   "version": 3,
   "versionNonce": 1150084233,
   "width": 20,
-  "x": -10,
+  "x": -7,
   "y": 0,
 }
 `;
@@ -2150,7 +2150,7 @@ exports[`contextMenu element > selecting 'Copy styles' in context menu copies st
             "strokeWidth": 2,
             "type": "rectangle",
             "width": 20,
-            "x": -10,
+            "x": -7,
             "y": 0,
           },
           "inserted": {
@@ -2307,7 +2307,7 @@ exports[`contextMenu element > selecting 'Delete' in context menu deletes elemen
   "version": 4,
   "versionNonce": 1014066025,
   "width": 20,
-  "x": -10,
+  "x": -7,
   "y": 0,
 }
 `;
@@ -2360,7 +2360,7 @@ exports[`contextMenu element > selecting 'Delete' in context menu deletes elemen
             "strokeWidth": 2,
             "type": "rectangle",
             "width": 20,
-            "x": -10,
+            "x": -7,
             "y": 0,
           },
           "inserted": {
@@ -2548,7 +2548,7 @@ exports[`contextMenu element > selecting 'Duplicate' in context menu duplicates
   "version": 3,
   "versionNonce": 1150084233,
   "width": 20,
-  "x": -10,
+  "x": -7,
   "y": 0,
 }
 `;
@@ -2582,7 +2582,7 @@ exports[`contextMenu element > selecting 'Duplicate' in context menu duplicates
   "version": 5,
   "versionNonce": 400692809,
   "width": 20,
-  "x": 0,
+  "x": 3,
   "y": 10,
 }
 `;
@@ -2635,7 +2635,7 @@ exports[`contextMenu element > selecting 'Duplicate' in context menu duplicates
             "strokeWidth": 2,
             "type": "rectangle",
             "width": 20,
-            "x": -10,
+            "x": -7,
             "y": 0,
           },
           "inserted": {
@@ -2689,7 +2689,7 @@ exports[`contextMenu element > selecting 'Duplicate' in context menu duplicates
             "strokeWidth": 2,
             "type": "rectangle",
             "width": 20,
-            "x": 0,
+            "x": 3,
             "y": 10,
           },
           "inserted": {
@@ -7769,82 +7769,6 @@ exports[`contextMenu element > shows context menu for element > [end of test] ap
   "collaborators": Map {},
   "contextMenu": {
     "items": [
-      "separator",
-      {
-        "icon": <svg
-          aria-hidden="true"
-          className=""
-          fill="none"
-          focusable="false"
-          role="img"
-          stroke="currentColor"
-          strokeLinecap="round"
-          strokeLinejoin="round"
-          strokeWidth={2}
-          viewBox="0 0 24 24"
-        >
-          <g
-            strokeWidth={"1.25000"}
-          >
-            <path
-              d="M0 0h24v24H0z"
-              fill="none"
-              stroke="none"
-            />
-            <path
-              d="M7 17m-3 0a3 3 0 1 0 6 0a3 3 0 1 0 -6 0"
-            />
-            <path
-              d="M17 17m-3 0a3 3 0 1 0 6 0a3 3 0 1 0 -6 0"
-            />
-            <path
-              d="M9.15 14.85l8.85 -10.85"
-            />
-            <path
-              d="M6 4l8.85 10.85"
-            />
-          </g>
-        </svg>,
-        "keyTest": [Function],
-        "label": "labels.cut",
-        "name": "cut",
-        "perform": [Function],
-        "trackEvent": {
-          "category": "element",
-        },
-      },
-      {
-        "icon": <svg
-          aria-hidden="true"
-          className=""
-          fill="none"
-          focusable="false"
-          role="img"
-          stroke="currentColor"
-          strokeLinecap="round"
-          strokeLinejoin="round"
-          viewBox="0 0 20 20"
-        >
-          <g
-            strokeWidth="1.25"
-          >
-            <path
-              d="M14.375 6.458H8.958a2.5 2.5 0 0 0-2.5 2.5v5.417a2.5 2.5 0 0 0 2.5 2.5h5.417a2.5 2.5 0 0 0 2.5-2.5V8.958a2.5 2.5 0 0 0-2.5-2.5Z"
-            />
-            <path
-              clipRule="evenodd"
-              d="M11.667 3.125c.517 0 .986.21 1.325.55.34.338.55.807.55 1.325v1.458H8.333c-.485 0-.927.185-1.26.487-.343.312-.57.75-.609 1.24l-.005 5.357H5a1.87 1.87 0 0 1-1.326-.55 1.87 1.87 0 0 1-.549-1.325V5c0-.518.21-.987.55-1.326.338-.34.807-.549 1.325-.549h6.667Z"
-            />
-          </g>
-        </svg>,
-        "keyTest": undefined,
-        "label": "labels.copy",
-        "name": "copy",
-        "perform": [Function],
-        "trackEvent": {
-          "category": "element",
-        },
-      },
       {
         "keyTest": undefined,
         "label": "labels.paste",
@@ -7855,78 +7779,6 @@ exports[`contextMenu element > shows context menu for element > [end of test] ap
         },
       },
       "separator",
-      {
-        "label": "labels.selectAllElementsInFrame",
-        "name": "selectAllElementsInFrame",
-        "perform": [Function],
-        "predicate": [Function],
-        "trackEvent": {
-          "category": "canvas",
-        },
-      },
-      {
-        "label": "labels.removeAllElementsFromFrame",
-        "name": "removeAllElementsFromFrame",
-        "perform": [Function],
-        "predicate": [Function],
-        "trackEvent": {
-          "category": "history",
-        },
-      },
-      {
-        "label": "labels.wrapSelectionInFrame",
-        "name": "wrapSelectionInFrame",
-        "perform": [Function],
-        "predicate": [Function],
-        "trackEvent": {
-          "category": "element",
-        },
-      },
-      "separator",
-      {
-        "PanelComponent": [Function],
-        "icon": <svg
-          aria-hidden="true"
-          className=""
-          fill="none"
-          focusable="false"
-          role="img"
-          stroke="currentColor"
-          strokeLinecap="round"
-          strokeLinejoin="round"
-          strokeWidth={2}
-          viewBox="0 0 24 24"
-        >
-          <g
-            strokeWidth="1.25"
-          >
-            <path
-              d="M0 0h24v24H0z"
-              fill="none"
-              stroke="none"
-            />
-            <path
-              d="M8 5v10a1 1 0 0 0 1 1h10"
-            />
-            <path
-              d="M5 8h10a1 1 0 0 1 1 1v10"
-            />
-          </g>
-        </svg>,
-        "keywords": [
-          "image",
-          "crop",
-        ],
-        "label": "helpDialog.cropStart",
-        "name": "cropEditor",
-        "perform": [Function],
-        "predicate": [Function],
-        "trackEvent": {
-          "category": "menu",
-        },
-        "viewMode": true,
-      },
-      "separator",
       {
         "icon": <svg
           aria-hidden="true"
@@ -8058,446 +7910,75 @@ exports[`contextMenu element > shows context menu for element > [end of test] ap
           strokeWidth={2}
           viewBox="0 0 24 24"
         >
-          <g
-            strokeWidth={"1.25000"}
-          >
+          <g>
             <path
               d="M0 0h24v24H0z"
               fill="none"
               stroke="none"
             />
             <path
-              d="M5 3m0 2a2 2 0 0 1 2 -2h10a2 2 0 0 1 2 2v2a2 2 0 0 1 -2 2h-10a2 2 0 0 1 -2 -2z"
+              d="M8 8m0 1a1 1 0 0 1 1 -1h6a1 1 0 0 1 1 1v6a1 1 0 0 1 -1 1h-6a1 1 0 0 1 -1 -1z"
             />
             <path
-              d="M19 6h1a2 2 0 0 1 2 2a5 5 0 0 1 -5 5l-5 0v2"
+              d="M12 20v.01"
             />
             <path
-              d="M10 15m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v4a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z"
+              d="M16 20v.01"
+            />
+            <path
+              d="M8 20v.01"
+            />
+            <path
+              d="M4 20v.01"
+            />
+            <path
+              d="M4 16v.01"
+            />
+            <path
+              d="M4 12v.01"
+            />
+            <path
+              d="M4 8v.01"
+            />
+            <path
+              d="M4 4v.01"
+            />
+            <path
+              d="M8 4v.01"
+            />
+            <path
+              d="M12 4v.01"
+            />
+            <path
+              d="M16 4v.01"
+            />
+            <path
+              d="M20 4v.01"
+            />
+            <path
+              d="M20 8v.01"
+            />
+            <path
+              d="M20 12v.01"
+            />
+            <path
+              d="M20 16v.01"
+            />
+            <path
+              d="M20 20v.01"
             />
           </g>
         </svg>,
         "keyTest": [Function],
-        "label": "labels.copyStyles",
-        "name": "copyStyles",
+        "label": "labels.selectAll",
+        "name": "selectAll",
         "perform": [Function],
         "trackEvent": {
-          "category": "element",
+          "category": "canvas",
         },
+        "viewMode": false,
       },
       {
-        "icon": <svg
-          aria-hidden="true"
-          className=""
-          fill="none"
-          focusable="false"
-          role="img"
-          stroke="currentColor"
-          strokeLinecap="round"
-          strokeLinejoin="round"
-          strokeWidth={2}
-          viewBox="0 0 24 24"
-        >
-          <g
-            strokeWidth={"1.25000"}
-          >
-            <path
-              d="M0 0h24v24H0z"
-              fill="none"
-              stroke="none"
-            />
-            <path
-              d="M5 3m0 2a2 2 0 0 1 2 -2h10a2 2 0 0 1 2 2v2a2 2 0 0 1 -2 2h-10a2 2 0 0 1 -2 -2z"
-            />
-            <path
-              d="M19 6h1a2 2 0 0 1 2 2a5 5 0 0 1 -5 5l-5 0v2"
-            />
-            <path
-              d="M10 15m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v4a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z"
-            />
-          </g>
-        </svg>,
-        "keyTest": [Function],
-        "label": "labels.pasteStyles",
-        "name": "pasteStyles",
-        "perform": [Function],
-        "trackEvent": {
-          "category": "element",
-        },
-      },
-      "separator",
-      {
-        "PanelComponent": [Function],
-        "icon": [Function],
-        "keyTest": [Function],
-        "label": "labels.group",
-        "name": "group",
-        "perform": [Function],
-        "predicate": [Function],
-        "trackEvent": {
-          "category": "element",
-        },
-      },
-      {
-        "icon": null,
-        "label": "labels.autoResize",
-        "name": "autoResize",
-        "perform": [Function],
-        "predicate": [Function],
-        "trackEvent": {
-          "category": "element",
-        },
-      },
-      {
-        "label": "labels.unbindText",
-        "name": "unbindText",
-        "perform": [Function],
-        "predicate": [Function],
-        "trackEvent": {
-          "category": "element",
-        },
-      },
-      {
-        "label": "labels.bindText",
-        "name": "bindText",
-        "perform": [Function],
-        "predicate": [Function],
-        "trackEvent": {
-          "category": "element",
-        },
-      },
-      {
-        "label": "labels.createContainerFromText",
-        "name": "wrapTextInContainer",
-        "perform": [Function],
-        "predicate": [Function],
-        "trackEvent": {
-          "category": "element",
-        },
-      },
-      {
-        "PanelComponent": [Function],
-        "icon": [Function],
-        "keyTest": [Function],
-        "label": "labels.ungroup",
-        "name": "ungroup",
-        "perform": [Function],
-        "predicate": [Function],
-        "trackEvent": {
-          "category": "element",
-        },
-      },
-      "separator",
-      {
-        "label": "labels.addToLibrary",
-        "name": "addToLibrary",
-        "perform": [Function],
-        "trackEvent": {
-          "category": "element",
-        },
-      },
-      "separator",
-      {
-        "PanelComponent": [Function],
-        "icon": <svg
-          aria-hidden="true"
-          className=""
-          fill="none"
-          focusable="false"
-          role="img"
-          stroke="currentColor"
-          strokeLinecap="round"
-          strokeLinejoin="round"
-          strokeWidth={2}
-          style={
-            {
-              "transform": "rotate(180deg)",
-            }
-          }
-          viewBox="0 0 24 24"
-        >
-          <g
-            strokeWidth={"1.50000"}
-          >
-            <path
-              d="M0 0h24v24H0z"
-              fill="none"
-              stroke="none"
-            />
-            <path
-              d="M12 5l0 14"
-            />
-            <path
-              d="M16 9l-4 -4"
-            />
-            <path
-              d="M8 9l4 -4"
-            />
-          </g>
-        </svg>,
-        "keyPriority": 40,
-        "keyTest": [Function],
-        "keywords": [
-          "move down",
-          "zindex",
-          "layer",
-        ],
-        "label": "labels.sendBackward",
-        "name": "sendBackward",
-        "perform": [Function],
-        "trackEvent": {
-          "category": "element",
-        },
-      },
-      {
-        "PanelComponent": [Function],
-        "icon": <svg
-          aria-hidden="true"
-          className=""
-          fill="none"
-          focusable="false"
-          role="img"
-          stroke="currentColor"
-          strokeLinecap="round"
-          strokeLinejoin="round"
-          strokeWidth={2}
-          viewBox="0 0 24 24"
-        >
-          <g
-            strokeWidth={"1.50000"}
-          >
-            <path
-              d="M0 0h24v24H0z"
-              fill="none"
-              stroke="none"
-            />
-            <path
-              d="M12 5l0 14"
-            />
-            <path
-              d="M16 9l-4 -4"
-            />
-            <path
-              d="M8 9l4 -4"
-            />
-          </g>
-        </svg>,
-        "keyPriority": 40,
-        "keyTest": [Function],
-        "keywords": [
-          "move up",
-          "zindex",
-          "layer",
-        ],
-        "label": "labels.bringForward",
-        "name": "bringForward",
-        "perform": [Function],
-        "trackEvent": {
-          "category": "element",
-        },
-      },
-      {
-        "PanelComponent": [Function],
-        "icon": <svg
-          aria-hidden="true"
-          className=""
-          fill="none"
-          focusable="false"
-          role="img"
-          stroke="currentColor"
-          strokeLinecap="round"
-          strokeLinejoin="round"
-          strokeWidth={2}
-          style={
-            {
-              "transform": "rotate(180deg)",
-            }
-          }
-          viewBox="0 0 24 24"
-        >
-          <g
-            strokeWidth={"1.50000"}
-          >
-            <path
-              d="M0 0h24v24H0z"
-              fill="none"
-              stroke="none"
-            />
-            <path
-              d="M12 10l0 10"
-            />
-            <path
-              d="M12 10l4 4"
-            />
-            <path
-              d="M12 10l-4 4"
-            />
-            <path
-              d="M4 4l16 0"
-            />
-          </g>
-        </svg>,
-        "keyTest": [Function],
-        "keywords": [
-          "move down",
-          "zindex",
-          "layer",
-        ],
-        "label": "labels.sendToBack",
-        "name": "sendToBack",
-        "perform": [Function],
-        "trackEvent": {
-          "category": "element",
-        },
-      },
-      {
-        "PanelComponent": [Function],
-        "icon": <svg
-          aria-hidden="true"
-          className=""
-          fill="none"
-          focusable="false"
-          role="img"
-          stroke="currentColor"
-          strokeLinecap="round"
-          strokeLinejoin="round"
-          strokeWidth={2}
-          viewBox="0 0 24 24"
-        >
-          <g
-            strokeWidth={"1.50000"}
-          >
-            <path
-              d="M0 0h24v24H0z"
-              fill="none"
-              stroke="none"
-            />
-            <path
-              d="M12 10l0 10"
-            />
-            <path
-              d="M12 10l4 4"
-            />
-            <path
-              d="M12 10l-4 4"
-            />
-            <path
-              d="M4 4l16 0"
-            />
-          </g>
-        </svg>,
-        "keyTest": [Function],
-        "keywords": [
-          "move up",
-          "zindex",
-          "layer",
-        ],
-        "label": "labels.bringToFront",
-        "name": "bringToFront",
-        "perform": [Function],
-        "trackEvent": {
-          "category": "element",
-        },
-      },
-      "separator",
-      {
-        "icon": <svg
-          aria-hidden="true"
-          className=""
-          fill="none"
-          focusable="false"
-          role="img"
-          stroke="currentColor"
-          strokeLinecap="round"
-          strokeLinejoin="round"
-          strokeWidth={2}
-          viewBox="0 0 24 24"
-        >
-          <g
-            strokeWidth={"1.25000"}
-          >
-            <path
-              d="M0 0h24v24H0z"
-              fill="none"
-              stroke="none"
-            />
-            <path
-              d="M12 3l0 18"
-            />
-            <path
-              d="M16 7l0 10l5 0l-5 -10"
-            />
-            <path
-              d="M8 7l0 10l-5 0l5 -10"
-            />
-          </g>
-        </svg>,
-        "keyTest": [Function],
-        "label": "labels.flipHorizontal",
-        "name": "flipHorizontal",
-        "perform": [Function],
-        "trackEvent": {
-          "category": "element",
-        },
-      },
-      {
-        "icon": <svg
-          aria-hidden="true"
-          className=""
-          fill="none"
-          focusable="false"
-          role="img"
-          stroke="currentColor"
-          strokeLinecap="round"
-          strokeLinejoin="round"
-          strokeWidth={2}
-          viewBox="0 0 24 24"
-        >
-          <g
-            strokeWidth={"1.25000"}
-          >
-            <path
-              d="M0 0h24v24H0z"
-              fill="none"
-              stroke="none"
-            />
-            <path
-              d="M3 12l18 0"
-            />
-            <path
-              d="M7 16l10 0l-10 5l0 -5"
-            />
-            <path
-              d="M7 8l10 0l-10 -5l0 5"
-            />
-          </g>
-        </svg>,
-        "keyTest": [Function],
-        "label": "labels.flipVertical",
-        "name": "flipVertical",
-        "perform": [Function],
-        "trackEvent": {
-          "category": "element",
-        },
-      },
-      "separator",
-      {
-        "PanelComponent": [Function],
-        "category": "Elements",
-        "keywords": [
-          "line",
-        ],
-        "label": [Function],
-        "name": "toggleLinearEditor",
-        "perform": [Function],
-        "predicate": [Function],
-        "trackEvent": {
-          "category": "element",
-        },
-      },
-      "separator",
-      {
-        "PanelComponent": [Function],
         "icon": <svg
           aria-hidden="true"
           className=""
@@ -8509,28 +7990,59 @@ exports[`contextMenu element > shows context menu for element > [end of test] ap
           strokeLinejoin="round"
           viewBox="0 0 20 20"
         >
-          <g
-            strokeWidth="1.25"
-          >
+          <g>
             <path
-              d="M8.333 11.667a2.917 2.917 0 0 0 4.167 0l3.333-3.334a2.946 2.946 0 1 0-4.166-4.166l-.417.416"
+              d="M13.542 8.542H6.458a2.5 2.5 0 0 0-2.5 2.5v3.75a2.5 2.5 0 0 0 2.5 2.5h7.084a2.5 2.5 0 0 0 2.5-2.5v-3.75a2.5 2.5 0 0 0-2.5-2.5Z"
+              stroke="currentColor"
+              strokeWidth="1.25"
             />
             <path
-              d="M11.667 8.333a2.917 2.917 0 0 0-4.167 0l-3.333 3.334a2.946 2.946 0 0 0 4.166 4.166l.417-.416"
+              d="M10 13.958a1.042 1.042 0 1 0 0-2.083 1.042 1.042 0 0 0 0 2.083Z"
+              stroke="currentColor"
+              strokeWidth="1.25"
             />
+            <mask
+              height={9}
+              id="UnlockedIcon"
+              maskUnits="userSpaceOnUse"
+              style={
+                {
+                  "maskType": "alpha",
+                }
+              }
+              width={9}
+              x={6}
+              y={1}
+            >
+              <path
+                d="M6.399 9.561V5.175c0-.93.401-1.823 1.116-2.48a3.981 3.981 0 0 1 2.693-1.028c1.01 0 1.98.37 2.694 1.027.715.658 1.116 1.55 1.116 2.481"
+                fill="#fff"
+                stroke="none"
+              />
+            </mask>
+            <g
+              mask="url(#UnlockedIcon)"
+            >
+              <path
+                d="M5.149 9.561v1.25h2.5v-1.25h-2.5Zm5.06-7.894V.417v1.25Zm2.559 3.508v1.25h2.5v-1.25h-2.5ZM7.648 8.51V5.175h-2.5V8.51h2.5Zm0-3.334c0-.564.243-1.128.713-1.561L6.668 1.775c-.959.883-1.52 2.104-1.52 3.4h2.5Zm.713-1.561a2.732 2.732 0 0 1 1.847-.697v-2.5c-1.31 0-2.585.478-3.54 1.358L8.36 3.614Zm1.847-.697c.71 0 1.374.26 1.847.697l1.694-1.839a5.231 5.231 0 0 0-3.54-1.358v2.5Zm1.847.697c.47.433.713.997.713 1.561h2.5c0-1.296-.56-2.517-1.52-3.4l-1.693 1.839Z"
+                fill="currentColor"
+                stroke="none"
+              />
+            </g>
           </g>
         </svg>,
-        "keyTest": [Function],
-        "label": [Function],
-        "name": "hyperlink",
+        "label": "labels.elementLock.unlockAll",
+        "name": "unlockAllElements",
         "perform": [Function],
         "predicate": [Function],
         "trackEvent": {
-          "action": "click",
-          "category": "hyperlink",
+          "category": "canvas",
         },
+        "viewMode": false,
       },
+      "separator",
       {
+        "checked": [Function],
         "icon": <svg
           aria-hidden="true"
           className=""
@@ -8543,76 +8055,50 @@ exports[`contextMenu element > shows context menu for element > [end of test] ap
           strokeWidth={2}
           viewBox="0 0 24 24"
         >
-          <React.Fragment>
+          <g
+            strokeWidth={"1.50000"}
+          >
             <path
               d="M0 0h24v24H0z"
               fill="none"
               stroke="none"
             />
             <path
-              d="M8 8m0 2a2 2 0 0 1 2 -2h8a2 2 0 0 1 2 2v8a2 2 0 0 1 -2 2h-8a2 2 0 0 1 -2 -2z"
+              d="M3 6h18"
             />
             <path
-              d="M16 8v-2a2 2 0 0 0 -2 -2h-8a2 2 0 0 0 -2 2v8a2 2 0 0 0 2 2h2"
-            />
-          </React.Fragment>
-        </svg>,
-        "label": "labels.copyElementLink",
-        "name": "copyElementLink",
-        "perform": [Function],
-        "predicate": [Function],
-        "trackEvent": {
-          "category": "element",
-        },
-      },
-      "separator",
-      {
-        "PanelComponent": [Function],
-        "icon": <svg
-          aria-hidden="true"
-          className=""
-          fill="none"
-          focusable="false"
-          role="img"
-          stroke="currentColor"
-          strokeLinecap="round"
-          strokeLinejoin="round"
-          viewBox="0 0 20 20"
-        >
-          <g
-            strokeWidth="1.25"
-          >
-            <path
-              d="M14.375 6.458H8.958a2.5 2.5 0 0 0-2.5 2.5v5.417a2.5 2.5 0 0 0 2.5 2.5h5.417a2.5 2.5 0 0 0 2.5-2.5V8.958a2.5 2.5 0 0 0-2.5-2.5Z"
+              d="M3 12h18"
             />
             <path
-              clipRule="evenodd"
-              d="M11.667 3.125c.517 0 .986.21 1.325.55.34.338.55.807.55 1.325v1.458H8.333c-.485 0-.927.185-1.26.487-.343.312-.57.75-.609 1.24l-.005 5.357H5a1.87 1.87 0 0 1-1.326-.55 1.87 1.87 0 0 1-.549-1.325V5c0-.518.21-.987.55-1.326.338-.34.807-.549 1.325-.549h6.667Z"
+              d="M3 18h18"
+            />
+            <path
+              d="M6 3v18"
+            />
+            <path
+              d="M12 3v18"
+            />
+            <path
+              d="M18 3v18"
             />
           </g>
         </svg>,
         "keyTest": [Function],
-        "label": "labels.duplicateSelection",
-        "name": "duplicateSelection",
-        "perform": [Function],
-        "trackEvent": {
-          "category": "element",
-        },
-      },
-      {
-        "icon": [Function],
-        "keyTest": [Function],
-        "label": [Function],
-        "name": "toggleElementLock",
+        "keywords": [
+          "snap",
+        ],
+        "label": "labels.toggleGrid",
+        "name": "gridMode",
         "perform": [Function],
         "predicate": [Function],
         "trackEvent": {
-          "category": "element",
+          "category": "canvas",
+          "predicate": [Function],
         },
+        "viewMode": true,
       },
-      "separator",
       {
-        "PanelComponent": [Function],
+        "checked": [Function],
         "icon": <svg
           aria-hidden="true"
           className=""
@@ -8622,21 +8108,202 @@ exports[`contextMenu element > shows context menu for element > [end of test] ap
           stroke="currentColor"
           strokeLinecap="round"
           strokeLinejoin="round"
-          viewBox="0 0 20 20"
+          strokeWidth={2}
+          viewBox="0 0 24 24"
         >
-          <path
-            d="M3.333 5.833h13.334M8.333 9.167v5M11.667 9.167v5M4.167 5.833l.833 10c0 .92.746 1.667 1.667 1.667h6.666c.92 0 1.667-.746 1.667-1.667l.833-10M7.5 5.833v-2.5c0-.46.373-.833.833-.833h3.334c.46 0 .833.373.833.833v2.5"
-            strokeWidth="1.25"
-          />
+          <g
+            strokeWidth={"1.25000"}
+          >
+            <path
+              d="M0 0h24v24H0z"
+              fill="none"
+              stroke="none"
+            />
+            <path
+              d="M4 13v-8a2 2 0 0 1 2 -2h1a2 2 0 0 1 2 2v8a2 2 0 0 0 6 0v-8a2 2 0 0 1 2 -2h1a2 2 0 0 1 2 2v8a8 8 0 0 1 -16 0"
+            />
+            <path
+              d="M4 8l5 0"
+            />
+            <path
+              d="M15 8l4 0"
+            />
+          </g>
         </svg>,
         "keyTest": [Function],
-        "label": "labels.delete",
-        "name": "deleteSelectedElements",
+        "label": "buttons.objectsSnapMode",
+        "name": "objectsSnapMode",
+        "perform": [Function],
+        "predicate": [Function],
+        "trackEvent": {
+          "category": "canvas",
+          "predicate": [Function],
+        },
+        "viewMode": false,
+      },
+      {
+        "checked": [Function],
+        "icon": <svg
+          aria-hidden="true"
+          className=""
+          fill="none"
+          focusable="false"
+          role="img"
+          stroke="currentColor"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+          strokeWidth={2}
+          viewBox="0 0 24 24"
+        >
+          <g
+            strokeWidth={"1.25000"}
+          >
+            <path
+              d="M0 0h24v24H0z"
+              fill="none"
+              stroke="none"
+            />
+            <path
+              d="M3 14c.83 .642 2.077 1.017 3.5 1c1.423 .017 2.67 -.358 3.5 -1c.83 -.642 2.077 -1.017 3.5 -1c1.423 -.017 2.67 .358 3.5 1"
+            />
+            <path
+              d="M8 3a2.4 2.4 0 0 0 -1 2a2.4 2.4 0 0 0 1 2"
+            />
+            <path
+              d="M12 3a2.4 2.4 0 0 0 -1 2a2.4 2.4 0 0 0 1 2"
+            />
+            <path
+              d="M3 10h14v5a6 6 0 0 1 -6 6h-2a6 6 0 0 1 -6 -6v-5z"
+            />
+            <path
+              d="M16.746 16.726a3 3 0 1 0 .252 -5.555"
+            />
+          </g>
+        </svg>,
+        "keyTest": [Function],
+        "label": "buttons.zenMode",
+        "name": "zenMode",
+        "perform": [Function],
+        "predicate": [Function],
+        "trackEvent": {
+          "category": "canvas",
+          "predicate": [Function],
+        },
+        "viewMode": true,
+      },
+      {
+        "checked": [Function],
+        "icon": <svg
+          aria-hidden="true"
+          className=""
+          fill="none"
+          focusable="false"
+          role="img"
+          stroke="currentColor"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+          strokeWidth={2}
+          viewBox="0 0 24 24"
+        >
+          <g
+            fill="none"
+            stroke="currentColor"
+            strokeWidth={"1.50000"}
+          >
+            <path
+              d="M0 0h24v24H0z"
+              fill="none"
+              stroke="none"
+            />
+            <path
+              d="M10 12a2 2 0 1 0 4 0a2 2 0 0 0 -4 0"
+            />
+            <path
+              d="M21 12c-2.4 4 -5.4 6 -9 6c-3.6 0 -6.6 -2 -9 -6c2.4 -4 5.4 -6 9 -6c3.6 0 6.6 2 9 6"
+            />
+          </g>
+        </svg>,
+        "keyTest": [Function],
+        "label": "labels.viewMode",
+        "name": "viewMode",
+        "perform": [Function],
+        "predicate": [Function],
+        "trackEvent": {
+          "category": "canvas",
+          "predicate": [Function],
+        },
+        "viewMode": true,
+      },
+      {
+        "checked": [Function],
+        "icon": <svg
+          aria-hidden="true"
+          className=""
+          fill="none"
+          focusable="false"
+          role="img"
+          stroke="currentColor"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+          strokeWidth={2}
+          viewBox="0 0 24 24"
+        >
+          <g
+            strokeWidth={"1.25000"}
+          >
+            <path
+              d="M0 0h24v24H0z"
+              fill="none"
+              stroke="none"
+            />
+            <path
+              d="M5 3v18"
+            />
+            <path
+              d="M19 21v-18"
+            />
+            <path
+              d="M5 7h14"
+            />
+            <path
+              d="M5 15h14"
+            />
+            <path
+              d="M8 13v4"
+            />
+            <path
+              d="M11 13v4"
+            />
+            <path
+              d="M16 13v4"
+            />
+            <path
+              d="M14 5v4"
+            />
+            <path
+              d="M11 5v4"
+            />
+            <path
+              d="M8 5v4"
+            />
+            <path
+              d="M3 21h18"
+            />
+          </g>
+        </svg>,
+        "keyTest": [Function],
+        "keywords": [
+          "edit",
+          "attributes",
+          "customize",
+        ],
+        "label": "stats.fullTitle",
+        "name": "stats",
         "perform": [Function],
         "trackEvent": {
-          "action": "delete",
-          "category": "element",
+          "category": "menu",
         },
+        "viewMode": true,
       },
     ],
     "left": -17,
diff --git a/packages/excalidraw/tests/__snapshots__/regressionTests.test.tsx.snap b/packages/excalidraw/tests/__snapshots__/regressionTests.test.tsx.snap
index 67d2c5de2..1de6f5db2 100644
--- a/packages/excalidraw/tests/__snapshots__/regressionTests.test.tsx.snap
+++ b/packages/excalidraw/tests/__snapshots__/regressionTests.test.tsx.snap
@@ -2465,7 +2465,7 @@ exports[`regression tests > can drag element that covers another element, while
   "scrolledOutside": false,
   "searchMatches": null,
   "selectedElementIds": {
-    "id3": true,
+    "id0": true,
   },
   "selectedElementsAreBeingDragged": false,
   "selectedGroupIds": {},
@@ -2667,7 +2667,7 @@ exports[`regression tests > can drag element that covers another element, while
       "delta": Delta {
         "deleted": {
           "selectedElementIds": {
-            "id3": true,
+            "id0": true,
           },
         },
         "inserted": {
@@ -2681,7 +2681,7 @@ exports[`regression tests > can drag element that covers another element, while
       "added": {},
       "removed": {},
       "updated": {
-        "id3": {
+        "id0": {
           "deleted": {
             "x": 300,
             "y": 300,
diff --git a/packages/excalidraw/tests/contextmenu.test.tsx b/packages/excalidraw/tests/contextmenu.test.tsx
index 75de2717f..21f7a6a79 100644
--- a/packages/excalidraw/tests/contextmenu.test.tsx
+++ b/packages/excalidraw/tests/contextmenu.test.tsx
@@ -304,12 +304,12 @@ describe("contextMenu element", () => {
 
   it("selecting 'Copy styles' in context menu copies styles", () => {
     UI.clickTool("rectangle");
-    mouse.down(10, 10);
+    mouse.down(13, 10);
     mouse.up(20, 20);
 
     fireEvent.contextMenu(GlobalTestState.interactiveCanvas, {
       button: 2,
-      clientX: 3,
+      clientX: 13,
       clientY: 3,
     });
     const contextMenu = UI.queryContextMenu();
@@ -389,12 +389,12 @@ describe("contextMenu element", () => {
 
   it("selecting 'Delete' in context menu deletes element", () => {
     UI.clickTool("rectangle");
-    mouse.down(10, 10);
+    mouse.down(13, 10);
     mouse.up(20, 20);
 
     fireEvent.contextMenu(GlobalTestState.interactiveCanvas, {
       button: 2,
-      clientX: 3,
+      clientX: 13,
       clientY: 3,
     });
     const contextMenu = UI.queryContextMenu();
@@ -405,12 +405,12 @@ describe("contextMenu element", () => {
 
   it("selecting 'Add to library' in context menu adds element to library", async () => {
     UI.clickTool("rectangle");
-    mouse.down(10, 10);
+    mouse.down(13, 10);
     mouse.up(20, 20);
 
     fireEvent.contextMenu(GlobalTestState.interactiveCanvas, {
       button: 2,
-      clientX: 3,
+      clientX: 13,
       clientY: 3,
     });
     const contextMenu = UI.queryContextMenu();
@@ -424,12 +424,12 @@ describe("contextMenu element", () => {
 
   it("selecting 'Duplicate' in context menu duplicates element", () => {
     UI.clickTool("rectangle");
-    mouse.down(10, 10);
+    mouse.down(13, 10);
     mouse.up(20, 20);
 
     fireEvent.contextMenu(GlobalTestState.interactiveCanvas, {
       button: 2,
-      clientX: 3,
+      clientX: 13,
       clientY: 3,
     });
     const contextMenu = UI.queryContextMenu();
diff --git a/packages/excalidraw/tests/regressionTests.test.tsx b/packages/excalidraw/tests/regressionTests.test.tsx
index 9deefb8c7..f11ea01e9 100644
--- a/packages/excalidraw/tests/regressionTests.test.tsx
+++ b/packages/excalidraw/tests/regressionTests.test.tsx
@@ -704,7 +704,7 @@ describe("regression tests", () => {
 
     // pointer down on rectangle
     mouse.reset();
-    mouse.down(100, 100);
+    mouse.down(110, 100); // Rectangle is rounded, there is no selection at the corner
     mouse.up(200, 200);
 
     expect(API.getSelectedElement().type).toBe("rectangle");
@@ -989,6 +989,7 @@ describe("regression tests", () => {
 
       // select rectangle
       mouse.reset();
+      mouse.moveTo(30, 0); // Rectangle is rounded, there is no selection at the corner
       mouse.click();
 
       // click on intersection between ellipse and rectangle
@@ -1155,6 +1156,7 @@ it(
     // Select first rectangle while keeping third one selected.
     // Third rectangle is selected because it was the last element to be created.
     mouse.reset();
+    mouse.moveTo(30, 0);
     Keyboard.withModifierKeys({ shift: true }, () => {
       mouse.click();
     });
@@ -1176,6 +1178,7 @@ it(
 
     // Pointer down o first rectangle that is part of the group
     mouse.reset();
+    mouse.moveTo(30, 0);
     Keyboard.withModifierKeys({ shift: true }, () => {
       mouse.down();
     });
diff --git a/packages/utils/src/collision.ts b/packages/utils/src/collision.ts
index 6f49d4b26..ced2b54a0 100644
--- a/packages/utils/src/collision.ts
+++ b/packages/utils/src/collision.ts
@@ -6,6 +6,8 @@ import {
   type GlobalPoint,
   type LocalPoint,
   type Polygon,
+  vectorCross,
+  vectorFromPoint,
 } from "@excalidraw/math";
 
 import { intersectElementWithLineSegment } from "@excalidraw/element/collision";
@@ -40,10 +42,19 @@ export const isPointInShape = (
   point: GlobalPoint,
   element: ExcalidrawElement,
 ) => {
-  if (
-    (isLinearElement(element) || isFreeDrawElement(element)) &&
-    !isPathALoop(element.points)
-  ) {
+  if (isLinearElement(element) || isFreeDrawElement(element)) {
+    if (isPathALoop(element.points)) {
+      // for a closed path, we need to check if the point is inside the path
+      const r = isPointInClosedPath(
+        element.points.map((p) =>
+          pointFrom<GlobalPoint>(element.x + p[0], element.y + p[1]),
+        ),
+        point,
+      );
+      //console.log(r);
+      return r;
+    }
+
     // There isn't any "inside" for a non-looping path
     return false;
   }
@@ -56,6 +67,36 @@ export const isPointInShape = (
   return intersections.length === 0;
 };
 
+/**
+ * Determine if a closed path contains a point.
+ *
+ * Implementation notes: We'll use the fact that the path is a consecutive
+ * sequence of line segments, these line segments have a winding order and
+ * the fact that if a point is inside the closed path, the cross product of the
+ * start point of a line segment to the point p and the end point of the line
+ * segment will be negative for all segments.
+ *
+ * @param points
+ * @param p
+ */
+const isPointInClosedPath = (
+  points: readonly GlobalPoint[],
+  p: GlobalPoint,
+) => {
+  const segments = points.slice(1).map((point, i) => {
+    return lineSegment(points[i], point);
+  });
+
+  return segments.every((segment) => {
+    const c = vectorCross(
+      vectorFromPoint(segment[0], p),
+      vectorFromPoint(segment[0], segment[1]),
+    );
+
+    return c < 0;
+  });
+};
+
 // check if the given element is in the given bounds
 export const isPointInBounds = <Point extends GlobalPoint | LocalPoint>(
   point: Point,