diff --git a/src/Gui/PreferencePacks/FreeCAD Dark/FreeCAD Dark.cfg b/src/Gui/PreferencePacks/FreeCAD Dark/FreeCAD Dark.cfg
index 9bf93bfa68..f1a9024b8a 100644
--- a/src/Gui/PreferencePacks/FreeCAD Dark/FreeCAD Dark.cfg	
+++ b/src/Gui/PreferencePacks/FreeCAD Dark/FreeCAD Dark.cfg	
@@ -7,7 +7,7 @@
         <FCParamGroup Name="Themes">
           <FCUInt Name="ThemeAccentColor1" Value="1252392959"/>
           <FCUInt Name="ThemeAccentColor2" Value="3027763199"/>
-          <FCUInt Name="ThemeAccentColor3" Value="4290017279"/>
+          <FCUInt Name="ThemeAccentColor3" Value="404564735"/>
         </FCParamGroup>
         <FCParamGroup Name="View">
           <FCUInt Name="SketchEdgeColor" Value="4059297279"/>
diff --git a/src/Gui/PreferencePacks/FreeCAD Light/FreeCAD Light.cfg b/src/Gui/PreferencePacks/FreeCAD Light/FreeCAD Light.cfg
index 2a21e1737f..85a3338a6d 100644
--- a/src/Gui/PreferencePacks/FreeCAD Light/FreeCAD Light.cfg	
+++ b/src/Gui/PreferencePacks/FreeCAD Light/FreeCAD Light.cfg	
@@ -6,7 +6,7 @@
         <FCParamGroup Name="Themes">
           <FCUInt Name="ThemeAccentColor1" Value="1252392959"/>
           <FCUInt Name="ThemeAccentColor2" Value="3027763199"/>
-          <FCUInt Name="ThemeAccentColor3" Value="4290017279"/>
+          <FCUInt Name="ThemeAccentColor3" Value="3353277951"/>
         </FCParamGroup>
         <FCParamGroup Name="Mod">
           <FCParamGroup Name="Start">
@@ -147,8 +147,8 @@
           <FCUInt Name="BacklightColor" Value="4059297279"/>
           <FCUInt Name="BoundingBoxColor" Value="1230002175"/>
           <FCUInt Name="DefaultShapeColor" Value="2914369023"/>
-          <FCUInt Name="HighlightColor" Value="1553296639"/>
-          <FCUInt Name="SelectionColor" Value="1401005823"/>
+          <FCUInt Name="HighlightColor" Value="1148145919"/>
+          <FCUInt Name="SelectionColor" Value="1114146303"/>
           <FCUInt Name="CbLabelColor" Value="556083711"/>
           <FCUInt Name="DefaultShapeLineColor" Value="421075455"/>
           <FCUInt Name="DefaultShapeVertexColor" Value="421075455"/>
diff --git a/src/Gui/Stylesheets/FreeCAD Dark.qss b/src/Gui/Stylesheets/FreeCAD Dark.qss
index 6545dfc525..df4c223426 100644
--- a/src/Gui/Stylesheets/FreeCAD Dark.qss	
+++ b/src/Gui/Stylesheets/FreeCAD Dark.qss	
@@ -60,17 +60,18 @@ Gui--PropertyEditor--PropertyEditor QAbstractSpinBox:read-only,
 Gui--PropertyEditor--PropertyEditor QAbstractSpinBox:disabled {
     color: transparent;
     border-color: transparent;
-    background-color: transparent;
+    background-color: #444444;
     selection-color: transparent;
     selection-background-color: transparent;
-
+    border-radius: 2px;
 }
+
 Gui--PropertyEditor--PropertyEditor > QWidget > QWidget > QLabel,
 Gui--PropertyEditor--PropertyEditor > QWidget > QWidget > QLabel:disabled {
     color: transparent;
     background-color: transparent;
     border: none;
-    border-radius: 0px;
+    border-radius: 2px;
     margin: 0px;
     padding: 0px;
 }
@@ -82,9 +83,8 @@ Gui--PropertyEditor--PropertyEditor QLineEdit,
 Gui--PropertyEditor--PropertyEditor QComboBox {
     margin-left: 0px;
     margin-right: 0px;
-    padding-top: 0px;
-    padding-bottom: 0px;
-
+    padding: 0 2px;
+    border-radius: 2px;
 }
 
 /* fix for column items background when a link is present */
