diff --git a/src/Gui/Stylesheets/FreeCAD Dark.qss b/src/Gui/Stylesheets/FreeCAD Dark.qss
index aece651954..1fb001a037 100644
--- a/src/Gui/Stylesheets/FreeCAD Dark.qss	
+++ b/src/Gui/Stylesheets/FreeCAD Dark.qss	
@@ -1536,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 @ThemeAccentColor3);
+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;
diff --git a/src/Gui/Stylesheets/overlay/Dark Theme + Dark Background.qss b/src/Gui/Stylesheets/overlay/Dark Theme + Dark Background.qss
index 341869e61c..42532cb83b 100644
--- a/src/Gui/Stylesheets/overlay/Dark Theme + Dark Background.qss	
+++ b/src/Gui/Stylesheets/overlay/Dark Theme + Dark Background.qss	
@@ -17,29 +17,6 @@ QFrame {
    background-color: #252525;
  }
 
- Gui--OverlayTabWidget[transparent="false"] QTreeView::item {
-  color: #ffffff;
- }
-
-Gui--OverlayTabWidget[transparent="true"] QTreeView::item {
-  color: #ffffff;
-}
-
- Gui--OverlayTabWidget[transparent="true"] QTreeView::item:selected {
-  color: #ffffff;
-  background-color: #234497;
-}
-
-Gui--OverlayTabWidget[transparent="true"] QTreeView::item:focus {
-  color: #ffffff;
-  background-color: #234497;
-}
-
- Gui--OverlayTabWidget[transparent="true"] QTreeView::item:selected:focus {
-  color: #ffffff;
-  background-color: #234497;
-}
-
  /* The OverlayTabWidget is named as OverlayLeft, OverlayRight, OverlayTop, OverlayBottom.
  To customize for each overlay docking site, use the following selector
 
diff --git a/src/Gui/Stylesheets/overlay/Dark Theme + Light Background.qss b/src/Gui/Stylesheets/overlay/Dark Theme + Light Background.qss
index 662f2f9fbe..28bc95b35a 100644
--- a/src/Gui/Stylesheets/overlay/Dark Theme + Light Background.qss	
+++ b/src/Gui/Stylesheets/overlay/Dark Theme + Light Background.qss	
@@ -17,7 +17,7 @@ QFrame {
    background-color: #252525;
   }
 
- QTreeView {
+  Gui--TreePanel QTreeView {
   background-color: rgba(0, 0, 0, 0.55);
   border: 0px solid #696968;
   /* alternate-background-color: rgba(255, 0, 0, 0.611); */
@@ -26,33 +26,18 @@ QFrame {
   border-radius: 0px;
 }
 
