diff --git a/toonz/sources/toonz/icons/dark/actions/20/eraser_polyline.svg b/toonz/sources/toonz/icons/dark/actions/20/eraser_polyline.svg
index 51e2923..f1aaec9 100644
--- a/toonz/sources/toonz/icons/dark/actions/20/eraser_polyline.svg
+++ b/toonz/sources/toonz/icons/dark/actions/20/eraser_polyline.svg
@@ -1,17 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="20px" height="20px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <g transform="matrix(1,0,0,1,-10,-430)">
-        <g id="eraser_polyline" transform="matrix(1,0,0,1,-0.100776,0)">
-            <g transform="matrix(1,0,0,1,0.100776,420)">
-                <rect x="10" y="10" width="20" height="20" style="fill-opacity:0;"/>
-            </g>
-            <g transform="matrix(1,0,0,1,-0.0503878,99)">
-                <path d="M25.511,340.321C25.297,340.378 25.099,340.493 24.939,340.657C24.939,340.657 18.459,347.346 18.459,347.346C18.228,347.585 18.097,347.909 18.101,348.247C18.103,348.585 18.238,348.907 18.474,349.142L20.191,350.853C20.284,350.947 20.411,350.999 20.544,350.999L21.075,351C21.082,351 21.088,351 21.095,351L29.539,351C29.661,351 29.779,350.947 29.865,350.854C29.951,350.76 30,350.633 30,350.5C30,350.367 29.951,350.24 29.865,350.146C29.779,350.053 29.661,350 29.539,350L24.976,350C26.139,348.731 28.327,346.346 29.405,345.179C29.406,345.179 29.406,345.179 29.406,345.179C29.863,344.683 29.853,343.903 29.385,343.42C29.385,343.42 26.708,340.657 26.708,340.657C26.518,340.461 26.273,340.335 26.01,340.295C25.942,340.239 25.857,340.209 25.768,340.21C25.671,340.212 25.579,340.252 25.511,340.321ZM22.78,344.323L25.908,347.504C24.9,348.602 23.971,349.616 23.619,350C23.619,350 20.751,350 20.751,350C20.439,349.689 19.697,348.949 19.18,348.434C19.129,348.383 19.101,348.313 19.101,348.24C19.101,348.239 19.101,348.238 19.101,348.237C19.1,348.164 19.127,348.094 19.177,348.042L22.78,344.323Z"/>
-            </g>
-            <g transform="matrix(1,0,0,1,-29.8992,0)">
-                <path d="M45.218,443.948L43.778,444.368C43.526,444.442 43.26,444.307 43.169,444.061C43.169,444.061 43.106,443.889 42.996,443.592C42.901,443.333 43.033,443.045 43.292,442.95C43.551,442.854 43.839,442.987 43.934,443.246L43.946,443.277L44.938,442.988C45.203,442.911 45.481,443.063 45.558,443.328C45.635,443.593 45.483,443.871 45.218,443.948ZM46.858,442.428L48.778,441.868C49.043,441.791 49.321,441.943 49.398,442.208C49.475,442.473 49.323,442.751 49.058,442.828L47.138,443.388C46.873,443.465 46.595,443.313 46.518,443.048C46.441,442.783 46.593,442.505 46.858,442.428ZM41.613,439.838C41.518,439.579 41.651,439.292 41.909,439.196C42.168,439.101 42.456,439.234 42.552,439.493L43.243,441.369C43.338,441.628 43.206,441.916 42.947,442.011C42.688,442.107 42.4,441.974 42.305,441.715L41.613,439.838ZM51.258,441.145L50.401,442.03C50.383,441.999 50.369,441.964 50.358,441.928C50.281,441.663 50.433,441.385 50.698,441.308L51.258,441.145ZM40.922,437.962L40.23,436.085C40.135,435.826 40.268,435.538 40.527,435.443C40.786,435.348 41.073,435.48 41.169,435.739L41.86,437.616C41.955,437.875 41.823,438.163 41.564,438.258C41.305,438.353 41.017,438.221 40.922,437.962ZM55.284,437.741C55.194,437.651 55.138,437.526 55.138,437.388L55.138,435.388C55.138,435.112 55.362,434.888 55.638,434.888C55.914,434.888 56.138,435.112 56.138,435.388L56.138,437.388C56.138,437.528 56.081,437.655 55.988,437.746C55.859,437.72 55.726,437.708 55.591,437.711C55.488,437.712 55.385,437.723 55.284,437.741ZM50.223,436.51L49.492,437.242C49.364,437.369 49.178,437.418 49.004,437.37C49.004,437.37 48.647,437.27 48.074,437.111C47.808,437.038 47.653,436.762 47.726,436.496C47.8,436.23 48.076,436.074 48.342,436.148L48.991,436.328L49.516,435.803C49.711,435.607 50.028,435.607 50.223,435.803C50.419,435.998 50.419,436.315 50.223,436.51ZM46.147,436.576L44.22,436.041C43.954,435.967 43.799,435.691 43.872,435.425C43.946,435.159 44.222,435.004 44.488,435.077L46.415,435.613C46.681,435.687 46.837,435.962 46.763,436.228C46.689,436.494 46.413,436.65 46.147,436.576ZM42.293,435.506L40.366,434.97C40.1,434.896 39.944,434.621 40.018,434.355C40.092,434.089 40.368,433.933 40.634,434.007L42.561,434.542C42.827,434.616 42.983,434.892 42.909,435.158C42.835,435.424 42.559,435.579 42.293,435.506ZM50.931,434.388L52.345,432.974C52.54,432.779 52.857,432.779 53.052,432.974C53.247,433.169 53.247,433.486 53.052,433.681L51.638,435.095C51.442,435.291 51.126,435.291 50.931,435.095C50.735,434.9 50.735,434.584 50.931,434.388ZM53.759,431.56L55.173,430.146C55.368,429.951 55.685,429.951 55.88,430.146C56.075,430.341 56.075,430.658 55.88,430.853L55.813,430.92C56.003,430.991 56.138,431.174 56.138,431.388L56.138,433.388C56.138,433.664 55.914,433.888 55.638,433.888C55.362,433.888 55.138,433.664 55.138,433.388L55.138,431.595L54.466,432.267C54.271,432.462 53.954,432.462 53.759,432.267C53.564,432.072 53.564,431.755 53.759,431.56Z"/>
-            </g>
-        </g>
+<svg width="100%" height="100%" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g id="eraser_polyline">
+        <rect x="0" y="0" width="20" height="20" style="fill-opacity:0;"/>
+        <path d="M15.36,9.321c-0.214,0.057 -0.412,0.172 -0.572,0.336c0,0 -6.48,6.689 -6.48,6.689c-0.231,0.239 -0.362,0.563 -0.358,0.901c0.002,0.338 0.137,0.66 0.373,0.895l1.717,1.711c0.093,0.094 0.22,0.146 0.353,0.146l0.531,0.001c0.007,-0 0.013,0 0.019,0l8.445,0c0.122,0 0.24,-0.053 0.326,-0.146c0.085,-0.094 0.135,-0.221 0.135,-0.354c-0,-0.133 -0.05,-0.26 -0.135,-0.354c-0.086,-0.093 -0.204,-0.146 -0.326,-0.146l-4.564,0c1.164,-1.269 3.352,-3.654 4.43,-4.821c0,0 0.001,-0 0.001,-0c0.456,-0.496 0.447,-1.276 -0.021,-1.759c0,0 -2.677,-2.763 -2.677,-2.763c-0.19,-0.196 -0.435,-0.322 -0.699,-0.362c-0.133,-0.019 -0.359,-0.012 -0.498,0.026Zm-2.731,4.002l3.128,3.181c-1.008,1.098 -1.937,2.112 -2.289,2.496c-0,-0 -2.869,-0 -2.869,-0c-0.311,-0.311 -1.053,-1.051 -1.57,-1.566c-0.051,-0.051 -0.079,-0.121 -0.079,-0.194c-0,-0.001 -0,-0.002 -0,-0.003c-0.001,-0.073 0.026,-0.143 0.076,-0.195l3.603,-3.719Z"/>
+        <path d="M15,1.734l-0.534,0.533c-0.195,0.195 -0.512,0.195 -0.707,0c-0.195,-0.195 -0.195,-0.512 0,-0.707l1.304,-1.304c0.086,-0.153 0.25,-0.256 0.437,-0.256c0.276,-0 0.5,0.224 0.5,0.5c0,0.017 0,0.035 -0,0.052l0,1.948c0,0.276 -0.224,0.5 -0.5,0.5c-0.276,-0 -0.5,-0.224 -0.5,-0.5l0,-0.766Zm1,3.766l0,2c0,0.276 -0.224,0.5 -0.5,0.5c-0.276,0 -0.5,-0.224 -0.5,-0.5l0,-2c0,-0.276 0.224,-0.5 0.5,-0.5c0.276,0 0.5,0.224 0.5,0.5Zm-10.782,8.448l-1.44,0.42c-0.252,0.074 -0.518,-0.061 -0.609,-0.307c0,0 -0.063,-0.172 -0.173,-0.469c-0.095,-0.259 0.037,-0.547 0.296,-0.642c0.259,-0.096 0.547,0.037 0.642,0.296l0.012,0.031l0.992,-0.289c0.265,-0.077 0.543,0.075 0.62,0.34c0.077,0.265 -0.075,0.543 -0.34,0.62Zm1.64,-1.52l1.92,-0.56c0.265,-0.077 0.543,0.075 0.62,0.34c0.077,0.265 -0.075,0.543 -0.34,0.62l-1.92,0.56c-0.265,0.077 -0.543,-0.075 -0.62,-0.34c-0.077,-0.265 0.075,-0.543 0.34,-0.62Zm-5.245,-2.59c-0.095,-0.259 0.038,-0.546 0.296,-0.642c0.259,-0.095 0.547,0.038 0.643,0.297l0.691,1.876c0.095,0.259 -0.037,0.547 -0.296,0.642c-0.259,0.096 -0.547,-0.037 -0.642,-0.296l-0.692,-1.877Zm-0.691,-1.876l-0.692,-1.877c-0.095,-0.259 0.038,-0.547 0.297,-0.642c0.259,-0.095 0.546,0.037 0.642,0.296l0.691,1.877c0.095,0.259 -0.037,0.547 -0.296,0.642c-0.259,0.095 -0.547,-0.037 -0.642,-0.296Zm9.301,-1.452l-0.731,0.732c-0.128,0.127 -0.314,0.176 -0.488,0.128c0,0 -0.357,-0.1 -0.93,-0.259c-0.266,-0.073 -0.421,-0.349 -0.348,-0.615c0.074,-0.266 0.35,-0.422 0.616,-0.348l0.649,0.18l0.525,-0.525c0.195,-0.196 0.512,-0.196 0.707,0c0.196,0.195 0.196,0.512 0,0.707Zm-4.076,0.066l-1.927,-0.535c-0.266,-0.074 -0.421,-0.35 -0.348,-0.616c0.074,-0.266 0.35,-0.421 0.616,-0.348l1.927,0.536c0.266,0.074 0.422,0.349 0.348,0.615c-0.074,0.266 -0.35,0.422 -0.616,0.348Zm-3.854,-1.07l-1.927,-0.536c-0.266,-0.074 -0.422,-0.349 -0.348,-0.615c0.074,-0.266 0.35,-0.422 0.616,-0.348l1.927,0.535c0.266,0.074 0.422,0.35 0.348,0.616c-0.074,0.266 -0.35,0.421 -0.616,0.348Zm8.638,-1.118l1.414,-1.414c0.195,-0.195 0.512,-0.195 0.707,0c0.195,0.195 0.195,0.512 0,0.707l-1.414,1.414c-0.196,0.196 -0.512,0.196 -0.707,0c-0.196,-0.195 -0.196,-0.511 0,-0.707Z"/>
     </g>
 </svg>
