Bug 1635077 - Apply the Folder Pane photon icons to the folder menus. r=aleca
authorRichard Marti <richard.marti@gmail.com>
Mon, 04 May 2020 13:08:17 +0200
changeset 39056 a78acd79c5b141c8492e63303b1c0820289d8a0b
parent 39055 06b4fa036ccda170128e73093c437e9d545a9ba7
child 39057 029fd20ab19e7ff00f6883632e8c2ac909cbaef2
push id402
push userclokep@gmail.com
push dateMon, 29 Jun 2020 20:48:04 +0000
reviewersaleca
bugs1635077
Bug 1635077 - Apply the Folder Pane photon icons to the folder menus. r=aleca
mail/themes/linux/mail/accountManage.css
mail/themes/linux/mail/compose/messengercompose.css
mail/themes/linux/mail/folderMenus.css
mail/themes/linux/mail/icons/folder-pane.png
mail/themes/linux/mail/mailWindow1.css
mail/themes/linux/mail/messenger.css
mail/themes/linux/mail/subscribe.css
mail/themes/osx/jar.mn
mail/themes/osx/mail/accountManage.css
mail/themes/osx/mail/compose/messengercompose.css
mail/themes/osx/mail/folderMenus.css
mail/themes/osx/mail/icons/folder-pane.png
mail/themes/osx/mail/icons/folder-pane@2x.png
mail/themes/osx/mail/mailWindow1.css
mail/themes/osx/mail/msgSelectOffline.css
mail/themes/osx/mail/newsblog/feed-subscriptions.css
mail/themes/osx/mail/subscribe.css
mail/themes/shared/jar.inc.mn
mail/themes/shared/mail/accountManage.css
mail/themes/shared/mail/folderMenus.css
mail/themes/shared/mail/messengercompose.css
mail/themes/windows/jar.mn
mail/themes/windows/mail/accountManage.css
mail/themes/windows/mail/compose/messengercompose.css
mail/themes/windows/mail/folderMenus.css
mail/themes/windows/mail/icons/folder.png
mail/themes/windows/mail/mailWindow1.css
mail/themes/windows/mail/msgSelectOffline.css
mail/themes/windows/mail/newsblog/feed-subscriptions.css
mail/themes/windows/mail/subscribe.css
--- a/mail/themes/linux/mail/accountManage.css
+++ b/mail/themes/linux/mail/accountManage.css
@@ -4,19 +4,14 @@
 
 @import url("chrome://messenger/skin/shared/accountManage.css");
 
 window > vbox,
 #accountTreeBox {
   font-size: 1.11em;
 }
 
-treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-smtp) {
-  list-style-image: url("chrome://messenger/skin/icons/server.png");
-  -moz-image-region: rect(16px 64px 32px 48px);
-}
-
 #accountActionsButton > .button-box > .button-menu-dropmarker {
   margin-inline-end: 4px;
   list-style-image: url("chrome://global/skin/icons/arrow-dropdown-12.svg");
   -moz-context-properties: fill;
   fill: currentColor;
 }
--- a/mail/themes/linux/mail/compose/messengercompose.css
+++ b/mail/themes/linux/mail/compose/messengercompose.css
@@ -142,21 +142,16 @@ menulist:-moz-locale-dir(rtl)::part(labe
 
 /* ::::: autocomplete icons ::::: */
 
 .ac-site-icon {
   display: -moz-box;
   margin: 1px 5px;
 }
 
-.autocomplete-richlistitem[type="subscribed-news"] > .ac-site-icon {
-  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  -moz-image-region: rect(208px 16px 224px 0);
-}
-
 #composeContentBox {
   background-color: -moz-dialog;
   box-shadow: 0 1px 4px rgba(0, 0, 0, 0.2) inset;
 }
 
 #composeContentBox:-moz-window-inactive {
   box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1) inset;
 }
--- a/mail/themes/linux/mail/folderMenus.css
+++ b/mail/themes/linux/mail/folderMenus.css
@@ -1,111 +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/. */
 
 /* ===== 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   ::::: */
-
-/* Folders */
-.folderMenuItem {
-  list-style-image: url("moz-icon://stock/gtk-directory?size=menu");
-}
-
-/* Newsgroup */
-.folderMenuItem[ServerType="nntp"] {
-  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  -moz-image-region: rect(208px 16px 224px 0px);
-}
-
-/* Feed folder */
-.folderMenuItem[IsFeedFolder="true"] {
-  list-style-image: url("chrome://messenger-newsblog/skin/rss-feed-folder.png");
-  -moz-image-region: auto;
-}
-
-.folderMenuItem[SpecialFolder="Inbox"] {
-  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  -moz-image-region: rect(64px 16px 80px 0px);
-}
-
-.folderMenuItem[SpecialFolder="Sent"] {
-  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  -moz-image-region: rect(144px 16px 160px 0px);
-}
-
-.folderMenuItem[SpecialFolder="Outbox"] {
-  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  -moz-image-region: rect(96px 16px 112px 0px);
-}
-
-.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"] {
-  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  -moz-image-region: rect(160px 16px 176px 0px);
-}
+@import url("chrome://messenger/skin/shared/folderMenus.css");
 
