diff --git a/toonz/sources/toonz/icons/dark/actions/16/fill_auto.svg b/toonz/sources/toonz/icons/dark/actions/16/fill_auto.svg
deleted file mode 100644
index abd6a34..0000000
--- a/toonz/sources/toonz/icons/dark/actions/16/fill_auto.svg
+++ /dev/null
@@ -1,12 +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,-430)">
-        <g id="fill_auto">
-            <g id="bg" transform="matrix(0.110345,0,0,0.121212,-6.22069,411.091)">
-                <rect x="147" y="156" width="145" height="132" style="fill:rgb(135,135,135);fill-opacity:0;"/>
-            </g>
-            <path d="M24,431L11,431L11,445L24,445L24,431ZM17.5,433C17.582,433 17.664,433.02 17.74,433.062L17.742,433.062C17.788,433.088 17.83,433.121 17.867,433.161L17.868,433.162C17.892,433.187 17.912,433.215 17.93,433.244L23.116,442.227C23.254,442.466 23.172,442.772 22.933,442.91C22.694,443.048 22.388,442.966 22.25,442.727L20.66,439.974C20.61,439.991 20.556,440 20.5,440L14.5,440C14.444,440 14.39,439.991 14.34,439.974L12.75,442.727C12.612,442.966 12.306,443.048 12.067,442.91C11.828,442.772 11.746,442.466 11.884,442.227L17.07,433.244C17.088,433.215 17.108,433.187 17.132,433.162L17.133,433.161C17.17,433.121 17.212,433.088 17.258,433.062L17.26,433.062C17.336,433.02 17.418,433 17.5,433ZM17.5,434.5L14.902,439L20.098,439L17.5,434.5Z"/>
-        </g>
-    </g>
-</svg>
diff --git a/toonz/sources/toonz/icons/dark/actions/16/toggle_autofill.svg b/toonz/sources/toonz/icons/dark/actions/16/toggle_autofill.svg
new file mode 100644
index 0000000..240f49c
--- /dev/null
+++ b/toonz/sources/toonz/icons/dark/actions/16/toggle_autofill.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g id="toggle_autofill">
+        <rect x="0" y="0" width="16" height="16" style="fill-opacity:0;"/>
+        <path d="M15,0l0,16l-13.857,0l-0,-16l13.857,0Zm-1,1l-11.857,0l-0,14l11.857,-0l0,-14Z"/>
+        <path d="M13,2l0,12l-10,0l-0,-12l10,0Zm-9,10.59l1.207,-0l0.943,-2.602l3.592,0l1.002,2.602l1.295,-0l-3.516,-8.59l-1.224,0l-3.299,8.59Zm2.479,-3.528l0.943,-2.519c0.199,-0.543 0.353,-1.09 0.463,-1.641c0.133,0.465 0.336,1.059 0.609,1.782l0.897,2.379l-2.912,-0Z"/>
+    </g>
+</svg>
diff --git a/toonz/sources/toonz/icons/dark/actions/20/stylepicker_areas.svg b/toonz/sources/toonz/icons/dark/actions/20/stylepicker_areas.svg
new file mode 100644
index 0000000..8bd1c44
--- /dev/null
+++ b/toonz/sources/toonz/icons/dark/actions/20/stylepicker_areas.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <rect x="0" y="0" width="20" height="20" style="fill-opacity:0;"/>
+    <path d="M14.198,11.447l-0.699,-0.698l1.409,-1.409l0.934,0.934l1.884,-1.884c0.52,-0.52 1.363,-0.52 1.884,0c0.52,0.52 0.52,1.364 -0,1.884l-1.884,1.883l0.942,0.942l-1.409,1.409l-0.706,-0.706l-5.68,5.68c-0.661,0.66 -1.732,0.66 -2.393,-0c-0.001,-0 -0.001,-0.001 -0.001,-0.001c-0.639,-0.639 -0.64,-1.676 0,-2.316l5.719,-5.718Zm0.471,0.471l-5.719,5.719c-0.379,0.379 -0.379,0.993 0,1.372c0.001,0 0.001,0.001 0.002,0.001c0.4,0.401 1.049,0.401 1.45,0.001l5.679,-5.68l-1.412,-1.413Z"/>
+    <path d="M16.065,8.636l-0.223,0.224l-0.227,-0.227c-0.39,-0.391 -1.023,-0.391 -1.414,-0l-1.409,1.408c-0.187,0.188 -0.293,0.442 -0.293,0.707c0,0.262 0.102,0.512 0.285,0.699l-3.545,3.545c-0.257,-0.215 -0.503,-0.464 -0.74,-0.748c-1.369,1.644 -3.072,2.134 -5.107,1.473c-1.257,-1.73 -1.316,-3.501 -0.176,-5.312c-1.986,-0.795 -2.98,-2.262 -2.98,-4.401c1.258,-1.731 2.924,-2.335 4.998,-1.81c0.142,-2.135 1.231,-3.533 3.265,-4.194c2.035,0.661 3.124,2.059 3.266,4.194c2.074,-0.525 3.74,0.079 4.998,1.81c0,1.034 -0.233,1.912 -0.698,2.632Zm-7.566,-2.837c-1.594,0 -2.888,1.295 -2.888,2.889c-0,1.595 1.294,2.889 2.888,2.889c1.595,0 2.889,-1.294 2.889,-2.889c0,-1.594 -1.294,-2.889 -2.889,-2.889Z"/>
+</svg>
diff --git a/toonz/sources/toonz/icons/dark/actions/20/stylepicker_lines.svg b/toonz/sources/toonz/icons/dark/actions/20/stylepicker_lines.svg
new file mode 100644
index 0000000..c58cc8b
--- /dev/null
+++ b/toonz/sources/toonz/icons/dark/actions/20/stylepicker_lines.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <rect x="0" y="0" width="20" height="20" style="fill-opacity:0;"/>
+    <path d="M14.198,11.447l-0.699,-0.698l1.409,-1.409l0.934,0.934l1.884,-1.884c0.52,-0.52 1.363,-0.52 1.884,0c0.52,0.52 0.52,1.364 -0,1.884l-1.884,1.883l0.942,0.942l-1.409,1.409l-0.706,-0.706l-5.68,5.68c-0.661,0.66 -1.732,0.66 -2.393,-0c-0.001,-0 -0.001,-0.001 -0.001,-0.001c-0.639,-0.639 -0.64,-1.676 0,-2.316l5.719,-5.718Zm0.471,0.471l-5.719,5.719c-0.379,0.379 -0.379,0.993 0,1.372c0.001,0 0.001,0.001 0.002,0.001c0.4,0.401 1.049,0.401 1.45,0.001l5.679,-5.68l-1.412,-1.413Z"/>
+    <path d="M8.932,15.299c-0.147,-0.11 -0.291,-0.229 -0.432,-0.359c-1.365,1.253 -3,1.569 -4.906,0.95c-0.159,-0.051 -0.298,-0.152 -0.396,-0.288c-1.178,-1.62 -1.382,-3.274 -0.613,-4.958c-1.613,-0.912 -2.419,-2.37 -2.419,-4.372c-0,-0.168 0.053,-0.331 0.151,-0.467c1.178,-1.62 2.687,-2.325 4.528,-2.115c0.368,-1.815 1.505,-3.032 3.41,-3.651c0.159,-0.052 0.331,-0.052 0.49,-0c1.905,0.619 3.042,1.836 3.41,3.651c1.841,-0.21 3.35,0.495 4.528,2.115c0.098,0.136 0.151,0.299 0.151,0.467c0,0.694 -0.097,1.323 -0.291,1.887l-0.701,0.701l-0.227,-0.227c-0.038,-0.039 -0.079,-0.073 -0.121,-0.104c0.365,-0.629 0.547,-1.382 0.547,-2.257c-1.148,-1.58 -2.668,-2.131 -4.561,-1.652c-0.13,-1.948 -1.123,-3.224 -2.98,-3.827c-1.857,0.603 -2.85,1.879 -2.98,3.827c-1.893,-0.479 -3.413,0.072 -4.561,1.652c-0,1.952 0.907,3.291 2.719,4.016c-1.04,1.653 -0.986,3.269 0.161,4.848c1.857,0.604 3.411,0.156 4.661,-1.345c0.315,0.379 0.65,0.691 1.004,0.935l-0.572,0.573Zm-0.432,-9.214c1.455,0 2.636,1.182 2.636,2.637c0,1.455 -1.181,2.636 -2.636,2.636c-1.455,-0 -2.636,-1.181 -2.636,-2.636c-0,-1.455 1.181,-2.637 2.636,-2.637Zm0,0.793c-1.017,0 -1.843,0.826 -1.843,1.844c-0,1.017 0.826,1.843 1.843,1.843c1.017,0 1.843,-0.826 1.843,-1.843c0,-1.018 -0.826,-1.844 -1.843,-1.844Z"/>
+</svg>
diff --git a/toonz/sources/toonz/icons/dark/actions/20/stylepicker_lines_areas.svg b/toonz/sources/toonz/icons/dark/actions/20/stylepicker_lines_areas.svg
new file mode 100644
index 0000000..3d53877
--- /dev/null
+++ b/toonz/sources/toonz/icons/dark/actions/20/stylepicker_lines_areas.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <rect x="0" y="0" width="20" height="20" style="fill-opacity:0;"/>
+    <path d="M14.198,11.447l-0.699,-0.698l1.409,-1.409l0.934,0.934l1.884,-1.884c0.52,-0.52 1.363,-0.52 1.884,0c0.52,0.52 0.52,1.364 -0,1.884l-1.884,1.883l0.942,0.942l-1.409,1.409l-0.706,-0.706l-5.68,5.68c-0.661,0.66 -1.732,0.66 -2.393,-0c-0.001,-0 -0.001,-0.001 -0.001,-0.001c-0.639,-0.639 -0.64,-1.676 0,-2.316l5.719,-5.718Zm0.471,0.471l-5.719,5.719c-0.379,0.379 -0.379,0.993 0,1.372c0.001,0 0.001,0.001 0.002,0.001c0.4,0.401 1.049,0.401 1.45,0.001l5.679,-5.68l-1.412,-1.413Z"/>
+    <path d="M8.936,15.295c-0.159,-0.117 -0.315,-0.245 -0.467,-0.384c-1.363,1.25 -2.994,1.566 -4.896,0.948c-0.159,-0.052 -0.298,-0.152 -0.396,-0.288c-1.175,-1.617 -1.379,-3.267 -0.611,-4.949c-1.61,-0.91 -2.415,-2.364 -2.415,-4.363c0,-0.167 0.053,-0.33 0.151,-0.465c1.176,-1.618 2.681,-2.321 4.519,-2.111c0.367,-1.812 1.502,-3.026 3.403,-3.644c0.159,-0.052 0.33,-0.052 0.489,-0c1.902,0.618 3.037,1.832 3.404,3.644c1.837,-0.21 3.343,0.493 4.518,2.111c0.098,0.135 0.151,0.298 0.151,0.465c0,0.734 -0.108,1.395 -0.325,1.982l-0.619,0.619l-0.227,-0.227c-0.05,-0.05 -0.104,-0.094 -0.161,-0.131c0.361,-0.626 0.541,-1.373 0.541,-2.243c-1.146,-1.576 -2.663,-2.126 -4.552,-1.648c-0.129,-1.944 -1.121,-3.218 -2.974,-3.82c-1.853,0.602 -2.845,1.876 -2.974,3.82c-1.89,-0.478 -3.407,0.072 -4.552,1.648c-0,1.948 0.905,3.285 2.714,4.009c-1.038,1.649 -0.985,3.262 0.161,4.838c1.853,0.602 3.404,0.155 4.651,-1.342c0.326,0.391 0.672,0.71 1.039,0.958l-0.572,0.573Zm1.152,-1.152c-0.361,-0.214 -0.698,-0.509 -1.011,-0.886c-0.151,-0.18 -0.373,-0.284 -0.608,-0.284c-0.235,-0 -0.457,0.104 -0.608,0.284c-0.963,1.156 -2.146,1.545 -3.55,1.17c-0.791,-1.219 -0.785,-2.465 0.015,-3.737c0.125,-0.199 0.156,-0.444 0.083,-0.667c-0.072,-0.223 -0.24,-0.403 -0.458,-0.49c-1.396,-0.558 -2.132,-1.563 -2.209,-3.014c0.915,-1.13 2.102,-1.51 3.559,-1.141c0.227,0.058 0.469,0.011 0.659,-0.127c0.19,-0.138 0.309,-0.353 0.325,-0.587c0.1,-1.501 0.828,-2.512 2.184,-3.033c1.356,0.521 2.084,1.532 2.184,3.033c0.016,0.234 0.134,0.449 0.324,0.587c0.191,0.138 0.432,0.185 0.66,0.127c1.457,-0.369 2.644,0.011 3.559,1.141c-0.04,0.747 -0.254,1.375 -0.643,1.886c-0.128,0.048 -0.248,0.124 -0.352,0.228l-0.603,0.603c-0.188,0.11 -0.391,0.209 -0.611,0.297c-0.218,0.087 -0.386,0.267 -0.459,0.49c-0.052,0.16 -0.051,0.331 -0,0.487c-0.019,0.078 -0.029,0.158 -0.029,0.238c0,0.262 0.102,0.512 0.285,0.699l-2.696,2.696Zm-1.619,-8.861c-1.889,0 -3.423,1.533 -3.423,3.422c0,1.889 1.534,3.423 3.423,3.423c1.889,-0 3.422,-1.534 3.422,-3.423c0,-1.889 -1.533,-3.422 -3.422,-3.422Zm-0,0.791c1.452,0 2.631,1.179 2.631,2.631c0,1.452 -1.179,2.631 -2.631,2.631c-1.452,0 -2.631,-1.179 -2.631,-2.631c-0,-1.452 1.179,-2.631 2.631,-2.631Zm-0,0.791c-1.015,0 -1.84,0.825 -1.84,1.84c0,1.016 0.825,1.84 1.84,1.84c1.015,0 1.84,-0.824 1.84,-1.84c-0,-1.015 -0.825,-1.84 -1.84,-1.84Z"/>
+</svg>
diff --git a/toonz/sources/toonz/mainwindow.cpp b/toonz/sources/toonz/mainwindow.cpp
index 8e6eb61..e522d3f 100644
--- a/toonz/sources/toonz/mainwindow.cpp
+++ b/toonz/sources/toonz/mainwindow.cpp
@@ -2205,7 +2205,7 @@ void MainWindow::defineActions() {
       MI_AutoFillToggle,
       QT_TRANSLATE_NOOP("MainWindow",
                         "Toggle Autofill on Current Palette Color"),
-      "Shift+A");
+      "Shift+A", "toggle_autofill");
 
   // Right Click
 