diff --git a/toonz/sources/toonz/icons/dark/actions/20/eraser_segment.svg b/toonz/sources/toonz/icons/dark/actions/20/eraser_segment.svg
index c99e55b..8a92d3b 100644
--- a/toonz/sources/toonz/icons/dark/actions/20/eraser_segment.svg
+++ b/toonz/sources/toonz/icons/dark/actions/20/eraser_segment.svg
@@ -1,26 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="20px" height="20px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;">
-    <g transform="matrix(1,0,0,1,-10,-460)">
-        <g id="type_erase_segment">
-            <g transform="matrix(1,0,0,1,0,450)">
-                <rect x="10" y="10" width="20" height="20" style="fill-opacity:0;"/>
-            </g>
-            <g transform="matrix(1,0,0,0.47619,6.05566,464)">
-                <rect x="17" y="10.5" width="2" height="10.5" style="fill-opacity:0.5;"/>
-            </g>
-            <g transform="matrix(1,0,0,1,8.05566,458)">
-                <path d="M15,17L11,17L11,15L21,15L21,17L17,17L17,21L15,21L15,17Z"/>
-            </g>
-            <g transform="matrix(1,0,0,1,8.05566,459)">
-                <path d="M14,12.5C14,12.367 13.958,12.24 13.885,12.146C13.812,12.053 13.712,12 13.608,12L6.392,12C6.288,12 6.188,12.053 6.114,12.146C6.042,12.24 6,12.367 6,12.5C6,12.633 6.042,12.76 6.114,12.854C6.188,12.947 6.288,13 6.392,13L13.608,13C13.712,13 13.812,12.947 13.885,12.854C13.958,12.76 14,12.633 14,12.5ZM21,12.5C21,12.367 20.959,12.24 20.886,12.146C20.812,12.053 20.712,12 20.608,12L18.393,12C18.288,12 18.189,12.053 18.115,12.146C18.042,12.24 18,12.367 18,12.5C18,12.633 18.042,12.76 18.115,12.854C18.189,12.947 18.288,13 18.393,13L20.608,13C20.712,13 20.812,12.947 20.886,12.854C20.959,12.76 21,12.633 21,12.5Z"/>
-            </g>
-            <g transform="matrix(0.538164,0.538164,-0.63979,0.63979,10.6385,393.659)">
-                <path d="M78.024,47.028C78.01,46.559 77.555,46.185 76.998,46.185L71.771,46.185C71.499,46.185 71.238,46.276 71.045,46.438C70.853,46.6 70.745,46.819 70.745,47.048L70.745,57.693C70.745,57.924 70.855,58.146 71.052,58.308C71.248,58.471 71.513,58.56 71.789,58.556C73.073,58.537 75.084,58.508 75.084,58.508L78.302,55.802C78.302,55.802 78.095,49.569 78.024,47.028Z" style="fill:none;stroke:black;stroke-width:1.2px;"/>
-            </g>
-            <g transform="matrix(0.498774,0.484773,-0.634146,0.652461,13.1504,397.038)">
-                <path d="M77.961,46.576L70.706,46.576L70.745,51.533L77.982,51.571L77.961,46.576Z" style="stroke:black;stroke-width:0.92px;"/>
-            </g>
-        </g>
+<svg width="100%" height="100%" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;">
+    <g id="type_erase_segment">
+        <rect x="-0.028" y="0" width="20" height="20" style="fill-opacity:0;"/>
+        <rect x="14" y="16" width="1.972" height="4"/>
+        <path d="M20,15l-3,0l0,-2l3,0l-0,2Z"/>
+        <path d="M12.986,15l-11.014,0l0,-2l11.014,0l0,2Z" style="fill:url(#_Linear1);"/>
+        <rect x="14" y="2" width="1.972" height="10" style="fill:url(#_Linear2);"/>
+        <path d="M16.986,12l0,4l-4,0l0,-4l4,0Zm-1,1l-2,-0l0,2l2,0l0,-2Z"/>
+        <path d="M12.028,10.5c-0,-0.133 -0.042,-0.26 -0.115,-0.354c-0.073,-0.093 -0.173,-0.146 -0.277,-0.146l-8.216,0c-0.104,0 -0.204,0.053 -0.278,0.146c-0.072,0.094 -0.114,0.221 -0.114,0.354c-0,0.133 0.042,0.26 0.114,0.354c0.074,0.093 0.174,0.146 0.278,0.146l8.216,0c0.104,0 0.204,-0.053 0.277,-0.146c0.073,-0.094 0.115,-0.221 0.115,-0.354Zm8,0c-0,-0.133 -0.041,-0.26 -0.114,-0.354c-0.074,-0.093 -0.174,-0.146 -0.278,-0.146l-1.215,0c-0.105,0 -0.204,0.053 -0.278,0.146c-0.073,0.094 -0.115,0.221 -0.115,0.354c-0,0.133 0.042,0.26 0.115,0.354c0.074,0.093 0.173,0.146 0.278,0.146l1.215,0c0.104,0 0.204,-0.053 0.278,-0.146c0.073,-0.094 0.114,-0.221 0.114,-0.354Z"/>
+        <path d="M11.512,4.737c0.293,-0.308 0.287,-0.792 -0.013,-1.092l-2.812,-2.813c-0.147,-0.146 -0.346,-0.228 -0.553,-0.228c-0.207,-0 -0.405,0.082 -0.552,0.228l-6.81,6.811c-0.148,0.148 -0.231,0.349 -0.229,0.559c0.002,0.209 0.087,0.409 0.238,0.555c0.704,0.679 1.804,1.742 1.804,1.742l3.463,0.001c0,-0 3.877,-4.099 5.464,-5.763Z" style="fill:none;stroke:#000;stroke-width:1px;"/>
+        <path d="M11.472,4.221l-3.619,-3.517l-3.124,3.253l3.585,3.533l3.158,-3.269Z" style="stroke:#000;stroke-width:0.75px;"/>
     </g>
+    <defs>
+        <linearGradient id="_Linear1" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-10.9884,1.40764e-15,-1.40764e-15,-12,12.9861,14)"><stop offset="0" style="stop-color:#000;stop-opacity:1"/><stop offset="1" style="stop-color:#000;stop-opacity:0"/></linearGradient>
+        <linearGradient id="_Linear2" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(6.73556e-16,-10,11,6.12323e-16,15,12)"><stop offset="0" style="stop-color:#000;stop-opacity:1"/><stop offset="1" style="stop-color:#000;stop-opacity:0"/></linearGradient>
+    </defs>
 </svg>
