diff --git a/src/other/firefox/Monterey/parts/tabsbar.css b/src/other/firefox/Monterey/parts/tabsbar.css
index 07aa2e9..104c2ae 100644
--- a/src/other/firefox/Monterey/parts/tabsbar.css
+++ b/src/other/firefox/Monterey/parts/tabsbar.css
@@ -72,6 +72,14 @@
 	width: 16px;
 }
 
+.tabbrowser-tab > .tab-stack > .tab-content > .tab-close-button {
+	visibility: hidden;
+}
+
+.tabbrowser-tab:hover > .tab-stack > .tab-content > .tab-close-button {
+	visibility: visible;
+}
+
 @media (prefers-color-scheme: dark) {
 	.tab-close-button {
 		list-style-image: url("../icons/window-close-symbolic-light.svg") !important;
@@ -145,3 +153,32 @@
 	height: 16px !important;
 	width: 16px !important;
 }
+
+@media (-moz-gtk-csd-reversed-placement) {
+.tab-content {
+	display: flex;
+	flex-direction: row;
+	justify-content: center;
+	align-items: center;
+	padding-right: 20px !important;
+}
+
+
+.tabbrowser-tab > .tab-stack > .tab-content > .tab-close-button {
+	order: 1;
+	min-width: 16px;
+}
+
+.tabbrowser-tab > .tab-stack > .tab-content > .tab-icon-stack {
+	order: 2;
+	margin-left: auto;
+}
+.tabbrowser-tab > .tab-stack > .tab-content > .tab-label-container {
+	order: 3;
+	margin-right: auto;
+}
+
+.tabbrowser-tab > .tab-stack > .tab-content > .tab-label-container > .tab-secondary-label {
+	display: none;
+}
+}
diff --git a/src/other/firefox/WhiteSur/parts/tabsbar.css b/src/other/firefox/WhiteSur/parts/tabsbar.css
index f0af262..50ee0cb 100644
--- a/src/other/firefox/WhiteSur/parts/tabsbar.css
+++ b/src/other/firefox/WhiteSur/parts/tabsbar.css
@@ -96,6 +96,7 @@ tab[selected]:-moz-window-inactive {
 /* Center all inside tab */
 .tab-content {
 	display: flex;
+	flex-direction: row;
 	justify-content: center;
 	align-items: center;
 	margin-top: -1px;
@@ -118,9 +119,9 @@ tab[selected]:-moz-window-inactive {
 .tab-icon-sound[activemedia-blocked="true"] {
 	margin-left: auto !important;
 }
-.tabbrowser-tab:not([soundplaying]):not([muted]):not([activemedia-blocked]) .tab-close-button {
-	margin-left: auto !important;
-}
+/*.tabbrowser-tab:not([soundplaying]):not([muted]):not([activemedia-blocked]) .tab-close-button {*/
+/*	margin-left: auto !important;*/
+/*}*/
 .tab-icon-sound {
 	margin-right: 6px;
 }
@@ -140,6 +141,7 @@ tab[selected]:-moz-window-inactive {
 /* If tab favicon is not present, force tab label to the center */
 .tabbrowser-tab .tab-label-container {
 	margin-left: 0 !important;
+	margin-right: auto !important;
 }
 
 .tabbrowser-tab:not([image]):not([busy]):not([progress]) .tab-label-container {
@@ -200,10 +202,6 @@ tab[selected]:-moz-window-inactive {
 } */
 
 /* Close tab button */
-:root {
-	--gnome-fill-icon: red !important;
-}
-
 .close-icon {
 	height: 16px !important;
 	padding: 0 !important;
@@ -223,11 +221,20 @@ tab[selected]:-moz-window-inactive {
 	width: 16px;
 }
 
+.tabbrowser-tab > .tab-stack > .tab-content > .tab-close-button {
+	visibility: hidden;
+}
+
+.tabbrowser-tab:hover > .tab-stack > .tab-content > .tab-close-button {
+	visibility: visible;
+}
+
 @media (prefers-color-scheme: dark) {
 	.tab-close-button {
 		list-style-image: url("../icons/window-close-symbolic-light.svg") !important;
 	}
 }
+
 :root:-moz-window-inactive .tab-close-button:not(#hack) {
 	opacity: .18 !important;
 }
@@ -255,11 +262,6 @@ tab[selected]:-moz-window-inactive {
 	display: none;
 }
 
-/* Move container lines to the top */
-.tabbrowser-tab[usercontextid] > .tab-stack > .tab-background {
-	border-top: 3px solid var(--identity-tab-color) !important;
-}
-
 /* Remove alt colours references for multi tabs*/
 .tabbrowser-tab[usercontextid]>.tab-stack>.tab-background>.tab-context-line {
 	display: none;
@@ -363,7 +365,6 @@ tab[selected]:-moz-window-inactive {
 }
 
 /* fix spacing on too many tabs */
-
 .tab-icon-overlay:not([pinned], [sharing]),
 [pictureinpicture] {
 	margin-inline-end: 4px !important;
@@ -380,3 +381,23 @@ tab[selected]:-moz-window-inactive {
 #tabbrowser-tabs[closebuttons="activetab"]>#tabbrowser-arrowscrollbox>.tabbrowser-tab>.tab-stack>.tab-content>.tab-icon-stack[selected="true"] {
 	margin-left: auto !important;
 }
+
+@media (-moz-gtk-csd-reversed-placement) {
+.tabbrowser-tab > .tab-stack > .tab-content > .tab-close-button {
+	order: 1;
+	min-width: 16px;
+}
+
+.tabbrowser-tab > .tab-stack > .tab-content > .tab-icon-stack {
+	order: 2;
+	margin-left: auto;
+}
+.tabbrowser-tab > .tab-stack > .tab-content > .tab-label-container {
+	order: 3;
+	margin-right: auto;
+}
+
+.tabbrowser-tab > .tab-stack > .tab-content > .tab-label-container > .tab-secondary-label {
+	display: none;
+}
+}