Bug 1495112 - Reference only one PNG file for the status icons in chat. r=jorgk DONTBUILD
authorRichard Marti <richard.marti@gmail.com>
Sat, 29 Sep 2018 10:58:45 +0200
changeset 33271 f1d5e317265924cd927819b3eb5b2a27b57b0cd1
parent 33270 759a21c4e0f95f324a865735ca7d1a84039cba53
child 33272 ae62e27f1265371d93dd0707edcaa6fa4ae1fedb
push id387
push userclokep@gmail.com
push dateMon, 10 Dec 2018 21:30:47 +0000
reviewersjorgk
bugs1495112
Bug 1495112 - Reference only one PNG file for the status icons in chat. r=jorgk DONTBUILD
chat/themes/available-16.png
chat/themes/away-16.png
chat/themes/idle-16.png
chat/themes/imtooltip.css
chat/themes/jar.mn
chat/themes/offline-16.png
chat/themes/status.css
mail/components/im/themes/chat.css
mail/components/im/themes/imAccounts.css
mail/themes/linux/jar.mn
mail/themes/linux/mail/chat.css
mail/themes/linux/mail/icons/status@2x.png
mail/themes/osx/mail/chat.css
mail/themes/windows/jar.mn
mail/themes/windows/mail/chat.css
mail/themes/windows/mail/icons/status@2x.png
deleted file mode 100644
index bcca43a9178551ed4eeb6031dba441f03a85a9f9..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index efda0de255f50f5fcac04e93d6f79630256df24d..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index a0ec6a18d115075496cfe38bb5562de5f239b42a..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/chat/themes/imtooltip.css
+++ b/chat/themes/imtooltip.css
@@ -1,39 +1,21 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-@import url("chrome://chat/skin/status.css");
-
 .displayNameMessageBox {
   margin-left: 4px;
   margin-top: 2px;
 }
 
-.statusTypeIcon {
-  margin: 32px 0 0;
-  max-width: 16px;
-  max-height: 16px;
-  min-width: 16px;
-  min-height: 16px;
-  width: 16px;
-  height: 16px;
-  background-color: transparent;
-  border: none;
-}
-
 .statusTypeIcon[left][status="chat"] {
   list-style-image: url('chrome://chat/skin/chat-left-16.png') !important;
 }
 
