Bug #345887 --> visual theme refresh for qute courtesty of Arvid Axelsson.

Enjoy!

mail/base/content/messenger.xul

@@ -332,6 +332,10 @@
                         class="treecol-image attachmentColumnHeader"
                         display="&attachmentColumn.label;" tooltiptext="&attachmentColumn.tooltip;"/>
                <splitter class="tree-splitter"/>
+               <treecol id="flaggedCol" persist="hidden ordinal" fixed="true" cycler="true"
+                        class="treecol-image flagColumnHeader"
+                        display="&starredColumn.label;" tooltiptext="&starredColumn.tooltip;"/>
+               <splitter class="tree-splitter"/>                
                <treecol id="subjectCol" persist="hidden ordinal width" flex="7" ignoreincolumnpicker="true"
                         label="&subjectColumn.label;" tooltiptext="&subjectColumn.tooltip;"/>
                <splitter class="tree-splitter"/>
@@ -360,10 +364,6 @@
                <treecol id="sizeCol" persist="hidden ordinal width" flex="1" hidden="true"
                         label="&sizeColumn.label;" tooltiptext="&sizeColumn.tooltip;"/>
                <splitter class="tree-splitter"/>
-               <treecol id="flaggedCol" persist="hidden ordinal" fixed="true" cycler="true" hidden="true"
-                        class="treecol-image flagColumnHeader"
-                        display="&starredColumn.label;" tooltiptext="&starredColumn.tooltip;"/>
-               <splitter class="tree-splitter"/>
                <treecol id="tagsCol" persist="hidden ordinal width" flex="1" hidden="true"
                         label="&tagsColumn.label;" tooltiptext="&tagsColumn.tooltip;"/>
                <splitter class="tree-splitter"/>

mail/base/content/msgHdrViewOverlay.js

@@ -1270,7 +1270,7 @@ function setApplicationIconForAttachment(attachment, listitem, largeView)
   var iconSize = largeView ? kLargeIcon : kSmallIcon;
   // generate a moz-icon url for the attachment so we'll show a nice icon next to it.
   if ( attachment.contentType == 'text/x-moz-deleted' )
-    listitem.setAttribute('image', 'chrome://messenger/skin/icons/message-mail-attach-del.gif');
+    listitem.setAttribute('image', 'chrome://messenger/skin/icons/message-mail-attach-del.png');
   else
     listitem.setAttribute('image', "moz-icon:" + "//" + attachment.displayName + "?size=" + iconSize + "&contentType=" + attachment.contentType);
 }

mail/themes/qute/mail/compose/messengercompose.css

@@ -430,9 +430,6 @@ treechildren::-moz-tree-image(remote-err) {
 #DecreaseFontSizeButton {
   -moz-image-region: rect(0px 16px 16px 0px);
 }
-#DecreaseFontSizeButton:hover {
-  -moz-image-region: rect(16px 16px 32px 0px);
-}
 #DecreaseFontSizeButton[disabled="true"] {
   -moz-image-region: rect(32px 16px 48px 0px) !important;
 }
@@ -440,9 +437,6 @@ treechildren::-moz-tree-image(remote-err) {
 #IncreaseFontSizeButton {
   -moz-image-region: rect(0px 32px 16px 16px);
 }
-#IncreaseFontSizeButton:hover {
-  -moz-image-region: rect(16px 32px 32px 16px);
-}
 #IncreaseFontSizeButton[disabled="true"] {
   -moz-image-region: rect(32px 32px 48px 16px) !important;
 }
@@ -450,9 +444,6 @@ treechildren::-moz-tree-image(remote-err) {
 #boldButton {
   -moz-image-region: rect(0px 48px 16px 32px);
 }
-#boldButton:hover, #boldButton[checked="true"] {
-  -moz-image-region: rect(16px 48px 32px 32px);
-}
 #boldButton[disabled="true"] {
   -moz-image-region: rect(32px 48px 48px 32px) !important;
 }
