diff --git a/packages/frontend-2/components/global/icon/IconMeasureArea.vue b/packages/frontend-2/components/global/icon/IconMeasureArea.vue
index 14e87bac8..cf178c489 100644
--- a/packages/frontend-2/components/global/icon/IconMeasureArea.vue
+++ b/packages/frontend-2/components/global/icon/IconMeasureArea.vue
@@ -1,71 +1,8 @@
 <template>
-  <svg width="24" height="24" viewBox="0 0 24 24" fill="none">
-    <g clip-path="url(#clip0_1396_52752)">
-      <path
-        d="M4 6V18"
-        stroke="currentColor"
-        stroke-width="1.5"
-        stroke-linecap="round"
-        stroke-linejoin="round"
-        stroke-dasharray="1 3"
-      />
-      <path
-        d="M20 6V18"
-        stroke="currentColor"
-        stroke-width="1.5"
-        stroke-linecap="round"
-        stroke-linejoin="round"
-        stroke-dasharray="1 3"
-      />
-      <path
-        d="M18 4H6"
-        stroke="currentColor"
-        stroke-width="1.5"
-        stroke-linecap="round"
-        stroke-linejoin="round"
-        stroke-dasharray="1 3"
-      />
-      <path
-        d="M18 20H6"
-        stroke="currentColor"
-        stroke-width="1.5"
-        stroke-linecap="round"
-        stroke-linejoin="round"
-        stroke-dasharray="1 3"
-      />
-      <path
-        d="M4 22C3.45 22 2.95 21.78 2.59 21.41C2.23 21.04 2 20.55 2 20C2 19.45 2.22 18.95 2.59 18.59C2.96 18.23 3.45 18 4 18C4.55 18 5.05 18.22 5.41 18.59C5.77 18.96 6 19.45 6 20C6 20.55 5.78 21.05 5.41 21.41C5.04 21.77 4.55 22 4 22Z"
-        stroke="currentColor"
-        stroke-width="1.5"
-        stroke-linecap="round"
-        stroke-linejoin="round"
-      />
-      <path
-        d="M20 6C19.45 6 18.95 5.78 18.59 5.41C18.23 5.04 18 4.55 18 4C18 3.45 18.22 2.95 18.59 2.59C18.96 2.23 19.45 2 20 2C20.55 2 21.05 2.22 21.41 2.59C21.77 2.96 22 3.45 22 4C22 4.55 21.78 5.05 21.41 5.41C21.04 5.77 20.55 6 20 6Z"
-        stroke="currentColor"
-        stroke-width="1.5"
-        stroke-linecap="round"
-        stroke-linejoin="round"
-      />
-      <path
-        d="M20 22C19.45 22 18.95 21.78 18.59 21.41C18.23 21.04 18 20.55 18 20C18 19.45 18.22 18.95 18.59 18.59C18.96 18.23 19.45 18 20 18C20.55 18 21.05 18.22 21.41 18.59C21.77 18.96 22 19.45 22 20C22 20.55 21.78 21.05 21.41 21.41C21.04 21.77 20.55 22 20 22Z"
-        stroke="currentColor"
-        stroke-width="1.5"
-        stroke-linecap="round"
-        stroke-linejoin="round"
-      />
-      <path
-        d="M4 6C3.45 6 2.95 5.78 2.59 5.41C2.23 5.04 2 4.55 2 4C2 3.45 2.22 2.95 2.59 2.59C2.96 2.23 3.45 2 4 2C4.55 2 5.05 2.22 5.41 2.59C5.77 2.96 6 3.45 6 4C6 4.55 5.78 5.05 5.41 5.41C5.04 5.77 4.55 6 4 6Z"
-        stroke="currentColor"
-        stroke-width="1.5"
-        stroke-linecap="round"
-        stroke-linejoin="round"
-      />
-    </g>
-    <defs>
-      <clipPath id="clip0_1396_52752">
-        <rect width="22" height="22" fill="white" transform="translate(1 1)" />
-      </clipPath>
-    </defs>
+  <svg width="22" height="22" viewBox="0 0 22 22" fill="none">
+    <path
+      d="M3 16C4.65685 16 6 17.3431 6 19C6 20.6569 4.65685 22 3 22C1.34315 22 0 20.6569 0 19C0 17.3431 1.34315 16 3 16ZM19 16C20.6569 16 22 17.3431 22 19C22 20.6569 20.6569 22 19 22C17.3431 22 16 20.6569 16 19C16 17.3431 17.3431 16 19 16ZM3 17.5C2.17157 17.5 1.5 18.1716 1.5 19C1.5 19.8284 2.17157 20.5 3 20.5C3.82843 20.5 4.5 19.8284 4.5 19C4.5 18.1716 3.82843 17.5 3 17.5ZM19 17.5C18.1716 17.5 17.5 18.1716 17.5 19C17.5 19.8284 18.1716 20.5 19 20.5C19.8284 20.5 20.5 19.8284 20.5 19C20.5 18.1716 19.8284 17.5 19 17.5ZM9.5 18.25C9.91421 18.25 10.25 18.5858 10.25 19C10.25 19.4142 9.91421 19.75 9.5 19.75H8.5C8.08579 19.75 7.75 19.4142 7.75 19C7.75 18.5858 8.08579 18.25 8.5 18.25H9.5ZM13.5 18.25C13.9142 18.25 14.25 18.5858 14.25 19C14.25 19.4142 13.9142 19.75 13.5 19.75H12.5C12.0858 19.75 11.75 19.4142 11.75 19C11.75 18.5858 12.0858 18.25 12.5 18.25H13.5ZM3 11.75C3.41421 11.75 3.75 12.0858 3.75 12.5V13.5C3.75 13.9142 3.41421 14.25 3 14.25C2.58579 14.25 2.25 13.9142 2.25 13.5V12.5C2.25 12.0858 2.58579 11.75 3 11.75ZM19 11.75C19.4142 11.75 19.75 12.0858 19.75 12.5V13.5C19.75 13.9142 19.4142 14.25 19 14.25C18.5858 14.25 18.25 13.9142 18.25 13.5V12.5C18.25 12.0858 18.5858 11.75 19 11.75ZM3 7.75C3.41421 7.75 3.75 8.08579 3.75 8.5V9.5C3.75 9.91421 3.41421 10.25 3 10.25C2.58579 10.25 2.25 9.91421 2.25 9.5V8.5C2.25 8.08579 2.58579 7.75 3 7.75ZM19 7.75C19.4142 7.75 19.75 8.08579 19.75 8.5V9.5C19.75 9.91421 19.4142 10.25 19 10.25C18.5858 10.25 18.25 9.91421 18.25 9.5V8.5C18.25 8.08579 18.5858 7.75 19 7.75ZM3 0C4.65685 0 6 1.34315 6 3C6 4.65685 4.65685 6 3 6C1.34315 6 0 4.65685 0 3C0 1.34315 1.34315 0 3 0ZM19 0C20.6569 0 22 1.34315 22 3C22 4.65685 20.6569 6 19 6C17.3431 6 16 4.65685 16 3C16 1.34315 17.3431 0 19 0ZM3 1.5C2.17157 1.5 1.5 2.17157 1.5 3C1.5 3.82843 2.17157 4.5 3 4.5C3.82843 4.5 4.5 3.82843 4.5 3C4.5 2.17157 3.82843 1.5 3 1.5ZM19 1.5C18.1716 1.5 17.5 2.17157 17.5 3C17.5 3.82843 18.1716 4.5 19 4.5C19.8284 4.5 20.5 3.82843 20.5 3C20.5 2.17157 19.8284 1.5 19 1.5ZM9.5 2.25C9.91421 2.25 10.25 2.58579 10.25 3C10.25 3.41421 9.91421 3.75 9.5 3.75H8.5C8.08579 3.75 7.75 3.41421 7.75 3C7.75 2.58579 8.08579 2.25 8.5 2.25H9.5ZM13.5 2.25C13.9142 2.25 14.25 2.58579 14.25 3C14.25 3.41421 13.9142 3.75 13.5 3.75H12.5C12.0858 3.75 11.75 3.41421 11.75 3C11.75 2.58579 12.0858 2.25 12.5 2.25H13.5Z"
+      fill="currentColor"
+    />
   </svg>
 </template>