-.userIconHolder[userIcon] + .statusTypeIcon {
-  margin-left: 32px;
-}
-
 .tooltipBuddies {
   margin-left: -3px;
   --blist-item-height: 20px; /* 16px icon plus padding */
 }
 
 .tooltipDisplayName {
   border-bottom: 1px solid rgba(0, 0, 0, 0.25);
   font-size: 16px;
@@ -64,29 +46,11 @@
 .tooltipRows label {
   margin-left: 0 !important;
 }
 
 .tooltipSeparator {
   margin-left: 3px;
 }
 
-.userIconHolder {
-  border: 2px solid rgba(0, 0, 0, 0.15);
-  border-radius: 5px;
-  overflow: hidden;
-}
-
-.userIcon,
-.userIconHolder {
-  max-width: 48px;
-  max-height: 48px;
-  min-width: 48px;
-  min-height: 48px;
-  width: 48px;
-  height: 48px;
-}
-
-.userIcon:not([src]),
-.statusTypeIcon:not([status]),
-.userIconHolder:not([userIcon]) {
+.statusTypeIcon:not([status]) {
   display: none;
 }
--- a/chat/themes/jar.mn
+++ b/chat/themes/jar.mn
@@ -1,23 +1,19 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 chat.jar:
 % skin chat classic/1.0 %skin/classic/chat/
-	skin/classic/chat/available-16.png
 	skin/classic/chat/available.png
-	skin/classic/chat/away-16.png
 	skin/classic/chat/away.png
-	skin/classic/chat/idle-16.png
 	skin/classic/chat/idle.png
 	skin/classic/chat/mobile-16.png
 	skin/classic/chat/mobile.png
-	skin/classic/chat/offline-16.png
 	skin/classic/chat/offline.png
 	skin/classic/chat/typing-16.png
 	skin/classic/chat/typed-16.png
 	skin/classic/chat/unknown.png
 	skin/classic/chat/unknown-16.png
 	skin/classic/chat/chat-16.png
 	skin/classic/chat/chat-left-16.png
 	skin/classic/chat/conv.css
deleted file mode 100644
index 5d862c470280ea2b1a52b65cc1d12af8e641465d..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/chat/themes/status.css
+++ b/chat/themes/status.css
@@ -32,34 +32,16 @@
 .statusTypeIcon[status="unknown"] {
   list-style-image: url('chrome://chat/skin/unknown-16.png');
 }
 
 .statusTypeIcon[status="chat"] {
   list-style-image: url('chrome://chat/skin/chat-16.png');
 }
 
-.statusTypeIcon[status="available"] {
-  list-style-image: url('chrome://chat/skin/available-16.png');
-}
-
-.statusTypeIcon[status="unavailable"],
-.statusTypeIcon[status="away"] {
-  list-style-image: url('chrome://chat/skin/away-16.png');
-}
-
-.statusTypeIcon[status="offline"],
-.statusTypeIcon[status="invisible"] {
-  list-style-image: url('chrome://chat/skin/offline-16.png');
-}
-
-.statusTypeIcon[status="idle"] {
-  list-style-image: url('chrome://chat/skin/idle-16.png');
-}
-
 .statusTypeIcon[status="mobile"] {
   list-style-image: url('chrome://chat/skin/mobile-16.png');
 }
 
 .protoIcon[status="offline"],
 .protoIcon[status="joining"],
 .protoIcon[status="unknown"] {
   opacity: 0.3;
--- a/mail/components/im/themes/chat.css
+++ b/mail/components/im/themes/chat.css
@@ -309,50 +309,144 @@ imcontact[aliasing] .contactDisplayName 
   border-radius: 5px;
   overflow: hidden;
 }
 
 .userIcon,
 .userIconHolder {
   max-width: 48px;
   max-height: 48px;
+  min-width: 48px;
+  min-height: 48px;
   width: 48px;
   height: 48px;
 }
 
 .userIcon:not([src]),
 .userIconHolder:not([userIcon]) {
   display: none;
 }
 
 .userIcon[src=""] {
   background-image: url("chrome://messenger/skin/userIcon.png");
   background-size: contain;
   background-repeat: no-repeat;
 }
 
 .statusTypeIcon {
-  margin: 0 0;
+  margin: 32px 0 0;
   width: 16px;
   height: 16px;
+  max-width: 16px;
+  max-height: 16px;
   min-height: 16px;
   min-width: 16px;
   -moz-appearance: none;
   background-color: transparent;
   border: none;
 }
 
+.userIconHolder[userIcon] + .statusTypeIcon {
+  margin-inline-start: 32px;
+}
+
 .statusTypeIcon[typing] {
   list-style-image: url('chrome://chat/skin/typing-16.png');
 }
 
 .statusTypeIcon[typed] {
   list-style-image: url('chrome://chat/skin/typed-16.png');
 }
 
+#statusTypeIcon[status="available"],
+#statusTypeAvailable,
+.statusTypeIcon[status="available"],
+#imStatusAvailable,
+#appmenu_imStatusAvailable,
+richlistitem[state="connected"] .accountStateIcon {
+  list-style-image: url("chrome://messenger/skin/icons/status.png");
+  -moz-image-region: rect(0 16px 16px 0);
+}
+
+#statusTypeIcon[status="idle"],
+.statusTypeIcon[status="idle"] {
+  list-style-image: url("chrome://messenger/skin/icons/status.png");
+  -moz-image-region: rect(0 32px 16px 16px);
+}
+
+#statusTypeIcon[status="offline"],
+#statusTypeIcon[status="invisible"],
+#statusTypeOffline,
+.statusTypeIcon[status="offline"],
+.statusTypeIcon[status="invisible"],
+#imStatusOffline,
+#appmenu_imStatusOffline,
+richlistitem[state="disconnected"] .accountStateIcon {
+  list-style-image: url("chrome://messenger/skin/icons/status.png");
+  -moz-image-region: rect(0 48px 16px 32px);
+}
+
+#statusTypeIcon[status="unavailable"],
+#statusTypeIcon[status="away"],
+#statusTypeUnavailable,
+.statusTypeIcon[status="unavailable"],
+.statusTypeIcon[status="away"],
+#imStatusUnavailable,
+#appmenu_imStatusUnavailable {
+  list-style-image: url("chrome://messenger/skin/icons/status.png");
+  -moz-image-region: rect(0 64px 16px 48px);
+}
+
+@media (min-resolution: 1.1dppx) {
+  #statusTypeIcon[status="available"],
+  #statusTypeAvailable,
+  .statusTypeIcon[status="available"],
+  #imStatusAvailable,
+  #appmenu_imStatusAvailable,
+  richlistitem[state="connected"] .accountStateIcon {
+    list-style-image: url("chrome://messenger/skin/icons/status@2x.png");
+    -moz-image-region: rect(0 32px 32px 0);
+  }
+
+  #statusTypeIcon[status="idle"],
+  .statusTypeIcon[status="idle"] {
+    list-style-image: url("chrome://messenger/skin/icons/status@2x.png");
+    -moz-image-region: rect(0 64px 32px 32px);
+  }
+
+  #statusTypeIcon[status="offline"],
+  #statusTypeIcon[status="invisible"],
+  #statusTypeOffline,
+  .statusTypeIcon[status="offline"],
+  .statusTypeIcon[status="invisible"],
+  #imStatusOffline,
+  #appmenu_imStatusOffline,
+  richlistitem[state="disconnected"] .accountStateIcon {
+    list-style-image: url("chrome://messenger/skin/icons/status@2x.png");
+    -moz-image-region: rect(0 96px 32px 64px);
+  }
+
+  #statusTypeIcon[status="unavailable"],
+  #statusTypeIcon[status="away"],
+  #statusTypeUnavailable,
+  .statusTypeIcon[status="unavailable"],
+  .statusTypeIcon[status="away"],
+  #imStatusUnavailable,
+  #appmenu_imStatusUnavailable {
+    list-style-image: url("chrome://messenger/skin/icons/status@2x.png");
+    -moz-image-region: rect(0 128px 32px 96px);
+  }
+
+  .prplIcon,
+  #statusTypeIcon .button-icon {
+    width: 16px;
+    height: 16px;
+  }
+}
+
 .statusMessage {
   margin: 0 0 !important;
 %ifdef XP_MACOSX
   min-height: 16px;
 %endif
 }
 
 .statusMessage[noTopic]:not([editing]),
