Bug 1168528 - Tab close icons on Windows HiDPI are blurry. r=Gijs

toolkit/themes/windows/global/global.css

@@ -324,6 +324,7 @@ popupnotificationcontent {
 
 /* :::::: Close button icons ::::: */
 
+%ifdef XP_WIN
 .close-icon {
   list-style-image: url("chrome://global/skin/icons/close.png");
   -moz-image-region: rect(0, 16px, 16px, 0);
@@ -337,22 +338,24 @@ popupnotificationcontent {
   -moz-image-region: rect(0, 48px, 16px, 32px);
 }
 
-%ifdef XP_WIN
-@media (-moz-windows-theme: luna-blue) {
-  .close-icon {
-    list-style-image: url("chrome://global/skin/icons/close-lunaBlue.png");
-  }
+.close-icon > .button-icon,
+.close-icon > .button-box > .button-icon,
+.close-icon > .toolbarbutton-icon {
+  width: 16px;
 }
 
-@media (-moz-windows-theme: luna-olive) {
+@media (min-resolution: 1.1dppx) {
   .close-icon {
-    list-style-image: url("chrome://global/skin/icons/close-lunaOlive.png");
+    list-style-image: url("chrome://global/skin/icons/close@2x.png");
+    -moz-image-region: rect(0, 32px, 32px, 0);
   }
-}
 
-@media (-moz-windows-theme: luna-silver) {
-  .close-icon {
-    list-style-image: url("chrome://global/skin/icons/close-lunaSilver.png");
+  .close-icon:hover {
+    -moz-image-region: rect(0, 64px, 32px, 32px);
+  }
+
+  .close-icon:hover:active {
+    -moz-image-region: rect(0, 96px, 32px, 64px);
   }
 }
 %endif

toolkit/themes/windows/global/jar.mn

@@ -101,9 +101,7 @@ toolkit.jar:
         skin/classic/global/icons/blacklist_large.png            (icons/blacklist_large.png)
         skin/classic/global/icons/Close.gif                      (icons/Close.gif)
         skin/classic/global/icons/close.png                      (icons/close.png)
-        skin/classic/global/icons/close-lunaBlue.png             (icons/close-lunaBlue.png)
-        skin/classic/global/icons/close-lunaOlive.png            (icons/close-lunaOlive.png)
-        skin/classic/global/icons/close-lunaSilver.png           (icons/close-lunaSilver.png)
+        skin/classic/global/icons/close@2x.png                   (icons/close@2x.png)
         skin/classic/global/icons/collapse.png                   (icons/collapse.png)
         skin/classic/global/icons/Error.png                      (icons/Error.png)
         skin/classic/global/icons/error-16.png                   (icons/error-16.png)