diff --git a/toonz/sources/toonz/icons/dark/actions/20/fill_freepick.svg b/toonz/sources/toonz/icons/dark/actions/20/fill_freepick.svg
new file mode 100644
index 0000000..81f3e1e
--- /dev/null
+++ b/toonz/sources/toonz/icons/dark/actions/20/fill_freepick.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:1;">
+    <g id="pick_freehand">
+        <rect x="0" y="0" width="20" height="20" style="fill-opacity:0;"/>
+        <path d="M13.237,10.082l-0.814,-0.815l1.643,-1.641l1.088,1.088l2.196,-2.195c0.606,-0.607 1.589,-0.607 2.195,-0c0.607,0.605 0.607,1.589 0,2.195l-2.195,2.195l1.098,1.099l-1.643,1.641l-0.823,-0.822l-6.62,6.62c-0.771,0.77 -2.019,0.77 -2.789,-0c-0.001,-0 -0.001,-0.001 -0.001,-0.001c-0.745,-0.745 -0.746,-1.953 0,-2.699l6.665,-6.665Zm0.549,0.549l-6.665,6.665c-0.442,0.442 -0.442,1.158 0,1.6c0.001,0 0.001,0.001 0.002,0.001c0.466,0.467 1.223,0.467 1.69,0.001l6.62,-6.62l-1.647,-1.647Z"/>
+        <path d="M1.489,14.56c0.918,0.031 2.311,0.189 2.849,-0.864c0.811,-1.708 -0.751,-3.005 -1.33,-3.535c-2.024,-1.569 -2.133,-1.859 -2.352,-2.415c-0.273,-0.694 -0.187,-1.665 0.019,-2.373c0.266,-0.92 0.573,-1.645 1.12,-2.359c0.337,-0.44 0.66,-0.781 1.103,-1.102c1.318,-0.954 2.626,-1.372 4.113,-1.419c2.335,-0.072 4.881,0.197 6.277,2.611c0.282,0.486 0.884,1.861 0.601,3.42c-0.1,0.553 -0.545,1.354 -1.03,1.859c-0.794,0.827 -1.881,1.212 -2.534,1.479c-0.885,0.361 -2.591,0.611 -4.115,0.527" style="fill:none;stroke:#000;stroke-width:1px;"/>
+        <ellipse cx="3.621" cy="10.323" rx="2.392" ry="1.846" style="fill:none;stroke:#000;stroke-width:1px;stroke-linejoin:round;stroke-miterlimit:1.5;"/>
+    </g>
+</svg>
diff --git a/toonz/sources/toonz/icons/dark/actions/20/fill_polyline.svg b/toonz/sources/toonz/icons/dark/actions/20/fill_polyline.svg
index 6ad9ea8..cd9fb34 100644
--- a/toonz/sources/toonz/icons/dark/actions/20/fill_polyline.svg
+++ b/toonz/sources/toonz/icons/dark/actions/20/fill_polyline.svg
@@ -1,17 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="20px" height="20px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <g transform="matrix(1,0,0,1,-10,-580)">
-        <g id="fill_polyline" transform="matrix(1,0,0,1,-0.100776,150)">
-            <g transform="matrix(1,0,0,1,0.100776,420)">
-                <rect x="10" y="10" width="20" height="20" style="fill-opacity:0;"/>
-            </g>
-            <g transform="matrix(-1,0,0,1,31.1138,435.309)">
-                <path d="M4.72,5.099L2.316,2.695C2.072,2.451 2.072,2.055 2.316,1.812C2.559,1.568 2.955,1.568 3.199,1.812L5.604,4.216L7.493,2.327C7.656,2.164 7.919,2.164 8.082,2.327L13.376,7.621L13.373,7.614C14.686,9.071 16,10.82 16,12.193C16,13.112 15.254,13.858 14.335,13.858C13.416,13.858 12.67,13.112 12.67,12.193C12.67,10.899 14.017,10.011 13.492,7.997C13.476,8.075 13.438,8.15 13.377,8.211L7.264,14.325C7.029,14.559 6.712,14.691 6.38,14.691C6.049,14.69 5.732,14.559 5.498,14.325L1.38,10.207C1.145,9.972 1.014,9.655 1.013,9.324C1.013,8.992 1.145,8.675 1.379,8.441L4.72,5.099ZM6.192,4.805L7.283,5.896C7.527,6.14 7.527,6.536 7.284,6.78C7.04,7.023 6.644,7.023 6.4,6.779L5.309,5.688L3.306,7.691L12.269,7.691L7.787,3.21L6.192,4.805Z"/>
-            </g>
-            <g transform="matrix(1,0,0,1,0.100776,-150)">
-                <path d="M14.812,594.067L13.778,594.368C13.526,594.442 13.26,594.307 13.169,594.061C13.169,594.061 13.106,593.889 12.996,593.592C12.901,593.333 13.033,593.045 13.292,592.95C13.551,592.854 13.839,592.987 13.934,593.246L13.946,593.277L14.938,592.988C15.142,592.929 15.353,593.005 15.475,593.163C15.241,593.461 15.017,593.764 14.812,594.067ZM11.613,589.838C11.518,589.579 11.651,589.292 11.909,589.196C12.168,589.101 12.456,589.234 12.552,589.493L13.243,591.369C13.338,591.628 13.206,591.916 12.947,592.011C12.688,592.107 12.4,591.974 12.305,591.715L11.613,589.838ZM10.922,587.962L10.23,586.085C10.135,585.826 10.268,585.538 10.527,585.443C10.786,585.348 11.073,585.48 11.169,585.739L11.86,587.616C11.955,587.875 11.823,588.163 11.564,588.258C11.305,588.353 11.017,588.221 10.922,587.962ZM25.138,587.133L25.138,585.388C25.138,585.112 25.362,584.888 25.638,584.888C25.914,584.888 26.138,585.112 26.138,585.388L26.138,586.675L25.409,587.404L25.138,587.133ZM20.223,586.51L19.492,587.242C19.364,587.369 19.178,587.418 19.004,587.37C19.004,587.37 18.647,587.27 18.074,587.111C17.808,587.038 17.653,586.762 17.726,586.496C17.8,586.23 18.076,586.074 18.342,586.148L18.991,586.328L19.516,585.803C19.711,585.607 20.028,585.607 20.223,585.803C20.419,585.998 20.419,586.315 20.223,586.51ZM16.147,586.576L14.22,586.041C13.954,585.967 13.799,585.691 13.872,585.425C13.946,585.159 14.222,585.004 14.488,585.077L16.415,585.613C16.681,585.687 16.837,585.962 16.763,586.228C16.689,586.494 16.413,586.65 16.147,586.576ZM12.293,585.506L10.366,584.97C10.1,584.896 9.944,584.621 10.018,584.355C10.092,584.089 10.368,583.933 10.634,584.007L12.561,584.542C12.827,584.616 12.983,584.892 12.909,585.158C12.835,585.424 12.559,585.579 12.293,585.506ZM20.931,584.388L22.345,582.974C22.54,582.779 22.857,582.779 23.052,582.974C23.247,583.169 23.247,583.486 23.052,583.681L21.638,585.095C21.442,585.291 21.126,585.291 20.931,585.095C20.735,584.9 20.735,584.584 20.931,584.388ZM23.759,581.56L25.173,580.146C25.368,579.951 25.685,579.951 25.88,580.146C26.075,580.341 26.075,580.658 25.88,580.853L25.813,580.92C26.003,580.991 26.138,581.174 26.138,581.388L26.138,583.388C26.138,583.664 25.914,583.888 25.638,583.888C25.362,583.888 25.138,583.664 25.138,583.388L25.138,581.595L24.466,582.267C24.271,582.462 23.954,582.462 23.759,582.267C23.564,582.072 23.564,581.755 23.759,581.56Z"/>
-            </g>
-        </g>
+<svg width="100%" height="100%" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g id="fill_polyline">
+        <rect x="0" y="0" width="20" height="20" style="fill-opacity:0;"/>
+        <path d="M16.293,10.408l2.404,-2.404c0.244,-0.244 0.244,-0.64 0,-0.883c-0.243,-0.244 -0.639,-0.244 -0.883,-0l-2.405,2.404l-1.889,-1.889c-0.163,-0.163 -0.426,-0.163 -0.589,-0l-5.294,5.294l0.003,-0.007c-1.313,1.457 -2.627,3.206 -2.627,4.579c0,0.919 0.746,1.665 1.665,1.665c0.919,-0 1.665,-0.746 1.665,-1.665c0,-1.294 -1.347,-2.182 -0.822,-4.196c0.016,0.078 0.054,0.153 0.115,0.214l6.113,6.114c0.235,0.234 0.552,0.366 0.884,0.366c0.331,-0.001 0.648,-0.132 0.882,-0.366l4.118,-4.118c0.235,-0.235 0.366,-0.552 0.367,-0.883c0,-0.332 -0.132,-0.649 -0.366,-0.883l-3.341,-3.342Zm-1.472,-0.294l-1.091,1.091c-0.244,0.244 -0.244,0.64 -0.001,0.884c0.244,0.243 0.64,0.243 0.884,-0.001l1.091,-1.091l2.003,2.003l-8.963,-0l4.482,-4.481l1.595,1.595Z"/>
+        <path d="M15,1.734l-0.534,0.533c-0.195,0.195 -0.512,0.195 -0.707,0c-0.195,-0.195 -0.195,-0.512 0,-0.707l1.304,-1.304c0.086,-0.153 0.25,-0.256 0.437,-0.256c0.276,0 0.5,0.224 0.5,0.5c0,0.017 0,0.035 -0,0.052l0,1.948c0,0.276 -0.224,0.5 -0.5,0.5c-0.276,0 -0.5,-0.224 -0.5,-0.5l0,-0.766Zm1,3.766l0,2c0,0.276 -0.224,0.5 -0.5,0.5c-0.276,0 -0.5,-0.224 -0.5,-0.5l0,-2c0,-0.276 0.224,-0.5 0.5,-0.5c0.276,0 0.5,0.224 0.5,0.5Zm-10.782,8.448l-1.44,0.42c-0.252,0.074 -0.518,-0.061 -0.609,-0.307c0,0 -0.063,-0.172 -0.173,-0.469c-0.095,-0.259 0.037,-0.547 0.296,-0.642c0.259,-0.096 0.547,0.037 0.642,0.296l0.012,0.031l0.992,-0.289c0.265,-0.077 0.543,0.075 0.62,0.34c0.077,0.265 -0.075,0.543 -0.34,0.62Zm-3.605,-4.11c-0.095,-0.259 0.038,-0.546 0.296,-0.642c0.259,-0.095 0.547,0.038 0.643,0.297l0.691,1.876c0.095,0.259 -0.037,0.547 -0.296,0.642c-0.259,0.096 -0.547,-0.037 -0.642,-0.296l-0.692,-1.877Zm-0.691,-1.876l-0.692,-1.877c-0.095,-0.259 0.038,-0.547 0.297,-0.642c0.259,-0.095 0.546,0.037 0.642,0.296l0.691,1.877c0.095,0.259 -0.037,0.547 -0.296,0.642c-0.259,0.095 -0.547,-0.037 -0.642,-0.296Zm9.301,-1.452l-0.731,0.732c-0.128,0.127 -0.314,0.176 -0.488,0.128c0,0 -0.357,-0.1 -0.93,-0.259c-0.266,-0.073 -0.421,-0.349 -0.348,-0.615c0.074,-0.266 0.35,-0.422 0.616,-0.348l0.649,0.18l0.525,-0.525c0.195,-0.196 0.512,-0.196 0.707,0c0.196,0.195 0.196,0.512 0,0.707Zm-4.076,0.066l-1.927,-0.535c-0.266,-0.074 -0.421,-0.35 -0.348,-0.616c0.074,-0.266 0.35,-0.421 0.616,-0.348l1.927,0.536c0.266,0.074 0.422,0.349 0.348,0.615c-0.074,0.266 -0.35,0.422 -0.616,0.348Zm-3.854,-1.07l-1.927,-0.536c-0.266,-0.074 -0.422,-0.349 -0.348,-0.615c0.074,-0.266 0.35,-0.422 0.616,-0.348l1.927,0.535c0.266,0.074 0.422,0.35 0.348,0.616c-0.074,0.266 -0.35,0.421 -0.616,0.348Zm8.638,-1.118l1.414,-1.414c0.195,-0.195 0.512,-0.195 0.707,0c0.195,0.195 0.195,0.512 0,0.707l-1.414,1.414c-0.196,0.196 -0.512,0.196 -0.707,0c-0.196,-0.195 -0.196,-0.511 0,-0.707Z"/>
     </g>
 </svg>
