Stylesheet fixes (#14749)

src/Gui/PreferencePacks/CMakeLists.txt

@@ -4,10 +4,10 @@ SET(PreferencePacks_Files
 )
 
 SET(PreferencePacks_Directories
-"Classic"
+"FreeCAD Classic"
 "Dark behave"
-"Light theme"
-"Dark theme"
+"FreeCAD Light"
+"FreeCAD Dark"
 )
 
 ADD_CUSTOM_TARGET(PreferencePacks_data ALL

src/Gui/PreferencePacks/FreeCAD Classic/FreeCAD Classic.cfg

@@ -5,6 +5,9 @@
     <FCParamGroup Name="BaseApp">
       <FCParamGroup Name="Preferences">
         <FCParamGroup Name="Mod">
+          <FCParamGroup Name="Start">
+            <FCBool Name="FileCardUseStyleSheet" Value="0"/>
+          </FCParamGroup>
           <FCParamGroup Name="Arch">
             <FCUInt Name="WallColor" Value="3604403967"/>
             <FCUInt Name="StructureColor" Value="2527705855"/>
@@ -128,6 +131,7 @@
         <FCParamGroup Name="MainWindow">
           <FCBool Name="TiledBackground" Value="0"/>
           <FCText Name="StyleSheet"></FCText>
+          <FCText Name="OverlayActiveStyleSheet">Light Theme + Dark Background.qss</FCText>
         </FCParamGroup>
       </FCParamGroup>
     </FCParamGroup>

src/Gui/PreferencePacks/FreeCAD Dark/FreeCAD Dark.cfg

@@ -84,16 +84,9 @@
         <FCParamGroup Name="OpenGL">
           <FCBool Name="UseSoftwareOpenGL" Value="0"/>
         </FCParamGroup>
-
         <FCParamGroup Name="Mod">
           <FCParamGroup Name="Start">
-            <FCUInt Name="BackgroundColor1" Value="556083711"/>
-            <FCUInt Name="BackgroundTextColor" Value="4059297279"/>
-            <FCUInt Name="PageColor" Value="876232959"/>
-            <FCUInt Name="PageTextColor" Value="4059297279"/>
-            <FCUInt Name="BoxColor" Value="1230002175"/>
-            <FCUInt Name="LinkColor" Value="4252898303"/>
-            <FCUInt Name="BackgroundColor2" Value="4278222847"/>
+            <FCBool Name="FileCardUseStyleSheet" Value="0"/>
           </FCParamGroup>
           <FCParamGroup Name="Arch">
             <FCUInt Name="WallColor" Value="3604403967"/>
@@ -178,7 +171,7 @@
         </FCParamGroup>
         <FCParamGroup Name="MainWindow">
           <FCBool Name="TiledBackground" Value="0"/>
-          <FCText Name="StyleSheet">Dark theme.qss</FCText>
+          <FCText Name="StyleSheet">FreeCAD Dark.qss</FCText>
           <FCText Name="OverlayActiveStyleSheet">Dark Theme + Dark Background.qss</FCText>
         </FCParamGroup>
       </FCParamGroup>

src/Gui/PreferencePacks/FreeCAD Light/FreeCAD Light.cfg

@@ -5,14 +5,7 @@
       <FCParamGroup Name="Preferences">
         <FCParamGroup Name="Mod">
           <FCParamGroup Name="Start">
-            <FCUInt Name="BackgroundColor1" Value="2914369023"/>
-            <FCUInt Name="BackgroundTextColor" Value="556083711"/>
-            <FCUInt Name="PageColor" Value="4059297279"/>
-            <FCUInt Name="PageTextColor" Value="556083711"/>
-            <FCUInt Name="BoxColor" Value="3739412223"/>
-            <FCUInt Name="LinkColor" Value="995875839"/>
-            <FCUInt Name="BackgroundColor2" Value="4278255615"/>
-            <FCText Name="AutoloadModule">StartWorkbench</FCText>
+            <FCBool Name="FileCardUseStyleSheet" Value="0"/>
           </FCParamGroup>
           <FCParamGroup Name="Arch">
             <FCUInt Name="WallColor" Value="2914369023"/>
@@ -208,7 +201,7 @@
           <FCUInt Name="BaseColor" Value="3505127423"/>
         </FCParamGroup>
         <FCParamGroup Name="MainWindow">
-          <FCText Name="StyleSheet">Light theme.qss</FCText>
+          <FCText Name="StyleSheet">FreeCAD Light.qss</FCText>
           <FCText Name="OverlayActiveStyleSheet">Light Theme + Light Background.qss</FCText>
         </FCParamGroup>
       </FCParamGroup>

src/Gui/PreferencePacks/package.xml

@@ -3,13 +3,13 @@
   <name>Built-In Preference Packs</name>
   <description>Preference Packs included with the FreeCAD distribution</description>
   <version>1.0.0</version>
-  <maintainer email="email@freecad.org">MisterMaker</maintainer>
+  <maintainer email="email@FreeCAD.org">MisterMaker</maintainer>
   <license file="../../LICENSE">LGPL2</license>
   <url type="repository">https://github.com/FreeCAD/FreeCAD</url>
 
   <content>
     <preferencepack>
-      <name>Classic</name>
+      <name>FreeCAD Classic</name>
       <type>Theme</type>
       <description>Removes stylesheets, and applies the classic purple/gray background. Resets all colors to default</description>
       <version>1.0.0</version>
@@ -19,22 +19,22 @@
       <tag>classic theme</tag>
     </preferencepack>
 	<preferencepack>
-	  <name>Light theme</name>
+	  <name>FreeCAD Light</name>
       <type>Theme</type>
       <description>Applies a basic light theme.</description>
-      <version>0.1.0</version>
+      <version>1.0.0</version>
       <tag>built-in</tag>
       <tag>background</tag>
-	  <tag>light</tag>
+	    <tag>light</tag>
     </preferencepack>
 	<preferencepack>
-	  <name>Dark theme</name>
+	  <name>FreeCAD Dark</name>
       <type>Theme</type>
       <description>Applies a basic dark theme.</description>
       <version>1.0.0</version>
       <tag>built-in</tag>
       <tag>background</tag>
-	  <tag>dark</tag>
+	    <tag>dark</tag>
     </preferencepack>
   </content>
 

src/Gui/Stylesheets/CMakeLists.txt

@@ -1,7 +1,7 @@
 
 SET(Stylesheets_Files
-    "Dark theme.qss"
-	"Light theme.qss"
+    	"FreeCAD Dark.qss"
+	"FreeCAD Light.qss"
 )
 
 SET(Overlay_Stylesheets_Files

src/Gui/Stylesheets/FreeCAD Dark.qss

@@ -41,6 +41,8 @@ Resetting everything helps to unify styles across different operating systems
   border-style: none;
   border-image: none;
   outline: 0;
+  color: White;
+  selection-background-color: @ThemeAccentColor1;
 }
 
 /* specific reset for elements inside QToolBar */
@@ -117,16 +119,16 @@ Gui--NavigationIndicatorGui--BlenderNavigationStyle {
 }
 
 /* QWidget ----------------------------------------------------------------
-
+This causes much load time.
 --------------------------------------------------------------------------- */
-QWidget {
+/* QWidget { */
   /* background-color: #444444; */
-  border: 0px solid #020202;
+  /* border: 0px solid #020202;
   padding: 0px;
-  color: White;
-  selection-background-color: transparent;
-  selection-color: White;
-}
+  color: White; */
+  /* selection-background-color: @ThemeAccentColor1; */
+  /* selection-color: White; */
+/* } */
 
 QWidget:disabled {
   color: #adadad;
@@ -195,8 +197,8 @@ QToolTip {
   /* If you remove the border property, background stops working on Windows */
   border: none;
   font-weight:bolder;
-  border-top-width: 0.5px;
-  border-left-width: 0.5px;
+  border-top-width: 1px;
+  border-left-width: 1px;
   border-right-width: 1.5px;
   border-bottom-width: 1.5px;
   border-style: solid;
@@ -252,7 +254,7 @@ QCheckBox {
 }
 
 QCheckBox:focus {
-  border: 0.5px solid @ThemeAccentColor2;
+  border: 1px solid @ThemeAccentColor2;
 }
 
 QCheckBox QWidget:disabled {
@@ -264,28 +266,31 @@ QCheckBox::indicator {
   background-color: #252525;
   width: 12px;
   height: 12px;
-  image:url(qss:images_classic/checkbox-Empty-white.png);
+  border: 1px solid #f0f0f0;
+  /* image:url(qss:images_classic/checkbox-Empty-white.png); */
 }
 
 QCheckBox::indicator:unchecked {
   background-color: #252525;
-  image:url(qss:images_classic/checkbox-Empty-white.png);
+  border: 1px solid #f0f0f0;
+  /* image:url(qss:images_classic/checkbox-Empty-white.png); */
 }
 
 QCheckBox::indicator:unchecked:hover, QCheckBox::indicator:unchecked:focus, QCheckBox::indicator:unchecked:pressed {
   background-color: @ThemeAccentColor1;
-  image:url(qss:images_classic/checkbox-Empty-white.png);
+  border: 1px solid #f0f0f0;
+  /* image:url(qss:images_classic/checkbox-Empty-white.png); */
 }
 
 QCheckBox::indicator:unchecked:disabled {
   background-color: #444444;
-  image:url(qss:images_classic/checkbox-Empty-lightgray.png);
+  border: 1px solid #696969;
+  /* image:url(qss:images_classic/checkbox-Empty-lightgray.png); */
 }
 
 QCheckBox::indicator:checked {
-  background-color: #252525;
-  /*border: 1px solid #020202; /* QRadioButton has the same color */
-  image:url(qss:images_classic/checkbox-checked-white.png);
+  /* background-color: #252525; */
+  image:url(qss:images_classic/check-checked-white.png);
 }
 
 QCheckBox::indicator:checked:hover, QCheckBox::indicator:checked:pressed {
@@ -294,18 +299,17 @@ QCheckBox::indicator:checked:hover, QCheckBox::indicator:checked:pressed {
 
 QCheckBox::indicator:checked:disabled {
   background-color: #444444;
-  image: url(qss:images_classic/checkbox-checked-lightgray.png);
+  image: url(qss:images_classic/check-checked-lightgray.png);
 }
 
 QCheckBox::indicator:indeterminate {
-  background-color: #252525;
-  border: 1px solid #020202;
-  image: url(qss:images_classic/checkbox-indeterminate-white.png);
+  /* background-color: #252525; */
+  image: url(qss:images_classic/Check-indeterminate-mark-white.png);
 }
 
 QCheckBox::indicator:indeterminate:disabled {
   background-color: #444444;
-  image: url(qss:images_classic/checkbox-indeterminate-white.png);
+  image: url(qss:images_classic/Check-indeterminate-mark-lightgray.png);
 }
 
 QCheckBox::indicator:indeterminate:hover, QCheckBox::indicator:indeterminate:pressed {
@@ -338,6 +342,7 @@ QGroupBox::indicator {
   border-radius:1px;
 }
 
+
 QGroupBox::indicator:unchecked {
   background-color: #020202;
   border: 1px solid #020202;
@@ -382,7 +387,7 @@ QRadioButton {
 }
 
 QRadioButton:focus {
-  border: 0.5px solid @ThemeAccentColor2;
+  border: 1px solid @ThemeAccentColor2;
 }
 
 QRadioButton:disabled {
@@ -400,42 +405,41 @@ QRadioButton QWidget {
 }
 
 QRadioButton::indicator {
-  height: 13px;
-  width: 13px;
-  border-image:url(qss:images_classic/Radio-unchecked-white.png);
+  border-image: none;
+  width: 14px;
+  height: 14px;
+  image:url(qss:images_classic/Radio-unchecked-white.png);
 }
 
 QRadioButton::indicator:unchecked {
-  /*image:url(qss:images_classic/Radio-checked-white.png);*/
 }
 
 QRadioButton::indicator:unchecked:hover, QRadioButton::indicator:unchecked:pressed {
-  /* background-color: @ThemeAccentColor1;
-  border: 1px solid @ThemeAccentColor1;
-  border-radius: 6px; */
+
 }
 
 QRadioButton::indicator:unchecked:disabled {
-  /*image:url(qss:images_classic/Radio-checked-lightgray.png);*/
-  border: 1px solid #444444;
+  border-image: none;
+  width: 14px;
+  height: 14px;
+  image:url(qss:images_classic/Radio-unchecked-lightgray.png);
 }
 
 QRadioButton::indicator:checked {
-  height: 13px;
-  width: 13px;
-  border-image:url(qss:images_classic/Radio-checked-white.png);
+  border-image: none;
+  width: 14px;
+  height: 14px;
+  image:url(qss:images_classic/Radio-checked-white.png);
 }
 
 QRadioButton::indicator:checked:hover, QRadioButton::indicator:checked:pressed {
-  /* background-color: @ThemeAccentColor1;
-  border: 1px solid @ThemeAccentColor1;
-  border-radius: 6px;
-  image:url(qss:images_classic/Radio-checked-white.png); */
+
 }
 
 QRadioButton::indicator:checked:disabled {
-  outline: none;
-  background-color: #444444;
+  border-image: none;
+  width: 14px;
+  height: 14px;
   image:url(qss:images_classic/Radio-checked-lightgray.png);
 }
 
@@ -453,7 +457,7 @@ QMenuBar {
 }
 
 QMenuBar:focus {
-  border: 0.5px solid @ThemeAccentColor2;
+  border: 1px solid @ThemeAccentColor2;
 }
 
 QMenuBar::item {
@@ -487,8 +491,7 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qmenu
 
 --------------------------------------------------------------------------- */
 QMenu {
-  border-bottom: 2px rgba(0,0,0,140);
-  border-right: 2px rgba(0,0,0,140);
+  border: 1px solid #3c3c3c;
   color: White;
   margin: 0px;
   background-color: #252525;
@@ -677,8 +680,8 @@ QScrollBar:horizontal {
   height: 14px;
   border-right: 14px solid qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 #020202, stop:0.1 #303030, stop:0.9 #353535, stop:1 #020202);
   border-left: 14px solid qlineargradient(x1:1, y1:0, x2:0, y2:0, stop:0 #020202, stop:0.1 #303030, stop:0.9 #353535, stop:1 #020202);
-  border-top: 0.5px solid #020202;
-  border-bottom: 0.5px solid #020202;
+  border-top: 1px solid #020202;
+  border-bottom: 1px solid #020202;
   background-color: #202020;
 }
 
@@ -687,8 +690,8 @@ QScrollBar:vertical {
   width: 14px;
   border-top: 14px solid qlineargradient(x1:0, y1:1, x2:0, y2:0, stop:0 #020202, stop:0.1 #303030, stop:0.9 #353535, stop:1 #020202);
   border-bottom: 14px solid qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #020202, stop:0.1 #303030, stop:0.9 #353535, stop:1 #020202);
-  border-left: 0.5px solid #020202;
-  border-right: 0.5px solid #020202;
+  border-left: 1px solid #020202;
+  border-right: 1px solid #020202;
   background-color: #202020;
 }
 
@@ -704,7 +707,7 @@ QScrollBar::handle:horizontal:hover {
 }
 
 QScrollBar::handle:horizontal:focus {
-  border: 0.5px solid @ThemeAccentColor2;
+  border: 1px solid @ThemeAccentColor2;
 }
 
 QScrollBar::handle:vertical {
@@ -723,7 +726,7 @@ QScrollBar::handle:vertical:hover {
 }
 
 QScrollBar::handle:vertical:focus {
-  border: 0.5px solid @ThemeAccentColor2;
+  border: 1px solid @ThemeAccentColor2;
 }
 
 QScrollBar::add-line:horizontal {
@@ -794,40 +797,6 @@ QScrollBar::sub-line:vertical:hover, QScrollBar::sub-line:vertical:on {
   subcontrol-origin: margin;
 }
 
-/* QScrollBar::up-arrow:horizontal, QScrollBar::down-arrow:horizontal {
-  background: none;
-  border: 1px solid #8800ff;
-} */
-
-/* QScrollBar::up-arrow:vertical, QScrollBar::down-arrow:vertical {
-  background: none;
-  border: 1px solid #00ff6a;
-} */
-
-/* QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal {
-  background: none;
-  border: 1px solid #00ff95; */
-  /* border: 1px solid #020202; */
-/* } */
-
-/* QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {
-  background: none;
-  border: 1px solid #0400ff;*/
-  /* border: 1px solid #020202; */
-/*} */
-
-/* QScrollBar::add-line {
-  border: 1px solid #ff0000;
-  background: none;
-}
-
-QScrollBar::sub-line {
-  border: 1px solid #00ff44;
-  background: none;
-} */
-
-
-
 /* QTextEdit --------------------------------------------------------------
 
 https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-specific-widgets
@@ -843,7 +812,7 @@ QTextEdit {
 }
 
 QTextEdit:focus {
-  border: 0.5px solid @ThemeAccentColor2;
+  border: 1px solid @ThemeAccentColor2;
 }
 
 QTextEdit:selected {
@@ -862,7 +831,7 @@ QPlainTextEdit {
 }
 
 QPlainTextEdit:focus {
-  border: 0.5px solid @ThemeAccentColor2;
+  border: 1px solid @ThemeAccentColor2;
 }
 
 QPlainTextEdit:selected {
@@ -903,15 +872,15 @@ QToolBar {
 
 QToolBar:horizontal {
   /* border-top: 1px solid #020202; */
-  border-bottom: 0.5px solid #020202;
+  border-bottom: 1px solid #020202;
   /* spacing: 2px; */
   padding-top: 3px;
   padding-left: 5px;
 }
 
 QToolBar:vertical {
-  border-left: 0.5px solid #020202;
-  border-right: 0.5px solid #020202;
+  border-left: 1px solid #020202;
+  border-right: 1px solid #020202;
   /* spacing: 1px; */
   padding-top: 3px;
   padding-left: 2px;
@@ -944,14 +913,15 @@ QToolBar::handle:vertical:hover {
   image: url(qss:images_classic/Vmovetoolbar-white.png);
 }
 
-
 QToolBar::separator:horizontal {
   width: 2px;
+  padding: 0px 5px;
   image: url(qss:images_classic/Hsepartoolbar-Darkgray.png);
 }
 
 QToolBar::separator:vertical {
   height: 2px;
+  padding: 5px 0px;
   image: url(qss:images_classic/Vsepartoolbar-Darkgray.png);
 }
 
@@ -983,6 +953,8 @@ QSpinBox {
   color: White;
   border-radius: 2px;
   min-height: 1.7em;
+  padding-left: 4px;
+  padding-right: 4px;
 }
 
 QAbstractSpinBox:up-button {
@@ -991,11 +963,8 @@ QAbstractSpinBox:up-button {
   subcontrol-position: top right;
   border-top: 1px solid transparent;
   border-right: 1px solid transparent;
+  border-bottom: 0px solid transparent;
   border-top-right-radius: 2px;
-  border-bottom-left-radius: 2px;
-  margin-top: 1px;
-  margin-right: 1px;
-
 }
 
 QAbstractSpinBox::up-arrow, QAbstractSpinBox::up-arrow:disabled, QAbstractSpinBox::up-arrow:off {
@@ -1016,13 +985,8 @@ QAbstractSpinBox:down-button {
   subcontrol-position: bottom right;
   border-bottom: 1px solid transparent;
   border-right: 1px solid transparent;
-  border-top-left-radius: 2px;
-  border-bottom-left-radius: 2px;
-  margin-bottom: 1px;
-  margin-right: 1px;
-  /* margin: 1px; */
-  /*width: 12px;
-  /*margin-top: -1px;*/
+  border-top: 0px solid transparent;
+  border-bottom-right-radius: 2px;
 }
 
 QAbstractSpinBox::down-arrow, QAbstractSpinBox::down-arrow:disabled, QAbstractSpinBox::down-arrow:off {
@@ -1042,7 +1006,7 @@ QAbstractSpinBox:hover {
 }
 
 QAbstractSpinBox:focus {
-  border: 0.5px solid @ThemeAccentColor2;
+  border: 1px solid @ThemeAccentColor2;
 }
 
 QAbstractSpinBox:selected {
@@ -1062,7 +1026,15 @@ QLabel {
   border: 0px solid #020202;
   padding: 2px;
   margin: 0px;
-  color: White;
+  color: #ffffff;
+}
+
+QLabel#FileCardStartPage {
+  background-color: transparent;
+  border: 0px solid #020202;
+  padding: 2px;
+  margin: 0px;
+  color: #ff0000;
 }
 
 QLabel:disabled {
@@ -1213,6 +1185,11 @@ QPushButton:checked {
   outline: none;
 }
 
+QPushButton:focus {
+  border: 1px solid  @ThemeAccentColor1;
+}
+
+
 QPushButton:checked:disabled {
   border: 1px solid  @ThemeAccentColor1;
   color: #adadad;
@@ -1311,25 +1288,25 @@ QToolButton:selected {
   color: White;
 }
 
-QToolButton[popupMode="0"] {
+/* QToolButton[popupMode="0"] { */
   /* Only for DelayedPopup */
-  padding-right: 20px;
-}
+  /* padding-right: 20px;
+} */
 
 QToolButton[popupMode="1"] {
   /* Only for MenuButtonPopup */
   padding-right: 20px;
 }
 
-QToolButton[popupMode="0"]::menu-button {
+/* QToolButton[popupMode="0"]::menu-button {
   border: none;
-}
+} */
 
-QToolButton[popupMode="0"]::menu-button:hover {
+/* QToolButton[popupMode="0"]::menu-button:hover {
   border: none;
   border-left: 2px solid #202020;
   border-radius: 3px;
-}
+} */
 QToolButton[popupMode="1"]::menu-button {
   border: none;
 }
@@ -1342,7 +1319,7 @@ QToolButton[popupMode="1"]::menu-button:hover {
 
 QToolButton[popupMode="2"] {
   /* Only for InstantPopup */
-  padding-right: 20px;
+  padding-right: 15px;
 }
 QToolBar > QToolButton#qt_toolbutton_menubutton {
   padding-right: 15px; /* Hack to add more width to buttons with menu */
@@ -1372,7 +1349,7 @@ QToolButton::menu-button:checked:hover {
 
 QToolButton::menu-indicator {
   /* Exclude a shift for better image */
-  subcontrol-position: center center;
+  subcontrol-position: right center;
   /* Shift it a bit */
 }
 
@@ -1380,11 +1357,9 @@ QToolButton::menu-arrow {
   image: url(qss:images_classic/Arrow-down-lightgray.png);
   width: 1.3ex;
   height: 1.3ex;
-  subcontrol-position: center center;
-  background: transparent;
+  /* background: transparent; */
 }
 QToolButton::menu-arrow:open {
-  subcontrol-position: center center;
   image: url(qss:images_classic/Arrow-Down-white.png);
   width: 1.3ex;
   height: 1.3ex;
@@ -1614,19 +1589,27 @@ padding: 0px;
 }
 
 QSint--ActionGroup QFrame[class="header"] QLabel[fold="false"] {
-  background-image: url(qss:images_classic/Qsint_header_Unfold_Blue-dark.png);
+  width: 30px;
+  height: 30px;
+  image: url(qss:images_classic/Qsint_header_Unfold_Blue-dark.png);
 }
 
 QSint--ActionGroup QFrame[class="header"] QLabel:hover[fold="false"] {
-  background-image: url(qss:images_classic/Qsint_header_UnfoldOver_Blue-dark.png);
+  width: 30px;
+  height: 30px;
+  image: url(qss:images_classic/Qsint_header_UnfoldOver_Blue-dark.png);
 }
 
 QSint--ActionGroup QFrame[class="header"] QLabel[fold="true"] {
-  background-image: url(qss:images_classic/Qsint_header_Fold_Blue-dark.png);
+  width: 30px;
+  height: 30px;
+  image: url(qss:images_classic/Qsint_header_Fold_Blue-dark.png);
 }
 
 QSint--ActionGroup QFrame[class="header"] QLabel[fold="true"]:hover {
-  background-image: url(qss:images_classic/Qsint_header_FoldOver_Blue-dark.png) ;
+  width: 30px;
+  height: 30px;
+  image: url(qss:images_classic/Qsint_header_FoldOver_Blue-dark.png) ;
 }
 
 QSint--ActionGroup QFrame[class="content"] {
@@ -1803,7 +1786,7 @@ QSlider::handle:horizontal:hover {
 
 QSlider::handle:horizontal:focus {
   background: @ThemeAccentColor2;
-  border: 0.5px solid @ThemeAccentColor2;
+  border: 1px solid @ThemeAccentColor2;
 }
 
 QSlider::handle:vertical {
@@ -1821,7 +1804,7 @@ QSlider::handle:vertical:hover {
 }
 
 QSlider::handle:vertical:focus {
-  border: 0.5px solid @ThemeAccentColor2;
+  border: 1px solid @ThemeAccentColor2;
 }
 
 /* QLineEdit --------------------------------------------------------------
@@ -1924,6 +1907,28 @@ QTabBar, QDockWidget QTabBar {
   /* left: 5px; move to the right by 5px - removed for fix */
 }
 
+QTabBar[style="icon-only"]::tab:top {
+  min-width: 16px;
+  padding-right: -1px;
+}
+
+QTabBar[style="icon-only"]::tab:bottom {
+  min-width: 16px;
+  padding-right: -1px;
+}
+
+QTabBar[style="icon-only"]::tab:left {
+  min-height: 16px;
+  padding: 0px;
+}
+
+QTabBar[style="icon-only"]::tab:right {
+  min-height: 16px;
+  padding: 0px;
+}
+
+
+
 QTabBar::close-button, QDockWidget QTabBar::close-button {
   border: 0;
   margin: 3px;
@@ -1945,62 +1950,12 @@ QTabBar::tab, QDockWidget QTabBar::tab {
   /* selected ------------------------------------------------------- */
   padding: 4px;
   background-color: #333333;
-
 }
-/*
-QTabBar::tab:top:selected:disabled, QDockWidget QTabBar::tab:top:selected:disabled {
-  color: #adadad;
-}
-
-QTabBar::tab:bottom:selected:disabled, QDockWidget QTabBar::tab:bottom:selected:disabled {
-  color: #adadad;
-}
-
-QTabBar::tab:left:selected:disabled, QDockWidget QTabBar::tab:left:selected:disabled {
-  color: #adadad;
-}
-
-QTabBar::tab:right:selected:disabled, QDockWidget QTabBar::tab:right:selected:disabled {
-  color: #adadad;
-}
-
-QTabBar::tab:top:!selected:disabled, QDockWidget QTabBar::tab:top:!selected:disabled {
-  color: #adadad;
-}
-
-QTabBar::tab:bottom:!selected:disabled, QDockWidget QTabBar::tab:bottom:!selected:disabled {
-  color: #adadad;
-
-}
-
-QTabBar::tab:left:!selected:disabled, QDockWidget QTabBar::tab:left:!selected:disabled {
-  color: #adadad;
-
-}
-
-QTabBar::tab:right:!selected:disabled, QDockWidget QTabBar::tab:right:!selected:disabled {
-  color: #adadad;
-}
-
-QTabBar::tab:top:!selected, QDockWidget QTabBar::tab:top:!selected {
-  color: #adadad;
-}
-
-QTabBar::tab:bottom:!selected, QDockWidget QTabBar::tab:bottom:!selected {
-  color: #adadad;
-}
-
-QTabBar::tab:left:!selected, QDockWidget QTabBar::tab:left:!selected {
-  color: #adadad;
-}
-
-QTabBar::tab:right:!selected, QDockWidget QTabBar::tab:right:!selected {
-  color: #adadad;
-} */
 
 QTabBar::tab:top, QDockWidget QTabBar::tab:top {
   color: white;
-  padding-left: 9px;
+  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);
   margin-top: 3px;
@@ -2087,7 +2042,7 @@ QTabBar::tab:left:selected, QDockWidget QTabBar::tab:left:selected {
 
 QTabBar::tab:left:!selected:hover, QDockWidget QTabBar::tab:left:!selected:hover {
   background-color: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 #444444, stop:1 #333333);
-
+  margin-right: 0px;
 }
 
 QTabBar::tab:right, QDockWidget QTabBar::tab:right {
@@ -2179,7 +2134,7 @@ QDockWidget::close-button {
   icon-size: 10px;
   border: none;
   background: transparent;
-  background-image: transparent;
+  background-image: none;
   border: 0;
   margin: 0;
   padding: 0;
@@ -2198,7 +2153,7 @@ QDockWidget::float-button {
   icon-size: 12px;
   border: none;
   background: transparent;
-  background-image: transparent;
+  background-image: none;
   border: 0;
   margin: 0;
   padding: 0;
@@ -2226,18 +2181,15 @@ QTreeView::branch  {
 }
 
 QTreeView::branch:has-siblings:!adjoins-item  {
-  /* border-image: url(qss:images_classic/branch_vline_white.png) 0; */
-  /* border-image: url(qss:images_classic/Arrow-right-white.png) 0; */
+
 }
 
 QTreeView::branch:has-siblings:adjoins-item  {
-  /* border-image: url(qss:images_classic/Arrow-right-blue.png) 0; */
-  /* border-image: url(qss:images_classic/branch_more_white.png) 0; */
+
 }
 
 QTreeView::branch:!has-children:!has-siblings:adjoins-item  {
-  /* border-image: url(qss:images_classic/Arrow-right-lightgray.png) 0; */
-  /* border-image: url(qss:images_classic/branch_end_white.png) 0; */
+
 }
 
 QTreeView::branch:closed:has-children:has-siblings  {
@@ -2245,7 +2197,6 @@ QTreeView::branch:closed:has-children:has-siblings  {
   margin-bottom: 5px;
   border-image: none;
   image: url(qss:images_classic/Arrow-right-white.png) 0;
-  /* border-image: url(qss:images_classic/branch_more_closed_white.png) 0; */
 }
 
 QTreeView::branch:has-children:!has-siblings:closed  {
@@ -2253,8 +2204,6 @@ QTreeView::branch:has-children:!has-siblings:closed  {
   margin-bottom: 5px;
   border-image: none;
   image: url(qss:images_classic/Arrow-right-white.png) 0;
-  /* border-image: url(qss:images_classic/Arrow-right-whitey.png) 0; */
-  /* border-image: url(qss:images_classic/branch_end_closed_white.png) 0; */
 }
 
 QTreeView::branch:open:has-children:has-siblings  {
@@ -2262,7 +2211,6 @@ QTreeView::branch:open:has-children:has-siblings  {
   margin-right: 6px;
   border-image: none;
   image: url(qss:images_classic/Arrow-down-white.png) 0;
-  /* border-image: url(qss:images_classic/branch_more_open_white.png) 0; */
 }
 
 QTreeView::branch:open:has-children:!has-siblings  {
@@ -2270,14 +2218,35 @@ QTreeView::branch:open:has-children:!has-siblings  {
   margin-right: 6px;
   border-image: none;
   image: url(qss:images_classic/Arrow-down-white.png) 0;
-  /* border-image: url(qss:images_classic/branch_end_open_white.png) 0; */
+}
+
+QTreeView::indicator,
+QListView::indicator,
+QTableView::indicator,
+QColumnView::indicator {
+  border: 1px solid #ffffff;
+}
+
+QTreeView::indicator:unchecked:disabled,
+QListView::indicator:unchecked:disabled,
+QTableView::indicator:unchecked:disabled,
+QColumnView::indicator:unchecked:disabled {
+  border: 1px solid #696969;
 }
 
 QTreeView::indicator:checked,
 QListView::indicator:checked,
 QTableView::indicator:checked,
 QColumnView::indicator:checked {
-  image: url(qss:images_classic/checkbox-checked-white.png);
+  image: url(qss:images_classic/check-checked-white.png);
+}
+
+QTreeView::indicator:checked:disabled ,
+QListView::indicator:checked:disabled ,
+QTableView::indicator:checked:disabled ,
+QColumnView::indicator:checked:disabled  {
+  image: url(qss:images_classic/check-checked-lightgray.png);
+  border: 1px solid #696969;
 }
 
 QTreeView::indicator:checked:hover, QTreeView::indicator:checked:focus, QTreeView::indicator:checked:pressed,
@@ -2290,15 +2259,17 @@ QTableView::indicator:checked:pressed,
 QColumnView::indicator:checked:hover,
 QColumnView::indicator:checked:focus,
 QColumnView::indicator:checked:pressed {
-  image: url(qss:images_classic/checkbox-checked-blue.png);
+  /* image: url(qss:images_classic/checkbox-checked-blue.png); */
+  background-color: @ThemeAccentColor1;
+  border: 1px solid #ffffff;
 }
 
-QTreeView::indicator:unchecked,
+/* QTreeView::indicator:unchecked,
 QListView::indicator:unchecked,
 QTableView::indicator:unchecked,
 QColumnView::indicator:unchecked {
   image: url(qss:images_classic/checkbox-Empty-white.png);
-}
+} */
 
 QTreeView::indicator:unchecked:hover, QTreeView::indicator:unchecked:focus, QTreeView::indicator:unchecked:pressed,
 QListView::indicator:unchecked:hover,
@@ -2310,16 +2281,18 @@ 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;
 }
 
 QTreeView::indicator:indeterminate,
 QListView::indicator:indeterminate,
 QTableView::indicator:indeterminate,
 QColumnView::indicator:indeterminate {
-  image: url(qss:images_classic/checkbox-indeterminate-white.png);
+  image: url(qss:images_classic/Check-indeterminate-mark-white.png);
 }
-
+/* :disabled */
 QTreeView::indicator:indeterminate:hover, QTreeView::indicator:indeterminate:focus, QTreeView::indicator:indeterminate:pressed,
 QListView::indicator:indeterminate:hover,
 QListView::indicator:indeterminate:focus,
@@ -2330,7 +2303,9 @@ QTableView::indicator:indeterminate:pressed,
 QColumnView::indicator:indeterminate:hover,
 QColumnView::indicator:indeterminate:focus,
 QColumnView::indicator:indeterminate:pressed {
-  image: url(qss:images_classic/checkbox-indeterminate-white.png);
+  image: url(qss:images_classic/Check-indeterminate-mark-lightgray.png);
+  background-color: @ThemeAccentColor1;
+  border: 1px solid #ffffff;
 }
 
 QTreeView,
@@ -2338,7 +2313,6 @@ QListView,
 QTableView,
 QColumnView {
   background-color: #252525;  /* background of a lot of stuff including spreadsheets.*/
-  /* border: 1px solid #ef0000; */
   color: White;
   gridline-color: #020202;
   border-radius: 0px;
@@ -2349,6 +2323,9 @@ QListView  {
   background-color: #252525;  /* background of a lot of stuff including spreadsheets.*/
 }
 
+QTreeView{
+selection-background-color: transparent; /* fix for selection color being visible in preferences */
+}
 
 QTreeView:disabled,
 QListView:disabled,
@@ -2384,7 +2361,7 @@ QTreeView::item:selected:active,
 QListView::item:selected:active,
 QTableView::item:selected:active,
 QColumnView::item:selected:active {
-  background-color: #333333;
+  background-color: @ThemeAccentColor2;
 }
 
 QTreeView::item:selected:!active,
@@ -2392,7 +2369,7 @@ QListView::item:selected:!active,
 QTableView::item:selected:!active,
 QColumnView::item:selected:!active {
   /* color: White; */
-  background-color: #333333;
+  background-color: @ThemeAccentColor1;
 }
 
 QTreeView::item:!selected:hover,
@@ -2462,7 +2439,7 @@ QHeaderView::section::vertical {
   padding-bottom: 0;
   padding-left: 1px;
   padding-right: 0px; */
-  border-top: 0.5px solid #020202;
+  border-top: 1px solid #020202;
 }
 
 QHeaderView::section::vertical::first, QHeaderView::section::vertical::only-one {
@@ -2736,65 +2713,32 @@ Gui--NotificationLabel {
   border: 1px solid #020202;
   border-radius: 2px;
 }
-
-
-Gui--OverlayToolButton:!hover{
-  background-color: transparent;
-  image: url(qss:overlay/close_light.svg);
+/* overlay */
+Gui--OverlayToolButton{
+  image: url(qss:images_classic/close-lightgray.png);
 }
 
 Gui--OverlayToolButton:hover {
-  image: url(qss:overlay/close_red.svg);
+  image: url(qss:images_classic/close-red.png);
 }
 
-Gui--OverlayToolButton[objectName="OBTN Transparent"]:!checked  {
-  image: url(qss:overlay/transparent_light.svg);
-}
-
-Gui--OverlayToolButton[objectName="OBTN Transparent"]:hover {
-  image: url(qss:overlay/transparent_lighter.svg);
-}
-
-Gui--OverlayToolButton[objectName="OBTN Transparent"]:checked {
-  image: url(qss:overlay/transparent_lighter.svg);
-}
-
-Gui--OverlayToolButton[objectName="OBTN Overlay"]:!checked{
-  image: url(qss:overlay/overlay_light.svg);
-}
-
-Gui--OverlayToolButton[objectName="OBTN Overlay"]:hover {
-  image: url(qss:overlay/overlay_lighter.svg);
-}
-
-Gui--OverlayToolButton[objectName="OBTN Overlay"]:checked {
-  image: url(qss:overlay/overlay_lighter.svg);
-}
-
-Gui--OverlayToolButton[objectName="OBTN AutoMode"]:!checked {
-  image: url(qss:overlay/mode_light.svg);
-}
-
-Gui--OverlayToolButton[objectName="OBTN AutoMode"]:hover {
-  image: url(qss:overlay/mode_lighter.svg);
-}
-
-Gui--OverlayToolButton[objectName="OBTN AutoMode"]:checked {
-  image: url(qss:overlay/mode_lighter.svg);
-}
-
-Gui--OverlayToolButton[objectName="OBTN Float"]:!checked {
-  image: url(qss:overlay/float_light.svg);
+Gui--OverlayToolButton[objectName="OBTN Float"] {
+  image: url(qss:images_classic/float-lightgray.png);
 }
 
 Gui--OverlayToolButton[objectName="OBTN Float"]:hover {
-  image: url(qss:overlay/float_lighter.svg);
+  image: url(qss:images_classic/float-white.png);
 }
 
-Gui--OverlayToolButton[objectName="OBTN Float"]:checked {
-  image: url(qss:overlay/float_lighter.svg);
+Gui--OverlayToolButton[objectName="OBTN Overlay"] {
+  image: url(qss:images_classic/overlay-lightgray.png);
 }
 
+Gui--OverlayToolButton[objectName="OBTN Overlay"]:hover {
+  image: url(qss:images_classic/overlay-white.png);
+}
+
+
 /*==================================================================================================
 Forming windows below are the border settings. See also https://forum.freecad.org/viewtopic.php?p=439797#p439797
 ==================================================================================================*/
@@ -2856,15 +2800,20 @@ Start page
 QWidget#thumbnailWidget {
   background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #333333, stop:1 #252525);
   border-radius: 8px;
-  margin-bottom: 3px;
-  margin-right: 7px;
   border: 1px solid #020202;
 }
 
 QWidget#thumbnailWidget[state="hovered"] {
-  border: 0.5px solid @ThemeAccentColor2;
+  border: 1px solid @ThemeAccentColor2;
 }
 
 QWidget#thumbnailWidget[state="pressed"] {
   border: 1px solid @ThemeAccentColor1;
-}
+}
+
+/**
+ * Special handling for WB Tab Bar
+ */
+ #WbTabBar #WbTabBarMore {
+  padding-right: 12px;
+ }

src/Gui/Stylesheets/FreeCAD Light.qss

@@ -41,6 +41,8 @@ Resetting everything helps to unify styles across different operating systems
   border-style: none;
   border-image: none;
   outline: 0;
+  color: black;
+  selection-background-color: @ThemeAccentColor1;
 }
 
 /* specific reset for elements inside QToolBar */
@@ -117,16 +119,16 @@ Gui--NavigationIndicatorGui--BlenderNavigationStyle {
 }
 
 /* QWidget ----------------------------------------------------------------
-
+This causes much load time.
 --------------------------------------------------------------------------- */
-QWidget {
+/* QWidget { */
   /* background-color: #d8d8d8; */
-  border: 0px solid #ababab;
-  padding: 0px;
+  /* border: 0px solid #ababab;
+  padding: 0px; */
   /* color: black; */
-  selection-background-color: transparent;
-  selection-color: black;
-}
+  /* selection-background-color: @ThemeAccentColor1; */
+  /* selection-color: black; */
+/* } */
 
 QWidget:disabled {
   color: #adadad;
@@ -182,8 +184,8 @@ QToolTip {
   /* If you remove the border property, background stops working on Windows */
   border: none;
   font-weight:bolder;
-  border-top-width: 0.5px;
-  border-left-width: 0.5px;
+  border-top-width: 1px;
+  border-left-width: 1px;
   border-right-width: 1.5px;
   border-bottom-width: 1.5px;
   border-style: solid;
@@ -239,7 +241,7 @@ QCheckBox {
 }
 
 QCheckBox:focus {
-  border: 0.5px solid @ThemeAccentColor2;
+  border: 1px solid @ThemeAccentColor2;
 }
 
 QCheckBox QWidget:disabled {
@@ -251,12 +253,14 @@ QCheckBox::indicator {
   background-color: #f0f0f0;
   width: 12px;
   height: 12px;
-  image:url(qss:images_classic/checkbox-Empty-black.png);
+  border: 1px solid #1c1c1c;
+  /* image:url(qss:images_classic/checkbox-Empty-black.png); */
 }
 
 QCheckBox::indicator:unchecked {
   background-color: #fdfdfd;
-  image:url(qss:images_classic/checkbox-Empty-black.png);
+  border: 1px solid #1c1c1c;
+  /* image:url(qss:images_classic/checkbox-Empty-black.png); */
 }
 
 QCheckBox::indicator:unchecked:hover, QCheckBox::indicator:unchecked:focus, QCheckBox::indicator:unchecked:pressed {
@@ -266,36 +270,42 @@ QCheckBox::indicator:unchecked:hover, QCheckBox::indicator:unchecked:focus, QChe
 
 QCheckBox::indicator:unchecked:disabled {
   background-color: #d8d8d8;
-  image:url(qss:images_classic/checkbox-Empty-lightgray.png);
+  border: 1px solid #646464;
+  /* image:url(qss:images_classic/checkbox-Empty-lightgray.png); */
 }
 
 QCheckBox::indicator:checked {
   background-color: #f0f0f0;
-  image:url(qss:images_classic/checkbox-checked-black.png);
+
+  image:url(qss:images_classic/check-checked-black.png);
 }
 
 QCheckBox::indicator:checked:hover, QCheckBox::indicator:checked:pressed {
   background-color: @ThemeAccentColor1;
+  border: 1px solid #1c1c1c;
 }
 
 QCheckBox::indicator:checked:disabled {
   background-color: #d8d8d8;
-  image: url(qss:images_classic/checkbox-checked-lightgray.png);
+  border: 1px solid #ababab;
+  image: url(qss:images_classic/check-checked-lightgray.png);
 }
 
 QCheckBox::indicator:indeterminate {
   background-color: #f0f0f0;
-  border: 1px solid #ababab;
-  image: url(qss:images_classic/checkbox-indeterminate-black.png);
+  border: 1px solid #1c1c1c;
+  image: url(qss:images_classic/Check-indeterminate-mark-black.png);
 }
 
 QCheckBox::indicator:indeterminate:disabled {
   background-color: #d8d8d8;
-  image: url(qss:images_classic/checkbox-indeterminate-black.png);
+  border: 1px solid #ababab;
+  image: url(qss:images_classic/Check-indeterminate-mark-lightgray.png);
 }
 
 QCheckBox::indicator:indeterminate:hover, QCheckBox::indicator:indeterminate:pressed {
   background-color: @ThemeAccentColor1; /* QRadioButton has the same color */
+  border: 1px solid #1c1c1c;
 }
 
 /* QGroupBox --------------------------------------------------------------
@@ -368,7 +378,7 @@ QRadioButton {
 }
 
 QRadioButton:focus {
-  border: 0.5px solid @ThemeAccentColor2;
+  border: 1px solid @ThemeAccentColor2;
 }
 
 QRadioButton:disabled {
@@ -385,9 +395,10 @@ QRadioButton QWidget {
 }
 
 QRadioButton::indicator {
-  height: 13px;
-  width: 13px;
-  border-image:url(qss:images_classic/Radio-unchecked-black.png);
+  border-image: none;
+  width: 14px;
+  height: 14px;
+  image:url(qss:images_classic/Radio-unchecked-black.png);
 }
 
 QRadioButton::indicator:unchecked {
@@ -398,13 +409,17 @@ QRadioButton::indicator:unchecked:hover, QRadioButton::indicator:unchecked:press
 }
 
 QRadioButton::indicator:unchecked:disabled {
-  border: 1px solid #d8d8d8;
+  border-image: none;
+  width: 14px;
+  height: 14px;
+  image:url(qss:images_classic/Radio-unchecked-lightgray.png);
 }
 
 QRadioButton::indicator:checked {
-  height: 13px;
-  width: 13px;
-  border-image:url(qss:images_classic/Radio-checked-black.png);
+  border-image: none;
+  width: 14px;
+  height: 14px;
+  image:url(qss:images_classic/Radio-checked-black.png);
 }
 
 QRadioButton::indicator:checked:hover, QRadioButton::indicator:checked:pressed {
@@ -412,8 +427,9 @@ QRadioButton::indicator:checked:hover, QRadioButton::indicator:checked:pressed {
 }
 
 QRadioButton::indicator:checked:disabled {
-  outline: none;
-  background-color: #d8d8d8;
+  border-image: none;
+  width: 14px;
+  height: 14px;
   image:url(qss:images_classic/Radio-checked-lightgray.png);
 }
 
@@ -429,7 +445,7 @@ QMenuBar {
 }
 
 QMenuBar:focus {
-  border: 0.5px solid @ThemeAccentColor2;
+  border: 1px solid @ThemeAccentColor2;
 }
 
 QMenuBar::item {
@@ -454,8 +470,7 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qmenu
 
 --------------------------------------------------------------------------- */
 QMenu {
-  border-bottom: 2px rgba(0,0,0,140);
-  border-right: 2px rgba(0,0,0,140);
+  border: 1px solid #ababab;
   color: black;
   margin: 0px;
   background-color: #f0f0f0;
@@ -644,8 +659,8 @@ QScrollBar:horizontal {
   height: 14px;
   border-right: 14px solid qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 #ababab, stop:0.1 #f9f9f9, stop:0.9 #fafafa, stop:1 #ababab);
   border-left: 14px solid qlineargradient(x1:1, y1:0, x2:0, y2:0, stop:0 #ababab, stop:0.1 #f9f9f9, stop:0.9 #fafafa, stop:1 #ababab);
-  border-top: 0.5px solid #ababab;
-  border-bottom: 0.5px solid #ababab;
+  border-top: 1px solid #ababab;
+  border-bottom: 1px solid #ababab;
   background-color: #e6e6e6;
 }
 
@@ -654,8 +669,8 @@ QScrollBar:vertical {
   width: 14px;
   border-top: 14px solid qlineargradient(x1:0, y1:1, x2:0, y2:0, stop:0 #ababab, stop:0.1 #f9f9f9, stop:0.9 #fafafa, stop:1 #ababab);
   border-bottom: 14px solid qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #ababab, stop:0.1 #f9f9f9, stop:0.9 #fafafa, stop:1 #ababab);
-  border-left: 0.5px solid #ababab;
-  border-right: 0.5px solid #ababab;
+  border-left: 1px solid #ababab;
+  border-right: 1px solid #ababab;
   background-color: #e6e6e6;
 }
 
@@ -671,7 +686,7 @@ QScrollBar::handle:horizontal:hover {
 }
 
 QScrollBar::handle:horizontal:focus {
-  border: 0.5px solid @ThemeAccentColor2;
+  border: 1px solid @ThemeAccentColor2;
 }
 
 QScrollBar::handle:vertical {
@@ -690,7 +705,7 @@ QScrollBar::handle:vertical:hover {
 }
 
 QScrollBar::handle:vertical:focus {
-  border: 0.5px solid @ThemeAccentColor2;
+  border: 1px solid @ThemeAccentColor2;
 }
 
 QScrollBar::add-line:horizontal {
@@ -776,7 +791,7 @@ QTextEdit {
 }
 
 QTextEdit:focus {
-  border: 0.5px solid @ThemeAccentColor2;
+  border: 1px solid @ThemeAccentColor2;
 }
 
 QTextEdit:selected {
@@ -795,7 +810,7 @@ QPlainTextEdit {
 }
 
 QPlainTextEdit:focus {
-  border: 0.5px solid @ThemeAccentColor2;
+  border: 1px solid @ThemeAccentColor2;
 }
 
 QPlainTextEdit:selected {
@@ -835,14 +850,14 @@ QToolBar {
 }
 
 QToolBar:horizontal {
-  border-bottom: 0.5px solid #ababab;
+  border-bottom: 1px solid #ababab;
   padding-top: 3px;
   padding-left: 5px;
 }
 
 QToolBar:vertical {
-  border-left: 0.5px solid #ababab;
-  border-right: 0.5px solid #ababab;
+  border-left: 1px solid #ababab;
+  border-right: 1px solid #ababab;
   padding-top: 3px;
   padding-left: 2px;
 }
@@ -874,11 +889,13 @@ QToolBar::handle:vertical:hover {
 
 QToolBar::separator:horizontal {
   width: 2px;
+  padding: 0px 5px;
   image: url(qss:images_classic/Hsepartoolbar-lightgray.png);
 }
 
 QToolBar::separator:vertical {
   height: 2px;
+  padding: 5px 0px;
   image: url(qss:images_classic/Vsepartoolbar-lightgray.png);
 }
 
@@ -910,6 +927,8 @@ QSpinBox {
   color: black;
   border-radius: 2px;
   min-height: 1.7em;
+  padding-left: 4px;
+  padding-right: 4px;
 }
 
 QAbstractSpinBox:up-button {
@@ -918,10 +937,8 @@ QAbstractSpinBox:up-button {
   subcontrol-position: top right;
   border-top: 1px solid transparent;
   border-right: 1px solid transparent;
+  border-bottom: 0px solid transparent;
   border-top-right-radius: 2px;
-  border-bottom-left-radius: 2px;
-  margin-top: 1px;
-  margin-right: 1px;
   border-left: 1px solid #b0b0b0;
 }
 
@@ -943,14 +960,9 @@ QAbstractSpinBox:down-button {
   subcontrol-position: bottom right;
   border-bottom: 1px solid transparent;
   border-right: 1px solid transparent;
-  border-top-left-radius: 2px;
-  border-bottom-left-radius: 2px;
-  margin-bottom: 1px;
-  margin-right: 1px;
+  border-top: 0px solid transparent;
+  border-bottom-right-radius: 2px;
   border-left: 1px solid #b0b0b0;
-  /* margin: 1px; */
-  /*width: 12px;
-  /*margin-top: -1px;*/
 }
 
 QAbstractSpinBox::down-arrow, QAbstractSpinBox::down-arrow:disabled, QAbstractSpinBox::down-arrow:off {
@@ -969,7 +981,7 @@ QAbstractSpinBox:hover {
 }
 
 QAbstractSpinBox:focus {
-  border: 0.5px solid @ThemeAccentColor2;
+  border: 1px solid @ThemeAccentColor2;
 }
 
 QAbstractSpinBox:selected {
@@ -1242,25 +1254,25 @@ QToolButton:selected {
   color: black;
 }
 
-QToolButton[popupMode="0"] {
+/* QToolButton[popupMode="0"] { */
   /* Only for DelayedPopup */
-  padding-right: 20px;
-}
+  /* padding-right: 20px;
+} */
 
 QToolButton[popupMode="1"] {
   /* Only for MenuButtonPopup */
   padding-right: 20px;
 }
 
-QToolButton[popupMode="0"]::menu-button {
+/* QToolButton[popupMode="0"]::menu-button {
   border: none;
-}
+} */
 
-QToolButton[popupMode="0"]::menu-button:hover {
+/* QToolButton[popupMode="0"]::menu-button:hover {
   border: none;
   border-left: 2px solid #e6e6e6;
   border-radius: 3px;
-}
+} */
 QToolButton[popupMode="1"]::menu-button {
   border: none;
 }
@@ -1303,7 +1315,7 @@ QToolButton::menu-button:checked:hover {
 
 QToolButton::menu-indicator {
   /* Exclude a shift for better image */
-  subcontrol-position: center center;
+  subcontrol-position: right center;
   /* Shift it a bit */
 }
 
@@ -1311,11 +1323,9 @@ QToolButton::menu-arrow {
   image: url(qss:images_classic/Arrow-down-lightgray.png);
   width: 1.3ex;
   height: 1.3ex;
-  subcontrol-position: center center;
-  background: transparent;
+  /* background: transparent; */
 }
 QToolButton::menu-arrow:open {
-  subcontrol-position: center center;
   image: url(qss:images_classic/Arrow-Down-black.png);
   width: 1.3ex;
   height: 1.3ex;
@@ -1548,20 +1558,28 @@ margin: 0px;
 padding: 0px;
 }
 
-QSint--ActionGroup QFrame[class="header"] QLabel[fold="false"] {
-  background-image: url(qss:images_classic/Qsint_header_Unfold_Blue-light.png);
+QSint--ActionGroup QFrame[class="header"] QLabel{
+  width: 30px;
+  height: 30px;
+  image: url(qss:images_classic/Qsint_header_Unfold_Blue-light.png);
 }
 
 QSint--ActionGroup QFrame[class="header"] QLabel:hover[fold="false"] {
-  background-image: url(qss:images_classic/Qsint_header_UnfoldOver_Blue-light.png);
+  width: 30px;
+  height: 30px;
+  image: url(qss:images_classic/Qsint_header_UnfoldOver_Blue_light.png);
 }
 
 QSint--ActionGroup QFrame[class="header"] QLabel[fold="true"] {
-  background-image: url(qss:images_classic/Qsint_header_Fold_Blue-light.png);
+  width: 30px;
+  height: 30px;
+  image: url(qss:images_classic/Qsint_header_Fold_Blue-light.png);
 }
 
 QSint--ActionGroup QFrame[class="header"] QLabel[fold="true"]:hover {
-  background-image: url(qss:images_classic/Qsint_header_FoldOver_Blue-light.png) ;
+  width: 30px;
+  height: 30px;
+  image: url(qss:images_classic/Qsint_header_FoldOver_Blue-light.png) ;
 }
 
 QSint--ActionGroup QFrame[class="content"] {
@@ -1738,7 +1756,7 @@ QSlider::handle:horizontal:hover {
 
 QSlider::handle:horizontal:focus {
   background: @ThemeAccentColor2;
-  border: 0.5px solid @ThemeAccentColor2;
+  border: 1px solid @ThemeAccentColor2;
 }
 
 QSlider::handle:vertical {
@@ -1756,7 +1774,7 @@ QSlider::handle:vertical:hover {
 }
 
 QSlider::handle:vertical:focus {
-  border: 0.5px solid @ThemeAccentColor2;
+  border: 1px solid @ThemeAccentColor2;
 }
 
 /* QLineEdit --------------------------------------------------------------
@@ -1858,6 +1876,25 @@ QTabBar, QDockWidget QTabBar {
   background-color: #f0f0f0;
   /* left: 5px; move to the right by 5px - removed for fix */
 }
+QTabBar[style="icon-only"]::tab:top {
+  min-width: 16px;
+  padding-right: -1px;
+}
+
+QTabBar[style="icon-only"]::tab:bottom {
+  min-width: 16px;
+  padding-right: -1px;
+}
+
+QTabBar[style="icon-only"]::tab:left {
+  min-height: 16px;
+  padding: 0px;
+}
+
+QTabBar[style="icon-only"]::tab:right {
+  min-height: 16px;
+  padding: 0px;
+}
 
 QTabBar::close-button, QDockWidget QTabBar::close-button {
   border: 0;
@@ -2116,7 +2153,7 @@ QDockWidget::close-button {
   icon-size: 10px;
   border: none;
   background: transparent;
-  background-image: transparent;
+  background-image: none;
   border: 0;
   margin: 0;
   padding: 0;
@@ -2135,7 +2172,7 @@ QDockWidget::float-button {
   icon-size: 12px;
   border: none;
   background: transparent;
-  background-image: transparent;
+  background-image: none;
   border: 0;
   margin: 0;
   padding: 0;
@@ -2210,11 +2247,33 @@ QTreeView::branch:open:has-children:!has-siblings  {
   /* border-image: url(qss:images_classic/branch_end_open_white.png) 0; */
 }
 
+QTreeView::indicator,
+QListView::indicator,
+QTableView::indicator,
+QColumnView::indicator {
+  border: 1px solid #1c1c1c;
+}
+
+QTreeView::indicator:unchecked:disabled,
+QListView::indicator:unchecked:disabled,
+QTableView::indicator:unchecked:disabled,
+QColumnView::indicator:unchecked:disabled {
+  border: 1px solid #696969;
+}
+
 QTreeView::indicator:checked,
 QListView::indicator:checked,
 QTableView::indicator:checked,
 QColumnView::indicator:checked {
-  image: url(qss:images_classic/checkbox-checked-black.png);
+  image: url(qss:images_classic/check-checked-black.png);
+}
+
+QTreeView::indicator:checked:disabled ,
+QListView::indicator:checked:disabled ,
+QTableView::indicator:checked:disabled ,
+QColumnView::indicator:checked:disabled  {
+  image: url(qss:images_classic/check-checked-lightgray.png);
+  border: 1px solid #696969;
 }
 
 QTreeView::indicator:checked:hover, QTreeView::indicator:checked:focus, QTreeView::indicator:checked:pressed,
@@ -2227,15 +2286,17 @@ QTableView::indicator:checked:pressed,
 QColumnView::indicator:checked:hover,
 QColumnView::indicator:checked:focus,
 QColumnView::indicator:checked:pressed {
-  image: url(qss:images_classic/checkbox-checked-blue.png);
+  /* image: url(qss:images_classic/checkbox-checked-blue.png); */
+  background-color: @ThemeAccentColor1;
+  border: 1px solid #1c1c1c;
 }
 
-QTreeView::indicator:unchecked,
+/* QTreeView::indicator:unchecked,
 QListView::indicator:unchecked,
 QTableView::indicator:unchecked,
 QColumnView::indicator:unchecked {
   image: url(qss:images_classic/checkbox-Empty-black.png);
-}
+} */
 
 QTreeView::indicator:unchecked:hover, QTreeView::indicator:unchecked:focus, QTreeView::indicator:unchecked:pressed,
 QListView::indicator:unchecked:hover,
@@ -2247,14 +2308,16 @@ 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;
 }
 
 QTreeView::indicator:indeterminate,
 QListView::indicator:indeterminate,
 QTableView::indicator:indeterminate,
 QColumnView::indicator:indeterminate {
-  image: url(qss:images_classic/checkbox-indeterminate-black.png);
+  image: url(qss:images_classic/Check-indeterminate-mark-black.png);
 }
 
 QTreeView::indicator:indeterminate:hover, QTreeView::indicator:indeterminate:focus, QTreeView::indicator:indeterminate:pressed,
@@ -2267,7 +2330,9 @@ QTableView::indicator:indeterminate:pressed,
 QColumnView::indicator:indeterminate:hover,
 QColumnView::indicator:indeterminate:focus,
 QColumnView::indicator:indeterminate:pressed {
-  image: url(qss:images_classic/checkbox-indeterminate-black.png);
+  image: url(qss:images_classic/Check-indeterminate-mark-black.png);
+  background-color: @ThemeAccentColor1;
+  border: 1px solid #1c1c1c;
 }
 
 QTreeView,
@@ -2286,6 +2351,10 @@ QListView  {
   background-color: #ffffff;  /* background of a lot of stuff including spreadsheets.*/
 }
 
+QTreeView{
+  selection-background-color: transparent; /* fix for selection color being visible in preferences */
+}
+
 
 QTreeView:disabled,
 QListView:disabled,
@@ -2321,7 +2390,7 @@ QTreeView::item:selected:active,
 QListView::item:selected:active,
 QTableView::item:selected:active,
 QColumnView::item:selected:active {
-  background-color: #f0f0f0;
+  background-color: @ThemeAccentColor2;
 }
 
 QTreeView::item:selected:!active,
@@ -2329,7 +2398,8 @@ QListView::item:selected:!active,
 QTableView::item:selected:!active,
 QColumnView::item:selected:!active {
   /* color: black; */
-  background-color: #f0f0f0;
+
+  background-color: @ThemeAccentColor1;
 }
 
 QTreeView::item:!selected:hover,
@@ -2399,7 +2469,7 @@ QHeaderView::section::vertical {
   padding-bottom: 0;
   padding-left: 1px;
   padding-right: 0px; */
-  border-top: 0.5px solid #ababab;
+  border-top: 1px solid #ababab;
 }
 
 QHeaderView::section::vertical::first, QHeaderView::section::vertical::only-one {
@@ -2630,6 +2700,7 @@ QAbstractView:selected {
 PlotWidget {
   /* Fix cut labels in plots #134 */
   padding: 0px;
+  color: rgba(253, 253, 253, 0.614);
 }
 
 /*==================================================================================================
@@ -2673,62 +2744,27 @@ Gui--NotificationLabel {
   border-radius: 2px;
 }
 
-
-Gui--OverlayToolButton:!hover{
-  background-color: transparent;
-  image: url(qss:overlay/close_lightgray.svg);
+Gui--OverlayToolButton{
+  image: url(qss:images_classic/close-lightgray.png);
 }
 
 Gui--OverlayToolButton:hover {
-  image: url(qss:overlay/close_red.svg);
+  image: url(qss:images_classic/close-red.png);
 }
-
-Gui--OverlayToolButton[objectName="OBTN Transparent"]:!checked  {
-  image: url(qss:overlay/transparent_light.svg);
-}
-
-Gui--OverlayToolButton[objectName="OBTN Transparent"]:hover {
-  image: url(qss:overlay/transparent_lighter.svg);
-}
-
-Gui--OverlayToolButton[objectName="OBTN Transparent"]:checked {
-  image: url(qss:overlay/transparent_lighter.svg);
-}
-
-Gui--OverlayToolButton[objectName="OBTN Overlay"]:!checked{
-  image: url(qss:overlay/overlay_light.svg);
-}
-
-Gui--OverlayToolButton[objectName="OBTN Overlay"]:hover {
-  image: url(qss:overlay/overlay_lighter.svg);
-}
-
-Gui--OverlayToolButton[objectName="OBTN Overlay"]:checked {
-  image: url(qss:overlay/overlay_lighter.svg);
-}
-
-Gui--OverlayToolButton[objectName="OBTN AutoMode"]:!checked {
-  image: url(qss:overlay/mode_light.svg);
-}
-
-Gui--OverlayToolButton[objectName="OBTN AutoMode"]:hover {
-  image: url(qss:overlay/mode_lighter.svg);
-}
-
-Gui--OverlayToolButton[objectName="OBTN AutoMode"]:checked {
-  image: url(qss:overlay/mode_lighter.svg);
-}
-
-Gui--OverlayToolButton[objectName="OBTN Float"]:!checked {
-  image: url(qss:overlay/float_light.svg);
+Gui--OverlayToolButton[objectName="OBTN Float"] {
+  image: url(qss:images_classic/float-lightgray.png);
 }
 
 Gui--OverlayToolButton[objectName="OBTN Float"]:hover {
-  image: url(qss:overlay/float_lighter.svg);
+  image: url(qss:images_classic/float-black.png);
 }
 
-Gui--OverlayToolButton[objectName="OBTN Float"]:checked {
-  image: url(qss:overlay/float_lighter.svg);
+Gui--OverlayToolButton[objectName="OBTN Overlay"] {
+  image: url(qss:images_classic/overlay-lightgray.png);
+}
+
+Gui--OverlayToolButton[objectName="OBTN Overlay"]:hover {
+  image: url(qss:images_classic/overlay-black.png);
 }
 
 /*==================================================================================================
@@ -2792,15 +2828,20 @@ Start page
 QWidget#thumbnailWidget {
   background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #f0f0f0, stop:1 #fdfdfd);
   border-radius: 8px;
-  margin-bottom: 3px;
-  margin-right: 7px;
   border: 1px solid #ababab;
 }
 
 QWidget#thumbnailWidget[state="hovered"] {
-  border: 0.5px solid @ThemeAccentColor2;
+  border: 1px solid @ThemeAccentColor2;
 }
 
 QWidget#thumbnailWidget[state="pressed"] {
   border: 1px solid @ThemeAccentColor1;
-}
+}
+
+/**
+ * Special handling for WB Tab Bar
+ */
+ #WbTabBar #WbTabBarMore {
+  padding-right: 12px;
+ }