@@ -2534,12 +2534,12 @@ void MainWindow::defineActions() {
                QT_TR_NOOP("Style Picker Tool - Next Mode"), "",
                ToolCommandType);
   createAction(MI_PickStyleAreas, QT_TR_NOOP("Style Picker Tool - Areas"), "",
-               ToolCommandType);
+               ToolCommandType, "stylepicker_areas");
   createAction(MI_PickStyleLines, QT_TR_NOOP("Style Picker Tool - Lines"), "",
-               ToolCommandType);
+               ToolCommandType, "stylepicker_lines");
   createAction(MI_PickStyleLinesAndAreas,
                QT_TR_NOOP("Style Picker Tool - Lines & Areas"), "",
-               ToolCommandType);
+               ToolCommandType, "stylepicker_lines_areas");
 
   /*-- RGB Picker tool + type switching shortcuts --*/
   createAction(MI_RGBPickerNextType, QT_TR_NOOP("RGB Picker Tool - Next Type"),
diff --git a/toonz/sources/toonz/toonz.qrc b/toonz/sources/toonz/toonz.qrc
index 6891c23..c052e66 100644
--- a/toonz/sources/toonz/toonz.qrc
+++ b/toonz/sources/toonz/toonz.qrc
@@ -402,7 +402,11 @@
 		<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/toggle_autofill.svg</file>
+
+		<file>icons/dark/actions/20/stylepicker_areas.svg</file>
+		<file>icons/dark/actions/20/stylepicker_lines.svg</file>
+		<file>icons/dark/actions/20/stylepicker_lines_areas.svg</file>
 
 		<file>icons/dark/actions/20/paintbrush_mode_areas.svg</file>
 		<file>icons/dark/actions/20/paintbrush_mode_lines.svg</file>