Bug 1192999 - Use close-XPVista7.png on Windows. r=clokep

im/themes/blist.css

@@ -193,8 +193,12 @@ contact[droptarget] > buddy[dummy] {
   -moz-stack-sizing: ignore;
 %ifdef UNIX_BUT_NOT_MAC
   list-style-image: url("moz-icon://stock/gtk-close?size=menu");
+%else
+%ifdef XP_WIN
+  list-style-image: url("chrome://global/skin/icons/close-XPVista7.png");
 %else
   list-style-image: url("chrome://global/skin/icons/close.png");
+%endif
   -moz-image-region: rect(0, 16px, 16px, 0);
 }
 .hideGroupButton:hover {
@@ -486,7 +490,11 @@ group[closed] .twisty {
   padding: 0;
   background: radial-gradient(circle, rgba(255, 255, 255, 0.25) 25%, transparent 100%);
   border: none;
+%ifdef XP_WIN
+  list-style-image: url("chrome://global/skin/icons/close-XPVista7.png");
+%else
   list-style-image: url("chrome://global/skin/icons/close.png");
+%endif
   -moz-image-region: rect(0, 16px, 16px, 0);
 }
 

im/themes/tabbrowser-winstripe/tabbrowser.css

@@ -182,7 +182,7 @@ toolbarbutton > .toolbarbutton-icon {
   -moz-image-region: rect(0, 64px, 16px, 48px);
   border: none;
   padding: 0px;
-  list-style-image: url("chrome://global/skin/icons/close.png");
+  list-style-image: url("chrome://global/skin/icons/close-XPVista7.png");
 }
 
 .tab-close-button:-moz-system-metric(touch-enabled) {
@@ -316,7 +316,7 @@ toolbarbutton > .toolbarbutton-icon {
 /* Tabstrip close button */
 .tabs-closebutton {
   -moz-appearance: none;
-  list-style-image: url("chrome://global/skin/icons/close.png");
+  list-style-image: url("chrome://global/skin/icons/close-XPVista7.png");
   -moz-image-region: rect(0, 16px, 16px, 0);
   padding: 4px 2px;
   margin: 0px;

mail/components/im/themes/chat.css

@@ -111,8 +111,12 @@ imcontact[aliasing] .contactDisplayName {
   -moz-stack-sizing: ignore;
 %ifdef UNIX_BUT_NOT_MAC
   list-style-image: url("moz-icon://stock/gtk-close?size=menu");
+%else
+%ifdef XP_WIN
+  list-style-image: url("chrome://global/skin/icons/close-XPVista7.png");
 %else
   list-style-image: url("chrome://global/skin/icons/close.png");
+%endif
   -moz-image-region: rect(0, 16px, 16px, 0);
 }
 .closeConversationButton:hover {

mail/themes/windows/mail/chat.css

@@ -524,13 +524,6 @@
   }
 }
 
-@media (-moz-os-version: windows-win8),
-       (-moz-os-version: windows-win10) {
-  .closeConversationButton {
-    list-style-image: url("chrome://global/skin/icons/close-XPVista7.png");
-  }
-}
-
 @media (-moz-windows-default-theme) and (-moz-os-version: windows-win8),
        (-moz-windows-default-theme) and (-moz-os-version: windows-win10) {
   .statusMessageToolbarItem {