@@ -406,25 +500,20 @@ imcontact[aliasing] .contactDisplayName 
 .displayName {
   font-size: 16px;
   border-bottom: 1px solid rgba(0,0,0,0.25);
   margin: 0 0 16px !important;
   padding-right: 20px;
 }
 
 .prplIcon {
-  margin: 0 1px 16px -16px !important;
-}
-
-.statusTypeIcon {
-  margin: 32px 0 0;
-}
-
-.userIconHolder[userIcon] + .statusTypeIcon {
-  margin-left: 32px;
+  margin-top: 0 !important;
+  margin-inline-end: 1px !important;
+  margin-bottom: 16px -16px !important;
+  margin-inline-start: -16px !important;
 }
 
 .conv-messages {
   min-width: 150px;
 %ifndef XP_MACOSX
 %ifndef XP_WIN
   border-bottom: solid 1px GrayText;
 %else
--- a/mail/components/im/themes/imAccounts.css
+++ b/mail/components/im/themes/imAccounts.css
@@ -143,22 +143,16 @@ richlistitem[dragover="up"] {
 
 .accountStateIcon {
   margin-inline-start: 16px;
   margin-top: 16px;
   width: 16px;
   height: 16px;
 }
 
-richlistitem[state="connected"] .accountStateIcon {
-  list-style-image: url("chrome://chat/skin/available-16.png");
-}
-richlistitem[state="disconnected"] .accountStateIcon {
-  list-style-image: url("chrome://chat/skin/offline-16.png");
-}
 richlistitem[state="connecting"] .accountStateIcon {
   list-style-image: url("chrome://global/skin/icons/loading.png");
 }
 richlistitem[error="true"] .accountStateIcon {
   list-style-image: url("chrome://global/skin/icons/warning.svg");
 }
 
 
@@ -220,29 +214,8 @@ richlistitem[error="true"] .accountState
 }
 
 %ifdef XP_WIN
 #statusTypeIcon .button-box {
   padding: 0 0;
   border: none;
 }
 %endif
