diff --git a/toonz/sources/toonz/icons/dark/actions/16/fill_empty_cells.svg b/toonz/sources/toonz/icons/dark/actions/16/fill_empty_cells.svg
index 3254497d..972e5fa7 100644
--- a/toonz/sources/toonz/icons/dark/actions/16/fill_empty_cells.svg
+++ b/toonz/sources/toonz/icons/dark/actions/16/fill_empty_cells.svg
@@ -1,8 +1,8 @@
 <?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="16px" height="16px" 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,-330)">
-        <g id="fill_empty_cells">
+    <g transform="matrix(1,0,0,1,-70,-430)">
+        <g id="fill_empty_cells" transform="matrix(1,0,0,1,60,100)">
             <g id="bg" transform="matrix(0.110345,0,0,0.121212,-6.22069,311.091)">
                 <rect x="147" y="156" width="145" height="132" style="fill:rgb(135,135,135);fill-opacity:0;"/>
             </g>
@@ -15,8 +15,8 @@
             <g transform="matrix(0.545455,0,0,0.8,9.36364,337.4)">
                 <path d="M15.833,4.5L3,4.5L3,9.5L15.833,9.5L15.833,4.5ZM4.833,5.75L4.833,8.25L14,8.25L14,5.75L4.833,5.75Z"/>
             </g>
-            <g transform="matrix(6.12323e-17,-1,1,6.12323e-17,15.0012,349.999)">
-                <path d="M9,9.471C9.008,9.609 8.959,9.749 8.854,9.854C8.659,10.05 8.341,10.05 8.146,9.854L6.146,7.854C6.111,7.819 6.082,7.781 6.06,7.739L6.027,7.666L6.005,7.576L5.999,7.5L6.005,7.424L6.027,7.334L6.06,7.26C6.082,7.219 6.111,7.18 6.146,7.146L8.146,5.145C8.341,4.95 8.659,4.95 8.854,5.145C8.959,5.25 9.008,5.391 9,5.528L9,6.999C9,6.999 15.35,7 17.5,7C17.776,7 18,7.224 18,7.5C18,7.776 17.776,8 17.5,8C15.35,8 9,8.001 9,8.001L9,9.471Z"/>
+            <g transform="matrix(-3.06166e-16,1,1,3.06166e-16,11,330)">
+                <path d="M12,13C12,13 2.85,12.999 1.233,12.999C1.097,12.999 0.986,12.892 0.981,12.756C0.977,12.622 0.971,12.455 0.966,12.311C0.963,12.23 0.993,12.15 1.05,12.092C1.107,12.033 1.185,12 1.266,12C3.06,12 12,12 12,12L12,10L14.5,12.5L12,15L12,13Z"/>
             </g>
         </g>
     </g>
diff --git a/toonz/sources/toonz/icons/dark/actions/16/fill_freehand.svg b/toonz/sources/toonz/icons/dark/actions/16/fill_freehand.svg
deleted file mode 100644
index 080949df..00000000
--- a/toonz/sources/toonz/icons/dark/actions/16/fill_freehand.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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="16px" height="16px" 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,-410)">
-        <g id="fill_freehand">
-            <g id="bg" transform="matrix(0.110345,0,0,0.121212,-6.22069,391.091)">
-                <rect x="147" y="156" width="145" height="132" style="fill:rgb(135,135,135);fill-opacity:0;"/>
-            </g>
-            <g transform="matrix(0.629063,0,0,0.733583,9.47568,410.666)">
-                <ellipse cx="5.534" cy="16.339" rx="3.034" ry="1.839" style="stroke:black;stroke-width:0.05px;"/>
-            </g>
-            <g transform="matrix(-0.842137,0,0,0.842137,26.8531,408.628)">
-                <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.388,7.609L12.294,7.566L7.787,3.21L6.192,4.805Z"/>
-            </g>
-            <g transform="matrix(1,0,0,1,0.0672542,0)">
-                <path d="M12.874,417.085C12.698,417.454 12.59,417.849 12.548,418.243C11.758,418.735 11.14,419.485 11.016,420.464C10.915,421.26 11.895,421.84 12.714,422.35C13.519,422.866 13.737,422.92 13.846,423.679C13.993,424.714 13.012,425.5 12.237,425.936C12.237,425.936 11.959,426.054 11.749,425.937C10.741,425.378 14.017,424.389 12.269,423.253C11.544,422.782 10.671,422.439 10.272,421.772C9.253,420.065 10.647,418.057 12.874,417.085ZM19.353,420.498C19.748,421.005 20.038,421.408 20.038,421.408C20.054,421.423 20.07,421.438 20.086,421.452C19.501,422.325 18.395,422.947 17.235,423.173C16.329,423.349 15.396,423.326 14.478,423.312C14.478,423.312 14.149,423.263 14.036,423.031C13.838,422.623 14.156,422.319 15.303,422.321C16.919,422.313 18.839,421.659 19.353,420.498Z"/>
-            </g>
-        </g>
-    </g>
-</svg>
diff --git a/toonz/sources/toonz/icons/dark/actions/16/fill_polyline.svg b/toonz/sources/toonz/icons/dark/actions/16/fill_polyline.svg
deleted file mode 100644
index 0bdcc143..00000000
--- a/toonz/sources/toonz/icons/dark/actions/16/fill_polyline.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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="16px" height="16px" 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,-390)">
-        <g id="fill_polyline">
-            <g id="bg" transform="matrix(0.110345,0,0,0.121212,-6.22069,371.091)">
-                <rect x="147" y="156" width="145" height="132" style="fill:rgb(135,135,135);fill-opacity:0;"/>
-            </g>
-            <g transform="matrix(-0.842137,0,0,0.842137,26.8531,388.628)">
-                <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.388,7.576L12.144,7.566L7.787,3.21L6.192,4.805Z"/>
-            </g>
-            <path d="M17.016,399.695C17.127,399.419 17.187,399.121 17.182,398.813C17.165,398.451 17.326,398.421 17.58,398.582C18.697,400.547 19.764,402.54 20.872,404.51C21.195,405.128 20.766,405.935 20.059,405.998C20.004,406 20,406.003 20,406.003L11.224,406L11,406C10.302,405.979 9.809,405.209 10.101,404.562C10.938,402.965 11.83,401.397 12.728,399.833C12.871,400.208 13.085,400.538 13.369,400.789L11,405L20,405L17.016,399.695Z"/>
-        </g>
-    </g>
-</svg>
diff --git a/toonz/sources/toonz/icons/dark/actions/16/redo.svg b/toonz/sources/toonz/icons/dark/actions/16/redo.svg
index 22a350c7..25da86a2 100644
--- a/toonz/sources/toonz/icons/dark/actions/16/redo.svg
+++ b/toonz/sources/toonz/icons/dark/actions/16/redo.svg
@@ -6,7 +6,7 @@
             <g id="bg" transform="matrix(0.110345,0,0,0.121212,93.7793,31.0909)">
                 <rect x="147" y="156" width="145" height="132" style="fill:rgb(135,135,135);fill-opacity:0;"/>
             </g>
-            <g transform="matrix(-1,0,0,1,236,21)">
+            <g transform="matrix(-1,0,0,1,236,20)">
                 <path d="M114,31.47C114.001,31.489 114.001,31.509 114,31.528L114,32.999C114,32.999 116.35,33 118.5,33L119.5,33C122.536,33 125,35.464 125,38.5C125,41.536 122.536,44 119.5,44L116.5,44C116.224,44 116,43.776 116,43.5C116,43.224 116.224,43 116.5,43L119.5,43C121.984,43 124,40.984 124,38.5C124,36.016 121.984,34 119.5,34L118.5,34L117,34L117,34.001C115.724,34.001 114.695,34.001 114,34.002L114,35.471C114.001,35.491 114.001,35.512 114,35.532L114,36.682L113.255,35.937C113.216,35.915 113.179,35.887 113.146,35.854L111.146,33.854C111.113,33.821 111.085,33.785 111.064,33.746L110.818,33.5L111.062,33.256C111.084,33.216 111.112,33.179 111.146,33.146L113.146,31.145C113.18,31.111 113.217,31.083 113.257,31.061L114,30.318L114,31.47Z"/>
             </g>
         </g>
diff --git a/toonz/sources/toonz/icons/dark/actions/16/renumber.svg b/toonz/sources/toonz/icons/dark/actions/16/renumber.svg
index 36054ca0..bf709943 100644
--- a/toonz/sources/toonz/icons/dark/actions/16/renumber.svg
+++ b/toonz/sources/toonz/icons/dark/actions/16/renumber.svg
@@ -1,15 +1,15 @@
 <?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="16px" height="16px" 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,-210,-10)">
-        <g id="renumber" transform="matrix(1,0,0,1,99.8999,0)">
+    <g transform="matrix(1,0,0,1,-90,-430)">
+        <g id="renumber" transform="matrix(1,0,0,1,-20.1001,420)">
             <g id="bg" transform="matrix(0.110345,0,0,0.121212,93.8794,-8.90909)">
                 <rect x="147" y="156" width="145" height="132" style="fill:rgb(135,135,135);fill-opacity:0;"/>
             </g>
-            <g transform="matrix(1,0,0,1,-99.8999,0)">
+            <g transform="matrix(1,0,0,1,-105.9,0)">
                 <path d="M218,24C218,23.448 217.552,23 217,23C216.448,23 216,23.448 216,24C216,24.552 216.448,25 217,25C217.552,25 218,24.552 218,24ZM220,21C220,20.448 219.552,20 219,20L217,20C216.448,20 216,20.448 216,21C216,21.552 216.448,22 217,22L219,22C219.552,22 220,21.552 220,21ZM222,18C222,17.448 221.552,17 221,17L217,17C216.448,17 216,17.448 216,18C216,18.552 216.448,19 217,19L221,19C221.552,19 222,18.552 222,18ZM224,15C224,14.448 223.552,14 223,14L217,14C216.448,14 216,14.448 216,15C216,15.552 216.448,16 217,16L223,16C223.552,16 224,15.552 224,15ZM226,12C226,11.448 225.552,11 225,11L217,11C216.448,11 216,11.448 216,12C216,12.552 216.448,13 217,13L225,13C225.552,13 226,12.552 226,12Z"/>
             </g>
