Improve appearance of downloads indicators on dark backgrounds on Windows

2 files changed, 22 insertions, 1 deletions

diff --git a/browser/themes/windows/downloads/downloads.css b/browser/themes/windows/downloads/downloads.css
index 0790717ee..7a917c554 100644
--- a/browser/themes/windows/downloads/downloads.css
+++ b/browser/themes/windows/downloads/downloads.css
@@ -302,7 +302,7 @@ richlistitem[type="download"]:hover > stack > .downloadButton.downloadRetry:acti
   position: relative;
 }
 
-#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar[brighttext] #downloads-indicator-anchor {
+#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar[brighttext] #downloads-indicator[counter] > #downloads-indicator-anchor {
   /* Use a dark download button when appropriate to improve text legibility */
   background: hsla(94,56%,18%,.3) padding-box;
   background-image: linear-gradient(hsla(0,0%,0%,.1), hsla(0,0%,0%,.4));
@@ -326,6 +326,13 @@ toolbar[brighttext] #downloads-indicator-icon {
                               0, 108, 18, 90) center no-repeat;
 }
 
+:-moz-any(#toolbar-menubar, #nav-bar[tabsontop=false]) #downloads-indicator-icon:not(:-moz-lwtheme),
+#TabsToolbar[tabsontop=true] #downloads-indicator-icon:not(:-moz-lwtheme),
+#nav-bar + #customToolbars + #PersonalToolbar[collapsed=true] + #TabsToolbar[tabsontop=false]:last-child #downloads-indicator-icon:not(:-moz-lwtheme) {
+  background: -moz-image-rect(var(--toolbarbutton-glass-image),
+                              0, 108, 18, 90) center no-repeat;
+}
+
 #downloads-indicator[attention] > #downloads-indicator-anchor > #downloads-indicator-icon {
   background-image: url("chrome://browser/skin/downloads/download-glow.png");
 }
@@ -344,6 +351,13 @@ toolbar[brighttext] #downloads-indicator:not([counter]) > #downloads-indicator-a
                               0, 108, 18, 90) center no-repeat;
 }
 
+:-moz-any(#toolbar-menubar, #nav-bar[tabsontop=false]) #downloads-indicator:not([counter]) > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter:not(:-moz-lwtheme),
+#TabsToolbar[tabsontop=true] #downloads-indicator:not([counter]) > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter:not(:-moz-lwtheme),
+#nav-bar + #customToolbars + #PersonalToolbar[collapsed=true] + #TabsToolbar[tabsontop=false]:last-child #downloads-indicator:not([counter]) > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter:not(:-moz-lwtheme) {
+  background: -moz-image-rect(var(--toolbarbutton-glass-image),
+                              0, 108, 18, 90) center no-repeat;
+}
+
 #downloads-indicator:not([counter])[attention] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter {
   background-image: url("chrome://browser/skin/downloads/download-glow.png");
 }
diff --git a/browser/themes/windows/statusbar/overlay.css b/browser/themes/windows/statusbar/overlay.css
index 8bd1ed267..c4b5b71d6 100644
--- a/browser/themes/windows/statusbar/overlay.css
+++ b/browser/themes/windows/statusbar/overlay.css
@@ -41,6 +41,13 @@
 	background: -moz-image-rect(var(--toolbarbutton-inverted-image), 0, 108, 18, 90) center no-repeat;
 }
 
+:-moz-any(#toolbar-menubar, #nav-bar[tabsontop=false]) #status4evar-download-button #status4evar-download-icon:not(:-moz-lwtheme),
+#TabsToolbar[tabsontop=true] #status4evar-download-button #status4evar-download-icon:not(:-moz-lwtheme),
+#nav-bar + #customToolbars + #PersonalToolbar[collapsed=true] + #TabsToolbar[tabsontop=false]:last-child #status4evar-download-button #status4evar-download-icon:not(:-moz-lwtheme)
+{
+	background: -moz-image-rect(var(--toolbarbutton-glass-image), 0, 108, 18, 90) center no-repeat;
+}
+
 #status4evar-download-button[attention] #status4evar-download-icon
 {
 	background-image: url("chrome://browser/skin/downloads/download-glow.png");