Bug 514829: [gnomestripe] the old style folder icons are used in a number of places (those where folder.png is referred to). ui-r=clarkbw, r=philor, sr=standard8, a=standard8
authorMagnus Melin <mkmelin+mozilla@iki.fi>
Wed, 09 Sep 2009 18:17:00 +0300
changeset 3602 806cadd87cb3a40807de722125b62aa5db1da915
parent 3601 2d36df75680d0c4898e22b55aff8b91368dc9b55
child 3603 977abd1818d291dadc44973002f38b3118480822
push idunknown
push userunknown
push dateunknown
reviewersclarkbw, philor, standard8, standard8
bugs514829
Bug 514829: [gnomestripe] the old style folder icons are used in a number of places (those where folder.png is referred to). ui-r=clarkbw, r=philor, sr=standard8, a=standard8
mail/themes/gnomestripe/jar.mn
mail/themes/gnomestripe/mail/folderMenus.css
mail/themes/gnomestripe/mail/folderPane.css
mail/themes/gnomestripe/mail/icons/folder.png
mail/themes/gnomestripe/mail/msgSelectOffline.css
mail/themes/gnomestripe/mail/newsblog/feed-subscriptions.css
mail/themes/gnomestripe/mail/subscribe.css
mailnews/base/search/content/FilterEditor.xul
--- a/mail/themes/gnomestripe/jar.mn
+++ b/mail/themes/gnomestripe/jar.mn
@@ -103,17 +103,16 @@ classic.jar:
   skin/classic/messenger/icons/secure.png                     (mail/icons/secure.png)
   skin/classic/messenger/icons/insecure.png                   (mail/icons/insecure.png)
   skin/classic/messenger/icons/identity.png                   (mail/icons/identity.png)
   skin/classic/messenger/icons/tick.png                       (mail/icons/tick.png)
   skin/classic/messenger/icons/error.png                      (mail/icons/error.png)
   skin/classic/messenger/icons/cancel.png                     (mail/icons/cancel.png)
   skin/classic/messenger/icons/mail-toolbar.png               (mail/icons/mail-toolbar.png)
   skin/classic/messenger/icons/mail-toolbar-small.png         (mail/icons/mail-toolbar-small.png)
-  skin/classic/messenger/icons/folder.png                     (mail/icons/folder.png)
   skin/classic/messenger/icons/folder-pane.png                (mail/icons/folder-pane.png)
   skin/classic/messenger/icons/folder-blank.png               (mail/icons/folder-blank.png)
   skin/classic/messenger/icons/folder-new-star.png            (mail/icons/folder-new-star.png)
   skin/classic/messenger/icons/message-list.png               (mail/icons/message-list.png)
   skin/classic/messenger/icons/message.png                    (mail/icons/message.png)
   skin/classic/messenger/icons/attachment-deleted.png         (mail/icons/attachment-deleted.png)
   skin/classic/messenger/icons/attachment-deleted-large.png   (mail/icons/attachment-deleted-large.png)
   skin/classic/messenger/icons/attachment-col.png             (mail/icons/attachment-col.png)
--- a/mail/themes/gnomestripe/mail/folderMenus.css
+++ b/mail/themes/gnomestripe/mail/folderMenus.css
@@ -15,16 +15,17 @@
  * March 31, 1998.
  *
  * The Initial Developer of the Original Code is
  * Netscape Communications Corporation.
  * Portions created by the Initial Developer are Copyright (C) 1998-1999
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
+ *   Magnus Melin <mkmelin+mozilla@iki.fi>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
  * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
  * in which case the provisions of the GPL or the LGPL are applicable instead
  * of those above. If you wish to allow use of your version of this file only
  * under the terms of either the GPL or the LGPL, and not to allow others to
  * use your version of this file under the terms of the MPL, indicate your
@@ -36,100 +37,101 @@
  * ***** END LICENSE BLOCK ***** */
 
 /* ===== folderMenus.css ================================================
   == Icons for menus which represent mail folder.
   ======================================================================= */
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-/* ::::: folder icons for menus ::::: */
+/* ::::: Folder icons for menus   ::::: */
 
