diff --git a/src/Gui/Dialogs/DlgMacroExecuteImp.cpp b/src/Gui/Dialogs/DlgMacroExecuteImp.cpp
index 2b8401b61a..98b4622986 100644
--- a/src/Gui/Dialogs/DlgMacroExecuteImp.cpp
+++ b/src/Gui/Dialogs/DlgMacroExecuteImp.cpp
@@ -569,6 +569,7 @@ void DlgMacroExecuteImp::onToolbarButtonClicked()
         QAbstractButton* doNotShowAgainButton =
             msgBox.addButton(tr("Do not show again"), QMessageBox::YesRole);
         msgBox.setText(tr("Guided Walkthrough"));
+        msgBox.setObjectName(QString::fromLatin1("macroGuideWalkthrough"));
         msgBox.setInformativeText(tr("This will guide you in setting up this macro in a custom \
 global toolbar.  Instructions will be in red text inside the dialog.\n\
 \n\
diff --git a/src/Gui/PreferencePacks/FreeCAD Light/FreeCAD Light.cfg b/src/Gui/PreferencePacks/FreeCAD Light/FreeCAD Light.cfg
index 0f3e06a6ea..8f46f8a66b 100644
--- a/src/Gui/PreferencePacks/FreeCAD Light/FreeCAD Light.cfg	
+++ b/src/Gui/PreferencePacks/FreeCAD Light/FreeCAD Light.cfg	
@@ -130,7 +130,7 @@
           <FCBool Name="Simple" Value="1"/>
           <FCBool Name="UseBackgroundColorMid" Value="0"/>
           <FCUInt Name="AnnotationTextColor" Value="876232959"/>
-          <FCUInt Name="BackgroundColor" Value="4294967295"/>
+          <FCUInt Name="BackgroundColor" Value="4177066239"/>
           <FCUInt Name="BackgroundColor2" Value="3671783167"/>
           <FCUInt Name="BackgroundColor3" Value="791639295"/>
           <FCUInt Name="BackgroundColor4" Value="3470056191"/>
diff --git a/src/Gui/Stylesheets/FreeCAD Dark.qss b/src/Gui/Stylesheets/FreeCAD Dark.qss
index 282bd523e3..2e17bbb2ea 100644
--- a/src/Gui/Stylesheets/FreeCAD Dark.qss	
+++ b/src/Gui/Stylesheets/FreeCAD Dark.qss	
@@ -416,7 +416,7 @@ QRadioButton::indicator {
   border-image: none;
   width: 14px;
   height: 14px;
-  image:url(qss:images_classic/Radio-unchecked-white.png);
+  image:url(qss:images_classic/radio-unchecked-white.png);
 }
 
 QRadioButton::indicator:unchecked {
@@ -430,14 +430,14 @@ QRadioButton::indicator:unchecked:disabled {
   border-image: none;
   width: 14px;
   height: 14px;
-  image:url(qss:images_classic/Radio-unchecked-lightgray.png);
+  image:url(qss:images_classic/radio-unchecked-lightgray.png);
 }
 
 QRadioButton::indicator:checked {
   border-image: none;
   width: 14px;
   height: 14px;
-  image:url(qss:images_classic/Radio-checked-white.png);
+  image:url(qss:images_classic/radio-checked-white.png);
 }
 
 QRadioButton::indicator:checked:hover, QRadioButton::indicator:checked:pressed {
@@ -448,7 +448,7 @@ QRadioButton::indicator:checked:disabled {
   border-image: none;
   width: 14px;
   height: 14px;
-  image:url(qss:images_classic/Radio-checked-lightgray.png);
+  image:url(qss:images_classic/radio-checked-lightgray.png);
 }
 
 /* QMenuBar ---------------------------------------------------------------
@@ -462,6 +462,11 @@ QMenuBar {
   selection-background-color: @ThemeAccentColor1;
 }
 
+QMenuBar:disabled,
+QMenuBar::item:disabled{
+    color: #adadad;
+}
+
 QMenuBar:focus {
   border: 1px solid @ThemeAccentColor2;
 }
@@ -512,6 +517,10 @@ QMenu::item {
   border: 0px transparent #020202;
 }
 
+QMenu::item:disabled {
+    color: #adadad;
+}
+
 QMenu::item:selected {
   color: white;
   background-color: @ThemeAccentColor1;
@@ -545,7 +554,7 @@ QMenu::icon:checked { /* appearance of a 'checked' icon */
   border-radius: 0px;
 }
 QMenu::indicator:non-exclusive:unchecked {
-  image: url(qss:images_classic/checkbox-Empty-white.png);
+  image: url(qss:images_classic/checkbox-empty-white.png);
 }
 
 QMenu::indicator:non-exclusive:unchecked:hover, QMenu::indicator:non-exclusive:unchecked:focus, QMenu::indicator:non-exclusive:unchecked:pressed {
@@ -554,7 +563,7 @@ QMenu::indicator:non-exclusive:unchecked:hover, QMenu::indicator:non-exclusive:u
 }
 
 QMenu::indicator:non-exclusive:unchecked:disabled {
-  image: url(qss:images_classic/checkbox-Empty-lightgray.png);
+  image: url(qss:images_classic/checkbox-empty-lightgray.png);
 }
 
 QMenu::indicator:non-exclusive:checked {
@@ -590,35 +599,35 @@ QMenu::indicator:exclusive:unchecked:hover, QMenu::indicator:exclusive:unchecked
   border: none;
   outline: none;
   background-color: @ThemeAccentColor1;
-  image: url(qss:images_classic/checkbox-Empty-white.png);
+  image: url(qss:images_classic/checkbox-empty-white.png);
 }
 
 QMenu::indicator:exclusive:unchecked:disabled {
-  image: url(qss:images_classic/checkbox-Empty-white.png);
+  image: url(qss:images_classic/checkbox-empty-white.png);
 }
 
 QMenu::indicator:exclusive:checked {
   border: none;
   outline: none;
-  image: url(qss:images_classic/Radio-checked-white.png);
+  image: url(qss:images_classic/radio-checked-white.png);
 }
 
 QMenu::indicator:exclusive:checked:hover, QMenu::indicator:exclusive:checked:focus, QMenu::indicator:exclusive:checked:pressed {
   border: none;
   outline: none;
   background-color: @ThemeAccentColor1;
-  image: url(qss:images_classic/checkbox-Empty-white.png);
+  image: url(qss:images_classic/checkbox-empty-white.png);
 }
 
 QMenu::indicator:exclusive:checked:disabled {
   outline: none;
-  image: url(qss:images_classic/Radio-checked-white.png);
+  image: url(qss:images_classic/radio-checked-white.png);
 }
 
 QMenu::right-arrow {
   margin: 5px;
   padding-left: 12px;
-  image:url(qss:images_classic/Arrow-right-white.png);
+  image:url(qss:images_classic/arrow-right-white.png);
   height: 8px;
   width: 8px;
   background-color: transparent;
@@ -730,7 +739,7 @@ QScrollBar::handle:vertical:focus {
 
 QScrollBar::add-line:horizontal {
   margin: 6px 6px;
-  image: url(qss:images_classic/Arrow-right-lightgray.png);
+  image: url(qss:images_classic/arrow-right-lightgray.png);
   height: 8px;
   width: 4px;
   subcontrol-position: right;
@@ -738,7 +747,7 @@ QScrollBar::add-line:horizontal {
 }
 
 QScrollBar::add-line:horizontal:hover, QScrollBar::add-line:horizontal:on {
-  image: url(qss:images_classic/Arrow-right-white.png);
+  image: url(qss:images_classic/arrow-right-white.png);
   height: 8px;
   width: 4px;
   subcontrol-position: right;
@@ -747,7 +756,7 @@ QScrollBar::add-line:horizontal:hover, QScrollBar::add-line:horizontal:on {
 
 QScrollBar::add-line:vertical {
   margin: 6px 6px;
-  image: url(qss:images_classic/Arrow-down-lightgray.png);
+  image: url(qss:images_classic/arrow-down-lightgray.png);
   height: 4px;
   width: 8px;
   subcontrol-position: bottom;
@@ -755,7 +764,7 @@ QScrollBar::add-line:vertical {
 }
 
 QScrollBar::add-line:vertical:hover, QScrollBar::add-line:vertical:on {
-  image: url(qss:images_classic/Arrow-down-white.png);
+  image: url(qss:images_classic/arrow-down-white.png);
   height: 4px;
   width: 8px;
   subcontrol-position: bottom;
@@ -764,7 +773,7 @@ QScrollBar::add-line:vertical:hover, QScrollBar::add-line:vertical:on {
 
 QScrollBar::sub-line:horizontal {
   margin: 6px 6px;
-  image: url(qss:images_classic/Arrow-left-lightgray.png);
+  image: url(qss:images_classic/arrow-left-lightgray.png);
   height: 8px;
   width: 4px;
   subcontrol-position: left;
@@ -772,7 +781,7 @@ QScrollBar::sub-line:horizontal {
 }
 
 QScrollBar::sub-line:horizontal:hover, QScrollBar::sub-line:horizontal:on {
-  image: url(qss:images_classic/Arrow-left-white.png);
+  image: url(qss:images_classic/arrow-left-white.png);
   height: 8px;
   width: 4px;
   subcontrol-position: left;
@@ -781,7 +790,7 @@ QScrollBar::sub-line:horizontal:hover, QScrollBar::sub-line:horizontal:on {
 
 QScrollBar::sub-line:vertical {
   margin: 6px 6px;
-  image: url(qss:images_classic/Arrow-up-lightgray.png);
+  image: url(qss:images_classic/arrow-up-lightgray.png);
   height: 4px;
   width: 8px;
   subcontrol-position: top;
@@ -789,7 +798,7 @@ QScrollBar::sub-line:vertical {
 }
 
 QScrollBar::sub-line:vertical:hover, QScrollBar::sub-line:vertical:on {
-  image: url(qss:images_classic/Arrow-up-white.png);
+  image: url(qss:images_classic/arrow-up-white.png);
   height: 4px;
   width: 8px;
   subcontrol-position: top;
@@ -880,7 +889,7 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtoolbar
 
 --------------------------------------------------------------------------- */
 QToolBar {
-  background-color: #333333;
+    background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #151515, stop:0.03 #333333,stop:0.97 #303030, stop:1 #151515);
   /* border: 1px solid #020202; */
   /* font-weight: bold; */
 }
@@ -892,16 +901,22 @@ QToolBar:only-one {
 }
 
 QToolBar:horizontal {
-  border-bottom: 1px solid #020202;
   padding-top: 3px;
-  padding-left: 4px;
+  padding-left: 3px;
+  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #151515, stop:0.03 #333333,stop:0.97 #303030, stop:1 #151515);
+}
+
+/* fix background color for toolbars that are the on menubar. */
+QToolBar:only-one {
+  background-color: transparent;
+  border:0px;
+  /* margin-top: -3px; */
 }
 
 QToolBar:vertical {
-  border-left: 1px solid #020202;
-  border-right: 1px solid #020202;
-  padding-top: 4px;
+  padding-top: 3px;
   padding-left: 3px;
+  background-color: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 #151515, stop:0.02 #333333,stop:0.98 #303030, stop:1 #151515);
 }
 
 QToolBar:disabled {
@@ -909,34 +924,63 @@ QToolBar:disabled {
 
 QToolBar::handle:horizontal {
   width: 8px;
-  image: url(qss:images_classic/Hmovetoolbar-lightgray.png);
+  image: url(qss:images_classic/hmovetoolbar-lightgray.png);
 }
 
 QToolBar::handle:vertical {
   height: 8px;
-  image: url(qss:images_classic/Vmovetoolbar-lightgray.png);
+  image: url(qss:images_classic/vmovetoolbar-lightgray.png);
 }
 
 QToolBar::handle:horizontal:hover {
   width: 8px;
-  image: url(qss:images_classic/Hmovetoolbar-white.png);
+  image: url(qss:images_classic/hmovetoolbar-white.png);
 }
 
 QToolBar::handle:vertical:hover {
   height: 8px;
-  image: url(qss:images_classic/Vmovetoolbar-white.png);
+  image: url(qss:images_classic/vmovetoolbar-white.png);
 }
 
 QToolBar::separator:horizontal {
   width: 2px;
   padding: 0px 3px;
-  image: url(qss:images_classic/Hsepartoolbar-Darkgray.png);
+  image: url(qss:images_classic/hsepartoolbar-darkgray.png);
 }
 
 QToolBar::separator:vertical {
   height: 2px;
   padding: 3px 0px;
-  image: url(qss:images_classic/Vsepartoolbar-Darkgray.png);
+  image: url(qss:images_classic/vsepartoolbar-darkgray.png);
+}
+
+/* undo button */
+
+QToolBar[objectName="Edit"] > QToolButton::menu-arrow {
+  background-image: url(qss:images_classic/arrow-down-lightgray.png);
+  background-position: center center;
+  background-repeat: none;
+  subcontrol-origin: padding;
+  subcontrol-position: bottom right;
+  height: 6px;
+}
+
+QToolBar[objectName="Edit"] > QToolButton::menu-arrow:hover {
+  background-image: url(qss:images_classic/arrow-down-white.png);
+  background-position: center center;
+  background-repeat: none;
+  subcontrol-origin: padding;
+  subcontrol-position: bottom right;
+  height: 6px;
+}
+
+QToolBar[objectName="Edit"] > QToolButton::menu-arrow:open {
+  background-image: url(qss:images_classic/arrow-down-white.png);
+  background-position: center center;
+  background-repeat: none;
+  subcontrol-origin: padding;
+  subcontrol-position: bottom right;
+  height: 6px;
 }
 
 /*The "show more" button  (it can also be stylable with "QToolBarExtension"  icon is not working Qproperty works but breaks when you move the toolbar see also */
@@ -971,7 +1015,7 @@ QSpinBox {
 }
 
 QAbstractSpinBox:up-button {
-  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #333333, stop:1 #252525);
+  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #444444, stop:1 #333333);
   subcontrol-origin: border;
   subcontrol-position: top right;
   border-top: 1px solid transparent;
@@ -983,20 +1027,24 @@ QAbstractSpinBox:up-button {
   margin-bottom:-1px;
 }
 
+QAbstractSpinBox:up-button:disabled {
+  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #333333, stop:1 #444444);
+}
+
 QAbstractSpinBox::up-arrow, QAbstractSpinBox::up-arrow:disabled, QAbstractSpinBox::up-arrow:off {
-  image: url(qss:images_classic/Arrow-up-lightgray.png);
+  image: url(qss:images_classic/arrow-up-lightgray.png);
   height: 8px;
   width: 8px;
 }
 
 QAbstractSpinBox::up-arrow:hover {
-  image: url(qss:images_classic/Arrow-up-white.png);
+  image: url(qss:images_classic/arrow-up-white.png);
   height: 8px;
   width: 8px;
 }
 
 QAbstractSpinBox:down-button {
-  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #252525, stop:1 #333333);
+  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #444444, stop:1 #333333);
   subcontrol-origin: border;
   subcontrol-position: bottom right;
   border-bottom: 1px solid transparent;
@@ -1008,18 +1056,26 @@ QAbstractSpinBox:down-button {
   margin-top:-1px;
 }
 
+QAbstractSpinBox:down-button:disabled {
+  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #333333, stop:1 #444444);
+}
+
 QAbstractSpinBox::down-arrow, QAbstractSpinBox::down-arrow:disabled, QAbstractSpinBox::down-arrow:off {
-  image: url(qss:images_classic/Arrow-down-lightgray.png);
+  image: url(qss:images_classic/arrow-down-lightgray.png);
   height: 8px;
   width: 8px;
 }
 
 QAbstractSpinBox::down-arrow:hover {
-  image: url(qss:images_classic/Arrow-down-white.png);
+  image: url(qss:images_classic/arrow-down-white.png);
   height: 8px;
   width: 8px;
 }
 
+QAbstractSpinBox:disabled {
+  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #333333, stop:1 #444444);
+}
+
 QAbstractSpinBox:hover {
 }
 
@@ -1171,7 +1227,7 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qpushbutton
 
 --------------------------------------------------------------------------- */
 QPushButton {
-  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #333333, stop:1 #252525);
+  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #444444, stop:1 #333333);
   color: white;
   border: 1px solid #020202;
   /* border-bottom-color: #1e1e1e; simulates shadow under the button */
@@ -1186,7 +1242,7 @@ QPushButton {
 }
 
 QPushButton:disabled {
-  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #333333, stop:1 #444444);
+  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #333333, stop:1 #333333);
   color: #adadad;
   border: 1px solid #020202;
 }
@@ -1212,7 +1268,7 @@ QPushButton:checked:selected {
 }
 
 QPushButton: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 #444444, stop:1 #404040);
   color: white;
 }
 
@@ -1236,6 +1292,9 @@ QDialogButtonBox QPushButton {
   min-width: 80px;
 }
 
+QMessageBox[objectName="macroGuideWalkthrough"] QDialogButtonBox QPushButton {
+  min-width: 20px;
+}
 /* QToolButton ------------------------------------------------------------
 
 https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtoolbutton
@@ -1272,7 +1331,7 @@ QToolButton:checked:disabled {
 }
 
 QToolButton:checked:hover {
-  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #333333, stop:0.7 #444444, stop:1 #444444);
+  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #333333, stop:0.7 #444444, stop:1 #404040);
   border: 1px solid #020202;
 }
 
@@ -1281,13 +1340,14 @@ QToolButton:checked:pressed {
 }
 
 QToolButton:checked:selected {
-  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #333333, stop:0.7 #444444, stop:1 #444444);
+  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #333333, stop:0.7 #444444, stop:1 #404040);
   border: 1px solid @ThemeAccentColor1;
   }
 
 QToolButton:hover {
   color: white;
   border: 1px solid #020202;
+  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #444444, stop:1 #404040);
 }
 
 QToolButton:pressed {
@@ -1331,18 +1391,18 @@ QToolButton::menu-indicator {
 }
 
 QToolButton::menu-arrow {
-  image: url(qss:images_classic/Arrow-down-lightgray.png);
+  image: url(qss:images_classic/arrow-down-lightgray.png);
   width: 18px;
   height: 18px;
   /* background-color: transparent; */
 }
 QToolButton::menu-arrow:open {
-  image: url(qss:images_classic/Arrow-Down-white.png);
+  image: url(qss:images_classic/arrow-down-white.png);
   width: 18px;
   height: 18px;
 }
 QToolButton::menu-arrow:hover {
-  image: url(qss:images_classic/Arrow-Down-white.png);
+  image: url(qss:images_classic/arrow-down-white.png);
   width: 18px;
   height: 18px;
 }
@@ -1375,7 +1435,7 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qcombobox
 QComboBox {
   border: 1px solid #020202;
   border-radius: 2px;
-  background-color: qlineargradient(x1:0, y1:0.3, x2:0, y2:1, stop:0 #333333, stop:1 #252525);
+  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #444444, stop:1 #333333);
   selection-background-color: @ThemeAccentColor1;
   padding-left: 4px;
   padding-right: 2px;
@@ -1392,9 +1452,10 @@ QComboBox {
 QComboBox:editable {
   background-color: #252525;
 }
+
 QComboBox QAbstractItemView {
-  border: 1px solid #020202;
-  border-radius: 2px;
+  border: 2px solid #020202;
+  /* padding-left: 4px; this fixes the icon padding but adds a 4px padding to all Qcomboboxes.*/
   background-color: #252525;
   selection-background-color: @ThemeAccentColor1;
 }
@@ -1423,7 +1484,7 @@ QComboBox:disabled {
 }
 
 QComboBox:hover {
-  background-color: qlineargradient(x1:0, y1:0.3, x2:0, y2:1, stop:0 #444444, stop:1 #333333);
+  background-color: qlineargradient(x1:0, y0:0, x2:0, y1:1, stop:0 #444444, stop:1 #404040);
   /* border: 1px solid @ThemeAccentColor1; */
 }
 
@@ -1473,7 +1534,7 @@ QComboBox::item:selected {
 
 QComboBox::drop-down {
   subcontrol-origin: padding;
-  /* background-color: qlineargradient(x1:0, y1:0.3, x2:0, y2:1, stop:0 #333333, stop:1 #020202); */
+  /* background-color: qlineargradient(x1:0, y0:0, x2:0, y1:1, stop:0 #333333, stop:1 #020202); */
   subcontrol-position: top right;
   width: 20px;
   border-right: 1px solid transparent;
@@ -1485,16 +1546,15 @@ QComboBox::drop-down:hover {
 }
 
 QComboBox::down-arrow {
-  image: url(qss:images_classic/Arrow-down-lightgray.png);
+  image: url(qss:images_classic/arrow-down-lightgray.png);
   /* height: 10px; */
   width: 8px;
 }
 
 QComboBox::down-arrow:on, QComboBox::down-arrow:hover, QComboBox::down-arrow:focus {
-  image: url(qss:images_classic/Arrow-down-white.png);
+  image: url(qss:images_classic/arrow-down-white.png);
 }
 
-
 /*==================================================================================================
 Tasks panel (custom FreeCAD class)
 ==================================================================================================*/
@@ -1568,25 +1628,25 @@ padding: 0px;
 QSint--ActionGroup QFrame[class="header"] QLabel[fold="false"] {
   width: 30px;
   height: 30px;
-  image: url(qss:images_classic/Qsint_header_unfold_lightgray.png);
+  image: url(qss:images_classic/qsint_header_unfold_lightgray.png);
 }
 
 QSint--ActionGroup QFrame[class="header"] QLabel:hover[fold="false"] {
   width: 30px;
   height: 30px;
-  image: url(qss:images_classic/Qsint_header_unfold_white.png);
+  image: url(qss:images_classic/qsint_header_unfold_white.png);
 }
 
 QSint--ActionGroup QFrame[class="header"] QLabel[fold="true"] {
   width: 30px;
   height: 30px;
-  image: url(qss:images_classic/Qsint_header_fold_lightgray.png);
+  image: url(qss:images_classic/qsint_header_fold_lightgray.png);
 }
 
 QSint--ActionGroup QFrame[class="header"] QLabel[fold="true"]:hover {
   width: 30px;
   height: 30px;
-  image: url(qss:images_classic/Qsint_header_fold_white.png);
+  image: url(qss:images_classic/qsint_header_fold_white.png);
 }
 
 QSint--ActionGroup QFrame[class="content"] {
@@ -1640,7 +1700,7 @@ background-color: #252525;
 QSint--ActionGroup QFrame[class="content"] QToolButton {
   color: white;
   text-align: center;
-  background-color: qlineargradient(x1:0, y1:0.3, x2:0, y2:1, stop:0 #333333, stop:1 #252525);
+  background-color: qlineargradient(x1:0, y0:0, x2:0, y1:1, stop:0 #333333, stop:1 #252525);
   border: 1px solid #000000;
   padding: 1px 1px; /* different than regular QPushButton */
   margin: 0px; /* different than regular QPushButton */
@@ -1649,7 +1709,7 @@ QSint--ActionGroup QFrame[class="content"] QToolButton {
 }
 
 QSint--ActionGroup QFrame[class="content"] QToolButton:checked {
-  background-color: qlineargradient(x1:0, y1:0.3, x2:0, y2:1, stop:0 #333333, stop:1 #444444);
+  background-color: qlineargradient(x1:0, y0:0, x2:0, y1:1, stop:0 #333333, stop:1 #444444);
   border: 1px solid @ThemeAccentColor2;
 }
 
@@ -1935,9 +1995,9 @@ QTabBar[style="text-only"]::tab:left {
 
 QTabBar::close-button, QDockWidget QTabBar::close-button {
   border: 0;
-  margin: 3px;
+  margin: 4px;
   padding: 0px;
-  image: url(qss:images_classic/Close-lightgray.png);
+  image: url(qss:images_classic/close-lightgray.png);
 }
 
 QTabBar::close-button:hover, QDockWidget QTabBar::close-button:hover {
@@ -1946,7 +2006,7 @@ QTabBar::close-button:hover, QDockWidget QTabBar::close-button:hover {
 }
 
 QTabBar::close-button:pressed, QDockWidget QTabBar::close-button:pressed {
-  image: url(qss:images_classic/close-DarkRed.png);
+  image: url(qss:images_classic/close-darkRed.png);
 }
 
 QTabBar::tab, QDockWidget QTabBar::tab {
@@ -1961,121 +2021,137 @@ QTabBar::tab:top, QDockWidget QTabBar::tab:top {
   margin-left: 0px;
   margin-right: 0px;
   min-width: 5px;
-  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #333333, stop:0.6 #252525, stop:1 #252525);
+  background-color: #252525;
   margin-top: 3px;
-  border-top: 1px solid #202020; /* selection color */
+  border-top: 1px solid #202020;
   border-bottom: 1px solid #202020;
   border-left: 1px solid #202020;
   border-right: 1px solid #202020;
-  border-top-left-radius: 2px;
-  border-top-right-radius: 2px;
+  border-top-left-radius: 3px;
+  border-top-right-radius: 3px;
 }
 
 QTabBar::tab:top:selected, QDockWidget QTabBar::tab:top:selected {
-  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #444444, stop:0.6 #444444, stop:1 #333333);
+  background-color: #3b3b3b;
   color: white;
-  border-top: 1px solid #202020; /* selection color */
-  border-bottom: 1px solid #333333;
+  border-top: 1px solid #202020;
+  border-bottom: 1px solid #3b3b3b;
   border-left: 1px solid #202020;
   border-right: 1px solid #202020;
   margin-top: 0px;
-  border-top-left-radius: 2px;
-  border-top-right-radius: 2px;
+  border-top-left-radius: 3px;
+  border-top-right-radius: 3px;
 }
 
 QTabBar::tab:top:!selected:hover, QDockWidget QTabBar::tab:top:!selected:hover {
-  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #333333, stop:1 #444444);
-  margin-top: 0px;
+  background-color:#333333;
+  color: white;
+  border-bottom: 1px solid #202020;
+  border-top: 1px solid #202020;
+  border-left: 1px solid #202020;
+  border-right: 1px solid #202020;
 }
 
 QTabBar::tab:bottom, QDockWidget QTabBar::tab:bottom {
   color: #adadad;
   min-width: 5px;
-  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #333333, stop:0.6 #252525, stop:1 #252525);
+  background-color: #252525;
   margin-bottom: 3px;
-  border-bottom: 1px solid #202020; /* selection color */
+  border-bottom: 1px solid #202020;
   border-top: 1px solid #202020;
   border-left: 1px solid #202020;
   border-right: 1px solid #202020;
-  border-bottom-left-radius: 2px;
-  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 3px;
+  border-bottom-right-radius: 3px;
 }
 
 QTabBar::tab:bottom:selected, QDockWidget QTabBar::tab:bottom:selected {
-  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #444444, stop:0.6 #444444, stop:1 #333333);
+  background-color: #3b3b3b;
   color: white;
-  border-bottom: 1px solid #202020; /* selection color */
-  border-top: 1px solid #333333;
+  border-bottom: 1px solid #202020;
+  border-top: 1px solid #3b3b3b;
   border-left: 1px solid #202020;
   border-right: 1px solid #202020;
   margin-bottom: 0px;
-  border-bottom-left-radius: 2px;
-  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 3px;
+  border-bottom-right-radius: 3px;
 }
 
 QTabBar::tab:bottom:!selected:hover, QDockWidget QTabBar::tab:bottom:!selected:hover {
-  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #333333, stop:1 #444444);
-  margin-bottom: 0px;
+  background-color:#333333;
+  color: white;
+  border-bottom: 1px solid #202020;
+  border-top: 1px solid #202020;
+  border-left: 1px solid #202020;
+  border-right: 1px solid #202020;
 }
 
 QTabBar::tab:left, QDockWidget QTabBar::tab:left {
   color: #adadad;
   min-height: 5px;
-  background-color: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 #333333, stop:0.6 #252525, stop:1 #252525);
+  background-color: #252525;
   margin-right: 3px;
-  border-bottom: 1px solid #202020; /* selection color */
+  border-bottom: 1px solid #202020;
   border-right: 1px solid #202020;
   border-left: 1px solid #202020;
   border-top: 1px solid #202020;
-  border-top-left-radius: 2px;
-  border-bottom-left-radius: 2px;
+  border-top-left-radius: 3px;
+  border-bottom-left-radius: 3px;
 }
 
 QTabBar::tab:left:selected, QDockWidget QTabBar::tab:left:selected {
-  background-color: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 #444444, stop:0.6 #444444, stop:1 #333333);
+  background-color: #3b3b3b;
   color: white;
-  border-bottom: 1px solid #202020; /* selection color */
-  border-right: 1px solid #333333;
+  border-bottom: 1px solid #202020;
+  border-right: 1px solid #3b3b3b;
   border-left: 1px solid #202020;
   border-top: 1px solid #202020;
   margin-left: 0px;
-  border-top-left-radius: 2px;
-  border-bottom-left-radius: 2px;
+  border-top-left-radius: 3px;
+  border-bottom-left-radius: 3px;
 }
 
 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-left: 0px;
+  background-color:#333333;
+  color: white;
+  border-bottom: 1px solid #202020;
+  border-top: 1px solid #202020;
+  border-left: 1px solid #202020;
+  border-right: 1px solid #202020;
 }
 
 QTabBar::tab:right, QDockWidget QTabBar::tab:right {
   color: white;
   min-height: 5px;
-  background-color: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 #333333, stop:0.6 #252525, stop:1 #252525);
+  background-color: #252525;
   margin-right: 3px;
-  border-bottom: 1px solid #202020; /* selection color */
+  border-bottom: 1px solid #202020;
   border-left: 1px solid #202020;
   border-right: 1px solid #202020;
   border-top: 1px solid #202020;
-  border-top-right-radius: 2px;
-  border-bottom-right-radius: 2px;
+  border-top-right-radius: 3px;
+  border-bottom-right-radius: 3px;
 }
 
 QTabBar::tab:right:selected, QDockWidget QTabBar::tab:right:selected {
-  background-color: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 #444444, stop:0.6 #444444, stop:1 #333333);
+  background-color: #3b3b3b;
   color: white;
-  border-bottom: 1px solid #202020; /* selection color */
-  border-left: 1px solid #333333;
+  border-bottom: 1px solid #202020;
+  border-left: 1px solid #3b3b3b;
   border-left: 1px solid #202020;
   border-top: 1px solid #202020;
   margin-right: 0px;
-  border-top-right-radius: 2px;
-  border-bottom-right-radius: 2px;
+  border-top-right-radius: 3px;
+  border-bottom-right-radius: 3px;
 }
 
 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;
+  background-color:#333333;
+  color: white;
+  border-bottom: 1px solid #202020;
+  border-top: 1px solid #202020;
+  border-left: 1px solid #202020;
+  border-right: 1px solid #202020;
 }
 
 QTabBar QToolButton, QDockWidget QTabBar QToolButton {
@@ -2096,19 +2172,19 @@ QTabBar QToolButton:pressed:hover, QDockWidget QTabBar QToolButton:pressed:hover
 }
 
 QTabBar QToolButton::left-arrow:enabled, QDockWidget QTabBar QToolButton::left-arrow:enabled {
-  image: url(qss:images_classic/Arrow-left-lightgray.png);
+  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);
+  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-lightgray.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-darkgray.png);
+  image: url(qss:images_classic/arrow-right-darkgray.png);
 }
 
 /* QDockWiget -------------------------------------------------------------
@@ -2127,7 +2203,7 @@ QDockWidget::title {
   padding: 3px;
   spacing: 4px;
   border: none;
-  background-color: qlineargradient(x1:0, y1:0.3, x2:0, y2:1, stop:0 #333333, stop:1 #252525);
+  background-color: qlineargradient(x1:0, y0:0, x2:0, y1:1, stop:0 #333333, stop:1 #252525);
   text-align: center;
   font-weight: bold;
 }
@@ -2196,22 +2272,22 @@ QTreeView::branch:!has-children:!has-siblings:adjoins-item  {
 
 QTreeView::branch:closed:has-children:has-siblings  {
   border-image: none;
-  image: url(qss:images_classic/Arrow-right-white.png);
+  image: url(qss:images_classic/arrow-right-white.png);
 }
 
 QTreeView::branch:has-children:!has-siblings:closed  {
   border-image: none;
-  image: url(qss:images_classic/Arrow-right-white.png);
+  image: url(qss:images_classic/arrow-right-white.png);
 }
 
 QTreeView::branch:open:has-children:has-siblings  {
   border-image: none;
-  image: url(qss:images_classic/Arrow-down-white.png);
+  image: url(qss:images_classic/arrow-down-white.png);
 }
 
 QTreeView::branch:open:has-children:!has-siblings  {
   border-image: none;
-  image: url(qss:images_classic/Arrow-down-white.png);
+  image: url(qss:images_classic/arrow-down-white.png);
 }
 
 QTreeView::indicator,
@@ -2262,7 +2338,7 @@ QColumnView::indicator:checked:pressed {
 QListView::indicator:unchecked,
 QTableView::indicator:unchecked,
 QColumnView::indicator:unchecked {
-  image: url(qss:images_classic/checkbox-Empty-white.png);
+  image: url(qss:images_classic/checkbox-empty-white.png);
 } */
 
 QTreeView::indicator:unchecked:hover, QTreeView::indicator:unchecked:focus, QTreeView::indicator:unchecked:pressed,
@@ -2275,7 +2351,7 @@ QTableView::indicator:unchecked:pressed,
 QColumnView::indicator:unchecked:hover,
 QColumnView::indicator:unchecked:focus,
 QColumnView::indicator:unchecked:pressed {
-  /* image: url(qss:images_classic/checkbox-Empty-blue.png); */
+  /* image: url(qss:images_classic/checkbox-empty-blue.png); */
   /* background-color: @ThemeAccentColor1;
   border: 1px solid #ffffff; */
 }
@@ -2284,7 +2360,7 @@ QTreeView::indicator:indeterminate,
 QListView::indicator:indeterminate,
 QTableView::indicator:indeterminate,
 QColumnView::indicator:indeterminate {
-  image: url(qss:images_classic/Indeterminate-mark-white.png);
+  image: url(qss:images_classic/indeterminate-mark-white.png);
 }
 
 QTreeView::indicator:indeterminate:hover, QTreeView::indicator:indeterminate:focus, QTreeView::indicator:indeterminate:pressed,
@@ -2297,7 +2373,7 @@ QTableView::indicator:indeterminate:pressed,
 QColumnView::indicator:indeterminate:hover,
 QColumnView::indicator:indeterminate:focus,
 QColumnView::indicator:indeterminate:pressed {
-  /* image: url(qss:images_classic/Indeterminate-mark-lightgray.png);
+  /* image: url(qss:images_classic/indeterminate-mark-lightgray.png);
   background-color: @ThemeAccentColor1;
   border: 1px solid #ffffff; */
 }
@@ -2375,6 +2451,7 @@ QTableView::item {
     color: white;
 }
 
+
 /* QHeaderView ------------------------------------------------------------
 
 https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qheaderview
@@ -2400,11 +2477,15 @@ QHeaderView:disabled {
 }
 
 QHeaderView::section {
-  background-color: qlineargradient(x1:0, y1:0.3, x2:0, y2:1, stop:0 #333333, stop:1 #252525);
+  background-color: qlineargradient(x1:0, y0:0, x2:0, y1:1, stop:0 #252525, stop:1 #333333);
   color: #ffffff;
   padding: 4px;
 }
 
+QHeaderView::section:hover {
+  background-color: qlineargradient(x1:0, y0:0, x2:0, y1:1, stop:0 #444444, stop:1 #404040);
+}
+
 QHeaderView::section::horizontal {
   border-bottom: 2px solid #020202;
   border-right: 0px solid transparent;
@@ -2446,7 +2527,7 @@ QHeaderView::down-arrow {
   width: 12px;
   padding-left: 2px;
   padding-right: 2px;
-  image: url(qss:images_classic/Arrow-down-lightgray.png);
+  image: url(qss:images_classic/arrow-down-lightgray.png);
 }
 
 QHeaderView::up-arrow {
@@ -2456,7 +2537,7 @@ QHeaderView::up-arrow {
   width: 12px;
   padding-left: 2px;
   padding-right: 2px;
-  image: url(qss:images_classic/Arrow-up-lightgray.png);
+  image: url(qss:images_classic/arrow-up-lightgray.png);
 }
 
 /* QToolBox --------------------------------------------------------------
@@ -2511,7 +2592,7 @@ QToolBox::tab:!selected:disabled {
 }
 
 QToolBox::tab:hover {
-  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #444444, stop:1 #333333);
+  background-color: qlineargradient(x1:0, y0:0, x2:0, y1:1, stop:0 #444444, stop:1 #404040);
   }
 
 QToolBox > QScrollArea > QWidget > QWidget {
@@ -2561,7 +2642,7 @@ https://stackoverflow.com/questions/14581498/qt-stylesheet-for-hline-vline-color
 https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qsplitter
 
 ---------------------------------------------------------------------------*/
-QSplitterHandle:hover { /* to fix bug about hovering on splitters https://bugreports.qt.io/browse/QTBUG-13768 */
+QSplitterHandle:hover { /* to fix bug about hovering on splitters https://bugreports.qt.io/browse/qTBUG-13768 */
 
 }
 
@@ -2622,13 +2703,13 @@ QDateEdit::drop-down, QDateTimeEdit::drop-down {
 }
 
 QDateEdit::down-arrow, QDateTimeEdit::down-arrow {
-  image: url(qss:images_classic/Arrow-down-lightgray.png);
+  image: url(qss:images_classic/arrow-down-lightgray.png);
   height: 8px;
   width: 8px;
 }
 
 QDateEdit::down-arrow:on, QDateEdit::down-arrow:hover, QDateEdit::down-arrow:focus, QDateTimeEdit::down-arrow:on, QDateTimeEdit::down-arrow:hover, QDateTimeEdit::down-arrow:focus {
-  image: url(qss:images_classic/Arrow-down-white.png);
+  image: url(qss:images_classic/arrow-down-white.png);
 }
 
 QDateEdit QAbstractItemView, QDateTimeEdit QAbstractItemView {
@@ -2752,23 +2833,23 @@ Settings menu #groupsTreeView:
 
 QTreeView::branch#groupsTreeView:closed:has-children:has-siblings  {
   border-image: none;
-  image: url(qss:images_classic/Arrow-right-white.png);
+  image: url(qss:images_classic/arrow-right-white.png);
 }
 
 QTreeView::branch#groupsTreeView:open:has-children:has-siblings  {
   border-image: none;
-  image: url(qss:images_classic/Arrow-down-white.png);
+  image: url(qss:images_classic/arrow-down-white.png);
 }
 
 QTreeView::branch#groupsTreeView:open:has-children:!has-siblings  {
 
   border-image: none;
-  image: url(qss:images_classic/Arrow-down-white.png);
+  image: url(qss:images_classic/arrow-down-white.png);
 }
 
 QTreeView::branch#groupsTreeView:has-children:!has-siblings:closed  {
   border-image: none;
-  image: url(qss:images_classic/Arrow-right-white.png);
+  image: url(qss:images_classic/arrow-right-white.png);
 }
 
 QTreeView::branch#groupsTreeView:has-siblings:!adjoins-item  {
@@ -2816,3 +2897,4 @@ QTreeView::item:!selected:hover#groupsTreeView {
   background-color: @ThemeAccentColor1;
   margin-left:-8px;
 } */
+
diff --git a/src/Gui/Stylesheets/FreeCAD Light.qss b/src/Gui/Stylesheets/FreeCAD Light.qss
index 943222caf0..db107bfe66 100644
--- a/src/Gui/Stylesheets/FreeCAD Light.qss	
+++ b/src/Gui/Stylesheets/FreeCAD Light.qss	
@@ -104,6 +104,7 @@ Main window
 ==================================================================================================*/
 QMainWindow,
 QDialog,
+
 QDockWidget {
     background-color: #f0f0f0; /* main background color */
 }
@@ -416,7 +417,7 @@ QRadioButton::indicator {
   border-image: none;
   width: 14px;
   height: 14px;
-  image:url(qss:images_classic/Radio-unchecked-black.png);
+  image:url(qss:images_classic/radio-unchecked-black.png);
 }
 
 QRadioButton::indicator:unchecked {
@@ -430,14 +431,14 @@ QRadioButton::indicator:unchecked:disabled {
   border-image: none;
   width: 14px;
   height: 14px;
-  image:url(qss:images_classic/Radio-unchecked-lightgray.png);
+  image:url(qss:images_classic/radio-unchecked-lightgray.png);
 }
 
 QRadioButton::indicator:checked {
   border-image: none;
   width: 14px;
   height: 14px;
-  image:url(qss:images_classic/Radio-checked-black.png);
+  image:url(qss:images_classic/radio-checked-black.png);
 }
 
 QRadioButton::indicator:checked:hover, QRadioButton::indicator:checked:pressed {
@@ -448,7 +449,7 @@ QRadioButton::indicator:checked:disabled {
   border-image: none;
   width: 14px;
   height: 14px;
-  image:url(qss:images_classic/Radio-checked-lightgray.png);
+  image:url(qss:images_classic/radio-checked-lightgray.png);
 }
 
 /* QMenuBar ---------------------------------------------------------------
@@ -457,11 +458,16 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qmenubar
 
 --------------------------------------------------------------------------- */
 QMenuBar {
-  background-color: #f0f0f0;
+  background-color: #ffffff;
   color: black;
   selection-background-color: @ThemeAccentColor1;
 }
 
+QMenuBar:disabled,
+QMenuBar::item:disabled{
+    color: #646464;
+}
+
 QMenuBar:focus {
   border: 1px solid @ThemeAccentColor2;
 }
@@ -495,6 +501,10 @@ QMenu {
   selection-background-color: @ThemeAccentColor1;
 }
 
+QMenu::item:disabled {
+    color: #646464;
+}
+
 QMenu::separator {
   height: 2px;
   background-color: #ededed;
@@ -545,7 +555,7 @@ QMenu::icon:checked { /* appearance of a 'checked' icon */
   border-radius: 0px;
 }
 QMenu::indicator:non-exclusive:unchecked {
-  image: url(qss:images_classic/checkbox-Empty-black.png);
+  image: url(qss:images_classic/checkbox-empty-black.png);
 }
 
 QMenu::indicator:non-exclusive:unchecked:hover, QMenu::indicator:non-exclusive:unchecked:focus, QMenu::indicator:non-exclusive:unchecked:pressed {
@@ -554,7 +564,7 @@ QMenu::indicator:non-exclusive:unchecked:hover, QMenu::indicator:non-exclusive:u
 }
 
 QMenu::indicator:non-exclusive:unchecked:disabled {
-  image: url(qss:images_classic/checkbox-Empty-lightgray.png);
+  image: url(qss:images_classic/checkbox-empty-lightgray.png);
 }
 
 QMenu::indicator:non-exclusive:checked {
@@ -590,35 +600,35 @@ QMenu::indicator:exclusive:unchecked:hover, QMenu::indicator:exclusive:unchecked
   border: none;
   outline: none;
   background-color: @ThemeAccentColor1;
-  image: url(qss:images_classic/checkbox-Empty-black.png);
+  image: url(qss:images_classic/checkbox-empty-black.png);
 }
 
 QMenu::indicator:exclusive:unchecked:disabled {
-  image: url(qss:images_classic/checkbox-Empty-black.png);
+  image: url(qss:images_classic/checkbox-empty-black.png);
 }
 
 QMenu::indicator:exclusive:checked {
   border: none;
   outline: none;
-  image: url(qss:images_classic/Radio-checked-black.png);
+  image: url(qss:images_classic/radio-checked-black.png);
 }
 
 QMenu::indicator:exclusive:checked:hover, QMenu::indicator:exclusive:checked:focus, QMenu::indicator:exclusive:checked:pressed {
   border: none;
   outline: none;
   background-color: @ThemeAccentColor1;
-  image: url(qss:images_classic/checkbox-Empty-black.png);
+  image: url(qss:images_classic/checkbox-empty-black.png);
 }
 
 QMenu::indicator:exclusive:checked:disabled {
   outline: none;
-  image: url(qss:images_classic/Radio-checked-black.png);
+  image: url(qss:images_classic/radio-checked-black.png);
 }
 
 QMenu::right-arrow {
   margin: 5px;
   padding-left: 12px;
-  image:url(qss:images_classic/Arrow-right-black.png);
+  image:url(qss:images_classic/arrow-right-black.png);
   height: 8px;
   width: 8px;
   background-color: transparent;
@@ -730,7 +740,7 @@ QScrollBar::handle:vertical:focus {
 
 QScrollBar::add-line:horizontal {
   margin: 6px 6px;
-  image: url(qss:images_classic/Arrow-right-lightgray.png);
+  image: url(qss:images_classic/arrow-right-lightgray.png);
   height: 8px;
   width: 4px;
   subcontrol-position: right;
@@ -738,7 +748,7 @@ QScrollBar::add-line:horizontal {
 }
 
 QScrollBar::add-line:horizontal:hover, QScrollBar::add-line:horizontal:on {
-  image: url(qss:images_classic/Arrow-right-black.png);
+  image: url(qss:images_classic/arrow-right-black.png);
   height: 8px;
   width: 4px;
   subcontrol-position: right;
@@ -747,7 +757,7 @@ QScrollBar::add-line:horizontal:hover, QScrollBar::add-line:horizontal:on {
 
 QScrollBar::add-line:vertical {
   margin: 6px 6px;
-  image: url(qss:images_classic/Arrow-down-lightgray.png);
+  image: url(qss:images_classic/arrow-down-lightgray.png);
   height: 4px;
   width: 8px;
   subcontrol-position: bottom;
@@ -755,7 +765,7 @@ QScrollBar::add-line:vertical {
 }
 
 QScrollBar::add-line:vertical:hover, QScrollBar::add-line:vertical:on {
-  image: url(qss:images_classic/Arrow-down-black.png);
+  image: url(qss:images_classic/arrow-down-black.png);
   height: 4px;
   width: 8px;
   subcontrol-position: bottom;
@@ -764,7 +774,7 @@ QScrollBar::add-line:vertical:hover, QScrollBar::add-line:vertical:on {
 
 QScrollBar::sub-line:horizontal {
   margin: 6px 6px;
-  image: url(qss:images_classic/Arrow-left-lightgray.png);
+  image: url(qss:images_classic/arrow-left-lightgray.png);
   height: 8px;
   width: 4px;
   subcontrol-position: left;
@@ -772,7 +782,7 @@ QScrollBar::sub-line:horizontal {
 }
 
 QScrollBar::sub-line:horizontal:hover, QScrollBar::sub-line:horizontal:on {
-  image: url(qss:images_classic/Arrow-left-black.png);
+  image: url(qss:images_classic/arrow-left-black.png);
   height: 8px;
   width: 4px;
   subcontrol-position: left;
@@ -781,7 +791,7 @@ QScrollBar::sub-line:horizontal:hover, QScrollBar::sub-line:horizontal:on {
 
 QScrollBar::sub-line:vertical {
   margin: 6px 6px;
-  image: url(qss:images_classic/Arrow-up-lightgray.png);
+  image: url(qss:images_classic/arrow-up-lightgray.png);
   height: 4px;
   width: 8px;
   subcontrol-position: top;
@@ -789,7 +799,7 @@ QScrollBar::sub-line:vertical {
 }
 
 QScrollBar::sub-line:vertical:hover, QScrollBar::sub-line:vertical:on {
-  image: url(qss:images_classic/Arrow-up-black.png);
+  image: url(qss:images_classic/arrow-up-black.png);
   height: 4px;
   width: 8px;
   subcontrol-position: top;
@@ -880,8 +890,7 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtoolbar
 
 --------------------------------------------------------------------------- */
 QToolBar {
-  background-color: #f0f0f0;
-  /* border: 1px solid #ababab; */
+  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #cecece, stop:0.03 #f4f4f4,stop:0.97 #f0f0f0, stop:1 #cecece);
   /* font-weight: bold; */
 }
 
@@ -892,16 +901,22 @@ QToolBar:only-one {
 }
 
 QToolBar:horizontal {
-  border-bottom: 1px solid #ababab;
   padding-top: 3px;
-  padding-left: 4px;
+  padding-left: 3px;
+  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #cecece, stop:0.03 #f4f4f4,stop:0.97 #f0f0f0, stop:1 #cecece);
+}
+
+/* fix background color for toolbars that are the on menubar. */
+QToolBar:only-one {
+  background-color: transparent;
+  border:0px;
+  /* margin-top: -3px; */
 }
 
 QToolBar:vertical {
-  border-left: 1px solid #ababab;
-  border-right: 1px solid #ababab;
-  padding-top: 4px;
+  padding-top: 3px;
   padding-left: 3px;
+  background-color: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 #cecece, stop:0.03 #f4f4f4,stop:0.97 #f0f0f0, stop:1 #cecece);
 }
 
 QToolBar:disabled {
@@ -909,34 +924,63 @@ QToolBar:disabled {
 
 QToolBar::handle:horizontal {
   width: 8px;
-  image: url(qss:images_classic/Hmovetoolbar-lightgray.png);
+  image: url(qss:images_classic/hmovetoolbar-lightgray.png);
 }
 
 QToolBar::handle:vertical {
   height: 8px;
-  image: url(qss:images_classic/Vmovetoolbar-lightgray.png);
+  image: url(qss:images_classic/vmovetoolbar-lightgray.png);
 }
 
 QToolBar::handle:horizontal:hover {
   width: 8px;
-  image: url(qss:images_classic/Hmovetoolbar-darkgray.png);
+  image: url(qss:images_classic/hmovetoolbar-darkgray.png);
 }
 
 QToolBar::handle:vertical:hover {
   height: 8px;
-  image: url(qss:images_classic/Vmovetoolbar-darkgray.png);
+  image: url(qss:images_classic/vmovetoolbar-darkgray.png);
 }
 
 QToolBar::separator:horizontal {
   width: 2px;
   padding: 0px 3px;
-  image: url(qss:images_classic/Hsepartoolbar-lightgray.png);
+  image: url(qss:images_classic/hsepartoolbar-lightgray.png);
 }
 
 QToolBar::separator:vertical {
   height: 2px;
   padding: 3px 0px;
-  image: url(qss:images_classic/Vsepartoolbar-lightgray.png);
+  image: url(qss:images_classic/vsepartoolbar-lightgray.png);
+}
+
+/* undo button */
+
+QToolBar[objectName="Edit"] > QToolButton::menu-arrow {
+  background-image: url(qss:images_classic/arrow-down-lightgray.png);
+  background-position: center center;
+  background-repeat: none;
+  subcontrol-origin: padding;
+  subcontrol-position: bottom right;
+  height: 6px;
+}
+
+QToolBar[objectName="Edit"] > QToolButton::menu-arrow:hover {
+  background-image: url(qss:images_classic/arrow-down-black.png);
+  background-position: center center;
+  background-repeat: none;
+  subcontrol-origin: padding;
+  subcontrol-position: bottom right;
+  height: 6px;
+}
+
+QToolBar[objectName="Edit"] > QToolButton::menu-arrow:open {
+  background-image: url(qss:images_classic/arrow-down-black.png);
+  background-position: center center;
+  background-repeat: none;
+  subcontrol-origin: padding;
+  subcontrol-position: bottom right;
+  height: 6px;
 }
 
 /*The "show more" button  (it can also be stylable with "QToolBarExtension"  icon is not working Qproperty works but breaks when you move the toolbar see also */
@@ -969,7 +1013,7 @@ QSpinBox {
 }
 
 QAbstractSpinBox:up-button {
-  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #f0f0f0, stop:1 #fdfdfd);
+  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #fdfdfd, stop:1 #f0f0f0);
   subcontrol-origin: border;
   subcontrol-position: top right;
   border-top: 1px solid transparent;
@@ -981,14 +1025,18 @@ QAbstractSpinBox:up-button {
   margin-bottom:-1px;
 }
 
+QAbstractSpinBox:up-button:disabled {
+background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #e2e2e2, stop:1 #ededed);
+}
+
 QAbstractSpinBox::up-arrow, QAbstractSpinBox::up-arrow:disabled, QAbstractSpinBox::up-arrow:off {
-  image: url(qss:images_classic/Arrow-up-lightgray.png);
+  image: url(qss:images_classic/arrow-up-lightgray.png);
   height: 8px;
   width: 8px;
 }
 
 QAbstractSpinBox::up-arrow:hover {
-  image: url(qss:images_classic/Arrow-up-black.png);
+  image: url(qss:images_classic/arrow-up-black.png);
   height: 8px;
   width: 8px;
 }
@@ -1006,18 +1054,26 @@ QAbstractSpinBox:down-button {
   margin-top:-1px;
 }
 
+QAbstractSpinBox:down-button:disabled {
+background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #e2e2e2, stop:1 #ededed);
+}
+
 QAbstractSpinBox::down-arrow, QAbstractSpinBox::down-arrow:disabled, QAbstractSpinBox::down-arrow:off {
-  image: url(qss:images_classic/Arrow-down-lightgray.png);
+  image: url(qss:images_classic/arrow-down-lightgray.png);
   height: 8px;
   width: 8px;
 }
 
 QAbstractSpinBox::down-arrow:hover {
-  image: url(qss:images_classic/Arrow-down-black.png);
+  image: url(qss:images_classic/arrow-down-black.png);
   height: 8px;
   width: 8px;
 }
 
+QAbstractSpinBox:disabled {
+  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #e2e2e2, stop:1 #ededed);
+}
+
 QAbstractSpinBox:hover {
 }
 
@@ -1168,7 +1224,7 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qpushbutton
 
 --------------------------------------------------------------------------- */
 QPushButton {
-  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #f0f0f0, stop:1 #fdfdfd);
+  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #fdfdfd, stop:1 #f0f0f0);
   color: black;
   border: 1px solid #ababab;
   /* border-bottom-color: #1e1e1e; simulates shadow under the button */
@@ -1183,7 +1239,7 @@ QPushButton {
 }
 
 QPushButton:disabled {
-background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #e2e2e2, stop:1 #fdfdfd);
+background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #e2e2e2, stop:1 #ededed);
   color: #646464;
   border: 1px solid #ababab;
 }
@@ -1209,7 +1265,7 @@ QPushButton:checked:selected {
 }
 
 QPushButton:hover {
-  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #fefefe, stop:1 #f8f8f8);
+  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #ffffff, stop:1 #fefefe);
   color: black;
 }
 
@@ -1233,6 +1289,10 @@ QDialogButtonBox QPushButton {
   min-width: 80px;
 }
 
+QMessageBox[objectName="macroGuideWalkthrough"] QDialogButtonBox QPushButton {
+  min-width: 20px;
+}
+
 /* QToolButton ------------------------------------------------------------
 
 https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtoolbutton
@@ -1284,6 +1344,7 @@ QToolButton:checked:selected {
 
 QToolButton:hover {
   color: black;
+  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #ffffff, stop:1 #fefefe);
   border: 1px solid #ababab;
 }
 
@@ -1328,18 +1389,18 @@ QToolButton::menu-indicator {
 }
 
 QToolButton::menu-arrow {
-  image: url(qss:images_classic/Arrow-down-lightgray.png);
+  image: url(qss:images_classic/arrow-down-lightgray.png);
   width: 18px;
   height: 18px;
   /* background-color: transparent; */
 }
 QToolButton::menu-arrow:open {
-  image: url(qss:images_classic/Arrow-Down-black.png);
+  image: url(qss:images_classic/arrow-Down-black.png);
   width: 18px;
   height: 18px;
 }
 QToolButton::menu-arrow:hover {
-  image: url(qss:images_classic/Arrow-Down-black.png);
+  image: url(qss:images_classic/arrow-Down-black.png);
   width: 18px;
   height: 18px;
 }
@@ -1372,7 +1433,7 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qcombobox
 QComboBox {
   border: 1px solid #ababab;
   border-radius: 2px;
-  background-color: qlineargradient(x1:0, y1:0.3, x2:0, y2:1, stop:0 #f0f0f0, stop:1 #fdfdfd);
+  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #fdfdfd, stop:1 #f0f0f0);
   selection-background-color: @ThemeAccentColor1;
   padding-left: 4px;
   padding-right: 2px;
@@ -1389,9 +1450,10 @@ QComboBox {
 QComboBox:editable {
   background-color: #fdfdfd;
 }
+
 QComboBox QAbstractItemView {
-  border: 1px solid #ababab;
-  border-radius: 2px;
+  border: 2px solid #ababab;
+  /* padding-left: 4px; this fixes the icon padding but adds a 4px padding to all Qcomboboxes.*/
   background-color: #fdfdfd;
   selection-background-color: @ThemeAccentColor1;
 }
@@ -1482,13 +1544,13 @@ QComboBox::drop-down:hover {
 }
 
 QComboBox::down-arrow {
-  image: url(qss:images_classic/Arrow-down-lightgray.png);
+  image: url(qss:images_classic/arrow-down-lightgray.png);
   /* height: 10px; */
   width: 8px;
 }
 
 QComboBox::down-arrow:on, QComboBox::down-arrow:hover, QComboBox::down-arrow:focus {
-  image: url(qss:images_classic/Arrow-down-black.png);
+  image: url(qss:images_classic/arrow-down-black.png);
 }
 
 
@@ -1565,25 +1627,25 @@ padding: 0px;
 QSint--ActionGroup QFrame[class="header"] QLabel[fold="false"] {
   width: 30px;
   height: 30px;
-  image: url(qss:images_classic/Qsint_header_unfold_lightgray.png);
+  image: url(qss:images_classic/qsint_header_unfold_lightgray.png);
 }
 
 QSint--ActionGroup QFrame[class="header"] QLabel:hover[fold="false"] {
   width: 30px;
   height: 30px;
-  image: url(qss:images_classic/Qsint_header_unfold_black.png);
+  image: url(qss:images_classic/qsint_header_unfold_black.png);
 }
 
 QSint--ActionGroup QFrame[class="header"] QLabel[fold="true"] {
   width: 30px;
   height: 30px;
-  image: url(qss:images_classic/Qsint_header_fold_lightgray.png);
+  image: url(qss:images_classic/qsint_header_fold_lightgray.png);
 }
 
 QSint--ActionGroup QFrame[class="header"] QLabel[fold="true"]:hover {
   width: 30px;
   height: 30px;
-  image: url(qss:images_classic/Qsint_header_fold_black.png);
+  image: url(qss:images_classic/qsint_header_fold_black.png);
 }
 
 QSint--ActionGroup QFrame[class="content"] {
@@ -1637,7 +1699,7 @@ background-color: #f0f0f0;
 QSint--ActionGroup QFrame[class="content"] QToolButton {
   color: black;
   text-align: center;
-  background-color: qlineargradient(x1:0, y1:0.3, x2:0, y2:1, stop:0 #f0f0f0, stop:1 #fdfdfd);
+  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #fdfdfd, stop:1 #f0f0f0);
   border: 1px solid #adadad;
   padding: 1px 1px; /* different than regular QPushButton */
   margin: 0px; /* different than regular QPushButton */
@@ -1646,7 +1708,7 @@ QSint--ActionGroup QFrame[class="content"] QToolButton {
 }
 
 QSint--ActionGroup QFrame[class="content"] QToolButton:checked {
-  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #fefefe, stop:1 #f8f8f8);
+  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #ffffff, stop:1 #fefefe);
   border: 1px solid @ThemeAccentColor2;
 }
 
@@ -1677,7 +1739,7 @@ QSint--ActionGroup QToolButton#filterButton QListWidget {
 
 
 QSint--ActionGroup QFrame[class="content"] QToolButton:hover{
-  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #fefefe, stop:1 #f8f8f8);
+  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #ffffff, stop:1 #fefefe);
 }
 QSint--ActionGroup QFrame[class="content"] QToolButton:focus {
   border: 1px solid @ThemeAccentColor2;
@@ -1932,9 +1994,9 @@ QTabBar[style="text-only"]::tab:left {
 
 QTabBar::close-button, QDockWidget QTabBar::close-button {
   border: 0;
-  margin: 3px;
+  margin: 4px;
   padding: 0px;
-  image: url(qss:images_classic/Close-lightgray.png);
+  image: url(qss:images_classic/close-lightgray.png);
 }
 
 QTabBar::close-button:hover, QDockWidget QTabBar::close-button:hover {
@@ -1958,122 +2020,133 @@ QTabBar::tab:top, QDockWidget QTabBar::tab:top {
   margin-left: 0px;
   margin-right: 0px;
   min-width: 5px;
-  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #dddddd, stop:0.6 #e2e2e2, stop:1 #cccccc);
+  background-color: #e2e2e2;
   margin-top: 3px;
-  border-top: 1px solid #ababab; /* selection color */
+  border-top: 1px solid #ababab;
   border-bottom: 1px solid #ababab;
   border-left: 1px solid #ababab;
   border-right: 1px solid #ababab;
-  border-top-left-radius: 2px;
-  border-top-right-radius: 2px;
+  border-top-left-radius: 3px;
+  border-top-right-radius: 3px;
 }
 
 QTabBar::tab:top:selected, QDockWidget QTabBar::tab:top:selected {
-  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #f0f0f0, stop:0.6 #fdfdfd stop:1 #f0f0f0);
+  background-color: #f8f8f8;
   color: black;
-  border-top: 1px solid #ababab; /* selection color */
-  border-bottom: 1px solid #f0f0f0;
+  border-top: 1px solid #ababab;
+  border-bottom: 1px solid #f8f8f8;
   border-left: 1px solid #ababab;
   border-right: 1px solid #ababab;
   margin-top: 0px;
-  border-top-left-radius: 2px;
-  border-top-right-radius: 2px;
+  border-top-left-radius: 3px;
+  border-top-right-radius: 3px;
 }
 
 QTabBar::tab:top:!selected:hover, QDockWidget QTabBar::tab:top:!selected:hover {
-  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #f0f0f0, stop:1 #d8d8d8);
-  margin-top: 0px;
+  background-color: #f8f8f8;
 }
 
 QTabBar::tab:bottom, QDockWidget QTabBar::tab:bottom {
   color: #646464;
   min-width: 5px;
-  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #dddddd, stop:0.6 #e2e2e2, stop:1 #cccccc);
+  background-color: #e2e2e2;
   margin-bottom: 3px;
-  border-bottom: 1px solid #ababab; /* selection color */
+  border-bottom: 1px solid #ababab;
   border-top: 1px solid #ababab;
   border-left: 1px solid #ababab;
   border-right: 1px solid #ababab;
-  border-bottom-left-radius: 2px;
-  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 3px;
+  border-bottom-right-radius: 3px;
 }
 
 QTabBar::tab:bottom:selected, QDockWidget QTabBar::tab:bottom:selected {
-  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #f0f0f0, stop:0.6 #fdfdfd stop:1 #f0f0f0);
+  background-color: #f8f8f8;
   color: black;
-  border-bottom: 1px solid #ababab; /* selection color */
-  border-top: 1px solid #f0f0f0;
+  border-bottom: 1px solid #ababab;
+  border-top: 1px solid #f8f8f8;
   border-left: 1px solid #ababab;
   border-right: 1px solid #ababab;
   margin-bottom: 0px;
-  border-bottom-left-radius: 2px;
-  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 3px;
+  border-bottom-right-radius: 3px;
 }
 
 QTabBar::tab:bottom:!selected:hover, QDockWidget QTabBar::tab:bottom:!selected:hover {
-  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #d8d8d8, stop:1 #f0f0f0);
-  margin-bottom: 0px;
+  background-color: #f8f8f8;
+  color: black;
+  border-bottom: 1px solid #ababab;
+  border-top: 1px solid #ababab;
+  border-left: 1px solid #ababab;
+  border-right: 1px solid #ababab;
 }
 
 QTabBar::tab:left, QDockWidget QTabBar::tab:left {
   color: #646464;
   min-height: 5px;
-  background-color: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 #dddddd, stop:0.6 #e2e2e2, stop:1 #cccccc);
+  background-color: #e2e2e2;
   margin-left: 3px;
-  border-bottom: 1px solid #ababab; /* selection color */
+  border-bottom: 1px solid #ababab;
   border-right: 1px solid #ababab;
   border-left: 1px solid #ababab;
   border-top: 1px solid #ababab;
-  border-top-left-radius: 2px;
-  border-bottom-left-radius: 2px;
+  border-top-left-radius: 3px;
+  border-bottom-left-radius: 3px;
 }
 
 QTabBar::tab:left:selected, QDockWidget QTabBar::tab:left:selected {
-  background-color: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 #f0f0f0, stop:0.6 #fdfdfd stop:1 #f0f0f0);
+  background-color: #f8f8f8;
   color: black;
-  border-bottom: 1px solid #ababab; /* selection color */
+  border-bottom: 1px solid #ababab;
   border-right: 1px solid #f0f0f0;
   border-left: 1px solid #ababab;
   border-top: 1px solid #ababab;
   margin-left: 0px;
-  border-top-left-radius: 2px;
-  border-bottom-left-radius: 2px;
+  border-top-left-radius: 3px;
+  border-bottom-left-radius: 3px;
 }
 
 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-left: 0px;
+  background-color: #f8f8f8;
+  color: black;
+  border-bottom: 1px solid #ababab;
+  border-top: 1px solid #ababab;
+  border-left: 1px solid #ababab;
+  border-right: 1px solid #ababab;
 }
 
 QTabBar::tab:right, QDockWidget QTabBar::tab:right {
   color: black;
   min-height: 5px;
-  background-color: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 #dddddd, stop:0.6 #e2e2e2, stop:1 #cccccc);
+  background-color: #e2e2e2;
   margin-right: 3px;
-  border-bottom: 1px solid #ababab; /* selection color */
+  border-bottom: 1px solid #ababab;
   border-left: 1px solid #ababab;
   border-right: 1px solid #ababab;
   border-top: 1px solid #ababab;
-  border-top-right-radius: 2px;
-  border-bottom-right-radius: 2px;
+  border-top-right-radius: 3px;
+  border-bottom-right-radius: 3px;
 }
 
 QTabBar::tab:right:selected, QDockWidget QTabBar::tab:right:selected {
-  background-color: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 #f0f0f0, stop:0.6 #fdfdfd stop:1 #f0f0f0);
+  background-color: #f8f8f8;
   color: black;
-  border-bottom: 1px solid #ababab; /* selection color */
+  border-bottom: 1px solid #ababab;
   border-left: 1px solid #f0f0f0;
   border-left: 1px solid #ababab;
   border-top: 1px solid #ababab;
   margin-right: 0px;
-  border-top-right-radius: 2px;
-  border-bottom-right-radius: 2px;
+  border-top-right-radius: 3px;
+  border-bottom-right-radius: 3px;
 }
 
 QTabBar::tab:right:!selected:hover, QDockWidget QTabBar::tab:right:!selected:hover {
-  background-color: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 #f0f0f0, stop:1 #d8d8d8);
-  margin-right: 0px;
-}
+  background-color: #f8f8f8;
+  color: black;
+  border-bottom: 1px solid #ababab;
+  border-top: 1px solid #ababab;
+  border-left: 1px solid #ababab;
+  border-right: 1px solid #ababab;
+  }
 
 QTabBar QToolButton, QDockWidget QTabBar QToolButton {
   /* Fixes #136 */
@@ -2093,19 +2166,19 @@ QTabBar QToolButton:pressed:hover, QDockWidget QTabBar QToolButton:pressed:hover
 }
 
 QTabBar QToolButton::left-arrow:enabled, QDockWidget QTabBar QToolButton::left-arrow:enabled {
-  image: url(qss:images_classic/Arrow-left-darkgray.png);
+  image: url(qss:images_classic/arrow-left-darkgray.png);
 }
 
 QTabBar QToolButton::left-arrow:disabled, QDockWidget QTabBar QToolButton::left-arrow:disabled {
-  image: url(qss:images_classic/Arrow-left-lightgray.png);
+  image: url(qss:images_classic/arrow-left-lightgray.png);
 }
 
 QTabBar QToolButton::right-arrow:enabled, QDockWidget QTabBar QToolButton::right-arrow:enabled {
-  image: url(qss:images_classic/Arrow-right-darkgray.png);
+  image: url(qss:images_classic/arrow-right-darkgray.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-lightgray.png);
 }
 
 /* QDockWiget -------------------------------------------------------------
@@ -2193,22 +2266,22 @@ QTreeView::branch:!has-children:!has-siblings:adjoins-item  {
 
 QTreeView::branch:closed:has-children:has-siblings  {
   border-image: none;
-  image: url(qss:images_classic/Arrow-right-black.png);
+  image: url(qss:images_classic/arrow-right-black.png);
 }
 
 QTreeView::branch:has-children:!has-siblings:closed  {
   border-image: none;
-  image: url(qss:images_classic/Arrow-right-black.png);
+  image: url(qss:images_classic/arrow-right-black.png);
 }
 
 QTreeView::branch:open:has-children:has-siblings  {
   border-image: none;
-  image: url(qss:images_classic/Arrow-down-black.png);
+  image: url(qss:images_classic/arrow-down-black.png);
 }
 
 QTreeView::branch:open:has-children:!has-siblings  {
   border-image: none;
-  image: url(qss:images_classic/Arrow-down-black.png) ;
+  image: url(qss:images_classic/arrow-down-black.png) ;
 }
 
 QTreeView::indicator,
@@ -2259,7 +2332,7 @@ QColumnView::indicator:checked:pressed {
 QListView::indicator:unchecked,
 QTableView::indicator:unchecked,
 QColumnView::indicator:unchecked {
-  image: url(qss:images_classic/checkbox-Empty-black.png);
+  image: url(qss:images_classic/checkbox-empty-black.png);
 } */
 
 QTreeView::indicator:unchecked:hover, QTreeView::indicator:unchecked:focus, QTreeView::indicator:unchecked:pressed,
@@ -2272,7 +2345,7 @@ QTableView::indicator:unchecked:pressed,
 QColumnView::indicator:unchecked:hover,
 QColumnView::indicator:unchecked:focus,
 QColumnView::indicator:unchecked:pressed {
-  /* image: url(qss:images_classic/checkbox-Empty-blue.png); */
+  /* image: url(qss:images_classic/checkbox-empty-blue.png); */
   /* background-color: @ThemeAccentColor1;
   border: 1px solid #1c1c1c; */
 }
@@ -2390,6 +2463,7 @@ QHeaderView {
   background-color: transparent;
   /* text-align: bottom; */
   margin: -1px; /* fix for misalignement*/
+      selection-background-color: @ThemeAccentColor1;
 }
 
 QHeaderView:disabled {
@@ -2398,18 +2472,33 @@ QHeaderView:disabled {
 }
 
 QHeaderView::section {
-  background-color: qlineargradient(x1:0, y1:0.3, x2:0, y2:1, stop:0 #f0f0f0, stop:1 #fdfdfd);
+  background-color: qlineargradient(x1:0, y1:0.3, x2:0, y2:1, stop:0 #fdfdfd, stop:1 #f0f0f0);
   color: black;
-  padding: 4px;
+  /* padding: 1px; */
+}
+
+QHeaderView::section:hover {
+  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #ffffff, stop:1 #fefefe);
+}
+
+QHeaderView::section:checked, QHeaderView::section:selected {
+  background-color: @ThemeAccentColor1;  /*Does not work currently. */
 }
 
 QHeaderView::section::horizontal {
+    selection-background-color: @ThemeAccentColor1;
   border-bottom: 2px solid #ababab;
   border-right: 0px solid transparent;
   border-top: 2px solid #ababab;
   border-left: 1px solid #ababab;
 }
 
+QHeaderView::section::horizontal:selected {
+  background-color: @ThemeAccentColor1;
+  selection-background-color: @ThemeAccentColor1;
+}
+
+
 QHeaderView::section::horizontal::first, QHeaderView::section::horizontal::only-one {
   /* border-left: 0px solid #ababab; */
 }
@@ -2444,7 +2533,7 @@ QHeaderView::down-arrow {
   width: 12px;
   padding-left: 2px;
   padding-right: 2px;
-  image: url(qss:images_classic/Arrow-down-lightgray.png);
+  image: url(qss:images_classic/arrow-down-lightgray.png);
 }
 
 QHeaderView::up-arrow {
@@ -2454,7 +2543,7 @@ QHeaderView::up-arrow {
   width: 12px;
   padding-left: 2px;
   padding-right: 2px;
-  image: url(qss:images_classic/Arrow-up-lightgray.png);
+  image: url(qss:images_classic/arrow-up-lightgray.png);
 }
 
 /* QToolBox --------------------------------------------------------------
@@ -2491,7 +2580,7 @@ QToolBox::tab:disabled {
 }
 
 QToolBox::tab:selected {
- background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #fefefe, stop:1 #f8f8f8);
+ background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #ffffff, stop:1 #fefefe);
 }
 
 QToolBox::tab:selected:disabled {
@@ -2509,7 +2598,7 @@ QToolBox::tab:!selected:disabled {
 }
 
 QToolBox::tab:hover {
- background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #fefefe, stop:1 #f8f8f8);
+ background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #ffffff, stop:1 #fefefe);
   }
 
 QToolBox > QScrollArea > QWidget > QWidget {
@@ -2559,7 +2648,7 @@ https://stackoverflow.com/questions/14581498/qt-stylesheet-for-hline-vline-color
 https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qsplitter
 
 ---------------------------------------------------------------------------*/
-QSplitterHandle:hover { /* to fix bug about hovering on splitters https://bugreports.qt.io/browse/QTBUG-13768 */
+QSplitterHandle:hover { /* to fix bug about hovering on splitters https://bugreports.qt.io/browse/qTBUG-13768 */
 
 }
 
@@ -2620,13 +2709,13 @@ QDateEdit::drop-down, QDateTimeEdit::drop-down {
 }
 
 QDateEdit::down-arrow, QDateTimeEdit::down-arrow {
-  image: url(qss:images_classic/Arrow-down-lightgray.png);
+  image: url(qss:images_classic/arrow-down-lightgray.png);
   height: 8px;
   width: 8px;
 }
 
 QDateEdit::down-arrow:on, QDateEdit::down-arrow:hover, QDateEdit::down-arrow:focus, QDateTimeEdit::down-arrow:on, QDateTimeEdit::down-arrow:hover, QDateTimeEdit::down-arrow:focus {
-  image: url(qss:images_classic/Arrow-down-black.png);
+  image: url(qss:images_classic/arrow-down-black.png);
 }
 
 QDateEdit QAbstractItemView, QDateTimeEdit QAbstractItemView {
@@ -2750,22 +2839,22 @@ Settings menu #groupsTreeView:
 
 QTreeView::branch#groupsTreeView:closed:has-children:has-siblings  {
   border-image: none;
-  image: url(qss:images_classic/Arrow-right-black.png);
+  image: url(qss:images_classic/arrow-right-black.png);
 }
 
 QTreeView::branch#groupsTreeView:open:has-children:has-siblings  {
   border-image: none;
-  image: url(qss:images_classic/Arrow-down-black.png);
+  image: url(qss:images_classic/arrow-down-black.png);
 }
 
 QTreeView::branch#groupsTreeView:open:has-children:!has-siblings  {
   border-image: none;
-  image: url(qss:images_classic/Arrow-down-black.png);
+  image: url(qss:images_classic/arrow-down-black.png);
 }
 
 QTreeView::branch#groupsTreeView:has-children:!has-siblings:closed  {
   border-image: none;
-  image: url(qss:images_classic/Arrow-right-black.png);
+  image: url(qss:images_classic/arrow-right-black.png);
 }
 
 QTreeView::branch#groupsTreeView:has-siblings:!adjoins-item  {
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-double-LeftRight-black.png b/src/Gui/Stylesheets/images_classic/arrow-double-leftright-black.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Arrow-double-LeftRight-black.png
rename to src/Gui/Stylesheets/images_classic/arrow-double-leftright-black.png
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-double-LeftRight-blue.png b/src/Gui/Stylesheets/images_classic/arrow-double-leftright-blue.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Arrow-double-LeftRight-blue.png
rename to src/Gui/Stylesheets/images_classic/arrow-double-leftright-blue.png
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-double-LeftRight-darkgray.png b/src/Gui/Stylesheets/images_classic/arrow-double-leftright-darkgray.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Arrow-double-LeftRight-darkgray.png
rename to src/Gui/Stylesheets/images_classic/arrow-double-leftright-darkgray.png
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-double-LeftRight-lightgray.png b/src/Gui/Stylesheets/images_classic/arrow-double-leftright-lightgray.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Arrow-double-LeftRight-lightgray.png
rename to src/Gui/Stylesheets/images_classic/arrow-double-leftright-lightgray.png
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-double-LeftRight-white.png b/src/Gui/Stylesheets/images_classic/arrow-double-leftright-white.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Arrow-double-LeftRight-white.png
rename to src/Gui/Stylesheets/images_classic/arrow-double-leftright-white.png
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-double-UpDown-black.png b/src/Gui/Stylesheets/images_classic/arrow-double-updown-black.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Arrow-double-UpDown-black.png
rename to src/Gui/Stylesheets/images_classic/arrow-double-updown-black.png
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-double-UpDown-blue.png b/src/Gui/Stylesheets/images_classic/arrow-double-updown-blue.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Arrow-double-UpDown-blue.png
rename to src/Gui/Stylesheets/images_classic/arrow-double-updown-blue.png
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-double-UpDown-darkgray.png b/src/Gui/Stylesheets/images_classic/arrow-double-updown-darkgray.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Arrow-double-UpDown-darkgray.png
rename to src/Gui/Stylesheets/images_classic/arrow-double-updown-darkgray.png
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-double-UpDown-lightgray.png b/src/Gui/Stylesheets/images_classic/arrow-double-updown-lightgray.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Arrow-double-UpDown-lightgray.png
rename to src/Gui/Stylesheets/images_classic/arrow-double-updown-lightgray.png
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-double-UpDown-white.png b/src/Gui/Stylesheets/images_classic/arrow-double-updown-white.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Arrow-double-UpDown-white.png
rename to src/Gui/Stylesheets/images_classic/arrow-double-updown-white.png
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-down-black.png b/src/Gui/Stylesheets/images_classic/arrow-down-black.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Arrow-down-black.png
rename to src/Gui/Stylesheets/images_classic/arrow-down-black.png
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-down-blue.png b/src/Gui/Stylesheets/images_classic/arrow-down-blue.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Arrow-down-blue.png
rename to src/Gui/Stylesheets/images_classic/arrow-down-blue.png
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-down-darkgray.png b/src/Gui/Stylesheets/images_classic/arrow-down-darkgray.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Arrow-down-darkgray.png
rename to src/Gui/Stylesheets/images_classic/arrow-down-darkgray.png
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-down-lightgray.png b/src/Gui/Stylesheets/images_classic/arrow-down-lightgray.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Arrow-down-lightgray.png
rename to src/Gui/Stylesheets/images_classic/arrow-down-lightgray.png
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-down-white.png b/src/Gui/Stylesheets/images_classic/arrow-down-white.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Arrow-down-white.png
rename to src/Gui/Stylesheets/images_classic/arrow-down-white.png
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-left-black.png b/src/Gui/Stylesheets/images_classic/arrow-left-black.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Arrow-left-black.png
rename to src/Gui/Stylesheets/images_classic/arrow-left-black.png
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-left-blue.png b/src/Gui/Stylesheets/images_classic/arrow-left-blue.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Arrow-left-blue.png
rename to src/Gui/Stylesheets/images_classic/arrow-left-blue.png
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-left-darkgray.png b/src/Gui/Stylesheets/images_classic/arrow-left-darkgray.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Arrow-left-darkgray.png
rename to src/Gui/Stylesheets/images_classic/arrow-left-darkgray.png
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-left-lightgray.png b/src/Gui/Stylesheets/images_classic/arrow-left-lightgray.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Arrow-left-lightgray.png
rename to src/Gui/Stylesheets/images_classic/arrow-left-lightgray.png
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-left-white.png b/src/Gui/Stylesheets/images_classic/arrow-left-white.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Arrow-left-white.png
rename to src/Gui/Stylesheets/images_classic/arrow-left-white.png
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-leftDown-black.png b/src/Gui/Stylesheets/images_classic/arrow-leftdown-black.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Arrow-leftDown-black.png
rename to src/Gui/Stylesheets/images_classic/arrow-leftdown-black.png
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-leftDown-blue.png b/src/Gui/Stylesheets/images_classic/arrow-leftdown-blue.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Arrow-leftDown-blue.png
rename to src/Gui/Stylesheets/images_classic/arrow-leftdown-blue.png
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-leftDown-darkgray.png b/src/Gui/Stylesheets/images_classic/arrow-leftdown-darkgray.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Arrow-leftDown-darkgray.png
rename to src/Gui/Stylesheets/images_classic/arrow-leftdown-darkgray.png
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-leftDown-lightgray.png b/src/Gui/Stylesheets/images_classic/arrow-leftdown-lightgray.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Arrow-leftDown-lightgray.png
rename to src/Gui/Stylesheets/images_classic/arrow-leftdown-lightgray.png
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-leftDown-white.png b/src/Gui/Stylesheets/images_classic/arrow-leftdown-white.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Arrow-leftDown-white.png
rename to src/Gui/Stylesheets/images_classic/arrow-leftdown-white.png
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-right-black.png b/src/Gui/Stylesheets/images_classic/arrow-right-black.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Arrow-right-black.png
rename to src/Gui/Stylesheets/images_classic/arrow-right-black.png
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-right-blue.png b/src/Gui/Stylesheets/images_classic/arrow-right-blue.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Arrow-right-blue.png
rename to src/Gui/Stylesheets/images_classic/arrow-right-blue.png
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-right-darkgray.png b/src/Gui/Stylesheets/images_classic/arrow-right-darkgray.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Arrow-right-darkgray.png
rename to src/Gui/Stylesheets/images_classic/arrow-right-darkgray.png
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-right-lightgray.png b/src/Gui/Stylesheets/images_classic/arrow-right-lightgray.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Arrow-right-lightgray.png
rename to src/Gui/Stylesheets/images_classic/arrow-right-lightgray.png
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-right-white.png b/src/Gui/Stylesheets/images_classic/arrow-right-white.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Arrow-right-white.png
rename to src/Gui/Stylesheets/images_classic/arrow-right-white.png
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-rightDown-black.png b/src/Gui/Stylesheets/images_classic/arrow-rightdown-black.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Arrow-rightDown-black.png
rename to src/Gui/Stylesheets/images_classic/arrow-rightdown-black.png
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-rightDown-blue.png b/src/Gui/Stylesheets/images_classic/arrow-rightdown-blue.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Arrow-rightDown-blue.png
rename to src/Gui/Stylesheets/images_classic/arrow-rightdown-blue.png
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-rightDown-darkgray.png b/src/Gui/Stylesheets/images_classic/arrow-rightdown-darkgray.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Arrow-rightDown-darkgray.png
rename to src/Gui/Stylesheets/images_classic/arrow-rightdown-darkgray.png
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-rightDown-lightgray.png b/src/Gui/Stylesheets/images_classic/arrow-rightdown-lightgray.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Arrow-rightDown-lightgray.png
rename to src/Gui/Stylesheets/images_classic/arrow-rightdown-lightgray.png
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-rightDown-white.png b/src/Gui/Stylesheets/images_classic/arrow-rightdown-white.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Arrow-rightDown-white.png
rename to src/Gui/Stylesheets/images_classic/arrow-rightdown-white.png
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-up-black.png b/src/Gui/Stylesheets/images_classic/arrow-up-black.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Arrow-up-black.png
rename to src/Gui/Stylesheets/images_classic/arrow-up-black.png
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-up-blue.png b/src/Gui/Stylesheets/images_classic/arrow-up-blue.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Arrow-up-blue.png
rename to src/Gui/Stylesheets/images_classic/arrow-up-blue.png
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-up-darkgray.png b/src/Gui/Stylesheets/images_classic/arrow-up-darkgray.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Arrow-up-darkgray.png
rename to src/Gui/Stylesheets/images_classic/arrow-up-darkgray.png
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-up-lightgray.png b/src/Gui/Stylesheets/images_classic/arrow-up-lightgray.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Arrow-up-lightgray.png
rename to src/Gui/Stylesheets/images_classic/arrow-up-lightgray.png
diff --git a/src/Gui/Stylesheets/images_classic/Arrow-up-white.png b/src/Gui/Stylesheets/images_classic/arrow-up-white.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Arrow-up-white.png
rename to src/Gui/Stylesheets/images_classic/arrow-up-white.png
diff --git a/src/Gui/Stylesheets/images_classic/checkbox-Empty-black.png b/src/Gui/Stylesheets/images_classic/checkbox-empty-black.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/checkbox-Empty-black.png
rename to src/Gui/Stylesheets/images_classic/checkbox-empty-black.png
diff --git a/src/Gui/Stylesheets/images_classic/checkbox-Empty-blue.png b/src/Gui/Stylesheets/images_classic/checkbox-empty-blue.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/checkbox-Empty-blue.png
rename to src/Gui/Stylesheets/images_classic/checkbox-empty-blue.png
diff --git a/src/Gui/Stylesheets/images_classic/checkbox-Empty-darkgray.png b/src/Gui/Stylesheets/images_classic/checkbox-empty-darkgray.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/checkbox-Empty-darkgray.png
rename to src/Gui/Stylesheets/images_classic/checkbox-empty-darkgray.png
diff --git a/src/Gui/Stylesheets/images_classic/checkbox-Empty-lightgray.png b/src/Gui/Stylesheets/images_classic/checkbox-empty-lightgray.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/checkbox-Empty-lightgray.png
rename to src/Gui/Stylesheets/images_classic/checkbox-empty-lightgray.png
diff --git a/src/Gui/Stylesheets/images_classic/checkbox-Empty-white.png b/src/Gui/Stylesheets/images_classic/checkbox-empty-white.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/checkbox-Empty-white.png
rename to src/Gui/Stylesheets/images_classic/checkbox-empty-white.png
diff --git a/src/Gui/Stylesheets/images_classic/Close-DarkRed.png b/src/Gui/Stylesheets/images_classic/close-darkred.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Close-DarkRed.png
rename to src/Gui/Stylesheets/images_classic/close-darkred.png
diff --git a/src/Gui/Stylesheets/images_classic/Close-lightgray.png b/src/Gui/Stylesheets/images_classic/close-lightgray.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Close-lightgray.png
rename to src/Gui/Stylesheets/images_classic/close-lightgray.png
diff --git a/src/Gui/Stylesheets/images_classic/Hmovetoolbar-black.png b/src/Gui/Stylesheets/images_classic/hmovetoolbar-black.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Hmovetoolbar-black.png
rename to src/Gui/Stylesheets/images_classic/hmovetoolbar-black.png
diff --git a/src/Gui/Stylesheets/images_classic/Hmovetoolbar-blue.png b/src/Gui/Stylesheets/images_classic/hmovetoolbar-blue.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Hmovetoolbar-blue.png
rename to src/Gui/Stylesheets/images_classic/hmovetoolbar-blue.png
diff --git a/src/Gui/Stylesheets/images_classic/Hmovetoolbar-darkgray.png b/src/Gui/Stylesheets/images_classic/hmovetoolbar-darkgray.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Hmovetoolbar-darkgray.png
rename to src/Gui/Stylesheets/images_classic/hmovetoolbar-darkgray.png
diff --git a/src/Gui/Stylesheets/images_classic/Hmovetoolbar-lightgray.png b/src/Gui/Stylesheets/images_classic/hmovetoolbar-lightgray.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Hmovetoolbar-lightgray.png
rename to src/Gui/Stylesheets/images_classic/hmovetoolbar-lightgray.png
diff --git a/src/Gui/Stylesheets/images_classic/Hmovetoolbar-white.png b/src/Gui/Stylesheets/images_classic/hmovetoolbar-white.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Hmovetoolbar-white.png
rename to src/Gui/Stylesheets/images_classic/hmovetoolbar-white.png
diff --git a/src/Gui/Stylesheets/images_classic/Hsepartoolbar-black.png b/src/Gui/Stylesheets/images_classic/hsepartoolbar-black.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Hsepartoolbar-black.png
rename to src/Gui/Stylesheets/images_classic/hsepartoolbar-black.png
diff --git a/src/Gui/Stylesheets/images_classic/Hsepartoolbar-blue.png b/src/Gui/Stylesheets/images_classic/hsepartoolbar-blue.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Hsepartoolbar-blue.png
rename to src/Gui/Stylesheets/images_classic/hsepartoolbar-blue.png
diff --git a/src/Gui/Stylesheets/images_classic/Hsepartoolbar-darkgray.png b/src/Gui/Stylesheets/images_classic/hsepartoolbar-darkgray.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Hsepartoolbar-darkgray.png
rename to src/Gui/Stylesheets/images_classic/hsepartoolbar-darkgray.png
diff --git a/src/Gui/Stylesheets/images_classic/Hsepartoolbar-lightgray.png b/src/Gui/Stylesheets/images_classic/hsepartoolbar-lightgray.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Hsepartoolbar-lightgray.png
rename to src/Gui/Stylesheets/images_classic/hsepartoolbar-lightgray.png
diff --git a/src/Gui/Stylesheets/images_classic/Hsepartoolbar-white.png b/src/Gui/Stylesheets/images_classic/hsepartoolbar-white.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Hsepartoolbar-white.png
rename to src/Gui/Stylesheets/images_classic/hsepartoolbar-white.png
diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_fold_black.png b/src/Gui/Stylesheets/images_classic/qsint_header_fold_black.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Qsint_header_fold_black.png
rename to src/Gui/Stylesheets/images_classic/qsint_header_fold_black.png
diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_Fold_Blue-Blue.png b/src/Gui/Stylesheets/images_classic/qsint_header_fold_blue-blue.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Qsint_header_Fold_Blue-Blue.png
rename to src/Gui/Stylesheets/images_classic/qsint_header_fold_blue-blue.png
diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_Fold_Blue-dark.png b/src/Gui/Stylesheets/images_classic/qsint_header_fold_blue-dark.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Qsint_header_Fold_Blue-dark.png
rename to src/Gui/Stylesheets/images_classic/qsint_header_fold_blue-dark.png
diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_Fold_Blue-light.png b/src/Gui/Stylesheets/images_classic/qsint_header_fold_blue-light.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Qsint_header_Fold_Blue-light.png
rename to src/Gui/Stylesheets/images_classic/qsint_header_fold_blue-light.png
diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_fold_darkgray.png b/src/Gui/Stylesheets/images_classic/qsint_header_fold_darkgray.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Qsint_header_fold_darkgray.png
rename to src/Gui/Stylesheets/images_classic/qsint_header_fold_darkgray.png
diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_fold_lightgray.png b/src/Gui/Stylesheets/images_classic/qsint_header_fold_lightgray.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Qsint_header_fold_lightgray.png
rename to src/Gui/Stylesheets/images_classic/qsint_header_fold_lightgray.png
diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_fold_white.png b/src/Gui/Stylesheets/images_classic/qsint_header_fold_white.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Qsint_header_fold_white.png
rename to src/Gui/Stylesheets/images_classic/qsint_header_fold_white.png
diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_FoldOver_Blue-Blue.png b/src/Gui/Stylesheets/images_classic/qsint_header_foldover_blue-blue.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Qsint_header_FoldOver_Blue-Blue.png
rename to src/Gui/Stylesheets/images_classic/qsint_header_foldover_blue-blue.png
diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_FoldOver_Blue-dark.png b/src/Gui/Stylesheets/images_classic/qsint_header_foldover_blue-dark.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Qsint_header_FoldOver_Blue-dark.png
rename to src/Gui/Stylesheets/images_classic/qsint_header_foldover_blue-dark.png
diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_FoldOver_Blue-light.png b/src/Gui/Stylesheets/images_classic/qsint_header_foldover_blue-light.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Qsint_header_FoldOver_Blue-light.png
rename to src/Gui/Stylesheets/images_classic/qsint_header_foldover_blue-light.png
diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_unfold_black.png b/src/Gui/Stylesheets/images_classic/qsint_header_unfold_black.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Qsint_header_unfold_black.png
rename to src/Gui/Stylesheets/images_classic/qsint_header_unfold_black.png
diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_Unfold_Blue-Blue.png b/src/Gui/Stylesheets/images_classic/qsint_header_unfold_blue-blue.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Qsint_header_Unfold_Blue-Blue.png
rename to src/Gui/Stylesheets/images_classic/qsint_header_unfold_blue-blue.png
diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_Unfold_Blue-dark.png b/src/Gui/Stylesheets/images_classic/qsint_header_unfold_blue-dark.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Qsint_header_Unfold_Blue-dark.png
rename to src/Gui/Stylesheets/images_classic/qsint_header_unfold_blue-dark.png
diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_Unfold_Blue-light.png b/src/Gui/Stylesheets/images_classic/qsint_header_unfold_blue-light.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Qsint_header_Unfold_Blue-light.png
rename to src/Gui/Stylesheets/images_classic/qsint_header_unfold_blue-light.png
diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_unfold_darkgray.png b/src/Gui/Stylesheets/images_classic/qsint_header_unfold_darkgray.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Qsint_header_unfold_darkgray.png
rename to src/Gui/Stylesheets/images_classic/qsint_header_unfold_darkgray.png
diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_unfold_lightgray.png b/src/Gui/Stylesheets/images_classic/qsint_header_unfold_lightgray.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Qsint_header_unfold_lightgray.png
rename to src/Gui/Stylesheets/images_classic/qsint_header_unfold_lightgray.png
diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_unfold_white.png b/src/Gui/Stylesheets/images_classic/qsint_header_unfold_white.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Qsint_header_unfold_white.png
rename to src/Gui/Stylesheets/images_classic/qsint_header_unfold_white.png
diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_UnFoldOver_Blue-Blue.png b/src/Gui/Stylesheets/images_classic/qsint_header_unfoldover_blue-blue.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Qsint_header_UnFoldOver_Blue-Blue.png
rename to src/Gui/Stylesheets/images_classic/qsint_header_unfoldover_blue-blue.png
diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_UnfoldOver_Blue-dark.png b/src/Gui/Stylesheets/images_classic/qsint_header_unfoldover_blue-dark.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Qsint_header_UnfoldOver_Blue-dark.png
rename to src/Gui/Stylesheets/images_classic/qsint_header_unfoldover_blue-dark.png
diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_UnfoldOver_Blue-light.png b/src/Gui/Stylesheets/images_classic/qsint_header_unfoldover_blue-light.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Qsint_header_UnfoldOver_Blue-light.png
rename to src/Gui/Stylesheets/images_classic/qsint_header_unfoldover_blue-light.png
diff --git a/src/Gui/Stylesheets/images_classic/Radio-checked-black.png b/src/Gui/Stylesheets/images_classic/radio-checked-black.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Radio-checked-black.png
rename to src/Gui/Stylesheets/images_classic/radio-checked-black.png
diff --git a/src/Gui/Stylesheets/images_classic/Radio-checked-blue.png b/src/Gui/Stylesheets/images_classic/radio-checked-blue.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Radio-checked-blue.png
rename to src/Gui/Stylesheets/images_classic/radio-checked-blue.png
diff --git a/src/Gui/Stylesheets/images_classic/Radio-checked-darkgray.png b/src/Gui/Stylesheets/images_classic/radio-checked-darkgray.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Radio-checked-darkgray.png
rename to src/Gui/Stylesheets/images_classic/radio-checked-darkgray.png
diff --git a/src/Gui/Stylesheets/images_classic/Radio-checked-lightgray.png b/src/Gui/Stylesheets/images_classic/radio-checked-lightgray.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Radio-checked-lightgray.png
rename to src/Gui/Stylesheets/images_classic/radio-checked-lightgray.png
diff --git a/src/Gui/Stylesheets/images_classic/Radio-checked-white.png b/src/Gui/Stylesheets/images_classic/radio-checked-white.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Radio-checked-white.png
rename to src/Gui/Stylesheets/images_classic/radio-checked-white.png
diff --git a/src/Gui/Stylesheets/images_classic/Radio-unchecked-black.png b/src/Gui/Stylesheets/images_classic/radio-unchecked-black.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Radio-unchecked-black.png
rename to src/Gui/Stylesheets/images_classic/radio-unchecked-black.png
diff --git a/src/Gui/Stylesheets/images_classic/Radio-unchecked-blue.png b/src/Gui/Stylesheets/images_classic/radio-unchecked-blue.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Radio-unchecked-blue.png
rename to src/Gui/Stylesheets/images_classic/radio-unchecked-blue.png
diff --git a/src/Gui/Stylesheets/images_classic/Radio-unchecked-darkgray.png b/src/Gui/Stylesheets/images_classic/radio-unchecked-darkgray.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Radio-unchecked-darkgray.png
rename to src/Gui/Stylesheets/images_classic/radio-unchecked-darkgray.png
diff --git a/src/Gui/Stylesheets/images_classic/Radio-unchecked-lightgray.png b/src/Gui/Stylesheets/images_classic/radio-unchecked-lightgray.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Radio-unchecked-lightgray.png
rename to src/Gui/Stylesheets/images_classic/radio-unchecked-lightgray.png
diff --git a/src/Gui/Stylesheets/images_classic/Radio-unchecked-white.png b/src/Gui/Stylesheets/images_classic/radio-unchecked-white.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Radio-unchecked-white.png
rename to src/Gui/Stylesheets/images_classic/radio-unchecked-white.png
diff --git a/src/Gui/Stylesheets/images_classic/Vmovetoolbar-black.png b/src/Gui/Stylesheets/images_classic/vmovetoolbar-black.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Vmovetoolbar-black.png
rename to src/Gui/Stylesheets/images_classic/vmovetoolbar-black.png
diff --git a/src/Gui/Stylesheets/images_classic/Vmovetoolbar-blue.png b/src/Gui/Stylesheets/images_classic/vmovetoolbar-blue.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Vmovetoolbar-blue.png
rename to src/Gui/Stylesheets/images_classic/vmovetoolbar-blue.png
diff --git a/src/Gui/Stylesheets/images_classic/Vmovetoolbar-darkgray.png b/src/Gui/Stylesheets/images_classic/vmovetoolbar-darkgray.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Vmovetoolbar-darkgray.png
rename to src/Gui/Stylesheets/images_classic/vmovetoolbar-darkgray.png
diff --git a/src/Gui/Stylesheets/images_classic/Vmovetoolbar-lightgray.png b/src/Gui/Stylesheets/images_classic/vmovetoolbar-lightgray.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Vmovetoolbar-lightgray.png
rename to src/Gui/Stylesheets/images_classic/vmovetoolbar-lightgray.png
diff --git a/src/Gui/Stylesheets/images_classic/Vmovetoolbar-white.png b/src/Gui/Stylesheets/images_classic/vmovetoolbar-white.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Vmovetoolbar-white.png
rename to src/Gui/Stylesheets/images_classic/vmovetoolbar-white.png
diff --git a/src/Gui/Stylesheets/images_classic/Vsepartoolbar-black.png b/src/Gui/Stylesheets/images_classic/vsepartoolbar-black.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Vsepartoolbar-black.png
rename to src/Gui/Stylesheets/images_classic/vsepartoolbar-black.png
diff --git a/src/Gui/Stylesheets/images_classic/Vsepartoolbar-blue.png b/src/Gui/Stylesheets/images_classic/vsepartoolbar-blue.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Vsepartoolbar-blue.png
rename to src/Gui/Stylesheets/images_classic/vsepartoolbar-blue.png
diff --git a/src/Gui/Stylesheets/images_classic/Vsepartoolbar-darkgray.png b/src/Gui/Stylesheets/images_classic/vsepartoolbar-darkgray.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Vsepartoolbar-darkgray.png
rename to src/Gui/Stylesheets/images_classic/vsepartoolbar-darkgray.png
diff --git a/src/Gui/Stylesheets/images_classic/Vsepartoolbar-lightgray.png b/src/Gui/Stylesheets/images_classic/vsepartoolbar-lightgray.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Vsepartoolbar-lightgray.png
rename to src/Gui/Stylesheets/images_classic/vsepartoolbar-lightgray.png
diff --git a/src/Gui/Stylesheets/images_classic/Vsepartoolbar-white.png b/src/Gui/Stylesheets/images_classic/vsepartoolbar-white.png
similarity index 100%
rename from src/Gui/Stylesheets/images_classic/Vsepartoolbar-white.png
rename to src/Gui/Stylesheets/images_classic/vsepartoolbar-white.png