-.folderMenuItem[SpecialFolder="Junk"] {
-  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  -moz-image-region: rect(80px 16px 96px 0px);
-}
-
-.folderMenuItem[SpecialFolder="Trash"] {
-  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"] {
-  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  -moz-image-region: rect(128px 16px 144px 0px);
-
-}
-
-/** IMAP/POP/movemail account nodes */
-.folderMenuItem[IsServer="true"] {
-  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  -moz-image-region: rect(16px 16px 32px 0px);
-}
-
-/* Local folders account node */
-.folderMenuItem[IsServer="true"][ServerType="none"] {
-  -moz-image-region: rect(0px 16px 16px 0px);
-}
-
-/* News server */
-.folderMenuItem[IsServer="true"][ServerType="nntp"] {
-  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"] {
-  list-style-image: url("chrome://messenger/skin/icons/server.png");
-  -moz-image-region: rect(0px 80px 16px 64px);
-}
-
-/* Feed server */
-.folderMenuItem[IsServer="true"][ServerType="rss"] {
-  list-style-image: url("chrome://messenger-newsblog/skin/rss-feed.png");
-  -moz-image-region: rect(0 16px 16px 0);
-}
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 .folderMenuItem .menu-iconic-left {
   visibility: visible;
 }
 
 menulist.folderMenuItem::part(icon) {
   width: 16px;
   height: 16px;
index df99485d39e7049d1d654e58ae1c56faee924991..9603296185cdcd77483fb0aa1a67f1c6ade57083
GIT binary patch
literal 550
zc$@(y0@?kEP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005)Nkl<Zc-p0s
z%S#(k6o+G?HW9ljxRQbjqLxB!Bi*{`KTzpHFfqo*LSjL2Ve2zNbkSuMT$Q4@5m&*8
zx)F>IM3@=WCYnIVBvP#?_(&o)#-HcjBxA=;LFmB8xpO(^yXQW1y8rzIyU8h7^fy9-
z4l0@p+>aAb@h^`H4-qUmsmBQ#bhoTvqwkFZ7qBj@`lL37-_+rkOb0nBF6cL_1S;m8
zIPws43>SW~1+0eatl;Lz-H(ml*F-gE>tiwgI+F}roh2l7vhi(p3y|z4h<2mGZs&8v
zf(uAQ*Hy%Vi}=x9#?FV!xInb!rxPNp3Mbxi1cu*|%mja51?0&OIP`Sjbn`3X;boq$
z7ElpOV94L=;QLgCOaBs5*D)S_J(YYuo5Kavg{Hv&xf~b11<2oQv^67-?4Qlw3)V=W
z*A|FPPiW;hFAj~p<1raK<@1Ulvc|6X9~}(6!1=Zt(P;;ywn9Xw+G)idY<CplaL%C!
zM5{qt5SgyWZdWPJgjpmnk8wrCiLi*^NG<jTUuFcW5F2x~1&o84Mg&I9*l|1~Suyqo
z%p^PEl6}`JBxElM@*ZBJ7jgMdRun>G?-8Kl@Pq~XgEfeUmLb|Q0(PHF!l8qbnv7}a
o4Jb4hKx!$3)cQ0XiR?SL13}S4rW5<O_W%F@07*qoM6N<$f{`@&bpQYW
--- a/mail/themes/linux/mail/mailWindow1.css
+++ b/mail/themes/linux/mail/mailWindow1.css
@@ -5,17 +5,16 @@
 */
 
 /* ===== mailWindow1.css ================================================
   == Styles for the main Mail window in the default layout scheme.
   ======================================================================= */
 
 @import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/primaryToolbar.css");
-@import url("chrome://messenger/skin/folderMenus.css");
 @import url("chrome://messenger/skin/folderPane.css");
 @import url("chrome://messenger/skin/messageIcons.css");
 @import url("chrome://messenger/skin/shared/mailWindow1.css");
 
 #messengerBox {
   background-color: -moz-Dialog;
 }
 
--- a/mail/themes/linux/mail/messenger.css
+++ b/mail/themes/linux/mail/messenger.css
@@ -528,17 +528,16 @@ treecol.treecol-image:hover:active {
 }
 
 #menu_newFolder {
   list-style-image: url("moz-icon://stock/gtk-directory?size=menu");
 }
 
 #menu_newVirtualFolder {
   list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  -moz-image-region: rect(128px 16px 144px 0px);
 }
 
 #openMessageFileMenuitem {
   list-style-image: url("moz-icon://stock/gtk-open?size=menu");
 }
 
 #menu_close {
   list-style-image: url("moz-icon://stock/gtk-close?size=menu");
--- a/mail/themes/linux/mail/subscribe.css
+++ b/mail/themes/linux/mail/subscribe.css
@@ -2,17 +2,16 @@
  * 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/. */
 
 /* ===== subscribe.css ==================================================
   == Styles for the Subscribe dialog.
   ======================================================================= */
 
 @import url("chrome://messenger/skin/messenger.css");
-@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) {
   margin-inline-end: 2px;
@@ -30,20 +29,19 @@ treechildren::-moz-tree-image(subscribed
 
 treechildren::-moz-tree-cell-text(nameColumn, subscribable-false) {
   color: gray;
   font-style: italic;
 }
 
 /* IMAP Folders*/
 treechildren::-moz-tree-image(nameColumn) {
-  list-style-image: url("moz-icon://stock/gtk-directory?size=menu");
+  list-style-image: url("chrome://messenger/skin/icons/folder.svg");
   margin-inline-end: 2px;
 }
 
 /* Newsgroups */
 treechildren::-moz-tree-image(nameColumn, serverType-nntp),
 treechildren::-moz-tree-image(nameColumn2, serverType-nntp) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  -moz-image-region: rect(208px 16px 224px 0px);
+  list-style-image: url("chrome://messenger/skin/icons/globe.svg");
   margin-inline-end: 2px;
 }
 
--- a/mail/themes/osx/jar.mn
+++ b/mail/themes/osx/jar.mn
@@ -107,18 +107,16 @@ classic.jar:
   skin/classic/messenger/icons/twisty-open.gif                   (mail/icons/twisty-open.gif)
   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/check.png                         (mail/icons/check.png)
   skin/classic/messenger/icons/dot.png                           (mail/icons/dot.png)
   skin/classic/messenger/icons/dot.svg                           (mail/icons/dot.svg)
   skin/classic/messenger/icons/flag-col.png                      (mail/icons/flag-col.png)
   skin/classic/messenger/icons/flaggedmail.png                   (mail/icons/flaggedmail.png)
-  skin/classic/messenger/icons/folder-pane.png                   (mail/icons/folder-pane.png)
-  skin/classic/messenger/icons/folder-pane@2x.png                (mail/icons/folder-pane@2x.png)
   skin/classic/messenger/icons/exclude.png                       (mail/icons/exclude.png)
   skin/classic/messenger/icons/exclude-selected.png              (mail/icons/exclude-selected.png)
   skin/classic/messenger/icons/multicolor.png                    (mail/icons/multicolor.png)
   skin/classic/messenger/icons/secure.png                        (mail/icons/secure.png)
   skin/classic/messenger/icons/server.png                        (mail/icons/server.png)
   skin/classic/messenger/icons/server@2x.png                     (mail/icons/server@2x.png)
   skin/classic/messenger/icons/chat-16@2x.png                    (mail/icons/chat-16@2x.png)
   skin/classic/messenger/icons/insecure.png                      (mail/icons/insecure.png)
--- a/mail/themes/osx/mail/accountManage.css
+++ b/mail/themes/osx/mail/accountManage.css
@@ -4,50 +4,26 @@
 
 @import url("chrome://messenger/skin/shared/accountManage.css");
 
 window > vbox,
 #accountTreeBox {
   font-size: 1.36em;
 }
 