+/* Folders */
 .folderMenuItem {
-  list-style-image: url("chrome://messenger/skin/icons/folder.png");
-  -moz-image-region: rect(0 16px 16px 0);
-}
-
-.folderMenuItem[open="true"] {
-  -moz-image-region: rect(0 32px 16px 16px);
+  list-style-image: url("moz-icon://stock/gtk-directory?size=menu");
 }
 
 /* Newsgroup */
 .folderMenuItem[ServerType="nntp"] {
-  -moz-image-region: rect(0 160px 16px 144px);
+  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
+  -moz-image-region: rect(208px 16px 224px 0px);
 }
 
 /* Feed */
 .folderMenuItem[ServerType="rss"] {
-  list-style-image: url("chrome://messenger-newsblog/skin/icons/rss-feed.png");
-  -moz-image-region: rect(0 16px 16px 0);
+  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
+  -moz-image-region: rect(112px 16px 128px 0px);
 }
 
-/* Resets list-style-image for Feed Trash and Virtual folders */
-.folderMenuItem[ServerType="rss"][SpecialFolder="Trash"],
-.folderMenuItem[ServerType="rss"][SpecialFolder="Virtual"] {
-  list-style-image: url("chrome://messenger/skin/icons/folder.png");
-}
-
-/* ..... special folders ..... */
-
 .folderMenuItem[SpecialFolder="Inbox"] {
-  -moz-image-region: rect(0 48px 16px 32px);
+  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
+  -moz-image-region: rect(64px 16px 80px 0px);
 }
 
 .folderMenuItem[SpecialFolder="Sent"] {
-  -moz-image-region: rect(0 64px 16px 48px);
+  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
+  -moz-image-region: rect(144px 16px 160px 0px);
 }
 
 .folderMenuItem[SpecialFolder="Outbox"] {
-  -moz-image-region: rect(0 80px 16px 64px);
+  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
+  -moz-image-region: rect(96px 16px 112px 0px);
 }
 
