diff --git a/src/other/firefox/Monterey/parts/popups-contents.css b/src/other/firefox/Monterey/parts/popups-contents.css
index c8ab7c8b..4eec1378 100644
--- a/src/other/firefox/Monterey/parts/popups-contents.css
+++ b/src/other/firefox/Monterey/parts/popups-contents.css
@@ -64,22 +64,34 @@
 }
 
 /* All tabs popover */
-.all-tabs-item[selected] {
-	box-shadow: none !important;
-	border-left: 3px solid var(--gnome-tabbar-tab-active-border-bottom-color);
-	border-radius: 0 !important;
+
+.all-tabs-item {
+	border-left: 3px solid transparent;
 }
 
 .all-tabs-item:hover,
-.all-tabs-item:active {
+.all-tabs-item:active,
+.all-tabs-item[selected] {
 	background: none !important;
 	padding: 0 !important;
+	border-radius: 0 !important;
 }
 
 .all-tabs-item > .all-tabs-secondary-button {
 	margin: 0 !important;
 }
 
+.all-tabs-item[selected] {
+	border-image: linear-gradient(
+		to bottom,
+		transparent 0,
+		transparent 35%,
+		var(--gnome-tabbar-tab-active-border-bottom-color) 35%,
+		var(--gnome-tabbar-tab-active-border-bottom-color) 65%,
+		transparent 65%,
+		transparent 100%) 3;
+}
+
 .all-tabs-item > .all-tabs-secondary-button label {
 	margin: 0 !important;
 }
diff --git a/src/other/firefox/Monterey/parts/popups.css b/src/other/firefox/Monterey/parts/popups.css
index 9959361e..dd985047 100644
--- a/src/other/firefox/Monterey/parts/popups.css
+++ b/src/other/firefox/Monterey/parts/popups.css
@@ -22,7 +22,6 @@ menupopup, panel,
 :is(panel, menupopup)::part(content) {
 	--panel-border-color: transparent !important;
 	--arrowpanel-border-color: transparent !important;
-
 }
 
 .panel-arrowcontent {
diff --git a/src/other/firefox/WhiteSur/parts/popups-contents.css b/src/other/firefox/WhiteSur/parts/popups-contents.css
index f414a305..4eec1378 100644
--- a/src/other/firefox/WhiteSur/parts/popups-contents.css
+++ b/src/other/firefox/WhiteSur/parts/popups-contents.css
@@ -64,25 +64,34 @@
 }
 
 /* All tabs popover */
-.all-tabs-item[selected] {
-	box-shadow: none !important;
-	border-radius: 0 !important;
-	background: url("../icons/bullet-symbolic.svg") !important;
-	background-position: left center;
-	background-size: 14px 14px;
-	background-repeat: no-repeat;
+
+.all-tabs-item {
+	border-left: 3px solid transparent;
 }
 
 .all-tabs-item:hover,
-.all-tabs-item:active {
+.all-tabs-item:active,
+.all-tabs-item[selected] {
 	background: none !important;
 	padding: 0 !important;
+	border-radius: 0 !important;
 }
 
 .all-tabs-item > .all-tabs-secondary-button {
 	margin: 0 !important;
 }
 
+.all-tabs-item[selected] {
+	border-image: linear-gradient(
+		to bottom,
+		transparent 0,
+		transparent 35%,
+		var(--gnome-tabbar-tab-active-border-bottom-color) 35%,
+		var(--gnome-tabbar-tab-active-border-bottom-color) 65%,
+		transparent 65%,
+		transparent 100%) 3;
+}
+
 .all-tabs-item > .all-tabs-secondary-button label {
 	margin: 0 !important;
 }
diff --git a/src/other/firefox/WhiteSur/theme.css b/src/other/firefox/WhiteSur/theme.css
index 109d47ab..c8c529f2 100644
--- a/src/other/firefox/WhiteSur/theme.css
+++ b/src/other/firefox/WhiteSur/theme.css
@@ -21,7 +21,7 @@
 
 /* Set theme version text in customization panel */
 #customization-footer::before {
-	background: url(icons/icon.svg) no-repeat;
+	background: url("icons/icon.svg") no-repeat;
 	background-size: contain;
 	content: "Firefox WhiteSur theme";
 	padding: 10px 10px 10px 50px;