-treechildren::-moz-tree-cell-text(folderNameCol, isServer-true) {
-  font-weight: bold;
-}
-
-treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-smtp) {
-  list-style-image: url("chrome://messenger/skin/icons/server.png");
-  -moz-image-region: rect(0 112px 16px 96px);
-}
-
-@media (min-resolution: 2dppx) {
-  treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-smtp) {
-    list-style-image: url("chrome://messenger/skin/icons/server@2x.png");
-    -moz-image-region: rect(0 224px 32px 192px);
-  }
-
-  treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-im) {
-    list-style-image: url("chrome://chat/skin/prpl-generic/icon32.png");
-  }
-}
-
-button {
-  min-height: 19px; /* aqua size for small buttons */
-}
-
 description {
   margin: 4px 4px 8px;
 }
 
 menulist > menupopup .menu-right {
   margin-inline: 0;
 }
 
 #archiveTree > treechildren {
-  background-color: #FFFFFF;
+  background-color: #fff;
 }
 
 #accountActionsButton> .button-box > .button-menu-dropmarker {
   -moz-appearance: none;
   display: -moz-box;
   list-style-image: url("chrome://global/skin/icons/arrow-dropdown-12.svg");
   -moz-context-properties: fill;
   fill: currentColor;
--- a/mail/themes/osx/mail/compose/messengercompose.css
+++ b/mail/themes/osx/mail/compose/messengercompose.css
@@ -214,25 +214,16 @@ toolbar[nowindowdrag="true"] {
 
 /* ::::: autocomplete icons ::::: */
 
 .ac-site-icon {
   display: -moz-box;
   margin: 2px 5px;
 }
 
-.autocomplete-richlistitem[type="subscribed-news"] > .ac-site-icon {
-  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  -moz-image-region: rect(0 160px 16px 144px);
-}
-
-menulist::part(description) {
-  color: #999;
-}
-
 /* ::::: compose toolbar sizer ::::: */
 
 #compose-toolbar-sizer {
   position: relative;
   z-index: 10;
   min-height: 0;
   height: 5px;
   margin-top: -5px;
--- a/mail/themes/osx/mail/folderMenus.css
+++ b/mail/themes/osx/mail/folderMenus.css
@@ -1,207 +1,29 @@
 /* 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/. */
 
 /* ===== 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 ::::: */
-
-.folderMenuItem {
-  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  -moz-image-region: rect(0 16px 16px 0);
-}
-
-/* News folders */
-.folderMenuItem[ServerType="nntp"] {
-  -moz-image-region: rect(0 160px 16px 144px);
-}
-
-/* Feed folders */
-.folderMenuItem[IsFeedFolder="true"] {
-  list-style-image: url("chrome://messenger-newsblog/skin/rss-feed-folder.png");
-  -moz-image-region: auto;
-}
-
-/* ..... special folders ..... */
-
-.folderMenuItem[SpecialFolder="Inbox"] {
-  -moz-image-region: rect(0 48px 16px 32px);
-}
-
-.folderMenuItem[SpecialFolder="Sent"] {
-  -moz-image-region: rect(0 64px 16px 48px);
-}
-
-.folderMenuItem[SpecialFolder="Outbox"] {
-  -moz-image-region: rect(0 80px 16px 64px);
-}
-
-.folderMenuItem[SpecialFolder="Drafts"] {
-    -moz-image-region: rect(0 96px 16px 80px);
-}
-
-.folderMenuItem[SpecialFolder="Templates"] {
-  -moz-image-region: rect(0 112px 16px 96px);
-}
-
-.folderMenuItem[SpecialFolder="Junk"] {
-  -moz-image-region: rect(0 128px 16px 112px);
-}
+@import url("chrome://messenger/skin/shared/folderMenus.css");
 
-.folderMenuItem[SpecialFolder="Trash"] {
-  -moz-image-region: rect(0 144px 16px 128px);
-}
-
-.folderMenuItem[SpecialFolder="Virtual"] {
-  -moz-image-region: rect(0 176px 16px 160px);
-}
-
-.folderMenuItem[SpecialFolder="Archive"] {
-  -moz-image-region: rect(0 208px 16px 192px);
-}
-
-/* ..... servers ..... */
-.folderMenuItem[IsServer="true"] {
-  list-style-image: url("chrome://messenger/skin/icons/server.png");
-}
-
-/* IMAP servers */
-.folderMenuItem[IsServer="true"][ServerType="imap"][IsSecure="true"] {
-  -moz-image-region: rect(0 32px 16px 16px);
-}
-
-/* POP3 servers */
-.folderMenuItem[IsServer="true"][ServerType="pop3"][IsSecure="true"] {
-  -moz-image-region: rect(0 32px 16px 16px);
-}
-
-/* Local Servers */
-.folderMenuItem[IsServer="true"][ServerType="none"] {
-  -moz-image-region: rect(0 48px 16px 32px);
-}
-
-/* News servers */
-.folderMenuItem[IsServer="true"][ServerType="nntp"] {
-  -moz-image-region: rect(0 64px 16px 48px);
-}
-
-.folderMenuItem[IsServer="true"][ServerType="nntp"][IsSecure="true"] {
-  -moz-image-region: rect(0 80px 16px 64px);
-}
-
-/* Feed servers */
-.folderMenuItem[IsServer="true"][ServerType="rss"] {
-  list-style-image: url("chrome://messenger-newsblog/skin/rss-feed.png");
-  -moz-image-region: rect(0 16px 16px 0);
-}
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 .folderMenuItem > .menu-right {
   width: 9px;
   height: 10px;
 }
 
 @media (min-resolution: 2dppx) {
   .folderMenuItem > .menu-iconic-left > .menu-iconic,
   .folderMenuItem::part(icon) {
     width: 16px;
     height: 16px;
   }
-
-  .folderMenuItem {
-    list-style-image: url("chrome://messenger/skin/icons/folder-pane@2x.png");
-    -moz-image-region: rect(0 32px 32px 0);
-  }
-
-  /* News folders */
-  .folderMenuItem[ServerType="nntp"] {
-    -moz-image-region: rect(0 320px 32px 288px);
-  }
-
-  /* Feed folders */
-  .folderMenuItem[IsFeedFolder="true"] {
-    list-style-image: url("chrome://messenger-newsblog/skin/rss-feed-folder@2x.png");
-    -moz-image-region: auto;
-  }
-
-  /* ..... special folders ..... */
-
-  .folderMenuItem[SpecialFolder="Inbox"] {
-    -moz-image-region: rect(0 96px 32px 64px);
-  }
-
-  .folderMenuItem[SpecialFolder="Sent"] {
-    -moz-image-region: rect(0 128px 32px 96px);
-  }
-
-  .folderMenuItem[SpecialFolder="Outbox"] {
-    -moz-image-region: rect(0 160px 32px 128px);
-  }
-
-  .folderMenuItem[SpecialFolder="Drafts"] {
-    -moz-image-region: rect(0 192px 32px 160px);
-  }
-
-  .folderMenuItem[SpecialFolder="Templates"] {
-    -moz-image-region: rect(0 224px 32px 192px);
-  }
-
-  .folderMenuItem[SpecialFolder="Junk"] {
-    -moz-image-region: rect(0 256px 32px 224px);
-  }
-
-  .folderMenuItem[SpecialFolder="Trash"] {
-    -moz-image-region: rect(0 288px 32px 256px);
-  }
-
-  .folderMenuItem[SpecialFolder="Virtual"] {
-    -moz-image-region: rect(0 352px 32px 320px);
-  }
-
-  .folderMenuItem[SpecialFolder="Archive"] {
-    -moz-image-region: rect(0 416px 32px 384px);
-  }
-
-  /* ..... servers ..... */
-  .folderMenuItem[IsServer="true"] {
-    list-style-image: url("chrome://messenger/skin/icons/server@2x.png");
-  }
-
-  /* IMAP servers */
-  .folderMenuItem[IsServer="true"][ServerType="imap"][IsSecure="true"] {
-    -moz-image-region: rect(0 64px 32px 32px);
-  }
-
-  /* POP3 servers */
-  .folderMenuItem[IsServer="true"][ServerType="pop3"][IsSecure="true"] {
-    -moz-image-region: rect(0 64px 32px 32px);
-  }
-
-  /* Local Servers */
-  .folderMenuItem[IsServer="true"][ServerType="none"] {
-    -moz-image-region: rect(0 96px 32px 64px);
-  }
-
-  /* News servers */
-  .folderMenuItem[IsServer="true"][ServerType="nntp"] {
-    -moz-image-region: rect(0 128px 32px 96px);
-  }
-
-  .folderMenuItem[IsServer="true"][ServerType="nntp"][IsSecure="true"] {
-    -moz-image-region: rect(0 160px 32px 128px);
-  }
-
-  /* Feed servers */
-  .folderMenuItem[IsServer="true"][ServerType="rss"] {
-    list-style-image: url("chrome://messenger-newsblog/skin/rss-feed@2x.png");
-    -moz-image-region: rect(0 32px 32px 0);
-  }
 }
 
 .menulist-menupopup[is="folder-menupopup"] {
   list-style-image: none;
   -moz-image-region: unset;
 }
deleted file mode 100644
index 9c0a877a2b1319f706bd7ecf2a041a20948822fa..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 5e58f165af0e105ad1ed2315655ef96054b9ed4e..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/mail/themes/osx/mail/mailWindow1.css
+++ b/mail/themes/osx/mail/mailWindow1.css
@@ -5,17 +5,16 @@
 */
 
 /* ===== mailWindow1.css ================================================
   == Styles for the main Mail window in the default layout scheme.
   ======================================================================= */
 
 @import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/primaryToolbar.css");
-@import url("chrome://messenger/skin/folderMenus.css");
 @import url("chrome://messenger/skin/folderPane.css");
 @import url("chrome://messenger/skin/messageIcons.css");
 @import url("chrome://messenger/skin/shared/mailWindow1.css");
 
 #messengerBox:-moz-lwtheme {
   background-color: -moz-OddTreeRow;
 }
 