-.folderMenuItem[SpecialFolder="Drafts"] {
-  -moz-image-region: rect(0 96px 16px 80px);
+.folderMenuItem[SpecialFolder="Drafts"] { 
+  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
+  -moz-image-region: rect(48px 16px 64px 0px);
 }
 
-.folderMenuItem[SpecialFolder="Templates"] {
-  -moz-image-region: rect(0 112px 16px 96px);
+.folderMenuItem[SpecialFolder="Templates"] { 
+  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
+  -moz-image-region: rect(160px 16px 176px 0px);
 }
 
 .folderMenuItem[SpecialFolder="Junk"] {
-  -moz-image-region: rect(0 128px 16px 112px);
+  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
+  -moz-image-region: rect(80px 16px 96px 0px);
 }
 
 .folderMenuItem[SpecialFolder="Trash"] {
-  -moz-image-region: rect(0 144px 16px 128px);
+  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
+  -moz-image-region: rect(176px 16px 192px 0px);
+}
+
+.folderMenuItem[SpecialFolder="Archive"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
+  -moz-image-region: rect(192px 16px 208px 0px);
 }
 
 .folderMenuItem[SpecialFolder="Virtual"] {
-  -moz-image-region: rect(0 176px 16px 160px);
+  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
+  -moz-image-region: rect(128px 16px 144px 0px);
+
 }
 
-/* ..... servers ..... */
-
+/** IMAP/POP/movemail account nodes */
 .folderMenuItem[IsServer="true"] {
-  list-style-image: url("chrome://messenger/skin/icons/server.png");
-  -moz-image-region: rect(0 16px 16px 0);
+  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
+  -moz-image-region: rect(16px 16px 32px 0px);
 }
 
-.folderMenuItem[IsServer="true"][ServerType="imap"][IsSecure="true"],
-.folderMenuItem[IsServer="true"][ServerType="pop3"][IsSecure="true"] {
-  -moz-image-region: rect(0 32px 16px 16px);
-}
-
-/* Local folders */
+/* Local folders account node */
 .folderMenuItem[IsServer="true"][ServerType="none"] {
-  -moz-image-region: rect(0 48px 16px 32px);
+  -moz-image-region: rect(0px 16px 16px 0px);
 }
 
 /* News server */
 .folderMenuItem[IsServer="true"][ServerType="nntp"] {
-  -moz-image-region: rect(0 64px 16px 48px);
+  list-style-image: url("chrome://messenger/skin/icons/server.png");
+  -moz-image-region: rect(0px 64px 16px 48px);
 }
 
+/** Secure news server */
 .folderMenuItem[IsServer="true"][ServerType="nntp"][IsSecure="true"] {
-  -moz-image-region: rect(0 80px 16px 64px) !important;
+  list-style-image: url("chrome://messenger/skin/icons/server.png");
+  -moz-image-region: rect(0px 80px 16px 64px);
 }
 
-/* Feed server */
+/* Feed account node */
 .folderMenuItem[IsServer="true"][ServerType="rss"] {
-  list-style-image: url("chrome://messenger-newsblog/skin/icons/server-rss.png");
+  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
+  -moz-image-region: rect(32px 16px 48px 0px);
 }
--- a/mail/themes/gnomestripe/mail/folderPane.css
+++ b/mail/themes/gnomestripe/mail/folderPane.css
@@ -6,50 +6,30 @@ treechildren::-moz-tree-image(folderName
   background-repeat: no-repeat;
   background-color: transparent;
   background-attachment: scroll;
   -moz-background-clip: border;
   -moz-background-inline-policy: continuous;
   -moz-background-origin: border;
   background-image: url("moz-icon://stock/gtk-directory?size=menu");
   list-style-image: url("chrome://messenger/skin/icons/folder-blank.png");
-}
 
-treechildren::-moz-tree-image(folderNameCol) {
   -moz-margin-end: 2px;
 }
 
 treechildren::-moz-tree-image(folderNameCol, newMessages-true) {
   background-image: url("moz-icon://stock/gtk-directory?size=menu");
   list-style-image: url("chrome://messenger/skin/icons/folder-new-star.png");
 }
 
 treechildren::-moz-tree-image(folderNameCol, selected, open, newMessages-true) {
   background-image: url("moz-icon://stock/gtk-directory?size=menu");
   list-style-image: url("chrome://messenger/skin/icons/folder-new-star.png");
 }
 
-/* ..... Newsgroup ..... */
-
-.tabmail-tab[type="folder"][ServerType="nntp"] > .tab-image-middle > .tab-icon-image,
-treechildren::-moz-tree-image(folderNameCol, serverType-nntp) {
-  background-image: none;
-  list-style-image: url("chrome://messenger/skin/icons/folder.png");
-  -moz-image-region: rect(0 160px 16px 144px);
-}
-
-/* ..... Feed ..... */
-
-.tabmail-tab[type="folder"][ServerType="rss"] > .tab-image-middle > .tab-icon-image,
-treechildren::-moz-tree-image(folderNameCol, serverType-rss) {
-  background-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  background-position: left -112px;
-  list-style-image: url("chrome://messenger/skin/icons/folder-blank.png");
-}
-
 treechildren::-moz-tree-image(folderNameCol, serverType-rss, newMessages-true) {
   background-image: url("chrome://messenger/skin/icons/folder-pane.png");
   background-position: left -112px;
   list-style-image: url("chrome://messenger/skin/icons/folder-new-star.png");
 }
 
 /* Resets list-style-image for Feed Trash and Virtual folders */
 
@@ -152,23 +132,34 @@ treechildren::-moz-tree-image(folderName
 
 .tabmail-tab[type="folder"][SpecialFolder="Virtual"] > .tab-image-middle > .tab-icon-image,
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Virtual) {
   background-image: url("chrome://messenger/skin/icons/folder-pane.png");
   background-position: left -128px;
   list-style-image: url("chrome://messenger/skin/icons/folder-blank.png");
 }
 
-/* .....  Newsgroup .....  */
-.tabmail-tab[type="folder"][ServerType="nntp"] > .tab-image-middle > .tab-icon-image {
+/* ..... Newsgroup ..... */
+
+.tabmail-tab[type="folder"][ServerType="nntp"] > .tab-image-middle > .tab-icon-image,
+treechildren::-moz-tree-image(folderNameCol, serverType-nntp) {
   background-image: url("chrome://messenger/skin/icons/folder-pane.png");
   background-position: left -208px;
   list-style-image: url("chrome://messenger/skin/icons/folder-blank.png");
 }
 
+/* ..... Feed ..... */
+
+.tabmail-tab[type="folder"][ServerType="rss"] > .tab-image-middle > .tab-icon-image,
+treechildren::-moz-tree-image(folderNameCol, serverType-rss) {
+  background-image: url("chrome://messenger/skin/icons/folder-pane.png");
+  background-position: left -112px;
+  list-style-image: url("chrome://messenger/skin/icons/folder-blank.png");
+}
+
 /* ..... Account nodes ..... */
 .tabmail-tab[type="folder"][IsServer="true"] > .tab-image-middle > .tab-icon-image {
   -moz-margin-start: 0px;
   background-image: url("chrome://messenger/skin/icons/folder-pane.png");
   background-position: left -16px;
   list-style-image: url("chrome://messenger/skin/icons/folder-blank.png");
 }
 
@@ -194,39 +185,38 @@ treechildren::-moz-tree-image(folderName
 
 /* ..... Secure news server ..... */
 .tabmail-tab[type="folder"][IsServer="true"][ServerType="nntp"][IsSecure="true"] > .tab-image-middle > .tab-icon-image {
   background-image: none;
   list-style-image: url("chrome://messenger/skin/icons/server.png");
   -moz-image-region: rect(0 80px 16px 64px);
 }
 
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Virtual, newMessages-true) {
-  list-style-image: url("chrome://messenger/skin/icons/folder.png");
-  -moz-image-region: rect(16px 176px 32px 160px);
-}
-
 treechildren::-moz-tree-cell-text(folderNameCol, newMessages-true),
 treechildren::-moz-tree-cell-text(folderNameCol, specialFolder-Inbox, newMessages-true) {
   font-weight: bold;
 }
 
+treechildren::-moz-tree-image(folderNameCol, biffState-NewMail, isServer-true) {
+  background-position: left -16px;
+  list-style-image: url("chrome://messenger/skin/icons/folder-new-star.png");
+}
+
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Virtual, newMessages-true) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-new-star.png");
+}
+
 /* ..... Mail server  ..... */
 
 treechildren::-moz-tree-image(folderNameCol, isServer-true) {
   background-image: url("chrome://messenger/skin/icons/folder-pane.png");
   background-position: left -16px;
   list-style-image: url("chrome://messenger/skin/icons/folder-blank.png");
 }
 
-treechildren::-moz-tree-image(folderNameCol, biffState-NewMail, isServer-true) {
-  background-position: left -16px;
-  list-style-image: url("chrome://messenger/skin/icons/folder-new-star.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) {
   background-position: left -16px;
   list-style-image: url("chrome://messenger/skin/icons/folder-blank.png");
 }
 
deleted file mode 100755
index 1b052b252144cdd6739bbf1a4eaf0897f82b7db4..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/mail/themes/gnomestripe/mail/msgSelectOffline.css
+++ b/mail/themes/gnomestripe/mail/msgSelectOffline.css
@@ -15,179 +15,44 @@
  * March 31, 1998.
  *
  * The Initial Developer of the Original Code is
  * Netscape Communications Corporation.
  * Portions created by the Initial Developer are Copyright (C) 1998-2001
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
- *   Joe Hewitt (hewitt@netscape.com)
- *   Håkan Waara (hwaara@chello.se)
- *   Jan Varga (varga@nixcorp.com)
+ *   Joe Hewitt <hewitt@netscape.com>
+ *   HÃ¥kan Waara <hwaara@chello.se>
+ *   Jan Varga <varga@nixcorp.com>
+ *   Magnus Melin <mkmelin+mozilla@iki.fi>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
  * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
  * in which case the provisions of the GPL or the LGPL are applicable instead
  * of those above. If you wish to allow use of your version of this file only
  * under the terms of either the GPL or the LGPL, and not to allow others to
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 /* ===== msgSelectOffline.css =================================================
-  == Styles for the Offline Use dialog.
-  ======================================================================= */
+   == The dialog where you select which folders to enable for offline use.
+   ========================================================================== */
 
 @import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/folderPane.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-/* ::::: Mail Folders ::::: */
-
-treechildren::-moz-tree-image(folderNameCol) {
-  -moz-margin-end: 2px;
-  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) {
-  -moz-image-region: rect(16px 16px 32px 0);
-}
-
-/* ..... Inbox ..... */
-
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Inbox) {
-  -moz-image-region: rect(0 48px 16px 32px);
-}
-
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Inbox, newMessages-true) {
-  -moz-image-region: rect(16px 48px 32px 32px);
-}
-
-/* ..... Sent ..... */
-
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Sent) {
-  -moz-image-region: rect(0 64px 16px 48px);
-}
-
-/* ..... Unsent ..... */
-
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Outbox) {
-  -moz-image-region: rect(0 80px 16px 64px);
-}
-
-/* ..... Drafts ..... */
-
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Drafts) {
-  -moz-image-region: rect(0 96px 16px 80px);
-}
-
-/* ..... Templates ..... */
-
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Templates) {
-  -moz-image-region: rect(0 112px 16px 96px);
-}
-
-/* ..... Junk ..... */
-
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Junk) {
-  -moz-image-region: rect(0 128px 16px 112px);
-}
-
-/* ..... Trash ..... */
-
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Trash) {
-  -moz-image-region: rect(0 144px 16px 128px);
-}
-
-/* ..... Shared folders .....
-
-treechildren::-moz-tree-image(folderNameCol, imapShared-true) {
-  -moz-image-region: rect(0 192px 16px 176px);
-}
-
-*/
-
-/* ..... Mail server  ..... */
-
-treechildren::-moz-tree-image(folderNameCol, isServer-true) {
-  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) {
-  -moz-image-region: rect(16px 16px 32px 0);
-}
-
-treechildren::-moz-tree-cell-text(folderNameCol, newMessages-true),
-treechildren::-moz-tree-cell-text(folderNameCol, specialFolder-Inbox, newMessages-true) {
-  font-weight: bold;
-}
-
-/* ..... 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) {
-  -moz-image-region: rect(0 32px 16px 16px);
-}
-
-treechildren::-moz-tree-image(folderNameCol, biffState-NewMail, isServer-true, isSecure-true) {
-  -moz-image-region: rect(16px 32px 32px 16px);
-}
-
-/* ..... Local folders ..... */
-
-treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-none) {
-  -moz-image-region: rect(0 48px 16px 32px);
-}
-
-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) {
-  -moz-image-region: rect(0 64px 16px 48px) !important;
-}
-
-treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp, isSecure-true) {
-  -moz-image-region: rect(0 80px 16px 64px) !important;
-}
-
-/* ..... Newsgroup ..... */
-
-treechildren::-moz-tree-image(folderNameCol, serverType-nntp) {
-  -moz-image-region: rect(0 160px 16px 144px);
-}
-
-/* ::::: All Servers ::::: */
-
-treechildren::-moz-tree-cell-text(closed, subfoldersHaveUnreadMessages-true) {
-  font-weight: bold;
-}
-
-treechildren::-moz-tree-cell-text(folderNameCol, isServer-true),
-treechildren::-moz-tree-cell-text(hasUnreadMessages-true) {
-  font-weight: bold;
-}
-
-treechildren::-moz-tree-cell-text(folderNameCol, noSelect-true) {
-  color: gray;
-  font-style: italic;
-}
-
-/* ::::: Download Icons ::::: */
-
 treechildren::-moz-tree-image(syncCol) {
   list-style-image: url("chrome://messenger/skin/icons/notchecked.gif");
 }
 
 treechildren::-moz-tree-image(syncCol, synchronize-true) {
   list-style-image: url("chrome://messenger/skin/icons/check.gif");
 }
 
