3 files changed, 18 insertions, 23 deletions
diff --git a/arc-firefox-theme/chrome/global/menu.css b/arc-firefox-theme/chrome/global/menu.css
index 61de49d..c2c779b 100644
--- a/arc-firefox-theme/chrome/global/menu.css
+++ b/arc-firefox-theme/chrome/global/menu.css
@@ -80,6 +80,7 @@ menulist > menupopup > menu {
 
 .menu-text,
 .menu-iconic-left,
+.menu-iconic-right,
 .menu-iconic-text {
   margin-top: 0px !important;
   margin-bottom: 0px !important;
@@ -118,7 +119,8 @@ menucaption > .menu-iconic-text {
   -moz-box-pack: end;
 }
 
-.menu-iconic-left {
+.menu-iconic-left,
+.menu-iconic-right {
   width: 16px;
   /* We can only hardcode this, to make the default GTK icon<->label spacing */
   -moz-padding-end: 3px !important;
@@ -158,7 +160,10 @@ menucaption > .menu-iconic-text {
 
 menulist > menupopup > menuitem > .menu-iconic-left,
 menulist > menupopup > menucaption > .menu-iconic-left,
-menulist > menupopup > menu > .menu-iconic-left {
+menulist > menupopup > menu > .menu-iconic-left,
+menulist > menupopup > menuitem > .menu-iconic-right,
+menulist > menupopup > menucaption > .menu-iconic-right,
+menulist > menupopup > menu > .menu-iconic-right {
   display: none;
 }
 
diff --git a/arc-firefox-theme/chrome/global/notification.css b/arc-firefox-theme/chrome/global/notification.css
index 4c5d27e..079f408 100644
--- a/arc-firefox-theme/chrome/global/notification.css
+++ b/arc-firefox-theme/chrome/global/notification.css
@@ -5,14 +5,16 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 notification {
-  color: InfoText;
+  color: -moz-gtk-info-bar-text;
   background-color: InfoBackground;
+  -moz-appearance: -moz-gtk-info-bar;
   text-shadow: none;
 }
 
 notification[type="info"] {
   color: -moz-DialogText;
   background-color: -moz-Dialog;
+  -moz-appearance: none;
 }
 
 notification[type="critical"] {
diff --git a/arc-firefox-theme/chrome/global/toolbarbutton.css b/arc-firefox-theme/chrome/global/toolbarbutton.css
index 4a11f72..a62e173 100644
--- a/arc-firefox-theme/chrome/global/toolbarbutton.css
+++ b/arc-firefox-theme/chrome/global/toolbarbutton.css
@@ -106,37 +106,25 @@ toolbarbutton[type="menu-button"][disabled="true"]:hover:active {
 }
 
 /* ::::: toolbarbutton badged ::::: */
+.toolbarbutton-badge-stack > .toolbarbutton-icon[label]:not([label=""]) {
+  -moz-margin-end: 0;
+}
 
 .toolbarbutton-badge {
   background-color: #d90000;
-}
-
-.toolbarbutton-badge::after {
-  /* The |content| property is set in the content stylesheet. */
   font-size: 10px;
-  font-weight: bold;
-  padding: 1px 2px 2px;
+  padding: 0 2px 1px;
   color: #fff;
-  background-color: inherit;
   border-radius: 2px;
   box-shadow: 0 1px 0 hsla(0, 100%, 100%, .2) inset,
               0 -1px 0 hsla(0, 0%, 0%, .1) inset,
               0 1px 0 hsla(206, 50%, 10%, .2);
-  position: absolute;
-  top: -4px;
-  right: -2px;
-  min-width: 10px;
+  margin: -6px 0 0 !important;
+  -moz-margin-end: -8px !important;
+  min-width: 14px;
   line-height: 10px;
   text-align: center;
-}
-
-.toolbarbutton-badge:-moz-locale-dir(rtl)::after {
-  left: -2px;
-  right: auto;
-}
-
-.toolbarbutton-badge-container {
-  position: relative;
+  -moz-stack-sizing: ignore;
 }
 
 /* .......... dropmarker .......... */