diff --git a/toolkit/content/xul.css b/toolkit/content/xul.css
index a706680b8880..b9ad1bb2fb19 100644
--- a/toolkit/content/xul.css
+++ b/toolkit/content/xul.css
@@ -144,7 +144,8 @@ button[type="menu-button"] {
 
 %ifdef MOZ_WIDGET_GTK2
 /********* detection of system setting to use icons in buttons ***********/
-.button-icon:not(:-moz-system-metric(images-in-buttons)) {
+button[label]:not([label=""]) > .button-box > .button-icon:not(:-moz-system-metric(images-in-buttons)),
+button[label]:not([label=""]) > .button-box > .box-inherit > .button-icon:not(:-moz-system-metric(images-in-buttons)) {
   display: none;
 }
 %endif