diff --git a/src/other/firefox/Monterey/parts/tabsbar-alt.css b/src/other/firefox/Monterey/parts/tabsbar-alt.css
index 7a65b09..32c5e39 100644
--- a/src/other/firefox/Monterey/parts/tabsbar-alt.css
+++ b/src/other/firefox/Monterey/parts/tabsbar-alt.css
@@ -82,16 +82,37 @@ tab > stack {
 	background: var(--gnome-inactive-tabbar-tab-active-background) !important;
 }
 
+/* Tab labels */
+tab .tab-label {
+	color: var(--gnome-tabbar-tab-color) !important;
+}
+tab:hover .tab-label {
+	color: var(--gnome-tabbar-tab-hover-color) !important;
+}
+tab[selected] .tab-label {
+	color: var(--gnome-tabbar-tab-active-color) !important;
+}
+tab:-moz-window-inactive .tab-label {
+	color: var(--gnome-inactive-tabbar-tab-color) !important;
+}
+tab[selected]:-moz-window-inactive .tab-label {
+	color: var(--gnome-inactive-tabbar-tab-active-color) !important;
+}
+
 /* Center all inside tab */
 .tab-content {
 	display: flex;
 	flex-direction: row;
-	justify-content: center;
-	align-items: center;
+	justify-content: center !important;
+	align-items: center !important;
 	min-width: 100% !important;
 	padding: 0 10px !important;
 }
 
+.tab-label {
+	margin-inline: 0 !important;
+}
+
 /* Prevent tab icons size breaking */
 .tab-icon-image, .tab-icon-sound, .tab-throbber, .tab-throbber-fallback, .tab-close-button {
 	min-width: 16px;
@@ -130,6 +151,7 @@ tab > stack {
 /* Adjust tab label width */
 .tab-label-container {
 	min-width: 0 !important;
+	max-width: min-content !important;
 }
 
 /* Put tab close button and icon sound to the right */
diff --git a/src/other/firefox/Monterey/parts/tabsbar.css b/src/other/firefox/Monterey/parts/tabsbar.css
index 2daef60..8be688c 100644
--- a/src/other/firefox/Monterey/parts/tabsbar.css
+++ b/src/other/firefox/Monterey/parts/tabsbar.css
@@ -58,6 +58,24 @@ tab > stack {
 	background: var(--gnome-inactive-tabbar-tab-active-background) !important;
 }
 
+/* Tab labels */
+tab .tab-label {
+	color: var(--gnome-tabbar-tab-color) !important;
+}
+tab:hover .tab-label {
+	color: var(--gnome-tabbar-tab-hover-color) !important;
+}
+tab[selected] .tab-label {
+	color: var(--gnome-tabbar-tab-active-color) !important;
+}
+tab:-moz-window-inactive .tab-label {
+	color: var(--gnome-inactive-tabbar-tab-color) !important;
+}
+tab[selected]:-moz-window-inactive .tab-label {
+	color: var(--gnome-inactive-tabbar-tab-active-color) !important;
+}
+
+
 .close-icon {
 	height: 16px !important;
 	padding: 0 !important;
diff --git a/src/other/firefox/WhiteSur/parts/tabsbar.css b/src/other/firefox/WhiteSur/parts/tabsbar.css
index 55858aa..5416131 100644
--- a/src/other/firefox/WhiteSur/parts/tabsbar.css
+++ b/src/other/firefox/WhiteSur/parts/tabsbar.css
@@ -73,7 +73,6 @@
 tab {
 	color: var(--gnome-tabbar-tab-color) !important;
 }
-
 tab:hover {
 	color: var(--gnome-tabbar-tab-hover-color) !important;
 }
@@ -112,18 +111,19 @@ tab[selected]:-moz-window-inactive {
 
 /* Center tab text */
 .tab-label {
-	margin-inline: auto !important;
-	margin-left: 0 !important;
+	margin-inline: 0 !important;
 }
 
 /* Adjust tab label width */
 .tab-label-container {
 	min-width: 0 !important;
+	max-width: min-content !important;
 }
 
 .tab-throbber:not([pinned]), .tab-icon-pending:not([pinned]), .tab-icon-image:not([pinned]), .tab-sharing-icon-overlay:not([pinned]), .tab-icon-overlay:not([pinned]) {
 	margin-inline-end: 0 !important;
 }
+
 .tabbrowser-tab:not([soundplaying], [muted], [activemedia-blocked], [crashed]) .tab-icon-stack {
 	padding: 6px;
 }
@@ -154,12 +154,7 @@ tab[selected]:-moz-window-inactive {
 /* Force tab favicon to the center */
 .tab-throbber, .tab-throbber-fallback,
 .tabbrowser-tab:not([busy]):not([soundplaying="true"],[muted="true"]) .tab-icon-image,
-.tabbrowser-tab:not([class*="identity-color-"]) .tab-icon-stack {
-	margin-left: auto !important;
-}
-
-/* separate class for multi-tab alignment*/
-.tabbrowser-tab[class*="identity-color-"]>.tab-stack>.tab-content>.tab-icon-stack {
+.tabbrowser-tab .tab-icon-stack {
 	margin-left: auto !important;
 }
 
@@ -194,7 +189,7 @@ tab[selected]:-moz-window-inactive {
 
 /* fix misc spacing between tabs */
 .tabbrowser-tab {
-	padding-inline: 0px !important;
+	padding-inline: 0 !important;
 	padding: 0 !important;
 }