- QTreeView::item {
+ Gui--TreePanel QTreeView::item {
   color: #ffffff;
 }
 
- Gui--OverlayTabWidget[transparent="false"] QTreeView::item {
+ Gui--OverlayTabWidget[transparent="false"] Gui--TreePanel QTreeView::item {
   color: #ffffff;
 }
 
-Gui--OverlayTabWidget[transparent="true"] QTreeView::item {
+Gui--OverlayTabWidget[transparent="true"] Gui--TreePanel QTreeView::item {
   color: #000000;
 }
 
- Gui--OverlayTabWidget[transparent="true"] QTreeView::item:selected {
-  color: #000000;
-  background-color: #799fff;
-}
-
-Gui--OverlayTabWidget[transparent="true"] QTreeView::item:focus {
-  color: #000000;
-  background-color: #799fff;
-}
-
- Gui--OverlayTabWidget[transparent="true"] QTreeView::item:selected:focus {
-  color: #000000;
-  background-color: #799fff;
-}
-
 /* The OverlayTabWidget is named as OverlayLeft, OverlayRight, OverlayTop, OverlayBottom.
 To customize for each overlay docking site, use the following selector
 
@@ -180,20 +165,40 @@ Gui--OverlayToolButton:hover {
 
  QTreeView::branch:open:has-children:has-siblings  {
   border-image: none;
-  image: url(qss:images_classic/Arrow-down-black.png);
+  image: url(qss:images_classic/Arrow-down-white.png);
 }
 
  QTreeView::branch:open:has-children:!has-siblings  {
   border-image: none;
-  image: url(qss:images_classic/Arrow-down-black.png);
+  image: url(qss:images_classic/Arrow-down-white.png);
 }
 
 QTreeView::branch:closed:has-children:has-siblings  {
   border-image: none;
-  image: url(qss:images_classic/Arrow-right-black.png);
+  image: url(qss:images_classic/Arrow-right-white.png);
 }
 
 QTreeView::branch:has-children:!has-siblings:closed  {
+  border-image: none;
+  image: url(qss:images_classic/Arrow-right-white.png);
+}
+
+Gui--TreePanel QTreeView::branch:open:has-children:has-siblings  {
+  border-image: none;
+  image: url(qss:images_classic/Arrow-down-black.png);
+}
+
+Gui--TreePanel QTreeView::branch:open:has-children:!has-siblings  {
+  border-image: none;
+  image: url(qss:images_classic/Arrow-down-black.png);
+}
+
+ Gui--TreePanel QTreeView::branch:closed:has-children:has-siblings  {
+  border-image: none;
+  image: url(qss:images_classic/Arrow-right-black.png);
+}
+
+ Gui--TreePanel QTreeView::branch:has-children:!has-siblings:closed  {
   border-image: none;
   image: url(qss:images_classic/Arrow-right-black.png);
 }
diff --git a/src/Gui/Stylesheets/overlay/Light Theme + Dark Background.qss b/src/Gui/Stylesheets/overlay/Light Theme + Dark Background.qss
index 2343154ccc..6dc761a2d3 100644
--- a/src/Gui/Stylesheets/overlay/Light Theme + Dark Background.qss	
+++ b/src/Gui/Stylesheets/overlay/Light Theme + Dark Background.qss	
@@ -19,7 +19,7 @@ Gui--OverlaySplitterHandle {
 
 
 /* Overwrites Properties panel to use white text. */
-QTreeView {
+ Gui--TreePanel QTreeView {
   background-color: rgba(70, 70, 70, 0.539);
   border: 0px solid #696968;
   /* alternate-background-color: rgba(255, 0, 0, 0.611); */
@@ -28,11 +28,11 @@ QTreeView {
   border-radius: 0px;
 }
 
-QTreeView::item {
+ Gui--TreePanel QTreeView::item {
   color: #000000;
 }
 
-QTreeView:disabled  {
+ Gui--TreePanel QTreeView:disabled  {
   color: #696968;
 }
 
@@ -40,53 +40,16 @@ Gui--PropertyEditor--PropertyEditor {
   qproperty-itemBackground: #ffffff;
 }
 
-Gui--OverlayTabWidget[transparent="false"] * {
-  color: #000000;
-}
-Gui--OverlayTabWidget[transparent="true"] * {
-  color: #000000;
-}
-
-Gui--OverlayTabWidget[transparent="false"] QTreeView::item {
+Gui--OverlayTabWidget[transparent="false"]  Gui--TreePanel QTreeView::item {
   color: #ffffff;
 }
 
-Gui--OverlayTabWidget[transparent="true"] QTreeView::item {
+Gui--OverlayTabWidget[transparent="true"] Gui--TreePanel QTreeView::item {
   color: #ffffff;
 }
 
- Gui--OverlayTabWidget[transparent="true"] QTreeView::item:selected {
-  color: #000000;
-  background-color: #c7def5;
-}
 
-Gui--OverlayTabWidget[transparent="true"] QTreeView::item:focus {
-  color: #000000;
-  background-color: #c7def5;
-}
-
- Gui--OverlayTabWidget[transparent="true"] QTreeView::item:selected:focus {
-  color: #000000;
-  background-color: #c7def5;
-}
-
-
-Gui--OverlayTabWidget[transparent="true"] QTreeView::item:hover {
-  color: #000000;
-  background-color: #c7def5;
-}
-
- Gui--OverlayTabWidget[transparent="true"] QTreeView::item:active {
-  color: #ffffff;
-}
-
-Gui--OverlayTabWidget[transparent="true"] QTreeView::item:selected:active {
-  color: #000000;
-  background-color: #c7def5;
-}
-
-
-Gui--OverlayTabWidget[transparent="true"] QTreeView::item:disabled {
+Gui--OverlayTabWidget[transparent="true"] Gui--TreePanel QTreeView::item:disabled {
   color: #9a9a9a;
 }
 
@@ -147,11 +110,6 @@ Gui--OverlayToolButton:hover {
   border-radius: 2px;
 }
 
-Gui--OverlayToolButton:focus {
-  border: 0.5px solid #0099ff;
-  border-radius: 2px;
-}
-
 Gui--OverlayToolButton::pressed,
 Gui--OverlayToolButton:checked {
   border: 0.5px solid #ababab;
@@ -196,22 +154,46 @@ Gui--OverlayToolButton[objectName="OBTN AutoMode"]:hover {
   image: url(qss:images_classic/mode-black.png);
 }
 
- QTreeView::branch:open:has-children:has-siblings  {
+
+QTreeView::branch:open:has-children:has-siblings  {
   border-image: none;
-  image: url(qss:images_classic/Arrow-down-white.png);
+  image: url(qss:images_classic/Arrow-down-black.png);
 }
 
- QTreeView::branch:open:has-children:!has-siblings  {
+QTreeView::branch:open:has-children:!has-siblings  {
   border-image: none;
-  image: url(qss:images_classic/Arrow-down-white.png);
+  image: url(qss:images_classic/Arrow-down-black.png);
 }
 
 QTreeView::branch:closed:has-children:has-siblings  {
   border-image: none;
-  image: url(qss:images_classic/Arrow-right-white.png);
+  image: url(qss:images_classic/Arrow-right-black.png);
 }
 
 QTreeView::branch:has-children:!has-siblings:closed  {
+  border-image: none;
+  image: url(qss:images_classic/Arrow-right-black.png);
+}
+
+
+ Gui--TreePanel QTreeView::branch:open:has-children:has-siblings  {
+  border-image: none;
+  image: url(qss:images_classic/Arrow-down-white.png);
+}
+
+ Gui--TreePanel QTreeView::branch:open:has-children:!has-siblings  {
+  border-image: none;
+  image: url(qss:images_classic/Arrow-down-white.png);
+}
+
+ Gui--TreePanel QTreeView::branch:closed:has-children:has-siblings  {
   border-image: none;
   image: url(qss:images_classic/Arrow-right-white.png);
 }
+
+ Gui--TreePanel QTreeView::branch:has-children:!has-siblings:closed  {
+  border-image: none;
+  image: url(qss:images_classic/Arrow-right-white.png);
+}
+
+
diff --git a/src/Gui/Stylesheets/overlay/Light Theme + Light Background.qss b/src/Gui/Stylesheets/overlay/Light Theme + Light Background.qss
index ef462c843a..e25905255b 100644
--- a/src/Gui/Stylesheets/overlay/Light Theme + Light Background.qss	
+++ b/src/Gui/Stylesheets/overlay/Light Theme + Light Background.qss	
@@ -21,31 +21,6 @@ Gui--OverlaySplitterHandle {
   background-color: #f0f0f0;
  }
 
-Gui--OverlayTabWidget[transparent="false"] QTreeView::item {
-  color: #000000;
-  selection-background-color: #ff8800;
-}
-
-Gui--OverlayTabWidget[transparent="true"] QTreeView::item {
-  color: #000000;
-  selection-background-color: #850000;
-}
-
- Gui--OverlayTabWidget[transparent="true"] QTreeView::item:selected {
-  color: #000000;
-  background-color: #c7def5;
-}
-
-Gui--OverlayTabWidget[transparent="true"] QTreeView::item:focus {
-  color: #000000;
-  background-color: #c7def5;
-}
-
- Gui--OverlayTabWidget[transparent="true"] QTreeView::item:selected:focus {
-  color: #000000;
-  background-color: #c7def5;
-}
-
 /* The OverlayTabWidget is named as OverlayLeft, OverlayRight, OverlayTop, OverlayBottom.
 To customize for each overlay docking site, use the following selector