@@ -460,9 +451,6 @@ treechildren::-moz-tree-image(remote-err) {
 #italicButton {
   -moz-image-region: rect(0px 64px 16px 48px);
 }
-#italicButton:hover, #italicButton[checked="true"] {
-  -moz-image-region: rect(16px 64px 32px 48px);
-}
 #italicButton[disabled="true"] {
   -moz-image-region: rect(32px 64px 48px 48px) !important;
 }
@@ -470,10 +458,6 @@ treechildren::-moz-tree-image(remote-err) {
 #underlineButton {
   -moz-image-region: rect(0px 80px 16px 64px);
 }
-#underlineButton:hover, #underlineButton[checked="true"] {
-  -moz-image-region: rect(16px 80px 32px 64px);
-}
-
 #underlineButton[disabled="true"] {
   -moz-image-region: rect(32px 80px 48px 64px) !important;
 }
@@ -481,9 +465,6 @@ treechildren::-moz-tree-image(remote-err) {
 #ulButton {
   -moz-image-region: rect(0px 96px 16px 80px);
 }
-#ulButton:hover, #ulButton[checked="true"] {
-  -moz-image-region: rect(16px 96px 32px 80px);
-}
 #ulButton[disabled="true"] {
   -moz-image-region: rect(32px 96px 48px 80px) !important;
 }
@@ -491,9 +472,6 @@ treechildren::-moz-tree-image(remote-err) {
 #olButton {
   -moz-image-region: rect(0px 112px 16px 96px);
 }
-#olButton:hover, #olButton[checked="true"] {
-  -moz-image-region: rect(16px 112px 32px 96px);
-}
 #olButton[disabled="true"] {
   -moz-image-region: rect(32px 112px 48px 96px) !important;
 }
@@ -501,9 +479,6 @@ treechildren::-moz-tree-image(remote-err) {
 #outdentButton {
   -moz-image-region: rect(0px 128px 16px 112px);
 }
-#outdentButton:hover {
-  -moz-image-region: rect(16px 128px 32px 112px);
-}
 #outdentButton[disabled="true"] {
   -moz-image-region: rect(32px 128px 48px 112px) !important;
 }
@@ -511,9 +486,6 @@ treechildren::-moz-tree-image(remote-err) {
 #indentButton {
   -moz-image-region: rect(0px 144px 16px 128px);
 }
-#indentButton:hover {
-  -moz-image-region: rect(16px 144px 32px 128px);
-}
 #indentButton[disabled="true"] {
   -moz-image-region: rect(32px 144px 48px 128px) !important;
 }
@@ -521,9 +493,6 @@ treechildren::-moz-tree-image(remote-err) {
 #AlignPopupButton {
   -moz-image-region: rect(0px 176px 16px 160px);
 }
-#AlignPopupButton:hover, #AlignPopupButton[open="true"] {
-  -moz-image-region: rect(16px 176px 32px 160px);
-}
 #AlignPopupButton[disabled="true"] {
   -moz-image-region: rect(32px 176px 48px 160px) !important;
 }
@@ -531,9 +500,6 @@ treechildren::-moz-tree-image(remote-err) {
 #InsertPopupButton {
   -moz-image-region: rect(0px 256px 16px 240px);
 }
-#InsertPopupButton:hover, #InsertPopupButton[open="true"] {
-  -moz-image-region: rect(16px 256px 32px 240px);
-}
 #InsertPopupButton[disabled="true"] {
   -moz-image-region: rect(32px 256px 48px 240px) !important;
 }
@@ -541,9 +507,6 @@ treechildren::-moz-tree-image(remote-err) {
 #smileButtonMenu {
   -moz-image-region: rect(0px 304px 16px 288px);
 }
-#smileButtonMenu:hover, #smileButtonMenu[open="true"] {
-  -moz-image-region: rect(16px 304px 32px 288px);
-}
 #smileButtonMenu[disabled="true"] {
   -moz-image-region: rect(32px 304px 48px 288px) !important;
 }