--- a/mail/themes/gnomestripe/mail/newsblog/feed-subscriptions.css
+++ b/mail/themes/gnomestripe/mail/newsblog/feed-subscriptions.css
@@ -31,44 +31,48 @@
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ****** */
 
-/* ::::: Feed Subscription UI icons :::::: */
+/* ::::: Feed Subscription styling :::::: */
 
-#subscriptionsDialog { 
+#subscriptionsDialog {
   padding: 0px;
 }
 
 #contentPane {
   margin: 9px 8px 5px;
 }
 
 #subscriptionChildren::-moz-tree-image(folderNameCol) {
-  -moz-margin-end: 2px;
-  list-style-image: url("chrome://messenger-newsblog/skin/icons/rss-feed.png");
-  -moz-image-region: rect(0 16px 16px 0);
+  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
+  -moz-image-region: rect(128px 16px 144px 0px);
 }
 
 #subscriptionChildren::-moz-tree-image(folderNameCol, container) {
-  list-style-image: url("chrome://messenger/skin/icons/folder.png");
-  -moz-image-region: rect(0 16px 16px 0);
-}
+  background-position: center center;
+  background-repeat: no-repeat;
+  background-color: transparent;
+  background-attachment: scroll;
+  -moz-background-clip: border;
+  -moz-background-inline-policy: continuous;
+  -moz-background-origin: border;
+  background-image: url("moz-icon://stock/gtk-directory?size=menu");
+  list-style-image: url("chrome://messenger/skin/icons/folder-blank.png");
 