-
-#statusTypeIcon[status="available"],
-#statusTypeAvailable {
-  list-style-image: url('chrome://chat/skin/available-16.png');
-}
-
-#statusTypeIcon[status="unavailable"],
-#statusTypeIcon[status="away"],
-#statusTypeUnavailable {
-  list-style-image: url('chrome://chat/skin/away-16.png');
-}
-
-#statusTypeIcon[status="offline"],
-#statusTypeIcon[status="invisible"],
-#statusTypeOffline {
-  list-style-image: url('chrome://chat/skin/offline-16.png');
-}
-
-#statusTypeIcon[status="idle"] {
-  list-style-image: url('chrome://chat/skin/idle-16.png');
-}
--- a/mail/themes/linux/jar.mn
+++ b/mail/themes/linux/jar.mn
@@ -149,16 +149,17 @@ classic.jar:
   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)
   skin/classic/messenger/icons/dropmarker.svg                 (mail/icons/dropmarker.svg)
   skin/classic/messenger/icons/dragIndicator.png              (mail/icons/dragIndicator.png)
   skin/classic/messenger/icons/status.png                     (mail/icons/status.png)
+  skin/classic/messenger/icons/status@2x.png                  (mail/icons/status@2x.png)
   skin/classic/messenger/icons/status-small.png               (mail/icons/status-small.png)
   skin/classic/messenger/accountcentral/read-messages.png     (mail/accountcentral/read-messages.png)
   skin/classic/messenger/accountcentral/write-message.png     (mail/accountcentral/write-message.png)
   skin/classic/messenger/accountcentral/create-account.png    (mail/accountcentral/create-account.png)
   skin/classic/messenger/accountcentral/account-settings.png  (mail/accountcentral/account-settings.png)
   skin/classic/messenger/accountcentral/search-messages.png   (mail/accountcentral/search-messages.png)
   skin/classic/messenger/accountcentral/manage-filters.png    (mail/accountcentral/manage-filters.png)
   skin/classic/messenger/accountcentral/offline-settings.png  (mail/accountcentral/offline-settings.png)
--- a/mail/themes/linux/mail/chat.css
+++ b/mail/themes/linux/mail/chat.css
@@ -85,55 +85,16 @@
 .closeConversationButton > .button-box > .button-icon {
   margin-inline-end: 0;
 }
 
 .conv-hbox {
   -moz-box-align: center;
 }
 
-#statusTypeIcon[status="available"],
-#statusTypeAvailable,
-.statusTypeIcon[status="available"],
-#imStatusAvailable,
-#appmenu_imStatusAvailable,
-richlistitem[state="connected"] .accountStateIcon {
-  list-style-image: url("chrome://messenger/skin/icons/status.png");
-  -moz-image-region: rect(0px 16px 16px 0px);
-}
-
-#statusTypeIcon[status="idle"],
-.statusTypeIcon[status="idle"] {
-  list-style-image: url("chrome://messenger/skin/icons/status.png");
-  -moz-image-region: rect(0px 32px 16px 16px);
-}
-
-#statusTypeIcon[status="offline"],
-#statusTypeIcon[status="invisible"],
-#statusTypeOffline,
-.statusTypeIcon[status="offline"],
-.statusTypeIcon[status="invisible"],
-#imStatusOffline,
-#appmenu_imStatusOffline,
-richlistitem[state="disconnected"] .accountStateIcon {
-  list-style-image: url("chrome://messenger/skin/icons/status.png");
-  -moz-image-region: rect(0px 48px 16px 32px);
-}
-
-#statusTypeIcon[status="unavailable"],
-#statusTypeIcon[status="away"],
-#statusTypeUnavailable,
-.statusTypeIcon[status="unavailable"],
-.statusTypeIcon[status="away"],
-#imStatusUnavailable,
-#appmenu_imStatusUnavailable {
-  list-style-image: url("chrome://messenger/skin/icons/status.png");
-  -moz-image-region: rect(0px 64px 16px 48px);
-}
-
 #displayNameAndstatusMessageStack #statusMessage {
   margin: 32px 0 0;
 }
 
 #displayNameAndstatusMessageStack #statusMessage[editing] {
   margin: 30px -2px -2px -4px;
 }
 