mail/themes/qute/mail/folderMenus.css

@@ -44,76 +44,73 @@
 /* ::::: folder icons for menus ::::: */
 
 .folderMenuItem {
-  list-style-image: url("chrome://messenger/skin/icons/folder-closed.png");
+  list-style-image: url("chrome://messenger/skin/icons/folder.png");
+  -moz-image-region: rect(0 16px 16px 0);
 }
 
 .folderMenuItem[open="true"] {
-list-style-image: url("chrome://messenger/skin/icons/folder-open.png");
+  -moz-image-region: rect(0 32px 16px 16px);
 }
 
 /* ..... special folders ..... */
 
 .folderMenuItem[SpecialFolder="Inbox"] {
-  list-style-image: url("chrome://messenger/skin/icons/folder-inbox.png");
+  -moz-image-region: rect(0 48px 16px 32px);
 }
 
 .folderMenuItem[SpecialFolder="Sent"] {
-  list-style-image: url("chrome://messenger/skin/icons/folder-sent.png");
+  -moz-image-region: rect(0 64px 16px 48px);
 }
 
 .folderMenuItem[SpecialFolder="Unsent Messages"] {
-  list-style-image: url("chrome://messenger/skin/icons/folder-outbox.png");
+  -moz-image-region: rect(0 80px 16px 64px);
 }
 
 .folderMenuItem[SpecialFolder="Drafts"] {
-  list-style-image: url("chrome://messenger/skin/icons/folder-draft.png");
+  -moz-image-region: rect(0 96px 16px 80px);
 }
 
 .folderMenuItem[SpecialFolder="Templates"] {
-  list-style-image: url("chrome://messenger/skin/icons/folder-template.png");
+  -moz-image-region: rect(0 112px 16px 96px);
 }
 
 .folderMenuItem[SpecialFolder="Junk"] {
-  list-style-image: url("chrome://messenger/skin/icons/folder-junk.png");
+  -moz-image-region: rect(0 128px 16px 112px);
 }
 
 .folderMenuItem[SpecialFolder="Trash"] {
-  list-style-image: url("chrome://messenger/skin/icons/folder-trash.png");
+  -moz-image-region: rect(0 144px 16px 128px);
 }
 
 .folderMenuItem[SpecialFolder="Virtual"] {
-  list-style-image: url("chrome://messenger/skin/icons/folder-search.png");
+  -moz-image-region: rect(0 176px 16px 160px);
 }
 
 .folderMenuItem[IsServer="true"] {
-  list-style-image: url("chrome://messenger/skin/icons/server-mail.png");
+  list-style-image: url("chrome://messenger/skin/icons/server.png");
+  -moz-image-region: rect(0 16px 16px 0);
 }
 
-/* IMAP folders */
-.folderMenuItem[IsServer="true"][ServerType="imap"][IsSecure="true"] {
-  list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.png");
-}
-
-/* POP3 folders */
+.folderMenuItem[IsServer="true"][ServerType="imap"][IsSecure="true"],
 .folderMenuItem[IsServer="true"][ServerType="pop3"][IsSecure="true"] {
-  list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.png");
+  -moz-image-region: rect(0 32px 16px 16px);
 }
 
-/* Local Servers */
+/* Local folders */
 .folderMenuItem[IsServer="true"][ServerType="none"] {
-  list-style-image: url("chrome://messenger/skin/icons/server-local.png");
+  -moz-image-region: rect(0 48px 16px 32px);
 }
 