-            <g transform="matrix(-3.06166e-16,1,1,3.06166e-16,100.1,10)">
+            <g transform="matrix(-3.06166e-16,1,1,3.06166e-16,111.1,10)">
                 <path d="M12,13C12,13 2.85,12.999 1.233,12.999C1.097,12.999 0.986,12.892 0.981,12.756C0.977,12.622 0.971,12.455 0.966,12.311C0.963,12.23 0.993,12.15 1.05,12.092C1.107,12.033 1.185,12 1.266,12C3.06,12 12,12 12,12L12,10L14.5,12.5L12,15L12,13Z"/>
             </g>
         </g>
diff --git a/toonz/sources/toonz/icons/dark/actions/16/rolldown.svg b/toonz/sources/toonz/icons/dark/actions/16/rolldown.svg
index a0da5329..b6e5d4bf 100644
--- a/toonz/sources/toonz/icons/dark/actions/16/rolldown.svg
+++ b/toonz/sources/toonz/icons/dark/actions/16/rolldown.svg
@@ -6,7 +6,9 @@
             <g id="bg" transform="matrix(0.110345,0,0,0.121212,73.7797,151.091)">
                 <rect x="147" y="156" width="145" height="132" style="fill:rgb(135,135,135);fill-opacity:0;"/>
             </g>
-            <path d="M93.5,185.182L90.318,182L96.682,182L93.5,185.182ZM94.001,177.5C94.001,179.65 94.002,182 94.002,182L93,182C93,182 93.001,179.65 93.001,177.5L93.001,176.5C93.001,173.464 95.465,171 98.501,171C101.537,171 104.001,173.464 104.001,176.5L104.001,177.5C104.001,177.776 103.777,178 103.501,178C103.225,178 103.001,177.776 103.001,177.5L103.001,176.5C103.001,174.016 100.985,172 98.501,172C96.017,172 94.001,174.016 94.001,176.5L94.001,177.5Z"/>
+            <g transform="matrix(-1,0,0,1,196.001,0)">
+                <path d="M93.5,185.182L90.318,182L96.682,182L93.5,185.182ZM94.001,177.5C94.001,179.65 94.002,182 94.002,182L93,182C93,182 93.001,179.65 93.001,177.5L93.001,176.5C93.001,173.464 95.465,171 98.501,171C101.537,171 104.001,173.464 104.001,176.5L104.001,177.5C104.001,177.776 103.777,178 103.501,178C103.225,178 103.001,177.776 103.001,177.5L103.001,176.5C103.001,174.016 100.985,172 98.501,172C96.017,172 94.001,174.016 94.001,176.5L94.001,177.5Z"/>
+            </g>
         </g>
     </g>
 </svg>
diff --git a/toonz/sources/toonz/icons/dark/actions/16/shift_keys_down.svg b/toonz/sources/toonz/icons/dark/actions/16/shift_keys_down.svg
index 6cf8a283..ea16d899 100644
--- a/toonz/sources/toonz/icons/dark/actions/16/shift_keys_down.svg
+++ b/toonz/sources/toonz/icons/dark/actions/16/shift_keys_down.svg
@@ -9,8 +9,8 @@
             <g transform="matrix(0.75,-1.02716e-32,-1.02716e-32,-0.75,106.25,428.75)">
                 <path d="M11,5L17,11L11,17L5,11L11,5Z"/>
             </g>
-            <g transform="matrix(-2.60388e-16,1,-1,-2.60388e-16,135,410.045)">
-                <path d="M0,12.999L-0.01,12.999L-0.045,12L13,12L13,10L15.5,12.5L13,15L13,13L0,12.999Z"/>
+            <g transform="matrix(-3.06166e-16,1,1,3.06166e-16,110,410.045)">
+                <path d="M12,13C12,13 2.85,12.999 1.233,12.999C1.097,12.999 0.986,12.892 0.981,12.756C0.977,12.622 0.971,12.455 0.966,12.311C0.963,12.23 0.993,12.15 1.05,12.092C1.107,12.033 1.185,12 1.266,12C3.06,12 12,12 12,12L12,10L14.5,12.5L12,15L12,13Z"/>
             </g>
             <g transform="matrix(1,0,0,1,-3,-2)">
                 <path d="M113.5,420L117.5,416L121.5,420L122,419.5L117.5,415L113,419.5L113.5,420Z" style="fill-opacity:0.5;"/>
diff --git a/toonz/sources/toonz/icons/dark/actions/16/shift_keys_up.svg b/toonz/sources/toonz/icons/dark/actions/16/shift_keys_up.svg
index 2c006730..1d417909 100644
--- a/toonz/sources/toonz/icons/dark/actions/16/shift_keys_up.svg
+++ b/toonz/sources/toonz/icons/dark/actions/16/shift_keys_up.svg
@@ -9,8 +9,8 @@
             <g transform="matrix(0.75,1.02716e-32,-1.02716e-32,0.75,106.25,406.795)">
                 <path d="M11,5L17,11L11,17L5,11L11,5Z"/>
             </g>
-            <g transform="matrix(-2.60388e-16,-1,-1,2.60388e-16,135,425.5)">
-                <path d="M0,12.999L-0.01,12.999L-0.045,12L13,12L13,10L15.5,12.5L13,15L13,13L0,12.999Z"/>
+            <g transform="matrix(-3.06166e-16,-1,1,-3.06166e-16,111,425.966)">
+                <path d="M12,13C12,13 2.85,12.999 1.233,12.999C1.097,12.999 0.986,12.892 0.981,12.756C0.977,12.622 0.971,12.455 0.966,12.311C0.963,12.23 0.993,12.15 1.05,12.092C1.107,12.033 1.185,12 1.266,12C3.06,12 12,12 12,12L12,10L14.5,12.5L12,15L12,13Z"/>
             </g>
             <g transform="matrix(1,0,0,-1,-3,837.545)">
                 <path d="M113.5,420L117.5,416L121.5,420L122,419.5L117.5,415L113,419.5L113.5,420Z" style="fill-opacity:0.5;"/>
diff --git a/toonz/sources/toonz/icons/dark/actions/16/type_normal.svg b/toonz/sources/toonz/icons/dark/actions/16/type_normal.svg
deleted file mode 100644
index 835bb7bd..00000000
--- a/toonz/sources/toonz/icons/dark/actions/16/type_normal.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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="16px" height="16px" 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">
-            <g id="bg" transform="matrix(0.110345,0,0,0.121212,-6.22069,-8.90909)">
-                <rect x="147" y="156" width="145" height="132" style="fill:rgb(135,135,135);fill-opacity:0;"/>
-            </g>
-            <g transform="matrix(1,0,0,1,0.514926,0)">
-                <path d="M22.985,15C23.261,15 23.485,15.224 23.485,15.5C23.485,15.776 23.261,16 22.985,16L19.985,16C19.709,16 19.485,15.776 19.485,15.5C19.485,15.224 19.709,15 19.985,15L22.985,15ZM13.985,15C14.261,15 14.485,15.224 14.485,15.5C14.485,15.776 14.261,16 13.985,16L10.985,16C10.709,16 10.485,15.776 10.485,15.5C10.485,15.224 10.709,15 10.985,15L13.985,15ZM22.339,11.853C22.534,11.658 22.534,11.342 22.339,11.146C22.143,10.951 21.827,10.951 21.632,11.146L19.631,13.147C19.436,13.342 19.436,13.658 19.631,13.854C19.827,14.049 20.143,14.049 20.338,13.854L22.339,11.853ZM12.338,11.146C12.143,10.951 11.827,10.951 11.632,11.146C11.436,11.342 11.436,11.658 11.631,11.853L13.632,13.854C13.827,14.049 14.144,14.049 14.339,13.854C14.534,13.658 14.534,13.342 14.339,13.147L12.338,11.146ZM17.485,10.5C17.485,10.224 17.261,10 16.985,10C16.709,10 16.485,10.224 16.485,10.5L16.485,13.5C16.485,13.776 16.709,14 16.985,14C17.261,14 17.485,13.776 17.485,13.5L17.485,10.5Z"/>
-            </g>
-            <g transform="matrix(0.534216,-0.230103,0.271094,0.629384,-2.85208,7.13623)">
-                <path d="M26,22L32.6,35L27.5,32.936L27.5,38.929L24.5,38.929L24.5,32.936L19.4,35L26,22Z"/>
-            </g>
-        </g>
-    </g>
-</svg>
diff --git a/toonz/sources/toonz/icons/dark/actions/16/view_guided_drawing.svg b/toonz/sources/toonz/icons/dark/actions/16/view_guided_drawing.svg
index 263b6106..69757a73 100644
--- a/toonz/sources/toonz/icons/dark/actions/16/view_guided_drawing.svg
+++ b/toonz/sources/toonz/icons/dark/actions/16/view_guided_drawing.svg
@@ -1,8 +1,8 @@
 <?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="16px" height="16px" 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,-190,-530)">
