diff --git a/src/Gui/Stylesheets/FreeCAD Dark.qss b/src/Gui/Stylesheets/FreeCAD Dark.qss
index c463797768..faece864ce 100644
--- a/src/Gui/Stylesheets/FreeCAD Dark.qss	
+++ b/src/Gui/Stylesheets/FreeCAD Dark.qss	
@@ -152,23 +152,16 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qmainwindow
 
 --------------------------------------------------------------------------- */
 QMainWindow::separator {
-  /*background-color: #3c3c3c;*/
   border: 0px solid #020202;
   spacing: 0px;
   padding: 1px;
 }
 
 QMainWindow::separator:vertical:hover {
-  /* background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,stop:0.2 transparent,stop:0.5 @ThemeAccentColor1, stop:0.8 transparent); */
-  /*background-color: @ThemeAccentColor1;*/
-  /* width: 2px;*/
   image: url(qss:images_classic/splitter_vertical-lightgray.png);
 }
 
 QMainWindow::separator:horizontal:hover {
-  /* height: 2px; */
-  /* background-color: qlineargradient(x1:0, y1:0, x2:1, y2:0,stop:0.2 transparent,stop:0.5 @ThemeAccentColor1, stop:0.8 transparent); */
-  /*background-color: @ThemeAccentColor1;*/
   image: url(qss:images_classic/splitter_horizontal-lightgray.png);
 }
 