-/* News folders */
-.folderMenuItem[ServerType="nntp"] {
-  list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup.png");
+/* News server */
+.folderMenuItem[IsServer="true"][ServerType="nntp"] {
+  -moz-image-region: rect(0 64px 16px 48px);
 }
 
 .folderMenuItem[IsServer="true"][ServerType="nntp"][IsSecure="true"] {
-  list-style-image: url("chrome://messenger/skin/icons/server-news-lock.png");
+  -moz-image-region: rect(0 80px 16px 64px) !important;
 }
 
-.folderMenuItem[IsServer="true"][ServerType="nntp"] {
-  list-style-image: url("chrome://messenger/skin/icons/server-news.png");
+/* Newsgroup */
+.folderMenuItem[ServerType="nntp"] {
+  -moz-image-region: rect(0 160px 16px 144px);
 }
-

mail/themes/qute/mail/folderPane.css

@@ -2,76 +2,95 @@
 
 treechildren::-moz-tree-image(folderNameCol) {
   margin-right: 2px;
-  list-style-image: url("chrome://messenger/skin/icons/folder-closed.png");
-}
-
-
-treechildren::-moz-tree-image(folderNameCol, selected, open) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-open.png");
-}
-
-treechildren::-moz-tree-image(folderNameCol, selected, open, newMessages-true) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-new-open.png");
+  list-style-image: url("chrome://messenger/skin/icons/folder.png");
+  -moz-image-region: rect(0 16px 16px 0);
 }
 
 treechildren::-moz-tree-image(folderNameCol, newMessages-true) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-new-closed.png");
+  -moz-image-region: rect(16px 16px 32px 0);
+}
+
+treechildren::-moz-tree-image(folderNameCol, selected, open) {
+  -moz-image-region: rect(0 32px 16px 16px);
+}
+
+treechildren::-moz-tree-image(folderNameCol, selected, open, newMessages-true) {
+  -moz-image-region: rect(16px 32px 32px 16px);
 }
 
 /* ..... Inbox ..... */
 
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Inbox) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-inbox.png");
+  -moz-image-region: rect(0 48px 16px 32px);
 }
 
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Inbox, newMessages-true) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-inbox-new.png");
+  -moz-image-region: rect(16px 48px 32px 32px);
 }
 
 /* ..... Sent ..... */
 
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Sent) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-sent.png");
+  -moz-image-region: rect(0 64px 16px 48px);
 }
 
 /* ..... Unsent ..... */
 
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Unsent Messages) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-outbox.png");
+  -moz-image-region: rect(0 80px 16px 64px);
 }
 
 /* ..... Drafts ..... */
 
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Drafts) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-draft.png");
+  -moz-image-region: rect(0 96px 16px 80px);
 }
 
 /* ..... Templates ..... */
 
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Templates) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-template.png");
+  -moz-image-region: rect(0 112px 16px 96px);
 }
 
 /* ..... Junk ..... */
 
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Junk) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-junk.png");
+  -moz-image-region: rect(0 128px 16px 112px);
 }
 
 /* ..... Trash ..... */
 
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Trash) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-trash.png");
+  -moz-image-region: rect(0 144px 16px 128px);
 }
 
-/* ..... Servers  ..... */
+/* ..... Shared folders .....
+
+treechildren::-moz-tree-image(folderNameCol, imapShared-true) {
+  -moz-image-region: rect(0 192px 16px 176px);
+}
+
+*/ 
+
+/* ..... Saved Search Folder ..... */
+
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Virtual) {
+  -moz-image-region: rect(0 176px 16px 160px);
+}
+
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Virtual, newMessages-true) {
+  -moz-image-region: rect(16px 176px 32px 160px);
+}
+
+/* ..... Mail server  ..... */
 
 treechildren::-moz-tree-image(folderNameCol, isServer-true) {
-  list-style-image: url("chrome://messenger/skin/icons/server-mail.png");
+  list-style-image: url("chrome://messenger/skin/icons/server.png");
+  -moz-image-region: rect(0 16px 16px 0);
 }
 
 treechildren::-moz-tree-image(folderNameCol, biffState-NewMail, isServer-true) {
-  list-style-image: url("chrome://messenger/skin/icons/server-mail-new.png");
+  -moz-image-region: rect(16px 16px 32px 0);
 }
 
 treechildren::-moz-tree-cell-text(folderNameCol, newMessages-true),