--- a/mail/themes/osx/mail/msgSelectOffline.css
+++ b/mail/themes/osx/mail/msgSelectOffline.css
@@ -2,142 +2,20 @@
  * 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/. */
 
 /* ===== msgSelectOffline.css =================================================
   == Styles for the Offline Use dialog.
   ======================================================================= */
 
 @import url("chrome://messenger/skin/messenger.css");
+@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) {
-  margin-inline-end: 2px;
-  list-style-image: url("chrome://messenger/skin/icons/folder-pane.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-pane.png");
-  -moz-image-region: rect(0 16px 16px 0);
-}
-
-/* ..... Inbox ..... */
-
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Inbox),
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Inbox, newMessages-true) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  -moz-image-region: rect(0 48px 16px 32px);
-}
-
-/* ..... Sent ..... */
-
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Sent) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  -moz-image-region: rect(0 64px 16px 48px);
-}
-
-/* ..... Unsent ..... */
-
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Outbox) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-pane.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-pane.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-pane.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-pane.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-pane.png");
-  -moz-image-region: rect(0 144px 16px 128px);
-}
-
-/* ..... Servers ..... */
-
-treechildren::-moz-tree-image(folderNameCol, isServer-true),
-treechildren::-moz-tree-image(folderNameCol, biffState-NewMail, isServer-true) {
-  list-style-image: url("chrome://messenger/skin/icons/server.png");
-  -moz-image-region: rect(0 16px 16px 0);
-}
-
-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, imapShared-true) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  -moz-image-region: rect(0 192px 16px 176px);
-}
-
-
-/* ..... Server Folders ..... */
-
-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.png");
-  -moz-image-region: rect(0 32px 16px 16px);
-}
-
-treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-none) {
-  list-style-image: url("chrome://messenger/skin/icons/server.png");
-  -moz-image-region: rect(0 16px 16px 0);
-}
-
-/* ..... News Folders ..... */
-
-treechildren::-moz-tree-image(folderNameCol, serverType-nntp) {
-  list-style-image: url("chrome://messenger/skin/icons/server.png");
-  -moz-image-region: rect(0 80px 16px 64px);
-}
-
-treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp) {
-  list-style-image: url("chrome://messenger/skin/icons/server.png");
-  -moz-image-region: rect(0 64px 16px 48px);
-}
-
-treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp, isSecure-true) {
-  list-style-image: url("chrome://messenger/skin/icons/server.png");
-  -moz-image-region: rect(0 32px 16px 16px);
-}
-
-/* ::::: 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) {
--- a/mail/themes/osx/mail/newsblog/feed-subscriptions.css
+++ b/mail/themes/osx/mail/newsblog/feed-subscriptions.css
@@ -20,8 +20,13 @@
 
 #statusContainerBox {
   height: 2.3em;
 }
 
 #autotagPrefix {
   width: 35ch;
 }
+
+#rssSubscriptionsList > treechildren::-moz-tree-image {
+  width: 16px;
+  height: 16px;
+}
--- a/mail/themes/osx/mail/subscribe.css
+++ b/mail/themes/osx/mail/subscribe.css
@@ -22,40 +22,30 @@ treechildren::-moz-tree-image(subscribed
 treechildren::-moz-tree-image(subscribedColumn2, subscribed-true) {
   list-style-image: url("chrome://messenger/skin/icons/check.png");
 }
 
 /* ::::: folder icons :::::: */
 
 treechildren::-moz-tree-image(nameColumn) {
   margin-inline-end: 2px;
-  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  -moz-image-region: rect(0 16px 16px 0);
+  list-style-image: url("chrome://messenger/skin/icons/folder.svg");
 }
 
 treechildren::-moz-tree-image(nameColumn, serverType-nntp),
 treechildren::-moz-tree-image(nameColumn2, serverType-nntp) {
   margin-inline-end: 2px;
-  list-style-image: url("chrome://messenger/skin/icons/server.png");
-  -moz-image-region: rect(0 80px 16px 64px);
+  list-style-image: url("chrome://messenger/skin/icons/globe.svg");
 }
 
 /* ::::: server icons :::::: */
 
 .subscribeMenuItem {
-  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/message.svg");
 }
 
 .subscribeMenuItem[ServerType="imap"][IsSecure="true"] {
-  list-style-image: url("chrome://messenger/skin/icons/server.png");
-  -moz-image-region: rect(0 32px 16px 16px);
+  list-style-image: url("chrome://messenger/skin/icons/message-secure.svg");
 }
 
 .subscribeMenuItem[ServerType="nntp"] {
-  list-style-image: url("chrome://messenger/skin/icons/server.png");
-  -moz-image-region: rect(0 64px 16px 48px);
+  list-style-image: url("chrome://messenger/skin/icons/globe.svg");
 }
