Bug 1232108 - Override toolkit's close.png to close.svg. r=aleth

im/themes/blist.css

@@ -182,18 +182,9 @@ contact[droptarget] > buddy[dummy] {
   -moz-appearance: none;
 }
 
-%ifdef XP_UNIX
-%ifndef XP_MACOSX
-%define UNIX_BUT_NOT_MAC
-%endif
-%endif
-
 .hideGroupButton {
   -moz-margin-end: 0;
   -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
@@ -206,7 +197,6 @@ contact[droptarget] > buddy[dummy] {
 }
 .hideGroupButton:hover:active {
   -moz-image-region: rect(0, 48px, 16px, 32px);
-%endif
 }
 
 .startChatBubble {
@@ -498,10 +488,6 @@ group[closed] .twisty {
   -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
-#userIconPanelImageRemove > .toolbarbutton-icon {
-  max-width: 16px;
-}
-
 #userIconPanelImageRemove:hover:not([disabled="true"]) {
   -moz-image-region: rect(0, 32px, 16px, 16px);
 }
@@ -510,6 +496,10 @@ group[closed] .twisty {
   -moz-image-region: rect(0, 48px, 16px, 32px);
 }
 
+#userIconPanelImageRemove > .toolbarbutton-icon {
+  max-width: 16px;
+}
+
 .userIconPanelButton {
   -moz-appearance: none;
   -moz-user-focus: normal;

im/themes/jar.mn

@@ -343,6 +343,10 @@ instantbird.jar:
 	skin/classic/instantbird/messages/simple/Variants/Normal.css   (messages/simple/Variants/Normal.css)
 	skin/classic/instantbird/messages/simple/Variants/Dark.css     (messages/simple/Variants/Dark.css)
 
+#ifdef XP_UNIX
 #ifdef XP_MACOSX
 % override chrome://instantbird/skin/tabbrowser/alltabs-box-bkgnd-icon.png     chrome://instantbird/skin/lion/tabbrowser/alltabs-box-bkgnd-icon.png        os=Darwin osversion>=10.7
+#else
+% override chrome://global/skin/icons/close.png  chrome://global/skin/icons/close.svg
+#endif
 #endif

mail/components/im/themes/chat.css

@@ -109,9 +109,6 @@ imcontact[aliasing] .contactDisplayName {
 .closeConversationButton {
   -moz-margin-end: 0;
   -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
@@ -124,7 +121,6 @@ imcontact[aliasing] .contactDisplayName {
 }
 .closeConversationButton:hover:active {
   -moz-image-region: rect(0, 48px, 16px, 32px);
-%endif
 }
 
 

mail/themes/linux/jar.mn

@@ -265,3 +265,4 @@ classic.jar:
   skin/classic/messenger/shared/tabmail.css                   (../shared/mail/tabmail.css)
   skin/classic/messenger/shared/accountProvisioner.css         (../shared/mail/accountProvisioner.css)
   skin/classic/messenger/shared/addressbook.css               (../shared/mail/addressbook.css)
+% override chrome://global/skin/icons/close.png               chrome://global/skin/icons/close.svg