@@ -96,6 +96,7 @@ Gui--PropertyEditor--PropertyEditor > QWidget > QFrame:focus {
 Gui--PropertyEditor--PropertyEditor > QWidget > QWidget > QLabel {
 	color: #ffffff;
 	background-color: #ACC8E5; /* same as focused background color */
+  border-radius: 2px;
 }
 
 /*==================================================================================================
@@ -131,11 +132,11 @@ This causes much load time.
   /* selection-color: white; */
 /* } */
 
-QWidget:disabled {
+/* QWidget:disabled {
   color: #adadad;
   selection-background-color: @ThemeAccentColor1;
   selection-color: #cccccc;
-}
+} */
 
 QWidget::item:selected {
   background-color: @ThemeAccentColor1;
@@ -191,7 +192,7 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtooltip
 
 --------------------------------------------------------------------------- */
 QToolTip {
-  background-color: #ffffff;
+  background-color: #FFFFE1;
   color: black;
   /* If you remove the border property, background stops working on Windows */
   border: none;
@@ -216,7 +217,7 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qstatusbar
 QStatusBar {
   border: 0px solid #3c3c3c;
   /* Fixes Spyder #9120, #9121 */
-  background: #333333;
+  background-color: #333333;
   /* Fixes #205, white vertical borders separating items */
 }
 
@@ -236,7 +237,7 @@ QStatusBar QToolTip {
 
 QStatusBar QLabel {
   /* Fixes Spyder #9120, #9121 */
-  background: transparent;
+  background-color: transparent;
 }
 
 /* QCheckBox --------------------------------------------------------------
@@ -246,11 +247,11 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qcheckbox
 --------------------------------------------------------------------------- */
 QCheckBox {
   color: white;
-  padding: 0px;
+  padding: 1px;
   outline: none;
   border: 1px solid transparent;
   background-color: transparent;
-  spacing:8px;
+  spacing: 8px;
 }
 
 QCheckBox:focus {
@@ -336,41 +337,49 @@ QGroupBox::title {
 }
 
 QGroupBox::indicator {
-  color: white;
-  background-color: #3c3c3c;
-  border: 1px solid #020202;
+  background-color: #000000;
   width: 12px;
   height: 12px;
-  border-radius:1px;
+  margin: 1px;
+  border: 1px solid #ffffff;
 }
 
 QGroupBox::indicator:unchecked {
-  background-color: #020202;
-  border: 1px solid #020202;
-  image: url(qss:images_classic/checkbox-indeterminate-white.png);
+  background-color: #000000;
 }
 
-QGroupBox::indicator:unchecked:hover, QGroupBox::indicator:unchecked:focus, QGroupBox::indicator:unchecked:pressed {
+QGroupBox::indicator:unchecked:hover {
   background-color: @ThemeAccentColor1;
+  border: 1px solid #ffffff;
+}
+
+QGroupBox::indicator:unchecked:focus {
+   border: 1px solid @ThemeAccentColor2;
 }
 
 QGroupBox::indicator:unchecked:disabled {
   background-color: #444444;
-  border: 1px solid #020202;
+  border: 1px solid #ffffff;
 }
 
 QGroupBox::indicator:checked {
-  border: none;
-  image:url(qss:images_classic/checkbox-checked-white.png);
+  background-color: #000000;
+  border: 1px solid #ffffff;
+  image:url(qss:images_classic/check-mark-white.png);
 }
 
-QGroupBox::indicator:checked:hover, QGroupBox::indicator:checked:focus, QGroupBox::indicator:checked:pressed {
+QGroupBox::indicator:checked:hover {
   background-color: @ThemeAccentColor1;
+  border: 1px solid #ffffff;
+}
+QGroupBox::indicator:checked:focus {
+   border: 1px solid @ThemeAccentColor2;
 }
-
 QGroupBox::indicator:checked:disabled {
-  background-color: @ThemeAccentColor1;
-}
+  background-color: #d8d8d8;
+  image:url(qss:images_classic/check-mark-lightgray.png);
+  border: 1px solid #ffffff;
+  }
 
 /* QRadioButton -----------------------------------------------------------
 
@@ -381,9 +390,9 @@ QRadioButton {
   background-color: transparent;
   color: white;
   border: none;
-  spacing: 4px;
-  padding-top: 4px;
-  padding-bottom: 4px;
+  spacing: 8px;
+  /* padding-top: 4px;
+  padding-bottom: 4px; */
   outline: none;
 }
 
@@ -459,11 +468,11 @@ QMenuBar:focus {
 }
 
 QMenuBar::item {
-  background: transparent;
+  background-color: transparent;
 }
 
 QMenuBar::item:selected {
-  background: transparent;
+  background-color: transparent;
   border: 0px solid #020202;
   background-color: @ThemeAccentColor1;
 }
@@ -530,7 +539,7 @@ QMenu::indicator {
 }
 
 QMenu::icon:checked { /* appearance of a 'checked' icon */
-  background: @ThemeAccentColor2;
+  background-color: @ThemeAccentColor2;
   margin-left: -5px;
   border: 5px solid @ThemeAccentColor2;
   position: absolute;
@@ -542,7 +551,7 @@ QMenu::indicator:non-exclusive:unchecked {
 
 QMenu::indicator:non-exclusive:unchecked:hover, QMenu::indicator:non-exclusive:unchecked:focus, QMenu::indicator:non-exclusive:unchecked:pressed {
   border: none;
-  background: @ThemeAccentColor1;
+  background-color: @ThemeAccentColor1;
 }
 
 QMenu::indicator:non-exclusive:unchecked:disabled {
@@ -555,7 +564,7 @@ QMenu::indicator:non-exclusive:checked {
 
 QMenu::indicator:non-exclusive:checked:hover, QMenu::indicator:non-exclusive:checked:focus, QMenu::indicator:non-exclusive:checked:pressed {
   border: none;
-  background: @ThemeAccentColor1;
+  background-color: @ThemeAccentColor1;
 }
 
 QMenu::indicator:non-exclusive:checked:disabled {
@@ -581,7 +590,7 @@ QMenu::indicator:exclusive:unchecked {
 QMenu::indicator:exclusive:unchecked:hover, QMenu::indicator:exclusive:unchecked:focus, QMenu::indicator:exclusive:unchecked:pressed {
   border: none;
   outline: none;
-  background: @ThemeAccentColor1;
+  background-color: @ThemeAccentColor1;
   image: url(qss:images_classic/checkbox-Empty-white.png);
 }
 
@@ -598,7 +607,7 @@ QMenu::indicator:exclusive:checked {
 QMenu::indicator:exclusive:checked:hover, QMenu::indicator:exclusive:checked:focus, QMenu::indicator:exclusive:checked:pressed {
   border: none;
   outline: none;
-  background: @ThemeAccentColor1;
+  background-color: @ThemeAccentColor1;
   image: url(qss:images_classic/checkbox-Empty-white.png);
 }
 
@@ -622,10 +631,10 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qcombobox
 
 --------------------------------------------------------------------------- */
 QAbstractItemView {
-  alternate-background-color: #5b5b5b;
+  alternate-background-color: #333333;
   color: white;
   border: 1px solid #020202;
-  border-radius: 2px;
+  border-radius: 3px;
 }
 
 QAbstractItemView QLineEdit {
@@ -640,7 +649,7 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qabstractscrollarea
 QAbstractScrollArea {
   background-color: transparent;
   border: 0px solid #020202;
-  border-radius: 0px;
+  border-radius: 3px;
   /* fix #159 */
   padding: 0px;
   /* remove min-height to fix #244 */
@@ -649,6 +658,7 @@ QAbstractScrollArea {
 
 QAbstractScrollArea:disabled {
   color: #adadad;
+  background-color: #444444;
 }
 
 /* QScrollArea ------------------------------------------------------------
@@ -656,7 +666,8 @@ QAbstractScrollArea:disabled {
 ---------------------------------------------------------------------------
 text input field disabled!!!!*/
 QScrollArea QWidget:disabled {
-  background-color: transparent
+  /* background-color: #444444; */
+    color: #adadad;
 }
 
 /* QScrollBar -------------------------------------------------------------
@@ -787,19 +798,19 @@ QScrollBar::sub-line:vertical:hover, QScrollBar::sub-line:vertical:on {
 }
 
 QScrollBar::up-arrow:horizontal, QScrollBar::down-arrow:horizontal {
-  background: none;
+  background-color: none;
 }
 
 QScrollBar::up-arrow:vertical, QScrollBar::down-arrow:vertical {
-  background: none;
+  background-color: none;
 }
 
 QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal {
-  background: none;
+  background-color: none;
 }
 
 QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {
-  background: none;
+  background-color: none;
 }
 
 /* QTextEdit --------------------------------------------------------------
@@ -821,7 +832,7 @@ QTextEdit:focus {
 }
 
 QTextEdit:selected {
-  background: #346792;
+  background-color: #346792;
   color: white;
 }
 
@@ -831,7 +842,7 @@ Python
 QPlainTextEdit {
   background-color: #3c3c3c;
   color: white;
-  border-radius: 1.9px;
+  border-radius: 2px;
   border: 0px solid #020202;
 }
 
@@ -840,7 +851,7 @@ QPlainTextEdit:focus {
 }
 
 QPlainTextEdit:selected {
-  background: @ThemeAccentColor1;
+  background-color: @ThemeAccentColor1;
   color: white;
 }
 
@@ -850,7 +861,7 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qsizegrip
 
 --------------------------------------------------------------------------- */
 QSizeGrip {
-  background: transparent;
+  background-color: transparent;
   width: 12px;
   height: 12px;
   image:url(qss:images_classic/sizegrip-lightgray.png);
@@ -878,14 +889,14 @@ QToolBar {
 QToolBar:horizontal {
   border-bottom: 1px solid #020202;
   padding-top: 3px;
-  padding-left: 5px;
+  padding-left: 4px;
 }
 
 QToolBar:vertical {
   border-left: 1px solid #020202;
   border-right: 1px solid #020202;
-  padding-top: 3px;
-  padding-left: 2px;
+  padding-top: 4px;
+  padding-left: 3px;
 }
 
 QToolBar:disabled {
@@ -913,13 +924,13 @@ QToolBar::handle:vertical:hover {
 
 QToolBar::separator:horizontal {
   width: 2px;
-  padding: 0px 5px;
+  padding: 0px 3px;
   image: url(qss:images_classic/Hsepartoolbar-Darkgray.png);
 }
 
 QToolBar::separator:vertical {
   height: 2px;
-  padding: 5px 0px;
+  padding: 3px 0px;
   image: url(qss:images_classic/Vsepartoolbar-Darkgray.png);
 }
 
@@ -932,11 +943,11 @@ padding: 0px;
 }
 
 QToolButton#qt_toolbar_ext_button:hover {
-background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #b4b4b4, stop:1 #c0c0c0);
+  background-color: transparent;
 }
 
 QToolButton#qt_toolbar_ext_button:on {
-background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #b4b4b4, stop:1 #c0c0c0);
+  background-color: transparent;
 }
 
 
@@ -949,7 +960,7 @@ QSpinBox {
   border: 1px solid #020202;
   color: white;
   border-radius: 2px;
-  min-height: 1.7em;
+  min-height: 24px;
   padding-left: 4px;
   padding-right: 4px;
 }
@@ -1012,7 +1023,7 @@ QAbstractSpinBox:focus {
 }
 
 QAbstractSpinBox:selected {
-  background: @ThemeAccentColor1;
+  background-color: @ThemeAccentColor1;
 }
 
 /* ------------------------------------------------------------------------ */
@@ -1024,21 +1035,22 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qframe
 
 --------------------------------------------------------------------------- */
 QLabel {
-  background-color: transparent;
-  border: 0px solid #020202;
-  padding: 2px;
-  margin: 0px;
-  color: #ffffff;
+  /* background-color: transparent; */
+  /* border: 0px solid #020202; */
+  /* padding: 2px; */
+  /* margin: 0px; */
+  /* color: #ffffff; */
+  /* border-radius: 3px; */
 }
 
 QLabel:disabled {
-  background-color: transparent;
-  border: 0px solid #020202;
+  /* background-color: transparent; */
+  /* border: 0px solid #020202; */
   color: #adadad;
 }
 
 QLabel[haslink="true"] {
-  color: #0080ff;
+  color: #71b6fb;
 }
 
 
@@ -1051,14 +1063,14 @@ QTextBrowser {
   background-color: #252525;
   border: 1px solid #020202;
   color: white;
-  border-radius: 1.9px;
+  border-radius: 2px;
 }
 
 QTextBrowser:disabled {
   background-color: #444444;
   border: 1px solid #020202;
   color: #adadad;
-  border-radius: 1.9px;
+  border-radius: 2px;
 }
 
 QTextBrowser:hover, QTextBrowser:!hover, QTextBrowser:selected, QTextBrowser:pressed {
@@ -1091,7 +1103,7 @@ QGraphicsView:hover, QGraphicsView:!hover, QGraphicsView:selected, QGraphicsView
 --------------------------------------------------------------------------- */
 QCalendarWidget {
   border: 1px solid #020202;
-  border-radius: 1.9px;
+  border-radius: 2px;
 }
 
 QCalendarWidget:disabled {
@@ -1121,7 +1133,7 @@ QProgressBar {
   background-color: #cccccc;
   border: 1px solid #020202;
   color: white;
-  border-radius: 1.9px;
+  border-radius: 2px;
   text-align: center;
 }
 
@@ -1129,20 +1141,20 @@ QProgressBar:disabled {
   background-color: #444444;
   border: 1px solid #020202;
   color: #696969;
-  border-radius: 1.9px;
+  border-radius: 2px;
   text-align: center;
 }
 
 QProgressBar::chunk {
   background-color: @ThemeAccentColor1;
   color: #444444;
-  border-radius: 1.9px;
+  border-radius: 2px;
 }
 
 QProgressBar::chunk:disabled {
   background-color: #444444;
   color: #020202;
-  border-radius: 1.9px;
+  border-radius: 2px;
 }
 
 /* ------------------------------------------------------------------------ */
@@ -1238,25 +1250,24 @@ QToolButton {
 }
 
 QToolButton:disabled {
-  /* background-color: rgba(0, 0, 0, 0.065); */
-  color: #adadad;
+  padding: 2px;
 }
 
 QToolButton:checked {
-  background-color: @ThemeAccentColor2;
-  border-radius: 2px;
+  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #333333, stop:0.7 #252525, stop:1 #252525);
+  border-radius: 3px;
+  border-left: 1px solid #020202;
+  border-top: 1px solid #020202;
+  border-right: 1px solid #444444;
+  border-bottom: 1px solid #444444;
 }
 
 QToolButton:checked:disabled {
-  background-color: @ThemeAccentColor1;
-  color: #adadad;
-  border-radius: 2px;
-  padding: 0px;
-  outline: none;
+  background-color: transparent;
 }
 
 QToolButton:checked:hover {
-  background-color: @ThemeAccentColor1;
+  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #333333, stop:0.7 #444444, stop:1 #444444);
   border: 1px solid #020202;
 }
 
@@ -1265,9 +1276,9 @@ QToolButton:checked:pressed {
 }
 
 QToolButton:checked:selected {
-  background: @ThemeAccentColor2;
-  color: white;
-}
+  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #333333, stop:0.7 #444444, stop:1 #444444);
+  border: 1px solid @ThemeAccentColor1;
+  }
 
 QToolButton:hover {
   color: white;
@@ -1282,49 +1293,16 @@ QToolButton:selected {
   color: white;
 }
 
-/* QToolButton[popupMode="0"] { */
-  /* Only for DelayedPopup */
-  /* padding-right: 20px;
-} */
-
-QToolButton[popupMode="1"] {
-  /* Only for MenuButtonPopup */
-  padding-right: 20px;
-}
-
-/* QToolButton[popupMode="0"]::menu-button {
-  border: none;
-} */
-
-/* QToolButton[popupMode="0"]::menu-button:hover {
-  border: none;
-  border-left: 2px solid #202020;
+QToolButton#qt_toolbutton_menubutton {
+  padding-right: 15px; /*Hack to add more width to buttons with menu */
   border-radius: 3px;
-} */
-QToolButton[popupMode="1"]::menu-button {
-  border: none;
-}
-
-QToolButton[popupMode="1"]::menu-button:hover {
-  border: none;
-  border-left: 2px solid #202020;
-  border-radius: 3px;
-}
-
-QToolButton[popupMode="2"] {
-  /* Only for InstantPopup */
-  padding-right: 15px;
-}
-QToolBar > QToolButton#qt_toolbutton_menubutton {
-  padding-right: 15px; /* Hack to add more width to buttons with menu */
-  border-radius: 3px;
-}
+ }
 
 QToolButton::menu-button {
   border: 1px solid transparent;
   /* 16px width + 4px for border = 20px allocated above */
+  width: 15px;
   border-radius: 3px;
-  width: 1.6ex;
 }
 
 QToolButton::menu-button:hover {
@@ -1338,7 +1316,7 @@ QToolButton::menu-button:pressed {
 
 QToolButton::menu-button:checked:hover {
   border: 1px solid #020202;
-  background: @ThemeAccentColor2;
+  background-color: @ThemeAccentColor2;
 }
 
 QToolButton::menu-indicator {
@@ -1349,19 +1327,19 @@ QToolButton::menu-indicator {
 
 QToolButton::menu-arrow {
   image: url(qss:images_classic/Arrow-down-lightgray.png);
-  width: 1.3ex;
-  height: 1.3ex;
-  /* background: transparent; */
+  width: 18px;
+  height: 18px;
+  /* background-color: transparent; */
 }
 QToolButton::menu-arrow:open {
   image: url(qss:images_classic/Arrow-Down-white.png);
-  width: 1.3ex;
-  height: 1.3ex;
+  width: 18px;
+  height: 18px;
 }
 QToolButton::menu-arrow:hover {
   image: url(qss:images_classic/Arrow-Down-white.png);
-  width: 1.3ex;
-  height: 1.3ex;
+  width: 18px;
+  height: 18px;
 }
 
 /* QCommandLinkButton -----------------------------------------------------
@@ -1371,7 +1349,7 @@ QCommandLinkButton {
   background-color: transparent;
   border: 1px solid #020202;
   color: white;
-  border-radius: 1.9px;
+  border-radius: 2px;
   padding: 0px;
   margin: 0px;
 }
@@ -1399,7 +1377,7 @@ QComboBox {
   /* padding-right = 36; 4 + 16*2 See scrollbar size */
   /* changed to 4px to fix #239 */
   /* Fixes #103, #111 */
-  min-height: 1.5em;
+  min-height: 23px;
   /*margin: 0px -1px 0px 0px;  hack for Mac... try it on Windows and Linux */
   /* padding-top: 2px;     removed to fix #132 */
   /* padding-bottom: 2px;  removed to fix #132 */
@@ -1407,7 +1385,7 @@ QComboBox {
   /* Needed to remove indicator - fix #132 */
 }
 QComboBox:editable {
-  background: #252525;
+  background-color: #252525;
 }
 QComboBox QAbstractItemView {
   border: 1px solid #020202;
@@ -1422,12 +1400,12 @@ QComboBox QAbstractItemView:hover {
 }
 
 QComboBox QAbstractItemView:selected {
-  background: @ThemeAccentColor1;
+  background-color: @ThemeAccentColor1;
   color: white;
 }
 
 QComboBox QAbstractItemView:alternate {
-  background: #252525;
+  background-color: #252525;
 }
 
 QComboBox:checked {
@@ -1480,12 +1458,12 @@ QComboBox::item {
 
 /* Needed to complete the rule set. */
 QComboBox::item:alternate {
-  background: #3c3c3c;
+  background-color: #3c3c3c;
 }
 /* Color of the selected list item. */
 QComboBox::item:selected {
   border: 1px solid #020202;
-  background: @ThemeAccentColor1;
+  background-color: @ThemeAccentColor1;
 }
 
 QComboBox::drop-down {
@@ -1558,7 +1536,7 @@ border-top: 1px solid #020202;
 border-left: 1px solid #020202;
 border-right: 1px solid #020202;
 /*background-color: #d4d4d4; /* Task Panel Header background color */
-background-color: qlineargradient(x1:0, y1:0, x2:1, y2:0,stop:0 #000000 stop:1 #171d2e);
+background-color: qlineargradient(x1:0, y1:0, x2:1, y2:0,stop:0 #000000 stop:1 @ThemeAccentColor3);
 border-top-left-radius: 3px;
 border-top-right-radius: 3px;
 border-bottom-left-radius: 0px;
@@ -1585,29 +1563,29 @@ padding: 0px;
 QSint--ActionGroup QFrame[class="header"] QLabel[fold="false"] {
   width: 30px;
   height: 30px;
-  image: url(qss:images_classic/Qsint_header_Unfold_Blue-dark.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_UnfoldOver_Blue-dark.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_Blue-dark.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_FoldOver_Blue-dark.png) ;
+  image: url(qss:images_classic/Qsint_header_fold_white.png);
 }
 
 QSint--ActionGroup QFrame[class="content"] {
-background-color: #171d2e; /* Task Panel background color */
+background-color: @ThemeAccentColor3; /* Task Panel background color */
 margin: 0px;
 padding: 0px;
 border-bottom: 1px solid #020202;
@@ -1619,9 +1597,6 @@ border-bottom-left-radius: 3px;
 border-bottom-right-radius: 3px;
 }
 
-QSint--ActionGroup QFrame[class="content"] > QWidget {
-background-color: #171d2e; /* Task Panel background color */
-}
 
 /* Fixs for tabs inside Task Panel */
 QSint--ActionGroup QFrame[class="content"] QTabBar::tab:top:selected {
@@ -1689,7 +1664,7 @@ QSint--ActionGroup QToolButton#manualUpdate {
 /* to give widget inside the menu same look as regular menu */
 QSint--ActionGroup QToolButton#filterButton QListWidget {
     color: #ffffff;
-    background: #252525;
+    background-color: #252525;
     border: 1px solid #000000;
 }
 
@@ -1717,7 +1692,7 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qslider
 
 --------------------------------------------------------------------------- */
 QSlider:disabled {
-  background: #444444;
+  background-color: #444444;
 }
 
 QSlider:focus {
@@ -1725,47 +1700,47 @@ QSlider:focus {
 }
 
 QSlider::groove:horizontal {
-  background: #444444;
+  background-color: #444444;
   border: 1px solid #020202;
   height: 4px;
   margin: 0px;
-  border-radius: 1.9px;
+  border-radius: 2px;
 }
 
 QSlider::groove:vertical {
-  background: @ThemeAccentColor1;
+  background-color: @ThemeAccentColor1;
   border: 1px solid #020202;
   width: 4px;
   margin: 0px;
-  border-radius: 1.9px;
+  border-radius: 2px;
 }
 
 QSlider::add-page:vertical {
-  background: @ThemeAccentColor1;
+  background-color: @ThemeAccentColor1;
   border: 1px solid #020202;
   width: 4px;
   margin: 0px;
-  border-radius: 1.9px;
+  border-radius: 2px;
 }
 
 QSlider::add-page:vertical :disabled {
-  background: #444444;
+  background-color: #444444;
 }
 
 QSlider::sub-page:horizontal {
-  background: @ThemeAccentColor1;
+  background-color: @ThemeAccentColor1;
   border: 1px solid #020202;
   height: 4px;
   margin: 0px;
-  border-radius: 1.9px;
+  border-radius: 2px;
 }
 
 QSlider::sub-page:horizontal:disabled {
-  background: @ThemeAccentColor1;
+  background-color: @ThemeAccentColor1;
 }
 
 QSlider::handle:horizontal {
-  background: #333333;
+  background-color: #333333;
   border: 1px solid #020202;
   width: 10px;
   height: 8px;
@@ -1774,17 +1749,17 @@ QSlider::handle:horizontal {
 }
 
 QSlider::handle:horizontal:hover {
-  background: @ThemeAccentColor1;
+  background-color: @ThemeAccentColor1;
   border: 1px solid #020202;
 }
 
 QSlider::handle:horizontal:focus {
-  background: @ThemeAccentColor2;
+  background-color: @ThemeAccentColor2;
   border: 1px solid @ThemeAccentColor2;
 }
 
 QSlider::handle:vertical {
-  background: #333333;
+  background-color: #333333;
   border: 1px solid #020202;
   width: 10px;
   height: 8px;
@@ -1793,7 +1768,7 @@ QSlider::handle:vertical {
 }
 
 QSlider::handle:vertical:hover {
-  background: @ThemeAccentColor1;
+  background-color: @ThemeAccentColor1;
   border: 1px solid #020202;
 }
 
@@ -1972,7 +1947,7 @@ QTabBar::tab, QDockWidget QTabBar::tab {
 }
 
 QTabBar::tab:top, QDockWidget QTabBar::tab:top {
-  color: white;
+  color: #adadad;
   margin-left: 0px;
   margin-right: 0px;
   min-width: 5px;
@@ -2004,8 +1979,7 @@ QTabBar::tab:top:!selected:hover, QDockWidget QTabBar::tab:top:!selected:hover {
 }
 
 QTabBar::tab:bottom, QDockWidget QTabBar::tab:bottom {
-  color: white;
-  padding-left: 9px;
+  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);
   margin-bottom: 3px;
@@ -2035,8 +2009,7 @@ QTabBar::tab:bottom:!selected:hover, QDockWidget QTabBar::tab:bottom:!selected:h
 }
 
 QTabBar::tab:left, QDockWidget QTabBar::tab:left {
-  color: white;
-  padding-bottom: 9px;
+  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);
   margin-right: 3px;
@@ -2067,7 +2040,6 @@ QTabBar::tab:left:!selected:hover, QDockWidget QTabBar::tab:left:!selected:hover
 
 QTabBar::tab:right, QDockWidget QTabBar::tab:right {
   color: white;
-  padding-bottom: 9px;
   min-height: 5px;
   background-color: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 #333333, stop:0.6 #252525, stop:1 #252525);
   margin-right: 3px;
@@ -2135,7 +2107,7 @@ QTabBar QToolButton::right-arrow:disabled, QDockWidget QTabBar QToolButton::righ
 QDockWidget {
   background-color: #333333;
   border: 1px solid #020202;
-  border-radius: 1.9px;
+  border-radius: 2px;
   titlebar-close-icon: url(qss:images_classic/transparent.png);
   titlebar-normal-icon: url(qss:images_classic/transparent.png);
 }
@@ -2153,7 +2125,7 @@ QDockWidget::title {
 QDockWidget::close-button {
   icon-size: 10px;
   border: none;
-  background: transparent;
+  background-color: transparent;
   background-image: none;
   border: 0;
   margin: 0;
@@ -2172,7 +2144,7 @@ QDockWidget::close-button:pressed {
 QDockWidget::float-button {
   icon-size: 12px;
   border: none;
-  background: transparent;
+  background-color: transparent;
   background-image: none;
   border: 0;
   margin: 0;
@@ -2197,11 +2169,11 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtableview
 
 --------------------------------------------------------------------------- */
 QTreeView::branch  {
-  background: transparent;
+  background-color: transparent;
+  selection-background-color: transparent;
 }
 
 QTreeView::branch:has-siblings:!adjoins-item  {
-
 }
 
 QTreeView::branch:has-siblings:adjoins-item  {
@@ -2272,8 +2244,8 @@ QColumnView::indicator:checked:hover,
 QColumnView::indicator:checked:focus,
 QColumnView::indicator:checked:pressed {
   /* image: url(qss:images_classic/checkbox-checked-blue.png); */
-  background-color: @ThemeAccentColor1;
-  border: 1px solid #ffffff;
+  /* background-color: @ThemeAccentColor1;
+  border: 1px solid #ffffff; */
 }
 
 /* QTreeView::indicator:unchecked,
@@ -2294,8 +2266,8 @@ QColumnView::indicator:unchecked:hover,
 QColumnView::indicator:unchecked:focus,
 QColumnView::indicator:unchecked:pressed {
   /* image: url(qss:images_classic/checkbox-Empty-blue.png); */
-  background-color: @ThemeAccentColor1;
-  border: 1px solid #ffffff;
+  /* background-color: @ThemeAccentColor1;
+  border: 1px solid #ffffff; */
 }
 
 QTreeView::indicator:indeterminate,
@@ -2315,9 +2287,9 @@ 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;
+  border: 1px solid #ffffff; */
 }
 
 QTreeView,
@@ -2557,7 +2529,7 @@ https://stackoverflow.com/questions/14581498/qt-stylesheet-for-hline-vline-color
 }
 
 .QFrame[frameShape="0"] {
-  border-radius: 1.9px;
+  border-radius: 2px;
   border: 1px solid #020202;
 }
 
@@ -2617,7 +2589,7 @@ QDateEdit, QDateTimeEdit {
   selection-background-color: @ThemeAccentColor1;
   border-style: solid;
   border: 1px solid #020202;
-  border-radius: 1.9px;
+  border-radius: 2px;
   /* This fixes 103, 111 */
   padding-top: 2px;
   /* This fixes 103, 111 */
@@ -2664,7 +2636,7 @@ QAbstractView:hover {
 }
 
 QAbstractView:selected {
-  background: @ThemeAccentColor1;
+  background-color: @ThemeAccentColor1;
   color: white;
 }
 
@@ -2744,7 +2716,6 @@ Gui--OverlayToolButton[objectName="OBTN Overlay"]:hover {
   image: url(qss:images_classic/overlay-white.png);
 }
 
-
 /*==================================================================================================
 Forming windows below are the border settings. See also https://forum.freecad.org/viewtopic.php?p=439797#p439797
 ==================================================================================================*/
@@ -2816,3 +2787,21 @@ QWidget#thumbnailWidget[state="pressed"] {
  #WbTabBar #WbTabBarMore {
   padding-right: 12px;
  }
+
+/* Below is a fix for identation in properties, but this is a QT 6 bug only and so is disabled since Windows is as I write this still on QT 5. */
+/* QTreeView::item:selected:active#groupsTreeView {
+  background-color: @ThemeAccentColor1;
+    margin-left:-8px;
+}
+
+QTreeView::item:selected#groupsTreeView{
+  background-color: @ThemeAccentColor1;
+    margin-left:-8px;
+}
+
+QTreeView::item:!selected:hover#groupsTreeView {
+  outline: 0;
+  color: white;
+  background-color: @ThemeAccentColor1;
+  margin-left:-8px;
+} */
\ No newline at end of file
diff --git a/src/Gui/Stylesheets/FreeCAD Light.qss b/src/Gui/Stylesheets/FreeCAD Light.qss
index 5bb9fca292..d22cfc803d 100644
--- a/src/Gui/Stylesheets/FreeCAD Light.qss	
+++ b/src/Gui/Stylesheets/FreeCAD Light.qss	
@@ -60,17 +60,18 @@ Gui--PropertyEditor--PropertyEditor QAbstractSpinBox:read-only,
 Gui--PropertyEditor--PropertyEditor QAbstractSpinBox:disabled {
     color: transparent;
     border-color: transparent;
-    background-color: transparent;
+    background-color: #ababab;
     selection-color: transparent;
     selection-background-color: transparent;
-
+    border-radius: 2px;
 }
+
 Gui--PropertyEditor--PropertyEditor > QWidget > QWidget > QLabel,
 Gui--PropertyEditor--PropertyEditor > QWidget > QWidget > QLabel:disabled {
     color: transparent;
     background-color: transparent;
     border: none;
-    border-radius: 0px;
+    border-radius: 2px;
     margin: 0px;
     padding: 0px;
 }
@@ -82,9 +83,8 @@ Gui--PropertyEditor--PropertyEditor QLineEdit,
 Gui--PropertyEditor--PropertyEditor QComboBox {
     margin-left: 0px;
     margin-right: 0px;
-    padding-top: 0px;
-    padding-bottom: 0px;
-
+    padding: 0 2px;
+    border-radius: 2px;
 }
 
 /* fix for column items background when a link is present */
@@ -96,6 +96,7 @@ Gui--PropertyEditor--PropertyEditor > QWidget > QFrame:focus {
 Gui--PropertyEditor--PropertyEditor > QWidget > QWidget > QLabel {
 	color: #000000;
 	background-color: #ACC8E5; /* same as focused background color */
+  border-radius: 2px;
 }
 
 /*==================================================================================================
@@ -131,11 +132,11 @@ This causes much load time.
   /* selection-color: black; */
 /* } */
 
-QWidget:disabled {
-  color: #adadad;
+/* QWidget:disabled {
+  color: #646464;
   selection-background-color: @ThemeAccentColor1;
   selection-color: #cccccc;
-}
+} */
 
 QWidget::item:selected {
   background-color: @ThemeAccentColor1;
@@ -216,7 +217,7 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qstatusbar
 QStatusBar {
   border: 0px solid #ededed;
   /* Fixes Spyder #9120, #9121 */
-  background: #f0f0f0;
+  background-color: #f0f0f0;
   /* Fixes #205, white vertical borders separating items */
 }
 
@@ -236,7 +237,7 @@ QStatusBar QToolTip {
 
 QStatusBar QLabel {
   /* Fixes Spyder #9120, #9121 */
-  background: transparent;
+  background-color: transparent;
 }
 
 /* QCheckBox --------------------------------------------------------------
@@ -246,11 +247,11 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qcheckbox
 --------------------------------------------------------------------------- */
 QCheckBox {
   color: black;
-  padding: 0px;
+  padding: 1px;
   outline: none;
   border: 1px solid transparent;
   background-color: transparent;
-  spacing:8px;
+  spacing: 8px;
 }
 
 QCheckBox:focus {
@@ -258,7 +259,7 @@ QCheckBox:focus {
 }
 
 QCheckBox QWidget:disabled {
-  color: #adadad;
+  color: #646464;
 }
 
 QCheckBox::indicator {
@@ -336,41 +337,49 @@ QGroupBox::title {
 }
 
 QGroupBox::indicator {
-  color: black;
-  background-color: #ededed;
-  border: 1px solid #ababab;
+  background-color: #ffffff;
   width: 12px;
   height: 12px;
-  border-radius:1px;
+  margin: 1px;
+  border: 1px solid #000000;
 }
 
 QGroupBox::indicator:unchecked {
-  background-color: #ababab;
-  border: 1px solid #ababab;
-  image: url(qss:images_classic/checkbox-indeterminate-black.png);
+  background-color: #ffffff;
 }
 
-QGroupBox::indicator:unchecked:hover, QGroupBox::indicator:unchecked:focus, QGroupBox::indicator:unchecked:pressed {
+QGroupBox::indicator:unchecked:hover {
   background-color: @ThemeAccentColor1;
+  border: 1px solid #000000;
+}
+
+QGroupBox::indicator:unchecked:focus {
+   border: 1px solid @ThemeAccentColor2;
 }
 
 QGroupBox::indicator:unchecked:disabled {
   background-color: #d8d8d8;
-  border: 1px solid #ababab;
-}
+  border: 1px solid #000000;
+  }
 
 QGroupBox::indicator:checked {
-  border: none;
-  image:url(qss:images_classic/checkbox-checked-black.png);
+  background-color: #ffffff;
+  border: 1px solid #000000;
+  image:url(qss:images_classic/check-mark-black.png);
 }
 
-QGroupBox::indicator:checked:hover, QGroupBox::indicator:checked:focus, QGroupBox::indicator:checked:pressed {
+QGroupBox::indicator:checked:hover {
   background-color: @ThemeAccentColor1;
+  border: 1px solid #000000;
+}
+QGroupBox::indicator:checked:focus {
+   border: 1px solid @ThemeAccentColor2;
 }
-
 QGroupBox::indicator:checked:disabled {
-  background-color: @ThemeAccentColor1;
-}
+  background-color: #d8d8d8;
+  image:url(qss:images_classic/check-mark-lightgray.png);
+  border: 1px solid #000000;
+  }
 
 /* QRadioButton -----------------------------------------------------------
 
@@ -381,9 +390,9 @@ QRadioButton {
   background-color: transparent;
   color: black;
   border: none;
-  spacing: 4px;
-  padding-top: 4px;
-  padding-bottom: 4px;
+  spacing: 8px;
+  /* padding-top: 4px;
+  padding-bottom: 4px; */
   outline: none;
 }
 
@@ -392,7 +401,7 @@ QRadioButton:focus {
 }
 
 QRadioButton:disabled {
-  background-color: #d8d8d8;
+  /* background-color: #d8d8d8; */
 }
 
 QRadioButton QWidget {
@@ -459,11 +468,11 @@ QMenuBar:focus {
 }
 
 QMenuBar::item {
-  background: transparent;
+  background-color: transparent;
 }
 
 QMenuBar::item:selected {
-  background: transparent;
+  background-color: transparent;
   border: 0px solid #ababab;
   background-color: @ThemeAccentColor1;
 }
@@ -530,7 +539,7 @@ QMenu::indicator {
 }
 
 QMenu::icon:checked { /* appearance of a 'checked' icon */
-  background: @ThemeAccentColor2;
+  background-color: @ThemeAccentColor2;
   margin-left: -5px;
   border: 5px solid @ThemeAccentColor2;
   position: absolute;
@@ -542,7 +551,7 @@ QMenu::indicator:non-exclusive:unchecked {
 
 QMenu::indicator:non-exclusive:unchecked:hover, QMenu::indicator:non-exclusive:unchecked:focus, QMenu::indicator:non-exclusive:unchecked:pressed {
   border: none;
-  background: @ThemeAccentColor1;
+  background-color: @ThemeAccentColor1;
 }
 
 QMenu::indicator:non-exclusive:unchecked:disabled {
@@ -555,7 +564,7 @@ QMenu::indicator:non-exclusive:checked {
 
 QMenu::indicator:non-exclusive:checked:hover, QMenu::indicator:non-exclusive:checked:focus, QMenu::indicator:non-exclusive:checked:pressed {
   border: none;
-  background: @ThemeAccentColor1;
+  background-color: @ThemeAccentColor1;
 }
 
 QMenu::indicator:non-exclusive:checked:disabled {
@@ -581,7 +590,7 @@ QMenu::indicator:exclusive:unchecked {
 QMenu::indicator:exclusive:unchecked:hover, QMenu::indicator:exclusive:unchecked:focus, QMenu::indicator:exclusive:unchecked:pressed {
   border: none;
   outline: none;
-  background: @ThemeAccentColor1;
+  background-color: @ThemeAccentColor1;
   image: url(qss:images_classic/checkbox-Empty-black.png);
 }
 
@@ -598,7 +607,7 @@ QMenu::indicator:exclusive:checked {
 QMenu::indicator:exclusive:checked:hover, QMenu::indicator:exclusive:checked:focus, QMenu::indicator:exclusive:checked:pressed {
   border: none;
   outline: none;
-  background: @ThemeAccentColor1;
+  background-color: @ThemeAccentColor1;
   image: url(qss:images_classic/checkbox-Empty-black.png);
 }
 
@@ -622,10 +631,10 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qcombobox
 
 --------------------------------------------------------------------------- */
 QAbstractItemView {
-  alternate-background-color: #ababab;
+  alternate-background-color: #f0f0f0;
   color: black;
   border: 1px solid #ababab;
-  border-radius: 2px;
+  border-radius: 3px;
 }
 
 QAbstractItemView QLineEdit {
@@ -640,7 +649,7 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qabstractscrollarea
 QAbstractScrollArea {
   background-color: transparent;
   border: 0px solid #ababab;
-  border-radius: 0px;
+  border-radius: 3px;
   /* fix #159 */
   padding: 0px;
   /* remove min-height to fix #244 */
@@ -648,7 +657,8 @@ QAbstractScrollArea {
 }
 
 QAbstractScrollArea:disabled {
-  color: #adadad;
+  color: #646464;
+  /* background-color: #d8d8d8; */
 }
 
 /* QScrollArea ------------------------------------------------------------
@@ -656,7 +666,8 @@ QAbstractScrollArea:disabled {
 ---------------------------------------------------------------------------
 text input field disabled!!!!*/
 QScrollArea QWidget:disabled {
-  background-color: transparent
+  /* background-color: #d8d8d8; */
+  color: #646464;
 }
 
 /* QScrollBar -------------------------------------------------------------
@@ -787,19 +798,19 @@ QScrollBar::sub-line:vertical:hover, QScrollBar::sub-line:vertical:on {
 }
 
 QScrollBar::up-arrow:horizontal, QScrollBar::down-arrow:horizontal {
-  background: none;
+  background-color: none;
 }
 
 QScrollBar::up-arrow:vertical, QScrollBar::down-arrow:vertical {
-  background: none;
+  background-color: none;
 }
 
 QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal {
-  background: none;
+  background-color: none;
 }
 
 QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {
-  background: none;
+  background-color: none;
 }
 
 /* QTextEdit --------------------------------------------------------------
@@ -821,7 +832,7 @@ QTextEdit:focus {
 }
 
 QTextEdit:selected {
-  background: #346792;
+  background-color: #346792;
   color: black;
 }
 
@@ -831,7 +842,7 @@ Python
 QPlainTextEdit {
   background-color: #ffffff;
   color: black;
-  border-radius: 1.9px;
+  border-radius: 2px;
   border: 0px solid #ababab;
 }
 
@@ -840,7 +851,7 @@ QPlainTextEdit:focus {
 }
 
 QPlainTextEdit:selected {
-  background: @ThemeAccentColor1;
+  background-color: @ThemeAccentColor1;
   color: black;
 }
 
@@ -850,7 +861,7 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qsizegrip
 
 --------------------------------------------------------------------------- */
 QSizeGrip {
-  background: transparent;
+  background-color: transparent;
   width: 12px;
   height: 12px;
   image:url(qss:images_classic/sizegrip-lightgray.png);
@@ -878,14 +889,14 @@ QToolBar {
 QToolBar:horizontal {
   border-bottom: 1px solid #ababab;
   padding-top: 3px;
-  padding-left: 5px;
+  padding-left: 4px;
 }
 
 QToolBar:vertical {
   border-left: 1px solid #ababab;
   border-right: 1px solid #ababab;
-  padding-top: 3px;
-  padding-left: 2px;
+  padding-top: 4px;
+  padding-left: 3px;
 }
 
 QToolBar:disabled {
@@ -911,23 +922,20 @@ QToolBar::handle:vertical:hover {
   image: url(qss:images_classic/Vmovetoolbar-darkgray.png);
 }
 
-
 QToolBar::separator:horizontal {
   width: 2px;
-  padding: 0px 5px;
+  padding: 0px 3px;
   image: url(qss:images_classic/Hsepartoolbar-lightgray.png);
 }
 
 QToolBar::separator:vertical {
   height: 2px;
-  padding: 5px 0px;
+  padding: 3px 0px;
   image: url(qss:images_classic/Vsepartoolbar-lightgray.png);
 }
 
 /*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 */
 QToolButton#qt_toolbar_ext_button {
-margin: 0px;
-padding: 0px;
 background-repeat: none;
 background-position: center center;
 }
@@ -950,7 +958,7 @@ QSpinBox {
   border: 1px solid #ababab;
   color: black;
   border-radius: 2px;
-  min-height: 1.7em;
+  min-height: 24px;
   padding-left: 4px;
   padding-right: 4px;
 }
@@ -1013,7 +1021,7 @@ QAbstractSpinBox:focus {
 }
 
 QAbstractSpinBox:selected {
-  background: @ThemeAccentColor1;
+  background-color: @ThemeAccentColor1;
 }
 
 /* ------------------------------------------------------------------------ */
@@ -1025,22 +1033,22 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qframe
 
 --------------------------------------------------------------------------- */
 QLabel {
-  background-color: transparent;
+  /* background-color: transparent;
   border: 0px solid #ababab;
   padding: 2px;
   margin: 0px;
   color: black;
-  spacing:8px;
+  spacing:8px; */
 }
 
 QLabel:disabled {
-  background-color: transparent;
-  border: 0px solid #ababab;
-  color: #adadad;
+  /* background-color: transparent;
+  border: 0px solid #ababab; */
+  color: #646464;
 }
 
 QLabel[haslink="true"] {
-  color: #0050a1;
+  color: #003e7d;
 }
 
 
@@ -1053,14 +1061,14 @@ QTextBrowser {
   background-color: #ffffff;
   border: 1px solid #ababab;
   color: black;
-  border-radius: 1.9px;
+  border-radius: 2px;
 }
 
 QTextBrowser:disabled {
   background-color: #d8d8d8;
   border: 1px solid #ababab;
-  color: #adadad;
-  border-radius: 1.9px;
+  color: #646464;
+  border-radius: 2px;
 }
 
 QTextBrowser:hover, QTextBrowser:!hover, QTextBrowser:selected, QTextBrowser:pressed {
@@ -1079,7 +1087,7 @@ QGraphicsView {
 QGraphicsView:disabled {
   background-color: #fdfdfd;
   border: 0px solid #ababab;
-  color: #adadad;
+  color: #646464;
   border-radius: 0px;
 }
 
@@ -1092,12 +1100,12 @@ QGraphicsView:hover, QGraphicsView:!hover, QGraphicsView:selected, QGraphicsView
 --------------------------------------------------------------------------- */
 QCalendarWidget {
   border: 1px solid #ababab;
-  border-radius: 1.9px;
+  border-radius: 2px;
 }
 
 QCalendarWidget:disabled {
   background-color: #f0f0f0;
-  color: #adadad;
+  color: #646464;
 }
 
 /* QLCDNumber -------------------------------------------------------------
@@ -1110,7 +1118,7 @@ QLCDNumber {
 
 QLCDNumber:disabled {
   background-color: #d8d8d8;
-  color: #adadad;
+  color: #646464;
 }
 
 /* QProgressBar -----------------------------------------------------------
@@ -1122,7 +1130,7 @@ QProgressBar {
   background-color: #cccccc;
   border: 1px solid #ababab;
   color: black;
-  border-radius: 1.9px;
+  border-radius: 2px;
   text-align: center;
 }
 
@@ -1130,20 +1138,20 @@ QProgressBar:disabled {
   background-color: #d8d8d8;
   border: 1px solid #ababab;
   color: #696969;
-  border-radius: 1.9px;
+  border-radius: 2px;
   text-align: center;
 }
 
 QProgressBar::chunk {
   background-color: @ThemeAccentColor1;
   color: #d8d8d8;
-  border-radius: 1.9px;
+  border-radius: 2px;
 }
 
 QProgressBar::chunk:disabled {
   background-color: #d8d8d8;
-  color: #ababab;
-  border-radius: 1.9px;
+  color: #646464;
+  border-radius: 2px;
 }
 
 /* ------------------------------------------------------------------------ */
@@ -1171,7 +1179,7 @@ QPushButton {
 
 QPushButton:disabled {
 background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #e2e2e2, stop:1 #fdfdfd);
-  color: #adadad;
+  color: #646464;
   border: 1px solid #ababab;
 }
 
@@ -1187,7 +1195,7 @@ QPushButton:focus {
 
 QPushButton:checked:disabled {
   border: 1px solid  @ThemeAccentColor1;
-  color: #adadad;
+  color: #646464;
   outline: none;
 }
 
@@ -1239,25 +1247,24 @@ QToolButton {
 }
 
 QToolButton:disabled {
-  /* background-color: rgba(0, 0, 0, 0.065); */
-  color: #adadad;
+  padding: 2px;
 }
 
 QToolButton:checked {
-  background-color: @ThemeAccentColor2;
-  border-radius: 2px;
+  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #efefef, stop:0.7 #d8d8d8, stop:1 #d8d8d8);
+  border-radius: 3px;
+  border-left: 1px solid #ababab;
+  border-top: 1px solid #ababab;
+  border-right: 1px solid #e1e1e1;
+  border-bottom: 1px solid #e1e1e1;
 }
 
 QToolButton:checked:disabled {
-  background-color: @ThemeAccentColor1;
-  color: #adadad;
-  border-radius: 2px;
-  padding: 0px;
-  outline: none;
+  background-color: transparent;
 }
 
 QToolButton:checked:hover {
-  background-color: @ThemeAccentColor1;
+  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #efefef, stop:0.7 #d8d8d8, stop:1 #d8d8d8);
   border: 1px solid #ababab;
 }
 
@@ -1266,9 +1273,9 @@ QToolButton:checked:pressed {
 }
 
 QToolButton:checked:selected {
-  background: @ThemeAccentColor2;
-  color: black;
-}
+  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #fefefe, stop:0.7 #ffffff, stop:1 #ffffff);
+  border: 1px solid @ThemeAccentColor1;
+  }
 
 QToolButton:hover {
   color: black;
@@ -1283,49 +1290,16 @@ QToolButton:selected {
   color: black;
 }
 
-/* QToolButton[popupMode="0"] { */
-  /* Only for DelayedPopup */
-  /* padding-right: 20px;
-} */
-
-QToolButton[popupMode="1"] {
-  /* Only for MenuButtonPopup */
-  padding-right: 20px;
-}
-
-/* QToolButton[popupMode="0"]::menu-button {
-  border: none;
-} */
-
-/* QToolButton[popupMode="0"]::menu-button:hover {
-  border: none;
-  border-left: 2px solid #e6e6e6;
+QToolButton#qt_toolbutton_menubutton {
+  padding-right: 15px; /*Hack to add more width to buttons with menu */
   border-radius: 3px;
-} */
-QToolButton[popupMode="1"]::menu-button {
-  border: none;
-}
-
-QToolButton[popupMode="1"]::menu-button:hover {
-  border: none;
-  border-left: 2px solid #e6e6e6;
-  border-radius: 3px;
-}
-
-QToolButton[popupMode="2"] {
-  /* Only for InstantPopup */
-  padding-right: 20px;
-}
-QToolBar > QToolButton#qt_toolbutton_menubutton {
-  padding-right: 15px; /* Hack to add more width to buttons with menu */
-  border-radius: 3px;
-}
+ }
 
 QToolButton::menu-button {
   border: 1px solid transparent;
   /* 16px width + 4px for border = 20px allocated above */
+  width: 15px;
   border-radius: 3px;
-  width: 1.6ex;
 }
 
 QToolButton::menu-button:hover {
@@ -1339,7 +1313,7 @@ QToolButton::menu-button:pressed {
 
 QToolButton::menu-button:checked:hover {
   border: 1px solid #ababab;
-  background: @ThemeAccentColor2;
+  background-color: @ThemeAccentColor2;
 }
 
 QToolButton::menu-indicator {
@@ -1350,19 +1324,19 @@ QToolButton::menu-indicator {
 
 QToolButton::menu-arrow {
   image: url(qss:images_classic/Arrow-down-lightgray.png);
-  width: 1.3ex;
-  height: 1.3ex;
-  /* background: transparent; */
+  width: 18px;
+  height: 18px;
+  /* background-color: transparent; */
 }
 QToolButton::menu-arrow:open {
   image: url(qss:images_classic/Arrow-Down-black.png);
-  width: 1.3ex;
-  height: 1.3ex;
+  width: 18px;
+  height: 18px;
 }
 QToolButton::menu-arrow:hover {
   image: url(qss:images_classic/Arrow-Down-black.png);
-  width: 1.3ex;
-  height: 1.3ex;
+  width: 18px;
+  height: 18px;
 }
 
 /* QCommandLinkButton -----------------------------------------------------
@@ -1372,14 +1346,14 @@ QCommandLinkButton {
   background-color: transparent;
   border: 1px solid #ababab;
   color: black;
-  border-radius: 1.9px;
+  border-radius: 2px;
   padding: 0px;
   margin: 0px;
 }
 
 QCommandLinkButton:disabled {
   background-color: transparent;
-  color: #adadad;
+  color: #646464;
 }
 
 /* ------------------------------------------------------------------------ */
@@ -1400,7 +1374,7 @@ QComboBox {
   /* padding-right = 36; 4 + 16*2 See scrollbar size */
   /* changed to 4px to fix #239 */
   /* Fixes #103, #111 */
-  min-height: 1.5em;
+  min-height: 23px;
   /*margin: 0px -1px 0px 0px;  hack for Mac... try it on Windows and Linux */
   /* padding-top: 2px;     removed to fix #132 */
   /* padding-bottom: 2px;  removed to fix #132 */
@@ -1408,7 +1382,7 @@ QComboBox {
   /* Needed to remove indicator - fix #132 */
 }
 QComboBox:editable {
-  background: #fdfdfd;
+  background-color: #fdfdfd;
 }
 QComboBox QAbstractItemView {
   border: 1px solid #ababab;
@@ -1423,12 +1397,12 @@ QComboBox QAbstractItemView:hover {
 }
 
 QComboBox QAbstractItemView:selected {
-  background: @ThemeAccentColor1;
+  background-color: @ThemeAccentColor1;
   color: black;
 }
 
 QComboBox QAbstractItemView:alternate {
-  background: #fdfdfd;
+  background-color: #fdfdfd;
 }
 
 QComboBox:checked {
@@ -1437,7 +1411,7 @@ QComboBox:checked {
 
 QComboBox:disabled {
   background-color: #d8d8d8;
-  color: #adadad;
+  color: #646464;
 }
 
 QComboBox:hover {
@@ -1481,12 +1455,12 @@ QComboBox::item {
 
 /* Needed to complete the rule set. */
 QComboBox::item:alternate {
-  background: #ededed;
+  background-color: #ededed;
 }
 /* Color of the selected list item. */
 QComboBox::item:selected {
   border: 1px solid #ababab;
-  background: @ThemeAccentColor1;
+  background-color: @ThemeAccentColor1;
 }
 
 QComboBox::drop-down {
@@ -1559,7 +1533,7 @@ border-top: 1px solid #ffffff;
 border-left: 1px solid #ffffff;
 border-right: 1px solid #ffffff;
 /*background-color: #d4d4d4; /* Task Panel Header background color */
-background-color: qlineargradient(x1:0, y1:0, x2:1, y2:0,stop:0 #e8f2fb, stop:1 #418FDE);
+background-color: qlineargradient(x1:0, y1:0, x2:1, y2:0,stop:0 #ffffff, stop:1 @ThemeAccentColor3);
 border-top-left-radius: 3px;
 border-top-right-radius: 3px;
 border-bottom-left-radius: 0px;
@@ -1583,32 +1557,32 @@ margin: 0px;
 padding: 0px;
 }
 
-QSint--ActionGroup QFrame[class="header"] QLabel{
+QSint--ActionGroup QFrame[class="header"] QLabel[fold="false"] {
   width: 30px;
   height: 30px;
-  image: url(qss:images_classic/Qsint_header_Unfold_Blue-light.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_UnfoldOver_Blue_light.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_Blue-light.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_FoldOver_Blue-light.png) ;
+  image: url(qss:images_classic/Qsint_header_fold_black.png);
 }
 
 QSint--ActionGroup QFrame[class="content"] {
-background-color: #c7def5; /* Task Panel background color */
+background-color: @ThemeAccentColor3; /* Task Panel background color */
 margin: 0px;
 padding: 0px;
 border-bottom: 1px solid #ffffff;
@@ -1620,9 +1594,6 @@ border-bottom-left-radius: 3px;
 border-bottom-right-radius: 3px;
 }
 
-QSint--ActionGroup QFrame[class="content"] > QWidget {
-background-color: #c7def5; /* Task Panel background color */
-}
 
 /* Fixs for tabs inside Task Panel */
 QSint--ActionGroup QFrame[class="content"] QTabBar::tab:top:selected {
@@ -1690,7 +1661,7 @@ QSint--ActionGroup QToolButton#manualUpdate {
 /* to give widget inside the menu same look as regular menu */
 QSint--ActionGroup QToolButton#filterButton QListWidget {
     color: #000000;
-    background: #ffffff;
+    background-color: #ffffff;
     border: 1px solid #adadad;
 }
 
@@ -1704,7 +1675,7 @@ QSint--ActionGroup QFrame[class="content"] QToolButton:focus {
 
 QSint--ActionGroup QFrame[class="content"] QToolButton:disabled,
 QSint--ActionGroup QFrame[class="content"] QToolButton:disabled:checked {
-    color: #adadad;
+  color: #646464;
     /* background-color: #fdfdfd; */
 }
 
@@ -1718,7 +1689,7 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qslider
 
 --------------------------------------------------------------------------- */
 QSlider:disabled {
-  background: #d8d8d8;
+  background-color: #d8d8d8;
 }
 
 QSlider:focus {
@@ -1726,47 +1697,47 @@ QSlider:focus {
 }
 
 QSlider::groove:horizontal {
-  background: #d8d8d8;
+  background-color: #d8d8d8;
   border: 1px solid #ababab;
   height: 4px;
   margin: 0px;
-  border-radius: 1.9px;
+  border-radius: 2px;
 }
 
 QSlider::groove:vertical {
-  background: @ThemeAccentColor1;
+  background-color: @ThemeAccentColor1;
   border: 1px solid #ababab;
   width: 4px;
   margin: 0px;
-  border-radius: 1.9px;
+  border-radius: 2px;
 }
 
 QSlider::add-page:vertical {
-  background: @ThemeAccentColor1;
+  background-color: @ThemeAccentColor1;
   border: 1px solid #ababab;
   width: 4px;
   margin: 0px;
-  border-radius: 1.9px;
+  border-radius: 2px;
 }
 
 QSlider::add-page:vertical :disabled {
-  background: #d8d8d8;
+  background-color: #d8d8d8;
 }
 
 QSlider::sub-page:horizontal {
-  background: @ThemeAccentColor1;
+  background-color: @ThemeAccentColor1;
   border: 1px solid #ababab;
   height: 4px;
   margin: 0px;
-  border-radius: 1.9px;
+  border-radius: 2px;
 }
 
 QSlider::sub-page:horizontal:disabled {
-  background: @ThemeAccentColor1;
+  background-color: @ThemeAccentColor1;
 }
 
 QSlider::handle:horizontal {
-  background: #f0f0f0;
+  background-color: #f0f0f0;
   border: 1px solid #ababab;
   width: 10px;
   height: 8px;
@@ -1775,17 +1746,17 @@ QSlider::handle:horizontal {
 }
 
 QSlider::handle:horizontal:hover {
-  background: @ThemeAccentColor1;
+  background-color: @ThemeAccentColor1;
   border: 1px solid #ababab;
 }
 
 QSlider::handle:horizontal:focus {
-  background: @ThemeAccentColor2;
+  background-color: @ThemeAccentColor2;
   border: 1px solid @ThemeAccentColor2;
 }
 
 QSlider::handle:vertical {
-  background: #f0f0f0;
+  background-color: #f0f0f0;
   border: 1px solid #ababab;
   width: 10px;
   height: 8px;
@@ -1794,7 +1765,7 @@ QSlider::handle:vertical {
 }
 
 QSlider::handle:vertical:hover {
-  background: @ThemeAccentColor1;
+  background-color: @ThemeAccentColor1;
   border: 1px solid #ababab;
 }
 
@@ -1823,7 +1794,7 @@ QLineEdit {
 
 QLineEdit:disabled {
   background-color: #d8d8d8;
-  color: #adadad;
+  color: #646464;
 }
 
 QLineEdit:hover {
@@ -1973,7 +1944,7 @@ QTabBar::tab, QDockWidget QTabBar::tab {
 }
 
 QTabBar::tab:top, QDockWidget QTabBar::tab:top {
-  color: black;
+  color: #646464;
   margin-left: 0px;
   margin-right: 0px;
   min-width: 5px;
@@ -2005,8 +1976,7 @@ QTabBar::tab:top:!selected:hover, QDockWidget QTabBar::tab:top:!selected:hover {
 }
 
 QTabBar::tab:bottom, QDockWidget QTabBar::tab:bottom {
-  color: black;
-  padding-left: 9px;
+  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);
   margin-bottom: 3px;
@@ -2036,8 +2006,7 @@ QTabBar::tab:bottom:!selected:hover, QDockWidget QTabBar::tab:bottom:!selected:h
 }
 
 QTabBar::tab:left, QDockWidget QTabBar::tab:left {
-  color: black;
-  padding-bottom: 9px;
+  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);
   margin-left: 3px;
@@ -2068,7 +2037,6 @@ QTabBar::tab:left:!selected:hover, QDockWidget QTabBar::tab:left:!selected:hover
 
 QTabBar::tab:right, QDockWidget QTabBar::tab:right {
   color: black;
-  padding-bottom: 9px;
   min-height: 5px;
   background-color: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 #dddddd, stop:0.6 #e2e2e2, stop:1 #cccccc);
   margin-right: 3px;
@@ -2136,7 +2104,7 @@ QTabBar QToolButton::right-arrow:disabled, QDockWidget QTabBar QToolButton::righ
 QDockWidget {
   background-color: #f0f0f0;
   border: 1px solid #ababab;
-  border-radius: 1.9px;
+  border-radius: 2px;
   titlebar-close-icon: url(qss:images_classic/transparent.png);
   titlebar-normal-icon: url(qss:images_classic/transparent.png);
 }
@@ -2154,7 +2122,7 @@ QDockWidget::title {
 QDockWidget::close-button {
   icon-size: 10px;
   border: none;
-  background: transparent;
+  background-color: transparent;
   background-image: none;
   border: 0;
   margin: 0;
@@ -2173,7 +2141,7 @@ QDockWidget::close-button:pressed {
 QDockWidget::float-button {
   icon-size: 12px;
   border: none;
-  background: transparent;
+  background-color: transparent;
   background-image: none;
   border: 0;
   margin: 0;
@@ -2198,11 +2166,11 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtableview
 
 --------------------------------------------------------------------------- */
 QTreeView::branch  {
-  background: transparent;
+  background-color: transparent;
+  selection-background-color: transparent;
 }
 
 QTreeView::branch:has-siblings:!adjoins-item  {
-
 }
 
 QTreeView::branch:has-siblings:adjoins-item  {
@@ -2273,8 +2241,8 @@ QColumnView::indicator:checked:hover,
 QColumnView::indicator:checked:focus,
 QColumnView::indicator:checked:pressed {
   /* image: url(qss:images_classic/checkbox-checked-blue.png); */
-  background-color: @ThemeAccentColor1;
-  border: 1px solid #1c1c1c;
+  /* background-color: @ThemeAccentColor1;
+  border: 1px solid #1c1c1c; */
 }
 
 /* QTreeView::indicator:unchecked,
@@ -2295,8 +2263,8 @@ QColumnView::indicator:unchecked:hover,
 QColumnView::indicator:unchecked:focus,
 QColumnView::indicator:unchecked:pressed {
   /* image: url(qss:images_classic/checkbox-Empty-blue.png); */
-  background-color: @ThemeAccentColor1;
-  border: 1px solid #1c1c1c;
+  /* background-color: @ThemeAccentColor1;
+  border: 1px solid #1c1c1c; */
 }
 
 QTreeView::indicator:indeterminate,
@@ -2316,9 +2284,9 @@ QTableView::indicator:indeterminate:pressed,
 QColumnView::indicator:indeterminate:hover,
 QColumnView::indicator:indeterminate:focus,
 QColumnView::indicator:indeterminate:pressed {
-  image: url(qss:images_classic/indeterminate-mark-black.png);
+  /* image: url(qss:images_classic/indeterminate-mark-black.png);
   background-color: @ThemeAccentColor1;
-  border: 1px solid #1c1c1c;
+  border: 1px solid #1c1c1c; */
 }
 
 QTreeView,
@@ -2342,7 +2310,7 @@ QListView:disabled,
 QTableView:disabled,
 QColumnView:disabled {
   background-color: #d8d8d8;
-  color: #adadad;
+  color: #646464;
 }
 
 QTreeView:selected,
@@ -2416,7 +2384,7 @@ QHeaderView {
 
 QHeaderView:disabled {
   /* background-color: #d8d8d8; */
-  color: #adadad;
+  color: #646464;
 }
 
 QHeaderView::section {
@@ -2440,7 +2408,7 @@ QHeaderView::section::horizontal::first, QHeaderView::section::horizontal::only-
 }
 
 QHeaderView::section::horizontal:disabled {
-  color: #adadad;
+  color: #646464;
 }
 
 QHeaderView::section::vertical {
@@ -2507,7 +2475,7 @@ background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #f0f0f0, stop:1
 }
 
 QToolBox::tab:disabled {
-  color: #adadad;
+  color: #646464;
 }
 
 QToolBox::tab:selected {
@@ -2517,7 +2485,7 @@ QToolBox::tab:selected {
 QToolBox::tab:selected:disabled {
   background-color: #696969;
   border-bottom: 0px solid #cccccc;
-  color: #adadad;
+  color: #646464;
 }
 
 QToolBox::tab:!selected {
@@ -2537,7 +2505,6 @@ QToolBox > QScrollArea > QWidget > QWidget {
   border: 0px;
   background-color: #f0f0f0;
   border-radius: 4px;
-  color: black;
 }
 
 /* QFrame -----------------------------------------------------------------
@@ -2559,7 +2526,7 @@ https://stackoverflow.com/questions/14581498/qt-stylesheet-for-hline-vline-color
 }
 
 .QFrame[frameShape="0"] {
-  border-radius: 1.9px;
+  border-radius: 2px;
   border: 1px solid #ababab;
 }
 
@@ -2619,7 +2586,7 @@ QDateEdit, QDateTimeEdit {
   selection-background-color: @ThemeAccentColor1;
   border-style: solid;
   border: 1px solid #ababab;
-  border-radius: 1.9px;
+  border-radius: 2px;
   /* This fixes 103, 111 */
   padding-top: 2px;
   /* This fixes 103, 111 */
@@ -2666,7 +2633,7 @@ QAbstractView:hover {
 }
 
 QAbstractView:selected {
-  background: @ThemeAccentColor1;
+  background-color: @ThemeAccentColor1;
   color: black;
 }
 
@@ -2687,7 +2654,7 @@ Gui--StatefulLabel[state="empty_sketch"] {
   color : #393939; /* 50% opacity white */
 }
 Gui--StatefulLabel[state="under_constrained"] {
-  /* color : #000000; black */
+  color : #000000;
 }
 Gui--StatefulLabel[state="conflicting_constraints"] {
   color : #9d0000; /* Red */
@@ -2771,23 +2738,22 @@ Settings menu #groupsTreeView:
 
 QTreeView::branch#groupsTreeView:closed:has-children:has-siblings  {
   border-image: none;
-  image: url(qss:images_classic/Arrow-right-black.png) 0;
+  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) 0;
+  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) 0;
+  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) 0;
+  image: url(qss:images_classic/Arrow-right-black.png);
 }
 
 QTreeView::branch#groupsTreeView:has-siblings:!adjoins-item  {
@@ -2817,3 +2783,21 @@ QWidget#thumbnailWidget[state="pressed"] {
  #WbTabBar #WbTabBarMore {
   padding-right: 12px;
  }
+
+/* Below is a fix for identation in properties, but this is a QT 6 bug only and so is disabled since Windows is as I write this still on QT 5. */
+/* QTreeView::item:selected:active#groupsTreeView {
+  background-color: @ThemeAccentColor1;
+    margin-left:-8px;
+}
+
+QTreeView::item:selected#groupsTreeView{
+  background-color: @ThemeAccentColor1;
+    margin-left:-8px;
+}
+
+QTreeView::item:!selected:hover#groupsTreeView {
+  outline: 0;
+  color: white;
+  background-color: @ThemeAccentColor1;
+  margin-left:-8px;
+} */
\ No newline at end of file
diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_fold_black.png b/src/Gui/Stylesheets/images_classic/Qsint_header_fold_black.png
new file mode 100644
index 0000000000..7040df8800
Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/Qsint_header_fold_black.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_fold_darkgray.png b/src/Gui/Stylesheets/images_classic/Qsint_header_fold_darkgray.png
new file mode 100644
index 0000000000..f9b4389909
Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/Qsint_header_fold_darkgray.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_fold_lightgray.png b/src/Gui/Stylesheets/images_classic/Qsint_header_fold_lightgray.png
new file mode 100644
index 0000000000..1fd04a2d7d
Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/Qsint_header_fold_lightgray.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_fold_white.png b/src/Gui/Stylesheets/images_classic/Qsint_header_fold_white.png
new file mode 100644
index 0000000000..ca2e157bff
Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/Qsint_header_fold_white.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_unfold_black.png b/src/Gui/Stylesheets/images_classic/Qsint_header_unfold_black.png
new file mode 100644
index 0000000000..e2bbe64f33
Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/Qsint_header_unfold_black.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_unfold_darkgray.png b/src/Gui/Stylesheets/images_classic/Qsint_header_unfold_darkgray.png
new file mode 100644
index 0000000000..5151369156
Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/Qsint_header_unfold_darkgray.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_unfold_lightgray.png b/src/Gui/Stylesheets/images_classic/Qsint_header_unfold_lightgray.png
new file mode 100644
index 0000000000..f5c2f1f30e
Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/Qsint_header_unfold_lightgray.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_unfold_white.png b/src/Gui/Stylesheets/images_classic/Qsint_header_unfold_white.png
new file mode 100644
index 0000000000..11e9e23006
Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/Qsint_header_unfold_white.png differ
diff --git a/src/Gui/Stylesheets/images_classic/icons classic.svg b/src/Gui/Stylesheets/images_classic/icons classic.svg
index 4466b174bb..ec43b2aaed 100644
--- a/src/Gui/Stylesheets/images_classic/icons classic.svg	
+++ b/src/Gui/Stylesheets/images_classic/icons classic.svg	
@@ -25,9 +25,9 @@
      inkscape:deskcolor="#d1d1d1"
      inkscape:document-units="mm"
      inkscape:export-bgcolor="#ffffff00"
-     inkscape:zoom="1.0248427"
-     inkscape:cx="690.34987"
-     inkscape:cy="625.46186"
+     inkscape:zoom="4.0993708"
+     inkscape:cx="681.93392"
+     inkscape:cy="452.99635"
      inkscape:window-width="1920"
      inkscape:window-height="1028"
      inkscape:window-x="1913"
@@ -4377,7 +4377,7 @@
          id="rect1515-5-2-8-2-4-9-7-70-4"
          style="opacity:0;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.77953;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /></g><g
        id="Qsint_header_Fold_Blue-light"
-       transform="translate(28.885491,-8.7454434)"
+       transform="translate(35.698074,-8.6506434)"
        inkscape:label="Qsint_header_Fold_Blue-light"><circle
          style="fill:#ffffff;fill-opacity:1;stroke:#b2b9d8;stroke-width:0.7;stroke-linecap:round;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:1"
          id="path3-8"
@@ -4393,7 +4393,7 @@
          d="m 158.00678,128.10912 -1.417,1.54152 h 0.71215 l 0.70485,-0.749 0.70484,0.749 h 0.71154 z"
          sodipodi:nodetypes="ccccccc" /></g><g
        id="Qsint_header_FoldOver_Blue-light"
-       transform="translate(28.885491,-1.4146305)"
+       transform="translate(36.288384,-1.6506436)"
        inkscape:label="Qsint_header_FoldOver_Blue-light"><circle
          style="fill:#ffffff;fill-opacity:1;stroke:#b2b9d8;stroke-width:0.7;stroke-linecap:round;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:1"
          id="path3-9-08"
@@ -4408,24 +4408,31 @@
          style="color:#000000;fill:#003ca5;fill-opacity:1;stroke-width:1.18703;-inkscape-stroke:none"
          d="m 158.00678,128.10912 -1.417,1.54152 h 0.71215 l 0.70485,-0.749 0.70484,0.749 h 0.71154 z"
          sodipodi:nodetypes="ccccccc" /></g><g
-       id="Qsint_header_Unfold_Blue-light"
+       id="Qsint_header_unfold_white"
        transform="rotate(-179.33753,172.40267,121.73943)"
-       inkscape:label="Qsint_header_Unfold_Blue-light"><circle
-         style="fill:#ffffff;fill-opacity:1;stroke:#b2b9d8;stroke-width:0.7;stroke-linecap:round;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:1"
+       inkscape:label="Qsint_header_unfold_white"
+       inkscape:export-filename="Qsint_header_Unfold_light-light.png"
+       inkscape:export-xdpi="45"
+       inkscape:export-ydpi="45"><circle
+         style="fill:#ffffff;fill-opacity:0;stroke:#ffffff;stroke-width:0.7;stroke-linecap:round;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:0.5"
          id="path3-6-6"
          cx="158.00647"
          cy="129.86105"
          r="2.7580521" /><path
-         id="path5-6-4-5-1"
-         style="color:#000000;fill:#4893df;fill-opacity:1;stroke-width:1.18703;-inkscape-stroke:none"
-         d="m 158.00794,129.75004 -1.417,1.54152 0.71216,0.001 0.70368,-0.75015 0.70599,0.74783 0.71155,10e-4 z"
-         sodipodi:nodetypes="ccccccc" /><path
-         id="path5-9-7-4"
-         style="color:#000000;fill:#4893df;fill-opacity:1;stroke-width:1.18703;-inkscape-stroke:none"
-         d="m 158.00562,128.10913 -1.417,1.54152 0.71216,10e-4 0.70368,-0.75015 0.70599,0.74783 0.71155,0.001 z"
-         sodipodi:nodetypes="ccccccc" /></g><g
+         id="path3"
+         style="fill:#000000;fill-opacity:0.25925928;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.78823531"
+         d="M -156.49431 -134.10909 A 2.4299331 2.4299331 0 0 0 -158.92414 -131.67926 A 2.4299331 2.4299331 0 0 0 -156.49431 -129.24943 A 2.4299331 2.4299331 0 0 0 -154.06448 -131.67926 A 2.4299331 2.4299331 0 0 0 -156.49431 -134.10909 z M -157.89578 -133.12568 L -157.18419 -133.11638 L -156.48708 -132.36036 L -155.77446 -133.10243 L -155.06236 -133.09313 L -156.49741 -131.56816 L -157.89578 -133.12568 z M -157.91231 -131.48496 L -157.20073 -131.47566 L -156.50361 -130.71963 L -155.79099 -131.4617 L -155.07889 -131.4524 L -156.51395 -129.92743 L -157.91231 -131.48496 z "
+         transform="rotate(179.33753)" /><path
+         style="fill:#ffffff;fill-opacity:0.78858024;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.277154"
+         d="m 703.94182,427.73605 c -1.30391,-1.452 -2.46312,-2.74299 -2.57604,-2.86886 l -0.20529,-0.22885 h 1.2827 1.28271 l 1.33048,1.44097 1.33048,1.44096 1.37318,-1.41268 1.37318,-1.41269 0.97576,0.008 c 0.53666,0.004 1.1036,0.0257 1.25985,0.0479 l 0.2841,0.0404 -2.60663,2.77143 c -1.43364,1.52429 -2.63522,2.78097 -2.67018,2.79263 -0.035,0.0117 -1.1304,-1.16682 -2.4343,-2.61881 z"
+         id="path5"
+         transform="matrix(-0.26456565,0.00305912,-0.00305912,-0.26456565,346.20137,241.4774)" /><path
+         style="fill:#ffffff;fill-opacity:0.78823531;stroke:#b2b9d8;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.27843139"
+         d="m 703.68279,433.72075 c -1.41846,-1.5798 -2.56826,-2.88311 -2.55512,-2.89625 0.0131,-0.0131 0.59854,-0.006 1.30089,0.0148 l 1.277,0.0387 1.31055,1.42666 1.31056,1.42667 0.45915,-0.47573 c 0.25253,-0.26166 0.86142,-0.8948 1.3531,-1.40699 l 0.89395,-0.93124 1.29971,0.0165 1.29971,0.0165 -2.63965,2.80531 c -1.45181,1.54292 -2.66016,2.81255 -2.68524,2.82141 -0.0251,0.009 -1.20615,-1.27646 -2.62461,-2.85625 z"
+         id="path6"
+         transform="matrix(-0.26456565,0.00305912,-0.00305912,-0.26456565,346.20137,241.4774)" /></g><g
        id="Qsint_header_UnfoldOver_Blue-light"
-       transform="rotate(180,172.44921,132.81914)"
+       transform="rotate(180,176.00339,132.87502)"
        inkscape:label="Qsint_header_UnfoldOver_Blue-light"><circle
          style="fill:#ffffff;fill-opacity:1;stroke:#b2b9d8;stroke-width:0.7;stroke-linecap:round;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:1"
          id="path3-9-1-8"
@@ -5699,4 +5706,156 @@
          style="fill:#4893df;fill-opacity:1;stroke:#4893df;stroke-width:0.47702;stroke-linecap:square;stroke-miterlimit:3;stroke-dashoffset:128.504;stroke-opacity:1"
          d="m 12.915026,43.063857 c -2.470564,2.470583 0,0 -2.470564,2.470583 v -2.470583 z"
          sodipodi:nodetypes="cccc"
-         inkscape:label="" /></g></g></svg>
+         inkscape:label="" /></g><g
+       id="Qsint_header_Fold_Blue-light-5"
+       transform="rotate(180,176.00308,121.58977)"
+       inkscape:label="Qsint_header_Unfold_Blue-light"><circle
+         style="fill:#ffffff;fill-opacity:1;stroke:#b2b9d8;stroke-width:0.7;stroke-linecap:round;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:1"
+         id="path3-8-6"
+         cx="158.00647"
+         cy="129.86105"
+         r="2.7580521" /><path
+         id="path5-6-4-1-2"
+         style="color:#000000;fill:#4893df;fill-opacity:1;stroke-width:1.18703;-inkscape-stroke:none"
+         d="m 158.00678,129.75005 -1.417,1.54152 h 0.71215 l 0.70485,-0.749 0.70484,0.749 h 0.71154 z"
+         sodipodi:nodetypes="ccccccc" /><path
+         id="path5-9-5-2"
+         style="color:#000000;fill:#4893df;fill-opacity:1;stroke-width:1.18703;-inkscape-stroke:none"
+         d="m 158.00678,128.10912 -1.417,1.54152 h 0.71215 l 0.70485,-0.749 0.70484,0.749 h 0.71154 z"
+         sodipodi:nodetypes="ccccccc" /></g><g
+       id="Qsint_header_fold_white"
+       transform="rotate(0.66247,943.1361,2603.0795)"
+       inkscape:label="Qsint_header_fold_white"><circle
+         style="fill:#ffffff;fill-opacity:0;stroke:#ffffff;stroke-width:0.7;stroke-linecap:round;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:0.5"
+         id="path3-6-6-2"
+         cx="158.00647"
+         cy="129.86105"
+         r="2.7580521" /><path
+         id="path3-3"
+         style="fill:#000000;fill-opacity:0.25882354;stroke:#c5c5c5;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0"
+         d="m -156.49431,-134.10909 a 2.4299331,2.4299331 0 0 0 -2.42983,2.42983 2.4299331,2.4299331 0 0 0 2.42983,2.42983 2.4299331,2.4299331 0 0 0 2.42983,-2.42983 2.4299331,2.4299331 0 0 0 -2.42983,-2.42983 z m -1.40147,0.98341 0.71159,0.009 0.69711,0.75602 0.71262,-0.74207 0.7121,0.009 -1.43505,1.52497 z m -0.0165,1.64072 0.71158,0.009 0.69712,0.75603 0.71262,-0.74207 0.7121,0.009 -1.43506,1.52497 z"
+         transform="rotate(179.33753)" /><path
+         style="fill:#ffffff;fill-opacity:0.78823531;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.277154"
+         d="m 703.94182,427.73605 c -1.30391,-1.452 -2.46312,-2.74299 -2.57604,-2.86886 l -0.20529,-0.22885 h 1.2827 1.28271 l 1.33048,1.44097 1.33048,1.44096 1.37318,-1.41268 1.37318,-1.41269 0.97576,0.008 c 0.53666,0.004 1.1036,0.0257 1.25985,0.0479 l 0.2841,0.0404 -2.60663,2.77143 c -1.43364,1.52429 -2.63522,2.78097 -2.67018,2.79263 -0.035,0.0117 -1.1304,-1.16682 -2.4343,-2.61881 z"
+         id="path5-6"
+         transform="matrix(-0.26456565,0.00305912,-0.00305912,-0.26456565,346.20137,241.4774)" /><path
+         style="fill:#ffffff;fill-opacity:0.78823531;stroke:#b2b9d8;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.278431"
+         d="m 703.68279,433.72075 c -1.41846,-1.5798 -2.56826,-2.88311 -2.55512,-2.89625 0.0131,-0.0131 0.59854,-0.006 1.30089,0.0148 l 1.277,0.0387 1.31055,1.42666 1.31056,1.42667 0.45915,-0.47573 c 0.25253,-0.26166 0.86142,-0.8948 1.3531,-1.40699 l 0.89395,-0.93124 1.29971,0.0165 1.29971,0.0165 -2.63965,2.80531 c -1.45181,1.54292 -2.66016,2.81255 -2.68524,2.82141 -0.0251,0.009 -1.20615,-1.27646 -2.62461,-2.85625 z"
+         id="path6-3"
+         transform="matrix(-0.26456565,0.00305912,-0.00305912,-0.26456565,346.20137,241.4774)" /></g><g
+       id="Qsint_header_fold_lightgray"
+       inkscape:label="Qsint_header_fold_lightgray"
+       transform="rotate(180,186.7376,128.11257)"><circle
+         style="fill:#b3b3b3;fill-opacity:0;stroke:#888888;stroke-width:0.7;stroke-linecap:round;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:0.5"
+         id="path3-6-6-3"
+         cx="-188.20636"
+         cy="-125.94494"
+         r="2.7580521"
+         transform="rotate(-179.33753)" /><path
+         id="path3-2"
+         style="fill:#000000;fill-opacity:0;stroke:#888888;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:1"
+         d="m 186.73774,125.68273 a 2.4299331,2.4299331 0 0 0 -2.42983,2.42983 2.4299331,2.4299331 0 0 0 2.42983,2.42983 2.4299331,2.4299331 0 0 0 2.42983,-2.42983 2.4299331,2.4299331 0 0 0 -2.42983,-2.42983 z m -1.40147,0.98341 0.71159,0.009 0.69711,0.75602 0.71262,-0.74207 0.7121,0.009 -1.43505,1.52497 z m -0.0165,1.64072 0.71158,0.009 0.69712,0.75603 0.71262,-0.74207 0.7121,0.009 -1.43506,1.52497 z" /><path
+         style="fill:#888888;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.277154"
+         d="m 186.09707,127.4996 c -0.345,-0.38418 -0.6517,-0.72575 -0.68158,-0.75905 l -0.0543,-0.0605 h 0.33938 0.33939 l 0.35202,0.38125 0.35202,0.38126 0.36332,-0.37377 0.36332,-0.37378 0.25817,0.002 c 0.142,10e-4 0.292,0.007 0.33334,0.0127 l 0.0752,0.0107 -0.68967,0.73328 c -0.37932,0.4033 -0.69724,0.73579 -0.70649,0.73888 -0.009,0.003 -0.29908,-0.30872 -0.64407,-0.69289 z"
+         id="path5-0" /><path
+         style="fill:#888888;fill-opacity:1;stroke:#b2b9d8;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.278431"
+         d="m 186.02853,129.08305 c -0.3753,-0.41799 -0.67952,-0.76282 -0.67604,-0.7663 0.003,-0.003 0.15836,-0.002 0.34419,0.004 l 0.33788,0.0102 0.34675,0.37747 0.34675,0.37747 0.12148,-0.12587 c 0.0668,-0.0692 0.22792,-0.23675 0.35801,-0.37227 l 0.23652,-0.24639 0.34389,0.004 0.34388,0.004 -0.69841,0.74223 c -0.38413,0.40823 -0.70383,0.74416 -0.71047,0.7465 -0.007,0.002 -0.31913,-0.33773 -0.69443,-0.75571 z"
+         id="path6-9" /></g><g
+       id="Qsint_header_unfold_black"
+       transform="rotate(-179.33753,168.36728,121.88557)"
+       inkscape:label="Qsint_header_unfold_black"><circle
+         style="fill:#ffffff;fill-opacity:0;stroke:#000000;stroke-width:0.7;stroke-linecap:round;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:0.5"
+         id="path3-6-6-9"
+         cx="158.00647"
+         cy="129.86105"
+         r="2.7580521" /><path
+         id="path3-39"
+         style="fill:#ffffff;fill-opacity:0.12371134;stroke:#010101;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0"
+         d="m -156.49431,-134.10909 a 2.4299331,2.4299331 0 0 0 -2.42983,2.42983 2.4299331,2.4299331 0 0 0 2.42983,2.42983 2.4299331,2.4299331 0 0 0 2.42983,-2.42983 2.4299331,2.4299331 0 0 0 -2.42983,-2.42983 z m -1.40147,0.98341 0.71159,0.009 0.69711,0.75602 0.71262,-0.74207 0.7121,0.009 -1.43505,1.52497 z m -0.0165,1.64072 0.71158,0.009 0.69712,0.75603 0.71262,-0.74207 0.7121,0.009 -1.43506,1.52497 z"
+         transform="rotate(179.33753)" /><path
+         style="fill:#000000;fill-opacity:0.79320985;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.277154"
+         d="m 703.94182,427.73605 c -1.30391,-1.452 -2.46312,-2.74299 -2.57604,-2.86886 l -0.20529,-0.22885 h 1.2827 1.28271 l 1.33048,1.44097 1.33048,1.44096 1.37318,-1.41268 1.37318,-1.41269 0.97576,0.008 c 0.53666,0.004 1.1036,0.0257 1.25985,0.0479 l 0.2841,0.0404 -2.60663,2.77143 c -1.43364,1.52429 -2.63522,2.78097 -2.67018,2.79263 -0.035,0.0117 -1.1304,-1.16682 -2.4343,-2.61881 z"
+         id="path5-8"
+         transform="matrix(-0.26456565,0.00305912,-0.00305912,-0.26456565,346.20137,241.4774)" /><path
+         style="fill:#000000;fill-opacity:0.79215688;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.27843103"
+         d="m 703.68279,433.72075 c -1.41846,-1.5798 -2.56826,-2.88311 -2.55512,-2.89625 0.0131,-0.0131 0.59854,-0.006 1.30089,0.0148 l 1.277,0.0387 1.31055,1.42666 1.31056,1.42667 0.45915,-0.47573 c 0.25253,-0.26166 0.86142,-0.8948 1.3531,-1.40699 l 0.89395,-0.93124 1.29971,0.0165 1.29971,0.0165 -2.63965,2.80531 c -1.45181,1.54292 -2.66016,2.81255 -2.68524,2.82141 -0.0251,0.009 -1.20615,-1.27646 -2.62461,-2.85625 z"
+         id="path6-0"
+         transform="matrix(-0.26456565,0.00305912,-0.00305912,-0.26456565,346.20137,241.4774)" /></g><g
+       id="Qsint_header_fold_black"
+       transform="rotate(0.66247,917.85898,1905.0624)"
+       inkscape:label="Qsint_header_fold_black"><circle
+         style="fill:#ffffff;fill-opacity:0;stroke:#000000;stroke-width:0.7;stroke-linecap:round;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:0.5"
+         id="path3-6-6-2-5"
+         cx="158.00647"
+         cy="129.86105"
+         r="2.7580521" /><path
+         id="path3-3-40"
+         style="fill:#ffffff;fill-opacity:0.1254902;stroke:#c5c5c5;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0"
+         d="m -156.49431,-134.10909 a 2.4299331,2.4299331 0 0 0 -2.42983,2.42983 2.4299331,2.4299331 0 0 0 2.42983,2.42983 2.4299331,2.4299331 0 0 0 2.42983,-2.42983 2.4299331,2.4299331 0 0 0 -2.42983,-2.42983 z m -1.40147,0.98341 0.71159,0.009 0.69711,0.75602 0.71262,-0.74207 0.7121,0.009 -1.43505,1.52497 z m -0.0165,1.64072 0.71158,0.009 0.69712,0.75603 0.71262,-0.74207 0.7121,0.009 -1.43506,1.52497 z"
+         transform="rotate(179.33753)" /><path
+         style="fill:#000000;fill-opacity:0.79215688;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.277154"
+         d="m 703.94182,427.73605 c -1.30391,-1.452 -2.46312,-2.74299 -2.57604,-2.86886 l -0.20529,-0.22885 h 1.2827 1.28271 l 1.33048,1.44097 1.33048,1.44096 1.37318,-1.41268 1.37318,-1.41269 0.97576,0.008 c 0.53666,0.004 1.1036,0.0257 1.25985,0.0479 l 0.2841,0.0404 -2.60663,2.77143 c -1.43364,1.52429 -2.63522,2.78097 -2.67018,2.79263 -0.035,0.0117 -1.1304,-1.16682 -2.4343,-2.61881 z"
+         id="path5-6-6"
+         transform="matrix(-0.26456565,0.00305912,-0.00305912,-0.26456565,346.20137,241.4774)" /><path
+         style="fill:#000000;fill-opacity:0.79215688;stroke:#c5c5c5;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.27843103"
+         d="m 703.68279,433.72075 c -1.41846,-1.5798 -2.56826,-2.88311 -2.55512,-2.89625 0.0131,-0.0131 0.59854,-0.006 1.30089,0.0148 l 1.277,0.0387 1.31055,1.42666 1.31056,1.42667 0.45915,-0.47573 c 0.25253,-0.26166 0.86142,-0.8948 1.3531,-1.40699 l 0.89395,-0.93124 1.29971,0.0165 1.29971,0.0165 -2.63965,2.80531 c -1.45181,1.54292 -2.66016,2.81255 -2.68524,2.82141 -0.0251,0.009 -1.20615,-1.27646 -2.62461,-2.85625 z"
+         id="path6-3-4"
+         transform="matrix(-0.26456565,0.00305912,-0.00305912,-0.26456565,346.20137,241.4774)" /></g><g
+       id="Qsint_header_unfold_darkgray"
+       transform="rotate(-179.33753,168.23358,132.63252)"
+       inkscape:label="Qsint_header_unfold_darkgray"><circle
+         style="fill:#ffffff;fill-opacity:0;stroke:#4d4d4d;stroke-width:0.7;stroke-linecap:round;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:0.5"
+         id="path3-6-6-2-7-9"
+         cx="158.00647"
+         cy="129.86105"
+         r="2.7580521" /><path
+         id="path3-3-4-5"
+         style="fill:#ffffff;fill-opacity:0;stroke:#808080;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:1"
+         d="m -156.49431,-134.10909 a 2.4299331,2.4299331 0 0 0 -2.42983,2.42983 2.4299331,2.4299331 0 0 0 2.42983,2.42983 2.4299331,2.4299331 0 0 0 2.42983,-2.42983 2.4299331,2.4299331 0 0 0 -2.42983,-2.42983 z m -1.40147,0.98341 0.71159,0.009 0.69711,0.75602 0.71262,-0.74207 0.7121,0.009 -1.43505,1.52497 z m -0.0165,1.64072 0.71158,0.009 0.69712,0.75603 0.71262,-0.74207 0.7121,0.009 -1.43506,1.52497 z"
+         transform="rotate(179.33753)" /><path
+         style="fill:#4d4d4d;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.277154"
+         d="m 703.94182,427.73605 c -1.30391,-1.452 -2.46312,-2.74299 -2.57604,-2.86886 l -0.20529,-0.22885 h 1.2827 1.28271 l 1.33048,1.44097 1.33048,1.44096 1.37318,-1.41268 1.37318,-1.41269 0.97576,0.008 c 0.53666,0.004 1.1036,0.0257 1.25985,0.0479 l 0.2841,0.0404 -2.60663,2.77143 c -1.43364,1.52429 -2.63522,2.78097 -2.67018,2.79263 -0.035,0.0117 -1.1304,-1.16682 -2.4343,-2.61881 z"
+         id="path5-6-1-3"
+         transform="matrix(-0.26456565,0.00305912,-0.00305912,-0.26456565,346.20137,241.4774)" /><path
+         style="fill:#4d4d4d;fill-opacity:1;stroke:#b2b9d8;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.278431"
+         d="m 703.68279,433.72075 c -1.41846,-1.5798 -2.56826,-2.88311 -2.55512,-2.89625 0.0131,-0.0131 0.59854,-0.006 1.30089,0.0148 l 1.277,0.0387 1.31055,1.42666 1.31056,1.42667 0.45915,-0.47573 c 0.25253,-0.26166 0.86142,-0.8948 1.3531,-1.40699 l 0.89395,-0.93124 1.29971,0.0165 1.29971,0.0165 -2.63965,2.80531 c -1.45181,1.54292 -2.66016,2.81255 -2.68524,2.82141 -0.0251,0.009 -1.20615,-1.27646 -2.62461,-2.85625 z"
+         id="path6-3-3-2"
+         transform="matrix(-0.26456565,0.00305912,-0.00305912,-0.26456565,346.20137,241.4774)" /></g><g
+       id="Qsint_header_fold_darkgray"
+       inkscape:label="Qsint_header_fold_darkgray"
+       transform="rotate(180,178.6654,128.35817)"><circle
+         style="fill:#ffffff;fill-opacity:0;stroke:#4d4d4d;stroke-width:0.7;stroke-linecap:round;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:0.5"
+         id="path3-6-6-3-5"
+         cx="-180.13754"
+         cy="-126.28385"
+         r="2.7580521"
+         transform="rotate(-179.33753)" /><path
+         id="path3-2-4"
+         style="fill:#ffffff;fill-opacity:0;stroke:#4d4d4d;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:1"
+         d="m 178.66554,125.92833 a 2.4299331,2.4299331 0 0 0 -2.42982,2.42982 2.4299331,2.4299331 0 0 0 2.42983,2.42983 2.4299331,2.4299331 0 0 0 2.42982,-2.42983 2.4299331,2.4299331 0 0 0 -2.42983,-2.42982 z m -1.40147,0.9834 0.71159,0.009 0.69711,0.75602 0.71263,-0.74207 0.71209,0.009 -1.43505,1.52497 z m -0.017,1.64072 0.71158,0.009 0.69713,0.75603 0.71261,-0.74207 0.7121,0.009 -1.43506,1.52497 z" /><path
+         style="fill:#4d4d4d;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.277154"
+         d="m 178.02486,127.74519 c -0.34499,-0.38418 -0.6517,-0.72574 -0.68158,-0.75905 l -0.0543,-0.0605 0.33938,-8e-5 0.33939,-8e-5 0.35202,0.38126 0.35202,0.38126 0.36332,-0.37378 0.36332,-0.37377 0.25817,0.002 c 0.142,0.001 0.292,0.006 0.33334,0.0129 l 0.0752,0.0109 -0.68968,0.73327 c -0.37932,0.4033 -0.69723,0.7358 -0.70648,0.73888 -0.009,0.003 -0.29909,-0.30872 -0.64408,-0.69289 z"
+         id="path5-0-5" /><path
+         style="fill:#4d4d4d;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.27843103"
+         d="m 177.95633,129.32864 c -0.3753,-0.41798 -0.67951,-0.76281 -0.67604,-0.7663 0.003,-0.004 0.15836,-0.001 0.34419,0.004 l 0.33788,0.01 0.34675,0.37747 0.34675,0.37747 0.12148,-0.12586 c 0.0668,-0.0692 0.22793,-0.23675 0.35801,-0.37227 l 0.23653,-0.24639 0.34388,0.004 0.34388,0.004 -0.69841,0.74224 c -0.38412,0.40822 -0.70383,0.74415 -0.71047,0.74649 -0.007,0.002 -0.31912,-0.33773 -0.69443,-0.75571 z"
+         id="path6-9-1" /></g><g
+       id="Qsint_header_unfold_lightgray"
+       transform="rotate(-179.33753,172.26896,132.48639)"
+       inkscape:label="Qsint_header_unfold_lightgray"><circle
+         style="fill:#b3b3b3;fill-opacity:0;stroke:#888888;stroke-width:0.7;stroke-linecap:round;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:0.5"
+         id="path3-6-6-2-7"
+         cx="158.00647"
+         cy="129.86105"
+         r="2.7580521" /><path
+         id="path3-3-4"
+         style="fill:#fafafa;fill-opacity:0;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.55686277"
+         d="m -156.49431,-134.10909 a 2.4299331,2.4299331 0 0 0 -2.42983,2.42983 2.4299331,2.4299331 0 0 0 2.42983,2.42983 2.4299331,2.4299331 0 0 0 2.42983,-2.42983 2.4299331,2.4299331 0 0 0 -2.42983,-2.42983 z m -1.40147,0.98341 0.71159,0.009 0.69711,0.75602 0.71262,-0.74207 0.7121,0.009 -1.43505,1.52497 z m -0.0165,1.64072 0.71158,0.009 0.69712,0.75603 0.71262,-0.74207 0.7121,0.009 -1.43506,1.52497 z"
+         transform="rotate(179.33753)" /><path
+         style="fill:#888888;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.277154"
+         d="m 703.94182,427.73605 c -1.30391,-1.452 -2.46312,-2.74299 -2.57604,-2.86886 l -0.20529,-0.22885 h 1.2827 1.28271 l 1.33048,1.44097 1.33048,1.44096 1.37318,-1.41268 1.37318,-1.41269 0.97576,0.008 c 0.53666,0.004 1.1036,0.0257 1.25985,0.0479 l 0.2841,0.0404 -2.60663,2.77143 c -1.43364,1.52429 -2.63522,2.78097 -2.67018,2.79263 -0.035,0.0117 -1.1304,-1.16682 -2.4343,-2.61881 z"
+         id="path5-6-1"
+         transform="matrix(-0.26456565,0.00305912,-0.00305912,-0.26456565,346.20137,241.4774)" /><path
+         style="fill:#888888;fill-opacity:1;stroke:#b2b9d8;stroke-width:0;stroke-linecap:round;stroke-miterlimit:3;stroke-opacity:0.278431"
+         d="m 703.68279,433.72075 c -1.41846,-1.5798 -2.56826,-2.88311 -2.55512,-2.89625 0.0131,-0.0131 0.59854,-0.006 1.30089,0.0148 l 1.277,0.0387 1.31055,1.42666 1.31056,1.42667 0.45915,-0.47573 c 0.25253,-0.26166 0.86142,-0.8948 1.3531,-1.40699 l 0.89395,-0.93124 1.29971,0.0165 1.29971,0.0165 -2.63965,2.80531 c -1.45181,1.54292 -2.66016,2.81255 -2.68524,2.82141 -0.0251,0.009 -1.20615,-1.27646 -2.62461,-2.85625 z"
+         id="path6-3-3"
+         transform="matrix(-0.26456565,0.00305912,-0.00305912,-0.26456565,346.20137,241.4774)" /></g></g></svg>