diff --git a/src/other/firefox/Monterey/parts/headerbar-urlbar.css b/src/other/firefox/Monterey/parts/headerbar-urlbar.css
index 36529af3..055d6172 100644
--- a/src/other/firefox/Monterey/parts/headerbar-urlbar.css
+++ b/src/other/firefox/Monterey/parts/headerbar-urlbar.css
@@ -191,7 +191,10 @@ toolbarspring {
 	border-radius: 5px !important;
 }
 
-.urlbar-page-action, #urlbar-go-button, .search-go-button,
+.urlbar-page-action,
+#urlbar-go-button,
+.urlbar-go-button,
+.search-go-button,
 #tracking-protection-icon-container {
 	width: 28px !important;
 	height: 26px !important;
@@ -209,10 +212,21 @@ toolbarspring {
 	margin-left: 0 !important;
 }
 
+#tracking-protection-icon-container:hover,
+.urlbar-page-action:hover,
+#urlbar-go-button:hover,
+.urlbar-go-button:hover,
+.search-go-button:hover,
 #identity-box:hover {
 	background: var(--gnome-headerbar-button-hover-background) !important;
 }
 
+#tracking-protection-icon-container:active,
+#tracking-protection-icon-container[open="true"],
+.urlbar-page-action:active,
+#urlbar-go-button:active,
+.urlbar-go-button:active,
+.search-go-button:active,
 #identity-box:active {
 	background: var(--gnome-headerbar-button-active-background) !important;
 }
diff --git a/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css b/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css
index 5114c12c..406f5764 100644
--- a/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css
+++ b/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css
@@ -145,6 +145,7 @@ toolbarspring {
 	border-radius: 5px 0 0 5px !important;
 	border-left-width: 1px !important;
 }
+
 .searchbar-engine-one-off-item.last-engine, .searchbar-engine-one-off-item:not(.search-setting-button):last-child {
 	border-radius: 0 5px 5px 0 !important;
 }
@@ -198,7 +199,10 @@ toolbarspring {
 	padding: 0 !important;
 }
 
-.urlbar-page-action, #urlbar-go-button, .search-go-button,
+.urlbar-page-action,
+#urlbar-go-button,
+.urlbar-go-button,
+.search-go-button,
 #tracking-protection-icon-container {
 	width: 28px !important;
 	height: 26px !important;
@@ -220,10 +224,21 @@ toolbarspring {
 	margin-left: 0 !important;
 }
 
+#tracking-protection-icon-container:hover,
+.urlbar-page-action:hover,
+#urlbar-go-button:hover,
+.urlbar-go-button:hover,
+.search-go-button:hover,
 #identity-box:hover {
 	background: var(--gnome-headerbar-button-hover-background) !important;
 }
 
+#tracking-protection-icon-container:active,
+#tracking-protection-icon-container[open="true"],
+.urlbar-page-action:active,
+#urlbar-go-button:active,
+.urlbar-go-button:active,
+.search-go-button:active,
 #identity-box:active {
 	background: var(--gnome-headerbar-button-active-background) !important;
 }
diff --git a/src/other/firefox/common/parts/buttons-fixes.css b/src/other/firefox/common/parts/buttons-fixes.css
index a0e1742b..00b8705e 100644
--- a/src/other/firefox/common/parts/buttons-fixes.css
+++ b/src/other/firefox/common/parts/buttons-fixes.css
@@ -40,12 +40,6 @@
 	border-color: unset;
 }
 
-/* Remove the header bar buttons' hover styles */
-#nav-bar {
-	--toolbarbutton-active-background: transparent !important;
-	--toolbarbutton-hover-background: transparent !important;
-}
-
 /* Glitch customizing: Cut / Copy / Paste buttons' icons
  * :not(#hack) is there just to elevate rule priority */
 :root[customizing] #nav-bar > hbox toolbaritem toolbarbutton image:not(#hack) {
diff --git a/src/other/firefox/common/parts/icons.css b/src/other/firefox/common/parts/icons.css
index d4cdcbfc..7d80cd62 100644
--- a/src/other/firefox/common/parts/icons.css
+++ b/src/other/firefox/common/parts/icons.css
@@ -303,6 +303,7 @@ menu[disabled] > .menu-right {
 #forward-button,
 #context-forward,
 #urlbar-go-button,
+.urlbar-go-button,
 .search-go-button {
 	list-style-image: url("../icons/go-next-symbolic.svg") !important;
 }