diff --git a/toolkit/themes/pinstripe/global/jar.mn b/toolkit/themes/pinstripe/global/jar.mn
index 9ed94677ac63..8fb88e11fcbf 100644
--- a/toolkit/themes/pinstripe/global/jar.mn
+++ b/toolkit/themes/pinstripe/global/jar.mn
@@ -27,7 +27,7 @@ toolkit.jar:
   skin/classic/global/listbox.css
   skin/classic/global/menu.css
   skin/classic/global/menulist.css
-  skin/classic/global/notification.css
+* skin/classic/global/notification.css
   skin/classic/global/netError.css
   skin/classic/global/numberbox.css
   skin/classic/global/passwordmgr.css
diff --git a/toolkit/themes/pinstripe/global/notification.css b/toolkit/themes/pinstripe/global/notification.css
index ed9b043896ac..36b1d11f11e7 100644
--- a/toolkit/themes/pinstripe/global/notification.css
+++ b/toolkit/themes/pinstripe/global/notification.css
@@ -1,3 +1,4 @@
+%include shared.inc
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 notification {
@@ -93,6 +94,12 @@ notification[type="critical"] .messageImage {
   margin-top: 17px;
 }
 
+.popup-notification-menubutton:-moz-focusring > .button-menubutton-dropmarker,
+.popup-notification-menubutton > .button-menubutton-button:-moz-focusring {
+  box-shadow: @focusRingShadow@;
+  position: relative;
+}
+
 .popup-notification-menubutton:not([type="menu-button"]),
 .popup-notification-menubutton > .button-menubutton-button,
 .popup-notification-menubutton > .button-menubutton-dropmarker {
diff --git a/toolkit/themes/winstripe/global/notification.css b/toolkit/themes/winstripe/global/notification.css
index de5717054313..eb434ab37995 100644
--- a/toolkit/themes/winstripe/global/notification.css
+++ b/toolkit/themes/winstripe/global/notification.css
@@ -102,10 +102,14 @@ XXX: apply styles to all themes until bug 509642 is fixed
   }
 
   .popup-notification-menubutton > .button-menubutton-button {
+    background-color: transparent;
+    padding: 1px;
+    -moz-border-end: none;
+  }
+
+  .popup-notification-menubutton > .button-menubutton-button > .button-box {
     -moz-padding-start: 8px;
     -moz-padding-end: 5px;
-    -moz-border-end: none;
-    background-color: transparent;
   }
 
   .popup-notification-menubutton > .button-menubutton-dropmarker {
@@ -115,6 +119,11 @@ XXX: apply styles to all themes until bug 509642 is fixed
     list-style-image: url("chrome://global/skin/arrow/arrow-dn-sharp.gif");
   }
 
+  .popup-notification-menubutton > .button-menubutton-dropmarker {
+    outline: 1px dotted ThreeDDarkShadow;
+    outline-offset: -3px;
+  }
+
 %ifdef WINSTRIPE_AERO
   .popup-notification-menubutton > .button-menubutton-button:-moz-locale-dir(ltr),
   .popup-notification-menubutton > .button-menubutton-dropmarker:-moz-locale-dir(rtl) {