-
-.subscribeMenuItem[ServerType="nntp"][IsSecure="true"] {
-  list-style-image: url("chrome://messenger/skin/icons/server.png");
-  -moz-image-region: rect(0 32px 16px 16px);
-}
--- a/mail/themes/shared/jar.inc.mn
+++ b/mail/themes/shared/jar.inc.mn
@@ -164,16 +164,17 @@
   skin/classic/messenger/shared/accountCreation.css           (../shared/mail/accountCreation.css)
   skin/classic/messenger/shared/newInstallPage.css            (../shared/mail/newInstallPage.css)
   skin/classic/messenger/shared/accountManage.css             (../shared/mail/accountManage.css)
   skin/classic/messenger/shared/accountProvisioner.css        (../shared/mail/accountProvisioner.css)
   skin/classic/messenger/shared/addressbook.css               (../shared/mail/addressbook.css)
   skin/classic/messenger/shared/compacttheme.css              (../shared/mail/compacttheme.css)
   skin/classic/messenger/shared/creationDialog.css            (../shared/mail/creationDialog.css)
   skin/classic/messenger/shared/EditorDialog.css              (../shared/mail/EditorDialog.css)
+  skin/classic/messenger/shared/folderMenus.css               (../shared/mail/folderMenus.css)
   skin/classic/messenger/shared/folderPane.css                (../shared/mail/folderPane.css)
   skin/classic/messenger/shared/preferences/applications.css  (../shared/mail/preferences/applications.css)
   skin/classic/messenger/shared/preferences/dialog.css        (../shared/mail/preferences/dialog.css)
   skin/classic/messenger/shared/preferences/passwordmgr.css   (../shared/mail/preferences/passwordmgr.css)
   skin/classic/messenger/shared/preferences/preferences.css   (../shared/mail/preferences/preferences.css)
   skin/classic/messenger/shared/preferences/calendar.svg      (../shared/mail/preferences/calendar.svg)
   skin/classic/messenger/shared/preferences/chat.svg          (../shared/mail/preferences/chat.svg)
   skin/classic/messenger/shared/preferences/general.svg       (../shared/mail/preferences/general.svg)
