mail status icons for Thunderbird Mac, including bug #239610

mail/base/skin/mac/jar.mn

@@ -93,6 +93,13 @@ classic.jar:
      skin/classic/messenger/icons/server-news.png           (icons/server-news.png)
      skin/classic/messenger/icons/server-remote-lock.png            (icons/server-remote-lock.png)
      skin/classic/messenger/icons/small-button-base.png         (icons/small-button-base.png)
+     skin/classic/messenger/icons/symbol-forwarded.png         (icons/symbol-forwarded.png)
+     skin/classic/messenger/icons/symbol-forwarded-selected.png         (icons/symbol-forwarded-selected.png)
+     skin/classic/messenger/icons/symbol-replied.png         (icons/symbol-replied.png)
+     skin/classic/messenger/icons/symbol-replied-selected.png         (icons/symbol-replied-selected.png)
+     skin/classic/messenger/icons/symbol-imapdeleted.png         (icons/symbol-imapdeleted.png)
+     skin/classic/messenger/icons/symbol-imapdeleted-selected.png         (icons/symbol-imapdeleted-selected.png)
+     skin/classic/messenger/icons/symbol-null.png         (icons/symbol-null.png)
      skin/classic/messenger/icons/template-folder.png           (icons/template-folder.png)
      skin/classic/messenger/icons/thread-closed-eye-selected.png        (icons/thread-closed-eye-selected.png)
      skin/classic/messenger/icons/thread-closed-eye.png         (icons/thread-closed-eye.png)

mail/base/skin/mac/mailWindow1.css

@@ -270,10 +270,19 @@ treechildren::-moz-tree-image(unreadButtonColHeader, unread, selected, focus) {
 }
 
 treechildren::-moz-tree-image(subjectCol, replied) {
-  list-style-image: url("chrome://messenger/skin/icons/message-mail-replied.png");
+  list-style-image: url("chrome://messenger/skin/icons/symbol-replied.png") !important;
 }
+
+treechildren::-moz-tree-image(subjectCol, replied, selected) {
+  list-style-image: url("chrome://messenger/skin/icons/symbol-replied-selected.png") !important;
+}
+
 treechildren::-moz-tree-image(subjectCol, forwarded) {
-  list-style-image: url("chrome://messenger/skin/icons/message-mail-forwarded.png");
+  list-style-image: url("chrome://messenger/skin/icons/symbol-forwarded.png") !important;
+}
+
+treechildren::-moz-tree-image(subjectCol, forwarded, selected) {
+  list-style-image: url("chrome://messenger/skin/icons/symbol-forwarded-selected.png") !important;
 }
 
 /* ..... attachment column ..... */
@@ -334,22 +343,20 @@ treechildren::-moz-tree-image(junkStatusCol, notjunk) {
 /* ..... subject column ..... */
 
 treechildren::-moz-tree-image(subjectCol) {
-  margin-right: 2px;
-  list-style-image: none;
-}
-
-treechildren::-moz-tree-image(subjectCol, new) {
-  list-style-image: none;
-}
-
-treechildren::-moz-tree-image(subjectCol, attach) {
-  list-style-image: none;
+  list-style-image: url("chrome://messenger/skin/icons/symbol-null.png");
+  margin: 0;
+  padding: 0;
 }
 
 treechildren::-moz-tree-image(subjectCol, imapdeleted) {
-  list-style-image: none;
+  list-style-image: url("chrome://messenger/skin/icons/symbol-imapdeleted.png") !important;
 }
 
+treechildren::-moz-tree-image(subjectCol, imapdeleted, selected) {
+  list-style-image: url("chrome://messenger/skin/icons/symbol-imapdeleted-selected.png") !important;
+}
+
+
 treechildren::-moz-tree-image(subjectCol, news) {
   list-style-image: none;
 }