-#subscriptionChildren::-moz-tree-image(folderNameCol, container, open) {
-  -moz-image-region: rect(0 32px 16px 16px);
+  -moz-margin-end: 2px;
 }
 
 #rssFeedInfoBox {
   border: 1px solid ThreeDShadow;
   -moz-border-radius: 0px;
   margin: 4px;
   padding: 0px;
 }
 
 #backgroundBox {
-  background-color: #FFFFFF; 
+  background-color: #FFFFFF;
   opacity: 0.5;
 }
--- a/mail/themes/gnomestripe/mail/subscribe.css
+++ b/mail/themes/gnomestripe/mail/subscribe.css
@@ -1,13 +1,14 @@
 /* ===== subscribe.css ==================================================
   == Styles for the Subscribe dialog.
   ======================================================================= */
 
 @import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/folderMenus.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: Subscription Icons  :::::: */
 
 treechildren::-moz-tree-image(subscribedColumn),
 treechildren::-moz-tree-image(subscribedColumn2) {
   -moz-margin-end: 2px;
@@ -23,40 +24,33 @@ treechildren::-moz-tree-image(subscribed
   list-style-image: none;
 }
 
 treechildren::-moz-tree-cell-text(nameColumn, Subscribable-false) {
   color: gray;
   font-style: italic;
 }
 
-/* ::::: Folders :::::: */
+/* IMAP Folders*/
+treechildren::-moz-tree-image(nameColumn) {
+  background-position: center center;
+  background-repeat: no-repeat;
+  background-color: transparent;
+  background-attachment: scroll;
+  -moz-background-clip: border;
+  -moz-background-inline-policy: continuous;
+  -moz-background-origin: border;
+  background-image: url("moz-icon://stock/gtk-directory?size=menu");
+  list-style-image: url("chrome://messenger/skin/icons/folder-blank.png");
 
-treechildren::-moz-tree-image(nameColumn) {
   -moz-margin-end: 2px;
-  list-style-image: url("chrome://messenger/skin/icons/folder.png");
-  -moz-image-region: rect(0 16px 16px 0);
-}
-
-treechildren::-moz-tree-image(nameColumn, ServerType-nntp),
-treechildren::-moz-tree-image(nameColumn2, nntp) {
-  -moz-margin-end: 2px;
-  -moz-image-region: rect(0 160px 16px 144px);
 }
 
-/* ::::: Servers :::::: */
+/* Newsgroups */
+treechildren::-moz-tree-image(nameColumn, ServerType-nntp),
+treechildren::-moz-tree-image(nameColumn2, nntp) {
+  background-image: url("chrome://messenger/skin/icons/folder-pane.png");
+  background-position: left -208px;
+  list-style-image: url("chrome://messenger/skin/icons/folder-blank.png");
 
-.subscribeMenuItem {
-  list-style-image: url("chrome://messenger/skin/icons/server.png");
-  -moz-image-region: rect(0 16px 16px 0);
+  -moz-margin-end: 2px;
 }
 
-.subscribeMenuItem[ServerType="imap"][IsSecure="true"] {
-  -moz-image-region: rect(0 32px 16px 16px);
-}
-
-.subscribeMenuItem[ServerType="nntp"] {
-  -moz-image-region: rect(0 64px 16px 48px);
-}
-
-.subscribeMenuItem[ServerType="nntp"][IsSecure="true"] {
-  -moz-image-region: rect(0 80px 16px 64px);
-}
--- a/mailnews/base/search/content/FilterEditor.xul
+++ b/mailnews/base/search/content/FilterEditor.xul
@@ -33,16 +33,17 @@
  decision by deleting the provisions above and replace them with the notice
  and other provisions required by the GPL or the LGPL. If you do not delete
  the provisions above, a recipient may use your version of this file under
  the terms of any one of the MPL, the GPL or the LGPL.
 
  ***** END LICENSE BLOCK ***** -->
 
 <?xml-stylesheet href="chrome://messenger/skin/filterDialog.css" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/folderPane.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/folderMenus.css" type="text/css"?>
 
 <?xul-overlay href="chrome://messenger/content/searchTermOverlay.xul"?>
 
 <!DOCTYPE dialog SYSTEM "chrome://messenger/locale/FilterEditor.dtd">
 
 <dialog id="FilterEditor"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"