@@ -79,50 +98,41 @@ treechildren::-moz-tree-cell-text(folderNameCol, specialFolder-Inbox, newMessage
   font-weight: bold;
 }
 
-/* Disable rules for special shared folder artwork until we actually have new artwork for these icons */
-
-/* treechildren::-moz-tree-image(folderNameCol, imapShared-true) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-share.gif");
-}
-
-*/
-
-/* ..... Server Folders ..... */
-
-treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-pop3, isSecure-true) {
-  list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.png");
-}
+/* ..... Secure mail server ..... */
 
+treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-pop3, isSecure-true),
 treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-imap, isSecure-true) {
-  list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.png");
+  -moz-image-region: rect(0 32px 16px 16px);
 }
 
 treechildren::-moz-tree-image(folderNameCol, biffState-NewMail, isServer-true, isSecure-true) {
-  list-style-image: url("chrome://messenger/skin/icons/server-remote-lock-new.png");
+  -moz-image-region: rect(16px 32px 32px 16px);
 }
 
+/* ..... Local folders ..... */
+
 treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-none) {
-  list-style-image: url("chrome://messenger/skin/icons/server-local.png");
+  -moz-image-region: rect(0 48px 16px 32px);
 }
 
-/* ..... News Folders ..... */
-
-treechildren::-moz-tree-image(folderNameCol, serverType-nntp) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup.png");
+treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-none, biffState-NewMail) {
+  -moz-image-region: rect(16px 48px 32px 32px);
 }
 
+/* ..... News server ..... */
+
 treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp) {
-  list-style-image: url("chrome://messenger/skin/icons/server-news.png");
+  -moz-image-region: rect(0 64px 16px 48px) !important;
 }
 
 treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp, isSecure-true) {
-  list-style-image: url("chrome://messenger/skin/icons/server-news-lock.png");
+  -moz-image-region: rect(0 80px 16px 64px) !important;
 }
 
-/* ..... Saved Search Folder ..... */
+/* ..... Newsgroup ..... */
 
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Virtual) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-search.png");
+treechildren::-moz-tree-image(folderNameCol, serverType-nntp) {
+  -moz-image-region: rect(0 160px 16px 144px);
 }
 
 /* ::::: All Servers ::::: */

mail/themes/qute/mail/jar.mn

@@ -45,13 +45,18 @@ classic.jar:
     skin/classic/messenger-newsblog/feed-subscriptions.css      (newsblog/feed-subscriptions.css)
     skin/classic/messenger-newsblog/newsBlogOverlay.css         (newsblog/newsBlogOverlay.css)
     skin/classic/messenger-newsblog/icons/rss-feed.png          (newsblog/rss-feed.png)
-    skin/classic/messenger-newsblog/icons/rss-feed-new.png      (newsblog/rss-feed-new.png)
     skin/classic/messenger-newsblog/icons/server-rss.png        (newsblog/server-rss.png)
-    skin/classic/messenger-newsblog/icons/folder-search-rss.png (newsblog/folder-search-rss.png)
     skin/classic/messenger/preferences/preferences.css          (preferences/preferences.css)
-    skin/classic/messenger/preferences/mail-options.png         (preferences/mail-options.png)
     skin/classic/messenger/preferences/mailPaneConfig.png       (preferences/mailPaneConfig.png)
+    skin/classic/messenger/preferences/general.png              (preferences/general.png)
+    skin/classic/messenger/preferences/display.png              (preferences/display.png)
+    skin/classic/messenger/preferences/composition.png          (preferences/composition.png)
     skin/classic/messenger/preferences/privacy.png              (preferences/privacy.png)