diff --git a/toonz/sources/toonz/icons/dark/actions/20/type_erase_segment.svg b/toonz/sources/toonz/icons/dark/actions/20/type_erase_segment.svg
new file mode 100644
index 0000000..361d806
--- /dev/null
+++ b/toonz/sources/toonz/icons/dark/actions/20/type_erase_segment.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g id="type_erase_segment">
+        <rect x="0" y="-0" width="20" height="20" style="fill-opacity:0;"/>
+        <rect x="9" y="15" width="3" height="5"/>
+        <path d="M20,13l-0,-3l-6,-0l0,3l6,-0Z"/>
+        <path d="M7,13l-0,-3l-7,-0l0,3l7,-0Z" style="fill:url(#_Linear1);"/>
+        <rect x="9" y="-0" width="3" height="9" style="fill:url(#_Linear2);"/>
+        <path d="M14,8l0,7l-7,-0l-0,-7l7,-0Zm-2,2l-3,0l0,3l3,-0l0,-3Z"/>
+        <path d="M20,6.5c0,0.133 -0.061,0.26 -0.171,0.354c-0.111,0.093 -0.261,0.146 -0.417,0.146l-1.822,-0c-0.158,-0 -0.306,-0.053 -0.418,-0.146c-0.109,-0.094 -0.172,-0.221 -0.172,-0.354c0,-0.133 0.063,-0.26 0.172,-0.354c0.112,-0.093 0.26,-0.146 0.418,-0.146l1.822,-0c0.156,-0 0.306,0.053 0.417,0.146c0.11,0.094 0.171,0.221 0.171,0.354Zm-4,-0c0,0.133 -0.061,0.26 -0.171,0.354c-0.111,0.093 -0.261,0.146 -0.417,0.146l-1.822,-0c-0.158,-0 -0.306,-0.053 -0.418,-0.146c-0.109,-0.094 -0.172,-0.221 -0.172,-0.354c0,-0.133 0.063,-0.26 0.172,-0.354c0.112,-0.093 0.26,-0.146 0.418,-0.146l1.822,-0c0.156,-0 0.306,0.053 0.417,0.146c0.11,0.094 0.171,0.221 0.171,0.354Zm-8,-0c0,0.133 -0.061,0.26 -0.171,0.354c-0.111,0.093 -0.261,0.146 -0.417,0.146l-1.822,-0c-0.158,-0 -0.306,-0.053 -0.418,-0.146c-0.109,-0.094 -0.172,-0.221 -0.172,-0.354c0,-0.133 0.063,-0.26 0.172,-0.354c0.112,-0.093 0.26,-0.146 0.418,-0.146l1.822,-0c0.156,-0 0.306,0.053 0.417,0.146c0.11,0.094 0.171,0.221 0.171,0.354Zm-4,-0c0,0.133 -0.061,0.26 -0.171,0.354c-0.111,0.093 -0.261,0.146 -0.417,0.146l-1.822,-0c-0.158,-0 -0.306,-0.053 -0.418,-0.146c-0.109,-0.094 -0.172,-0.221 -0.172,-0.354c0,-0.133 0.063,-0.26 0.172,-0.354c0.112,-0.093 0.26,-0.146 0.418,-0.146l1.822,-0c0.156,-0 0.306,0.053 0.417,0.146c0.11,0.094 0.171,0.221 0.171,0.354Z"/>
+        <path id="mode" d="M0,17l3,3l-1.995,0c-0.266,0 -0.522,-0.106 -0.711,-0.294c-0.188,-0.189 -0.294,-0.445 -0.294,-0.711c0,-0.872 0,-1.995 0,-1.995Zm3,-17l-3,3l0,-1.995c-0,-0.266 0.106,-0.522 0.294,-0.711c0.189,-0.188 0.445,-0.294 0.711,-0.294c0.872,-0 1.995,-0 1.995,-0Zm17,3l-3,-3l1.995,0c0.266,-0 0.522,0.106 0.711,0.294c0.188,0.189 0.294,0.445 0.294,0.711c0,0.872 0,1.995 0,1.995Zm-3,17l3,-3l0,1.995c0,0.266 -0.106,0.522 -0.294,0.711c-0.189,0.188 -0.445,0.294 -0.711,0.294c-0.872,0 -1.995,0 -1.995,0Z"/>
+    </g>
+    <defs>
+        <linearGradient id="_Linear1" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-6.9838,1.52982e-15,-1.52982e-15,-18,7,11.5)"><stop offset="0" style="stop-color:#000;stop-opacity:1"/><stop offset="1" style="stop-color:#000;stop-opacity:0"/></linearGradient>
+        <linearGradient id="_Linear2" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.02459e-15,-9,16.7329,5.51091e-16,10.5212,9)"><stop offset="0" style="stop-color:#000;stop-opacity:1"/><stop offset="1" style="stop-color:#000;stop-opacity:0"/></linearGradient>
+    </defs>
+</svg>
diff --git a/toonz/sources/toonz/icons/dark/actions/20/type_lasso.svg b/toonz/sources/toonz/icons/dark/actions/20/type_lasso.svg
index d5a2685..99ae89f 100644
--- a/toonz/sources/toonz/icons/dark/actions/20/type_lasso.svg
+++ b/toonz/sources/toonz/icons/dark/actions/20/type_lasso.svg
@@ -1,20 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="20px" height="20px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;">
-    <g transform="matrix(1,0,0,1,-10,-40)">
-        <g id="type_freehand">
-            <g transform="matrix(1,0,0,1,0,30)">
-                <rect x="10" y="10" width="20" height="20" style="fill-opacity:0;"/>
-            </g>
-            <g transform="matrix(0.882706,0,0,0.826498,10.3129,40.5925)">
-                <path d="M5.5,20.525C5.5,20.525 7.081,20.346 7.5,18.5C7.979,16.389 5.879,15.594 3.5,13.5C3.179,13.217 2.944,12.876 2.778,12.498C1.918,10.529 2.949,7.557 3.527,6.599C4.058,5.719 5.431,3.438 8.684,2.584C11.603,1.818 17.821,1.947 19.19,7.063C20.291,11.174 18.16,13.044 17.444,13.641C15.12,15.575 12.869,15.606 9.589,15.535" style="fill:none;stroke:black;stroke-width:1px;"/>
-            </g>
-            <g transform="matrix(0.882706,0,0,1.12368,11.083,35.0807)">
-                <ellipse cx="5.534" cy="16.339" rx="3.034" ry="1.839" style="fill:none;stroke:black;stroke-width:0.84px;"/>
-            </g>
-            <g transform="matrix(1,0,0,1,2.27928e-10,30)">
-                <path d="M25,29.5C25,29.633 25.053,29.76 25.146,29.854C25.24,29.947 25.367,30 25.5,30C25.9,30 26.992,30 28,30C29.105,30 30,29.105 30,28C30,26.992 30,25.9 30,25.5C30,25.367 29.947,25.24 29.854,25.146C29.76,25.053 29.633,25 29.5,25C29.367,25 29.24,25.053 29.146,25.146C29.053,25.24 29,25.367 29,25.5C29,26.123 29,27.204 29,28C29,28.265 28.895,28.52 28.707,28.707C28.52,28.895 28.265,29 28,29C27.204,29 26.123,29 25.5,29C25.367,29 25.24,29.053 25.146,29.146C25.053,29.24 25,29.367 25,29.5ZM10.5,25C10.367,25 10.24,25.053 10.146,25.146C10.053,25.24 10,25.367 10,25.5C10,25.9 10,26.992 10,28C10,29.105 10.895,30 12,30C13.008,30 14.1,30 14.5,30C14.633,30 14.76,29.947 14.854,29.854C14.947,29.76 15,29.633 15,29.5C15,29.367 14.947,29.24 14.854,29.146C14.76,29.053 14.633,29 14.5,29C13.877,29 12.796,29 12,29C11.735,29 11.48,28.895 11.293,28.707C11.105,28.52 11,28.265 11,28C11,27.204 11,26.123 11,25.5C11,25.367 10.947,25.24 10.854,25.146C10.76,25.053 10.633,25 10.5,25ZM29.5,15C29.633,15 29.76,14.947 29.854,14.854C29.947,14.76 30,14.633 30,14.5C30,14.1 30,13.008 30,12C30,10.895 29.105,10 28,10C26.992,10 25.9,10 25.5,10C25.367,10 25.24,10.053 25.146,10.146C25.053,10.24 25,10.367 25,10.5C25,10.633 25.053,10.76 25.146,10.854C25.24,10.947 25.367,11 25.5,11C26.123,11 27.204,11 28,11C28.265,11 28.52,11.105 28.707,11.293C28.895,11.48 29,11.735 29,12C29,12.796 29,13.877 29,14.5C29,14.633 29.053,14.76 29.146,14.854C29.24,14.947 29.367,15 29.5,15ZM15,10.5C15,10.367 14.947,10.24 14.854,10.146C14.76,10.053 14.633,10 14.5,10C14.1,10 13.008,10 12,10C10.895,10 10,10.895 10,12C10,13.008 10,14.1 10,14.5C10,14.633 10.053,14.76 10.146,14.854C10.24,14.947 10.367,15 10.5,15C10.633,15 10.76,14.947 10.854,14.854C10.947,14.76 11,14.633 11,14.5C11,13.877 11,12.796 11,12C11,11.735 11.105,11.48 11.293,11.293C11.48,11.105 11.735,11 12,11C12.796,11 13.877,11 14.5,11C14.633,11 14.76,10.947 14.854,10.854C14.947,10.76 15,10.633 15,10.5Z"/>
-            </g>
-        </g>
+<svg width="100%" height="100%" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;">
+    <g id="type_freehand">
+        <rect x="0" y="0" width="20" height="20" style="fill-opacity:0;"/>
+        <path d="M5.168,17.556c-0,0 1.395,-0.148 1.765,-1.673c0.423,-1.745 -1.431,-2.402 -3.531,-4.133c-0.283,-0.234 -0.49,-0.516 -0.637,-0.828c-0.759,-1.627 0.151,-4.084 0.661,-4.875c0.469,-0.728 1.681,-2.613 4.552,-3.319c2.577,-0.633 8.066,-0.526 9.274,3.702c0.972,3.398 -0.909,4.943 -1.541,5.437c-2.052,1.598 -4.039,1.624 -6.934,1.565" style="fill:none;stroke:#000;stroke-width:0.86px;"/>
+        <ellipse cx="5.968" cy="13.441" rx="2.678" ry="2.066" style="fill:none;stroke:#000;stroke-width:0.85px;"/>
+        <path id="mode" d="M0,17l3,3l-2,-0c-0.552,-0 -1,-0.448 -1,-1c0,-0.873 0,-2 0,-2Zm3,-17l-3,3l0,-2c0,-0.552 0.448,-1 1,-1c0.873,-0 2,-0 2,-0Zm17,3l-3,-3l2,-0c0.552,0 1,0.448 1,1c0,0.873 0,2 0,2Zm-3,17l3,-3l0,2c-0,0.552 -0.448,1 -1,1c-0.873,-0 -2,0 -2,0Z"/>
     </g>
 </svg>