--- a/mail/themes/shared/mail/accountManage.css
+++ b/mail/themes/shared/mail/accountManage.css
@@ -175,18 +175,22 @@ richlistitem[default="true"],
 #identitiesList > richlistitem:first-child {
   font-weight: bold;
 }
 
 treechildren::-moz-tree-cell-text(isDefaultServer-true) {
   text-decoration: underline;
 }
 
+treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-smtp) {
+  list-style-image: url("chrome://messenger/skin/icons/outbox.svg");
+}
+
 treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-im) {
-  list-style-image: url("chrome://chat/skin/prpl-generic/icon.png");
+  list-style-image: url("chrome://messenger/skin/icons/chat.svg");
 }
 
 #accounttree treechildren::-moz-tree-indentation {
   width: 1ch;
 }
 
 .label-inline {
   margin-block: auto;
copy from mail/themes/linux/mail/folderMenus.css
copy to mail/themes/shared/mail/folderMenus.css
--- a/mail/themes/linux/mail/folderMenus.css
+++ b/mail/themes/shared/mail/folderMenus.css
@@ -3,115 +3,101 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== folderMenus.css ================================================
   == Icons for menus which represent mail folder.
   ======================================================================= */
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
+menulist.folderMenuItem::part(icon) {
+  opacity: 0.85;
+}
+
 /* ::::: Folder icons for menus   ::::: */
 
 /* Folders */
 .folderMenuItem {
-  list-style-image: url("moz-icon://stock/gtk-directory?size=menu");
+  list-style-image: url("chrome://messenger/skin/icons/folder.svg");
+  opacity: 0.85;
+  -moz-context-properties: fill;
+  fill: currentColor;
 }
 
 /* Newsgroup */
 .folderMenuItem[ServerType="nntp"] {
-  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  -moz-image-region: rect(208px 16px 224px 0px);
+  list-style-image: url("chrome://messenger/skin/icons/newsgroup.svg");
 }
 
 /* Feed folder */
 .folderMenuItem[IsFeedFolder="true"] {
-  list-style-image: url("chrome://messenger-newsblog/skin/rss-feed-folder.png");
-  -moz-image-region: auto;
+  list-style-image: url("chrome://messenger/skin/icons/subscribe.svg");
 }
 
+/* Special folders */
+
 .folderMenuItem[SpecialFolder="Inbox"] {
-  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  -moz-image-region: rect(64px 16px 80px 0px);
+  list-style-image: url("chrome://messenger/skin/icons/inbox.svg");
 }
 
 .folderMenuItem[SpecialFolder="Sent"] {
-  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  -moz-image-region: rect(144px 16px 160px 0px);
+  list-style-image: url("chrome://messenger/skin/icons/sent.svg");
 }
 
 .folderMenuItem[SpecialFolder="Outbox"] {
-  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  -moz-image-region: rect(96px 16px 112px 0px);
+  list-style-image: url("chrome://messenger/skin/icons/outbox.svg");
 }
 
 .folderMenuItem[SpecialFolder="Drafts"] {
-  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  -moz-image-region: rect(48px 16px 64px 0px);
+  list-style-image: url("chrome://messenger/skin/icons/file-item.svg");
 }
 
 .folderMenuItem[SpecialFolder="Templates"] {
-  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  -moz-image-region: rect(160px 16px 176px 0px);
+  list-style-image: url("chrome://messenger/skin/icons/template.svg");
 }
 
 .folderMenuItem[SpecialFolder="Junk"] {
-  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  -moz-image-region: rect(80px 16px 96px 0px);
+  list-style-image: url("chrome://messenger/skin/icons/junk.svg");
 }
 
 .folderMenuItem[SpecialFolder="Trash"] {
-  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  -moz-image-region: rect(176px 16px 192px 0px);
+  list-style-image: url("chrome://messenger/skin/icons/delete.svg");
 }
 
 .folderMenuItem[SpecialFolder="Archive"] {
-  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  -moz-image-region: rect(192px 16px 208px 0px);
+  list-style-image: url("chrome://messenger/skin/icons/archive.svg");
 }
 
 .folderMenuItem[SpecialFolder="Virtual"] {
-  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  -moz-image-region: rect(128px 16px 144px 0px);
+  list-style-image: url("chrome://messenger/skin/icons/search-folder.svg");
 
 }
 
-/** IMAP/POP/movemail account nodes */
+/* IMAP/POP server */
 .folderMenuItem[IsServer="true"] {
-  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  -moz-image-region: rect(16px 16px 32px 0px);
+  list-style-image: url("chrome://messenger/skin/icons/message.svg");
 }
 
-/* Local folders account node */
+/* IMAP/POP secure server */
+.folderMenuItem[IsServer="true"][ServerType="imap"][IsSecure="true"],
+.folderMenuItem[IsServer="true"][ServerType="pop3"][IsSecure="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/message-secure.svg");
+}
+
+/* Local server */
 .folderMenuItem[IsServer="true"][ServerType="none"] {
-  -moz-image-region: rect(0px 16px 16px 0px);
+  list-style-image: url("chrome://messenger/skin/icons/folder-local.svg");
 }
 
 /* News server */
 .folderMenuItem[IsServer="true"][ServerType="nntp"] {
-  list-style-image: url("chrome://messenger/skin/icons/server.png");
-  -moz-image-region: rect(0px 64px 16px 48px);
+  list-style-image: url("chrome://messenger/skin/icons/globe.svg");
 }
 
 /** Secure news server */
 .folderMenuItem[IsServer="true"][ServerType="nntp"][IsSecure="true"] {
-  list-style-image: url("chrome://messenger/skin/icons/server.png");
-  -moz-image-region: rect(0px 80px 16px 64px);
+  list-style-image: url("chrome://messenger/skin/icons/globe-secure.svg");
 }
 
 /* Feed server */
 .folderMenuItem[IsServer="true"][ServerType="rss"] {
-  list-style-image: url("chrome://messenger-newsblog/skin/rss-feed.png");
-  -moz-image-region: rect(0 16px 16px 0);
-}
-
-.folderMenuItem .menu-iconic-left {
-  visibility: visible;
+  list-style-image: url("chrome://messenger/skin/icons/subscribe.svg");
 }