-        <g id="view_guided_drawing" transform="matrix(1,0,0,1,160,180)">
+    <g transform="matrix(1,0,0,1,-170,-530)">
+        <g id="view_guided_drawing_on" transform="matrix(1,0,0,1,140,180)">
             <g id="bg" transform="matrix(0.110345,0,0,0.121212,13.7793,331.091)">
                 <rect x="147" y="156" width="145" height="132" style="fill:rgb(135,135,135);fill-opacity:0;"/>
             </g>
@@ -15,7 +15,7 @@
             <g transform="matrix(1,0,0,1,-140,180)">
                 <path d="M182,172.605C182,172.835 181.853,173.039 181.635,173.114C181.36,173.181 181.154,173.396 181.058,173.663C181.005,173.844 180.839,173.968 180.65,173.968C180.362,174 180,174 180,174C180,173.095 180.603,172.329 181.428,172.083C181.56,172.052 181.699,172.082 181.805,172.166C181.911,172.25 181.973,172.378 181.973,172.514C182,172.544 182,172.575 182,172.605Z"/>
             </g>
-            <g id="toggle" transform="matrix(1,0,0,1,30.5,351.988)">
+            <g id="toggle" transform="matrix(-1,0,0,1,52.5,351.988)">
                 <path d="M15.5,11C15.5,9.344 14.156,8 12.5,8L9.5,8C7.844,8 6.5,9.344 6.5,11C6.5,12.656 7.844,14 9.5,14L12.5,14C14.156,14 15.5,12.656 15.5,11ZM12.5,9C13.604,9 14.5,9.902 14.5,11.012C14.5,12.123 13.604,13.025 12.5,13.025C11.396,13.025 10.5,12.123 10.5,11.012C10.5,9.902 11.396,9 12.5,9Z"/>
             </g>
             <g transform="matrix(1,0,0,1,-160,180)">
diff --git a/toonz/sources/toonz/icons/dark/actions/16/view_guided_drawing_on.svg b/toonz/sources/toonz/icons/dark/actions/16/view_guided_drawing_on.svg
index 69757a73..263b6106 100644
--- a/toonz/sources/toonz/icons/dark/actions/16/view_guided_drawing_on.svg
+++ b/toonz/sources/toonz/icons/dark/actions/16/view_guided_drawing_on.svg
@@ -1,8 +1,8 @@
 <?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="16px" height="16px" 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,-170,-530)">
-        <g id="view_guided_drawing_on" transform="matrix(1,0,0,1,140,180)">
+    <g transform="matrix(1,0,0,1,-190,-530)">
+        <g id="view_guided_drawing" transform="matrix(1,0,0,1,160,180)">
             <g id="bg" transform="matrix(0.110345,0,0,0.121212,13.7793,331.091)">
                 <rect x="147" y="156" width="145" height="132" style="fill:rgb(135,135,135);fill-opacity:0;"/>
             </g>
@@ -15,7 +15,7 @@
             <g transform="matrix(1,0,0,1,-140,180)">
                 <path d="M182,172.605C182,172.835 181.853,173.039 181.635,173.114C181.36,173.181 181.154,173.396 181.058,173.663C181.005,173.844 180.839,173.968 180.65,173.968C180.362,174 180,174 180,174C180,173.095 180.603,172.329 181.428,172.083C181.56,172.052 181.699,172.082 181.805,172.166C181.911,172.25 181.973,172.378 181.973,172.514C182,172.544 182,172.575 182,172.605Z"/>
             </g>
-            <g id="toggle" transform="matrix(-1,0,0,1,52.5,351.988)">
+            <g id="toggle" transform="matrix(1,0,0,1,30.5,351.988)">
                 <path d="M15.5,11C15.5,9.344 14.156,8 12.5,8L9.5,8C7.844,8 6.5,9.344 6.5,11C6.5,12.656 7.844,14 9.5,14L12.5,14C14.156,14 15.5,12.656 15.5,11ZM12.5,9C13.604,9 14.5,9.902 14.5,11.012C14.5,12.123 13.604,13.025 12.5,13.025C11.396,13.025 10.5,12.123 10.5,11.012C10.5,9.902 11.396,9 12.5,9Z"/>
             </g>
             <g transform="matrix(1,0,0,1,-160,180)">
diff --git a/toonz/sources/toonz/icons/dark/actions/16/zoomout.svg b/toonz/sources/toonz/icons/dark/actions/16/zoomout.svg
index 9b24aae4..69a0c7a5 100644
--- a/toonz/sources/toonz/icons/dark/actions/16/zoomout.svg
+++ b/toonz/sources/toonz/icons/dark/actions/16/zoomout.svg
@@ -15,4 +15,3 @@
         </g>
     </g>
 </svg>
-</svg>
diff --git a/toonz/sources/toonz/icons/dark/actions/20/eraser_freehand.svg b/toonz/sources/toonz/icons/dark/actions/20/eraser_freehand.svg
new file mode 100644
index 00000000..afb3eda0
--- /dev/null
+++ b/toonz/sources/toonz/icons/dark/actions/20/eraser_freehand.svg
@@ -0,0 +1,20 @@
+<?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,-340)">
+        <g id="eraser_freehand" transform="matrix(1,0,0,1,-0.100776,0)">
+            <g transform="matrix(1,0,0,1,0.100776,330)">
+                <rect x="10" y="10" width="20" height="20" style="fill-opacity:0;"/>
+            </g>
+            <g transform="matrix(1,0,0,1,0,9)">
+                <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(0.788509,0,0,0.738299,8.6699,338.846)">
+                <path d="M3.672,21.281C3.672,21.281 7.195,21.883 7.523,19.549C8.025,16.999 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:1.31px;"/>
+            </g>
+            <g transform="matrix(0.788509,0,0,1.00377,9.35783,333.923)">
+                <ellipse cx="5.534" cy="16.339" rx="3.034" ry="1.839" style="fill:none;stroke:black;stroke-width:1.11px;"/>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/toonz/sources/toonz/icons/dark/actions/20/eraser_normal.svg b/toonz/sources/toonz/icons/dark/actions/20/eraser_normal.svg
new file mode 100644
index 00000000..ba31614c
--- /dev/null
+++ b/toonz/sources/toonz/icons/dark/actions/20/eraser_normal.svg
@@ -0,0 +1,17 @@
+<?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,-370)">
+        <g id="eraser_normal">
+            <g transform="matrix(1,0,0,1,0,360)">
+                <rect x="10" y="10" width="20" height="20" style="fill-opacity:0;"/>
+            </g>
+            <g transform="matrix(1,0,0,1,-0.100776,39)">
+                <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(0.69174,-0.297954,0.351032,0.814971,-15.7059,359.817)">
+                <path d="M26,22L32.6,35L27.5,32.936L27.5,39L24.5,39L24.5,32.936L19.4,35L26,22Z"/>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/toonz/sources/toonz/icons/dark/actions/20/eraser_polyline.svg b/toonz/sources/toonz/icons/dark/actions/20/eraser_polyline.svg
new file mode 100644
index 00000000..51e29234
--- /dev/null
+++ b/toonz/sources/toonz/icons/dark/actions/20/eraser_polyline.svg
@@ -0,0 +1,17 @@
+<?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>
+    </g>
+</svg>
diff --git a/toonz/sources/toonz/icons/dark/actions/20/eraser_rectangular.svg b/toonz/sources/toonz/icons/dark/actions/20/eraser_rectangular.svg
new file mode 100644
index 00000000..1544f474
--- /dev/null
+++ b/toonz/sources/toonz/icons/dark/actions/20/eraser_rectangular.svg
@@ -0,0 +1,17 @@
+<?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,-400)">
+        <g id="eraser_rectangular">
+            <g transform="matrix(1,0,0,1,0,390)">
+                <rect x="10" y="10" width="20" height="20" style="fill-opacity:0;"/>
+            </g>
+            <g transform="matrix(1,0,0,1,-0.100776,69)">
+                <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,-30,0)">
+                <path d="M41,412L42,412L42,413L40,413L40,411L41,411L41,412ZM49,412L47,412L47,413L49,413L49,412ZM45.5,412L43.5,412L43.5,413L45.5,413L45.5,412ZM53,413L51.6,413L53,411.555L53,413ZM41,407L40,407L40,409L41,409L41,407ZM53,407L52,407L52,409L53,409L53,407ZM41,403.5L40,403.5L40,405.5L41,405.5L41,403.5ZM53,403.5L52,403.5L52,405.5L53,405.5L53,403.5ZM42,400L42,401L41,401L41,402L40,402L40,400L42,400ZM53,402L52,402L52,401L51,401L51,400L53,400L53,402ZM49,400L47,400L47,401L49,401L49,400ZM45.5,400L43.5,400L43.5,401L45.5,401L45.5,400Z"/>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/toonz/sources/toonz/icons/dark/actions/16/type_erase_segment.svg b/toonz/sources/toonz/icons/dark/actions/20/eraser_segment.svg
similarity index 51%
rename from toonz/sources/toonz/icons/dark/actions/16/type_erase_segment.svg
rename to toonz/sources/toonz/icons/dark/actions/20/eraser_segment.svg
index 59b31648..c99e55bd 100644
--- a/toonz/sources/toonz/icons/dark/actions/16/type_erase_segment.svg
+++ b/toonz/sources/toonz/icons/dark/actions/20/eraser_segment.svg
@@ -1,24 +1,24 @@
 <?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="16px" height="16px" 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,-30)">