diff --git a/packages/frontend-2/components/global/icon/IconMeasurePoint.vue b/packages/frontend-2/components/global/icon/IconMeasurePoint.vue
index ed40673b1..0a681b700 100644
--- a/packages/frontend-2/components/global/icon/IconMeasurePoint.vue
+++ b/packages/frontend-2/components/global/icon/IconMeasurePoint.vue
@@ -1,42 +1,8 @@
 <template>
-  <svg width="24" height="24" viewBox="0 0 24 24" fill="none">
-    <g clip-path="url(#clip0_1396_52768)">
-      <path
-        d="M10.9601 13.41C10.5701 13.02 10.3701 12.51 10.3701 12C10.3701 11.49 10.5701 10.98 10.9601 10.59C11.3501 10.2 11.8601 10 12.3701 10C12.8801 10 13.3901 10.2 13.7801 10.59C14.1701 10.98 14.3701 11.49 14.3701 12C14.3701 12.51 14.1701 13.02 13.7801 13.41C13.3901 13.8 12.8801 14 12.3701 14C11.8601 14 11.3501 13.8 10.9601 13.41Z"
-        stroke="currentColor"
-        stroke-width="1.5"
-        stroke-linecap="round"
-        stroke-linejoin="round"
-      />
-      <path
-        d="M12.3701 1.83002C12.3701 4.10677 12.3701 7.66002 12.3701 7.66002"
-        stroke="currentColor"
-        stroke-width="1.5"
-        stroke-linecap="round"
-        stroke-linejoin="round"
-        stroke-dasharray="4 4"
-      />
-      <path
-        d="M21.72 17.72L15.79 14.41"
-        stroke="currentColor"
-        stroke-width="1.5"
-        stroke-linecap="round"
-        stroke-linejoin="round"
-        stroke-dasharray="4 4"
-      />
-      <path
-        d="M3 17.75L8.93 14.44"
-        stroke="currentColor"
-        stroke-width="1.5"
-        stroke-linecap="round"
-        stroke-linejoin="round"
-        stroke-dasharray="4 4"
-      />
-    </g>
-    <defs>
-      <clipPath id="clip0_1396_52768">
-        <rect width="24" height="24" fill="white" />
-      </clipPath>
-    </defs>
+  <svg width="22" height="22" viewBox="0 0 22 22" fill="none">
+    <path
+      d="M2.46481 16.6006C2.82352 16.3935 3.28213 16.5163 3.48923 16.875C3.69629 17.2337 3.5734 17.6923 3.21481 17.8994L2.3486 18.3994C1.98989 18.6065 1.5313 18.4837 1.32419 18.125C1.11709 17.7663 1.23994 17.3077 1.5986 17.1006L2.46481 16.6006ZM18.5107 16.875C18.7178 16.5163 19.1764 16.3936 19.5351 16.6006L20.4013 17.1006C20.76 17.3077 20.8829 17.7663 20.6757 18.125C20.4686 18.4837 20.01 18.6065 19.6513 18.3994L18.7851 17.8994C18.4266 17.6923 18.3037 17.2336 18.5107 16.875ZM6.14548 14.4756C6.50418 14.2685 6.9628 14.3913 7.16989 14.75C7.37695 15.1087 7.25407 15.5673 6.89548 15.7744L6.02926 16.2744C5.67056 16.4815 5.21197 16.3587 5.00485 16C4.79776 15.6413 4.9206 15.1827 5.27926 14.9756L6.14548 14.4756ZM14.83 14.75C15.0371 14.3913 15.4958 14.2686 15.8545 14.4756L16.7207 14.9756C17.0794 15.1827 17.2022 15.6413 16.9951 16C16.788 16.3587 16.3294 16.4815 15.9707 16.2744L15.1045 15.7744C14.7459 15.5673 14.623 15.1086 14.83 14.75ZM11 9.5C12.6568 9.5 14 10.8431 14 12.5C14 14.1569 12.6568 15.5 11 15.5C9.34313 15.5 7.99997 14.1568 7.99997 12.5C7.99997 10.8432 9.34313 9.50002 11 9.5ZM11 11C10.1716 11 9.49997 11.6716 9.49997 12.5C9.49997 13.3284 10.1716 14 11 14C11.8284 14 12.5 13.3284 12.5 12.5C12.5 11.6716 11.8284 11 11 11ZM11 5.5C11.4142 5.5 11.75 5.83579 11.75 6.25V7.25C11.75 7.66421 11.4142 8 11 8C10.5858 7.99998 10.25 7.6642 10.25 7.25V6.25C10.25 5.8358 10.5858 5.50002 11 5.5ZM11 1.25C11.4142 1.25 11.75 1.58579 11.75 2V3C11.75 3.41421 11.4142 3.75 11 3.75C10.5858 3.74998 10.25 3.4142 10.25 3V2C10.25 1.5858 10.5858 1.25002 11 1.25Z"
+      fill="currentColor"
+    />
   </svg>
 </template>