-
-menulist.folderMenuItem::part(icon) {
-  width: 16px;
-  height: 16px;
-}
-
-.menulist-menupopup[is="folder-menupopup"] {
-  list-style-image: none;
-  -moz-image-region: unset;
-}
--- a/mail/themes/shared/mail/messengercompose.css
+++ b/mail/themes/shared/mail/messengercompose.css
@@ -453,16 +453,20 @@ menulist::part(description) {
 .autocomplete-richlistitem[type="remote-abook"] > .ac-site-icon {
   list-style-image: url("chrome://messenger/skin/icons/globe.svg");
 }
 
 .autocomplete-richlistitem[type="remote-err"] > .ac-site-icon {
   list-style-image: url("chrome://global/skin/icons/error.svg");
 }
 
+.autocomplete-richlistitem[type="subscribed-news"] > .ac-site-icon {
+  list-style-image: url("chrome://messenger/skin/icons/newsgroup.svg");
+}
+
 /* :::: attachment notification :::: */
 
 #attachmentReminderText {
   margin-inline-start: 0;
   cursor: pointer;
 }
 
 #attachmentKeywords {
--- a/mail/themes/windows/jar.mn
+++ b/mail/themes/windows/jar.mn
@@ -94,17 +94,16 @@ classic.jar:
   skin/classic/messenger/smime/icons/hdrSignOkVerified.png    (mail/smime/hdrSignOkVerified.png)
   skin/classic/messenger/smime/icons/hdrSignOkUnverified.png  (mail/smime/hdrSignOkUnverified.png)
   skin/classic/messenger/smime/icons/hdrSignUnknown.png       (mail/smime/hdrSignUnknown.png)
   skin/classic/messenger/smime/icons/sbCryptoOk.png           (mail/smime/sbCryptoOk.png)
   skin/classic/messenger/smime/icons/sbSignOk.png             (mail/smime/sbSignOk.png)
   skin/classic/messenger/icons/zoomout.png                    (mail/icons/zoomout.png)
   skin/classic/messenger/icons/zoomout-hover.png              (mail/icons/zoomout-hover.png)
   skin/classic/messenger/icons/readmail.png                   (mail/icons/readmail.png)
-  skin/classic/messenger/icons/folder.png                     (mail/icons/folder.png)
   skin/classic/messenger/icons/message.png                    (mail/icons/message.png)
   skin/classic/messenger/icons/multicolor.png                 (mail/icons/multicolor.png)
   skin/classic/messenger/icons/license.txt                    (mail/icons/license.txt)
   skin/classic/messenger/icons/arrow-dn-inverted.png          (mail/icons/arrow-dn-inverted.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/thread.png                     (mail/icons/thread.png)
   skin/classic/messenger/icons/thread-ignored.png             (mail/icons/thread-ignored.png)
--- a/mail/themes/windows/mail/accountManage.css
+++ b/mail/themes/windows/mail/accountManage.css
@@ -3,13 +3,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 @import url("chrome://messenger/skin/shared/accountManage.css");
 
 window > vbox,
 #accountTreeBox {
   font-size: 1.25em;
 }