copy from mail/themes/osx/mail/icons/status@2x.png
copy to mail/themes/linux/mail/icons/status@2x.png
--- a/mail/themes/osx/mail/chat.css
+++ b/mail/themes/osx/mail/chat.css
@@ -132,102 +132,16 @@
   -moz-appearance: none !important;
 }
 
 /* Set a background color to avoid lightweight theme backgrounds */
 #contextPane {
   background-color: #fff;
 }
 
-#statusTypeIcon[status="available"],
-#statusTypeAvailable,
-.statusTypeIcon[status="available"],
-#imStatusAvailable,
-#appmenu_imStatusAvailable,
-richlistitem[state="connected"] .accountStateIcon {
-  list-style-image: url("chrome://messenger/skin/icons/status.png");
-  -moz-image-region: rect(0px 16px 16px 0px);
-}
-
-#statusTypeIcon[status="idle"],
-.statusTypeIcon[status="idle"] {
-  list-style-image: url("chrome://messenger/skin/icons/status.png");
-  -moz-image-region: rect(0px 32px 16px 16px);
-}
-
-#statusTypeIcon[status="offline"],
-#statusTypeIcon[status="invisible"],
-#statusTypeOffline,
-.statusTypeIcon[status="offline"],
-.statusTypeIcon[status="invisible"],
-#imStatusOffline,
-#appmenu_imStatusOffline,
-richlistitem[state="disconnected"] .accountStateIcon {
-  list-style-image: url("chrome://messenger/skin/icons/status.png");
-  -moz-image-region: rect(0px 48px 16px 32px);
-}
-
-#statusTypeIcon[status="unavailable"],
-#statusTypeIcon[status="away"],
-#statusTypeUnavailable,
-.statusTypeIcon[status="unavailable"],
-.statusTypeIcon[status="away"],
-#imStatusUnavailable,
-#appmenu_imStatusUnavailable {
-  list-style-image: url("chrome://messenger/skin/icons/status.png");
-  -moz-image-region: rect(0px 64px 16px 48px);
-}
-
-@media (min-resolution: 2dppx) {
-  #statusTypeIcon[status="available"],
-  #statusTypeAvailable,
-  .statusTypeIcon[status="available"],
-  #imStatusAvailable,
-  #appmenu_imStatusAvailable,
-  richlistitem[state="connected"] .accountStateIcon {
-    list-style-image: url("chrome://messenger/skin/icons/status@2x.png");
-    -moz-image-region: rect(0px 32px 32px 0px);
-  }
-
-  #statusTypeIcon[status="idle"],
-  .statusTypeIcon[status="idle"] {
-    list-style-image: url("chrome://messenger/skin/icons/status@2x.png");
-    -moz-image-region: rect(0px 64px 32px 32px);
-  }
-
-  #statusTypeIcon[status="offline"],
-  #statusTypeIcon[status="invisible"],
-  #statusTypeOffline,
-  .statusTypeIcon[status="offline"],
-  .statusTypeIcon[status="invisible"],
-  #imStatusOffline,
-  #appmenu_imStatusOffline,
-  richlistitem[state="disconnected"] .accountStateIcon {
-    list-style-image: url("chrome://messenger/skin/icons/status@2x.png");
-    -moz-image-region: rect(0px 96px 32px 64px);
-  }
-
-  #statusTypeIcon[status="unavailable"],
-  #statusTypeIcon[status="away"],
-  #statusTypeUnavailable,
-  .statusTypeIcon[status="unavailable"],
-  .statusTypeIcon[status="away"],
-  #imStatusUnavailable,
-  #appmenu_imStatusUnavailable {
-    list-style-image: url("chrome://messenger/skin/icons/status@2x.png");
-    -moz-image-region: rect(0px 128px 32px 96px);
-  }
-
-  .prplIcon,
-  #statusTypeIcon .button-icon {
-    width: 16px;
-    height: 16px;
-  }
-}
-
 #displayNameAndstatusMessageStack #statusMessage {
   margin: 32px 0 0;
   min-height: 16px;
 }
 
 #displayNameAndstatusMessageStack #statusMessage[editing] {
   margin: 29px 2px 0 -4px;
 }