@@ -176,14 +169,12 @@ QMainWindow::separator:horizontal {
   width: 4px;
   margin-top: 0.1px;
   margin-bottom: 0.1px;
-  /* image: url(qss:images_classic/splitter_horizontal-dark.png);*/
 }
 
 QMainWindow::separator:vertical {
   height: 4px;
   margin-left: 0.1px;
   margin-right: 0.1px;
-  /* image: url(qss:images_classic/splitter_vertical_dark.png);*/
 }
 
 /* QToolTip ---------------------------------------------------------------
@@ -267,54 +258,56 @@ QCheckBox::indicator {
   width: 12px;
   height: 12px;
   border: 1px solid #f0f0f0;
-  /* image:url(qss:images_classic/checkbox-Empty-white.png); */
 }
 
 QCheckBox::indicator:unchecked {
   background-color: #252525;
   border: 1px solid #f0f0f0;
-  /* image:url(qss:images_classic/checkbox-Empty-white.png); */
 }
 
 QCheckBox::indicator:unchecked:hover, QCheckBox::indicator:unchecked:focus, QCheckBox::indicator:unchecked:pressed {
   background-color: @ThemeAccentColor1;
   border: 1px solid #f0f0f0;
-  /* image:url(qss:images_classic/checkbox-Empty-white.png); */
 }
 
 QCheckBox::indicator:unchecked:disabled {
   background-color: #444444;
   border: 1px solid #696969;
-  /* image:url(qss:images_classic/checkbox-Empty-lightgray.png); */
 }
 
 QCheckBox::indicator:checked {
-  /* background-color: #252525; */
-  image:url(qss:images_classic/check-checked-white.png);
+  image:url(qss:images_classic/check-mark-white.png);
+  border: 1px solid #f0f0f0;
+  background-color: #252525;
 }
 
 QCheckBox::indicator:checked:hover, QCheckBox::indicator:checked:pressed {
   background-color: @ThemeAccentColor1;
+  border: 1px solid #f0f0f0;
 }
 
 QCheckBox::indicator:checked:disabled {
   background-color: #444444;
-  image: url(qss:images_classic/check-checked-lightgray.png);
+  border: 1px solid #696969;
+  image: url(qss:images_classic/check-mark-lightgray.png);
 }
 
 QCheckBox::indicator:indeterminate {
-  /* background-color: #252525; */
-  image: url(qss:images_classic/Check-indeterminate-mark-white.png);
+  background-color: #252525;
+  border: 1px solid #f0f0f0;
+  image: url(qss:images_classic/indeterminate-mark-white.png);
 }
 
 QCheckBox::indicator:indeterminate:disabled {
   background-color: #444444;
-  image: url(qss:images_classic/Check-indeterminate-mark-lightgray.png);
+    border: 1px solid #696969;
+  image: url(qss:images_classic/indeterminate-mark-lightgray.png);
 }
 
 QCheckBox::indicator:indeterminate:hover, QCheckBox::indicator:indeterminate:pressed {
-  background-color: @ThemeAccentColor1; /* QRadioButton has the same color */
-}
+  background-color: @ThemeAccentColor1;
+    border: 1px solid #f0f0f0;
+  }
 
 /* QGroupBox --------------------------------------------------------------
 
@@ -342,7 +335,6 @@ QGroupBox::indicator {
   border-radius:1px;
 }
 
-
 QGroupBox::indicator:unchecked {
   background-color: #020202;
   border: 1px solid #020202;
@@ -392,7 +384,6 @@ QRadioButton:focus {
 
 QRadioButton:disabled {
   background-color: #444444;
-  /* color: #444444; */
 }
 
 QRadioButton QWidget {
@@ -450,8 +441,6 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qmenubar
 --------------------------------------------------------------------------- */
 QMenuBar {
   background-color: #252525;
-  /*padding: 1px;
-  border: 0px solid rgba(0,0,0,140);*/
   color: White;
   selection-background-color: @ThemeAccentColor1;
 }
@@ -462,10 +451,6 @@ QMenuBar:focus {
 
 QMenuBar::item {
   background: transparent;
-    /*padding-left:5px;
-  padding-right: 5px;
-  padding-bottom: 1px;
-  padding-top: 1px;*/
 }
 
 QMenuBar::item:selected {
@@ -475,14 +460,9 @@ QMenuBar::item:selected {
 }
 
 QMenuBar::item:pressed {
-  /*padding: 2px;
-  padding-left: 10px;
-  padding-right: 10px;*/
   border: 0px solid #020202;
   background-color: @ThemeAccentColor1;
   color: White;
-  /*margin-bottom: 0px;
-  padding-bottom: 0px;*/
 }
 
 /* QMenu ------------------------------------------------------------------
@@ -797,6 +777,22 @@ QScrollBar::sub-line:vertical:hover, QScrollBar::sub-line:vertical:on {
   subcontrol-origin: margin;
 }
 
+QScrollBar::up-arrow:horizontal, QScrollBar::down-arrow:horizontal {
+  background: none;
+}
+
+QScrollBar::up-arrow:vertical, QScrollBar::down-arrow:vertical {
+  background: none;
+}
+
+QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal {
+  background: none;
+}
+
+QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {
+  background: none;
+}
+
 /* QTextEdit --------------------------------------------------------------
 
 https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-specific-widgets
@@ -871,9 +867,7 @@ QToolBar {
 }
 
 QToolBar:horizontal {
-  /* border-top: 1px solid #020202; */
   border-bottom: 1px solid #020202;
-  /* spacing: 2px; */
   padding-top: 3px;
   padding-left: 5px;
 }
@@ -881,25 +875,20 @@ QToolBar:horizontal {
 QToolBar:vertical {
   border-left: 1px solid #020202;
   border-right: 1px solid #020202;
-  /* spacing: 1px; */
   padding-top: 3px;
   padding-left: 2px;
 }
 
 QToolBar:disabled {
-  /* Fixes #272 */
-  /* background-color: #444444; */
 }
 
 QToolBar::handle:horizontal {
   width: 8px;
-  /* margin: 3px 3px; */
   image: url(qss:images_classic/Hmovetoolbar-lightgray.png);
 }
 
 QToolBar::handle:vertical {
   height: 8px;
-  /* margin: 3px 3px; */
   image: url(qss:images_classic/Vmovetoolbar-lightgray.png);
 }
 
@@ -963,8 +952,11 @@ QAbstractSpinBox:up-button {
   subcontrol-position: top right;
   border-top: 1px solid transparent;
   border-right: 1px solid transparent;
-  border-bottom: 0px solid transparent;
+  border-bottom: 1px solid #020202;
   border-top-right-radius: 2px;
+  border-left: 1px solid #020202;
+  margin:1px;
+  margin-bottom:-1px;
 }
 
 QAbstractSpinBox::up-arrow, QAbstractSpinBox::up-arrow:disabled, QAbstractSpinBox::up-arrow:off {
@@ -985,8 +977,11 @@ QAbstractSpinBox:down-button {
   subcontrol-position: bottom right;
   border-bottom: 1px solid transparent;
   border-right: 1px solid transparent;
-  border-top: 0px solid transparent;
+  border-top: 1px solid #020202;
   border-bottom-right-radius: 2px;
+  border-left: 1px solid #020202;
+  margin:1px;
+  margin-top:-1px;
 }
 
 QAbstractSpinBox::down-arrow, QAbstractSpinBox::down-arrow:disabled, QAbstractSpinBox::down-arrow:off {
@@ -1002,7 +997,6 @@ QAbstractSpinBox::down-arrow:hover {
 }
 
 QAbstractSpinBox:hover {
-
 }
 
 QAbstractSpinBox:focus {
@@ -1029,14 +1023,6 @@ QLabel {
   color: #ffffff;
 }
 
-QLabel#FileCardStartPage {
-  background-color: transparent;
-  border: 0px solid #020202;
-  padding: 2px;
-  margin: 0px;
-  color: #ff0000;
-}
-
 QLabel:disabled {
   background-color: transparent;
   border: 0px solid #020202;
@@ -1068,7 +1054,6 @@ QTextBrowser:disabled {
 }
 
 QTextBrowser:hover, QTextBrowser:!hover, QTextBrowser:selected, QTextBrowser:pressed {
-  /* border: 1px solid @ThemeAccentColor1; */
 }
 
 /* QGraphicsView ----------------------------------------------------------
@@ -1175,7 +1160,7 @@ QPushButton {
 }
 
 QPushButton:disabled {
-  background-color: #444444;
+  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #333333, stop:1 #444444);
   color: #adadad;
   border: 1px solid #020202;
 }
@@ -1468,7 +1453,7 @@ QComboBox::indicator {
 QComboBox::indicator:checked {
   width: 10px;
   height: 10px;
-  image: url(qss:images_classic/Check-Checked-white.png);
+  image: url(qss:images_classic/check-mark-white.png);
 }
 
 QComboBox::item {
@@ -1909,25 +1894,49 @@ QTabBar, QDockWidget QTabBar {
 
 QTabBar[style="icon-only"]::tab:top {
   min-width: 16px;
-  padding-right: -1px;
+  padding-right: -2px;
+  padding-left: 10px;
+}
+
+QTabBar[style="text-only"]::tab:top {
+  min-width: 16px;
+  /* padding-right: -2px;
+  padding-left: 10px; */
 }
 
 QTabBar[style="icon-only"]::tab:bottom {
   min-width: 16px;
-  padding-right: -1px;
+  padding-right: -2px;
+  padding-left: 10px;
 }
 
-QTabBar[style="icon-only"]::tab:left {
-  min-height: 16px;
-  padding: 0px;
+QTabBar[style="text-only"]::tab:bottom {
+  min-width: 16px;
+  padding-left: 4px;
 }
 
 QTabBar[style="icon-only"]::tab:right {
   min-height: 16px;
-  padding: 0px;
+  padding-bottom: -2px;
+  padding-top: 10px;
 }
 
+QTabBar[style="text-only"]::tab:right {
+  min-height: 16px;
+  /* padding-right: -2px;
+  padding-left: 10px; */
+}
 
+QTabBar[style="icon-only"]::tab:left {
+  min-height: 16px;
+  padding-top: -2px;
+  padding-bottom: 10px;
+}
+
+QTabBar[style="text-only"]::tab:left {
+  min-height: 16px;
+  padding-bottom: 4px;
+}
 
 QTabBar::close-button, QDockWidget QTabBar::close-button {
   border: 0;
@@ -2011,7 +2020,8 @@ QTabBar::tab:bottom:selected, QDockWidget QTabBar::tab:bottom:selected {
 }
 
 QTabBar::tab:bottom:!selected:hover, QDockWidget QTabBar::tab:bottom:!selected:hover {
-  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #444444, stop:1 #333333);
+  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #d8d8d8, stop:1 #f0f0f0);
+  margin-bottom: 0px;
 }
 
 QTabBar::tab:left, QDockWidget QTabBar::tab:left {
@@ -2035,14 +2045,14 @@ QTabBar::tab:left:selected, QDockWidget QTabBar::tab:left:selected {
   border-right: 1px solid #333333;
   border-left: 1px solid #202020;
   border-top: 1px solid #202020;
-  margin-right: 0px;
+  margin-left: 0px;
   border-top-left-radius: 2px;
   border-bottom-left-radius: 2px;
 }
 
 QTabBar::tab:left:!selected:hover, QDockWidget QTabBar::tab:left:!selected:hover {
   background-color: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 #444444, stop:1 #333333);
-  margin-right: 0px;
+  margin-left: 0px;
 }
 
 QTabBar::tab:right, QDockWidget QTabBar::tab:right {
@@ -2073,40 +2083,40 @@ QTabBar::tab:right:selected, QDockWidget QTabBar::tab:right:selected {
 
 QTabBar::tab:right:!selected:hover, QDockWidget QTabBar::tab:right:!selected:hover {
   background-color: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 #333333, stop:1 #444444);
-
+  margin-right: 0px;
 }
 
 QTabBar QToolButton, QDockWidget QTabBar QToolButton {
   /* Fixes #136 */
-  background-color: #444444;
-  height: 12px;
-  width: 12px;
+  /* background-color: #444444; */
+  border: 1px solid #202020;;
+  margin: 1px;
+  background-color: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 #333333, stop:0.6 #252525, stop:1 #252525);
+
 }
 
 QTabBar QToolButton:pressed, QDockWidget QTabBar QToolButton:pressed {
-  border: 0px solid @ThemeAccentColor1;
-  background-color: @ThemeAccentColor1;
+  background-color: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 #444444, stop:0.6 #444444, stop:1 #333333);
 }
 
 QTabBar QToolButton:pressed:hover, QDockWidget QTabBar QToolButton:pressed:hover {
-  border: 0px solid @ThemeAccentColor1;
-  background-color: @ThemeAccentColor1;
+  background-color: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 #444444, stop:0.6 #444444, stop:1 #333333);
 }
 
 QTabBar QToolButton::left-arrow:enabled, QDockWidget QTabBar QToolButton::left-arrow:enabled {
-  image: url(qss:images_classic/Arrow-left-white.png);
-}
-
-QTabBar QToolButton::left-arrow:disabled, QDockWidget QTabBar QToolButton::left-arrow:disabled {
   image: url(qss:images_classic/Arrow-left-lightgray.png);
 }
 
+QTabBar QToolButton::left-arrow:disabled, QDockWidget QTabBar QToolButton::left-arrow:disabled {
+  image: url(qss:images_classic/Arrow-left-darkgray.png);
+}
+
 QTabBar QToolButton::right-arrow:enabled, QDockWidget QTabBar QToolButton::right-arrow:enabled {
-  image: url(qss:images_classic/Arrow-right-white.png);
+  image: url(qss:images_classic/Arrow-right-lightgray.png);
 }
 
 QTabBar QToolButton::right-arrow:disabled, QDockWidget QTabBar QToolButton::right-arrow:disabled {
-  image: url(qss:images_classic/Arrow-right-lightgray.png);
+  image: url(qss:images_classic/Arrow-right-darkgray.png);
 }
 
 /* QDockWiget -------------------------------------------------------------
@@ -2193,31 +2203,23 @@ QTreeView::branch:!has-children:!has-siblings:adjoins-item  {
 }
 
 QTreeView::branch:closed:has-children:has-siblings  {
-  margin-top: 5px;
-  margin-bottom: 5px;
   border-image: none;
-  image: url(qss:images_classic/Arrow-right-white.png) 0;
+  image: url(qss:images_classic/Arrow-right-white.png);
 }
 
 QTreeView::branch:has-children:!has-siblings:closed  {
-  margin-top: 5px;
-  margin-bottom: 5px;
   border-image: none;
-  image: url(qss:images_classic/Arrow-right-white.png) 0;
+  image: url(qss:images_classic/Arrow-right-white.png);
 }
 
 QTreeView::branch:open:has-children:has-siblings  {
-  margin-left: 6px;
-  margin-right: 6px;
   border-image: none;
-  image: url(qss:images_classic/Arrow-down-white.png) 0;
+  image: url(qss:images_classic/Arrow-down-white.png);
 }
 
 QTreeView::branch:open:has-children:!has-siblings  {
-  margin-left: 6px;
-  margin-right: 6px;
   border-image: none;
-  image: url(qss:images_classic/Arrow-down-white.png) 0;
+  image: url(qss:images_classic/Arrow-down-white.png);
 }
 
 QTreeView::indicator,
@@ -2238,14 +2240,14 @@ QTreeView::indicator:checked,
 QListView::indicator:checked,
 QTableView::indicator:checked,
 QColumnView::indicator:checked {
-  image: url(qss:images_classic/check-checked-white.png);
+  image: url(qss:images_classic/check-mark-white.png);
 }
 
 QTreeView::indicator:checked:disabled ,
 QListView::indicator:checked:disabled ,
 QTableView::indicator:checked:disabled ,
 QColumnView::indicator:checked:disabled  {
-  image: url(qss:images_classic/check-checked-lightgray.png);
+  image: url(qss:images_classic/check-mark-lightgray.png);
   border: 1px solid #696969;
 }
 
@@ -2290,9 +2292,9 @@ QTreeView::indicator:indeterminate,
 QListView::indicator:indeterminate,
 QTableView::indicator:indeterminate,
 QColumnView::indicator:indeterminate {
-  image: url(qss:images_classic/Check-indeterminate-mark-white.png);
+  image: url(qss:images_classic/Indeterminate-mark-white.png);
 }
-/* :disabled */
+
 QTreeView::indicator:indeterminate:hover, QTreeView::indicator:indeterminate:focus, QTreeView::indicator:indeterminate:pressed,
 QListView::indicator:indeterminate:hover,
 QListView::indicator:indeterminate:focus,
@@ -2303,7 +2305,7 @@ QTableView::indicator:indeterminate:pressed,
 QColumnView::indicator:indeterminate:hover,
 QColumnView::indicator:indeterminate:focus,
 QColumnView::indicator:indeterminate:pressed {
-  image: url(qss:images_classic/Check-indeterminate-mark-lightgray.png);
+  image: url(qss:images_classic/Indeterminate-mark-lightgray.png);
   background-color: @ThemeAccentColor1;
   border: 1px solid #ffffff;
 }
@@ -2316,6 +2318,7 @@ QColumnView {
   color: White;
   gridline-color: #020202;
   border-radius: 0px;
+  selection-background-color: @ThemeAccentColor1;
 }
 
 QTableView,
@@ -2323,10 +2326,6 @@ QListView  {
   background-color: #252525;  /* background of a lot of stuff including spreadsheets.*/
 }
 
-QTreeView{
-selection-background-color: transparent; /* fix for selection color being visible in preferences */
-}
-
 QTreeView:disabled,
 QListView:disabled,
 QTableView:disabled,
@@ -2368,7 +2367,6 @@ QTreeView::item:selected:!active,
 QListView::item:selected:!active,
 QTableView::item:selected:!active,
 QColumnView::item:selected:!active {
-  /* color: White; */
   background-color: @ThemeAccentColor1;
 }
 
@@ -2435,10 +2433,6 @@ QHeaderView::section::horizontal:disabled {
 }
 
 QHeaderView::section::vertical {
-  /* padding-top: 1px;
-  padding-bottom: 0;
-  padding-left: 1px;
-  padding-right: 0px; */
   border-top: 1px solid #020202;
 }
 
@@ -2480,23 +2474,25 @@ used in PATH
 --------------------------------------------------------------------------- */
 QToolBox {
   padding: 0px;
-  border: 1px solid #696969;
+  border: 0px solid transparent;
   border-radius: 4px;
   background-color: transparent;
+    color: white;
 }
 
 QToolBox:selected {
   padding: 0px;
-  border: 0px solid @ThemeAccentColor1;
+  border: 1px solid @ThemeAccentColor1;
 }
 
 QToolBox::tab {
-  background-color: transparent;
-  border: 0px solid #696969;
-  color: white;
-  background-image: url(qss:images_classic/Arrow-down-white.png);
-  background-repeat: none;
-  background-position: center left;
+  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #333333, stop:1 #252525);
+  color: White;
+  border-radius: 4px;
+ border: 1px solid #020202;
+  image: none;
+  background-image: none;
+  padding-left: 0px;
 }
 
 QToolBox::tab:disabled {
@@ -2504,10 +2500,7 @@ QToolBox::tab:disabled {
 }
 
 QToolBox::tab:selected {
-  background-color: #696969;
-  background-image: url(qss:images_classic/transparent.png);
-  padding-right: 5px;
-  background-repeat: none;
+  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #444444, stop:1 #333333);
 }
 
 QToolBox::tab:selected:disabled {
@@ -2517,7 +2510,7 @@ QToolBox::tab:selected:disabled {
 }
 
 QToolBox::tab:!selected {
-
+  color: white;
 }
 
 QToolBox::tab:!selected:disabled {
@@ -2525,13 +2518,14 @@ QToolBox::tab:!selected:disabled {
 }
 
 QToolBox::tab:hover {
-  background-color: @ThemeAccentColor1;
+  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #444444, stop:1 #333333);
   }
 
-QToolBox QScrollArea QWidget QWidget {
+QToolBox > QScrollArea > QWidget > QWidget {
   padding: 0px;
   border: 0px;
-  background-color: transparent;
+  background-color: #3c3c3c;
+  border-radius: 4px;
 }
 
 /* QFrame -----------------------------------------------------------------
@@ -2678,33 +2672,35 @@ SKETCHER
 ==================================================================================================*/
 
 Gui--StatefulLabel[state="empty_sketch"] {
-  color : rgba(255,255,255,127); /* 50% opacity white */
+  color : #ffffff; /* 50% opacity white */
 }
 Gui--StatefulLabel[state="under_constrained"] {
-  color : rgba(255,255,255,255); /* White */
+  color : #ffffff
 }
 Gui--StatefulLabel[state="conflicting_constraints"] {
-  color : rgba(255,0,0,255); /* Red */
+  color : #fc6c6c; /* Red */
+  font-weight: bold;
 }
 Gui--StatefulLabel[state="malformed_constraints"] {
-  color : rgba(255,0,0,255); /* Red */
+  color : #fc6c6c; /* Red */
+  font-weight: bold;
 }
 Gui--StatefulLabel[state="redundant_constraints"] {
-  color : rgba(255,69,0,255); /* Orange red */
+  color : #ffa256; /* Orange red */
 }
 Gui--StatefulLabel[state="partially_redundant_constraints"] {
-  color : rgba(65,105,225,255); /* Royal blue */
+  color : #77cbff; /* Royal blue */
 }
 Gui--StatefulLabel[state="solver_failed"] {
-  color : rgba(255,0,0,255); /* Red */
+  color : #ff9090; /* Red */
   font-weight: bold;
 }
 Gui--StatefulLabel[state="fully_constrained"] {
-  color : rgba(0,255,0,255); /* Green */
+  color : #8cff5b; /* Green */
   font-weight: bold;
 }
 Gui--UrlLabel {
-  color : rgba(0,91,255,255); /* Deep sky blue */
+  color : #0095ff; /* Deep sky blue */
   text-decoration : underline;
 }
 
@@ -2763,31 +2759,24 @@ Settings menu #groupsTreeView:
 ==================================================================================================*/
 
 QTreeView::branch#groupsTreeView:closed:has-children:has-siblings  {
-  margin-top: 15px;
-  margin-bottom: 15px;
   border-image: none;
-  image: url(qss:images_classic/Arrow-right-white.png) 0;
+  image: url(qss:images_classic/Arrow-right-white.png);
 }
 
 QTreeView::branch#groupsTreeView:open:has-children:has-siblings  {
-  margin-left: 6px;
-  margin-right: 6px;
   border-image: none;
-  image: url(qss:images_classic/Arrow-down-white.png) 0;
+  image: url(qss:images_classic/Arrow-down-white.png);
 }
 
 QTreeView::branch#groupsTreeView:open:has-children:!has-siblings  {
-  margin-left: 6px;
-  margin-right: 6px;
+
   border-image: none;
-  image: url(qss:images_classic/Arrow-down-white.png) 0;
+  image: url(qss:images_classic/Arrow-down-white.png);
 }
 
 QTreeView::branch#groupsTreeView:has-children:!has-siblings:closed  {
-  margin-top: 15px;
-  margin-bottom: 15px;
   border-image: none;
-  image: url(qss:images_classic/Arrow-right-white.png) 0;
+  image: url(qss:images_classic/Arrow-right-white.png);
 }
 
 QTreeView::branch#groupsTreeView:has-siblings:!adjoins-item  {
diff --git a/src/Gui/Stylesheets/FreeCAD Light.qss b/src/Gui/Stylesheets/FreeCAD Light.qss
index 3325324102..44e8d995ee 100644
--- a/src/Gui/Stylesheets/FreeCAD Light.qss	
+++ b/src/Gui/Stylesheets/FreeCAD Light.qss	
@@ -140,6 +140,10 @@ QWidget::item:selected {
   background-color: @ThemeAccentColor1;
 }
 
+  /* Causes issue with colorselector.
+  QWidget::item:hover:!selected {
+    background-color: @ThemeAccentColor1;
+  }*/
 
 /* QMainWindow ------------------------------------------------------------
 
@@ -254,30 +258,27 @@ QCheckBox::indicator {
   width: 12px;
   height: 12px;
   border: 1px solid #1c1c1c;
-  /* image:url(qss:images_classic/checkbox-Empty-black.png); */
 }
 
 QCheckBox::indicator:unchecked {
   background-color: #fdfdfd;
   border: 1px solid #1c1c1c;
-  /* image:url(qss:images_classic/checkbox-Empty-black.png); */
 }
 
 QCheckBox::indicator:unchecked:hover, QCheckBox::indicator:unchecked:focus, QCheckBox::indicator:unchecked:pressed {
   background-color: @ThemeAccentColor1;
-  image:url(qss:images_classic/checkbox-Empty-black.png);
+  border: 1px solid #1c1c1c;
 }
 
 QCheckBox::indicator:unchecked:disabled {
   background-color: #d8d8d8;
   border: 1px solid #646464;
-  /* image:url(qss:images_classic/checkbox-Empty-lightgray.png); */
 }
 
 QCheckBox::indicator:checked {
-  background-color: #f0f0f0;
-
-  image:url(qss:images_classic/check-checked-black.png);
+  image:url(qss:images_classic/check-mark-black.png);
+  border: 1px solid #1c1c1c;
+  background-color: #fdfdfd;
 }
 
 QCheckBox::indicator:checked:hover, QCheckBox::indicator:checked:pressed {
@@ -288,23 +289,23 @@ QCheckBox::indicator:checked:hover, QCheckBox::indicator:checked:pressed {
 QCheckBox::indicator:checked:disabled {
   background-color: #d8d8d8;
   border: 1px solid #ababab;
-  image: url(qss:images_classic/check-checked-lightgray.png);
+  image: url(qss:images_classic/check-mark-lightgray.png);
 }
 
 QCheckBox::indicator:indeterminate {
   background-color: #f0f0f0;
   border: 1px solid #1c1c1c;
-  image: url(qss:images_classic/Check-indeterminate-mark-black.png);
+  image: url(qss:images_classic/indeterminate-mark-black.png);
 }
 
 QCheckBox::indicator:indeterminate:disabled {
   background-color: #d8d8d8;
   border: 1px solid #ababab;
-  image: url(qss:images_classic/Check-indeterminate-mark-lightgray.png);
+  image: url(qss:images_classic/indeterminate-mark-lightgray.png);
 }
 
 QCheckBox::indicator:indeterminate:hover, QCheckBox::indicator:indeterminate:pressed {
-  background-color: @ThemeAccentColor1; /* QRadioButton has the same color */
+  background-color: @ThemeAccentColor1;
   border: 1px solid #1c1c1c;
 }
 
@@ -776,6 +777,22 @@ QScrollBar::sub-line:vertical:hover, QScrollBar::sub-line:vertical:on {
   subcontrol-origin: margin;
 }
 
+QScrollBar::up-arrow:horizontal, QScrollBar::down-arrow:horizontal {
+  background: none;
+}
+
+QScrollBar::up-arrow:vertical, QScrollBar::down-arrow:vertical {
+  background: none;
+}
+
+QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal {
+  background: none;
+}
+
+QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {
+  background: none;
+}
+
 /* QTextEdit --------------------------------------------------------------
 
 https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-specific-widgets
@@ -863,7 +880,6 @@ QToolBar:vertical {
 }
 
 QToolBar:disabled {
-
 }
 
 QToolBar::handle:horizontal {
@@ -937,9 +953,11 @@ QAbstractSpinBox:up-button {
   subcontrol-position: top right;
   border-top: 1px solid transparent;
   border-right: 1px solid transparent;
-  border-bottom: 0px solid transparent;
+  border-bottom: 1px solid #b0b0b0;
   border-top-right-radius: 2px;
   border-left: 1px solid #b0b0b0;
+  margin:1px;
+  margin-bottom:-1px;
 }
 
 QAbstractSpinBox::up-arrow, QAbstractSpinBox::up-arrow:disabled, QAbstractSpinBox::up-arrow:off {
@@ -960,9 +978,11 @@ QAbstractSpinBox:down-button {
   subcontrol-position: bottom right;
   border-bottom: 1px solid transparent;
   border-right: 1px solid transparent;
-  border-top: 0px solid transparent;
+  border-top: 1px solid #b0b0b0;
   border-bottom-right-radius: 2px;
   border-left: 1px solid #b0b0b0;
+  margin:1px;
+  margin-top:-1px;
 }
 
 QAbstractSpinBox::down-arrow, QAbstractSpinBox::down-arrow:disabled, QAbstractSpinBox::down-arrow:off {
@@ -1141,7 +1161,8 @@ QPushButton {
 }
 
 QPushButton:disabled {
-  background-color: #d8d8d8;
+background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #e2e2e2, stop:1 #fdfdfd);
+
   color: #adadad;
   border: 1px solid #ababab;
 }
@@ -1434,7 +1455,7 @@ QComboBox::indicator {
 QComboBox::indicator:checked {
   width: 10px;
   height: 10px;
-  image: url(qss:images_classic/Check-Checked-black.png);
+  image: url(qss:images_classic/check-mark-black.png);
 }
 
 QComboBox::item {
@@ -1496,13 +1517,11 @@ Gui--PropertyEditor--PropertyEditor {
 /* Action group */
 QFrame[class="panel"] {
 background-color: rgba(237, 237, 237, 0.5);
-
 }
 
 QSint--ActionGroup {
 padding: 0px; /* if not reset, it might create problems with QPushButtons and other elements */
 margin: 0px; /* if not reset, it might create problems with QPushButtons and other elements */
-color: black;
 }
 
 QSint--ActionGroup QGroupBox {
@@ -1523,9 +1542,7 @@ QSint--ActionGroup QFrame[height="1"],
 QSint--ActionGroup QFrame[width="1"],
 QSint--ActionGroup QFrame[width="1"],
 QSint--ActionGroup QFrame[width="1"] {
-/* border-color: #ababab; */
-border-top: #ababab;
-border-left: #ababab;
+border-color: rgba(0,0,0,60);
 }
 
 /* Panel header */
@@ -1876,24 +1893,51 @@ QTabBar, QDockWidget QTabBar {
   background-color: #f0f0f0;
   /* left: 5px; move to the right by 5px - removed for fix */
 }
+
 QTabBar[style="icon-only"]::tab:top {
   min-width: 16px;
-  padding-right: -1px;
+  padding-right: -2px;
+  padding-left: 10px;
+}
+
+QTabBar[style="text-only"]::tab:top {
+  min-width: 16px;
+  /* padding-right: -2px;
+  padding-left: 10px; */
 }
 
 QTabBar[style="icon-only"]::tab:bottom {
   min-width: 16px;
-  padding-right: -1px;
+  padding-right: -2px;
+  padding-left: 10px;
 }
 
-QTabBar[style="icon-only"]::tab:left {
-  min-height: 16px;
-  padding: 0px;
+QTabBar[style="text-only"]::tab:bottom {
+  min-width: 16px;
+  padding-left: 4px;
 }
 
 QTabBar[style="icon-only"]::tab:right {
   min-height: 16px;
-  padding: 0px;
+  padding-bottom: -2px;
+  padding-top: 10px;
+}
+
+QTabBar[style="text-only"]::tab:right {
+  min-height: 16px;
+  /* padding-right: -2px;
+  padding-left: 10px; */
+}
+
+QTabBar[style="icon-only"]::tab:left {
+  min-height: 16px;
+  padding-top: -2px;
+  padding-bottom: 10px;
+}
+
+QTabBar[style="text-only"]::tab:left {
+  min-height: 16px;
+  padding-bottom: 4px;
 }
 
 QTabBar::close-button, QDockWidget QTabBar::close-button {
@@ -1917,58 +1961,7 @@ QTabBar::tab, QDockWidget QTabBar::tab {
   /* selected ------------------------------------------------------- */
   padding: 4px;
   background-color: #f0f0f0;
-
 }
-/*
-QTabBar::tab:top:selected:disabled, QDockWidget QTabBar::tab:top:selected:disabled {
-  color: #adadad;
-}
-
-QTabBar::tab:bottom:selected:disabled, QDockWidget QTabBar::tab:bottom:selected:disabled {
-  color: #adadad;
-}
-
-QTabBar::tab:left:selected:disabled, QDockWidget QTabBar::tab:left:selected:disabled {
-  color: #adadad;
-}
-
-QTabBar::tab:right:selected:disabled, QDockWidget QTabBar::tab:right:selected:disabled {
-  color: #adadad;
-}
-
-QTabBar::tab:top:!selected:disabled, QDockWidget QTabBar::tab:top:!selected:disabled {
-  color: #adadad;
-}
-
-QTabBar::tab:bottom:!selected:disabled, QDockWidget QTabBar::tab:bottom:!selected:disabled {
-  color: #adadad;
-
-}
-
-QTabBar::tab:left:!selected:disabled, QDockWidget QTabBar::tab:left:!selected:disabled {
-  color: #adadad;
-
-}
-
-QTabBar::tab:right:!selected:disabled, QDockWidget QTabBar::tab:right:!selected:disabled {
-  color: #adadad;
-}
-
-QTabBar::tab:top:!selected, QDockWidget QTabBar::tab:top:!selected {
-  color: #adadad;
-}
-
-QTabBar::tab:bottom:!selected, QDockWidget QTabBar::tab:bottom:!selected {
-  color: #adadad;
-}
-
-QTabBar::tab:left:!selected, QDockWidget QTabBar::tab:left:!selected {
-  color: #adadad;
-}
-
-QTabBar::tab:right:!selected, QDockWidget QTabBar::tab:right:!selected {
-  color: #adadad;
-} */
 
 QTabBar::tab:top, QDockWidget QTabBar::tab:top {
   color: black;
@@ -2038,7 +2031,7 @@ QTabBar::tab:left, QDockWidget QTabBar::tab:left {
   padding-bottom: 9px;
   min-height: 5px;
   background-color: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 #dddddd, stop:0.6 #e2e2e2, stop:1 #cccccc);
-  margin-right: 3px;
+  margin-left: 3px;
   border-bottom: 1px solid #ababab; /* selection color */
   border-right: 1px solid #ababab;
   border-left: 1px solid #ababab;
@@ -2054,14 +2047,14 @@ QTabBar::tab:left:selected, QDockWidget QTabBar::tab:left:selected {
   border-right: 1px solid #f0f0f0;
   border-left: 1px solid #ababab;
   border-top: 1px solid #ababab;
-  margin-right: 0px;
+  margin-left: 0px;
   border-top-left-radius: 2px;
   border-bottom-left-radius: 2px;
 }
 
 QTabBar::tab:left:!selected:hover, QDockWidget QTabBar::tab:left:!selected:hover {
   background-color: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 #d8d8d8, stop:1 #f0f0f0);
-  margin-right: 0px;
+  margin-left: 0px;
 }
 
 QTabBar::tab:right, QDockWidget QTabBar::tab:right {
@@ -2097,23 +2090,23 @@ QTabBar::tab:right:!selected:hover, QDockWidget QTabBar::tab:right:!selected:hov
 
 QTabBar QToolButton, QDockWidget QTabBar QToolButton {
   /* Fixes #136 */
-  background-color: #d8d8d8;
-  height: 12px;
-  width: 12px;
+  /* background-color: #444444; */
+  border: 1px solid #ababab;;
+  margin: 1px;
+  background-color: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 #f0f0f0, stop:1 #d8d8d8);
+
 }
 
 QTabBar QToolButton:pressed, QDockWidget QTabBar QToolButton:pressed {
-  border: 0px solid @ThemeAccentColor1;
-  background-color: @ThemeAccentColor1;
+  background-color: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 #f0f0f0, stop:0.6 #fdfdfd stop:1 #f0f0f0);
 }
 
 QTabBar QToolButton:pressed:hover, QDockWidget QTabBar QToolButton:pressed:hover {
-  border: 0px solid @ThemeAccentColor1;
-  background-color: @ThemeAccentColor1;
+  background-color: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 #f0f0f0, stop:0.6 #fdfdfd stop:1 #f0f0f0);
 }
 
 QTabBar QToolButton::left-arrow:enabled, QDockWidget QTabBar QToolButton::left-arrow:enabled {
-  image: url(qss:images_classic/Arrow-left-black.png);
+  image: url(qss:images_classic/Arrow-left-darkgray.png);
 }
 
 QTabBar QToolButton::left-arrow:disabled, QDockWidget QTabBar QToolButton::left-arrow:disabled {
@@ -2121,7 +2114,7 @@ QTabBar QToolButton::left-arrow:disabled, QDockWidget QTabBar QToolButton::left-
 }
 
 QTabBar QToolButton::right-arrow:enabled, QDockWidget QTabBar QToolButton::right-arrow:enabled {
-  image: url(qss:images_classic/Arrow-right-black.png);
+  image: url(qss:images_classic/Arrow-right-darkgray.png);
 }
 
 QTabBar QToolButton::right-arrow:disabled, QDockWidget QTabBar QToolButton::right-arrow:disabled {
@@ -2200,51 +2193,35 @@ QTreeView::branch  {
 }
 
 QTreeView::branch:has-siblings:!adjoins-item  {
-  /* border-image: url(qss:images_classic/branch_vline_white.png) 0; */
-  /* border-image: url(qss:images_classic/Arrow-right-black.png) 0; */
+
 }
 
 QTreeView::branch:has-siblings:adjoins-item  {
-  /* border-image: url(qss:images_classic/Arrow-right-blue.png) 0; */
-  /* border-image: url(qss:images_classic/branch_more_white.png) 0; */
+
 }
 
 QTreeView::branch:!has-children:!has-siblings:adjoins-item  {
-  /* border-image: url(qss:images_classic/Arrow-right-lightgray.png) 0; */
-  /* border-image: url(qss:images_classic/branch_end_white.png) 0; */
+
 }
 
 QTreeView::branch:closed:has-children:has-siblings  {
-  margin-top: 5px;
-  margin-bottom: 5px;
   border-image: none;
-  image: url(qss:images_classic/Arrow-right-black.png) 0;
-  /* border-image: url(qss:images_classic/branch_more_closed_white.png) 0; */
+  image: url(qss:images_classic/Arrow-right-black.png);
 }
 
 QTreeView::branch:has-children:!has-siblings:closed  {
-  margin-top: 5px;
-  margin-bottom: 5px;
   border-image: none;
-  image: url(qss:images_classic/Arrow-right-black.png) 0;
-  /* border-image: url(qss:images_classic/Arrow-right-whitey.png) 0; */
-  /* border-image: url(qss:images_classic/branch_end_closed_white.png) 0; */
+  image: url(qss:images_classic/Arrow-right-black.png);
 }
 
 QTreeView::branch:open:has-children:has-siblings  {
-  margin-left: 6px;
-  margin-right: 6px;
   border-image: none;
-  image: url(qss:images_classic/Arrow-down-black.png) 0;
-  /* border-image: url(qss:images_classic/branch_more_open_white.png) 0; */
+  image: url(qss:images_classic/Arrow-down-black.png);
 }
 
 QTreeView::branch:open:has-children:!has-siblings  {
-  margin-left: 6px;
-  margin-right: 6px;
   border-image: none;
-  image: url(qss:images_classic/Arrow-down-black.png) 0;
-  /* border-image: url(qss:images_classic/branch_end_open_white.png) 0; */
+  image: url(qss:images_classic/Arrow-down-black.png) ;
 }
 
 QTreeView::indicator,
@@ -2265,14 +2242,14 @@ QTreeView::indicator:checked,
 QListView::indicator:checked,
 QTableView::indicator:checked,
 QColumnView::indicator:checked {
-  image: url(qss:images_classic/check-checked-black.png);
+  image: url(qss:images_classic/check-mark-black.png);
 }
 
 QTreeView::indicator:checked:disabled ,
 QListView::indicator:checked:disabled ,
 QTableView::indicator:checked:disabled ,
 QColumnView::indicator:checked:disabled  {
-  image: url(qss:images_classic/check-checked-lightgray.png);
+  image: url(qss:images_classic/check-mark-lightgray.png);
   border: 1px solid #696969;
 }
 
@@ -2317,7 +2294,7 @@ QTreeView::indicator:indeterminate,
 QListView::indicator:indeterminate,
 QTableView::indicator:indeterminate,
 QColumnView::indicator:indeterminate {
-  image: url(qss:images_classic/Check-indeterminate-mark-black.png);
+  image: url(qss:images_classic/indeterminate-mark-black.png);
 }
 
 QTreeView::indicator:indeterminate:hover, QTreeView::indicator:indeterminate:focus, QTreeView::indicator:indeterminate:pressed,
@@ -2330,7 +2307,7 @@ QTableView::indicator:indeterminate:pressed,
 QColumnView::indicator:indeterminate:hover,
 QColumnView::indicator:indeterminate:focus,
 QColumnView::indicator:indeterminate:pressed {
-  image: url(qss:images_classic/Check-indeterminate-mark-black.png);
+  image: url(qss:images_classic/indeterminate-mark-black.png);
   background-color: @ThemeAccentColor1;
   border: 1px solid #1c1c1c;
 }
@@ -2340,10 +2317,10 @@ QListView,
 QTableView,
 QColumnView {
   background-color: #f0f0f0;  /* background of a lot of stuff including spreadsheets.*/
-  /* border: 1px solid #ef0000; */
   color: black;
   gridline-color: #ababab;
   border-radius: 0px;
+  selection-background-color: @ThemeAccentColor1;
 }
 
 QTableView,
@@ -2351,11 +2328,6 @@ QListView  {
   background-color: #ffffff;  /* background of a lot of stuff including spreadsheets.*/
 }
 
-QTreeView{
-  selection-background-color: transparent; /* fix for selection color being visible in preferences */
-}
-
-
 QTreeView:disabled,
 QListView:disabled,
 QTableView:disabled,
@@ -2376,7 +2348,7 @@ QTreeView:focus,
 QListView:focus,
 QTableView:focus,
 QColumnView:focus {
-  /* border: 1px solid #ababab; */
+  /* background-color: @ThemeAccentColor2; */
 }
 
 QTreeView::item:pressed,
@@ -2397,8 +2369,6 @@ QTreeView::item:selected:!active,
 QListView::item:selected:!active,
 QTableView::item:selected:!active,
 QColumnView::item:selected:!active {
-  /* color: black; */
-
   background-color: @ThemeAccentColor1;
 }
 
@@ -2465,10 +2435,6 @@ QHeaderView::section::horizontal:disabled {
 }
 
 QHeaderView::section::vertical {
-  /* padding-top: 1px;
-  padding-bottom: 0;
-  padding-left: 1px;
-  padding-right: 0px; */
   border-top: 1px solid #ababab;
 }
 
@@ -2510,23 +2476,25 @@ used in PATH
 --------------------------------------------------------------------------- */
 QToolBox {
   padding: 0px;
-  border: 1px solid #696969;
+  border: 0px solid transparent;
   border-radius: 4px;
   background-color: transparent;
+  color: black;
 }
 
 QToolBox:selected {
   padding: 0px;
-  border: 0px solid @ThemeAccentColor1;
+  border: 1px solid @ThemeAccentColor1;
 }
 
 QToolBox::tab {
-  background-color: transparent;
-  border: 0px solid #696969;
+background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #f0f0f0, stop:1 #fdfdfd);
   color: black;
-  background-image: url(qss:images_classic/Arrow-down-black.png);
-  background-repeat: none;
-  background-position: center left;
+  border-radius: 4px;
+  border: 1px solid #ababab;
+  image: none;
+  background-image: none;
+  padding-left: 0px;
 }
 
 QToolBox::tab:disabled {
@@ -2534,10 +2502,7 @@ QToolBox::tab:disabled {
 }
 
 QToolBox::tab:selected {
-  background-color: #696969;
-  background-image: url(qss:images_classic/transparent.png);
-  padding-right: 5px;
-  background-repeat: none;
+ background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #fefefe, stop:1 #f8f8f8);
 }
 
 QToolBox::tab:selected:disabled {
@@ -2547,7 +2512,7 @@ QToolBox::tab:selected:disabled {
 }
 
 QToolBox::tab:!selected {
-
+  color: black;
 }
 
 QToolBox::tab:!selected:disabled {
@@ -2555,13 +2520,15 @@ QToolBox::tab:!selected:disabled {
 }
 
 QToolBox::tab:hover {
-  background-color: @ThemeAccentColor1;
+ background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #fefefe, stop:1 #f8f8f8);
   }
 
-QToolBox QScrollArea QWidget QWidget {
+QToolBox > QScrollArea > QWidget > QWidget {
   padding: 0px;
   border: 0px;
-  background-color: transparent;
+  background-color: #f0f0f0;
+  border-radius: 4px;
+  color: black;
 }
 
 /* QFrame -----------------------------------------------------------------
@@ -2708,33 +2675,35 @@ SKETCHER
 ==================================================================================================*/
 
 Gui--StatefulLabel[state="empty_sketch"] {
-  color : rgba(255,255,255,127); /* 50% opacity white */
+  color : #393939; /* 50% opacity white */
 }
 Gui--StatefulLabel[state="under_constrained"] {
-  color : rgba(255,255,255,255); /* White */
+  /* color : #000000; black */
 }
 Gui--StatefulLabel[state="conflicting_constraints"] {
-  color : rgba(255,0,0,255); /* Red */
+  color : #9d0000; /* Red */
+  font-weight: bold;
 }
 Gui--StatefulLabel[state="malformed_constraints"] {
-  color : rgba(255,0,0,255); /* Red */
+  color : #9d0000; /* Red */
+  font-weight: bold;
 }
 Gui--StatefulLabel[state="redundant_constraints"] {
-  color : rgba(255,69,0,255); /* Orange red */
+  color : #ab4d00; /* Orange red */
 }
 Gui--StatefulLabel[state="partially_redundant_constraints"] {
-  color : rgba(65,105,225,255); /* Royal blue */
+  color : #005991; /* Royal blue */
 }
 Gui--StatefulLabel[state="solver_failed"] {
-  color : rgba(255,0,0,255); /* Red */
+  color : #9d0000; /* Red */
   font-weight: bold;
 }
 Gui--StatefulLabel[state="fully_constrained"] {
-  color : rgba(0,255,0,255); /* Green */
+  color : #278100; /* Green */
   font-weight: bold;
 }
 Gui--UrlLabel {
-  color : rgba(0,91,255,255); /* Deep sky blue */
+  color : #0061a7; /* Deep sky blue */
   text-decoration : underline;
 }
 
@@ -2743,7 +2712,7 @@ Gui--NotificationLabel {
   border: 1px solid #ababab;
   border-radius: 2px;
 }
-
+/* overlay */
 Gui--OverlayToolButton{
   image: url(qss:images_classic/close-lightgray.png);
 }
@@ -2751,6 +2720,7 @@ Gui--OverlayToolButton{
 Gui--OverlayToolButton:hover {
   image: url(qss:images_classic/close-red.png);
 }
+
 Gui--OverlayToolButton[objectName="OBTN Float"] {
   image: url(qss:images_classic/float-lightgray.png);
 }
@@ -2791,29 +2761,22 @@ Settings menu #groupsTreeView:
 ==================================================================================================*/
 
 QTreeView::branch#groupsTreeView:closed:has-children:has-siblings  {
-  margin-top: 15px;
-  margin-bottom: 15px;
   border-image: none;
   image: url(qss:images_classic/Arrow-right-black.png) 0;
 }
 
 QTreeView::branch#groupsTreeView:open:has-children:has-siblings  {
-  margin-left: 6px;
-  margin-right: 6px;
   border-image: none;
   image: url(qss:images_classic/Arrow-down-black.png) 0;
 }
 
 QTreeView::branch#groupsTreeView:open:has-children:!has-siblings  {
-  margin-left: 6px;
-  margin-right: 6px;
   border-image: none;
   image: url(qss:images_classic/Arrow-down-black.png) 0;
 }
 
 QTreeView::branch#groupsTreeView:has-children:!has-siblings:closed  {
-  margin-top: 15px;
-  margin-bottom: 15px;
+
   border-image: none;
   image: url(qss:images_classic/Arrow-right-black.png) 0;
 }
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-down-black.png b/src/Gui/Stylesheets/images_classic/Arrow-down-black.png
index e6576e7e0c..535c4c2da8 100644
Binary files a/src/Gui/Stylesheets/images_classic/Arrow-down-black.png and b/src/Gui/Stylesheets/images_classic/Arrow-down-black.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-down-blue.png b/src/Gui/Stylesheets/images_classic/Arrow-down-blue.png
index 11e0534594..0c6e2ab501 100644
Binary files a/src/Gui/Stylesheets/images_classic/Arrow-down-blue.png and b/src/Gui/Stylesheets/images_classic/Arrow-down-blue.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-down-darkgray.png b/src/Gui/Stylesheets/images_classic/Arrow-down-darkgray.png
index 2f06a8928b..87040a7e11 100644
Binary files a/src/Gui/Stylesheets/images_classic/Arrow-down-darkgray.png and b/src/Gui/Stylesheets/images_classic/Arrow-down-darkgray.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-down-lightgray.png b/src/Gui/Stylesheets/images_classic/Arrow-down-lightgray.png
index af4c6961e2..748870f7b3 100644
Binary files a/src/Gui/Stylesheets/images_classic/Arrow-down-lightgray.png and b/src/Gui/Stylesheets/images_classic/Arrow-down-lightgray.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-down-white.png b/src/Gui/Stylesheets/images_classic/Arrow-down-white.png
index 2069d2aa6b..fdd985a481 100644
Binary files a/src/Gui/Stylesheets/images_classic/Arrow-down-white.png and b/src/Gui/Stylesheets/images_classic/Arrow-down-white.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-left-black.png b/src/Gui/Stylesheets/images_classic/Arrow-left-black.png
index 6cda4d2659..0dabc01bdf 100644
Binary files a/src/Gui/Stylesheets/images_classic/Arrow-left-black.png and b/src/Gui/Stylesheets/images_classic/Arrow-left-black.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-left-blue.png b/src/Gui/Stylesheets/images_classic/Arrow-left-blue.png
index 28b43accdc..0b686fe25d 100644
Binary files a/src/Gui/Stylesheets/images_classic/Arrow-left-blue.png and b/src/Gui/Stylesheets/images_classic/Arrow-left-blue.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-left-darkgray.png b/src/Gui/Stylesheets/images_classic/Arrow-left-darkgray.png
index 4fb7028bfc..f55a97506a 100644
Binary files a/src/Gui/Stylesheets/images_classic/Arrow-left-darkgray.png and b/src/Gui/Stylesheets/images_classic/Arrow-left-darkgray.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-left-lightgray.png b/src/Gui/Stylesheets/images_classic/Arrow-left-lightgray.png
index 043e733960..92693c2b15 100644
Binary files a/src/Gui/Stylesheets/images_classic/Arrow-left-lightgray.png and b/src/Gui/Stylesheets/images_classic/Arrow-left-lightgray.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-left-white.png b/src/Gui/Stylesheets/images_classic/Arrow-left-white.png
index 6e0e1921db..a065d2f868 100644
Binary files a/src/Gui/Stylesheets/images_classic/Arrow-left-white.png and b/src/Gui/Stylesheets/images_classic/Arrow-left-white.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-leftDown-black.png b/src/Gui/Stylesheets/images_classic/Arrow-leftDown-black.png
new file mode 100644
index 0000000000..fcb4d7354e
Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/Arrow-leftDown-black.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-leftDown-blue.png b/src/Gui/Stylesheets/images_classic/Arrow-leftDown-blue.png
index af1154ab70..4299934538 100644
Binary files a/src/Gui/Stylesheets/images_classic/Arrow-leftDown-blue.png and b/src/Gui/Stylesheets/images_classic/Arrow-leftDown-blue.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-leftDown-darkgray.png b/src/Gui/Stylesheets/images_classic/Arrow-leftDown-darkgray.png
index e7fb5d0664..8bd0a5ef5b 100644
Binary files a/src/Gui/Stylesheets/images_classic/Arrow-leftDown-darkgray.png and b/src/Gui/Stylesheets/images_classic/Arrow-leftDown-darkgray.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-leftDown-lightgray.png b/src/Gui/Stylesheets/images_classic/Arrow-leftDown-lightgray.png
index d464f064d6..6e518899b9 100644
Binary files a/src/Gui/Stylesheets/images_classic/Arrow-leftDown-lightgray.png and b/src/Gui/Stylesheets/images_classic/Arrow-leftDown-lightgray.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-leftDown-white.png b/src/Gui/Stylesheets/images_classic/Arrow-leftDown-white.png
index ec401bb51b..9fcb4042b6 100644
Binary files a/src/Gui/Stylesheets/images_classic/Arrow-leftDown-white.png and b/src/Gui/Stylesheets/images_classic/Arrow-leftDown-white.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-leftDown.png b/src/Gui/Stylesheets/images_classic/Arrow-leftDown.png
deleted file mode 100644
index edd8dcce7a..0000000000
Binary files a/src/Gui/Stylesheets/images_classic/Arrow-leftDown.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-right-black.png b/src/Gui/Stylesheets/images_classic/Arrow-right-black.png
index 9c966035f7..65675e0ced 100644
Binary files a/src/Gui/Stylesheets/images_classic/Arrow-right-black.png and b/src/Gui/Stylesheets/images_classic/Arrow-right-black.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-right-blue.png b/src/Gui/Stylesheets/images_classic/Arrow-right-blue.png
index c53f65e647..bd1619bfa0 100644
Binary files a/src/Gui/Stylesheets/images_classic/Arrow-right-blue.png and b/src/Gui/Stylesheets/images_classic/Arrow-right-blue.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-right-darkgray.png b/src/Gui/Stylesheets/images_classic/Arrow-right-darkgray.png
index f98346f236..7c325fc2e5 100644
Binary files a/src/Gui/Stylesheets/images_classic/Arrow-right-darkgray.png and b/src/Gui/Stylesheets/images_classic/Arrow-right-darkgray.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-right-lightgray.png b/src/Gui/Stylesheets/images_classic/Arrow-right-lightgray.png
index 451a569773..9ccf971812 100644
Binary files a/src/Gui/Stylesheets/images_classic/Arrow-right-lightgray.png and b/src/Gui/Stylesheets/images_classic/Arrow-right-lightgray.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-right-white.png b/src/Gui/Stylesheets/images_classic/Arrow-right-white.png
index 7e00e5c43b..dbda9ba0e4 100644
Binary files a/src/Gui/Stylesheets/images_classic/Arrow-right-white.png and b/src/Gui/Stylesheets/images_classic/Arrow-right-white.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-rightDown-black.png b/src/Gui/Stylesheets/images_classic/Arrow-rightDown-black.png
index be8e3c856c..789c738f8a 100644
Binary files a/src/Gui/Stylesheets/images_classic/Arrow-rightDown-black.png and b/src/Gui/Stylesheets/images_classic/Arrow-rightDown-black.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-rightDown-blue.png b/src/Gui/Stylesheets/images_classic/Arrow-rightDown-blue.png
index fe875bab3e..bffe95b7a8 100644
Binary files a/src/Gui/Stylesheets/images_classic/Arrow-rightDown-blue.png and b/src/Gui/Stylesheets/images_classic/Arrow-rightDown-blue.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-rightDown-darkgray.png b/src/Gui/Stylesheets/images_classic/Arrow-rightDown-darkgray.png
index 002980daf9..5df06d9c31 100644
Binary files a/src/Gui/Stylesheets/images_classic/Arrow-rightDown-darkgray.png and b/src/Gui/Stylesheets/images_classic/Arrow-rightDown-darkgray.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-rightDown-lightgray.png b/src/Gui/Stylesheets/images_classic/Arrow-rightDown-lightgray.png
index b8ff2a9eda..96247a312c 100644
Binary files a/src/Gui/Stylesheets/images_classic/Arrow-rightDown-lightgray.png and b/src/Gui/Stylesheets/images_classic/Arrow-rightDown-lightgray.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-rightDown-white.png b/src/Gui/Stylesheets/images_classic/Arrow-rightDown-white.png
index fbd45d5480..2d7c2ab151 100644
Binary files a/src/Gui/Stylesheets/images_classic/Arrow-rightDown-white.png and b/src/Gui/Stylesheets/images_classic/Arrow-rightDown-white.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-up-black.png b/src/Gui/Stylesheets/images_classic/Arrow-up-black.png
index 69330ee6c1..83a719ddb3 100644
Binary files a/src/Gui/Stylesheets/images_classic/Arrow-up-black.png and b/src/Gui/Stylesheets/images_classic/Arrow-up-black.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-up-blue.png b/src/Gui/Stylesheets/images_classic/Arrow-up-blue.png
index 383db86672..17ed6579c9 100644
Binary files a/src/Gui/Stylesheets/images_classic/Arrow-up-blue.png and b/src/Gui/Stylesheets/images_classic/Arrow-up-blue.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-up-darkgray.png b/src/Gui/Stylesheets/images_classic/Arrow-up-darkgray.png
index a468abec86..6e7dabdfc6 100644
Binary files a/src/Gui/Stylesheets/images_classic/Arrow-up-darkgray.png and b/src/Gui/Stylesheets/images_classic/Arrow-up-darkgray.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-up-lightgray.png b/src/Gui/Stylesheets/images_classic/Arrow-up-lightgray.png
index 7d6c9e7a56..9ad7ba54bd 100644
Binary files a/src/Gui/Stylesheets/images_classic/Arrow-up-lightgray.png and b/src/Gui/Stylesheets/images_classic/Arrow-up-lightgray.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-up-white.png b/src/Gui/Stylesheets/images_classic/Arrow-up-white.png
index 1ab9ee6774..d918bf3f3a 100644
Binary files a/src/Gui/Stylesheets/images_classic/Arrow-up-white.png and b/src/Gui/Stylesheets/images_classic/Arrow-up-white.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Capa 1.png b/src/Gui/Stylesheets/images_classic/Capa 1.png
deleted file mode 100644
index 78b407f0ef..0000000000
Binary files a/src/Gui/Stylesheets/images_classic/Capa 1.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images_classic/Check-Checked-black.png b/src/Gui/Stylesheets/images_classic/Check-Checked-black.png
deleted file mode 100644
index 23509fcee0..0000000000
Binary files a/src/Gui/Stylesheets/images_classic/Check-Checked-black.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images_classic/Check-Checked-blue.png b/src/Gui/Stylesheets/images_classic/Check-Checked-blue.png
deleted file mode 100644
index 0bc64a629a..0000000000
Binary files a/src/Gui/Stylesheets/images_classic/Check-Checked-blue.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images_classic/Check-Checked-darkgray.png b/src/Gui/Stylesheets/images_classic/Check-Checked-darkgray.png
deleted file mode 100644
index 76dd2110e4..0000000000
Binary files a/src/Gui/Stylesheets/images_classic/Check-Checked-darkgray.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images_classic/Check-Checked-lightgray.png b/src/Gui/Stylesheets/images_classic/Check-Checked-lightgray.png
deleted file mode 100644
index a4fc91ab98..0000000000
Binary files a/src/Gui/Stylesheets/images_classic/Check-Checked-lightgray.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images_classic/Check-Checked-white.png b/src/Gui/Stylesheets/images_classic/Check-Checked-white.png
deleted file mode 100644
index 69a6858acf..0000000000
Binary files a/src/Gui/Stylesheets/images_classic/Check-Checked-white.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images_classic/Check-indeterminate-mark-black.png b/src/Gui/Stylesheets/images_classic/Check-indeterminate-mark-black.png
deleted file mode 100644
index 9f8311d1e5..0000000000
Binary files a/src/Gui/Stylesheets/images_classic/Check-indeterminate-mark-black.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images_classic/Check-indeterminate-mark-blue.png b/src/Gui/Stylesheets/images_classic/Check-indeterminate-mark-blue.png
deleted file mode 100644
index 650a6bcd06..0000000000
Binary files a/src/Gui/Stylesheets/images_classic/Check-indeterminate-mark-blue.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images_classic/Check-indeterminate-mark-darkgray.png b/src/Gui/Stylesheets/images_classic/Check-indeterminate-mark-darkgray.png
deleted file mode 100644
index a963557573..0000000000
Binary files a/src/Gui/Stylesheets/images_classic/Check-indeterminate-mark-darkgray.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images_classic/Check-indeterminate-mark-lightgray.png b/src/Gui/Stylesheets/images_classic/Check-indeterminate-mark-lightgray.png
deleted file mode 100644
index 6dbaccc122..0000000000
Binary files a/src/Gui/Stylesheets/images_classic/Check-indeterminate-mark-lightgray.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images_classic/Check-indeterminate-mark-white.png b/src/Gui/Stylesheets/images_classic/Check-indeterminate-mark-white.png
deleted file mode 100644
index de7bf9888e..0000000000
Binary files a/src/Gui/Stylesheets/images_classic/Check-indeterminate-mark-white.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images_classic/check-mark-black.png b/src/Gui/Stylesheets/images_classic/check-mark-black.png
new file mode 100644
index 0000000000..7d313ddbb2
Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/check-mark-black.png differ
diff --git a/src/Gui/Stylesheets/images_classic/check-mark-blue.png b/src/Gui/Stylesheets/images_classic/check-mark-blue.png
new file mode 100644
index 0000000000..7d3a543148
Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/check-mark-blue.png differ
diff --git a/src/Gui/Stylesheets/images_classic/check-mark-darkgray.png b/src/Gui/Stylesheets/images_classic/check-mark-darkgray.png
new file mode 100644
index 0000000000..2b89246296
Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/check-mark-darkgray.png differ
diff --git a/src/Gui/Stylesheets/images_classic/check-mark-lightgray.png b/src/Gui/Stylesheets/images_classic/check-mark-lightgray.png
new file mode 100644
index 0000000000..18c0b0bfe1
Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/check-mark-lightgray.png differ
diff --git a/src/Gui/Stylesheets/images_classic/check-mark-white.png b/src/Gui/Stylesheets/images_classic/check-mark-white.png
new file mode 100644
index 0000000000..b7cb44d234
Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/check-mark-white.png differ
diff --git a/src/Gui/Stylesheets/images_classic/icons classic.svg b/src/Gui/Stylesheets/images_classic/icons classic.svg
index baffbff3c6..4466b174bb 100644
--- a/src/Gui/Stylesheets/images_classic/icons classic.svg	
+++ b/src/Gui/Stylesheets/images_classic/icons classic.svg	
@@ -26,8 +26,8 @@
      inkscape:document-units="mm"
      inkscape:export-bgcolor="#ffffff00"
      inkscape:zoom="1.0248427"
-     inkscape:cx="710.84082"
-     inkscape:cy="700.59534"
+     inkscape:cx="690.34987"
+     inkscape:cy="625.46186"
      inkscape:window-width="1920"
      inkscape:window-height="1028"
      inkscape:window-x="1913"
@@ -1356,41 +1356,23 @@
          x="43.345779"
          y="74.802681"
          ry="0"
-         rx="0" /></g><path
-       id="Arrow-leftDown-black"
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504"
-       d="m 10.225155,90.229528 c 2.470583,2.470564 0,0 2.470583,2.470564 h -2.470583 z"
-       sodipodi:nodetypes="cccc"
-       inkscape:label="Arrow-leftDown" /><path
-       id="Arrow-up-black"
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504"
-       d="m 13.376063,61.576768 c -3.4939258,0 0,0 -3.4939258,0 L 11.6291,59.829809 Z"
-       sodipodi:nodetypes="cccc"
-       inkscape:label="Arrow-up-black"><desc
-         id="desc11">Arrow-up</desc><title
-         id="title11">Arrow-up-black</title></path><path
-       id="Arrow-down-black"
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504"
-       d="m 9.8821372,51.225807 c 3.4939258,0 0,0 3.4939258,0 L 11.6291,52.972751 Z"
-       sodipodi:nodetypes="cccc"
-       inkscape:label="Arrow-down-black"><desc
-         id="desc12">Arrow-down</desc><title
-         id="title12">Arrow-down</title></path><path
-       id="Arrow-right-black"
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504"
-       d="m 10.706222,82.895452 c 0,-3.493916 0,0 0,-3.493916 l 1.746962,1.746957 z"
-       sodipodi:nodetypes="cccc"
-       inkscape:label="Arrow-right-black" /><path
-       id="Arrow-left-black"
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504"
-       d="m 12.551979,68.573543 c 0,3.493915 0,0 0,3.493915 l -1.746963,-1.746957 z"
-       sodipodi:nodetypes="cccc"
-       inkscape:label="Arrow-left-black" /><path
-       id="Arrow-rightDown-black"
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504"
-       d="m 10.562461,102.16745 c 2.470583,-2.47058 0,0 2.470583,-2.47058 v 2.47058 z"
-       sodipodi:nodetypes="cccc"
-       inkscape:label="Arrow-rightDown-black" /><g
+         rx="0" /></g><g
+       id="g3"
+       inkscape:label="Arrow-down-black"
+       transform="translate(0,1.5562793)"><rect
+         style="opacity:1;fill:#000000;fill-opacity:0;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.139825"
+         id="rect2"
+         width="5.5248413"
+         height="5.2053728"
+         x="9.1290998"
+         y="47.38736" /><path
+         id="Arrow-down-black"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504"
+         d="m 10.144557,49.067178 c 3.493927,0 0,0 3.493927,0 l -1.746963,1.746944 z"
+         sodipodi:nodetypes="cccc"
+         inkscape:label="Arrow-down-black"><desc
+           id="desc12">Arrow-down</desc><title
+           id="title12">Arrow-down</title></path></g><g
        id="checkbox-indeterminate-black"
        transform="matrix(1.9080808,0,0,1.9080808,-11.986833,-140.41657)"
        inkscape:label="checkbox-indeterminate-black"><g
@@ -1441,41 +1423,7 @@
          id="path6-1-5" /><path
          style="fill:#888888;fill-opacity:1;stroke:#888888;stroke-width:0.581761;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
          d="m 48.739561,65.932118 -1.32916,-1.411205 -1.329164,1.411205 z"
-         id="path6-1-2-9" /></g><path
-       id="Arrow-leftDown-lightgray"
-       style="fill:#888888;fill-opacity:1;stroke:#888888;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
-       d="m 37.076445,90.229529 c 2.470583,2.470564 0,0 2.470583,2.470564 h -2.470583 z"
-       sodipodi:nodetypes="cccc"
-       inkscape:label="Arrow-leftDown-lightgray" /><path
-       id="Arrow-up-lightgray"
-       style="fill:#888888;fill-opacity:1;stroke:#888888;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
-       d="m 40.227352,61.576768 c -3.493925,0 0,0 -3.493925,0 l 1.746962,-1.746959 z"
-       sodipodi:nodetypes="cccc"
-       inkscape:label="Arrow-up-lightgray"><desc
-         id="desc11-0">Arrow-up</desc><title
-         id="title11-2">Arrow-up</title></path><path
-       id="Arrow-down-lightgray"
-       style="fill:#888888;fill-opacity:1;stroke:#888888;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
-       d="m 36.733427,51.225807 c 3.493925,0 0,0 3.493925,0 l -1.746963,1.746944 z"
-       sodipodi:nodetypes="cccc"
-       inkscape:label="Arrow-down-lightgray"><desc
-         id="desc12-3">Arrow-down</desc><title
-         id="title12-2">Arrow-down</title></path><path
-       id="Arrow-right-lightgray"
-       style="fill:#888888;fill-opacity:1;stroke:#888888;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
-       d="m 37.557512,82.895452 c 0,-3.493916 0,0 0,-3.493916 l 1.746962,1.746957 z"
-       sodipodi:nodetypes="cccc"
-       inkscape:label="Arrow-right-lightgray" /><path
-       id="Arrow-left-lightgray"
-       style="fill:#888888;fill-opacity:1;stroke:#888888;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
-       d="m 39.403269,68.573543 c 0,3.493915 0,0 0,3.493915 l -1.746963,-1.746957 z"
-       sodipodi:nodetypes="cccc"
-       inkscape:label="Arrow-left-lightgray" /><path
-       id="Arrow-rightDown-lightgray"
-       style="fill:#888888;fill-opacity:1;stroke:#888888;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
-       d="m 37.413751,102.16745 c 2.470583,-2.47058 0,0 2.470583,-2.47058 v 2.47058 z"
-       sodipodi:nodetypes="cccc"
-       inkscape:label="Arrow-rightDown-lightgray" /><g
+         id="path6-1-2-9" /></g><g
        id="Arrow-double-LeftRight-lightgray"
        transform="matrix(1.9461599e-4,0.90299667,-0.90299667,1.9461599e-4,99.24722,79.562015)"
        inkscape:label="Arrow-double-LeftRight-lightgray"><path
@@ -1669,41 +1617,7 @@
          x="43.345779"
          y="74.802681"
          ry="0"
-         rx="0" /></g><path
-       id="Arrow-leftDown-darkgray"
-       style="fill:#4d4d4d;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
-       d="m 63.927735,90.229529 c 2.470583,2.470564 0,0 2.470583,2.470564 h -2.470583 z"
-       sodipodi:nodetypes="cccc"
-       inkscape:label="Arrow-leftDown-darkgray" /><path
-       id="Arrow-up-darkgray"
-       style="fill:#4d4d4d;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
-       d="m 67.078642,61.576768 c -3.493925,0 0,0 -3.493925,0 l 1.746962,-1.746959 z"
-       sodipodi:nodetypes="cccc"
-       inkscape:label="Arrow-up-darkgray"><desc
-         id="desc11-6">Arrow-up</desc><title
-         id="title11-9">Arrow-up</title></path><path
-       id="Arrow-down-darkgray"
-       style="fill:#4d4d4d;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.47702;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       d="m 63.584717,51.225807 c 3.493925,0 0,0 3.493925,0 l -1.746963,1.746944 z"
-       sodipodi:nodetypes="cccc"
-       inkscape:label="Arrow-down-darkgray"><desc
-         id="desc12-0">Arrow-down</desc><title
-         id="title12-9">Arrow-down</title></path><path
-       id="Arrow-right-darkgray"
-       style="fill:#4d4d4d;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
-       d="m 64.408802,82.895452 c 0,-3.493916 0,0 0,-3.493916 l 1.746962,1.746957 z"
-       sodipodi:nodetypes="cccc"
-       inkscape:label="Arrow-right-darkgray" /><path
-       id="Arrow-left-darkgray"
-       style="fill:#4d4d4d;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
-       d="m 66.254559,68.573543 c 0,3.493915 0,0 0,3.493915 l -1.746963,-1.746957 z"
-       sodipodi:nodetypes="cccc"
-       inkscape:label="Arrow-left-darkgray" /><path
-       id="Arrow-rightDown-darkgray"
-       style="fill:#4d4d4d;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
-       d="m 64.265041,102.16745 c 2.470583,-2.47058 0,0 2.470583,-2.47058 v 2.47058 z"
-       sodipodi:nodetypes="cccc"
-       inkscape:label="Arrow-rightDown-darkgray" /><g
+         rx="0" /></g><g
        id="checkbox-indeterminate-darkgray"
        transform="matrix(1.9080808,0,0,1.9080808,41.715747,-140.41657)"
        inkscape:label="checkbox-indeterminate-darkgray"><g
@@ -1882,53 +1796,7 @@
          x="43.345779"
          y="74.802681"
          ry="0"
-         rx="0" /></g><path
-       id="Arrow-leftDown-white"
-       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
-       d="m 90.779022,90.229528 c 2.470583,2.470564 0,0 2.470583,2.470564 h -2.470583 z"
-       sodipodi:nodetypes="cccc"
-       inkscape:label="Arrow-leftDown-white" /><path
-       id="Arrow-up-white"
-       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
-       d="m 93.92993,61.576768 c -3.493925,0 0,0 -3.493925,0 l 1.746962,-1.746959 z"
-       sodipodi:nodetypes="cccc"
-       inkscape:label="Arrow-up-white"
-       inkscape:export-filename="images_classic\Arrow-up-white.svg"
-       inkscape:export-xdpi="45"
-       inkscape:export-ydpi="45"><desc
-         id="desc11-9">Arrow-up</desc><title
-         id="title11-7">Arrow-up</title></path><path
-       id="Arrow-down-white"
-       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
-       d="m 90.436005,51.225807 c 3.493925,0 0,0 3.493925,0 l -1.746963,1.746944 z"
-       sodipodi:nodetypes="cccc"
-       inkscape:label="Arrow-down-white"
-       inkscape:export-filename="images_classic\Arrow-down-white.svg"
-       inkscape:export-xdpi="45"
-       inkscape:export-ydpi="45"><desc
-         id="desc12-8">Arrow-down</desc><title
-         id="title12-4">Arrow-down</title></path><path
-       id="Arrow-right-white"
-       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
-       d="m 91.260089,82.895452 c 0,-3.493916 0,0 0,-3.493916 l 1.746962,1.746957 z"
-       sodipodi:nodetypes="cccc"
-       inkscape:label="Arrow-right-white"
-       inkscape:export-filename="images_classic\Arrow-right-white.svg"
-       inkscape:export-xdpi="45"
-       inkscape:export-ydpi="45" /><path
-       id="Arrow-left-white"
-       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
-       d="m 93.105846,68.573543 c 0,3.493915 0,0 0,3.493915 l -1.746963,-1.746957 z"
-       sodipodi:nodetypes="cccc"
-       inkscape:label="Arrow-left-white"
-       inkscape:export-filename="images_classic\Arrow-left-white.svg"
-       inkscape:export-xdpi="45"
-       inkscape:export-ydpi="45" /><path
-       id="Arrow-rightDown-white"
-       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
-       d="m 91.116328,102.16745 c 2.470583,-2.47058 0,0 2.470583,-2.47058 v 2.47058 z"
-       sodipodi:nodetypes="cccc"
-       inkscape:label="Arrow-rightDown-white" /><g
+         rx="0" /></g><g
        id="checkbox-indeterminate-white"
        transform="matrix(1.9080808,0,0,1.9080808,68.567035,-140.41657)"
        inkscape:label="checkbox-indeterminate-white"
@@ -2276,41 +2144,7 @@
          x="43.345779"
          y="74.802681"
          ry="0"
-         rx="0" /></g><path
-       id="Arrow-leftDown-blue"
-       style="fill:#4893df;fill-opacity:1;stroke:#4893df;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
-       d="m 115.29523,90.229528 c 2.47058,2.470564 0,0 2.47058,2.470564 h -2.47058 z"
-       sodipodi:nodetypes="cccc"
-       inkscape:label="Arrow-leftDown-blue" /><path
-       id="Arrow-up-blue"
-       style="fill:#4893df;fill-opacity:1;stroke:#4893df;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
-       d="m 118.44613,61.576768 c -3.49392,0 0,0 -3.49392,0 l 1.74696,-1.746959 z"
-       sodipodi:nodetypes="cccc"
-       inkscape:label="Arrow-up-blue"><desc
-         id="desc11-9-1">Arrow-up</desc><title
-         id="title11-7-3">Arrow-up</title></path><path
-       id="Arrow-down-blue"
-       style="fill:#4893df;fill-opacity:1;stroke:#4893df;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
-       d="m 114.95221,51.225807 c 3.49392,0 0,0 3.49392,0 l -1.74696,1.746944 z"
-       sodipodi:nodetypes="cccc"
-       inkscape:label="Arrow-down-blue"><desc
-         id="desc12-8-0">Arrow-down</desc><title
-         id="title12-4-1">Arrow-down</title></path><path
-       id="Arrow-right-blue"
-       style="fill:#4893df;fill-opacity:1;stroke:#4893df;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
-       d="m 115.77629,82.895452 c 0,-3.493916 0,0 0,-3.493916 l 1.74696,1.746957 z"
-       sodipodi:nodetypes="cccc"
-       inkscape:label="Arrow-right-blue" /><path
-       id="Arrow-left-blue"
-       style="fill:#4893df;fill-opacity:1;stroke:#4893df;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
-       d="m 117.62205,68.573543 c 0,3.493915 0,0 0,3.493915 l -1.74696,-1.746957 z"
-       sodipodi:nodetypes="cccc"
-       inkscape:label="Arrow-left-blue" /><path
-       id="Arrow-rightDown-blue"
-       style="fill:#4893df;fill-opacity:1;stroke:#4893df;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
-       d="m 115.63253,102.16745 c 2.47059,-2.47058 0,0 2.47059,-2.47058 v 2.47058 z"
-       sodipodi:nodetypes="cccc"
-       inkscape:label="Arrow-rightDown-blue" /><g
+         rx="0" /></g><g
        id="checkbox-indeterminate-blue"
        transform="matrix(1.9080808,0,0,1.9080808,93.08324,-140.41656)"
        inkscape:label="checkbox-indeterminate-blue"
@@ -5246,9 +5080,9 @@
          x="1.4425559"
          y="4"
          ry="5.5511148e-17" /></g><g
-       id="check-checked-black"
+       id="check-mark-black"
        transform="matrix(1.9080808,0,0,1.9080808,55.925613,57.113479)"
-       inkscape:label="check-checked-black"><rect
+       inkscape:label="check-mark-black"><rect
          style="fill:none;stroke:#000000;stroke-width:0.25;stroke-linejoin:miter;stroke-dasharray:none;stroke-dashoffset:128.504;stroke-opacity:0"
          id="rect354-384-9-9"
          width="3.3369336"
@@ -5261,9 +5095,9 @@
          d="m 44.084608,76.315193 0.707406,1.270074 1.070284,-2.161554"
          id="path4-9"
          sodipodi:nodetypes="ccc" /></g><g
-       id="Check-indeterminate-mark-black"
+       id="indeterminate-mark-black"
        transform="matrix(1.9080808,0,0,1.9080808,118.2005,-96.136049)"
-       inkscape:label="Check-indeterminate-mark-black"><g
+       inkscape:label="indeterminate-mark-black"><g
          id="layer1-47-9-0"
          transform="matrix(0.11566147,0,0,0.1422392,-113.58621,101.3715)"><path
            style="fill:none;stroke:#000000;stroke-width:4.42871;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
@@ -5280,9 +5114,9 @@
            y="74.802681"
            ry="0"
            rx="0" /></g></g><g
-       id="check-checked-lightgray"
+       id="check-mark-lightgray"
        transform="matrix(1.9080808,0,0,1.9080808,82.776903,57.113479)"
-       inkscape:label="check-checked-lightgray"><rect
+       inkscape:label="check-mark-lightgray"><rect
          style="fill:none;stroke:#888888;stroke-width:0.25;stroke-linejoin:miter;stroke-dasharray:none;stroke-dashoffset:128.504;stroke-opacity:0"
          id="rect354-384-9-0-0"
          width="3.3369336"
@@ -5295,9 +5129,9 @@
          d="m 44.084608,76.315193 0.707406,1.270074 1.070284,-2.161554"
          id="path4-2-8"
          sodipodi:nodetypes="ccc" /></g><g
-       id="Check-indeterminate-mark-lightgray"
+       id="indeterminate-mark-lightgray"
        transform="matrix(1.9080808,0,0,1.9080808,145.05179,-96.136049)"
-       inkscape:label="Check-indeterminate-mark-lightgray"><g
+       inkscape:label="indeterminate-mark-lightgray"><g
          id="layer1-47-9-4-3"
          transform="matrix(0.11566147,0,0,0.1422392,-113.58621,101.3715)"><path
            style="fill:none;stroke:#888888;stroke-width:4.42871;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
@@ -5314,9 +5148,9 @@
            y="74.802681"
            ry="0"
            rx="0" /></g></g><g
-       id="check-checked-darkgray"
+       id="check-mark-darkgray"
        transform="matrix(1.9080808,0,0,1.9080808,109.62819,57.113479)"
-       inkscape:label="check-checked-darkgray"><rect
+       inkscape:label="check-mark-darkgray"><rect
          style="fill:none;stroke:#4d4d4d;stroke-width:0.25;stroke-linejoin:miter;stroke-dasharray:none;stroke-dashoffset:128.504;stroke-opacity:0"
          id="rect354-384-9-7-7"
          width="3.3369336"
@@ -5329,9 +5163,9 @@
          d="m 44.084608,76.315193 0.707406,1.270074 1.070284,-2.161554"
          id="path4-8-0"
          sodipodi:nodetypes="ccc" /></g><g
-       id="Check-indeterminate-mark-darkgray"
+       id="indeterminate-mark-darkgray"
        transform="matrix(1.9080808,0,0,1.9080808,171.90308,-96.136049)"
-       inkscape:label="Check-indeterminate-mark-darkgray"><g
+       inkscape:label="indeterminate-mark-darkgray"><g
          id="layer1-47-9-1-6"
          transform="matrix(0.11566147,0,0,0.1422392,-113.58621,101.3715)"><path
            style="fill:none;stroke:#4d4d4d;stroke-width:4.42871;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
@@ -5348,9 +5182,9 @@
            y="74.802681"
            ry="0"
            rx="0" /></g></g><g
-       id="check-checked-white"
+       id="check-mark-white"
        transform="matrix(1.9080808,0,0,1.9080808,136.47948,57.113478)"
-       inkscape:label="check-checked-white"
+       inkscape:label="check-mark-white"
        style="stroke:#ffffff;stroke-opacity:1"><rect
          style="fill:none;stroke:#ffffff;stroke-width:0.25;stroke-linejoin:miter;stroke-dasharray:none;stroke-dashoffset:128.504;stroke-opacity:0"
          id="rect354-384-9-3-9"
@@ -5364,9 +5198,9 @@
          d="m 44.084608,76.315193 0.707406,1.270074 1.070284,-2.161554"
          id="path4-1-0"
          sodipodi:nodetypes="ccc" /></g><g
-       id="Check-indeterminate-mark-white"
+       id="indeterminate-mark-white"
        transform="matrix(1.9080808,0,0,1.9080808,198.75436,-96.136049)"
-       inkscape:label="Check-indeterminate-mark-white"
+       inkscape:label="indeterminate-mark-white"
        style="stroke:#ffffff;stroke-opacity:1"><g
          id="layer1-47-9-8-6"
          transform="matrix(0.11566147,0,0,0.1422392,-113.58621,101.3715)"
@@ -5385,9 +5219,9 @@
            y="74.802681"
            ry="0"
            rx="0" /></g></g><g
-       id="check-checked-blue"
+       id="check-mark-blue"
        transform="matrix(1.9080808,0,0,1.9080808,160.99568,57.113481)"
-       inkscape:label="check-checked-blue"
+       inkscape:label="check-mark-blue"
        style="fill:#557bb6;fill-opacity:0;stroke:#557bb6;stroke-opacity:1"><rect
          style="fill:#ffffff;fill-opacity:0;stroke:#4893df;stroke-width:0.25;stroke-linejoin:miter;stroke-dasharray:none;stroke-dashoffset:128.504;stroke-opacity:0"
          id="rect354-384-9-3-3-3"
@@ -5401,9 +5235,9 @@
          d="m 44.084608,76.315193 0.707406,1.270074 1.070284,-2.161554"
          id="path4-1-8-1"
          sodipodi:nodetypes="ccc" /></g><g
-       id="Check-indeterminate-mark-blue"
+       id="indeterminate-mark-blue"
        transform="matrix(1.9080808,0,0,1.9080808,223.27057,-96.136039)"
-       inkscape:label="Check-indeterminate-mark-blue"
+       inkscape:label="indeterminate-mark-blue"
        style="fill:#557bb6;fill-opacity:0;stroke:#557bb6;stroke-opacity:1"><g
          id="layer1-47-9-8-3-8"
          transform="matrix(0.11566147,0,0,0.1422392,-113.58621,101.3715)"
@@ -5421,4 +5255,448 @@
            x="43.345779"
            y="74.802681"
            ry="0"
-           rx="0" /></g></g></g></svg>
+           rx="0" /></g></g><g
+       id="Arrow-up-black"
+       transform="rotate(180,11.572279,55.033588)"
+       inkscape:label="Arrow-up-black"><rect
+         style="opacity:1;fill:#000000;fill-opacity:0;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.139825"
+         id="rect2-3"
+         width="5.5248413"
+         height="5.2053728"
+         x="9.1290998"
+         y="47.38736" /><path
+         id="Arrow-down-black-1"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504"
+         d="m 10.144557,49.067178 c 3.493927,0 0,0 3.493927,0 l -1.746963,1.746944 z"
+         sodipodi:nodetypes="cccc"
+         inkscape:label="Arrow-down-black"><desc
+           id="desc12-4">Arrow-down</desc><title
+           id="title12-5">Arrow-down</title></path></g><g
+       id="Arrow-left-black"
+       transform="rotate(90,1.2499856,59.292988)"
+       inkscape:label="Arrow-left-black"><rect
+         style="opacity:1;fill:#000000;fill-opacity:0;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.139825"
+         id="rect2-3-8"
+         width="5.5248413"
+         height="5.2053728"
+         x="9.1290998"
+         y="47.38736" /><path
+         id="Arrow-down-black-1-6"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504"
+         d="m 10.144557,49.067178 c 3.493927,0 0,0 3.493927,0 l -1.746963,1.746944 z"
+         sodipodi:nodetypes="cccc"
+         inkscape:label="Arrow-down-black"><desc
+           id="desc12-4-5">Arrow-down</desc><title
+           id="title12-5-3">Arrow-down</title></path></g><g
+       id="Arrow-right-black"
+       transform="rotate(-90,26.693962,66.13108)"
+       inkscape:label="Arrow-right-black"><rect
+         style="opacity:1;fill:#000000;fill-opacity:0;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.139825"
+         id="rect2-3-8-7"
+         width="5.5248413"
+         height="5.2053728"
+         x="9.1290998"
+         y="47.38736" /><path
+         id="Arrow-down-black-1-6-6"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504"
+         d="m 10.144557,49.067178 c 3.493927,0 0,0 3.493927,0 l -1.746963,1.746944 z"
+         sodipodi:nodetypes="cccc"
+         inkscape:label="Arrow-down-black"><desc
+           id="desc12-4-5-9">Arrow-down</desc><title
+           id="title12-5-3-6">Arrow-down</title></path></g><g
+       id="Arrow-right-black-6"
+       transform="rotate(-90,34.420877,68.335751)"
+       inkscape:label="Arrow-leftDown-black"><rect
+         style="opacity:1;fill:#2a2a2a;fill-opacity:0;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.139825"
+         id="rect2-3-8-7-8"
+         width="5.5248413"
+         height="5.2053728"
+         x="9.0859737"
+         y="41.865116" /><path
+         id="Arrow-leftDown-black2"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504"
+         d="m 12.915026,43.063857 c -2.470564,2.470583 0,0 -2.470564,2.470583 v -2.470583 z"
+         sodipodi:nodetypes="cccc"
+         inkscape:label="" /></g><g
+       id="Arrow-rightDown-black"
+       transform="rotate(180,11.200661,73.157368)"
+       inkscape:label="Arrow-rightDown-black"><rect
+         style="opacity:1;fill:#2a2a2a;fill-opacity:0;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.139825"
+         id="rect2-3-8-7-8-3"
+         width="5.5248413"
+         height="5.2053728"
+         x="9.0859737"
+         y="41.865116" /><path
+         id="Arrow-leftDown-black2-0"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504"
+         d="m 12.915026,43.063857 c -2.470564,2.470583 0,0 -2.470564,2.470583 v -2.470583 z"
+         sodipodi:nodetypes="cccc"
+         inkscape:label="" /></g><g
+       id="Arrow-down-lightgray"
+       inkscape:label="Arrow-down-lightgray"
+       transform="translate(27.927461,1.5562793)"><rect
+         style="opacity:1;fill:#000000;fill-opacity:0;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.139825"
+         id="rect2-5"
+         width="5.5248413"
+         height="5.2053728"
+         x="9.1290998"
+         y="47.38736" /><path
+         id="Arrow-down-lightgray-2"
+         style="fill:#888888;fill-opacity:1;stroke:#888888;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
+         d="m 10.144557,49.067178 c 3.493927,0 0,0 3.493927,0 l -1.746963,1.746944 z"
+         sodipodi:nodetypes="cccc"
+         inkscape:label="Arrow-down-black"><desc
+           id="desc12-7">Arrow-down</desc><title
+           id="title12-0">Arrow-down</title></path></g><g
+       id="Arrow-up-lightgray"
+       transform="rotate(180,25.53601,55.033588)"
+       inkscape:label="Arrow-up-lightgray"><rect
+         style="opacity:1;fill:#000000;fill-opacity:0;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.139825"
+         id="rect2-3-6"
+         width="5.5248413"
+         height="5.2053728"
+         x="9.1290998"
+         y="47.38736" /><path
+         id="Arrow-down-lightgray-1-1"
+         style="fill:#888888;fill-opacity:1;stroke:#888888;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
+         d="m 10.144557,49.067178 c 3.493927,0 0,0 3.493927,0 l -1.746963,1.746944 z"
+         sodipodi:nodetypes="cccc"
+         inkscape:label="Arrow-down-black"><desc
+           id="desc12-4-54">Arrow-down</desc><title
+           id="title12-5-38">Arrow-down</title></path></g><g
+       id="Arrow-left-lightgray"
+       transform="rotate(90,15.213716,73.256719)"
+       inkscape:label="Arrow-left-lightgray"><rect
+         style="opacity:1;fill:#000000;fill-opacity:0;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.139825"
+         id="rect2-3-8-78"
+         width="5.5248413"
+         height="5.2053728"
+         x="9.1290998"
+         y="47.38736" /><path
+         id="Arrow-down-lightgray-1-6-8"
+         style="fill:#888888;fill-opacity:1;stroke:#888888;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
+         d="m 10.144557,49.067178 c 3.493927,0 0,0 3.493927,0 l -1.746963,1.746944 z"
+         sodipodi:nodetypes="cccc"
+         inkscape:label="Arrow-down-black"><desc
+           id="desc12-4-5-3">Arrow-down</desc><title
+           id="title12-5-3-7">Arrow-down</title></path></g><g
+       id="Arrow-right-lightgray"
+       transform="rotate(-90,40.657693,52.167349)"
+       inkscape:label="Arrow-right-lightgray"><rect
+         style="opacity:1;fill:#000000;fill-opacity:0;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.139825"
+         id="rect2-3-8-7-1"
+         width="5.5248413"
+         height="5.2053728"
+         x="9.1290998"
+         y="47.38736" /><path
+         id="Arrow-down-lightgray-1-6-6-1"
+         style="fill:#888888;fill-opacity:1;stroke:#888888;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
+         d="m 10.144557,49.067178 c 3.493927,0 0,0 3.493927,0 l -1.746963,1.746944 z"
+         sodipodi:nodetypes="cccc"
+         inkscape:label="Arrow-down-black"><desc
+           id="desc12-4-5-9-9">Arrow-down</desc><title
+           id="title12-5-3-6-3">Arrow-down</title></path></g><g
+       id="Arrow-leftDown-lightgray"
+       transform="rotate(-90,48.384608,54.37202)"
+       inkscape:label="Arrow-leftDown-lightgray"><rect
+         style="opacity:1;fill:#2a2a2a;fill-opacity:0;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.139825"
+         id="rect2-3-8-7-8-0"
+         width="5.5248413"
+         height="5.2053728"
+         x="9.0859737"
+         y="41.865116" /><path
+         id="Arrow-leftDown-lightgray2-03"
+         style="fill:#888888;fill-opacity:1;stroke:#888888;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
+         d="m 12.915026,43.063857 c -2.470564,2.470583 0,0 -2.470564,2.470583 v -2.470583 z"
+         sodipodi:nodetypes="cccc"
+         inkscape:label="" /></g><g
+       id="Arrow-rightDown-lightgray"
+       transform="rotate(180,25.164392,73.157368)"
+       inkscape:label="Arrow-rightDown-lightgray"><rect
+         style="opacity:1;fill:#2a2a2a;fill-opacity:0;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.139825"
+         id="rect2-3-8-7-8-3-7"
+         width="5.5248413"
+         height="5.2053728"
+         x="9.0859737"
+         y="41.865116" /><path
+         id="Arrow-leftDown-lightgray2-0-5"
+         style="fill:#888888;fill-opacity:1;stroke:#888888;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
+         d="m 12.915026,43.063857 c -2.470564,2.470583 0,0 -2.470564,2.470583 v -2.470583 z"
+         sodipodi:nodetypes="cccc"
+         inkscape:label="" /></g><g
+       id="Arrow-down-white"
+       inkscape:label="Arrow-down-white"
+       transform="translate(80.870902,1.5562793)"><rect
+         style="opacity:1;fill:#000000;fill-opacity:0;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.139825"
+         id="rect2-5-7"
+         width="5.5248413"
+         height="5.2053728"
+         x="9.1290998"
+         y="47.38736" /><path
+         id="Arrow-down-white-2"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
+         d="m 10.144557,49.067178 c 3.493927,0 0,0 3.493927,0 l -1.746963,1.746944 z"
+         sodipodi:nodetypes="cccc"
+         inkscape:label="Arrow-down-black"><desc
+           id="desc12-7-1">Arrow-down</desc><title
+           id="title12-0-9">Arrow-down</title></path></g><g
+       id="Arrow-up-white"
+       transform="rotate(180,52.007731,55.038565)"
+       inkscape:label="Arrow-up-white"><rect
+         style="opacity:1;fill:#000000;fill-opacity:0;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.139825"
+         id="rect2-3-6-6"
+         width="5.5248413"
+         height="5.2053728"
+         x="9.1290998"
+         y="47.38736" /><path
+         id="Arrow-down-white-1-1"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
+         d="m 10.144557,49.067178 c 3.493927,0 0,0 3.493927,0 l -1.746963,1.746944 z"
+         sodipodi:nodetypes="cccc"
+         inkscape:label="Arrow-down-black"><desc
+           id="desc12-4-54-3">Arrow-down</desc><title
+           id="title12-5-38-3">Arrow-down</title></path></g><g
+       id="Arrow-left-white"
+       transform="rotate(90,41.68046,99.733412)"
+       inkscape:label="Arrow-left-white"><rect
+         style="opacity:1;fill:#000000;fill-opacity:0;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.139825"
+         id="rect2-3-8-78-1"
+         width="5.5248413"
+         height="5.2053728"
+         x="9.1290998"
+         y="47.38736" /><path
+         id="Arrow-down-white-1-6-8"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
+         d="m 10.144557,49.067178 c 3.493927,0 0,0 3.493927,0 l -1.746963,1.746944 z"
+         sodipodi:nodetypes="cccc"
+         inkscape:label="Arrow-down-black"><desc
+           id="desc12-4-5-3-4">Arrow-down</desc><title
+           id="title12-5-3-7-8">Arrow-down</title></path></g><g
+       id="Arrow-right-white"
+       transform="rotate(-90,67.134386,25.700604)"
+       inkscape:label="Arrow-right-white"><rect
+         style="opacity:1;fill:#000000;fill-opacity:0;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.139825"
+         id="rect2-3-8-7-1-5"
+         width="5.5248413"
+         height="5.2053728"
+         x="9.1290998"
+         y="47.38736" /><path
+         id="Arrow-down-white-1-6-6-1"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
+         d="m 10.144557,49.067178 c 3.493927,0 0,0 3.493927,0 l -1.746963,1.746944 z"
+         sodipodi:nodetypes="cccc"
+         inkscape:label="Arrow-down-black"><desc
+           id="desc12-4-5-9-9-4">Arrow-down</desc><title
+           id="title12-5-3-6-3-2">Arrow-down</title></path></g><g
+       id="Arrow-leftDown-white"
+       transform="rotate(-90,74.861305,27.905276)"
+       inkscape:label="Arrow-leftDown-white"><rect
+         style="opacity:1;fill:#2a2a2a;fill-opacity:0;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.139825"
+         id="rect2-3-8-7-8-0-1"
+         width="5.5248413"
+         height="5.2053728"
+         x="9.0859737"
+         y="41.865116" /><path
+         id="Arrow-leftDown-white2-03"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
+         d="m 12.915026,43.063857 c -2.470564,2.470583 0,0 -2.470564,2.470583 v -2.470583 z"
+         sodipodi:nodetypes="cccc"
+         inkscape:label="" /></g><g
+       id="Arrow-rightDown-white"
+       transform="rotate(180,51.636113,73.157368)"
+       inkscape:label="Arrow-rightDown-white"><rect
+         style="opacity:1;fill:#2a2a2a;fill-opacity:0;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.139825"
+         id="rect2-3-8-7-8-3-7-5"
+         width="5.5248413"
+         height="5.2053728"
+         x="9.0859737"
+         y="41.865116" /><path
+         id="Arrow-leftDown-white2-0-5"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
+         d="m 12.915026,43.063857 c -2.470564,2.470583 0,0 -2.470564,2.470583 v -2.470583 z"
+         sodipodi:nodetypes="cccc"
+         inkscape:label="" /></g><g
+       id="Arrow-down-darkgray"
+       inkscape:label="Arrow-down-darkgray"
+       transform="translate(55.217546,1.5562793)"><rect
+         style="opacity:1;fill:#000000;fill-opacity:0;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.139825"
+         id="rect2-5-6"
+         width="5.5248413"
+         height="5.2053728"
+         x="9.1290998"
+         y="47.38736" /><path
+         id="Arrow-down-darkgray-2"
+         style="fill:#4d4d4d;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
+         d="m 10.144557,49.067178 c 3.493927,0 0,0 3.493927,0 l -1.746963,1.746944 z"
+         sodipodi:nodetypes="cccc"
+         inkscape:label="Arrow-down-black"><desc
+           id="desc12-7-4">Arrow-down</desc><title
+           id="title12-0-3">Arrow-down</title></path></g><g
+       id="Arrow-up-darkgray"
+       transform="rotate(180,39.181053,55.811727)"
+       inkscape:label="Arrow-up-darkgray"><rect
+         style="opacity:1;fill:#000000;fill-opacity:0;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.139825"
+         id="rect2-3-6-0"
+         width="5.5248413"
+         height="5.2053728"
+         x="9.1290998"
+         y="47.38736" /><path
+         id="Arrow-down-darkgray-1-1"
+         style="fill:#4d4d4d;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
+         d="m 10.144557,49.067178 c 3.493927,0 0,0 3.493927,0 l -1.746963,1.746944 z"
+         sodipodi:nodetypes="cccc"
+         inkscape:label="Arrow-down-black"><desc
+           id="desc12-4-54-2">Arrow-down</desc><title
+           id="title12-5-38-8">Arrow-down</title></path></g><g
+       id="Arrow-left-darkgray"
+       transform="rotate(90,28.08062,87.679905)"
+       inkscape:label="Arrow-left-darkgray"><rect
+         style="opacity:1;fill:#000000;fill-opacity:0;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.139825"
+         id="rect2-3-8-78-7"
+         width="5.5248413"
+         height="5.2053728"
+         x="9.1290998"
+         y="47.38736" /><path
+         id="Arrow-down-darkgray-1-6-8"
+         style="fill:#4d4d4d;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
+         d="m 10.144557,49.067178 c 3.493927,0 0,0 3.493927,0 l -1.746963,1.746944 z"
+         sodipodi:nodetypes="cccc"
+         inkscape:label="Arrow-down-black"><desc
+           id="desc12-4-5-3-1">Arrow-down</desc><title
+           id="title12-5-3-7-6">Arrow-down</title></path></g><g
+       id="Arrow-right-darkgray"
+       transform="rotate(-90,55.08087,39.300445)"
+       inkscape:label="Arrow-right-darkgray"><rect
+         style="opacity:1;fill:#000000;fill-opacity:0;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.139825"
+         id="rect2-3-8-7-1-4"
+         width="5.5248413"
+         height="5.2053728"
+         x="9.1290998"
+         y="47.38736" /><path
+         id="Arrow-down-darkgray-1-6-6-1"
+         style="fill:#4d4d4d;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
+         d="m 10.144557,49.067178 c 3.493927,0 0,0 3.493927,0 l -1.746963,1.746944 z"
+         sodipodi:nodetypes="cccc"
+         inkscape:label="Arrow-down-black"><desc
+           id="desc12-4-5-9-9-0">Arrow-down</desc><title
+           id="title12-5-3-6-3-5">Arrow-down</title></path></g><g
+       id="Arrow-leftDown-darkgray"
+       transform="rotate(-90,62.80779,41.505116)"
+       inkscape:label="Arrow-leftDown-darkgray"><rect
+         style="opacity:1;fill:#2a2a2a;fill-opacity:0;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.139825"
+         id="rect2-3-8-7-8-0-12"
+         width="5.5248413"
+         height="5.2053728"
+         x="9.0859737"
+         y="41.865116" /><path
+         id="Arrow-leftDown-darkgray2-03"
+         style="fill:#4d4d4d;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
+         d="m 12.915026,43.063857 c -2.470564,2.470583 0,0 -2.470564,2.470583 v -2.470583 z"
+         sodipodi:nodetypes="cccc"
+         inkscape:label="" /></g><g
+       id="Arrow-rightDown-darkgray"
+       transform="rotate(180,38.809435,73.157368)"
+       inkscape:label="Arrow-rightDown-darkgray"><rect
+         style="opacity:1;fill:#2a2a2a;fill-opacity:0;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.139825"
+         id="rect2-3-8-7-8-3-7-2"
+         width="5.5248413"
+         height="5.2053728"
+         x="9.0859737"
+         y="41.865116" /><path
+         id="Arrow-leftDown-darkgray2-0-5"
+         style="fill:#4d4d4d;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
+         d="m 12.915026,43.063857 c -2.470564,2.470583 0,0 -2.470564,2.470583 v -2.470583 z"
+         sodipodi:nodetypes="cccc"
+         inkscape:label="" /></g><g
+       id="Arrow-down-blue"
+       inkscape:label="Arrow-down-blue"
+       transform="translate(105.18567,1.5562793)"><rect
+         style="opacity:1;fill:#000000;fill-opacity:0;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.139825"
+         id="rect2-5-8"
+         width="5.5248413"
+         height="5.2053728"
+         x="9.1290998"
+         y="47.38736" /><path
+         id="Arrow-down-blue-2"
+         style="fill:#4893df;fill-opacity:1;stroke:#4893df;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
+         d="m 10.144557,49.067178 c 3.493927,0 0,0 3.493927,0 l -1.746963,1.746944 z"
+         sodipodi:nodetypes="cccc"
+         inkscape:label="Arrow-down-black"><desc
+           id="desc12-7-9">Arrow-down</desc><title
+           id="title12-0-5">Arrow-down</title></path></g><g
+       id="Arrow-up-blue"
+       transform="rotate(180,64.165114,55.811728)"
+       inkscape:label="Arrow-up-blue"><rect
+         style="opacity:1;fill:#000000;fill-opacity:0;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.139825"
+         id="rect2-3-6-4"
+         width="5.5248413"
+         height="5.2053728"
+         x="9.1290998"
+         y="47.38736" /><path
+         id="Arrow-down-blue-1-1"
+         style="fill:#4893df;fill-opacity:1;stroke:#4893df;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
+         d="m 10.144557,49.067178 c 3.493927,0 0,0 3.493927,0 l -1.746963,1.746944 z"
+         sodipodi:nodetypes="cccc"
+         inkscape:label="Arrow-down-black"><desc
+           id="desc12-4-54-38">Arrow-down</desc><title
+           id="title12-5-38-37">Arrow-down</title></path></g><g
+       id="Arrow-left-blue"
+       transform="rotate(90,53.06468,112.66396)"
+       inkscape:label="Arrow-left-blue"><rect
+         style="opacity:1;fill:#000000;fill-opacity:0;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.139825"
+         id="rect2-3-8-78-6"
+         width="5.5248413"
+         height="5.2053728"
+         x="9.1290998"
+         y="47.38736" /><path
+         id="Arrow-down-blue-1-6-8"
+         style="fill:#4893df;fill-opacity:1;stroke:#4893df;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
+         d="m 10.144557,49.067178 c 3.493927,0 0,0 3.493927,0 l -1.746963,1.746944 z"
+         sodipodi:nodetypes="cccc"
+         inkscape:label="Arrow-down-black"><desc
+           id="desc12-4-5-3-3">Arrow-down</desc><title
+           id="title12-5-3-7-2">Arrow-down</title></path></g><g
+       id="Arrow-right-blue"
+       transform="rotate(-90,80.064933,14.316385)"
+       inkscape:label="Arrow-right-blue"><rect
+         style="opacity:1;fill:#000000;fill-opacity:0;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.139825"
+         id="rect2-3-8-7-1-6"
+         width="5.5248413"
+         height="5.2053728"
+         x="9.1290998"
+         y="47.38736" /><path
+         id="Arrow-down-blue-1-6-6-1"
+         style="fill:#4893df;fill-opacity:1;stroke:#4893df;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
+         d="m 10.144557,49.067178 c 3.493927,0 0,0 3.493927,0 l -1.746963,1.746944 z"
+         sodipodi:nodetypes="cccc"
+         inkscape:label="Arrow-down-black"><desc
+           id="desc12-4-5-9-9-2">Arrow-down</desc><title
+           id="title12-5-3-6-3-6">Arrow-down</title></path></g><g
+       id="Arrow-leftDown-blue"
+       transform="rotate(-90,87.791853,16.521056)"
+       inkscape:label="Arrow-leftDown-blue"><rect
+         style="opacity:1;fill:#2a2a2a;fill-opacity:0;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.139825"
+         id="rect2-3-8-7-8-0-5"
+         width="5.5248413"
+         height="5.2053728"
+         x="9.0859737"
+         y="41.865116" /><path
+         id="Arrow-leftDown-blue2-03"
+         style="fill:#4893df;fill-opacity:1;stroke:#4893df;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
+         d="m 12.915026,43.063857 c -2.470564,2.470583 0,0 -2.470564,2.470583 v -2.470583 z"
+         sodipodi:nodetypes="cccc"
+         inkscape:label="" /></g><g
+       id="Arrow-rightDown-blue"
+       transform="rotate(180,63.793496,73.157368)"
+       inkscape:label="Arrow-rightDown-blue"><rect
+         style="opacity:1;fill:#2a2a2a;fill-opacity:0;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.139825"
+         id="rect2-3-8-7-8-3-7-8"
+         width="5.5248413"
+         height="5.2053728"
+         x="9.0859737"
+         y="41.865116" /><path
+         id="Arrow-leftDown-blue2-0-5"
+         style="fill:#4893df;fill-opacity:1;stroke:#4893df;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
+         d="m 12.915026,43.063857 c -2.470564,2.470583 0,0 -2.470564,2.470583 v -2.470583 z"
+         sodipodi:nodetypes="cccc"
+         inkscape:label="" /></g></g></svg>
diff --git a/src/Gui/Stylesheets/images_classic/indeterminate-mark-black.png b/src/Gui/Stylesheets/images_classic/indeterminate-mark-black.png
new file mode 100644
index 0000000000..3937fae6f1
Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/indeterminate-mark-black.png differ
diff --git a/src/Gui/Stylesheets/images_classic/indeterminate-mark-blue.png b/src/Gui/Stylesheets/images_classic/indeterminate-mark-blue.png
new file mode 100644
index 0000000000..842d67225e
Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/indeterminate-mark-blue.png differ
diff --git a/src/Gui/Stylesheets/images_classic/indeterminate-mark-darkgray.png b/src/Gui/Stylesheets/images_classic/indeterminate-mark-darkgray.png
new file mode 100644
index 0000000000..6886315e97
Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/indeterminate-mark-darkgray.png differ
diff --git a/src/Gui/Stylesheets/images_classic/indeterminate-mark-lightgray.png b/src/Gui/Stylesheets/images_classic/indeterminate-mark-lightgray.png
new file mode 100644
index 0000000000..84cb248f69
Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/indeterminate-mark-lightgray.png differ
diff --git a/src/Gui/Stylesheets/images_classic/indeterminate-mark-white.png b/src/Gui/Stylesheets/images_classic/indeterminate-mark-white.png
new file mode 100644
index 0000000000..12a4ef3222
Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/indeterminate-mark-white.png differ
diff --git a/src/Gui/Stylesheets/overlay/Dark Theme + Dark Background.qss b/src/Gui/Stylesheets/overlay/Dark Theme + Dark Background.qss
index a3b9159119..341869e61c 100644
--- a/src/Gui/Stylesheets/overlay/Dark Theme + Dark Background.qss	
+++ b/src/Gui/Stylesheets/overlay/Dark Theme + Dark Background.qss	
@@ -8,14 +8,13 @@ QFrame {
 
  QAbstractItemView {
    alternate-background-color: rgba(0, 0, 0, 0.119);
-   color: White;
-   border: transparent;
-   padding-right: 5px;
+   color: #ffffff;
+   border: 1px solid #252525;
  }
 
  Gui--OverlayTitleBar,
  Gui--OverlaySplitterHandle {
-   background-color: transparent;
+   background-color: #252525;
  }
 
  Gui--OverlayTabWidget[transparent="false"] QTreeView::item {
@@ -28,17 +27,17 @@ Gui--OverlayTabWidget[transparent="true"] QTreeView::item {
 
  Gui--OverlayTabWidget[transparent="true"] QTreeView::item:selected {
   color: #ffffff;
-  background-color: #181d2a;
+  background-color: #234497;
 }
 
 Gui--OverlayTabWidget[transparent="true"] QTreeView::item:focus {
   color: #ffffff;
-  background-color: #181d2a;
+  background-color: #234497;
 }
 
  Gui--OverlayTabWidget[transparent="true"] QTreeView::item:selected:focus {
   color: #ffffff;
-  background-color: #181d2a;
+  background-color: #234497;
 }
 
  /* The OverlayTabWidget is named as OverlayLeft, OverlayRight, OverlayTop, OverlayBottom.
@@ -67,7 +66,7 @@ Gui--OverlayTabWidget[transparent="true"] QTreeView::item:focus {
    qproperty-enableEffect: 1;
  }
 
- Gui--PropertyEditor--PropertyEditor {
+Gui--PropertyEditor--PropertyEditor {
   qproperty-itemBackground: #333333;
 }
 
@@ -79,7 +78,7 @@ Gui--OverlayTabWidget[transparent="true"] QTreeView::item:focus {
  QSint--ActionGroup QFrame[class="content"] {
    border-bottom-left-radius: 5px;
    border-bottom-right-radius: 5px;
-   }
+ }
 
  Gui--OverlayTabWidget::tab-bar:top,
  Gui--OverlayTabWidget::tab-bar:bottom {
@@ -98,68 +97,62 @@ Gui--OverlayTabWidget[transparent="true"] QTreeView::item:focus {
  }
 
  Gui--OverlayToolButton {
-  border: 0.5px solid transparent;
+  border: 1px solid transparent;
   border-radius: 2px;
 }
 
 Gui--OverlayToolButton:hover {
-  border: 0.5px solid #f5f5f5;
+  border: 1px solid #000000;
+  background: #000000;
   border-radius: 2px;
 }
 
 Gui--OverlayToolButton:focus {
-  border: 0.5px solid #0099ff;
+  border: 1px solid #0099ff;
   border-radius: 2px;
 }
 
 Gui--OverlayToolButton::pressed,
 Gui--OverlayToolButton:checked {
-  border: 0.5px solid #696969;
+  border: 1px solid #696969;
   border-radius: 2px;
   background-color: #696969;
 }
 
 Gui--OverlayToolButton:checked:hover {
-  border: 0.5px solid #f5f5f5;
+  border: 1px solid #000000;
+  background: #000000;
 }
 
- Gui--OverlayToolButton[objectName="OBTN Transparent"] {
-  image: url(qss:overlay/icons/mode_lighter.svg);
+Gui--OverlayToolButton{
+  image: url(qss:images_classic/close-lightgray.png) ;
+}
 
- }
+Gui--OverlayToolButton:hover {
+  image: url(qss:images_classic/close-red.png) ;
+}
 
- Gui--OverlayToolButton[objectName="OBTN Transparent"]:hover {
-  image: url(qss:overlay/icons/mode_lighter.svg);
+Gui--OverlayToolButton[objectName="OBTN Transparent"] {
+  image: url(qss:images_classic/transparent-lightgray.png) ;
+  }
 
- }
+Gui--OverlayToolButton[objectName="OBTN Transparent"]:hover {
+  image: url(qss:images_classic/transparent-white.png) ;
+}
 
- Gui--OverlayToolButton[objectName="OBTN Overlay"]  {
-  image: url(qss:overlay/icons/mode_lighter.svg);
+Gui--OverlayToolButton[objectName="OBTN Overlay"] {
+  image: url(qss:images_classic/overlay-lightgray.png) ;
+}
 
- }
+Gui--OverlayToolButton[objectName="OBTN Overlay"]:hover {
+  image: url(qss:images_classic/overlay-white.png) ;
+}
 
- Gui--OverlayToolButton[objectName="OBTN Overlay"]:hover {
-  image: url(qss:overlay/icons/mode_lighter.svg);
+Gui--OverlayToolButton[objectName="OBTN AutoMode"] {
+  image: url(qss:images_classic/mode-lightgray.png) ;
+}
 
- }
+Gui--OverlayToolButton[objectName="OBTN AutoMode"]:hover {
+  image: url(qss:images_classic/mode-white.png) ;
+}
 
- Gui--OverlayToolButton[objectName="OBTN AutoMode"]  {
-  image: url(qss:overlay/icons/mode_lighter.svg);
-
- }
-
- Gui--OverlayToolButton[objectName="OBTN AutoMode"]:hover {
-  image: url(qss:overlay/icons/mode_lighter.svg);
-
- }
-
- Gui--OverlaySplitterHandle Gui--OverlayToolButton,
- Gui--OverlayToolButton[objectName="OBTN Float"]  {
-  image: url(qss:overlay/icons/mode_lighter.svg);
-
- }
-
- Gui--OverlaySplitterHandle Gui--OverlayToolButton:hover,
- Gui--OverlayToolButton[objectName="OBTN Float"]:hover {
-   image: url(qss:overlay/icons/mode_lighter.svg);
- }
\ No newline at end of file
diff --git a/src/Gui/Stylesheets/overlay/Dark Theme + Light Background.qss b/src/Gui/Stylesheets/overlay/Dark Theme + Light Background.qss
index df24149e16..662f2f9fbe 100644
--- a/src/Gui/Stylesheets/overlay/Dark Theme + Light Background.qss	
+++ b/src/Gui/Stylesheets/overlay/Dark Theme + Light Background.qss	
@@ -8,9 +8,8 @@ QFrame {
 
  QAbstractItemView {
    alternate-background-color: rgba(0, 0, 0, 0.273);
-   color: White;
-   border: transparent;
-   padding-right: 5px;
+   color: #ffffff;
+   border: 1px solid #696968;
  }
 
  Gui--OverlayTitleBar,
@@ -91,7 +90,7 @@ Gui--PropertyEditor--PropertyEditor {
  QSint--ActionGroup QFrame[class="content"] {
    border-bottom-left-radius: 5px;
    border-bottom-right-radius: 5px;
-   }
+ }
 
  Gui--OverlayTabWidget::tab-bar:top,
  Gui--OverlayTabWidget::tab-bar:bottom {
@@ -110,32 +109,42 @@ Gui--PropertyEditor--PropertyEditor {
  }
 
  Gui--OverlayToolButton {
-  border: 0.5px solid transparent;
+  border: 1px solid transparent;
   border-radius: 2px;
 }
 
 Gui--OverlayToolButton:hover {
-  border: 0.5px solid #f5f5f5;
+  border: 1px solid #000000;
+  background: #000000;
   border-radius: 2px;
 }
 
 Gui--OverlayToolButton:focus {
-  border: 0.5px solid #0099ff;
+  border: 1px solid #0099ff;
   border-radius: 2px;
 }
 
 Gui--OverlayToolButton::pressed,
 Gui--OverlayToolButton:checked {
-  border: 0.5px solid #696969;
+  border: 1px solid #696969;
   border-radius: 2px;
   background-color: #696969;
 }
 
 Gui--OverlayToolButton:checked:hover {
-  border: 0.5px solid #696969;
+  border: 1px solid #000000;
+  background: #000000;
 }
 
- Gui--OverlayToolButton[objectName="OBTN Transparent"]:!hover {
+Gui--OverlayToolButton{
+  image: url(qss:images_classic/close-lightgray.png) ;
+}
+
+Gui--OverlayToolButton:hover {
+  image: url(qss:images_classic/close-red.png) ;
+}
+
+ Gui--OverlayToolButton[objectName="OBTN Transparent"] {
    image: url(qss:images_classic/transparent-lightgray.png);
  }
 
@@ -143,7 +152,7 @@ Gui--OverlayToolButton:checked:hover {
    image: url(qss:images_classic/transparent-white.png);
  }
 
- Gui--OverlayToolButton[objectName="OBTN Overlay"]:!hover {
+ Gui--OverlayToolButton[objectName="OBTN Overlay"] {
     image: url(qss:images_classic/overlay-lightgray.png);
  }
 
@@ -151,7 +160,7 @@ Gui--OverlayToolButton:checked:hover {
    image: url(qss:images_classic/overlay-white.png);
  }
 
- Gui--OverlayToolButton[objectName="OBTN AutoMode"]:!hover {
+ Gui--OverlayToolButton[objectName="OBTN AutoMode"] {
   image: url(qss:images_classic/mode-lightgray.png);
 }
 
@@ -160,7 +169,7 @@ Gui--OverlayToolButton:checked:hover {
  }
 
  Gui--OverlaySplitterHandle Gui--OverlayToolButton,
- Gui--OverlayToolButton[objectName="OBTN Float"]:!hover {
+ Gui--OverlayToolButton[objectName="OBTN Float"] {
    image: url(qss:images_classic/float-lightgray.png);
  }
 
@@ -170,29 +179,21 @@ Gui--OverlayToolButton:checked:hover {
  }
 
  QTreeView::branch:open:has-children:has-siblings  {
-  margin-left: 6px;
-  margin-right: 6px;
   border-image: none;
   image: url(qss:images_classic/Arrow-down-black.png);
 }
 
  QTreeView::branch:open:has-children:!has-siblings  {
-  margin-left: 6px;
-  margin-right: 6px;
   border-image: none;
   image: url(qss:images_classic/Arrow-down-black.png);
 }
 
 QTreeView::branch:closed:has-children:has-siblings  {
-  margin-top: 5px;
-  margin-bottom: 5px;
   border-image: none;
-  image: url(qss:images_classic/Arrow-right-black.png) 0;
+  image: url(qss:images_classic/Arrow-right-black.png);
 }
 
 QTreeView::branch:has-children:!has-siblings:closed  {
-  margin-top: 5px;
-  margin-bottom: 5px;
   border-image: none;
-  image: url(qss:images_classic/Arrow-right-black.png) 0;
+  image: url(qss:images_classic/Arrow-right-black.png);
 }
diff --git a/src/Gui/Stylesheets/overlay/Light Theme + Dark Background.qss b/src/Gui/Stylesheets/overlay/Light Theme + Dark Background.qss
index 51456bcc58..2343154ccc 100644
--- a/src/Gui/Stylesheets/overlay/Light Theme + Dark Background.qss	
+++ b/src/Gui/Stylesheets/overlay/Light Theme + Dark Background.qss	
@@ -6,12 +6,10 @@ QTabWidget::pane{
   background-color: transparent;
   border: transparent;
 }
-
 QAbstractItemView {
-  alternate-background-color: rgba(255, 255, 255, 0.13);
+  alternate-background-color: #f0f0f0;
   color: #000000;
-  border: transparent;
-  padding-right: 5px;
+  border: 1px solid #ababab;
 }
 
 Gui--OverlayTitleBar,
@@ -39,7 +37,14 @@ QTreeView:disabled  {
 }
 
 Gui--PropertyEditor--PropertyEditor {
-  qproperty-itemBackground: #333333;
+  qproperty-itemBackground: #ffffff;
+}
+
+Gui--OverlayTabWidget[transparent="false"] * {
+  color: #000000;
+}
+Gui--OverlayTabWidget[transparent="true"] * {
+  color: #000000;
 }
 
 Gui--OverlayTabWidget[transparent="false"] QTreeView::item {
@@ -137,7 +142,8 @@ Gui--OverlayToolButton {
 }
 
 Gui--OverlayToolButton:hover {
-  border: 0.5px solid #000000;
+  border: 0.5px solid #ffffff;
+  background-color: #ffffff;
   border-radius: 2px;
 }
 
@@ -150,14 +156,15 @@ Gui--OverlayToolButton::pressed,
 Gui--OverlayToolButton:checked {
   border: 0.5px solid #ababab;
   border-radius: 2px;
-  background-color: #ffffff;
+  background-color: #ababab;
 }
 
 Gui--OverlayToolButton:checked:hover {
-  border: 0.5px solid #000000;
+  border: 0.5px solid #ffffff;
+  background-color: #ffffff;
 }
 
-Gui--OverlayToolButton:!hover{
+Gui--OverlayToolButton{
   image: url(qss:images_classic/close-lightgray.png);
 }
 
@@ -165,14 +172,15 @@ Gui--OverlayToolButton:hover {
   image: url(qss:images_classic/close-red.png);
 }
 
-Gui--OverlayToolButton[objectName="OBTN Transparent"]:!hover {
-  image: url(qss:images_classic/transparent-lightgray.png);}
+Gui--OverlayToolButton[objectName="OBTN Transparent"] {
+  image: url(qss:images_classic/transparent-lightgray.png);
+  }
 
 Gui--OverlayToolButton[objectName="OBTN Transparent"]:hover {
   image: url(qss:images_classic/transparent-black.png);
 }
 
-Gui--OverlayToolButton[objectName="OBTN Overlay"]:!hover {
+Gui--OverlayToolButton[objectName="OBTN Overlay"] {
   image: url(qss:images_classic/overlay-lightgray.png);
 }
 
@@ -180,7 +188,7 @@ Gui--OverlayToolButton[objectName="OBTN Overlay"]:hover {
   image: url(qss:images_classic/overlay-black.png);
 }
 
-Gui--OverlayToolButton[objectName="OBTN AutoMode"]:!hover {
+Gui--OverlayToolButton[objectName="OBTN AutoMode"] {
   image: url(qss:images_classic/mode-lightgray.png);
 }
 
@@ -189,30 +197,21 @@ Gui--OverlayToolButton[objectName="OBTN AutoMode"]:hover {
 }
 
  QTreeView::branch:open:has-children:has-siblings  {
-  margin-left: 6px;
-  margin-right: 6px;
   border-image: none;
-  image: url(qss:images_classic/Arrow-down-white.png) 0;
+  image: url(qss:images_classic/Arrow-down-white.png);
 }
 
  QTreeView::branch:open:has-children:!has-siblings  {
-  margin-left: 6px;
-  margin-right: 6px;
   border-image: none;
-  image: url(qss:images_classic/Arrow-down-white.png) 0;
+  image: url(qss:images_classic/Arrow-down-white.png);
 }
 
-
 QTreeView::branch:closed:has-children:has-siblings  {
-  margin-top: 5px;
-  margin-bottom: 5px;
   border-image: none;
-  image: url(qss:images_classic/Arrow-right-white.png) 0;
+  image: url(qss:images_classic/Arrow-right-white.png);
 }
 
 QTreeView::branch:has-children:!has-siblings:closed  {
-  margin-top: 5px;
-  margin-bottom: 5px;
   border-image: none;
-  image: url(qss:images_classic/Arrow-right-white.png) 0;
+  image: url(qss:images_classic/Arrow-right-white.png);
 }
diff --git a/src/Gui/Stylesheets/overlay/Light Theme + Light Background.qss b/src/Gui/Stylesheets/overlay/Light Theme + Light Background.qss
index a1a08f96b1..ef462c843a 100644
--- a/src/Gui/Stylesheets/overlay/Light Theme + Light Background.qss	
+++ b/src/Gui/Stylesheets/overlay/Light Theme + Light Background.qss	
@@ -9,13 +9,12 @@ QTabWidget::pane{
 QAbstractItemView {
   alternate-background-color: #f0f0f0;
   color: #000000;
-  border: transparent;
-  padding-right: 5px;
+  border: 1px solid #ababab;
 }
 
 Gui--PropertyEditor--PropertyEditor {
   qproperty-itemBackground: #ffffff;
-}
+  }
 
 Gui--OverlayTitleBar,
 Gui--OverlaySplitterHandle {
@@ -99,32 +98,35 @@ Gui--OverlayProxyWidget {
 }
 
 Gui--OverlayToolButton {
-  border: 0.5px solid transparent;
+  border: 1px solid transparent;
   border-radius: 2px;
 }
 
 Gui--OverlayToolButton:hover {
-  border: 0.5px solid #000000;
+  border: 1px solid white;
+  background-color: #ffffff;
   border-radius: 2px;
 }
 
 Gui--OverlayToolButton:focus {
-  border: 0.5px solid #0099ff;
+  border: 1px solid #0099ff;
   border-radius: 2px;
 }
 
 Gui--OverlayToolButton::pressed,
 Gui--OverlayToolButton:checked {
-  border: 0.5px solid #ababab;
+  border: 1px solid #ababab;
   border-radius: 2px;
-  background-color: #ffffff;
+  background-color: #ababab;
 }
 
 Gui--OverlayToolButton:checked:hover {
-  border: 0.5px solid #000000;
+  border: 1px solid #ffffff;
+  background-color: #ffffff;
 }
 
-Gui--OverlayToolButton:!hover{
+
+Gui--OverlayToolButton{
   image: url(qss:images_classic/close-lightgray.png);
 }
 
@@ -132,14 +134,15 @@ Gui--OverlayToolButton:hover {
   image: url(qss:images_classic/close-red.png);
 }
 
-Gui--OverlayToolButton[objectName="OBTN Transparent"]:!hover {
-  image: url(qss:images_classic/transparent-lightgray.png);}
+Gui--OverlayToolButton[objectName="OBTN Transparent"] {
+  image: url(qss:images_classic/transparent-lightgray.png);
+  }
 
 Gui--OverlayToolButton[objectName="OBTN Transparent"]:hover {
   image: url(qss:images_classic/transparent-black.png);
 }
 
-Gui--OverlayToolButton[objectName="OBTN Overlay"]:!hover {
+Gui--OverlayToolButton[objectName="OBTN Overlay"] {
   image: url(qss:images_classic/overlay-lightgray.png);
 }
 
@@ -147,7 +150,7 @@ Gui--OverlayToolButton[objectName="OBTN Overlay"]:hover {
   image: url(qss:images_classic/overlay-black.png);
 }
 
-Gui--OverlayToolButton[objectName="OBTN AutoMode"]:!hover {
+Gui--OverlayToolButton[objectName="OBTN AutoMode"] {
   image: url(qss:images_classic/mode-lightgray.png);
 }