+<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 id="bg" transform="matrix(0.110345,0,0,0.121212,-6.22069,11.0909)">
-                <rect x="147" y="156" width="145" height="132" style="fill:rgb(135,135,135);fill-opacity:0;"/>
+            <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,3,31)">
+            <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,5,25)">
+            <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,5,26)">
-                <path d="M14,12.5C14,12.367 13.958,12.24 13.885,12.146C13.812,12.053 13.712,12 13.608,12L7.43,12C7.326,12 7.226,12.053 7.152,12.146C7.08,12.24 7.038,12.367 7.038,12.5C7.038,12.633 7.08,12.76 7.152,12.854C7.226,12.947 7.326,13 7.43,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 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.4353,0.4353,-0.517501,0.517501,9.73719,-24.4637)">
-                <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.48px;"/>
+            <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.406426,0.395017,-0.516734,0.531658,11.7442,-22.175)">
+            <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>
diff --git a/toonz/sources/toonz/icons/dark/actions/20/fill_freehand.svg b/toonz/sources/toonz/icons/dark/actions/20/fill_freehand.svg
new file mode 100644
index 00000000..e95d36d4
--- /dev/null
+++ b/toonz/sources/toonz/icons/dark/actions/20/fill_freehand.svg
@@ -0,0 +1,20 @@
+<?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,-490)">
+        <g id="fill_freehand" transform="matrix(1,0,0,1,-0.100776,150)">
+            <g transform="matrix(1,0,0,1,0.100776,330)">
+                <rect x="10" y="10" width="20" height="20" style="fill-opacity:0;"/>
+            </g>
+            <g transform="matrix(-1,0,0,1,31.1138,345.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="M23.423,496.023C23.47,495.507 23.421,494.903 23.22,494.199C23.22,494.198 23.22,494.198 23.22,494.198C22.734,492.5 21.375,491.646 19.892,491.263C18.331,490.861 16.626,490.972 15.536,491.24C13.159,491.824 12.158,493.387 11.77,493.989C11.521,494.377 11.159,495.255 11.039,496.181C10.964,496.761 10.98,497.363 11.213,497.862C11.313,498.075 11.454,498.268 11.647,498.428C12.608,499.22 13.519,499.884 14.141,500.589C14.857,501.399 15.221,502.263 14.993,503.369C14.852,504.27 14.208,504.741 13.458,504.955C12.502,505.228 11.386,505.052 11.386,505.052C11.113,505.009 10.927,504.752 10.971,504.479C11.015,504.207 11.271,504.021 11.544,504.065C11.544,504.065 12.427,504.209 13.183,503.993C13.571,503.883 13.936,503.673 14.006,503.205C14.008,503.196 14.01,503.186 14.012,503.177C14.174,502.406 13.89,501.814 13.392,501.251C12.799,500.58 11.926,499.953 11.011,499.199C11.011,499.199 11.011,499.199 11.011,499.199C10.698,498.941 10.469,498.631 10.307,498.286C10.307,498.286 10.307,498.285 10.306,498.285C9.997,497.621 9.947,496.824 10.047,496.052C10.19,494.95 10.633,493.909 10.93,493.448C10.93,493.448 10.93,493.448 10.93,493.448C11.379,492.75 12.544,490.945 15.297,490.269C15.297,490.269 15.297,490.269 15.297,490.269C16.509,489.971 18.406,489.847 20.142,490.295C21.956,490.763 23.587,491.845 24.181,493.924C24.462,494.904 24.501,495.728 24.4,496.416C24.11,496.19 23.77,496.059 23.423,496.023ZM18.664,499.782C17.904,499.848 17.078,499.835 16.14,499.816C15.864,499.81 15.636,500.03 15.63,500.306C15.625,500.582 15.844,500.81 16.12,500.816C16.651,500.827 17.148,500.833 17.62,500.825L18.664,499.782Z"/>
+            </g>
+            <g transform="matrix(0.788509,0,0,1.00377,9.35783,333.923)">
+                <ellipse cx="5.534" cy="16.339" rx="3.034" ry="1.839" style="fill:none;stroke:black;stroke-width:1.11px;"/>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/toonz/sources/toonz/icons/dark/actions/20/fill_mode_areas.svg b/toonz/sources/toonz/icons/dark/actions/20/fill_mode_areas.svg
new file mode 100644
index 00000000..d7e78e5c
--- /dev/null
+++ b/toonz/sources/toonz/icons/dark/actions/20/fill_mode_areas.svg
@@ -0,0 +1,17 @@
+<?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,-670)">
+        <g id="fill_mode_areas" transform="matrix(1,0,0,1,0,120)">
+            <g transform="matrix(1,0,0,1,0,540)">
+                <rect x="10" y="10" width="20" height="20" style="fill-opacity:0;"/>
+            </g>
+            <g transform="matrix(-1,0,0,1,31,555.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,-30,0)">
+                <path d="M43.84,565.843C43.693,565.807 43.544,565.764 43.394,565.715C42.136,563.985 42.077,562.214 43.217,560.404C41.231,559.609 40.237,558.142 40.237,556.003C41.495,554.272 43.161,553.669 45.235,554.193C45.377,552.059 46.465,550.661 48.5,550C50.535,550.661 51.623,552.059 51.765,554.193C53.839,553.669 55.505,554.272 56.763,556.003L56.762,556.039C56.755,556.046 56.748,556.053 56.74,556.06C56.741,556.06 55.396,557.404 55.396,557.404C55.396,557.404 54.568,556.575 54.568,556.575C53.818,555.825 52.607,555.825 51.857,556.575L51.068,557.365C50.588,556.435 49.618,555.799 48.5,555.799C46.906,555.799 45.611,557.093 45.611,558.687C45.611,559.805 46.248,560.775 47.177,561.255L46.563,561.869C46.563,561.869 46.403,562.041 46.513,561.919C45.643,562.884 44.782,563.97 44.225,565.007C44.074,565.288 43.945,565.568 43.84,565.843Z"/>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/toonz/sources/toonz/icons/dark/actions/20/fill_mode_lines.svg b/toonz/sources/toonz/icons/dark/actions/20/fill_mode_lines.svg
new file mode 100644
index 00000000..94a5eee4
--- /dev/null
+++ b/toonz/sources/toonz/icons/dark/actions/20/fill_mode_lines.svg
@@ -0,0 +1,17 @@
+<?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,-610)">
+        <g id="fill_mode_lines" transform="matrix(1,0,0,1,7.10543e-15,30)">
+            <g transform="matrix(1,0,0,1,0,570)">
+                <rect x="10" y="10" width="20" height="20" style="fill-opacity:0;"/>
+            </g>
+            <g transform="matrix(-1,0,0,1,31.013,585.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,-30,0)">
+                <path d="M45.79,595.316C45.835,595.376 45.884,595.434 45.939,595.489L46.382,595.932C46.065,596.002 45.738,596.036 45.4,596.034C45.511,595.797 45.643,595.557 45.79,595.316ZM43.87,595.799C43.795,595.778 43.72,595.754 43.644,595.73C43.486,595.679 43.349,595.579 43.251,595.445C42.086,593.841 41.883,592.204 42.645,590.536C41.048,589.634 40.25,588.191 40.25,586.208C40.25,586.043 40.303,585.881 40.4,585.747C41.565,584.142 43.059,583.445 44.882,583.653C45.246,581.856 46.371,580.651 48.257,580.038C48.415,579.987 48.585,579.987 48.743,580.038C50.629,580.651 51.754,581.856 52.118,583.653C53.941,583.445 55.435,584.142 56.6,585.747C56.671,585.845 56.718,585.957 56.739,586.075L55.925,586.888C55.952,586.671 55.965,586.444 55.965,586.208C54.829,584.645 53.324,584.099 51.45,584.573C51.322,582.645 50.338,581.382 48.5,580.785C46.662,581.382 45.678,582.645 45.55,584.573C43.676,584.099 42.171,584.645 41.035,586.208C41.035,588.141 41.933,589.466 43.727,590.185C42.697,591.82 42.751,593.42 43.886,594.983C43.992,595.018 44.097,595.049 44.201,595.076C44.074,595.319 43.963,595.561 43.87,595.799ZM47.431,591.015L48.045,590.401C47.258,590.199 46.675,589.483 46.675,588.634C46.675,587.627 47.493,586.809 48.5,586.809C49.35,586.809 50.065,587.391 50.267,588.178L50.881,587.565C50.472,586.657 49.56,586.024 48.5,586.024C47.06,586.024 45.89,587.193 45.89,588.634C45.89,589.693 46.523,590.606 47.431,591.015Z"/>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/toonz/sources/toonz/icons/dark/actions/20/fill_mode_lines_areas.svg b/toonz/sources/toonz/icons/dark/actions/20/fill_mode_lines_areas.svg
new file mode 100644
index 00000000..7020a977
--- /dev/null
+++ b/toonz/sources/toonz/icons/dark/actions/20/fill_mode_lines_areas.svg
@@ -0,0 +1,17 @@
+<?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,-640)">
+        <g id="fill_mode_lines_areas" transform="matrix(1,0,0,1,0.013,120)">
+            <g transform="matrix(1,0,0,1,-0.013,-120)">
+                <rect x="10" y="640" width="20" height="20" style="fill-opacity:0;"/>
+            </g>
+            <g transform="matrix(-1,0,0,1,31,525.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,-30,0)">
+                <path d="M43.858,535.796C43.787,535.775 43.716,535.753 43.644,535.73C43.486,535.679 43.349,535.579 43.251,535.445C42.086,533.841 41.883,532.204 42.645,530.536C41.048,529.634 40.25,528.191 40.25,526.208C40.25,526.043 40.303,525.881 40.4,525.747C41.565,524.142 43.059,523.445 44.882,523.653C45.246,521.856 46.371,520.651 48.257,520.038C48.415,519.987 48.585,519.987 48.743,520.038C50.629,520.651 51.754,521.856 52.118,523.653C53.941,523.445 55.435,524.142 56.6,525.747C56.669,525.842 56.715,525.95 56.737,526.064L55.927,526.874C55.952,526.66 55.965,526.439 55.965,526.208C54.829,524.645 53.324,524.099 51.45,524.573C51.322,522.645 50.338,521.382 48.5,520.785C46.662,521.382 45.678,522.645 45.55,524.573C43.676,524.099 42.171,524.645 41.035,526.208C41.035,528.141 41.933,529.466 43.727,530.185C42.697,531.82 42.751,533.42 43.886,534.983C43.988,535.017 44.09,535.046 44.19,535.073C44.063,535.316 43.952,535.557 43.858,535.796ZM44.874,533.958C44.794,533.942 44.714,533.923 44.633,533.901C43.897,532.767 43.902,531.609 44.647,530.425C44.763,530.241 44.792,530.013 44.724,529.806C44.657,529.598 44.501,529.431 44.298,529.35C42.999,528.831 42.315,527.896 42.243,526.546C43.094,525.496 44.198,525.143 45.554,525.486C45.765,525.539 45.99,525.496 46.167,525.367C46.344,525.239 46.454,525.039 46.469,524.821C46.561,523.426 47.239,522.485 48.5,522C49.761,522.485 50.439,523.426 50.531,524.821C50.546,525.039 50.656,525.239 50.833,525.367C51.01,525.496 51.235,525.539 51.446,525.486C52.802,525.143 53.906,525.496 54.757,526.546C54.753,526.615 54.748,526.682 54.741,526.749L54.568,526.575C53.818,525.825 52.607,525.825 51.857,526.575L51.49,526.943C50.91,525.887 49.788,525.171 48.5,525.171C46.619,525.171 45.092,526.698 45.092,528.579C45.092,529.867 45.808,530.99 46.864,531.569L46.563,531.869C46.563,531.869 46.403,532.041 46.513,531.919C45.934,532.561 45.358,533.258 44.874,533.958ZM47.422,531.011L48.193,530.24C47.437,530.096 46.864,529.431 46.864,528.633C46.864,527.731 47.597,526.998 48.5,526.998C49.298,526.998 49.963,527.57 50.107,528.326L50.877,527.556C50.466,526.653 49.556,526.024 48.5,526.024C47.06,526.024 45.89,527.193 45.89,528.634C45.89,529.69 46.519,530.6 47.422,531.011Z"/>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/toonz/sources/toonz/icons/dark/actions/16/fill_rectangular.svg b/toonz/sources/toonz/icons/dark/actions/20/fill_normal.svg
similarity index 60%
rename from toonz/sources/toonz/icons/dark/actions/16/fill_rectangular.svg
rename to toonz/sources/toonz/icons/dark/actions/20/fill_normal.svg
index 6ccff583..f28bcd2b 100644
--- a/toonz/sources/toonz/icons/dark/actions/16/fill_rectangular.svg
+++ b/toonz/sources/toonz/icons/dark/actions/20/fill_normal.svg
@@ -1,15 +1,17 @@
 <?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="16px" height="16px" 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,-370)">