diff --git a/toonz/sources/toonz/icons/dark/actions/20/type_normal.svg b/toonz/sources/toonz/icons/dark/actions/20/type_normal.svg
index ce8ae3b..b9c6f9b 100644
--- a/toonz/sources/toonz/icons/dark/actions/20/type_normal.svg
+++ b/toonz/sources/toonz/icons/dark/actions/20/type_normal.svg
@@ -1,28 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="20px" height="20px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <g transform="matrix(1,0,0,1,-10,-10)">
-        <g id="type_normal">
-            <rect x="10" y="10" width="20" height="20" style="fill-opacity:0;"/>
-            <g transform="matrix(1,0,0,1,9,9)">
-                <path d="M11,3.5C11,3.224 10.776,3 10.5,3C10.224,3 10,3.224 10,3.5L10,6.5C10,6.776 10.224,7 10.5,7C10.776,7 11,6.776 11,6.5L11,3.5Z"/>
-            </g>
-            <g transform="matrix(0.707107,-0.707107,0.676801,0.676801,4.69142,18.5407)">
-                <path d="M11,3.522C11,3.234 10.776,3 10.5,3C10.224,3 10,3.234 10,3.522L10,6.478C10,6.766 10.224,7 10.5,7C10.776,7 11,6.766 11,6.478L11,3.522Z"/>
-            </g>
-            <g transform="matrix(6.12323e-17,1,-1,6.12323e-17,29,7)">
-                <path d="M11,3.5C11,3.224 10.776,3 10.5,3C10.224,3 10,3.224 10,3.5L10,6.5C10,6.776 10.224,7 10.5,7C10.776,7 11,6.776 11,6.5L11,3.5Z"/>
-            </g>
-            <g transform="matrix(0.707107,0.707107,-0.676801,0.676801,19.4593,3.69142)">
-                <path d="M11,3.522C11,3.234 10.776,3 10.5,3C10.224,3 10,3.234 10,3.522L10,6.478C10,6.766 10.224,7 10.5,7C10.776,7 11,6.766 11,6.478L11,3.522Z"/>
-            </g>
-            <g transform="matrix(6.12323e-17,1,-1,6.12323e-17,20,7)">
-                <path d="M11,3.5C11,3.224 10.776,3 10.5,3C10.224,3 10,3.224 10,3.5L10,6.5C10,6.776 10.224,7 10.5,7C10.776,7 11,6.776 11,6.5L11,3.5Z"/>
-            </g>
-            <g transform="matrix(0.53202,-0.229157,0.26998,0.626797,-0.7633,9.68182)">
-                <path d="M26,22L32.6,35L27.5,32.936L27.5,39L24.5,39L24.5,32.936L19.4,35L26,22Z"/>
-            </g>
-            <path d="M25,29.5C25,29.633 25.053,29.76 25.146,29.854C25.24,29.947 25.367,30 25.5,30C25.9,30 26.992,30 28,30C29.105,30 30,29.105 30,28C30,26.992 30,25.9 30,25.5C30,25.367 29.947,25.24 29.854,25.146C29.76,25.053 29.633,25 29.5,25C29.367,25 29.24,25.053 29.146,25.146C29.053,25.24 29,25.367 29,25.5C29,26.123 29,27.204 29,28C29,28.265 28.895,28.52 28.707,28.707C28.52,28.895 28.265,29 28,29C27.204,29 26.123,29 25.5,29C25.367,29 25.24,29.053 25.146,29.146C25.053,29.24 25,29.367 25,29.5ZM10.5,25C10.367,25 10.24,25.053 10.146,25.146C10.053,25.24 10,25.367 10,25.5C10,25.9 10,26.992 10,28C10,29.105 10.895,30 12,30C13.008,30 14.1,30 14.5,30C14.633,30 14.76,29.947 14.854,29.854C14.947,29.76 15,29.633 15,29.5C15,29.367 14.947,29.24 14.854,29.146C14.76,29.053 14.633,29 14.5,29C13.877,29 12.796,29 12,29C11.735,29 11.48,28.895 11.293,28.707C11.105,28.52 11,28.265 11,28C11,27.204 11,26.123 11,25.5C11,25.367 10.947,25.24 10.854,25.146C10.76,25.053 10.633,25 10.5,25ZM29.5,15C29.633,15 29.76,14.947 29.854,14.854C29.947,14.76 30,14.633 30,14.5C30,14.1 30,13.008 30,12C30,10.895 29.105,10 28,10C26.992,10 25.9,10 25.5,10C25.367,10 25.24,10.053 25.146,10.146C25.053,10.24 25,10.367 25,10.5C25,10.633 25.053,10.76 25.146,10.854C25.24,10.947 25.367,11 25.5,11C26.123,11 27.204,11 28,11C28.265,11 28.52,11.105 28.707,11.293C28.895,11.48 29,11.735 29,12C29,12.796 29,13.877 29,14.5C29,14.633 29.053,14.76 29.146,14.854C29.24,14.947 29.367,15 29.5,15ZM15,10.5C15,10.367 14.947,10.24 14.854,10.146C14.76,10.053 14.633,10 14.5,10C14.1,10 13.008,10 12,10C10.895,10 10,10.895 10,12C10,13.008 10,14.1 10,14.5C10,14.633 10.053,14.76 10.146,14.854C10.24,14.947 10.367,15 10.5,15C10.633,15 10.76,14.947 10.854,14.854C10.947,14.76 11,14.633 11,14.5C11,13.877 11,12.796 11,12C11,11.735 11.105,11.48 11.293,11.293C11.48,11.105 11.735,11 12,11C12.796,11 13.877,11 14.5,11C14.633,11 14.76,10.947 14.854,10.854C14.947,10.76 15,10.633 15,10.5Z"/>
-        </g>
+<svg width="100%" height="100%" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g id="type_normal">
+        <rect x="0" y="0" width="20" height="20" style="fill-opacity:0;"/>
+        <path d="M5.96,2l10.54,9.962l-4.91,-0.188l2.458,5.706l-2.396,1.033l-2.458,-5.706l-3.237,3.696l0.003,-14.503Z"/>
+        <path id="mode" d="M0,17l3,3l-1.996,0c-0.266,0 -0.522,-0.106 -0.71,-0.294c-0.188,-0.188 -0.294,-0.444 -0.294,-0.71c0,-0.872 -0,-1.996 -0,-1.996Zm3,-17l-3,3l0,-1.996c-0,-0.266 0.106,-0.522 0.294,-0.71c0.188,-0.188 0.444,-0.294 0.71,-0.294c0.872,-0 1.996,-0 1.996,-0Zm17,3l-3,-3l1.996,0c0.266,-0 0.522,0.106 0.71,0.294c0.188,0.188 0.294,0.444 0.294,0.71c0,0.872 0,1.996 0,1.996Zm-3,17l3,-3l0,1.996c0,0.266 -0.106,0.522 -0.294,0.71c-0.188,0.188 -0.444,0.294 -0.71,0.294c-0.872,0 -1.996,0 -1.996,0Z"/>
     </g>
 </svg>
