diff --git a/src/Gui/OverlayWidgets.cpp b/src/Gui/OverlayWidgets.cpp
index 9bfe867238..a0f3fd38d1 100644
--- a/src/Gui/OverlayWidgets.cpp
+++ b/src/Gui/OverlayWidgets.cpp
@@ -440,29 +440,34 @@ OverlayTabWidget::OverlayTabWidget(QWidget *parent, Qt::DockWidgetArea pos)
 
 void OverlayTabWidget::refreshIcons()
 {
-    actOverlay.setIcon(BitmapFactory().pixmap("qss:overlay/icons/overlay.svg"));
-    actNoAutoMode.setIcon(BitmapFactory().pixmap("qss:overlay/icons/mode.svg"));
-    actTaskShow.setIcon(BitmapFactory().pixmap("qss:overlay/icons/taskshow.svg"));
-    actEditShow.setIcon(BitmapFactory().pixmap("qss:overlay/icons/editshow.svg"));
-    actEditHide.setIcon(BitmapFactory().pixmap("qss:overlay/icons/edithide.svg"));
-    actTransparent.setIcon(BitmapFactory().pixmap("qss:overlay/icons/transparent.svg"));
-    QPixmap pxAutoHide = BitmapFactory().pixmap("qss:overlay/icons/autohide.svg");
-    switch(dockArea) {
-    case Qt::LeftDockWidgetArea:
-        actAutoHide.setIcon(pxAutoHide);
-        break;
-    case Qt::RightDockWidgetArea:
-        actAutoHide.setIcon(pxAutoHide.transformed(QTransform().scale(-1,1)));
-        break;
-    case Qt::TopDockWidgetArea:
-        actAutoHide.setIcon(pxAutoHide.transformed(QTransform().rotate(90)));
-        break;
-    case Qt::BottomDockWidgetArea:
-        actAutoHide.setIcon(pxAutoHide.transformed(QTransform().rotate(-90)));
-        break;
-    default:
-        break;
+    auto curStyleSheet =
+        App::GetApplication()
+            .GetParameterGroupByPath("User parameter:BaseApp/Preferences/MainWindow")
+            ->GetASCII("StyleSheet", "None");
+
+    QPixmap pxAutoHide;
+
+    if (isStyleSheetDark(curStyleSheet)) {
+        actOverlay.setIcon(BitmapFactory().pixmap("qss:overlay/icons/overlay_light.svg"));
+        actNoAutoMode.setIcon(BitmapFactory().pixmap("qss:overlay/icons/mode_light.svg"));
+        actTaskShow.setIcon(BitmapFactory().pixmap("qss:overlay/icons/taskshow_light.svg"));
+        actEditShow.setIcon(BitmapFactory().pixmap("qss:overlay/icons/editshow_light.svg"));
+        actEditHide.setIcon(BitmapFactory().pixmap("qss:overlay/icons/edithide_light.svg"));
+        actTransparent.setIcon(BitmapFactory().pixmap("qss:overlay/icons/transparent_light.svg"));
+        pxAutoHide = BitmapFactory().pixmap("qss:overlay/icons/autohide_light.svg");
     }
+    else {
+        actOverlay.setIcon(BitmapFactory().pixmap("qss:overlay/icons/overlay.svg"));
+        actNoAutoMode.setIcon(BitmapFactory().pixmap("qss:overlay/icons/mode.svg"));
+        actTaskShow.setIcon(BitmapFactory().pixmap("qss:overlay/icons/taskshow.svg"));
+        actEditShow.setIcon(BitmapFactory().pixmap("qss:overlay/icons/editshow.svg"));
+        actEditHide.setIcon(BitmapFactory().pixmap("qss:overlay/icons/edithide.svg"));
+        actTransparent.setIcon(BitmapFactory().pixmap("qss:overlay/icons/transparent.svg"));
+        pxAutoHide = BitmapFactory().pixmap("qss:overlay/icons/autohide.svg");
+    }
+
+    actAutoHide.setIcon(rotateAutoHideIcon(pxAutoHide, dockArea));
+
     syncAutoMode();
 }
 
@@ -870,29 +875,162 @@ void OverlayTabWidget::retranslate()
 
 void OverlayTabWidget::syncAutoMode()
 {
-    QAction *action = nullptr;
-    switch(autoMode) {
-    case AutoMode::AutoHide:
-        action = &actAutoHide;
-        break;
-    case AutoMode::EditShow:
-        action = &actEditShow;
-        break;
-    case AutoMode::TaskShow:
-        action = &actTaskShow;
-        break;
-    case AutoMode::EditHide:
-        action = &actEditHide;
-        break;
-    default:
-        action = &actNoAutoMode;
-        break;
+    auto curStyleSheet =
+        App::GetApplication()
+            .GetParameterGroupByPath("User parameter:BaseApp/Preferences/MainWindow")
+            ->GetASCII("StyleSheet", "None");
+
+    QAction* action = nullptr;
+    switch (autoMode) {
+        case AutoMode::AutoHide:
+            action = &actAutoHide;
+            if (isStyleSheetDark(curStyleSheet)) {
+                QPixmap pxAutoHideMode =
+                    BitmapFactory().pixmap("qss:overlay/icons/autohide_lighter.svg");
+                pxAutoHideMode = rotateAutoHideIcon(pxAutoHideMode, dockArea);
+                action->setIcon(pxAutoHideMode);
+                actNoAutoMode.setIcon(BitmapFactory().pixmap("qss:overlay/icons/mode_light.svg"));
+                actTaskShow.setIcon(BitmapFactory().pixmap("qss:overlay/icons/taskshow_light.svg"));
+                actEditShow.setIcon(BitmapFactory().pixmap("qss:overlay/icons/editshow_light.svg"));
+                actEditHide.setIcon(BitmapFactory().pixmap("qss:overlay/icons/edithide_light.svg"));
+            }
+            else {
+                QPixmap pxAutoHideMode = BitmapFactory().pixmap("qss:overlay/icons/autohide.svg");
+                pxAutoHideMode = rotateAutoHideIcon(pxAutoHideMode, dockArea);
+                action->setIcon(pxAutoHideMode);
+                actNoAutoMode.setIcon(
+                    BitmapFactory().pixmap("qss:overlay/icons/mode_lightgray.svg"));
+                actTaskShow.setIcon(
+                    BitmapFactory().pixmap("qss:overlay/icons/taskshow_lightgray.svg"));
+                actEditShow.setIcon(
+                    BitmapFactory().pixmap("qss:overlay/icons/editshow_lightgray.svg"));
+                actEditHide.setIcon(
+                    BitmapFactory().pixmap("qss:overlay/icons/edithide_lightgray.svg"));
+            }
+            break;
+        case AutoMode::EditShow:
+            action = &actEditShow;
+            if (isStyleSheetDark(curStyleSheet)) {
+                QPixmap pxEditShowMode =
+                    BitmapFactory().pixmap("qss:overlay/icons/editshow_lighter.svg");
+                action->setIcon(pxEditShowMode);
+                QPixmap pxAutoHideMode =
+                    BitmapFactory().pixmap("qss:overlay/icons/autohide_light.svg");
+                pxAutoHideMode = rotateAutoHideIcon(pxAutoHideMode, dockArea);
+                actAutoHide.setIcon(pxAutoHideMode);
+                actNoAutoMode.setIcon(BitmapFactory().pixmap("qss:overlay/icons/mode_light.svg"));
+                actTaskShow.setIcon(BitmapFactory().pixmap("qss:overlay/icons/taskshow_light.svg"));
+                actEditHide.setIcon(BitmapFactory().pixmap("qss:overlay/icons/edithide_light.svg"));
+            }
+            else {
+                QPixmap pxEditShowMode = BitmapFactory().pixmap("qss:overlay/icons/editshow.svg");
+                action->setIcon(pxEditShowMode);
+                QPixmap pxAutoHideMode =
+                    BitmapFactory().pixmap("qss:overlay/icons/autohide_lightgray.svg");
+                pxAutoHideMode = rotateAutoHideIcon(pxAutoHideMode, dockArea);
+                actAutoHide.setIcon(pxAutoHideMode);
+                actNoAutoMode.setIcon(
+                    BitmapFactory().pixmap("qss:overlay/icons/mode_lightgray.svg"));
+                actTaskShow.setIcon(
+                    BitmapFactory().pixmap("qss:overlay/icons/taskshow_lightgray.svg"));
+                actEditHide.setIcon(
+                    BitmapFactory().pixmap("qss:overlay/icons/edithide_lightgray.svg"));
+            }
+            break;
+        case AutoMode::TaskShow:
+            action = &actTaskShow;
+            if (isStyleSheetDark(curStyleSheet)) {
+                QPixmap pxTaskShowMode =
+                    BitmapFactory().pixmap("qss:overlay/icons/taskshow_lighter.svg");
+                action->setIcon(pxTaskShowMode);
+                QPixmap pxAutoHideMode =
+                    BitmapFactory().pixmap("qss:overlay/icons/autohide_light.svg");
+                pxAutoHideMode = rotateAutoHideIcon(pxAutoHideMode, dockArea);
+                actNoAutoMode.setIcon(BitmapFactory().pixmap("qss:overlay/icons/mode_light.svg"));
+                actEditShow.setIcon(BitmapFactory().pixmap("qss:overlay/icons/editshow_light.svg"));
+                actAutoHide.setIcon(pxAutoHideMode);
+                actEditHide.setIcon(BitmapFactory().pixmap("qss:overlay/icons/edithide_light.svg"));
+            }
+            else {
+                QPixmap pxTaskShowMode = BitmapFactory().pixmap("qss:overlay/icons/taskshow.svg");
+                action->setIcon(pxTaskShowMode);
+                QPixmap pxAutoHideMode =
+                    BitmapFactory().pixmap("qss:overlay/icons/autohide_lightgray.svg");
+                pxAutoHideMode = rotateAutoHideIcon(pxAutoHideMode, dockArea);
+                actNoAutoMode.setIcon(
+                    BitmapFactory().pixmap("qss:overlay/icons/mode_lightgray.svg"));
+                actEditShow.setIcon(
+                    BitmapFactory().pixmap("qss:overlay/icons/editshow_lightgray.svg"));
+                actAutoHide.setIcon(pxAutoHideMode);
+                actEditHide.setIcon(
+                    BitmapFactory().pixmap("qss:overlay/icons/edithide_lightgray.svg"));
+            }
+            break;
+        case AutoMode::EditHide:
+            action = &actEditHide;
+            if (isStyleSheetDark(curStyleSheet)) {
+                QPixmap pxEditHideMode =
+                    BitmapFactory().pixmap("qss:overlay/icons/edithide_lighter.svg");
+                action->setIcon(pxEditHideMode);
+                QPixmap pxAutoHideMode =
+                    BitmapFactory().pixmap("qss:overlay/icons/autohide_light.svg");
+                pxAutoHideMode = rotateAutoHideIcon(pxAutoHideMode, dockArea);
+                actNoAutoMode.setIcon(BitmapFactory().pixmap("qss:overlay/icons/mode_light.svg"));
+                actEditShow.setIcon(BitmapFactory().pixmap("qss:overlay/icons/editshow_light.svg"));
+                actAutoHide.setIcon(pxAutoHideMode);
+                actTaskShow.setIcon(BitmapFactory().pixmap("qss:overlay/icons/taskshow_light.svg"));
+            }
+            else {
+                QPixmap pxEditHideMode = BitmapFactory().pixmap("qss:overlay/icons/edithide.svg");
+                action->setIcon(pxEditHideMode);
+                QPixmap pxAutoHideMode =
+                    BitmapFactory().pixmap("qss:overlay/icons/autohide_lightgray.svg");
+                pxAutoHideMode = rotateAutoHideIcon(pxAutoHideMode, dockArea);
+                actNoAutoMode.setIcon(
+                    BitmapFactory().pixmap("qss:overlay/icons/mode_lightgray.svg"));
+                actEditShow.setIcon(
+                    BitmapFactory().pixmap("qss:overlay/icons/editshow_lightgray.svg"));
+                actAutoHide.setIcon(pxAutoHideMode);
+                actTaskShow.setIcon(
+                    BitmapFactory().pixmap("qss:overlay/icons/taskshow_lightgray.svg"));
+            }
+            break;
+        default:
+            action = &actNoAutoMode;
+            if (isStyleSheetDark(curStyleSheet)) {
+                QPixmap pxNoAutoMode = BitmapFactory().pixmap("qss:overlay/icons/mode_lighter.svg");
+                action->setIcon(pxNoAutoMode);
+                QPixmap pxAutoHideMode =
+                    BitmapFactory().pixmap("qss:overlay/icons/autohide_light.svg");
+                pxAutoHideMode = rotateAutoHideIcon(pxAutoHideMode, dockArea);
+                actTaskShow.setIcon(BitmapFactory().pixmap("qss:overlay/icons/taskshow_light.svg"));
+                actEditShow.setIcon(BitmapFactory().pixmap("qss:overlay/icons/editshow_light.svg"));
+                actAutoHide.setIcon(pxAutoHideMode);
+                actEditHide.setIcon(BitmapFactory().pixmap("qss:overlay/icons/edithide_light.svg"));
+            }
+            else {
+                QPixmap pxNoAutoMode = BitmapFactory().pixmap("qss:overlay/icons/mode.svg");
+                action->setIcon(pxNoAutoMode);
+                QPixmap pxAutoHideMode =
+                    BitmapFactory().pixmap("qss:overlay/icons/autohide_lightgray.svg");
+                pxAutoHideMode = rotateAutoHideIcon(pxAutoHideMode, dockArea);
+                actTaskShow.setIcon(
+                    BitmapFactory().pixmap("qss:overlay/icons/taskshow_lightgray.svg"));
+                actEditShow.setIcon(
+                    BitmapFactory().pixmap("qss:overlay/icons/editshow_lightgray.svg"));
+                actAutoHide.setIcon(pxAutoHideMode);
+                actEditHide.setIcon(
+                    BitmapFactory().pixmap("qss:overlay/icons/edithide_lightgray.svg"));
+            }
+            break;
     }
     actAutoMode.setIcon(action->icon());
-    if (action == &actNoAutoMode)
+    if (action == &actNoAutoMode) {
         actAutoMode.setToolTip(tr("Select auto show/hide mode"));
-    else
+    }
+    else {
         actAutoMode.setToolTip(action->toolTip());
+    }
 }
 
 void OverlayTabWidget::onAction(QAction *action)
@@ -1770,6 +1908,36 @@ QLayoutItem *OverlayTabWidget::prepareTitleWidget(QWidget *widget, const QList<Q
     return spacer;
 }
 
+bool OverlayTabWidget::isStyleSheetDark(std::string curStyleSheet)
+{
+    if (curStyleSheet.find("dark") != std::string::npos
+        || curStyleSheet.find("Dark") != std::string::npos) {
+        return true;
+    }
+    return false;
+}
+
+QPixmap OverlayTabWidget::rotateAutoHideIcon(QPixmap pxAutoHide, Qt::DockWidgetArea dockArea)
+{
+    switch (dockArea) {
+        case Qt::LeftDockWidgetArea:
+            return pxAutoHide;
+            break;
+        case Qt::RightDockWidgetArea:
+            return pxAutoHide.transformed(QTransform().scale(-1, 1));
+            break;
+        case Qt::TopDockWidgetArea:
+            return pxAutoHide.transformed(QTransform().rotate(90));
+            break;
+        case Qt::BottomDockWidgetArea:
+            return pxAutoHide.transformed(QTransform().rotate(-90));
+            break;
+        default:
+            return pxAutoHide;
+            break;
+    }
+}
+
 // -----------------------------------------------------------
 
 OverlayTitleBar::OverlayTitleBar(QWidget * parent)
diff --git a/src/Gui/OverlayWidgets.h b/src/Gui/OverlayWidgets.h
index 66dbad626d..93eb97229f 100644
--- a/src/Gui/OverlayWidgets.h
+++ b/src/Gui/OverlayWidgets.h
@@ -179,6 +179,10 @@ public:
     void onAction(QAction *);
     /// Sync relevant actions status with the current auto mode
     void syncAutoMode();
+    // Establish if stylesheet is dark
+    static bool isStyleSheetDark(std::string curStyleSheet);
+    // Rotate the AutoHide icon according to the dock area
+    static QPixmap rotateAutoHideIcon(QPixmap pxAutoHide, Qt::DockWidgetArea dockArea);
 
     /** Set tab widget position offset
      * @param ofs: the offset size. Width is the x offset for top and bottom
diff --git a/src/Gui/Stylesheets/overlay/icons/autohide_light.svg b/src/Gui/Stylesheets/overlay/icons/autohide_light.svg
new file mode 100644
index 0000000000..55a01e027c
--- /dev/null
+++ b/src/Gui/Stylesheets/overlay/icons/autohide_light.svg
@@ -0,0 +1,86 @@
+<?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"
+   width="12"
+   height="12"
+   id="svg2"
+   version="1.1"
+   viewBox="0 0 12 12"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="autohide.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     id="namedview8"
+     showgrid="true"
+     inkscape:zoom="22.627417"
+     inkscape:cx="4.6041743"
+     inkscape:cy="2.6400142"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4136"
+       spacingx="0.5"
+       spacingy="0.5"
+       empspacing="2"
+       units="px" />
+  </sodipodi:namedview>
+  <defs
+     id="defs4" />
+  <metadata
+     id="metadata7">
+    <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:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     id="path5607"
+     d="m 5,1.5 5.501761,0.00796 L 10.5,10.5 5,10.5"
+     style="fill:none;fill-rule:evenodd;stroke:#838383;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1.0"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
+  <path
+     id="path5609"
+     d="m 8.5,6 -5,0"
+     style="fill:none;fill-rule:evenodd;stroke:#838383;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1.0"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cc" />
+  <path
+     id="path5611"
+     d="m 4.4999599,4 -3,2 3,2"
+     style="fill:none;fill-rule:evenodd;stroke:#838383;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1.0" />
+</svg>
diff --git a/src/Gui/Stylesheets/overlay/icons/autohide_lighter.svg b/src/Gui/Stylesheets/overlay/icons/autohide_lighter.svg
new file mode 100644
index 0000000000..578ee3f01d
--- /dev/null
+++ b/src/Gui/Stylesheets/overlay/icons/autohide_lighter.svg
@@ -0,0 +1,86 @@
+<?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"
+   width="12"
+   height="12"
+   id="svg2"
+   version="1.1"
+   viewBox="0 0 12 12"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="autohide.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     id="namedview8"
+     showgrid="true"
+     inkscape:zoom="22.627417"
+     inkscape:cx="4.6041743"
+     inkscape:cy="2.6400142"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4136"
+       spacingx="0.5"
+       spacingy="0.5"
+       empspacing="2"
+       units="px" />
+  </sodipodi:namedview>
+  <defs
+     id="defs4" />
+  <metadata
+     id="metadata7">
+    <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:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     id="path5607"
+     d="m 5,1.5 5.501761,0.00796 L 10.5,10.5 5,10.5"
+     style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1.0"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
+  <path
+     id="path5609"
+     d="m 8.5,6 -5,0"
+     style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1.0"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cc" />
+  <path
+     id="path5611"
+     d="m 4.4999599,4 -3,2 3,2"
+     style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1.0" />
+</svg>
diff --git a/src/Gui/Stylesheets/overlay/icons/autohide_lightgray.svg b/src/Gui/Stylesheets/overlay/icons/autohide_lightgray.svg
new file mode 100644
index 0000000000..0dffc6f718
--- /dev/null
+++ b/src/Gui/Stylesheets/overlay/icons/autohide_lightgray.svg
@@ -0,0 +1,86 @@
+<?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"
+   width="12"
+   height="12"
+   id="svg2"
+   version="1.1"
+   viewBox="0 0 12 12"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="autohide.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     id="namedview8"
+     showgrid="true"
+     inkscape:zoom="22.627417"
+     inkscape:cx="4.6041743"
+     inkscape:cy="2.6400142"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4136"
+       spacingx="0.5"
+       spacingy="0.5"
+       empspacing="2"
+       units="px" />
+  </sodipodi:namedview>
+  <defs
+     id="defs4" />
+  <metadata
+     id="metadata7">
+    <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:creator>
+          <cc:Agent>
+            <dc:title>Pablo Gil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>SVG</rdf:li>
+            <rdf:li>template</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     id="path5607"
+     d="m 5,1.5 5.501761,0.00796 L 10.5,10.5 5,10.5"
+     style="fill:none;fill-rule:evenodd;stroke:#bbbbbb;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1.0"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
+  <path
+     id="path5609"
+     d="m 8.5,6 -5,0"
+     style="fill:none;fill-rule:evenodd;stroke:#bbbbbb;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1.0"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cc" />
+  <path
+     id="path5611"
+     d="m 4.4999599,4 -3,2 3,2"
+     style="fill:none;fill-rule:evenodd;stroke:#bbbbbb;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1.0" />
+</svg>
diff --git a/src/Gui/Stylesheets/overlay/icons/edithide_light.svg b/src/Gui/Stylesheets/overlay/icons/edithide_light.svg
new file mode 100644
index 0000000000..106d2710e6
--- /dev/null
+++ b/src/Gui/Stylesheets/overlay/icons/edithide_light.svg
@@ -0,0 +1,44 @@
+<?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"
+   id="svg6528"
+   height="12"
+   width="12"
+   version="1.1">
+  <metadata
+     id="metadata6538">
+    <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="defs6536" />
+  <g
+     style="opacity:1.0"
+     id="g7160">
+    <path
+       d="M 10.970616,2.3551087 9.5394447,0.92536398 c -0.179128,-0.1791285 -0.469874,-0.1791285 -0.649002,0 L 7.5970066,2.2203698 2.5975388,7.219695 C 2.5561478,7.261087 2.5226048,7.310044 2.4996248,7.3635687 L 1.4297071,9.8632313 c -0.075077,0.1729907 -0.035256,0.3735287 0.096486,0.5051287 0.088779,0.08878 0.2051055,0.134738 0.3245722,0.134738 0.061231,0 0.1224642,-0.01227 0.1821258,-0.03668 l 2.499663,-1.0699201 c 0.053525,-0.02298 0.1026242,-0.056665 0.1438738,-0.097914 L 9.6757527,4.2992585 10.970759,3.0058226 C 11.149745,2.8249815 11.149745,2.5342367 10.970616,2.3551083 Z M 2.7245703,9.17141 3.1424889,8.1978361 3.698144,8.7534913 2.7245703,9.17141 Z M 4.243094,8.4336292 3.4624938,7.6530289 7.9658256,3.1495541 8.7465687,3.9301544 4.243094,8.4336292 Z m 4.9365227,-4.9366658 -0.7806,-0.7806003 0.815856,-0.8158552 0.780599,0.779173 -0.815855,0.8172825 z"
+       id="path6532"
+       style="color:#000000;fill:#838383;fill-opacity:1.0;fill-rule:evenodd;-inkscape-stroke:none" />
+    <path
+       style="opacity:1;fill:none;fill-opacity:1.0;stroke:#838383;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:63;stroke-opacity:1"
+       d="M 3.1716102,2.6885593 8.8877119,8.8813559"
+       id="path7156" />
+    <circle
+       style="opacity:1;fill:none;fill-opacity:0.50196078;stroke:#838383;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:63;stroke-opacity:1"
+       id="path7158"
+       cx="5.9064341"
+       cy="5.9813395"
+       r="5" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/overlay/icons/edithide_lighter.svg b/src/Gui/Stylesheets/overlay/icons/edithide_lighter.svg
new file mode 100644
index 0000000000..bf0e2c0401
--- /dev/null
+++ b/src/Gui/Stylesheets/overlay/icons/edithide_lighter.svg
@@ -0,0 +1,44 @@
+<?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"
+   id="svg6528"
+   height="12"
+   width="12"
+   version="1.1">
+  <metadata
+     id="metadata6538">
+    <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="defs6536" />
+  <g
+     style="opacity:1.0"
+     id="g7160">
+    <path
+       d="M 10.970616,2.3551087 9.5394447,0.92536398 c -0.179128,-0.1791285 -0.469874,-0.1791285 -0.649002,0 L 7.5970066,2.2203698 2.5975388,7.219695 C 2.5561478,7.261087 2.5226048,7.310044 2.4996248,7.3635687 L 1.4297071,9.8632313 c -0.075077,0.1729907 -0.035256,0.3735287 0.096486,0.5051287 0.088779,0.08878 0.2051055,0.134738 0.3245722,0.134738 0.061231,0 0.1224642,-0.01227 0.1821258,-0.03668 l 2.499663,-1.0699201 c 0.053525,-0.02298 0.1026242,-0.056665 0.1438738,-0.097914 L 9.6757527,4.2992585 10.970759,3.0058226 C 11.149745,2.8249815 11.149745,2.5342367 10.970616,2.3551083 Z M 2.7245703,9.17141 3.1424889,8.1978361 3.698144,8.7534913 2.7245703,9.17141 Z M 4.243094,8.4336292 3.4624938,7.6530289 7.9658256,3.1495541 8.7465687,3.9301544 4.243094,8.4336292 Z m 4.9365227,-4.9366658 -0.7806,-0.7806003 0.815856,-0.8158552 0.780599,0.779173 -0.815855,0.8172825 z"
+       id="path6532"
+       style="color:#000000;fill:#ffffff;fill-opacity:1.0;fill-rule:evenodd;-inkscape-stroke:none" />
+    <path
+       style="opacity:1;fill:none;fill-opacity:1.0;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:63;stroke-opacity:1"
+       d="M 3.1716102,2.6885593 8.8877119,8.8813559"
+       id="path7156" />
+    <circle
+       style="opacity:1;fill:none;fill-opacity:0.50196078;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:63;stroke-opacity:1"
+       id="path7158"
+       cx="5.9064341"
+       cy="5.9813395"
+       r="5" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/overlay/icons/edithide_lightgray.svg b/src/Gui/Stylesheets/overlay/icons/edithide_lightgray.svg
new file mode 100644
index 0000000000..88f223c672
--- /dev/null
+++ b/src/Gui/Stylesheets/overlay/icons/edithide_lightgray.svg
@@ -0,0 +1,44 @@
+<?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"
+   id="svg6528"
+   height="12"
+   width="12"
+   version="1.1">
+  <metadata
+     id="metadata6538">
+    <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="defs6536" />
+  <g
+     style="opacity:1.0"
+     id="g7160">
+    <path
+       d="M 10.970616,2.3551087 9.5394447,0.92536398 c -0.179128,-0.1791285 -0.469874,-0.1791285 -0.649002,0 L 7.5970066,2.2203698 2.5975388,7.219695 C 2.5561478,7.261087 2.5226048,7.310044 2.4996248,7.3635687 L 1.4297071,9.8632313 c -0.075077,0.1729907 -0.035256,0.3735287 0.096486,0.5051287 0.088779,0.08878 0.2051055,0.134738 0.3245722,0.134738 0.061231,0 0.1224642,-0.01227 0.1821258,-0.03668 l 2.499663,-1.0699201 c 0.053525,-0.02298 0.1026242,-0.056665 0.1438738,-0.097914 L 9.6757527,4.2992585 10.970759,3.0058226 C 11.149745,2.8249815 11.149745,2.5342367 10.970616,2.3551083 Z M 2.7245703,9.17141 3.1424889,8.1978361 3.698144,8.7534913 2.7245703,9.17141 Z M 4.243094,8.4336292 3.4624938,7.6530289 7.9658256,3.1495541 8.7465687,3.9301544 4.243094,8.4336292 Z m 4.9365227,-4.9366658 -0.7806,-0.7806003 0.815856,-0.8158552 0.780599,0.779173 -0.815855,0.8172825 z"
+       id="path6532"
+       style="color:#000000;fill:#bbbbbb;fill-opacity:1.0;fill-rule:evenodd;-inkscape-stroke:none" />
+    <path
+       style="opacity:1;fill:none;fill-opacity:1.0;stroke:#bbbbbb;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:63;stroke-opacity:1"
+       d="M 3.1716102,2.6885593 8.8877119,8.8813559"
+       id="path7156" />
+    <circle
+       style="opacity:1;fill:none;fill-opacity:0.50196078;stroke:#bbbbbb;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:63;stroke-opacity:1"
+       id="path7158"
+       cx="5.9064341"
+       cy="5.9813395"
+       r="5" />
+  </g>
+</svg>
diff --git a/src/Gui/Stylesheets/overlay/icons/editshow_light.svg b/src/Gui/Stylesheets/overlay/icons/editshow_light.svg
new file mode 100644
index 0000000000..637bfd3ec6
--- /dev/null
+++ b/src/Gui/Stylesheets/overlay/icons/editshow_light.svg
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   id="svg6528"
+   height="12"
+   width="12"
+   version="1.1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <metadata
+     id="metadata6538">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6538" />
+  <path
+     style="color:#000000;fill:#838383;fill-opacity:1.0;fill-rule:evenodd;-inkscape-stroke:none"
+     id="path6532"
+     d="M 11.749015,1.7952914 10.347156,0.39482903 c -0.175459,-0.1754598 -0.4602506,-0.1754598 -0.6357099,0 L 8.4445007,1.663312 3.5474261,6.5602469 C 3.5068828,6.6007913 3.4740266,6.6487458 3.451517,6.701174 L 2.4035126,9.1496414 c -0.073539,0.1694479 -0.034534,0.3658789 0.09451,0.4947827 0.08696,0.086962 0.2009047,0.1319789 0.3179247,0.1319789 0.059977,0 0.119956,-0.012018 0.1783957,-0.035929 L 5.4428109,8.6924669 c 0.052428,-0.02251 0.1005224,-0.055504 0.1409271,-0.095909 l 4.896934,-4.896935 1.268484,-1.2669453 C 11.924476,2.2555401 11.924476,1.97075 11.749015,1.7952903 Z M 3.6718559,8.4719892 4.0812152,7.5183549 4.62549,8.0626298 3.6718559,8.4719892 Z M 5.1592789,7.7493187 4.3946661,6.9847058 8.8057659,2.573466 9.5705187,3.3380788 5.1592789,7.7493187 Z M 9.9946975,2.9137599 9.2300849,2.1491471 10.029231,1.3500012 10.793844,2.1132161 9.9946975,2.9137599 Z" />
+  <path
+     id="path7086"
+     d="M 5,2 1.5,2 1.4996684,10.5 10,10.5 10,7"
+     style="fill:none;fill-rule:evenodd;stroke:#838383;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1.0"/>
+</svg>
diff --git a/src/Gui/Stylesheets/overlay/icons/editshow_lighter.svg b/src/Gui/Stylesheets/overlay/icons/editshow_lighter.svg
new file mode 100644
index 0000000000..b657024d6b
--- /dev/null
+++ b/src/Gui/Stylesheets/overlay/icons/editshow_lighter.svg
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   id="svg6528"
+   height="12"
+   width="12"
+   version="1.1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <metadata
+     id="metadata6538">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6538" />
+  <path
+     style="color:#000000;fill:#fefefe;fill-opacity:1.0;fill-rule:evenodd;-inkscape-stroke:none"
+     id="path6532"
+     d="M 11.749015,1.7952914 10.347156,0.39482903 c -0.175459,-0.1754598 -0.4602506,-0.1754598 -0.6357099,0 L 8.4445007,1.663312 3.5474261,6.5602469 C 3.5068828,6.6007913 3.4740266,6.6487458 3.451517,6.701174 L 2.4035126,9.1496414 c -0.073539,0.1694479 -0.034534,0.3658789 0.09451,0.4947827 0.08696,0.086962 0.2009047,0.1319789 0.3179247,0.1319789 0.059977,0 0.119956,-0.012018 0.1783957,-0.035929 L 5.4428109,8.6924669 c 0.052428,-0.02251 0.1005224,-0.055504 0.1409271,-0.095909 l 4.896934,-4.896935 1.268484,-1.2669453 C 11.924476,2.2555401 11.924476,1.97075 11.749015,1.7952903 Z M 3.6718559,8.4719892 4.0812152,7.5183549 4.62549,8.0626298 3.6718559,8.4719892 Z M 5.1592789,7.7493187 4.3946661,6.9847058 8.8057659,2.573466 9.5705187,3.3380788 5.1592789,7.7493187 Z M 9.9946975,2.9137599 9.2300849,2.1491471 10.029231,1.3500012 10.793844,2.1132161 9.9946975,2.9137599 Z" />
+  <path
+     id="path7086"
+     d="M 5,2 1.5,2 1.4996684,10.5 10,10.5 10,7"
+     style="fill:none;fill-rule:evenodd;stroke:#fefefe;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1.0"/>
+</svg>
diff --git a/src/Gui/Stylesheets/overlay/icons/editshow_lightgray.svg b/src/Gui/Stylesheets/overlay/icons/editshow_lightgray.svg
new file mode 100644
index 0000000000..673c9b5990
--- /dev/null
+++ b/src/Gui/Stylesheets/overlay/icons/editshow_lightgray.svg
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   id="svg6528"
+   height="12"
+   width="12"
+   version="1.1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <metadata
+     id="metadata6538">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6538" />
+  <path
+     style="color:#000000;fill:#bbbbbb;fill-opacity:1.0;fill-rule:evenodd;-inkscape-stroke:none"
+     id="path6532"
+     d="M 11.749015,1.7952914 10.347156,0.39482903 c -0.175459,-0.1754598 -0.4602506,-0.1754598 -0.6357099,0 L 8.4445007,1.663312 3.5474261,6.5602469 C 3.5068828,6.6007913 3.4740266,6.6487458 3.451517,6.701174 L 2.4035126,9.1496414 c -0.073539,0.1694479 -0.034534,0.3658789 0.09451,0.4947827 0.08696,0.086962 0.2009047,0.1319789 0.3179247,0.1319789 0.059977,0 0.119956,-0.012018 0.1783957,-0.035929 L 5.4428109,8.6924669 c 0.052428,-0.02251 0.1005224,-0.055504 0.1409271,-0.095909 l 4.896934,-4.896935 1.268484,-1.2669453 C 11.924476,2.2555401 11.924476,1.97075 11.749015,1.7952903 Z M 3.6718559,8.4719892 4.0812152,7.5183549 4.62549,8.0626298 3.6718559,8.4719892 Z M 5.1592789,7.7493187 4.3946661,6.9847058 8.8057659,2.573466 9.5705187,3.3380788 5.1592789,7.7493187 Z M 9.9946975,2.9137599 9.2300849,2.1491471 10.029231,1.3500012 10.793844,2.1132161 9.9946975,2.9137599 Z" />
+  <path
+     id="path7086"
+     d="M 5,2 1.5,2 1.4996684,10.5 10,10.5 10,7"
+     style="fill:none;fill-rule:evenodd;stroke:#bbbbbb;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1.0"/>
+</svg>
diff --git a/src/Gui/Stylesheets/overlay/icons/mode_light.svg b/src/Gui/Stylesheets/overlay/icons/mode_light.svg
index ee07548058..a5346b3d59 100644
--- a/src/Gui/Stylesheets/overlay/icons/mode_light.svg
+++ b/src/Gui/Stylesheets/overlay/icons/mode_light.svg
@@ -341,6 +341,6 @@
          style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
          d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
          id="path14329" /></marker></defs><path
-     style="fill:#bfbfbf;fill-opacity:1;stroke:none;stroke-width:1.1"
+     style="fill:#838383;fill-opacity:1;stroke:none;stroke-width:1.1"
      d="M 5.2397267,0.5 C 5.0575893,0.5 4.910959,0.64663006 4.910959,0.82876739 V 1.6643839 C 4.4856893,1.7699554 4.0763696,1.9398708 3.6917809,2.1712334 L 3.1027398,1.5821921 c -0.1287903,-0.1287903 -0.3369631,-0.1287903 -0.4657533,0 L 1.5684931,2.650685 c -0.1287902,0.1287908 -0.1287902,0.336963 0,0.4657539 L 2.1575342,3.7054803 C 1.9279826,4.0889453 1.7688105,4.5029063 1.6643837,4.9246576 H 0.82876723 C 0.64663022,4.9246576 0.5,5.0712876 0.5,5.2534237 v 1.5068496 c 0,0.1821374 0.14663022,0.3287674 0.32876723,0.3287674 H 1.650685 C 1.7562388,7.5146894 1.9259776,7.9233066 2.1575342,8.3082185 L 1.5684931,8.89726 c -0.1287902,0.1287897 -0.1287902,0.3369631 0,0.4657545 l 1.0684934,1.0684925 c 0.1287902,0.128791 0.336963,0.128791 0.4657533,0 L 3.6917809,9.8424645 C 4.0780503,10.075431 4.4856146,10.230006 4.910959,10.335617 v 0.835616 C 4.910959,11.35337 5.0575893,11.5 5.2397267,11.5 h 1.5068497 c 0.182136,0 0.328766,-0.14663 0.328766,-0.328767 v -0.835616 c 0.4262534,-0.10505 0.8336574,-0.261859 1.219178,-0.4931525 L 8.883562,10.431507 c 0.1287908,0.128791 0.336963,0.128791 0.4657538,0 L 10.417809,9.3630145 c 0.128789,-0.1287914 0.128789,-0.3369648 0,-0.4657545 L 9.8287671,8.3082185 C 10.060611,7.9240029 10.229802,7.5121062 10.335617,7.0890409 h 0.835617 C 11.35337,7.0890407 11.5,6.9424107 11.5,6.7602733 V 5.2534249 C 11.5,5.0712876 11.35337,4.9246576 11.171234,4.9246576 H 10.335617 C 10.230681,4.5019542 10.05798,4.0880816 9.8287671,3.7054803 L 10.417809,3.1164389 c 0.128789,-0.1287909 0.128789,-0.3369631 0,-0.4657539 L 9.3493158,1.5821921 c -0.1287908,-0.1287903 -0.336963,-0.1287903 -0.4657538,0 L 8.2945204,2.1712334 C 7.9095759,1.9401799 7.4989601,1.7692083 7.0753424,1.6643839 V 0.82876739 C 7.0753424,0.64663006 6.9287124,0.5 6.7465764,0.5 Z m 0.6986295,3.4246576 c 0.5326902,-0.014142 1.0759354,0.166 1.493151,0.5616435 0.8344301,0.7912871 0.873478,2.1107753 0.082192,2.9452058 C 6.7243649,8.2638772 5.4036157,8.3001209 4.5684931,7.5136984 3.7340631,6.7224113 3.6950148,5.4029233 4.4863016,4.5684928 4.8819454,4.1512779 5.4056664,3.9387947 5.9383562,3.9246576 Z"
      id="rect3381-0" /></svg>
diff --git a/src/Gui/Stylesheets/overlay/icons/mode_lightgray.svg b/src/Gui/Stylesheets/overlay/icons/mode_lightgray.svg
new file mode 100644
index 0000000000..9f75c407b9
--- /dev/null
+++ b/src/Gui/Stylesheets/overlay/icons/mode_lightgray.svg
@@ -0,0 +1,346 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="12"
+   height="12"
+   viewBox="0 0 12 12"
+   enable-background="new 0 0 32 32"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+     id="metadata7"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs5"><marker
+       style="overflow:visible"
+       id="Arrow2Mend-5"
+       refX="0"
+       refY="0"
+       orient="auto"><path
+         transform="scale(-0.6,-0.6)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         id="path45132-1" /></marker><marker
+       style="overflow:visible"
+       id="DotM-00"
+       refX="0"
+       refY="0"
+       orient="auto"><path
+         transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+         d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+         id="path14329-2" /></marker><marker
+       style="overflow:visible"
+       id="Arrow2Mend-07"
+       refX="0"
+       refY="0"
+       orient="auto"><path
+         transform="scale(-0.6,-0.6)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         id="path45132-31" /></marker><marker
+       style="overflow:visible"
+       id="DotM-0"
+       refX="0"
+       refY="0"
+       orient="auto"><path
+         transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+         d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+         id="path14329-94" /></marker><marker
+       style="overflow:visible"
+       id="Arrow2Mend-6"
+       refX="0"
+       refY="0"
+       orient="auto"><path
+         transform="scale(-0.6,-0.6)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         id="path45132-8" /></marker><marker
+       style="overflow:visible"
+       id="DotM-8"
+       refX="0"
+       refY="0"
+       orient="auto"><path
+         transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+         d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+         id="path14329-91" /></marker><clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath3169-2"><rect
+         style="fill:#f5f5f4;fill-opacity:1;stroke:#888a85;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect3171-7"
+         width="748.77557"
+         height="428.80975"
+         x="48.992397"
+         y="105.34417" /></clipPath><clipPath
+       id="clipPath22-7"
+       clipPathUnits="userSpaceOnUse"><path
+         id="path24-2"
+         d="M 0,792 1224,792 1224,0 0,0 0,792 Z" /></clipPath><clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath6483-7"><rect
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         id="rect6485-5"
+         width="548"
+         height="280"
+         x="67.578148"
+         y="187.65627" /></clipPath><clipPath
+       id="clipPath10152"
+       clipPathUnits="userSpaceOnUse"><rect
+         y="754.14667"
+         x="-37.134048"
+         height="140.17392"
+         width="718.58722"
+         id="rect10154"
+         style="fill:#555753;fill-opacity:1;stroke:#555753;stroke-width:1.83322382;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /></clipPath><marker
+       style="overflow:visible"
+       id="Arrow2Mend-0"
+       refX="0"
+       refY="0"
+       orient="auto"><path
+         transform="scale(-0.6,-0.6)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         id="path45132-982" /></marker><marker
+       style="overflow:visible"
+       id="DotM-2"
+       refX="0"
+       refY="0"
+       orient="auto"><path
+         transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+         d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+         id="path14329-95" /></marker><marker
+       style="overflow:visible"
+       id="Arrow2Mend-2"
+       refX="0"
+       refY="0"
+       orient="auto"><path
+         transform="scale(-0.6,-0.6)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         id="path45132-98" /></marker><marker
+       style="overflow:visible"
+       id="DotM-5"
+       refX="0"
+       refY="0"
+       orient="auto"><path
+         transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+         d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+         id="path14329-1" /></marker><marker
+       style="overflow:visible"
+       id="Arrow2Mend-75"
+       refX="0"
+       refY="0"
+       orient="auto"><path
+         transform="scale(-0.6,-0.6)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         id="path45132-9" /></marker><marker
+       style="overflow:visible"
+       id="DotM-466"
+       refX="0"
+       refY="0"
+       orient="auto"><path
+         transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+         d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+         id="path14329-32" /></marker><marker
+       style="overflow:visible"
+       id="marker32938"
+       refX="0"
+       refY="0"
+       orient="auto"><path
+         transform="scale(-0.6,-0.6)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         id="path32940" /></marker><marker
+       style="overflow:visible"
+       id="marker32934"
+       refX="0"
+       refY="0"
+       orient="auto"><path
+         transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+         d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+         id="path32936" /></marker><marker
+       style="overflow:visible"
+       id="Arrow2Mend-7"
+       refX="0"
+       refY="0"
+       orient="auto"><path
+         transform="scale(-0.6,-0.6)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         id="path45132-2" /></marker><marker
+       style="overflow:visible"
+       id="DotM-46"
+       refX="0"
+       refY="0"
+       orient="auto"><path
+         transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+         d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+         id="path14329-9" /></marker><marker
+       style="overflow:visible"
+       id="Arrow2Mend-3"
+       refX="0"
+       refY="0"
+       orient="auto"><path
+         transform="scale(-0.6,-0.6)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         id="path45132-3" /></marker><marker
+       style="overflow:visible"
+       id="DotM-42"
+       refX="0"
+       refY="0"
+       orient="auto"><path
+         transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+         d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+         id="path14329-3" /></marker><marker
+       style="overflow:visible"
+       id="Arrow2Mend-9"
+       refX="0"
+       refY="0"
+       orient="auto"><path
+         transform="scale(-0.6,-0.6)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         id="path45132-4" /></marker><marker
+       style="overflow:visible"
+       id="DotM-4"
+       refX="0"
+       refY="0"
+       orient="auto"><path
+         transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+         d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+         id="path14329-8" /></marker><clipPath
+       id="clipPath6483-5"
+       clipPathUnits="userSpaceOnUse"><rect
+         y="187.65627"
+         x="67.578148"
+         height="280"
+         width="548"
+         id="rect6485-2"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" /></clipPath><clipPath
+       id="clipPath6483-1-7-3-0"
+       clipPathUnits="userSpaceOnUse"><rect
+         y="187.65627"
+         x="67.578148"
+         height="280"
+         width="548"
+         id="rect6485-6-4-5-6"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" /></clipPath><marker
+       style="overflow:visible"
+       id="Arrow2Lend-0"
+       refX="0"
+       refY="0"
+       orient="auto"><path
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         id="path45126-6" /></marker><clipPath
+       id="clipPath6483-1-7-3-9"
+       clipPathUnits="userSpaceOnUse"><rect
+         y="187.65627"
+         x="67.578148"
+         height="280"
+         width="548"
+         id="rect6485-6-4-5-8"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" /></clipPath><clipPath
+       id="clipPath6483-1-7-3"
+       clipPathUnits="userSpaceOnUse"><rect
+         y="187.65627"
+         x="67.578148"
+         height="280"
+         width="548"
+         id="rect6485-6-4-5"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" /></clipPath><clipPath
+       id="clipPath6483-1-7"
+       clipPathUnits="userSpaceOnUse"><rect
+         y="187.65627"
+         x="67.578148"
+         height="280"
+         width="548"
+         id="rect6485-6-4"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" /></clipPath><clipPath
+       id="clipPath6483-1"
+       clipPathUnits="userSpaceOnUse"><rect
+         y="187.65627"
+         x="67.578148"
+         height="280"
+         width="548"
+         id="rect6485-6"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" /></clipPath><clipPath
+       id="clipPath6483"
+       clipPathUnits="userSpaceOnUse"><rect
+         y="187.65627"
+         x="67.578148"
+         height="280"
+         width="548"
+         id="rect6485"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" /></clipPath><clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath22"><path
+         d="M 0,792 1224,792 1224,0 0,0 0,792 Z"
+         id="path24" /></clipPath><clipPath
+       id="clipPath3169"
+       clipPathUnits="userSpaceOnUse"><rect
+         y="105.34417"
+         x="48.992397"
+         height="428.80975"
+         width="748.77557"
+         id="rect3171"
+         style="fill:#f5f5f4;fill-opacity:1;stroke:#888a85;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /></clipPath><marker
+       style="overflow:visible"
+       id="Arrow2Lend"
+       refX="0"
+       refY="0"
+       orient="auto"><path
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         id="path45126" /></marker><marker
+       style="overflow:visible"
+       id="Arrow2Mend"
+       refX="0"
+       refY="0"
+       orient="auto"><path
+         transform="scale(-0.6,-0.6)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         id="path45132" /></marker><marker
+       style="overflow:visible"
+       id="DotL"
+       refX="0"
+       refY="0"
+       orient="auto"><path
+         transform="matrix(0.8,0,0,0.8,5.92,0.8)"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+         d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+         id="path14326" /></marker><marker
+       style="overflow:visible"
+       id="DotM"
+       refX="0"
+       refY="0"
+       orient="auto"><path
+         transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+         d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+         id="path14329" /></marker></defs><path
+     style="fill:#bbbbbb;fill-opacity:1;stroke:none;stroke-width:1.1"
+     d="M 5.2397266,0.5 C 5.0575891,0.5 4.9109589,0.64663005 4.9109589,0.82876742 V 1.6643838 C 4.4856893,1.7699553 4.0763698,1.9398709 3.691781,2.1712336 L 3.10274,1.5821922 c -0.1287904,-0.1287905 -0.3369634,-0.1287905 -0.4657537,0 L 1.5684932,2.650685 c -0.1287902,0.1287908 -0.1287902,0.336963 0,0.4657539 L 2.1575343,3.7054804 C 1.9279826,4.0889454 1.7688105,4.5029064 1.6643836,4.9246577 H 0.82876727 C 0.64663021,4.9246577 0.5,5.0712877 0.5,5.2534237 v 1.5068497 c 0,0.1821375 0.14663021,0.3287674 0.32876727,0.3287674 H 1.6506851 C 1.7562389,7.5146895 1.9259777,7.9233066 2.1575343,8.3082186 L 1.5684932,8.89726 c -0.1287902,0.1287897 -0.1287902,0.3369631 0,0.4657546 l 1.0684931,1.0684924 c 0.1287903,0.12879 0.3369633,0.12879 0.4657537,0 L 3.691781,9.842465 c 0.3862691,0.232967 0.7938336,0.387541 1.2191779,0.49315 v 0.835618 c 0,0.182137 0.1466302,0.328767 0.3287677,0.328767 h 1.5068498 c 0.182136,0 0.328766,-0.14663 0.328766,-0.328767 v -0.835618 c 0.4262536,-0.10505 0.8336573,-0.261856 1.2191781,-0.49315 l 0.5890415,0.589042 c 0.1287907,0.12879 0.336963,0.12879 0.4657537,0 L 10.41781,9.3630146 c 0.12879,-0.1287915 0.12879,-0.3369649 0,-0.4657546 L 9.8287673,8.3082186 C 10.06061,7.924003 10.229803,7.5121063 10.335616,7.0890411 h 0.835618 C 11.35337,7.0890408 11.5,6.9424109 11.5,6.7602734 V 5.2534251 C 11.5,5.0712877 11.35337,4.9246577 11.171234,4.9246577 H 10.335616 C 10.230682,4.5019542 10.057981,4.0880816 9.8287673,3.7054804 L 10.41781,3.1164389 c 0.12879,-0.1287909 0.12879,-0.3369631 0,-0.4657539 L 9.3493157,1.5821922 c -0.1287907,-0.1287905 -0.336963,-0.1287905 -0.4657537,0 L 8.2945205,2.1712336 C 7.9095759,1.9401799 7.4989599,1.7692083 7.0753424,1.6643838 V 0.82876742 C 7.0753424,0.64663005 6.9287124,0.5 6.7465764,0.5 Z M 5.9383562,3.9246578 C 6.4710464,3.910516 7.0142917,4.0906576 7.4315072,4.4863011 8.2659375,5.2775883 8.3049854,6.5970764 7.5136992,7.431507 6.724365,8.2638773 5.4036156,8.300121 4.5684931,7.5136985 3.7340632,6.7224114 3.6950146,5.4029232 4.4863015,4.5684929 4.8819453,4.151278 5.4056663,3.9387948 5.9383562,3.924658 Z"
+     id="rect3381-0" /></svg>
diff --git a/src/Gui/Stylesheets/overlay/icons/taskshow_light.svg b/src/Gui/Stylesheets/overlay/icons/taskshow_light.svg
index c2516d9abb..fa27735198 100644
--- a/src/Gui/Stylesheets/overlay/icons/taskshow_light.svg
+++ b/src/Gui/Stylesheets/overlay/icons/taskshow_light.svg
@@ -24,6 +24,6 @@
      id="defs6536" />
   <path
      id="path4139-0"
-     style="color:#000000;fill:#bfbfbf;fill-opacity:0.99875158;fill-rule:evenodd;-inkscape-stroke:none"
+     style="color:#000000;fill:#838383;fill-opacity:0.99875158;fill-rule:evenodd;-inkscape-stroke:none"
      d="M 3,8 V 9 H 9 V 8 Z M 3,6 V 7 H 9 V 6 Z M 3,4 V 5 H 9 V 4 Z M 3,0.37795276 V 0.87795274 3.3779528 H 9 V 0.37795276 Z M 4,1.3779528 h 4 v 1 H 4 Z M 1,1.5 V 11 H 11 V 1.5 H 9 v 1 h 1 V 10 H 2 V 2.5 h 1 v -1 z" />
 </svg>
diff --git a/src/Gui/Stylesheets/overlay/icons/taskshow_lighter.svg b/src/Gui/Stylesheets/overlay/icons/taskshow_lighter.svg
new file mode 100644
index 0000000000..bb495ce47d
--- /dev/null
+++ b/src/Gui/Stylesheets/overlay/icons/taskshow_lighter.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   id="svg6528"
+   height="12"
+   width="12"
+   version="1.1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <metadata
+     id="metadata6538">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6536" />
+  <path
+     id="path4139-0"
+     style="color:#ffffff;fill:#ffffff;fill-opacity:1.0;fill-rule:evenodd;-inkscape-stroke:none"
+     d="M 3,8 V 9 H 9 V 8 Z M 3,6 V 7 H 9 V 6 Z M 3,4 V 5 H 9 V 4 Z M 3,0.37795276 V 0.87795274 3.3779528 H 9 V 0.37795276 Z M 4,1.3779528 h 4 v 1 H 4 Z M 1,1.5 V 11 H 11 V 1.5 H 9 v 1 h 1 V 10 H 2 V 2.5 h 1 v -1 z" />
+</svg>
diff --git a/src/Gui/Stylesheets/overlay/icons/taskshow_lightgray.svg b/src/Gui/Stylesheets/overlay/icons/taskshow_lightgray.svg
new file mode 100644
index 0000000000..4259fb5247
--- /dev/null
+++ b/src/Gui/Stylesheets/overlay/icons/taskshow_lightgray.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   id="svg6528"
+   height="12"
+   width="12"
+   version="1.1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <metadata
+     id="metadata6538">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6536" />
+  <path
+     id="path4139-0"
+     style="color:#bbbbbb;fill:#bbbbbb;fill-opacity:1.0;fill-rule:evenodd;-inkscape-stroke:none"
+     d="M 3,8 V 9 H 9 V 8 Z M 3,6 V 7 H 9 V 6 Z M 3,4 V 5 H 9 V 4 Z M 3,0.37795276 V 0.87795274 3.3779528 H 9 V 0.37795276 Z M 4,1.3779528 h 4 v 1 H 4 Z M 1,1.5 V 11 H 11 V 1.5 H 9 v 1 h 1 V 10 H 2 V 2.5 h 1 v -1 z" />
+</svg>