-        <g id="fill_rectangular">
-            <g id="bg" transform="matrix(0.110345,0,0,0.121212,-6.22069,351.091)">
-                <rect x="147" y="156" width="145" height="132" style="fill:rgb(135,135,135);fill-opacity:0;"/>
+<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,-520)">
+        <g id="fill_normal" transform="matrix(1,0,0,1,0,150)">
+            <g transform="matrix(1,0,0,1,0,360)">
+                <rect x="10" y="10" width="20" height="20" style="fill-opacity:0;"/>
             </g>
-            <g transform="matrix(-0.842137,0,0,0.842137,26.8531,368.628)">
-                <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.388,7.576L12.144,7.566L7.787,3.21L6.192,4.805Z"/>
+            <g transform="matrix(-1,0,0,1,31,375.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,-150)">
+                <path d="M14.819,534.038L12.803,529.359L10,532.561L10.002,520L19.131,528.628L14.879,528.466L16.414,532.029C15.846,532.666 15.287,533.351 14.819,534.038Z"/>
             </g>
-            <path d="M12.444,378C12.363,378.337 12.333,378.671 12.362,379L11,379L11,385L18,385L18,379C18,379 18.166,379.025 19,380.053L19,386L10,386L10,378L12.444,378Z"/>
         </g>
     </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
new file mode 100644
index 00000000..6ad9ea83
--- /dev/null
+++ b/toonz/sources/toonz/icons/dark/actions/20/fill_polyline.svg
@@ -0,0 +1,17 @@
+<?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>
+    </g>
+</svg>
diff --git a/toonz/sources/toonz/icons/dark/actions/16/fill_normal.svg b/toonz/sources/toonz/icons/dark/actions/20/fill_rectangular.svg
similarity index 52%
rename from toonz/sources/toonz/icons/dark/actions/16/fill_normal.svg
rename to toonz/sources/toonz/icons/dark/actions/20/fill_rectangular.svg
index c29b54ca..5aba7d4b 100644
--- a/toonz/sources/toonz/icons/dark/actions/16/fill_normal.svg
+++ b/toonz/sources/toonz/icons/dark/actions/20/fill_rectangular.svg
@@ -1,16 +1,16 @@
 <?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="16px" height="16px" 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,-110,-370)">
-        <g id="fill_normal" transform="matrix(1,0,0,1,100,0)">
-            <g id="bg" transform="matrix(0.110345,0,0,0.121212,-6.22069,351.091)">
-                <rect x="147" y="156" width="145" height="132" style="fill:rgb(135,135,135);fill-opacity:0;"/>
+<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,-550)">
+        <g id="fill_rectangular" transform="matrix(1,0,0,1,-7.10543e-15,150)">
+            <g transform="matrix(1,0,0,1,0,390)">
+                <rect x="10" y="10" width="20" height="20" style="fill-opacity:0;"/>
             </g>
-            <g transform="matrix(-0.842137,0,0,0.842137,26.8531,368.628)">
-                <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.388,7.576L12.144,7.566L7.787,3.21L6.192,4.805Z"/>
+            <g transform="matrix(-1,0,0,1,31.013,405.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(0.358488,-0.154412,0.181919,0.422351,-3.32183,373.242)">
-                <path d="M26,22L32.6,35L27.5,32.936L27.5,39L24.5,39L24.5,32.936L19.4,35L26,22Z"/>
+            <g transform="matrix(1,0,0,1,7.10543e-15,-150)">
+                <path d="M11,562L12,562L12,563L10,563L10,561L11,561L11,562ZM15.5,562L13.5,562L13.5,563L15.5,563L15.5,562ZM11,557L10,557L10,559L11,559L11,557ZM11,553.5L10,553.5L10,555.5L11,555.5L11,553.5ZM23,553.5L22,553.5L22,555.5L23,555.5L23,553.5ZM12,550L12,551L11,551L11,552L10,552L10,550L12,550ZM23,552L22,552L22,551L21,551L21,550L23,550L23,552ZM19,550L17,550L17,551L19,551L19,550ZM15.5,550L13.5,550L13.5,551L15.5,551L15.5,550Z"/>
             </g>
         </g>
     </g>