diff --git a/toonz/sources/toonz/icons/dark/actions/20/type_pickerlasso.svg b/toonz/sources/toonz/icons/dark/actions/20/type_pickerlasso.svg
index 412ea70..1a91c97 100644
--- a/toonz/sources/toonz/icons/dark/actions/20/type_pickerlasso.svg
+++ b/toonz/sources/toonz/icons/dark/actions/20/type_pickerlasso.svg
@@ -1,21 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="20px" height="20px" clip-rule="evenodd" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="1.5" version="1.1" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
-    <g transform="translate(-10 -40)">
-        <g id="type_freehand">
-            <g transform="translate(0 30)">
-                <rect x="10" y="10" width="20" height="20" fill-opacity="0"/>
-            </g>
-            <g transform="matrix(.88271 0 0 .8265 10.313 40.592)">
-                <path d="m4.177 21.062s1.8468-0.57385 2.2658-2.4198c0.479-2.111-0.5638-3.0479-2.9428-5.1419-0.321-0.283-0.556-0.624-0.722-1.002-0.86-1.969 0.171-4.941 0.749-5.899 0.531-0.88 1.904-3.161 5.157-4.015 2.919-0.766 7.9547-0.88103 10.22 3.9587" fill="none" stroke="#000" stroke-width="1px"/>
-            </g>
-            <g transform="matrix(.88271 0 0 1.1237 11.083 35.081)">
-                <ellipse cx="5.534" cy="16.339" rx="3.034" ry="1.839" fill="none" stroke="#000" stroke-width=".84px"/>
-            </g>
-            <g transform="translate(2.2793e-10 30)">
-                <path d="m25 29.5c0 0.133 0.053 0.26 0.146 0.354 0.094 0.093 0.221 0.146 0.354 0.146h2.5c1.105 0 2-0.895 2-2v-2.5c0-0.133-0.053-0.26-0.146-0.354-0.094-0.093-0.221-0.146-0.354-0.146s-0.26 0.053-0.354 0.146c-0.093 0.094-0.146 0.221-0.146 0.354v2.5c0 0.265-0.105 0.52-0.293 0.707-0.187 0.188-0.442 0.293-0.707 0.293h-2.5c-0.133 0-0.26 0.053-0.354 0.146-0.093 0.094-0.146 0.221-0.146 0.354zm-14.5-4.5c-0.133 0-0.26 0.053-0.354 0.146-0.093 0.094-0.146 0.221-0.146 0.354v2.5c0 1.105 0.895 2 2 2h2.5c0.133 0 0.26-0.053 0.354-0.146 0.093-0.094 0.146-0.221 0.146-0.354s-0.053-0.26-0.146-0.354c-0.094-0.093-0.221-0.146-0.354-0.146h-2.5c-0.265 0-0.52-0.105-0.707-0.293-0.188-0.187-0.293-0.442-0.293-0.707v-2.5c0-0.133-0.053-0.26-0.146-0.354-0.094-0.093-0.221-0.146-0.354-0.146zm19-10c0.133 0 0.26-0.053 0.354-0.146 0.093-0.094 0.146-0.221 0.146-0.354v-2.5c0-1.105-0.895-2-2-2h-2.5c-0.133 0-0.26 0.053-0.354 0.146-0.093 0.094-0.146 0.221-0.146 0.354s0.053 0.26 0.146 0.354c0.094 0.093 0.221 0.146 0.354 0.146h2.5c0.265 0 0.52 0.105 0.707 0.293 0.188 0.187 0.293 0.442 0.293 0.707v2.5c0 0.133 0.053 0.26 0.146 0.354 0.094 0.093 0.221 0.146 0.354 0.146zm-14.5-4.5c0-0.133-0.053-0.26-0.146-0.354-0.094-0.093-0.221-0.146-0.354-0.146h-2.5c-1.105 0-2 0.895-2 2v2.5c0 0.133 0.053 0.26 0.146 0.354 0.094 0.093 0.221 0.146 0.354 0.146s0.26-0.053 0.354-0.146c0.093-0.094 0.146-0.221 0.146-0.354v-2.5c0-0.265 0.105-0.52 0.293-0.707 0.187-0.188 0.442-0.293 0.707-0.293h2.5c0.133 0 0.26-0.053 0.354-0.146 0.093-0.094 0.146-0.221 0.146-0.354z"/>
-            </g><g transform="matrix(.66599 0 0 .66599 15.668 45.668)" clip-rule="evenodd" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="2">
-                <path d="m11.306 7.176-1.049-1.049 2.116-2.115 1.402 1.402 2.829-2.828c0.78-0.781 2.047-0.781 2.828 0 0.781 0.78 0.781 2.047 0 2.828l-2.828 2.828 1.414 1.415-2.116 2.115-1.06-1.06-8.528 8.528c-0.993 0.992-2.601 0.992-3.593 0-1e-3 0-1e-3 -1e-3 -2e-3 -1e-3 -0.959-0.96-0.96-2.516 1e-3 -3.477zm0.707 0.707-8.586 8.587c-0.569 0.569-0.569 1.491 0 2.061 1e-3 0 1e-3 1e-3 2e-3 1e-3 0.601 0.602 1.576 0.602 2.177 1e-3l8.528-8.528z"/>
-            </g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:1;">
+    <g id="type_picker_lasso">
+        <rect x="-0" y="0" width="20" height="20" style="fill-opacity:0;"/>
+        <path id="mode" d="M-0,17l3,3l-2,-0c-0.552,-0 -1,-0.448 -1,-1c-0,-0.873 -0,-2 -0,-2Zm3,-17l-3,3l-0,-2c0,-0.552 0.448,-1 1,-1c0.873,-0 2,-0 2,-0Zm17,3l-3,-3l2,-0c0.552,0 1,0.448 1,1c-0,0.873 -0,2 -0,2Zm-3,17l3,-3l-0,2c-0,0.552 -0.448,1 -1,1c-0.873,-0 -2,0 -2,-0Z"/>
+        <g id="pick_freehand">
+            <rect x="-0" y="0" width="20" height="20" style="fill-opacity:0;"/>
+            <path d="M12.691,9.748l-0.76,-0.759l1.533,-1.532l1.015,1.015l2.049,-2.048c0.565,-0.565 1.482,-0.565 2.048,0c0.565,0.565 0.565,1.483 -0,2.048l-2.048,2.048l1.024,1.025l-1.533,1.532l-0.767,-0.768l-6.177,6.176c-0.719,0.719 -1.883,0.719 -2.602,0c-0,0 -0,-0 -0.001,-0c-0.695,-0.696 -0.695,-1.822 0.001,-2.518l6.218,-6.219Zm0.512,0.512l-6.218,6.219c-0.412,0.412 -0.412,1.08 -0,1.493c0,-0 0,0.001 0.001,0.001c0.435,0.436 1.141,0.436 1.577,0l6.176,-6.176l-1.536,-1.537Z"/>
+            <path d="M2.308,13.557c0.787,0.026 1.981,0.161 2.443,-0.741c0.695,-1.464 -0.645,-2.576 -1.14,-3.03c-1.735,-1.345 -1.829,-1.593 -2.016,-2.07c-0.235,-0.595 -0.161,-1.427 0.015,-2.034c0.229,-0.789 0.492,-1.41 0.961,-2.022c0.288,-0.377 0.565,-0.67 0.945,-0.945c1.13,-0.817 2.251,-1.176 3.525,-1.216c2.002,-0.062 4.184,0.169 5.381,2.238c0.241,0.417 0.757,1.595 0.515,2.932c-0.086,0.473 -0.468,1.16 -0.884,1.593c-0.679,0.708 -1.611,1.039 -2.172,1.267c-0.758,0.31 -2.22,0.524 -3.526,0.452" style="fill:none;stroke:#000;stroke-width:1px;"/>
+            <ellipse cx="4.135" cy="9.925" rx="2.051" ry="1.582" style="fill:none;stroke:#000;stroke-width:0.86px;stroke-linejoin:round;stroke-miterlimit:1.5;"/>
         </g>
     </g>
 </svg>
