diff --git a/CMakeSettings.json b/CMakeSettings.json
new file mode 100644
index 0000000000..04d0104631
--- /dev/null
+++ b/CMakeSettings.json
@@ -0,0 +1,22 @@
+{
+  "configurations": [
+    {
+      "name": "x64-release",
+      "generator": "Ninja",
+      "configurationType": "Release",
+      "inheritEnvironments": [ "msvc_x64_x64" ],
+      "buildRoot": "C:\\github repros\\out\\freecadbuild\\${name}",
+      "installRoot": "C:\\github repros\\out\\freecadinstall\\${name}",
+      "cmakeCommandArgs": "",
+      "buildCommandArgs": "",
+      "ctestCommandArgs": "",
+      "variables": [
+        {
+          "name": "FREECAD_LIBPACK_DIR",
+          "value": "C:/freecad_libs/LibPack",
+          "type": "PATH"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/Gui/Stylesheets/Dark theme.qss b/src/Gui/Stylesheets/Dark theme.qss
index 2c3703c3bb..dc47f994e1 100644
--- a/src/Gui/Stylesheets/Dark theme.qss	
+++ b/src/Gui/Stylesheets/Dark theme.qss	
@@ -1608,36 +1608,20 @@ margin: 0px;
 padding: 0px;
 }
 
-QSint--ActionGroup QFrame[class="header"] QLabel {
-  image: url(qss:images_classic/Unfold_Blue2-dark.png) ;
-/* background-color: transparent;
-background-image: url(qss:images_classic/Arrow-down-lightgray.png);
-background-repeat: none;
-background-position: center center;
-padding: 2px;
-margin: 4px; */
+QSint--ActionGroup QFrame[class="header"] QLabel[fold="false"] {
+  background-image: url(qss:images_classic/Qsint_header_Unfold_Blue-dark.png);
 }
 
-QSint--ActionGroup QFrame[class="header"] QLabel:hover {
-/* background-color: transparent;
-background-image: url(qss:images_classic/Arrow-down-white.png); */
-image: url(qss:images_classic/UnfoldOver_Blue2-dark.png) ;
+QSint--ActionGroup QFrame[class="header"] QLabel:hover[fold="false"] {
+  background-image: url(qss:images_classic/Qsint_header_UnfoldOver_Blue-dark.png);
 }
 
 QSint--ActionGroup QFrame[class="header"] QLabel[fold="true"] {
-image: url(qss:images_classic/Fold_Blue2-dark.png) ;
-/* background-color: transparent;
-background-image: url(qss:images_classic/Arrow-up-lightgray.png);
-background-repeat: none;
-background-position: center center;
-padding: 2px;
-margin: 0px; */
+  background-image: url(qss:images_classic/Qsint_header_Fold_Blue-dark.png);
 }
 
 QSint--ActionGroup QFrame[class="header"] QLabel[fold="true"]:hover {
-image: url(qss:images_classic/FoldOver_Blue1.png) ;
-/* background-color: transparent; */
-/* background-image: url(qss:images_classic/Arrow-up-white.png); */
+  background-image: url(qss:images_classic/Qsint_header_FoldOver_Blue-dark.png) ;
 }
 
 QSint--ActionGroup QFrame[class="content"] {
diff --git a/src/Gui/Stylesheets/Light theme.qss b/src/Gui/Stylesheets/Light theme.qss
index 21caf77b73..fe807e71ba 100644
--- a/src/Gui/Stylesheets/Light theme.qss	
+++ b/src/Gui/Stylesheets/Light theme.qss	
@@ -1543,36 +1543,20 @@ margin: 0px;
 padding: 0px;
 }
 
-QSint--ActionGroup QFrame[class="header"] QLabel {
-  image: url(qss:images_classic/Unfold_Blue2.png) ;
-/* background-color: transparent;
-background-image: url(qss:images_classic/Arrow-down-lightgray.png);
-background-repeat: none;
-background-position: center center;
-padding: 2px;
-margin: 4px; */
+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:hover {
-/* background-color: transparent;
-background-image: url(qss:images_classic/Arrow-down-black.png); */
-image: url(qss:images_classic/UnfoldOver_Blue2.png) ;
+QSint--ActionGroup QFrame[class="header"] QLabel:hover[fold="false"] {
+  background-image: url(qss:images_classic/Qsint_header_UnfoldOver_Blue-light.png);
 }
 
 QSint--ActionGroup QFrame[class="header"] QLabel[fold="true"] {
-image: url(qss:images_classic/Fold_Blue2.png) ;
-/* background-color: transparent;
-background-image: url(qss:images_classic/Arrow-up-lightgray.png);
-background-repeat: none;
-background-position: center center;
-padding: 2px;
-margin: 0px; */
+  background-image: url(qss:images_classic/Qsint_header_Fold_Blue-light.png);
 }
 
 QSint--ActionGroup QFrame[class="header"] QLabel[fold="true"]:hover {
-image: url(qss:images_classic/FoldOver_Blue1.png) ;
-/* background-color: transparent; */
-/* background-image: url(qss:images_classic/Arrow-up-black.png); */
+  background-image: url(qss:images_classic/Qsint_header_FoldOver_Blue-light.png) ;
 }
 
 QSint--ActionGroup QFrame[class="content"] {
diff --git a/src/Gui/Stylesheets/images_classic/FoldOver_Blue1.png b/src/Gui/Stylesheets/images_classic/FoldOver_Blue1.png
deleted file mode 100644
index 39f7274338..0000000000
Binary files a/src/Gui/Stylesheets/images_classic/FoldOver_Blue1.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images_classic/FoldOver_Blue2-dark.png b/src/Gui/Stylesheets/images_classic/FoldOver_Blue2-dark.png
deleted file mode 100644
index 073b7da855..0000000000
Binary files a/src/Gui/Stylesheets/images_classic/FoldOver_Blue2-dark.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images_classic/FoldOver_Blue2.png b/src/Gui/Stylesheets/images_classic/FoldOver_Blue2.png
deleted file mode 100644
index 6688b30a7e..0000000000
Binary files a/src/Gui/Stylesheets/images_classic/FoldOver_Blue2.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images_classic/Fold_Blue1.png b/src/Gui/Stylesheets/images_classic/Fold_Blue1.png
deleted file mode 100644
index 2a4e9746cc..0000000000
Binary files a/src/Gui/Stylesheets/images_classic/Fold_Blue1.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images_classic/Fold_Blue2-dark.png b/src/Gui/Stylesheets/images_classic/Fold_Blue2-dark.png
deleted file mode 100644
index 547f818ba9..0000000000
Binary files a/src/Gui/Stylesheets/images_classic/Fold_Blue2-dark.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images_classic/Fold_Blue2.png b/src/Gui/Stylesheets/images_classic/Fold_Blue2.png
deleted file mode 100644
index a4a67cb628..0000000000
Binary files a/src/Gui/Stylesheets/images_classic/Fold_Blue2.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_FoldOver_Blue-Blue.png b/src/Gui/Stylesheets/images_classic/Qsint_header_FoldOver_Blue-Blue.png
new file mode 100644
index 0000000000..c6866b8609
Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/Qsint_header_FoldOver_Blue-Blue.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_FoldOver_Blue-dark.png b/src/Gui/Stylesheets/images_classic/Qsint_header_FoldOver_Blue-dark.png
new file mode 100644
index 0000000000..f427f08082
Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/Qsint_header_FoldOver_Blue-dark.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_FoldOver_Blue-light.png b/src/Gui/Stylesheets/images_classic/Qsint_header_FoldOver_Blue-light.png
new file mode 100644
index 0000000000..65b1cde5aa
Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/Qsint_header_FoldOver_Blue-light.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_Fold_Blue-Blue.png b/src/Gui/Stylesheets/images_classic/Qsint_header_Fold_Blue-Blue.png
new file mode 100644
index 0000000000..b6ed1c1187
Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/Qsint_header_Fold_Blue-Blue.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_Fold_Blue-dark.png b/src/Gui/Stylesheets/images_classic/Qsint_header_Fold_Blue-dark.png
new file mode 100644
index 0000000000..0c5ef5957f
Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/Qsint_header_Fold_Blue-dark.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_Fold_Blue-light.png b/src/Gui/Stylesheets/images_classic/Qsint_header_Fold_Blue-light.png
new file mode 100644
index 0000000000..bdfd0bf240
Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/Qsint_header_Fold_Blue-light.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_UnFoldOver_Blue-Blue.png b/src/Gui/Stylesheets/images_classic/Qsint_header_UnFoldOver_Blue-Blue.png
new file mode 100644
index 0000000000..b9ddbb60f2
Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/Qsint_header_UnFoldOver_Blue-Blue.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_UnfoldOver_Blue-dark.png b/src/Gui/Stylesheets/images_classic/Qsint_header_UnfoldOver_Blue-dark.png
new file mode 100644
index 0000000000..5035c71c13
Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/Qsint_header_UnfoldOver_Blue-dark.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_UnfoldOver_Blue_light.png b/src/Gui/Stylesheets/images_classic/Qsint_header_UnfoldOver_Blue_light.png
new file mode 100644
index 0000000000..e0456dba8a
Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/Qsint_header_UnfoldOver_Blue_light.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_Unfold_Blue-Blue.png b/src/Gui/Stylesheets/images_classic/Qsint_header_Unfold_Blue-Blue.png
new file mode 100644
index 0000000000..6761469737
Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/Qsint_header_Unfold_Blue-Blue.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_Unfold_Blue-dark.png b/src/Gui/Stylesheets/images_classic/Qsint_header_Unfold_Blue-dark.png
new file mode 100644
index 0000000000..84b1a479ca
Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/Qsint_header_Unfold_Blue-dark.png differ
diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_Unfold_Blue-light.png b/src/Gui/Stylesheets/images_classic/Qsint_header_Unfold_Blue-light.png
new file mode 100644
index 0000000000..ee6afced02
Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/Qsint_header_Unfold_Blue-light.png differ
diff --git a/src/Gui/Stylesheets/images_classic/UnFoldOver_Blue1.png b/src/Gui/Stylesheets/images_classic/UnFoldOver_Blue1.png
deleted file mode 100644
index c98b22f296..0000000000
Binary files a/src/Gui/Stylesheets/images_classic/UnFoldOver_Blue1.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images_classic/UnfoldOver_Blue2.png b/src/Gui/Stylesheets/images_classic/UnfoldOver_Blue2.png
deleted file mode 100644
index c99d6dc831..0000000000
Binary files a/src/Gui/Stylesheets/images_classic/UnfoldOver_Blue2.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images_classic/UnfoldOver_Blue2_copy_1.png b/src/Gui/Stylesheets/images_classic/UnfoldOver_Blue2_copy_1.png
deleted file mode 100644
index eda97bad0e..0000000000
Binary files a/src/Gui/Stylesheets/images_classic/UnfoldOver_Blue2_copy_1.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images_classic/Unfold_Blue1.png b/src/Gui/Stylesheets/images_classic/Unfold_Blue1.png
deleted file mode 100644
index 33d555877d..0000000000
Binary files a/src/Gui/Stylesheets/images_classic/Unfold_Blue1.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images_classic/Unfold_Blue2-dark.png b/src/Gui/Stylesheets/images_classic/Unfold_Blue2-dark.png
deleted file mode 100644
index 2180fd2964..0000000000
Binary files a/src/Gui/Stylesheets/images_classic/Unfold_Blue2-dark.png and /dev/null differ
diff --git a/src/Gui/Stylesheets/images_classic/Unfold_Blue2.png b/src/Gui/Stylesheets/images_classic/Unfold_Blue2.png
deleted file mode 100644
index c90a23f5db..0000000000
Binary files a/src/Gui/Stylesheets/images_classic/Unfold_Blue2.png and /dev/null differ