diff --git a/toonz/sources/toonz/icons/dark/actions/20/geometric_arc.svg b/toonz/sources/toonz/icons/dark/actions/20/geometric_arc.svg
new file mode 100644
index 00000000..6f7b0214
--- /dev/null
+++ b/toonz/sources/toonz/icons/dark/actions/20/geometric_arc.svg
@@ -0,0 +1,14 @@
+<?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,-190)">
+        <g id="geometric_arc">
+            <g transform="matrix(1,0,0,1,0,180)">
+                <rect x="10" y="10" width="20" height="20" style="fill-opacity:0;"/>
+            </g>
+            <g transform="matrix(1,0,0,1,0,30)">
+                <path d="M26,164C26,164 21,164 17.5,167.5C14,171 14,176 14,176" style="fill:none;stroke:black;stroke-width:2px;"/>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/toonz/sources/toonz/icons/dark/actions/20/geometric_circle.svg b/toonz/sources/toonz/icons/dark/actions/20/geometric_circle.svg
new file mode 100644
index 00000000..5075b132
--- /dev/null
+++ b/toonz/sources/toonz/icons/dark/actions/20/geometric_circle.svg
@@ -0,0 +1,14 @@
+<?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,-220)">
+        <g id="geometric_circle">
+            <g transform="matrix(1,0,0,1,0,210)">
+                <rect x="10" y="10" width="20" height="20" style="fill-opacity:0;"/>
+            </g>
+            <g transform="matrix(1,0,0,1,0,90)">
+                <path d="M20,132C24.415,132 28,135.585 28,140C28,144.415 24.415,148 20,148C15.585,148 12,144.415 12,140C12,135.585 15.585,132 20,132ZM20,134C23.311,134 26,136.689 26,140C26,143.311 23.311,146 20,146C16.689,146 14,143.311 14,140C14,136.689 16.689,134 20,134Z"/>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/toonz/sources/toonz/icons/dark/actions/20/geometric_ellipse.svg b/toonz/sources/toonz/icons/dark/actions/20/geometric_ellipse.svg
new file mode 100644
index 00000000..9aec78d0
--- /dev/null
+++ b/toonz/sources/toonz/icons/dark/actions/20/geometric_ellipse.svg
@@ -0,0 +1,14 @@
+<?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,-250)">
+        <g id="geometric_ellipse">
+            <g transform="matrix(1,0,0,1,0,240)">
+                <rect x="10" y="10" width="20" height="20" style="fill-opacity:0;"/>
+            </g>
+            <g transform="matrix(0,0.625,-1,0,160,247.5)">
+                <path d="M20,132C24.415,132 28,135.585 28,140C28,144.415 24.415,148 20,148C15.585,148 12,144.415 12,140C12,135.585 15.585,132 20,132ZM20,134C21.204,134 22.152,134.614 22.942,135.404C24.117,136.579 24.8,138.209 24.8,140C24.8,141.791 24.117,143.421 22.942,144.596C22.152,145.386 21.204,146 20,146C18.796,146 17.848,145.386 17.058,144.596C15.883,143.421 15.2,141.791 15.2,140C15.2,138.209 15.883,136.579 17.058,135.404C17.848,134.614 18.796,134 20,134Z"/>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/toonz/sources/toonz/icons/dark/actions/20/geometric_line.svg b/toonz/sources/toonz/icons/dark/actions/20/geometric_line.svg
new file mode 100644
index 00000000..f467e43d
--- /dev/null
+++ b/toonz/sources/toonz/icons/dark/actions/20/geometric_line.svg
@@ -0,0 +1,12 @@
+<?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,-160)">
+        <g id="geometric_line">
+            <g transform="matrix(1,0,0,1,0,150)">
+                <rect x="10" y="10" width="20" height="20" style="fill-opacity:0;"/>
+            </g>
+            <path d="M26,164L14,176" style="fill:none;stroke:black;stroke-width:2px;"/>
+        </g>
+    </g>
+</svg>
diff --git a/toonz/sources/toonz/icons/dark/actions/20/geometric_multiarc.svg b/toonz/sources/toonz/icons/dark/actions/20/geometric_multiarc.svg
new file mode 100644
index 00000000..d2777a44
--- /dev/null
+++ b/toonz/sources/toonz/icons/dark/actions/20/geometric_multiarc.svg
@@ -0,0 +1,17 @@
+<?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,-280)">
+        <g id="geometric_multiarc">
+            <g transform="matrix(1,0,0,1,0,270)">
+                <rect x="10" y="10" width="20" height="20" style="fill-opacity:0;"/>
+            </g>
+            <g transform="matrix(1,0,0,1,-1,120)">
+                <path d="M26,164C26,164 21,164 17.5,167.5C14,171 14,176 14,176" style="fill:none;stroke:black;stroke-width:2px;"/>
+            </g>
+            <g transform="matrix(0.707107,0.707107,-0.707107,0.707107,127.551,161.65)">
+                <path d="M23.879,166.121C23.879,166.121 19.586,165.414 16.086,168.914C12.586,172.414 14,176 14,176" style="fill:none;stroke:black;stroke-width:2px;"/>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/toonz/sources/toonz/icons/dark/actions/20/geometric_polygon.svg b/toonz/sources/toonz/icons/dark/actions/20/geometric_polygon.svg
new file mode 100644
index 00000000..db8d03ff
--- /dev/null
+++ b/toonz/sources/toonz/icons/dark/actions/20/geometric_polygon.svg
@@ -0,0 +1,14 @@
+<?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,-310)">
+        <g id="geometric_polygon">
+            <g transform="matrix(1,0,0,1,0,300)">
+                <rect x="10" y="10" width="20" height="20" style="fill-opacity:0;"/>
+            </g>
+            <g transform="matrix(0.8981,0,0,1,1.13989,-1)">
+                <path d="M21,312L28.794,316.5L28.794,325.5L21,330L13.206,325.5L13.206,316.5L21,312ZM21,314.378L26.567,317.592C26.567,317.592 26.567,324.408 26.567,324.408C26.567,324.408 21,327.622 21,327.622C21,327.622 15.433,324.408 15.433,324.408C15.433,324.408 15.433,317.592 15.433,317.592L21,314.378Z"/>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/toonz/sources/toonz/icons/dark/actions/20/geometric_rectangle.svg b/toonz/sources/toonz/icons/dark/actions/20/geometric_rectangle.svg
new file mode 100644
index 00000000..65be8905
--- /dev/null
+++ b/toonz/sources/toonz/icons/dark/actions/20/geometric_rectangle.svg
@@ -0,0 +1,14 @@
+<?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,-130)">
+        <g id="geometric_rectangle">
+            <g transform="matrix(1,0,0,1,0,120)">
+                <rect x="10" y="10" width="20" height="20" style="fill-opacity:0;"/>
+            </g>
+            <g transform="matrix(1.14286,0,0,1.14286,-2.85714,14.2857)">
+                <path d="M27,103L13,103L13,117L27,117L27,103ZM25.25,104.75L25.25,115.25C25.25,115.25 14.75,115.25 14.75,115.25C14.75,115.25 14.75,104.75 14.75,104.75L25.25,104.75Z"/>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/toonz/sources/toonz/icons/dark/actions/20/paintbrush_mode_areas.svg b/toonz/sources/toonz/icons/dark/actions/20/paintbrush_mode_areas.svg
new file mode 100644
index 00000000..f0d39243
--- /dev/null
+++ b/toonz/sources/toonz/icons/dark/actions/20/paintbrush_mode_areas.svg
@@ -0,0 +1,17 @@
+<?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,-40,-640)">
+        <g id="paintbrush_mode_areas" transform="matrix(1,0,0,1,30,30)">
+            <g transform="matrix(1,0,0,1,0,600)">
+                <rect x="10" y="10" width="20" height="20" style="fill-opacity:0;"/>
+            </g>
+            <g transform="matrix(1,0,0,1,-30,0)">
+                <path d="M48.688,626.116L47,624.429L49.786,621.643L55.357,627.214L52.571,630L51.881,629.309L53.273,626.455L50.545,627.974L49.786,627.214L50.482,625.378L48.688,626.116ZM54.925,620.218L57.755,617.389C57.982,617.161 58.285,617.023 58.607,617.002L58.607,617.002C58.921,616.981 59.229,617.098 59.451,617.32C59.526,617.394 59.605,617.474 59.68,617.549C59.902,617.771 60.018,618.079 59.997,618.392L59.997,618.393C59.976,618.715 59.839,619.017 59.611,619.245L56.782,622.074L57.711,623.003C58.223,623.516 58.223,624.347 57.711,624.86C57.246,625.324 56,626.571 56,626.571L50.429,621C50.429,621 51.675,619.753 52.14,619.289C52.652,618.776 53.484,618.776 53.996,619.289L54.925,620.218ZM58.687,617.656C59.049,617.656 59.343,617.951 59.343,618.313C59.343,618.675 59.049,618.969 58.687,618.969C58.324,618.969 58.03,618.675 58.03,618.313C58.03,617.951 58.324,617.656 58.687,617.656Z"/>
+            </g>
+            <g transform="matrix(1,0,0,1,-30,-30)">
+                <path d="M46.211,655.761L45.939,655.489C45.354,654.903 45.354,653.954 45.939,653.368L47.773,651.534C46.412,651.302 45.374,650.115 45.374,648.687C45.374,647.093 46.668,645.799 48.263,645.799C49.69,645.799 50.877,646.837 51.11,648.198C52.166,647.174 53.827,647.141 54.92,648.101L56.505,646.517C56.518,646.35 56.525,646.179 56.525,646.003C55.267,644.272 53.602,643.669 51.527,644.193C51.386,642.059 50.297,640.661 48.263,640C46.228,640.661 45.139,642.059 44.998,644.193C42.923,643.669 41.258,644.272 40,646.003C40,648.142 40.994,649.609 42.98,650.404C41.84,652.214 41.899,653.985 43.156,655.715C44.275,656.079 45.293,656.094 46.211,655.761Z"/>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/toonz/sources/toonz/icons/dark/actions/20/paintbrush_mode_lines.svg b/toonz/sources/toonz/icons/dark/actions/20/paintbrush_mode_lines.svg
new file mode 100644
index 00000000..26d56bfe
--- /dev/null
+++ b/toonz/sources/toonz/icons/dark/actions/20/paintbrush_mode_lines.svg
@@ -0,0 +1,17 @@
+<?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,-40,-610)">
+        <g id="paintbrush_mode_lines" transform="matrix(1,0,0,1,30,0)">
+            <g transform="matrix(1,0,0,1,0,600)">
+                <rect x="10" y="10" width="20" height="20" style="fill-opacity:0;"/>
+            </g>
+            <g transform="matrix(1,0,0,1,-30,0)">
+                <path d="M48.688,626.116L47,624.429L49.786,621.643L55.357,627.214L52.571,630L51.881,629.309L53.273,626.455L50.545,627.974L49.786,627.214L50.482,625.378L48.688,626.116ZM54.925,620.218L57.755,617.389C57.982,617.161 58.285,617.023 58.607,617.002L58.607,617.002C58.921,616.981 59.229,617.098 59.451,617.32C59.526,617.394 59.605,617.474 59.68,617.549C59.902,617.771 60.018,618.079 59.997,618.392L59.997,618.393C59.976,618.715 59.839,619.017 59.611,619.245L56.782,622.074L57.711,623.003C58.223,623.516 58.223,624.347 57.711,624.86C57.246,625.324 56,626.571 56,626.571L50.429,621C50.429,621 51.675,619.753 52.14,619.289C52.652,618.776 53.484,618.776 53.996,619.289L54.925,620.218ZM58.687,617.656C59.049,617.656 59.343,617.951 59.343,618.313C59.343,618.675 59.049,618.969 58.687,618.969C58.324,618.969 58.03,618.675 58.03,618.313C58.03,617.951 58.324,617.656 58.687,617.656Z"/>
+            </g>
+            <g transform="matrix(1,0,0,1,-30,0)">
+                <path d="M46.382,625.932L45.939,625.489C45.858,625.408 45.788,625.32 45.729,625.226C45.153,625.276 44.538,625.195 43.886,624.983C42.751,623.42 42.697,621.82 43.727,620.185C41.933,619.466 41.035,618.141 41.035,616.208C42.171,614.645 43.676,614.099 45.55,614.573C45.678,612.645 46.662,611.382 48.5,610.785C50.338,611.382 51.322,612.645 51.45,614.573C53.324,614.099 54.829,614.645 55.965,616.208C55.965,616.534 55.94,616.842 55.889,617.133L56.694,616.328C56.712,616.309 56.731,616.291 56.75,616.274C56.75,616.252 56.75,616.23 56.75,616.208C56.75,616.043 56.697,615.881 56.6,615.747C55.435,614.142 53.941,613.445 52.118,613.653C51.754,611.856 50.629,610.651 48.743,610.038C48.585,609.987 48.415,609.987 48.257,610.038C46.371,610.651 45.246,611.856 44.882,613.653C43.059,613.445 41.565,614.142 40.4,615.747C40.303,615.881 40.25,616.043 40.25,616.208C40.25,618.191 41.048,619.634 42.645,620.536C41.883,622.204 42.086,623.841 43.251,625.445C43.349,625.579 43.486,625.679 43.644,625.73C44.63,626.05 45.542,626.118 46.382,625.932ZM48.095,621.212L48.423,620.884C48.38,620.744 48.359,620.599 48.36,620.453C47.418,620.381 46.675,619.593 46.675,618.634C46.675,617.627 47.493,616.809 48.5,616.809C49.507,616.809 50.325,617.627 50.325,618.634C50.325,618.768 50.31,618.899 50.283,619.025L51.079,618.229C50.884,616.981 49.803,616.024 48.5,616.024C47.06,616.024 45.89,617.193 45.89,618.634C45.89,619.936 46.847,621.017 48.095,621.212Z"/>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/toonz/sources/toonz/icons/dark/actions/20/paintbrush_mode_lines_areas.svg b/toonz/sources/toonz/icons/dark/actions/20/paintbrush_mode_lines_areas.svg
new file mode 100644
index 00000000..88c29319
--- /dev/null
+++ b/toonz/sources/toonz/icons/dark/actions/20/paintbrush_mode_lines_areas.svg
@@ -0,0 +1,17 @@
+<?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,-40,-670)">
+        <g id="paintbrush_mode_lines_areas" transform="matrix(1,0,0,1,30,60)">
+            <g transform="matrix(1,0,0,1,0,600)">
+                <rect x="10" y="10" width="20" height="20" style="fill-opacity:0;"/>
+            </g>
+            <g transform="matrix(1,0,0,1,-30,0)">
+                <path d="M48.688,626.116L47,624.429L49.786,621.643L55.357,627.214L52.571,630L51.881,629.309L53.273,626.455L50.545,627.974L49.786,627.214L50.482,625.378L48.688,626.116ZM54.925,620.218L57.755,617.389C57.982,617.161 58.285,617.023 58.607,617.002L58.607,617.002C58.921,616.981 59.229,617.098 59.451,617.32C59.526,617.394 59.605,617.474 59.68,617.549C59.902,617.771 60.018,618.079 59.997,618.392L59.997,618.393C59.976,618.715 59.839,619.017 59.611,619.245L56.782,622.074L57.711,623.003C58.223,623.516 58.223,624.347 57.711,624.86C57.246,625.324 56,626.571 56,626.571L50.429,621C50.429,621 51.675,619.753 52.14,619.289C52.652,618.776 53.484,618.776 53.996,619.289L54.925,620.218ZM58.687,617.656C59.049,617.656 59.343,617.951 59.343,618.313C59.343,618.675 59.049,618.969 58.687,618.969C58.324,618.969 58.03,618.675 58.03,618.313C58.03,617.951 58.324,617.656 58.687,617.656Z"/>
+            </g>
+            <g transform="matrix(1,0,0,1,-30,-60)">
+                <path d="M46.332,685.882L45.939,685.489C45.85,685.4 45.774,685.302 45.712,685.198C45.069,685.296 44.377,685.224 43.636,684.983C42.501,683.42 42.447,681.82 43.477,680.185C41.683,679.466 40.785,678.141 40.785,676.208C41.921,674.645 43.426,674.099 45.3,674.573C45.428,672.645 46.412,671.382 48.25,670.785C50.088,671.382 51.072,672.645 51.2,674.573C53.074,674.099 54.579,674.645 55.715,676.208C55.715,676.655 55.667,677.069 55.571,677.45L56.493,676.529C56.498,676.424 56.5,676.317 56.5,676.208C56.5,676.043 56.447,675.881 56.35,675.747C55.185,674.142 53.691,673.445 51.868,673.653C51.504,671.856 50.379,670.651 48.493,670.038C48.335,669.987 48.165,669.987 48.007,670.038C46.121,670.651 44.996,671.856 44.632,673.653C42.809,673.445 41.315,674.142 40.15,675.747C40.053,675.881 40,676.043 40,676.208C40,678.191 40.798,679.634 42.395,680.536C41.633,682.204 41.836,683.841 43.001,685.445C43.099,685.579 43.236,685.679 43.394,685.73C44.459,686.076 45.438,686.127 46.332,685.882ZM45.557,684.019C45.186,684.051 44.795,684.011 44.383,683.901C43.647,682.767 43.652,681.609 44.397,680.425C44.513,680.241 44.542,680.013 44.474,679.806C44.407,679.598 44.251,679.431 44.048,679.35C42.749,678.831 42.065,677.896 41.993,676.546C42.844,675.496 43.948,675.143 45.304,675.486C45.515,675.539 45.74,675.496 45.917,675.367C46.094,675.239 46.204,675.039 46.219,674.821C46.311,673.426 46.989,672.485 48.25,672C49.511,672.485 50.189,673.426 50.281,674.821C50.296,675.039 50.406,675.239 50.583,675.367C50.76,675.496 50.985,675.539 51.196,675.486C52.552,675.143 53.656,675.496 54.507,676.546C54.485,676.961 54.405,677.336 54.267,677.673C53.41,677.268 52.391,677.322 51.576,677.832C51.235,676.31 49.875,675.171 48.25,675.171C46.369,675.171 44.842,676.698 44.842,678.579C44.842,680.174 45.94,681.515 47.422,681.886L45.939,683.368C45.752,683.556 45.624,683.781 45.557,684.019ZM48.07,681.237L48.25,681.057C48.161,680.802 48.124,680.457 48.124,680.264C47.28,680.2 46.614,679.494 46.614,678.633C46.614,677.731 47.347,676.998 48.25,676.998C49.153,676.998 49.886,677.731 49.886,678.633C49.886,678.76 49.871,678.883 49.844,679.001C49.928,679.027 50.05,679.073 50.177,679.13L50.854,678.454C50.761,677.097 49.63,676.024 48.25,676.024C46.81,676.024 45.64,677.193 45.64,678.634C45.64,680.013 46.714,681.145 48.07,681.237Z"/>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/toonz/sources/toonz/icons/dark/actions/16/type_lasso.svg b/toonz/sources/toonz/icons/dark/actions/20/selection_freehand.svg
similarity index 67%
rename from toonz/sources/toonz/icons/dark/actions/16/type_lasso.svg
rename to toonz/sources/toonz/icons/dark/actions/20/selection_freehand.svg
index 7ff6e784..fe97ed54 100644
--- a/toonz/sources/toonz/icons/dark/actions/16/type_lasso.svg
+++ b/toonz/sources/toonz/icons/dark/actions/20/selection_freehand.svg
@@ -1,15 +1,15 @@
 <?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="16px" height="16px" 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,-90)">