diff --git a/toonz/sources/toonz/icons/dark/actions/20/type_polyline.svg b/toonz/sources/toonz/icons/dark/actions/20/type_polyline.svg
index 813f8c0..f347a4c 100644
--- a/toonz/sources/toonz/icons/dark/actions/20/type_polyline.svg
+++ b/toonz/sources/toonz/icons/dark/actions/20/type_polyline.svg
@@ -1,17 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="20px" height="20px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <g transform="matrix(1,0,0,1,-10,-70)">
-        <g id="type_polyline">
-            <g transform="matrix(1,0,0,1,0,60)">
-                <rect x="10" y="10" width="20" height="20" style="fill-opacity:0;"/>
-            </g>
-            <g transform="matrix(1,0,0,1,9,66.9998)">
-                <path d="M8.08,19.56L6.64,19.98C6.388,20.054 6.122,19.919 6.031,19.673C6.031,19.673 5.968,19.501 5.858,19.204C5.763,18.945 5.895,18.657 6.154,18.562C6.413,18.466 6.701,18.599 6.796,18.858L6.808,18.889L7.8,18.6C8.065,18.523 8.343,18.675 8.42,18.94C8.497,19.205 8.345,19.483 8.08,19.56ZM9.72,18.04L11.64,17.48C11.905,17.403 12.183,17.555 12.26,17.82C12.337,18.085 12.185,18.363 11.92,18.44L10,19C9.735,19.077 9.457,18.925 9.38,18.66C9.303,18.395 9.455,18.117 9.72,18.04ZM13.56,16.92L15.48,16.36C15.745,16.283 16.023,16.435 16.1,16.7C16.177,16.965 16.025,17.243 15.76,17.32L13.84,17.88C13.575,17.957 13.297,17.805 13.22,17.54C13.143,17.275 13.295,16.997 13.56,16.92ZM4.475,15.45C4.38,15.191 4.513,14.904 4.771,14.808C5.03,14.713 5.318,14.846 5.414,15.105L6.105,16.981C6.2,17.24 6.068,17.528 5.809,17.623C5.55,17.719 5.262,17.586 5.167,17.327L4.475,15.45ZM18,15.625L18,15C18,14.724 18.224,14.5 18.5,14.5C18.776,14.5 19,14.724 19,15L19,16C19,16.227 18.848,16.419 18.64,16.48C18.64,16.48 18.278,16.586 17.68,16.76C17.415,16.837 17.137,16.685 17.06,16.42C16.983,16.155 17.135,15.877 17.4,15.8L18,15.625ZM3.784,13.574L3.092,11.697C2.997,11.438 3.13,11.15 3.389,11.055C3.648,10.96 3.935,11.092 4.031,11.351L4.722,13.228C4.817,13.487 4.685,13.775 4.426,13.87C4.167,13.965 3.879,13.833 3.784,13.574ZM19,11L19,13C19,13.276 18.776,13.5 18.5,13.5C18.224,13.5 18,13.276 18,13L18,11C18,10.724 18.224,10.5 18.5,10.5C18.776,10.5 19,10.724 19,11ZM13.085,12.122L12.354,12.854C12.226,12.981 12.04,13.03 11.866,12.982C11.866,12.982 11.509,12.882 10.936,12.723C10.67,12.65 10.515,12.374 10.588,12.108C10.662,11.842 10.938,11.686 11.204,11.76L11.853,11.94L12.378,11.415C12.573,11.219 12.89,11.219 13.085,11.415C13.281,11.61 13.281,11.927 13.085,12.122ZM9.009,12.188L7.082,11.653C6.816,11.579 6.661,11.303 6.734,11.037C6.808,10.771 7.084,10.616 7.35,10.689L9.277,11.225C9.543,11.299 9.699,11.574 9.625,11.84C9.551,12.106 9.275,12.262 9.009,12.188ZM5.155,11.118L3.228,10.582C2.962,10.508 2.806,10.233 2.88,9.967C2.954,9.701 3.23,9.545 3.496,9.619L5.423,10.154C5.689,10.228 5.845,10.504 5.771,10.77C5.697,11.036 5.421,11.191 5.155,11.118ZM13.793,10L15.207,8.586C15.402,8.391 15.719,8.391 15.914,8.586C16.109,8.781 16.109,9.098 15.914,9.293L14.5,10.707C14.304,10.903 13.988,10.903 13.793,10.707C13.597,10.512 13.597,10.196 13.793,10ZM16.621,7.172L18.035,5.758C18.23,5.563 18.547,5.563 18.742,5.758C18.937,5.953 18.937,6.27 18.742,6.465L18.675,6.532C18.865,6.603 19,6.786 19,7L19,9C19,9.276 18.776,9.5 18.5,9.5C18.224,9.5 18,9.276 18,9L18,7.207L17.328,7.879C17.133,8.074 16.816,8.074 16.621,7.879C16.426,7.684 16.426,7.367 16.621,7.172Z"/>
-            </g>
-            <g transform="matrix(1,0,0,1,-2.88765e-10,60)">
-                <path d="M25,29.5C25,29.633 25.053,29.76 25.146,29.854C25.24,29.947 25.367,30 25.5,30C25.9,30 26.992,30 28,30C29.105,30 30,29.105 30,28C30,26.992 30,25.9 30,25.5C30,25.367 29.947,25.24 29.854,25.146C29.76,25.053 29.633,25 29.5,25C29.367,25 29.24,25.053 29.146,25.146C29.053,25.24 29,25.367 29,25.5C29,26.123 29,27.204 29,28C29,28.265 28.895,28.52 28.707,28.707C28.52,28.895 28.265,29 28,29C27.204,29 26.123,29 25.5,29C25.367,29 25.24,29.053 25.146,29.146C25.053,29.24 25,29.367 25,29.5ZM10.5,25C10.367,25 10.24,25.053 10.146,25.146C10.053,25.24 10,25.367 10,25.5C10,25.9 10,26.992 10,28C10,29.105 10.895,30 12,30C13.008,30 14.1,30 14.5,30C14.633,30 14.76,29.947 14.854,29.854C14.947,29.76 15,29.633 15,29.5C15,29.367 14.947,29.24 14.854,29.146C14.76,29.053 14.633,29 14.5,29C13.877,29 12.796,29 12,29C11.735,29 11.48,28.895 11.293,28.707C11.105,28.52 11,28.265 11,28C11,27.204 11,26.123 11,25.5C11,25.367 10.947,25.24 10.854,25.146C10.76,25.053 10.633,25 10.5,25ZM29.5,15C29.633,15 29.76,14.947 29.854,14.854C29.947,14.76 30,14.633 30,14.5C30,14.1 30,13.008 30,12C30,10.895 29.105,10 28,10C26.992,10 25.9,10 25.5,10C25.367,10 25.24,10.053 25.146,10.146C25.053,10.24 25,10.367 25,10.5C25,10.633 25.053,10.76 25.146,10.854C25.24,10.947 25.367,11 25.5,11C26.123,11 27.204,11 28,11C28.265,11 28.52,11.105 28.707,11.293C28.895,11.48 29,11.735 29,12C29,12.796 29,13.877 29,14.5C29,14.633 29.053,14.76 29.146,14.854C29.24,14.947 29.367,15 29.5,15ZM15,10.5C15,10.367 14.947,10.24 14.854,10.146C14.76,10.053 14.633,10 14.5,10C14.1,10 13.008,10 12,10C10.895,10 10,10.895 10,12C10,13.008 10,14.1 10,14.5C10,14.633 10.053,14.76 10.146,14.854C10.24,14.947 10.367,15 10.5,15C10.633,15 10.76,14.947 10.854,14.854C10.947,14.76 11,14.633 11,14.5C11,13.877 11,12.796 11,12C11,11.735 11.105,11.48 11.293,11.293C11.48,11.105 11.735,11 12,11C12.796,11 13.877,11 14.5,11C14.633,11 14.76,10.947 14.854,10.854C14.947,10.76 15,10.633 15,10.5Z"/>
-            </g>
-        </g>
+<svg width="100%" height="100%" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g id="type_polyline">
+        <rect x="0" y="0" width="20" height="20" style="fill-opacity:0;"/>
+        <path d="M7.08,16.56l-1.44,0.42c-0.252,0.074 -0.518,-0.061 -0.609,-0.307c-0,-0 -0.063,-0.172 -0.173,-0.469c-0.095,-0.259 0.037,-0.547 0.296,-0.642c0.259,-0.096 0.547,0.037 0.642,0.296l0.012,0.031l0.992,-0.289c0.265,-0.077 0.543,0.075 0.62,0.34c0.077,0.265 -0.075,0.543 -0.34,0.62Zm1.64,-1.52l1.92,-0.56c0.265,-0.077 0.543,0.075 0.62,0.34c0.077,0.265 -0.075,0.543 -0.34,0.62l-1.92,0.56c-0.265,0.077 -0.543,-0.075 -0.62,-0.34c-0.077,-0.265 0.075,-0.543 0.34,-0.62Zm3.84,-1.12l1.92,-0.56c0.265,-0.077 0.543,0.075 0.62,0.34c0.077,0.265 -0.075,0.543 -0.34,0.62l-1.92,0.56c-0.265,0.077 -0.543,-0.075 -0.62,-0.34c-0.077,-0.265 0.075,-0.543 0.34,-0.62Zm-9.085,-1.47c-0.095,-0.259 0.038,-0.546 0.296,-0.642c0.259,-0.095 0.547,0.038 0.643,0.297l0.691,1.876c0.095,0.259 -0.037,0.547 -0.296,0.642c-0.259,0.096 -0.547,-0.037 -0.642,-0.296l-0.692,-1.877Zm13.525,0.175l0,-0.625c0,-0.276 0.224,-0.5 0.5,-0.5c0.276,-0 0.5,0.224 0.5,0.5l0,1c0,0.227 -0.152,0.419 -0.36,0.48c0,-0 -0.362,0.106 -0.96,0.28c-0.265,0.077 -0.543,-0.075 -0.62,-0.34c-0.077,-0.265 0.075,-0.543 0.34,-0.62l0.6,-0.175Zm-14.216,-2.051l-0.692,-1.877c-0.095,-0.259 0.038,-0.547 0.297,-0.642c0.259,-0.095 0.546,0.037 0.642,0.296l0.691,1.877c0.095,0.259 -0.037,0.547 -0.296,0.642c-0.259,0.095 -0.547,-0.037 -0.642,-0.296Zm15.216,-2.574l0,2c0,0.276 -0.224,0.5 -0.5,0.5c-0.276,-0 -0.5,-0.224 -0.5,-0.5l0,-2c0,-0.276 0.224,-0.5 0.5,-0.5c0.276,-0 0.5,0.224 0.5,0.5Zm-5.915,1.122l-0.731,0.732c-0.128,0.127 -0.314,0.176 -0.488,0.128c-0,-0 -0.357,-0.1 -0.93,-0.259c-0.266,-0.073 -0.421,-0.349 -0.348,-0.615c0.074,-0.266 0.35,-0.422 0.616,-0.348l0.649,0.18l0.525,-0.525c0.195,-0.196 0.512,-0.196 0.707,-0c0.196,0.195 0.196,0.512 -0,0.707Zm-4.076,0.066l-1.927,-0.535c-0.266,-0.074 -0.421,-0.35 -0.348,-0.616c0.074,-0.266 0.35,-0.421 0.616,-0.348l1.927,0.536c0.266,0.074 0.422,0.349 0.348,0.615c-0.074,0.266 -0.35,0.422 -0.616,0.348Zm-3.854,-1.07l-1.927,-0.536c-0.266,-0.074 -0.422,-0.349 -0.348,-0.615c0.074,-0.266 0.35,-0.422 0.616,-0.348l1.927,0.535c0.266,0.074 0.422,0.35 0.348,0.616c-0.074,0.266 -0.35,0.421 -0.616,0.348Zm8.638,-1.118l1.414,-1.414c0.195,-0.195 0.512,-0.195 0.707,-0c0.195,0.195 0.195,0.512 -0,0.707l-1.414,1.414c-0.196,0.196 -0.512,0.196 -0.707,-0c-0.196,-0.195 -0.196,-0.511 -0,-0.707Zm2.828,-2.828l1.59,-1.635c0.195,-0.195 0.471,-0.26 0.707,0c0.1,0.181 0.086,0.556 0.086,0.556c-0,-0 -0.004,0.78 -0.004,0.907l0,2c0,0.276 -0.224,0.5 -0.5,0.5c-0.276,-0 -0.5,-0.224 -0.5,-0.5l0,-1.793l-0.672,0.672c-0.195,0.195 -0.512,0.195 -0.707,-0c-0.195,-0.195 -0.195,-0.512 -0,-0.707Z"/>
+        <path id="mode" d="M-0,17l3,3l-2,-0c-0.552,-0 -1,-0.448 -1,-1c-0,-0.873 -0,-2 -0,-2Zm3,-17l-3,3l-0,-2c0,-0.552 0.448,-1 1,-1c0.873,-0 2,-0 2,-0Zm17,3l-3,-3l2,-0c0.552,0 1,0.448 1,1c-0,0.873 -0,2 -0,2Zm-3,17l3,-3l-0,2c-0,0.552 -0.448,1 -1,1c-0.873,-0 -2,0 -2,-0Z"/>
     </g>
 </svg>
