diff --git a/theme/parts/buttons-fixes.css b/theme/parts/buttons-fixes.css
index d790ae9..21af903 100644
--- a/theme/parts/buttons-fixes.css
+++ b/theme/parts/buttons-fixes.css
@@ -18,7 +18,7 @@
 }
 
 /* Fix hover background */
-.toolbarbutton-badge-stack:not(#hack), .toolbarbutton-icon:not(#hack), .toolbarbutton-text:not(#hack) {
+#appMenu-fullscreen-button2 > .toolbarbutton-icon {
 	background: transparent !important;
 }
 
diff --git a/theme/parts/icons.css b/theme/parts/icons.css
index 0c565d4..3acdea7 100644
--- a/theme/parts/icons.css
+++ b/theme/parts/icons.css
@@ -3,7 +3,7 @@
 @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
 /* Icons color */
-.toolbarbutton-icon,
+.toolbarbutton-icon:not([class*="identity-color-"] .toolbarbutton-icon),
 menuitem:not([class*='identity']) .menu-iconic-left .menu-iconic-icon,
 .urlbar-page-action:not([readeractive]),
 .urlbar-icon,