-
-treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-smtp) {
-  list-style-image: url("chrome://messenger/skin/icons/server.png");
-  -moz-image-region: rect(16px 64px 32px 48px);
-}
--- a/mail/themes/windows/mail/compose/messengercompose.css
+++ b/mail/themes/windows/mail/compose/messengercompose.css
@@ -363,21 +363,16 @@ toolbar:not(:-moz-lwtheme) {
 
 /* ::::: autocomplete icons ::::: */
 
 .ac-site-icon {
   display: -moz-box;
   margin: 1px 5px;
 }
 
-.autocomplete-richlistitem[type="subscribed-news"] > .ac-site-icon {
-  list-style-image: url("chrome://messenger/skin/icons/folder.png");
-  -moz-image-region: rect(0 160px 16px 144px);
-}
-
 @media (-moz-windows-default-theme) {
   menulist,
   menulist[disabled="true"] {
     color: inherit;
     border: 1px solid;
     background: var(--toolbarbutton-hover-background);
     border-color: var(--toolbarbutton-hover-bordercolor);
     box-shadow: var(--toolbarbutton-hover-boxshadow);
--- a/mail/themes/windows/mail/folderMenus.css
+++ b/mail/themes/windows/mail/folderMenus.css
@@ -1,108 +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/. */
 
 /* ===== folderMenus.css ================================================
   == Icons for menus which represent mail folder.
   ======================================================================= */
 
+@import url("chrome://messenger/skin/shared/folderMenus.css");
+
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* Don't apply the here needless -moz-image-region to the dropmarker. */
 menulist::part(dropmarker) {
   -moz-image-region: unset;
 }
 
-/* ::::: 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);
-}
-
-/* Newsgroup */
-.folderMenuItem[ServerType="nntp"] {
-  -moz-image-region: rect(0 160px 16px 144px);
-}
-
-/* Feed folder */
-.folderMenuItem[IsFeedFolder="true"] {
-  list-style-image: url("chrome://messenger-newsblog/skin/rss-feed-folder.png");
-  -moz-image-region: auto;
-}
-
-/* ..... special folders ..... */
-
-.folderMenuItem[SpecialFolder="Inbox"] {
-  -moz-image-region: rect(0 48px 16px 32px);
-}
-
-.folderMenuItem[SpecialFolder="Sent"] {
-  -moz-image-region: rect(0 64px 16px 48px);
-}
-
-.folderMenuItem[SpecialFolder="Outbox"] {
-  -moz-image-region: rect(0 80px 16px 64px);
-}
-
-.folderMenuItem[SpecialFolder="Drafts"] {
-  -moz-image-region: rect(0 96px 16px 80px);
-}
-
-.folderMenuItem[SpecialFolder="Templates"] {
-  -moz-image-region: rect(0 112px 16px 96px);
-}
-
-.folderMenuItem[SpecialFolder="Junk"] {
-  -moz-image-region: rect(0 128px 16px 112px);
-}
-
-.folderMenuItem[SpecialFolder="Trash"] {
-  -moz-image-region: rect(0 144px 16px 128px);
-}
-
-.folderMenuItem[SpecialFolder="Virtual"] {
-  -moz-image-region: rect(0 176px 16px 160px);
-}
-
-/* ..... servers ..... */
-
-.folderMenuItem[IsServer="true"] {
-  list-style-image: url("chrome://messenger/skin/icons/server.png");
-  -moz-image-region: rect(0 16px 16px 0);
-}
-
-.folderMenuItem[IsServer="true"][ServerType="imap"][IsSecure="true"],
-.folderMenuItem[IsServer="true"][ServerType="pop3"][IsSecure="true"] {
-  -moz-image-region: rect(0 32px 16px 16px);
-}
-
-/* Local folders */
-.folderMenuItem[IsServer="true"][ServerType="none"] {
-  -moz-image-region: rect(0 48px 16px 32px);
-}
-
-/* News server */
-.folderMenuItem[IsServer="true"][ServerType="nntp"] {
-  -moz-image-region: rect(0 64px 16px 48px);
-}
-
-.folderMenuItem[IsServer="true"][ServerType="nntp"][IsSecure="true"] {
-  -moz-image-region: rect(0 80px 16px 64px) !important;
-}
-
-/* Feed server */
-.folderMenuItem[IsServer="true"][ServerType="rss"] {
-  list-style-image: url("chrome://messenger-newsblog/skin/rss-feed.png");
-  -moz-image-region: rect(0 16px 16px 0);
-}
-
 .menulist-menupopup[is="folder-menupopup"] {
   list-style-image: none;
   -moz-image-region: unset;
 }
deleted file mode 100755
index 5a34a3e18729e06cfa0dbcc71c50218308e1da24..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/mail/themes/windows/mail/mailWindow1.css
+++ b/mail/themes/windows/mail/mailWindow1.css
@@ -3,17 +3,16 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== mailWindow1.css ================================================
   == Styles for the main Mail window in the default layout scheme.
   ======================================================================= */
 
 @import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/primaryToolbar.css");
-@import url("chrome://messenger/skin/folderMenus.css");
 @import url("chrome://messenger/skin/folderPane.css");
 @import url("chrome://messenger/skin/messageIcons.css");
 @import url("chrome://messenger/skin/shared/mailWindow1.css");
 
 #messengerBox {
   background-color: -moz-Dialog;
 }
 
--- a/mail/themes/windows/mail/msgSelectOffline.css
+++ b/mail/themes/windows/mail/msgSelectOffline.css
@@ -2,149 +2,20 @@
  * 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/. */
 
 /* ===== msgSelectOffline.css =================================================
   == Styles for the Offline Use dialog.
   ======================================================================= */
 
 @import url("chrome://messenger/skin/messenger.css");
+@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) {
-  margin-inline-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) {
--- a/mail/themes/windows/mail/newsblog/feed-subscriptions.css
+++ b/mail/themes/windows/mail/newsblog/feed-subscriptions.css
@@ -39,8 +39,13 @@
 }
 
 #nameValue,
 #locationValue,
 #selectFolderValue {
   padding-top: 0;
   padding-bottom: 1px;
 }
+
+#rssSubscriptionsList > treechildren::-moz-tree-image {
+  width: 16px;
+  height: 16px;
+}
--- a/mail/themes/windows/mail/subscribe.css
+++ b/mail/themes/windows/mail/subscribe.css
@@ -31,36 +31,30 @@ treechildren::-moz-tree-cell-text(nameCo
   color: gray;
   font-style: italic;
 }
 
 /* ::::: Folders :::::: */
 
 treechildren::-moz-tree-image(nameColumn) {
   margin-inline-end: 2px;
-  list-style-image: url("chrome://messenger/skin/icons/folder.png");
-  -moz-image-region: rect(0 16px 16px 0);
+  list-style-image: url("chrome://messenger/skin/icons/folder.svg");
 }
 
 treechildren::-moz-tree-image(nameColumn, serverType-nntp),
 treechildren::-moz-tree-image(nameColumn2, serverType-nntp) {
   margin-inline-end: 2px;
-  -moz-image-region: rect(0 160px 16px 144px);
+  list-style-image: url("chrome://messenger/skin/icons/globe.svg");
 }
 
 /* ::::: Servers :::::: */
 
 .subscribeMenuItem {
-  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/message.svg");
 }
 
 .subscribeMenuItem[ServerType="imap"][IsSecure="true"] {
-  -moz-image-region: rect(0 32px 16px 16px);
+  list-style-image: url("chrome://messenger/skin/icons/message-secure.svg");
 }
 
 .subscribeMenuItem[ServerType="nntp"] {
-  -moz-image-region: rect(0 64px 16px 48px);
+  list-style-image: url("chrome://messenger/skin/icons/globe.svg");
 }
-
-.subscribeMenuItem[ServerType="nntp"][IsSecure="true"] {
-  -moz-image-region: rect(0 80px 16px 64px);
-}