+    skin/classic/messenger/preferences/attachments.png          (preferences/attachments.png)
+    skin/classic/messenger/preferences/advanced.png             (preferences/advanced.png)
+    skin/classic/messenger/preferences/background.png           (preferences/background.png)
+    skin/classic/messenger/preferences/hover.png                (preferences/hover.png)
+    skin/classic/messenger/preferences/selected.png             (preferences/selected.png)
     skin/classic/messenger/smime/msgCompSMIMEOverlay.css        (smime/msgCompSMIMEOverlay.css)
     skin/classic/messenger/smime/msgHdrViewSMIMEOverlay.css     (smime/msgHdrViewSMIMEOverlay.css)
     skin/classic/messenger/smime/msgReadSMIMEOverlay.css        (smime/msgReadSMIMEOverlay.css)
@@ -69,68 +74,39 @@ classic.jar:
     skin/classic/messenger/smime/icons/sbSignOk.png             (smime/sbSignOk.png)
     skin/classic/messenger/smime/icons/sbSignUnknown.png        (smime/sbSignUnknown.png)
     skin/classic/messenger/icons/new-mail-alert.png             (icons/new-mail-alert.png)
-    skin/classic/messenger/icons/readmail.gif                   (icons/readmail.gif)
+    skin/classic/messenger/icons/readmail.png                   (icons/readmail.png)
     skin/classic/messenger/icons/mail-toolbar.png               (icons/mail-toolbar.png)
     skin/classic/messenger/icons/mail-toolbar-small.png         (icons/mail-toolbar-small.png)
-    skin/classic/messenger/icons/folder-junk.png                (icons/folder-junk.png)
-    skin/classic/messenger/icons/folder-closed.png              (icons/folder-closed.png)
-    skin/classic/messenger/icons/folder-draft.png               (icons/folder-draft.png)
-    skin/classic/messenger/icons/folder-inbox-new.png           (icons/folder-inbox-new.png)
-    skin/classic/messenger/icons/folder-inbox.png               (icons/folder-inbox.png)
-    skin/classic/messenger/icons/folder-new-closed.png          (icons/folder-new-closed.png)
-    skin/classic/messenger/icons/folder-open.png                (icons/folder-open.png)
-    skin/classic/messenger/icons/folder-new-open.png            (icons/folder-new-open.png)
-    skin/classic/messenger/icons/folder-outbox.png              (icons/folder-outbox.png)
-    skin/classic/messenger/icons/folder-sent.png                (icons/folder-sent.png)
-    skin/classic/messenger/icons/folder-template.png            (icons/folder-template.png)
-    skin/classic/messenger/icons/folder-trash.png               (icons/folder-trash.png) 
-    skin/classic/messenger/icons/folder-search.png              (icons/folder-search.png) 
-    skin/classic/messenger/icons/message-mail-forwarded.png     (icons/message-mail-forwarded.png)
-    skin/classic/messenger/icons/message-mail-forwarded-read.png (icons/message-mail-forwarded-read.png)
-    skin/classic/messenger/icons/message-mail-replied.png       (icons/message-mail-replied.png)
-    skin/classic/messenger/icons/message-mail-replied-read.png  (icons/message-mail-replied-read.png)    
-    skin/classic/messenger/icons/message-mail-replied-forw.png  (icons/message-mail-replied-forw.png)
-    skin/classic/messenger/icons/message-mail-replied-forw-read.png (icons/message-mail-replied-forw-read.png)    
-    skin/classic/messenger/icons/message-mail.png               (icons/message-mail.png)
+    skin/classic/messenger/icons/folder.png                     (icons/folder.png)
+    skin/classic/messenger/icons/message-replied.png            (icons/message-replied.png)
+    skin/classic/messenger/icons/message-forwarded.png          (icons/message-forwarded.png)
+    skin/classic/messenger/icons/message-replied-forw.png       (icons/message-replied-forw.png)
+    skin/classic/messenger/icons/message-new.png                (icons/message-new.png)
     skin/classic/messenger/icons/message-mail-imapdelete.png    (icons/message-mail-imapdelete.png)