diff --git a/toonz/sources/toonz/icons/dark/actions/20/type_rectangular.svg b/toonz/sources/toonz/icons/dark/actions/20/type_rectangular.svg
index 96c14a3..b007df0 100644
--- a/toonz/sources/toonz/icons/dark/actions/20/type_rectangular.svg
+++ b/toonz/sources/toonz/icons/dark/actions/20/type_rectangular.svg
@@ -1,17 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="20px" height="20px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <g transform="matrix(1,0,0,1,-10,-100)">
-        <g id="type_rectangular">
-            <g transform="matrix(1,0,0,1,0,90)">
-                <rect x="10" y="10" width="20" height="20" style="fill-opacity:0;"/>
-            </g>
-            <g transform="matrix(1,0,0,1,10,100)">
-                <path d="M16,18L16,17L17,17L17,16L18,16L18,18L16,18ZM3,17L4,17L4,18L2,18L2,16L3,16L3,17ZM14.5,17L12.5,17L12.5,18L14.5,18L14.5,17ZM11,17L9,17L9,18L11,18L11,17ZM7.5,17L5.5,17L5.5,18L7.5,18L7.5,17ZM3,12.5L2,12.5L2,14.5L3,14.5L3,12.5ZM18,12.5L17,12.5L17,14.5L18,14.5L18,12.5ZM3,9L2,9L2,11L3,11L3,9ZM18,9L17,9L17,11L18,11L18,9ZM3,5.5L2,5.5L2,7.5L3,7.5L3,5.5ZM18,5.5L17,5.5L17,7.5L18,7.5L18,5.5ZM4,2L4,3L3,3L3,4L2,4L2,2L4,2ZM18,4L17,4L17,3L16,3L16,2L18,2L18,4ZM11,2L9,2L9,3L11,3L11,2ZM14.5,2L12.5,2L12.5,3L14.5,3L14.5,2ZM7.5,2L5.5,2L5.5,3L7.5,3L7.5,2Z"/>
-            </g>
-            <g transform="matrix(1,0,0,1,-3.49413e-10,90)">
-                <path d="M25,29.5C25,29.633 25.053,29.76 25.146,29.854C25.24,29.947 25.367,30 25.5,30C25.9,30 26.992,30 28,30C29.105,30 30,29.105 30,28C30,26.992 30,25.9 30,25.5C30,25.367 29.947,25.24 29.854,25.146C29.76,25.053 29.633,25 29.5,25C29.367,25 29.24,25.053 29.146,25.146C29.053,25.24 29,25.367 29,25.5C29,26.123 29,27.204 29,28C29,28.265 28.895,28.52 28.707,28.707C28.52,28.895 28.265,29 28,29C27.204,29 26.123,29 25.5,29C25.367,29 25.24,29.053 25.146,29.146C25.053,29.24 25,29.367 25,29.5ZM10.5,25C10.367,25 10.24,25.053 10.146,25.146C10.053,25.24 10,25.367 10,25.5C10,25.9 10,26.992 10,28C10,29.105 10.895,30 12,30C13.008,30 14.1,30 14.5,30C14.633,30 14.76,29.947 14.854,29.854C14.947,29.76 15,29.633 15,29.5C15,29.367 14.947,29.24 14.854,29.146C14.76,29.053 14.633,29 14.5,29C13.877,29 12.796,29 12,29C11.735,29 11.48,28.895 11.293,28.707C11.105,28.52 11,28.265 11,28C11,27.204 11,26.123 11,25.5C11,25.367 10.947,25.24 10.854,25.146C10.76,25.053 10.633,25 10.5,25ZM29.5,15C29.633,15 29.76,14.947 29.854,14.854C29.947,14.76 30,14.633 30,14.5C30,14.1 30,13.008 30,12C30,10.895 29.105,10 28,10C26.992,10 25.9,10 25.5,10C25.367,10 25.24,10.053 25.146,10.146C25.053,10.24 25,10.367 25,10.5C25,10.633 25.053,10.76 25.146,10.854C25.24,10.947 25.367,11 25.5,11C26.123,11 27.204,11 28,11C28.265,11 28.52,11.105 28.707,11.293C28.895,11.48 29,11.735 29,12C29,12.796 29,13.877 29,14.5C29,14.633 29.053,14.76 29.146,14.854C29.24,14.947 29.367,15 29.5,15ZM15,10.5C15,10.367 14.947,10.24 14.854,10.146C14.76,10.053 14.633,10 14.5,10C14.1,10 13.008,10 12,10C10.895,10 10,10.895 10,12C10,13.008 10,14.1 10,14.5C10,14.633 10.053,14.76 10.146,14.854C10.24,14.947 10.367,15 10.5,15C10.633,15 10.76,14.947 10.854,14.854C10.947,14.76 11,14.633 11,14.5C11,13.877 11,12.796 11,12C11,11.735 11.105,11.48 11.293,11.293C11.48,11.105 11.735,11 12,11C12.796,11 13.877,11 14.5,11C14.633,11 14.76,10.947 14.854,10.854C14.947,10.76 15,10.633 15,10.5Z"/>
-            </g>
-        </g>
+<svg width="100%" height="100%" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g id="type_rectangular">
+        <rect x="0" y="0" width="20" height="20" style="fill-opacity:0;"/>
+        <path d="M16,18l0,-1l1,0l0,-1l1,0l0,2l-2,0Zm-13,-1l1,0l0,1l-2,0l0,-2l1,0l0,1Zm11.5,0l-2,0l0,1l2,0l0,-1Zm-3.5,0l-2,0l0,1l2,0l0,-1Zm-3.5,0l-2,0l0,1l2,0l0,-1Zm-4.5,-4.5l-1,0l0,2l1,0l0,-2Zm15,0l-1,0l0,2l1,0l0,-2Zm-15,-3.5l-1,0l0,2l1,0l0,-2Zm15,0l-1,0l0,2l1,0l0,-2Zm-15,-3.5l-1,0l0,2l1,0l0,-2Zm15,0l-1,0l0,2l1,0l0,-2Zm-14,-3.5l0,1l-1,0l0,1l-1,0l0,-2l2,0Zm14,2l-1,0l0,-1l-1,0l0,-1l2,0l0,2Zm-7,-2l-2,0l0,1l2,0l0,-1Zm3.5,0l-2,0l0,1l2,0l0,-1Zm-7,0l-2,0l0,1l2,0l0,-1Z"/>
+        <path id="mode" d="M0,17l3,3l-2,-0c-0.552,-0 -1,-0.448 -1,-1c0,-0.873 0,-2 0,-2Zm3,-17l-3,3l0,-2c0,-0.552 0.448,-1 1,-1c0.873,-0 2,-0 2,-0Zm17,3l-3,-3l2,-0c0.552,0 1,0.448 1,1c0,0.873 0,2 0,2Zm-3,17l3,-3l0,2c-0,0.552 -0.448,1 -1,1c-0.873,-0 -2,0 -2,0Z"/>
     </g>
 </svg>
diff --git a/toonz/sources/toonz/toonz.qrc b/toonz/sources/toonz/toonz.qrc
index 264cc31..221bf82 100644
--- a/toonz/sources/toonz/toonz.qrc
+++ b/toonz/sources/toonz/toonz.qrc
@@ -391,6 +391,7 @@
 		<file>icons/dark/actions/20/fill_mode_areas.svg</file>
 		<file>icons/dark/actions/20/fill_mode_lines.svg</file>
 		<file>icons/dark/actions/20/fill_mode_lines_areas.svg</file>
+		<file>icons/dark/actions/20/fill_freepick.svg</file>
 		<file>icons/dark/actions/16/fill_auto.svg</file>
 
 		<file>icons/dark/actions/20/paintbrush_mode_areas.svg</file>
@@ -422,6 +423,7 @@
 		<file>icons/dark/actions/20/type_rectangular.svg</file>
 		<file>icons/dark/actions/20/type_polyline.svg</file>
 		<file>icons/dark/actions/20/type_normal.svg</file>
+		<file>icons/dark/actions/20/type_erase_segment.svg</file>
 
 		<file>icons/dark/actions/16/shift_and_trace.svg</file>
 		<file>icons/dark/actions/16/shift_and_trace_edit.svg</file>