-        <g id="type_lasso">
-            <g id="bg" transform="matrix(0.110345,0,0,0.121212,-6.22069,71.0909)">
-                <rect x="147" y="156" width="145" height="132" style="fill:rgb(135,135,135);fill-opacity:0;"/>
+<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,-40,-40)">
+        <g id="selection_freehand" transform="matrix(1,0,0,1,30,0)">
+            <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,8.32242,88.5859)">
+            <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,9.09253,83.0741)">
+            <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>
diff --git a/toonz/sources/toonz/icons/dark/actions/20/selection_normal.svg b/toonz/sources/toonz/icons/dark/actions/20/selection_normal.svg
new file mode 100644
index 00000000..6a2ef017
--- /dev/null
+++ b/toonz/sources/toonz/icons/dark/actions/20/selection_normal.svg
@@ -0,0 +1,27 @@
+<?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,-40,-10)">
+        <g id="selection_normal" transform="matrix(1,0,0,1,30,0)">
+            <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>
+        </g>
+    </g>
+</svg>
diff --git a/toonz/sources/toonz/icons/dark/actions/16/type_polyline.svg b/toonz/sources/toonz/icons/dark/actions/20/selection_polyline.svg
similarity index 78%
rename from toonz/sources/toonz/icons/dark/actions/16/type_polyline.svg
rename to toonz/sources/toonz/icons/dark/actions/20/selection_polyline.svg
index 34e11264..d29a2b3d 100644
--- a/toonz/sources/toonz/icons/dark/actions/16/type_polyline.svg
+++ b/toonz/sources/toonz/icons/dark/actions/20/selection_polyline.svg
@@ -1,13 +1,13 @@
 <?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="16px" height="16px" 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,-50)">
-        <g id="type_polyline">
-            <g id="bg" transform="matrix(0.110345,0,0,0.121212,-6.22069,31.0909)">
-                <rect x="147" y="156" width="145" height="132" style="fill:rgb(135,135,135);fill-opacity:0;"/>
+<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,-40,-70)">
+        <g id="selection_polyline" transform="matrix(1,0,0,1,30,0)">
+            <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(0.991425,0,0,1.07725,7.16293,43.9547)">
-                <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 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.211,5.537C18.406,5.342 18.682,5.278 18.918,5.537C19.018,5.718 19.004,6.093 19.004,6.093C19.004,6.093 19,6.873 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>
     </g>
