diff --git a/src/other/firefox/Monterey/parts/icons.css b/src/other/firefox/Monterey/parts/icons.css
index e1b3bcfd..c4dbc7a1 100644
--- a/src/other/firefox/Monterey/parts/icons.css
+++ b/src/other/firefox/Monterey/parts/icons.css
@@ -111,17 +111,11 @@ treechildren::-moz-tree-twisty {
 	width: 16px !important;
 	height: 16px !important;
 }
-treechildren::-moz-tree-twisty(open) {
-	list-style-image: url("../icons/pan-down-symbolic.svg") !important;
-}
-treechildren::-moz-tree-twisty(selected, focus) {
-	list-style-image: url("../icons/pan-down-symbolic-light.svg") !important;
-}
 .item.client.closed .item-twisty-container {
 	background-image: url("../icons/pan-down-symbolic.svg") !important;
 }
 treechildren::-moz-tree-twisty(selected, focus, open) {
-	list-style-image: url("../icons/pan-end-symbolic-light.svg") !important;
+	list-style-image: url("../icons/pan-down-symbolic-light.svg") !important;
 }
 treechildren::-moz-tree-image(title, container),
 treechildren::-moz-tree-image(title, open) {
@@ -133,10 +127,10 @@ treechildren::-moz-tree-image(query, OrganizerQuery_history____v) {
 }
 
 .sidebar-panel[lwt-sidebar-brighttext] .sidebar-placesTreechildren::-moz-tree-twisty {
-	list-style-image: url("../icons/pan-down-symbolic-light.svg") !important;
+	list-style-image: url("../icons/pan-end-symbolic-light.svg") !important;
 }
 .sidebar-panel[lwt-sidebar-brighttext] .sidebar-placesTreechildren::-moz-tree-twisty(open) {
-	list-style-image: url("../icons/pan-end-symbolic-light.svg") !important;
+	list-style-image: url("../icons/pan-down-symbolic-light.svg") !important;
 }
 /* Sidebar: History: clock icon */
 #historyTree treechildren::-moz-tree-image {
diff --git a/src/other/firefox/WhiteSur/parts/buttons-fixes.css b/src/other/firefox/WhiteSur/parts/buttons-fixes.css
index a4209b16..260639d5 100644
--- a/src/other/firefox/WhiteSur/parts/buttons-fixes.css
+++ b/src/other/firefox/WhiteSur/parts/buttons-fixes.css
@@ -162,6 +162,11 @@ button.close.ghost-button:active {
 	font-size: 1em !important;
 }
 
+/* Sidebar header button sizing */
+#sidebar-switcher-target {
+	flex: unset !important;
+}
+
 /* Sidebar header button arrow opacity */
 #sidebar-switcher-arrow {
 	opacity: 1 !important;
diff --git a/src/other/firefox/WhiteSur/parts/icons.css b/src/other/firefox/WhiteSur/parts/icons.css
index e1b3bcfd..c4dbc7a1 100644
--- a/src/other/firefox/WhiteSur/parts/icons.css
+++ b/src/other/firefox/WhiteSur/parts/icons.css
@@ -111,17 +111,11 @@ treechildren::-moz-tree-twisty {
 	width: 16px !important;
 	height: 16px !important;
 }
-treechildren::-moz-tree-twisty(open) {
-	list-style-image: url("../icons/pan-down-symbolic.svg") !important;
-}
-treechildren::-moz-tree-twisty(selected, focus) {
-	list-style-image: url("../icons/pan-down-symbolic-light.svg") !important;
-}
 .item.client.closed .item-twisty-container {
 	background-image: url("../icons/pan-down-symbolic.svg") !important;
 }
 treechildren::-moz-tree-twisty(selected, focus, open) {
-	list-style-image: url("../icons/pan-end-symbolic-light.svg") !important;
+	list-style-image: url("../icons/pan-down-symbolic-light.svg") !important;
 }
 treechildren::-moz-tree-image(title, container),
 treechildren::-moz-tree-image(title, open) {
@@ -133,10 +127,10 @@ treechildren::-moz-tree-image(query, OrganizerQuery_history____v) {
 }
 
 .sidebar-panel[lwt-sidebar-brighttext] .sidebar-placesTreechildren::-moz-tree-twisty {
-	list-style-image: url("../icons/pan-down-symbolic-light.svg") !important;
+	list-style-image: url("../icons/pan-end-symbolic-light.svg") !important;
 }
 .sidebar-panel[lwt-sidebar-brighttext] .sidebar-placesTreechildren::-moz-tree-twisty(open) {
-	list-style-image: url("../icons/pan-end-symbolic-light.svg") !important;
+	list-style-image: url("../icons/pan-down-symbolic-light.svg") !important;
 }
 /* Sidebar: History: clock icon */
 #historyTree treechildren::-moz-tree-image {