-    skin/classic/messenger/icons/message-mail-new.png           (icons/message-mail-new.png)   
-    skin/classic/messenger/icons/message-mail-read.png          (icons/message-mail-read.png)    
-    skin/classic/messenger/icons/message-news.png               (icons/message-news.png)   
-    skin/classic/messenger/icons/message-news-forwarded.png     (icons/message-news-forwarded.png)
-    skin/classic/messenger/icons/message-news-replied.png       (icons/message-news-replied.png)
-    skin/classic/messenger/icons/message-news-replied-forw.png  (icons/message-news-replied-forw.png)
-    skin/classic/messenger/icons/message-mail-attach-del.gif    (icons/message-mail-attach-del.gif)
+    skin/classic/messenger/icons/attachment-deleted.png         (icons/attachment-deleted.png)
     skin/classic/messenger/icons/attachment-col.png             (icons/attachment-col.png)
     skin/classic/messenger/icons/attachment.png                 (icons/attachment.png)
     skin/classic/messenger/icons/junk-col.png                   (icons/junk-col.png)
     skin/classic/messenger/icons/thread-col.png                 (icons/thread-col.png)
-    skin/classic/messenger/icons/thread-new.png                 (icons/thread-new.png)
     skin/classic/messenger/icons/thread.png                     (icons/thread.png)  
     skin/classic/messenger/icons/thread-ignored.png             (icons/thread-ignored.png)
-    skin/classic/messenger/icons/thread-ignored-new.png         (icons/thread-ignored-new.png)
     skin/classic/messenger/icons/thread-watched.png             (icons/thread-watched.png)
-    skin/classic/messenger/icons/thread-watched-new.png         (icons/thread-watched-new.png)
     skin/classic/messenger/icons/flag-col.png                   (icons/flag-col.png)
     skin/classic/messenger/icons/flag.png                       (icons/flag.png)
-    skin/classic/messenger/icons/server-mail.png                (icons/server-mail.png)    
-    skin/classic/messenger/icons/server-mail-new.png            (icons/server-mail-new.png)
-    skin/classic/messenger/icons/server-remote-lock.png         (icons/server-remote-lock.png)
-    skin/classic/messenger/icons/server-remote-lock-new.png     (icons/server-remote-lock-new.png)    
-    skin/classic/messenger/icons/server-local.png               (icons/server-local.png) 
-    skin/classic/messenger/icons/server-news.png                (icons/server-news.png) 
-    skin/classic/messenger/icons/server-news-lock.png           (icons/server-news-lock.png)   
-    skin/classic/messenger/icons/folder-newsgroup.png           (icons/folder-newsgroup.png)
-    skin/classic/messenger/icons/message-news-new.png           (icons/message-news-new.png)  
+    skin/classic/messenger/icons/server.png                     (icons/server.png)
     skin/classic/messenger/icons/readcol.png                    (icons/readcol.png)
     skin/classic/messenger/icons/unreadmail.png                 (icons/unreadmail.png)
     skin/classic/messenger/icons/Search-bar.png                 (icons/Search-bar.png)
     skin/classic/messenger/icons/search-arrow.gif               (icons/search-arrow.gif)
     skin/classic/messenger/icons/quick-search-clear.png         (icons/quick-search-clear.png)
+    skin/classic/messenger/icons/close-button.png               (icons/close-button.png)
     skin/classic/messenger/icons/remote-blocked.png             (icons/remote-blocked.png)    
+    skin/classic/messenger/icons/junk.png                       (icons/junk.png)
     skin/classic/messenger/icons/check.gif                      (icons/check.gif)
     skin/classic/messenger/icons/notchecked.gif                 (icons/notchecked.gif)
     skin/classic/messenger/icons/online.png                     (icons/online.png)
     skin/classic/messenger/icons/offline.png                    (icons/offline.png)
+    skin/classic/messenger/icons/row.png                        (icons/row.png)
     skin/classic/communicator/icons/smileys/smiley-smile.png    (icons/smiley-smile.png)
     skin/classic/communicator/icons/smileys/smiley-frown.png    (icons/smiley-frown.png)
     skin/classic/communicator/icons/smileys/smiley-wink.png     (icons/smiley-wink.png)