diff --git a/toonz/sources/toonz/icons/dark/actions/16/type_rectangular.svg b/toonz/sources/toonz/icons/dark/actions/20/selection_rectangular.svg
similarity index 71%
rename from toonz/sources/toonz/icons/dark/actions/16/type_rectangular.svg
rename to toonz/sources/toonz/icons/dark/actions/20/selection_rectangular.svg
index 1a551b83..8103e952 100644
--- a/toonz/sources/toonz/icons/dark/actions/16/type_rectangular.svg
+++ b/toonz/sources/toonz/icons/dark/actions/20/selection_rectangular.svg
@@ -1,12 +1,12 @@
 <?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="16px" height="16px" 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_rectangular">
-            <g id="bg" transform="matrix(0.110345,0,0,0.121212,-6.22069,51.0909)">
-                <rect x="147" y="156" width="145" height="132" style="fill:rgb(135,135,135);fill-opacity:0;"/>
+<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,-40,-100)">
+        <g id="selection_rectangular" transform="matrix(1,0,0,1,30,0)">
+            <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,8,68)">
+            <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>
diff --git a/toonz/sources/toonz/icons/dark/actions/20/type_lasso.svg b/toonz/sources/toonz/icons/dark/actions/20/type_lasso.svg
new file mode 100644
index 00000000..d5a26857
--- /dev/null
+++ b/toonz/sources/toonz/icons/dark/actions/20/type_lasso.svg
@@ -0,0 +1,20 @@
+<?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>
+    </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
new file mode 100644
index 00000000..ce8ae3b6
--- /dev/null
+++ b/toonz/sources/toonz/icons/dark/actions/20/type_normal.svg
@@ -0,0 +1,28 @@
+<?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>
+    </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
new file mode 100644
index 00000000..813f8c01
--- /dev/null
+++ b/toonz/sources/toonz/icons/dark/actions/20/type_polyline.svg
@@ -0,0 +1,17 @@
+<?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>
+    </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
new file mode 100644
index 00000000..96c14a33
--- /dev/null
+++ b/toonz/sources/toonz/icons/dark/actions/20/type_rectangular.svg
@@ -0,0 +1,17 @@
+<?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>
+    </g>
+</svg>
diff --git a/toonz/sources/toonz/mainwindow.cpp b/toonz/sources/toonz/mainwindow.cpp
index 6aef00d8..596cc06f 100644
--- a/toonz/sources/toonz/mainwindow.cpp
+++ b/toonz/sources/toonz/mainwindow.cpp
@@ -2647,27 +2647,28 @@ void MainWindow::defineActions() {
   createAction(MI_EditNextMode, QT_TR_NOOP("Animate Tool - Next Mode"), "", "",
                ToolCommandType);
   createAction(MI_EditPosition, QT_TR_NOOP("Animate Tool - Position"), "", "",
-               ToolCommandType);
+               ToolCommandType, "edit_position");
   createAction(MI_EditRotation, QT_TR_NOOP("Animate Tool - Rotation"), "", "",
-               ToolCommandType);
+               ToolCommandType, "edit_rotation");
   createAction(MI_EditScale, QT_TR_NOOP("Animate Tool - Scale"), "", "",
-               ToolCommandType);
+               ToolCommandType, "edit_scale");
   createAction(MI_EditShear, QT_TR_NOOP("Animate Tool - Shear"), "", "",
-               ToolCommandType);
+               ToolCommandType, "edit_shear");
   createAction(MI_EditCenter, QT_TR_NOOP("Animate Tool - Center"), "", "",
-               ToolCommandType);
+               ToolCommandType, "edit_center");
   createAction(MI_EditAll, QT_TR_NOOP("Animate Tool - All"), "", "",
-               ToolCommandType);
+               ToolCommandType, "edit_all");
 
   /*-- Selection tool + type switching shortcuts --*/
   createAction(MI_SelectionNextType, QT_TR_NOOP("Selection Tool - Next Type"), "",
                "", ToolCommandType);
   createAction(MI_SelectionRectangular,
-               QT_TR_NOOP("Selection Tool - Rectangular"), "", "", ToolCommandType);
+               QT_TR_NOOP("Selection Tool - Rectangular"), "", "", ToolCommandType,
+               "selection_rectangular");
   createAction(MI_SelectionFreehand, QT_TR_NOOP("Selection Tool - Freehand"), "", "",
-               ToolCommandType);
+               ToolCommandType, "selection_freehand");
   createAction(MI_SelectionPolyline, QT_TR_NOOP("Selection Tool - Polyline"), "", "",
-               ToolCommandType);
+               ToolCommandType, "selection_polyline");
 
   /*-- Brush tool + mode switching shortcuts --*/
   createAction(MI_BrushAutoFillOn, QT_TR_NOOP("Brush Tool - Auto Fill On"), "", "",
@@ -2679,21 +2680,21 @@ void MainWindow::defineActions() {
   createAction(MI_GeometricNextShape, QT_TR_NOOP("Geometric Tool - Next Shape"), "",
                "", ToolCommandType);
   createAction(MI_GeometricRectangle, QT_TR_NOOP("Geometric Tool - Rectangle"), "",
-               "", ToolCommandType);
+               "", ToolCommandType, "geometric_rectangle");
   createAction(MI_GeometricCircle, QT_TR_NOOP("Geometric Tool - Circle"), "", "",
-               ToolCommandType);
+               ToolCommandType, "geometric_circle");
   createAction(MI_GeometricEllipse, QT_TR_NOOP("Geometric Tool - Ellipse"), "", "",
-               ToolCommandType);
+               ToolCommandType, "geometric_ellipse");
   createAction(MI_GeometricLine, QT_TR_NOOP("Geometric Tool - Line"), "", "",
-               ToolCommandType);
+               ToolCommandType, "geometric_line");
   createAction(MI_GeometricPolyline, QT_TR_NOOP("Geometric Tool - Polyline"), "",
-               "", ToolCommandType);
+               "", ToolCommandType, "geometric_polyline");
   createAction(MI_GeometricArc, QT_TR_NOOP("Geometric Tool - Arc"), "", "",
-               ToolCommandType);
+               ToolCommandType, "geometric_arc");
   createAction(MI_GeometricMultiArc, QT_TR_NOOP("Geometric Tool - MultiArc"), "",
-               "", ToolCommandType);
+               "", ToolCommandType, "geometric_multiarc");
   createAction(MI_GeometricPolygon, QT_TR_NOOP("Geometric Tool - Polygon"), "", "",
-               ToolCommandType);
+               ToolCommandType, "geometric_polygon");
 
   /*-- Type tool + style switching shortcuts --*/
   createAction(MI_TypeNextStyle, QT_TR_NOOP("Type Tool - Next Style"), "", "",
diff --git a/toonz/sources/toonz/toonz.qrc b/toonz/sources/toonz/toonz.qrc
index bd304356..26470e5b 100644
--- a/toonz/sources/toonz/toonz.qrc
+++ b/toonz/sources/toonz/toonz.qrc
@@ -382,17 +382,42 @@
 		<file>icons/dark/actions/20/mode_areas.svg</file>
 		<file>icons/dark/actions/20/mode_areas_lines.svg</file>
 
-		<file>icons/dark/actions/16/fill_rectangular.svg</file>
-		<file>icons/dark/actions/16/fill_normal.svg</file>
-		<file>icons/dark/actions/16/fill_freehand.svg</file>
-		<file>icons/dark/actions/16/fill_polyline.svg</file>
+		<file>icons/dark/actions/20/fill_rectangular.svg</file>
+		<file>icons/dark/actions/20/fill_normal.svg</file>
+		<file>icons/dark/actions/20/fill_freehand.svg</file>
+		<file>icons/dark/actions/20/fill_polyline.svg</file>
+		<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/16/fill_auto.svg</file>
 
-		<file>icons/dark/actions/16/type_lasso.svg</file>
-		<file>icons/dark/actions/16/type_rectangular.svg</file>
-		<file>icons/dark/actions/16/type_polyline.svg</file>
-		<file>icons/dark/actions/16/type_normal.svg</file>
-		<file>icons/dark/actions/16/type_erase_segment.svg</file>
+		<file>icons/dark/actions/20/paintbrush_mode_areas.svg</file>
+		<file>icons/dark/actions/20/paintbrush_mode_lines.svg</file>
+		<file>icons/dark/actions/20/paintbrush_mode_lines_areas.svg</file>
+
+		<file>icons/dark/actions/20/eraser_normal.svg</file>
+		<file>icons/dark/actions/20/eraser_polyline.svg</file>
+		<file>icons/dark/actions/20/eraser_rectangular.svg</file>
+		<file>icons/dark/actions/20/eraser_freehand.svg</file>
+    <file>icons/dark/actions/20/eraser_segment.svg</file>
+
+    <file>icons/dark/actions/20/geometric_arc.svg</file>
+		<file>icons/dark/actions/20/geometric_circle.svg</file>
+		<file>icons/dark/actions/20/geometric_ellipse.svg</file>
+		<file>icons/dark/actions/20/geometric_line.svg</file>
+		<file>icons/dark/actions/20/geometric_multiarc.svg</file>
+		<file>icons/dark/actions/20/geometric_polygon.svg</file>
+		<file>icons/dark/actions/20/geometric_rectangle.svg</file>
+
+		<file>icons/dark/actions/20/selection_rectangular.svg</file>
+		<file>icons/dark/actions/20/selection_polyline.svg</file>
+		<file>icons/dark/actions/20/selection_normal.svg</file>
+		<file>icons/dark/actions/20/selection_freehand.svg</file>
+
+    <file>icons/dark/actions/20/type_lasso.svg</file>
+		<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/16/shift_and_trace.svg</file>
 		<file>icons/dark/actions/16/shift_and_trace_edit.svg</file>