--- a/mail/themes/linux/jar.mn
+++ b/mail/themes/linux/jar.mn
@@ -166,17 +166,16 @@ classic.jar:
   skin/classic/messenger/icons/message-ignored.png            (mail/icons/message-ignored.png)
   skin/classic/messenger/icons/thread-watched.png             (mail/icons/thread-watched.png)
   skin/classic/messenger/icons/flag-col.png                   (mail/icons/flag-col.png)
   skin/classic/messenger/icons/flag-col.svg                   (mail/icons/flag-col.svg)
   skin/classic/messenger/icons/server.png                     (mail/icons/server.png)
   skin/classic/messenger/icons/readcol.svg                    (mail/icons/readcol.svg)
   skin/classic/messenger/icons/search-arrow.png               (mail/icons/search-arrow.png)
   skin/classic/messenger/icons/close-button.png               (mail/icons/close-button.png)
-  skin/classic/messenger/icons/close-inverted.png             (mail/icons/close-inverted.png)
   skin/classic/messenger/icons/remote-blocked.png             (mail/icons/remote-blocked.png)
   skin/classic/messenger/icons/phishing.png                   (mail/icons/phishing.png)
   skin/classic/messenger/icons/junk.png                       (mail/icons/junk.png)
   skin/classic/messenger/icons/check.gif                      (mail/icons/check.gif)
   skin/classic/messenger/icons/notchecked.gif                 (mail/icons/notchecked.gif)
   skin/classic/messenger/icons/online.png                     (mail/icons/online.png)
   skin/classic/messenger/icons/offline.png                    (mail/icons/offline.png)
   skin/classic/messenger/icons/row.png                        (mail/icons/row.png)

deleted file mode 100644
index 64f5c1a70e935b2f340cb5cad63d12c36c26dd29..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001

--- a/mail/themes/linux/mail/messenger.css
+++ b/mail/themes/linux/mail/messenger.css
@@ -344,20 +344,11 @@ statusbarpanel {
 }
 
 treechildren::-moz-tree-cell-text {
   -moz-padding-start: 5px;
 }
 
 /* ::::: Notifications ::::: */
 
-notification[value="addon-install-failed"] .messageCloseButton {
-  -moz-appearance: none;
-  -moz-image-region: rect(0, 16px, 16px, 0);
+notification[type="critical"] .messageCloseButton:not(:hover):not(:active) {
+  background-image: -moz-image-rect(url("chrome://global/skin/icons/close.svg"), 0, 64, 16, 48);
 }
-
-notification[value="addon-install-failed"] .messageCloseButton:hover {
-  -moz-image-region: rect(0, 32px, 16px, 16px);
-}
-
-notification[value="addon-install-failed"] .messageCloseButton:hover:active {
-  -moz-image-region: rect(0, 48px, 16px, 32px);
-}

--- a/mail/themes/osx/mail/messenger.css
+++ b/mail/themes/osx/mail/messenger.css
@@ -147,19 +147,23 @@ notification[value="addon-install-comple
   box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2),
               0 1px rgba(255, 255, 255, 0.25);
   background-color: transparent;
   background-image: linear-gradient(rgba(45, 54, 71, 0.3),
                                     rgba(45, 54, 71, 0.1));
   border-color: rgba(60, 73, 97, 0.7);
 }
 
+notification[type="critical"] .messageCloseButton:not(:hover) {
+  -moz-image-region: rect(0, 64px, 16px, 48px);
+}
+
 @media (min-resolution: 2dppx) {
-  notification[value="addon-install-failed"] .messageCloseButton {
-    list-style-image: url("chrome://messenger/skin/icons/close-inverted@2x.png");
+  notification[type="critical"] .messageCloseButton:not(:hover) {
+    -moz-image-region: rect(0, 128px, 32px, 96px);
   }
 }
 
 /* ::::: Tabs in Titlebar :::::: */
 
 #messengerWindow[tabsintitlebar="true"]:not(:-moz-lwtheme) > #titlebar {
   -moz-appearance: -moz-window-titlebar;
 }

--- a/mail/themes/shared/mail/messenger.css
+++ b/mail/themes/shared/mail/messenger.css
@@ -69,20 +69,16 @@ notification[value="addon-install-failed
 }
 
 notification[value="addon-install-blocked"] .notification-inner,
 notification[value="addon-install-failed"] .notification-inner,
 notification[value="addon-install-complete"] .notification-inner {
   border: none;
 }
 
-notification[value="addon-install-failed"] .messageCloseButton {
-  list-style-image: url("chrome://messenger/skin/icons/close-inverted.png");
-}
-
 /* ::::: searchTermOverlay ::::: */
 
 #searchTermList > listitem[highlight = "true"] {
   animation: highlight .4s ease-in;
 }
 
 @keyframes highlight {
   from { background-color: Highlight; }

--- a/mail/themes/windows/mail/messenger.css
+++ b/mail/themes/windows/mail/messenger.css
@@ -152,22 +152,18 @@ treechildren::-moz-tree-cell-text {
 @media not all and (-moz-windows-default-theme) {
   treechildren::-moz-tree-cell-text {
     -moz-padding-start: 4px !important;
   }
 }
 
 /* ::::: Notifications ::::: */
 
-notification[value="addon-install-failed"] .messageCloseButton {
-  list-style-image: url("chrome://messenger/skin/icons/closeTab.png");
-}
-
-notification[type="critical"] .messageCloseButton:not(:hover):not(:active) {
-  -moz-image-region: rect(0, 64px, 16px, 48px);
+notification[type="critical"] .messageCloseButton {
+  list-style-image: url("chrome://global/skin/icons/close-inverted.png");
 }
 
 menulist.folderMenuItem > .menulist-label-box > .menulist-label {
   -moz-margin-start: 2px !important;
 }
 
 button[type="menu-button"] > button {
   margin: -3px;