--- a/mail/themes/windows/jar.mn
+++ b/mail/themes/windows/jar.mn
@@ -164,16 +164,17 @@ classic.jar:
   skin/classic/messenger/window-controls/minimize-highcontrast.svg (mail/window-controls/minimize-highcontrast.svg)
   skin/classic/messenger/window-controls/minimize-themes.svg       (mail/window-controls/minimize-themes.svg)
   skin/classic/messenger/window-controls/restore.svg               (mail/window-controls/restore.svg)
   skin/classic/messenger/window-controls/restore-highcontrast.svg  (mail/window-controls/restore-highcontrast.svg)
   skin/classic/messenger/window-controls/restore-themes.svg        (mail/window-controls/restore-themes.svg)
   skin/classic/messenger/icons/connecting.png                 (mail/icons/connecting.png)
   skin/classic/messenger/icons/notloading.png                 (mail/icons/notloading.png)
   skin/classic/messenger/icons/status.png                     (mail/icons/status.png)
+  skin/classic/messenger/icons/status@2x.png                  (mail/icons/status@2x.png)
   skin/classic/messenger/icons/status-small.png               (mail/icons/status-small.png)
   skin/classic/messenger/accountcentral/read-messages.png     (mail/accountcentral/read-messages.png)
   skin/classic/messenger/accountcentral/write-message.png     (mail/accountcentral/write-message.png)
   skin/classic/messenger/accountcentral/create-account.png    (mail/accountcentral/create-account.png)
   skin/classic/messenger/accountcentral/junk.png              (mail/accountcentral/junk.png)
   skin/classic/messenger/accountcentral/account-settings.png  (mail/accountcentral/account-settings.png)
   skin/classic/messenger/accountcentral/search-messages.png   (mail/accountcentral/search-messages.png)
   skin/classic/messenger/accountcentral/manage-filters.png    (mail/accountcentral/manage-filters.png)
--- a/mail/themes/windows/mail/chat.css
+++ b/mail/themes/windows/mail/chat.css
@@ -178,55 +178,16 @@
   }
 
   richlistitem[selected] > label,
   #nicklist:focus > richlistitem[inactive][selected] > label {
     color: -moz-dialogtext !important;
   }
 }
 
-#statusTypeIcon[status="available"],
-#statusTypeAvailable,
-.statusTypeIcon[status="available"],
-#imStatusAvailable,
-#appmenu_imStatusAvailable,
-richlistitem[state="connected"] .accountStateIcon {
-  list-style-image: url("chrome://messenger/skin/icons/status.png");
-  -moz-image-region: rect(0 16px 16px 0);
-}
-
-#statusTypeIcon[status="idle"],
-.statusTypeIcon[status="idle"] {
-  list-style-image: url("chrome://messenger/skin/icons/status.png");
-  -moz-image-region: rect(0 32px 16px 16px);
-}
-
-#statusTypeIcon[status="offline"],
-#statusTypeIcon[status="invisible"],
-#statusTypeOffline,
-.statusTypeIcon[status="offline"],
-.statusTypeIcon[status="invisible"],
-#imStatusOffline,
-#appmenu_imStatusOffline,
-richlistitem[state="disconnected"] .accountStateIcon {
-  list-style-image: url("chrome://messenger/skin/icons/status.png");
-  -moz-image-region: rect(0 48px 16px 32px);
-}
-
-#statusTypeIcon[status="unavailable"],
-#statusTypeIcon[status="away"],
-#statusTypeUnavailable,
-.statusTypeIcon[status="unavailable"],
-.statusTypeIcon[status="away"],
-#imStatusUnavailable,
-#appmenu_imStatusUnavailable {
-  list-style-image: url("chrome://messenger/skin/icons/status.png");
-  -moz-image-region: rect(0 64px 16px 48px);
-}
-
 @media (-moz-os-version: windows-win7) and (-moz-windows-default-theme) {
   :root:not([lwt-tree]) #listPaneBox {
     background-color: rgb(238, 243, 250);
   }
 
   #conversationsDeck {
     background-color: rgb(233, 239, 245);
   }
copy from mail/themes/osx/mail/icons/status@2x.png
copy to mail/themes/windows/mail/icons/status@2x.png