diff --git a/packages/frontend-2/components/global/icon/MeasurePerpendicular.vue b/packages/frontend-2/components/global/icon/MeasurePerpendicular.vue
index b50ec52bf..c1f486067 100644
--- a/packages/frontend-2/components/global/icon/MeasurePerpendicular.vue
+++ b/packages/frontend-2/components/global/icon/MeasurePerpendicular.vue
@@ -1,54 +1,8 @@
 <template>
-  <svg width="24" height="24" viewBox="0 0 24 24" fill="none">
+  <svg width="22" height="22" viewBox="0 0 22 22" fill="none">
     <path
-      d="M12 6V18"
-      stroke="currentColor"
-      stroke-width="1.5"
-      stroke-linecap="round"
-      stroke-linejoin="round"
-      stroke-dasharray="1 3"
-    />
-    <path
-      d="M12 22C13.1046 22 14 21.1046 14 20C14 18.8954 13.1046 18 12 18C10.8954 18 10 18.8954 10 20C10 21.1046 10.8954 22 12 22Z"
-      stroke="currentColor"
-      stroke-width="1.5"
-      stroke-linecap="round"
-      stroke-linejoin="round"
-    />
-    <path
-      d="M12 6C13.1046 6 14 5.10457 14 4C14 2.89543 13.1046 2 12 2C10.8954 2 10 2.89543 10 4C10 5.10457 10.8954 6 12 6Z"
-      stroke="currentColor"
-      stroke-width="1.5"
-      stroke-linecap="round"
-      stroke-linejoin="round"
-    />
-    <path
-      d="M6 20H10"
-      stroke="currentColor"
-      stroke-width="1.5"
-      stroke-linecap="round"
-      stroke-linejoin="round"
-    />
-    <path
-      d="M14 20H18"
-      stroke="currentColor"
-      stroke-width="1.5"
-      stroke-linecap="round"
-      stroke-linejoin="round"
-    />
-    <path
-      d="M6 4H10"
-      stroke="currentColor"
-      stroke-width="1.5"
-      stroke-linecap="round"
-      stroke-linejoin="round"
-    />
-    <path
-      d="M14 4H18"
-      stroke="currentColor"
-      stroke-width="1.5"
-      stroke-linecap="round"
-      stroke-linejoin="round"
+      d="M11 16C12.3976 16 13.569 16.9565 13.9023 18.25H19C19.4142 18.25 19.75 18.5858 19.75 19C19.75 19.4142 19.4142 19.75 19 19.75H13.9023C13.569 21.0435 12.3976 22 11 22C9.59958 22 8.42628 21.0397 8.0957 19.7422C8.06429 19.7462 8.0325 19.75 8 19.75H3C2.58579 19.75 2.25 19.4142 2.25 19C2.25 18.5858 2.58579 18.25 3 18.25H8C8.03246 18.25 8.06433 18.2528 8.0957 18.2568C8.4266 16.9598 9.59991 16 11 16ZM11 17.5C10.1716 17.5 9.5 18.1716 9.5 19C9.5 19.8284 10.1716 20.5 11 20.5C11.8284 20.5 12.5 19.8284 12.5 19C12.5 18.1716 11.8284 17.5 11 17.5ZM11 11.75C11.4142 11.75 11.75 12.0858 11.75 12.5V13.5C11.75 13.9142 11.4142 14.25 11 14.25C10.5858 14.25 10.25 13.9142 10.25 13.5V12.5C10.25 12.0858 10.5858 11.75 11 11.75ZM11 7.75C11.4142 7.75 11.75 8.08579 11.75 8.5V9.5C11.75 9.91421 11.4142 10.25 11 10.25C10.5858 10.25 10.25 9.91421 10.25 9.5V8.5C10.25 8.08579 10.5858 7.75 11 7.75ZM11 0C12.3976 0 13.569 0.956465 13.9023 2.25H19C19.4142 2.25 19.75 2.58579 19.75 3C19.75 3.41421 19.4142 3.75 19 3.75H13.9023C13.569 5.04354 12.3976 6 11 6C9.59958 6 8.42628 5.03968 8.0957 3.74219C8.06429 3.7462 8.0325 3.75 8 3.75H3C2.58579 3.75 2.25 3.41421 2.25 3C2.25 2.58579 2.58579 2.25 3 2.25H8C8.03246 2.25 8.06433 2.25284 8.0957 2.25684C8.4266 0.959806 9.59991 0 11 0ZM11 1.5C10.1716 1.5 9.5 2.17157 9.5 3C9.5 3.82843 10.1716 4.5 11 4.5C11.8284 4.5 12.5 3.82843 12.5 3C12.5 2.17157 11.8284 1.5 11 1.5Z"
+      fill="currentColor"
     />
   </svg>
 </template>
