diff --git a/toonz/sources/toonz/Resources/tool_assistant.svg b/toonz/sources/toonz/Resources/tool_assistant.svg
new file mode 100644
index 0000000..dba7153
--- /dev/null
+++ b/toonz/sources/toonz/Resources/tool_assistant.svg
@@ -0,0 +1,330 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg148"
+ version="1.1"
+ viewBox="0 0 26 26"
+ height="26"
+ width="26"
+ sodipodi:docname="tool_assistant.svg"
+ inkscape:version="0.92.3 (2405546, 2018-03-11)">
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1595"
+ inkscape:window-height="881"
+ id="namedview79"
+ showgrid="false"
+ inkscape:zoom="9.0769231"
+ inkscape:cx="17.737288"
+ inkscape:cy="10.79661"
+ inkscape:window-x="59"
+ inkscape:window-y="38"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg148" />
+ <metadata
+ id="metadata152">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs131">
+ <linearGradient
+ gradientTransform="matrix(1 0 0 1.01 -0 -0.02)"
+ gradientUnits="userSpaceOnUse"
+ y2="18.65"
+ x2="14.9"
+ y1="1.67"
+ x1="5.81"
+ id="grad0">
+ <stop
+ id="stop2"
+ stop-color="#ffffff"
+ offset="0" />
+ <stop
+ id="stop4"
+ stop-color="#f3f3f3"
+ offset="0.04" />
+ <stop
+ id="stop6"
+ stop-color="#e7e7e7"
+ offset="0.08" />
+ <stop
+ id="stop8"
+ stop-color="#dadada"
+ offset="0.13" />
+ <stop
+ id="stop10"
+ stop-color="#cecece"
+ offset="0.17" />
+ <stop
+ id="stop12"
+ stop-color="#c1c1c1"
+ offset="0.22" />
+ <stop
+ id="stop14"
+ stop-color="#b4b4b4"
+ offset="0.26" />
+ <stop
+ id="stop16"
+ stop-color="#a7a7a7"
+ offset="0.31" />
+ <stop
+ id="stop18"
+ stop-color="#9b9b9b"
+ offset="0.36" />
+ <stop
+ id="stop20"
+ stop-color="#8e8e8e"
+ offset="0.4" />
+ <stop
+ id="stop22"
+ stop-color="#818181"
+ offset="0.45" />
+ <stop
+ id="stop24"
+ stop-color="#737373"
+ offset="0.5" />
+ <stop
+ id="stop26"
+ stop-color="#666666"
+ offset="0.55" />
+ <stop
+ id="stop28"
+ stop-color="#595959"
+ offset="0.61" />
+ <stop
+ id="stop30"
+ stop-color="#4b4b4b"
+ offset="0.66" />
+ <stop
+ id="stop32"
+ stop-color="#3d3d3d"
+ offset="0.71" />
+ <stop
+ id="stop34"
+ stop-color="#2f2f2f"
+ offset="0.77" />
+ <stop
+ id="stop36"
+ stop-color="#212121"
+ offset="0.82" />
+ <stop
+ id="stop38"
+ stop-color="#121212"
+ offset="0.88" />
+ <stop
+ id="stop40"
+ stop-color="#040404"
+ offset="0.94" />
+ <stop
+ id="stop42"
+ stop-color="#000000"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ gradientTransform="matrix(1 0 0 1.01 0 0.01)"
+ gradientUnits="userSpaceOnUse"
+ y2="18.53"
+ x2="21.37"
+ y1="7.34"
+ x1="16"
+ id="grad1">
+ <stop
+ id="stop45"
+ stop-color="#ffffff"
+ offset="0" />
+ <stop
+ id="stop47"
+ stop-color="#f3f3f3"
+ offset="0.15" />
+ <stop
+ id="stop49"
+ stop-color="#e7e7e7"
+ offset="0.27" />
+ <stop
+ id="stop51"
+ stop-color="#dadada"
+ offset="0.38" />
+ <stop
+ id="stop53"
+ stop-color="#cecece"
+ offset="0.46" />
+ <stop
+ id="stop55"
+ stop-color="#c1c1c1"
+ offset="0.53" />
+ <stop
+ id="stop57"
+ stop-color="#b4b4b4"
+ offset="0.59" />
+ <stop
+ id="stop59"
+ stop-color="#a8a7a7"
+ offset="0.65" />
+ <stop
+ id="stop61"
+ stop-color="#9b9b9a"
+ offset="0.69" />
+ <stop
+ id="stop63"
+ stop-color="#8e8e8e"
+ offset="0.74" />
+ <stop
+ id="stop65"
+ stop-color="#818181"
+ offset="0.77" />
+ <stop
+ id="stop67"
+ stop-color="#737373"
+ offset="0.81" />
+ <stop
+ id="stop69"
+ stop-color="#666666"
+ offset="0.84" />
+ <stop
+ id="stop71"
+ stop-color="#595959"
+ offset="0.86" />
+ <stop
+ id="stop73"
+ stop-color="#4b4b4b"
+ offset="0.89" />
+ <stop
+ id="stop75"
+ stop-color="#3d3d3d"
+ offset="0.91" />
+ <stop
+ id="stop77"
+ stop-color="#2f2f2f"
+ offset="0.93" />
+ <stop
+ id="stop79"
+ stop-color="#212121"
+ offset="0.95" />
+ <stop
+ id="stop81"
+ stop-color="#121212"
+ offset="0.97" />
+ <stop
+ id="stop83"
+ stop-color="#040404"
+ offset="0.98" />
+ <stop
+ id="stop85"
+ stop-color="#000000"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ gradientUnits="userSpaceOnUse"
+ y2="27.16"
+ x2="9.97"
+ y1="16.5"
+ x1="5.78"
+ id="grad2">
+ <stop
+ id="stop88"
+ stop-color="#ffffff"
+ offset="0" />
+ <stop
+ id="stop90"
+ stop-color="#f3f3f3"
+ offset="0.09" />
+ <stop
+ id="stop92"
+ stop-color="#e7e7e7"
+ offset="0.18" />
+ <stop
+ id="stop94"
+ stop-color="#dadada"
+ offset="0.26" />
+ <stop
+ id="stop96"
+ stop-color="#cecece"
+ offset="0.33" />
+ <stop
+ id="stop98"
+ stop-color="#c1c1c1"
+ offset="0.4" />
+ <stop
+ id="stop100"
+ stop-color="#b4b4b4"
+ offset="0.46" />
+ <stop
+ id="stop102"
+ stop-color="#a7a7a7"
+ offset="0.51" />
+ <stop
+ id="stop104"
+ stop-color="#9b9b9a"
+ offset="0.57" />
+ <stop
+ id="stop106"
+ stop-color="#8e8e8e"
+ offset="0.62" />
+ <stop
+ id="stop108"
+ stop-color="#818080"
+ offset="0.66" />
+ <stop
+ id="stop110"
+ stop-color="#737373"
+ offset="0.71" />
+ <stop
+ id="stop112"
+ stop-color="#666666"
+ offset="0.75" />
+ <stop
+ id="stop114"
+ stop-color="#595959"
+ offset="0.78" />
+ <stop
+ id="stop116"
+ stop-color="#4b4b4b"
+ offset="0.82" />
+ <stop
+ id="stop118"
+ stop-color="#3d3d3d"
+ offset="0.85" />
+ <stop
+ id="stop120"
+ stop-color="#2f2f2f"
+ offset="0.89" />
+ <stop
+ id="stop122"
+ stop-color="#212121"
+ offset="0.92" />
+ <stop
+ id="stop124"
+ stop-color="#121212"
+ offset="0.95" />
+ <stop
+ id="stop126"
+ stop-color="#040404"
+ offset="0.97" />
+ <stop
+ id="stop128"
+ stop-color="#000000"
+ offset="1" />
+ </linearGradient>
+ </defs>
+</svg>
diff --git a/toonz/sources/toonz/Resources/tool_assistant_rollover.svg b/toonz/sources/toonz/Resources/tool_assistant_rollover.svg
new file mode 100644
index 0000000..dba7153
--- /dev/null
+++ b/toonz/sources/toonz/Resources/tool_assistant_rollover.svg
@@ -0,0 +1,330 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg148"
+ version="1.1"
+ viewBox="0 0 26 26"
+ height="26"
+ width="26"
+ sodipodi:docname="tool_assistant.svg"
+ inkscape:version="0.92.3 (2405546, 2018-03-11)">
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1595"
+ inkscape:window-height="881"
+ id="namedview79"
+ showgrid="false"
+ inkscape:zoom="9.0769231"
+ inkscape:cx="17.737288"
+ inkscape:cy="10.79661"
+ inkscape:window-x="59"
+ inkscape:window-y="38"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg148" />
+ <metadata
+ id="metadata152">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs131">
+ <linearGradient
+ gradientTransform="matrix(1 0 0 1.01 -0 -0.02)"
+ gradientUnits="userSpaceOnUse"
+ y2="18.65"
+ x2="14.9"
+ y1="1.67"
+ x1="5.81"
+ id="grad0">
+ <stop
+ id="stop2"
+ stop-color="#ffffff"
+ offset="0" />
+ <stop
+ id="stop4"
+ stop-color="#f3f3f3"
+ offset="0.04" />
+ <stop
+ id="stop6"
+ stop-color="#e7e7e7"
+ offset="0.08" />
+ <stop
+ id="stop8"
+ stop-color="#dadada"
+ offset="0.13" />
+ <stop
+ id="stop10"
+ stop-color="#cecece"
+ offset="0.17" />
+ <stop
+ id="stop12"
+ stop-color="#c1c1c1"
+ offset="0.22" />
+ <stop
+ id="stop14"
+ stop-color="#b4b4b4"
+ offset="0.26" />
+ <stop
+ id="stop16"
+ stop-color="#a7a7a7"
+ offset="0.31" />
+ <stop
+ id="stop18"
+ stop-color="#9b9b9b"
+ offset="0.36" />
+ <stop
+ id="stop20"
+ stop-color="#8e8e8e"
+ offset="0.4" />
+ <stop
+ id="stop22"
+ stop-color="#818181"
+ offset="0.45" />
+ <stop
+ id="stop24"
+ stop-color="#737373"
+ offset="0.5" />
+ <stop
+ id="stop26"
+ stop-color="#666666"
+ offset="0.55" />
+ <stop
+ id="stop28"
+ stop-color="#595959"
+ offset="0.61" />
+ <stop
+ id="stop30"
+ stop-color="#4b4b4b"
+ offset="0.66" />
+ <stop
+ id="stop32"
+ stop-color="#3d3d3d"
+ offset="0.71" />
+ <stop
+ id="stop34"
+ stop-color="#2f2f2f"
+ offset="0.77" />
+ <stop
+ id="stop36"
+ stop-color="#212121"
+ offset="0.82" />
+ <stop
+ id="stop38"
+ stop-color="#121212"
+ offset="0.88" />
+ <stop
+ id="stop40"
+ stop-color="#040404"
+ offset="0.94" />
+ <stop
+ id="stop42"
+ stop-color="#000000"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ gradientTransform="matrix(1 0 0 1.01 0 0.01)"
+ gradientUnits="userSpaceOnUse"
+ y2="18.53"
+ x2="21.37"
+ y1="7.34"
+ x1="16"
+ id="grad1">
+ <stop
+ id="stop45"
+ stop-color="#ffffff"
+ offset="0" />
+ <stop
+ id="stop47"
+ stop-color="#f3f3f3"
+ offset="0.15" />
+ <stop
+ id="stop49"
+ stop-color="#e7e7e7"
+ offset="0.27" />
+ <stop
+ id="stop51"
+ stop-color="#dadada"
+ offset="0.38" />
+ <stop
+ id="stop53"
+ stop-color="#cecece"
+ offset="0.46" />
+ <stop
+ id="stop55"
+ stop-color="#c1c1c1"
+ offset="0.53" />
+ <stop
+ id="stop57"
+ stop-color="#b4b4b4"
+ offset="0.59" />
+ <stop
+ id="stop59"
+ stop-color="#a8a7a7"
+ offset="0.65" />
+ <stop
+ id="stop61"
+ stop-color="#9b9b9a"
+ offset="0.69" />
+ <stop
+ id="stop63"
+ stop-color="#8e8e8e"
+ offset="0.74" />
+ <stop
+ id="stop65"
+ stop-color="#818181"
+ offset="0.77" />
+ <stop
+ id="stop67"
+ stop-color="#737373"
+ offset="0.81" />
+ <stop
+ id="stop69"
+ stop-color="#666666"
+ offset="0.84" />
+ <stop
+ id="stop71"
+ stop-color="#595959"
+ offset="0.86" />
+ <stop
+ id="stop73"
+ stop-color="#4b4b4b"
+ offset="0.89" />
+ <stop
+ id="stop75"
+ stop-color="#3d3d3d"
+ offset="0.91" />
+ <stop
+ id="stop77"
+ stop-color="#2f2f2f"
+ offset="0.93" />
+ <stop
+ id="stop79"
+ stop-color="#212121"
+ offset="0.95" />
+ <stop
+ id="stop81"
+ stop-color="#121212"
+ offset="0.97" />
+ <stop
+ id="stop83"
+ stop-color="#040404"
+ offset="0.98" />
+ <stop
+ id="stop85"
+ stop-color="#000000"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ gradientUnits="userSpaceOnUse"
+ y2="27.16"
+ x2="9.97"
+ y1="16.5"
+ x1="5.78"
+ id="grad2">
+ <stop
+ id="stop88"
+ stop-color="#ffffff"
+ offset="0" />
+ <stop
+ id="stop90"
+ stop-color="#f3f3f3"
+ offset="0.09" />
+ <stop
+ id="stop92"
+ stop-color="#e7e7e7"
+ offset="0.18" />
+ <stop
+ id="stop94"
+ stop-color="#dadada"
+ offset="0.26" />
+ <stop
+ id="stop96"
+ stop-color="#cecece"
+ offset="0.33" />
+ <stop
+ id="stop98"
+ stop-color="#c1c1c1"
+ offset="0.4" />
+ <stop
+ id="stop100"
+ stop-color="#b4b4b4"
+ offset="0.46" />
+ <stop
+ id="stop102"
+ stop-color="#a7a7a7"
+ offset="0.51" />
+ <stop
+ id="stop104"
+ stop-color="#9b9b9a"
+ offset="0.57" />
+ <stop
+ id="stop106"
+ stop-color="#8e8e8e"
+ offset="0.62" />
+ <stop
+ id="stop108"
+ stop-color="#818080"
+ offset="0.66" />
+ <stop
+ id="stop110"
+ stop-color="#737373"
+ offset="0.71" />
+ <stop
+ id="stop112"
+ stop-color="#666666"
+ offset="0.75" />
+ <stop
+ id="stop114"
+ stop-color="#595959"
+ offset="0.78" />
+ <stop
+ id="stop116"
+ stop-color="#4b4b4b"
+ offset="0.82" />
+ <stop
+ id="stop118"
+ stop-color="#3d3d3d"
+ offset="0.85" />
+ <stop
+ id="stop120"
+ stop-color="#2f2f2f"
+ offset="0.89" />
+ <stop
+ id="stop122"
+ stop-color="#212121"
+ offset="0.92" />
+ <stop
+ id="stop124"
+ stop-color="#121212"
+ offset="0.95" />
+ <stop
+ id="stop126"
+ stop-color="#040404"
+ offset="0.97" />
+ <stop
+ id="stop128"
+ stop-color="#000000"
+ offset="1" />
+ </linearGradient>
+ </defs>
+</svg>
diff --git a/toonz/sources/toonz/mainwindow.cpp b/toonz/sources/toonz/mainwindow.cpp
index 0959e26..8249ec1 100644
--- a/toonz/sources/toonz/mainwindow.cpp
+++ b/toonz/sources/toonz/mainwindow.cpp
@@ -2472,7 +2472,7 @@ void MainWindow::defineActions() {
createToolAction(T_Plastic, "plastic", QT_TR_NOOP("Plastic Tool"), "X");
createToolAction(T_Ruler, "ruler", QT_TR_NOOP("Ruler Tool"), "");
createToolAction(T_Finger, "finger", QT_TR_NOOP("Finger Tool"), "");
- createToolAction(T_EditAssistants, "geometric", QT_TR_NOOP("Edit Assistants"), "");
+ createToolAction(T_EditAssistants, "tool_assistant", QT_TR_NOOP("Edit Assistants"), "");
/*-- Animate tool + mode switching shortcuts --*/
createAction(MI_EditNextMode, QT_TR_NOOP("Animate Tool - Next Mode"), "",