--- a/browser/themes/shared/urlbar-searchbar.inc.css
+++ b/browser/themes/shared/urlbar-searchbar.inc.css
@@ -159,43 +159,54 @@
   width: 28px;
   height: 28px;
   /* 28x28 box - 16x16 image = 12x12 padding, 6 on each side */
   padding: 6px;
   -moz-context-properties: fill, fill-opacity;
   fill: currentColor;
   fill-opacity: 0.6;
   color: inherit;
-  transition-property: background-color;
-  transition-duration: var(--toolbarbutton-hover-transition-duration);
 }
 
 :root[uidensity=compact] .urlbar-icon {
   width: 24px;
   height: 24px;
   /* 24x24 box - 16x16 image = 8x8 padding, 4 on each side */
   padding: 4px;
 }
 
 :root[uidensity=touch] .urlbar-icon {
   width: 30px;
   height: 30px;
   /* 30x30 box - 16x16 image = 14x14 padding, 7 on each side */
   padding: 7px;
 }
 
-.urlbar-icon:hover {
+.urlbar-icon,
+.urlbar-icon-wrapper {
+  transition-property: background-color;
+  transition-duration: var(--toolbarbutton-hover-transition-duration);
+}
+
+.urlbar-icon:hover,
+.urlbar-icon-wrapper:hover {
   background-color: hsla(0,0%,80%,.4);
 }
 
-.urlbar-icon:hover:active {
+.urlbar-icon:hover:active,
+.urlbar-icon-wrapper:hover:active {
   background-color: hsla(0,0%,80%,.45);
   transition-duration: var(--toolbarbutton-active-transition-duration);
 }
 
+.urlbar-icon-wrapper > .urlbar-icon:hover,
+.urlbar-icon-wrapper > .urlbar-icon:hover:active {
+  background-color: transparent;
+}
+
 .urlbar-go-button,
 .search-go-button {
   list-style-image: url("chrome://browser/skin/back.svg");
   width: 26px;
 }
 
 .urlbar-go-button:-moz-locale-dir(ltr),
 .search-go-button:-moz-locale-dir(ltr) {