diff --git a/packages/frontend-2/components/global/icon/MeasurePointToPoint.vue b/packages/frontend-2/components/global/icon/MeasurePointToPoint.vue
index 5f8def8c4..0f862ab3c 100644
--- a/packages/frontend-2/components/global/icon/MeasurePointToPoint.vue
+++ b/packages/frontend-2/components/global/icon/MeasurePointToPoint.vue
@@ -1,33 +1,8 @@
 <template>
-  <svg width="24" height="24" viewBox="0 0 24 24" fill="none">
-    <g clip-path="url(#clip0_1396_52717)">
-      <path
-        d="M16.87 5.64999L8.13 18.35"
-        stroke="currentColor"
-        stroke-width="1.5"
-        stroke-linecap="round"
-        stroke-linejoin="round"
-        stroke-dasharray="1 3"
-      />
-      <path
-        d="M7 22C6.45 22 5.95 21.78 5.59 21.41C5.23 21.04 5 20.55 5 20C5 19.45 5.22 18.95 5.59 18.59C5.96 18.23 6.45 18 7 18C7.55 18 8.05 18.22 8.41 18.59C8.77 18.96 9 19.45 9 20C9 20.55 8.78 21.05 8.41 21.41C8.04 21.77 7.55 22 7 22Z"
-        stroke="currentColor"
-        stroke-width="1.5"
-        stroke-linecap="round"
-        stroke-linejoin="round"
-      />
-      <path
-        d="M18 6C17.45 6 16.95 5.78 16.59 5.41C16.23 5.04 16 4.55 16 4C16 3.45 16.22 2.95 16.59 2.59C16.96 2.23 17.45 2 18 2C18.55 2 19.05 2.22 19.41 2.59C19.77 2.96 20 3.45 20 4C20 4.55 19.78 5.05 19.41 5.41C19.04 5.77 18.55 6 18 6Z"
-        stroke="currentColor"
-        stroke-width="1.5"
-        stroke-linecap="round"
-        stroke-linejoin="round"
-      />
-    </g>
-    <defs>
-      <clipPath id="clip0_1396_52717">
-        <rect width="17" height="22" fill="white" transform="translate(4 1)" />
-      </clipPath>
-    </defs>
+  <svg width="22" height="22" viewBox="0 0 22 22" fill="none">
+    <path
+      d="M3 16C4.65685 16 6 17.3431 6 19C6 20.6569 4.65685 22 3 22C1.34315 22 0 20.6569 0 19C0 17.3431 1.34315 16 3 16ZM3 17.5C2.17157 17.5 1.5 18.1716 1.5 19C1.5 19.8284 2.17157 20.5 3 20.5C3.82843 20.5 4.5 19.8284 4.5 19C4.5 18.1716 3.82843 17.5 3 17.5ZM7.07324 13.8662C7.36614 13.5733 7.8409 13.5733 8.13379 13.8662C8.42668 14.1591 8.42668 14.6339 8.13379 14.9268L7.42676 15.6338C7.13386 15.9267 6.6591 15.9267 6.36621 15.6338C6.07332 15.3409 6.07332 14.8661 6.36621 14.5732L7.07324 13.8662ZM10.8232 10.1162C11.1161 9.82332 11.5909 9.82332 11.8838 10.1162C12.1767 10.4091 12.1767 10.8839 11.8838 11.1768L11.1768 11.8838C10.8839 12.1767 10.4091 12.1767 10.1162 11.8838C9.82332 11.5909 9.82332 11.1161 10.1162 10.8232L10.8232 10.1162ZM14.5732 6.36621C14.8661 6.07332 15.3409 6.07332 15.6338 6.36621C15.9267 6.6591 15.9267 7.13386 15.6338 7.42676L14.9268 8.13379C14.6339 8.42668 14.1591 8.42668 13.8662 8.13379C13.5733 7.8409 13.5733 7.36614 13.8662 7.07324L14.5732 6.36621ZM19 0C20.6569 0 22 1.34315 22 3C22 4.65685 20.6569 6 19 6C17.3431 6 16 4.65685 16 3C16 1.34315 17.3431 0 19 0ZM19 1.5C18.1716 1.5 17.5 2.17157 17.5 3C17.5 3.82843 18.1716 4.5 19 4.5C19.8284 4.5 20.5 3.82843 20.5 3C20.5 2.17157 19.8284 1.5 19 1.5Z"
+      fill="#1A1A1A"
+    />
   </svg>
 </template>
diff --git a/packages/frontend-2/components/viewer/measurements/Menu.vue b/packages/frontend-2/components/viewer/measurements/Menu.vue
index 5cf45ba91..d0a1f2d38 100644
--- a/packages/frontend-2/components/viewer/measurements/Menu.vue
+++ b/packages/frontend-2/components/viewer/measurements/Menu.vue
@@ -87,11 +87,10 @@ interface MeasurementTypeOption {
 
 const { measurementOptions, setMeasurementOptions, clearMeasurements } =
   useMeasurementUtilities()
+const { getTooltipProps } = useSmartTooltipDelay()
 
 const showSettings = ref(false)
 
-const { getTooltipProps } = useSmartTooltipDelay()
-
 const updateMeasurementsType = (selectedOption: MeasurementTypeOption) => {
   setMeasurementOptions({
     ...measurementOptions.value,