Bug 1532378 - Implement photon icons to the Folder Pane. r=mkmelin, ui-r=paenglab
authorAlessandro Castellani <alessandro@thunderbird.net>
Mon, 04 May 2020 13:56:18 +0300
changeset 38122 87bdc889cbad5156c23cb04c819c1905bd7ffdcc
parent 38121 a888cc00988ff7b4a21dbd05178cd0d2a055b063
child 38123 87970e80244c9117cba8f522be7d4d25eecfb5cd
push id2595
push userclokep@gmail.com
push dateMon, 04 May 2020 19:02:04 +0000
treeherdercomm-beta@f53913797371 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmkmelin, paenglab
bugs1532378
Bug 1532378 - Implement photon icons to the Folder Pane. r=mkmelin, ui-r=paenglab
mail/themes/linux/mail/folderPane.css
mail/themes/osx/mail/folderPane.css
mail/themes/osx/mail/mailWindow1.css
mail/themes/shared/jar.inc.mn
mail/themes/shared/mail/folderPane.css
mail/themes/shared/mail/icons/folder-local.svg
mail/themes/shared/mail/icons/message-secure.svg
mail/themes/shared/mail/icons/newsgroup.svg
mail/themes/shared/mail/icons/outbox.svg
mail/themes/shared/mail/icons/search-folder.svg
mail/themes/shared/mail/icons/sent.svg
mail/themes/shared/mail/icons/subscribe.svg
mail/themes/shared/mail/icons/template.svg
mail/themes/windows/mail/folderPane.css
--- a/mail/themes/linux/mail/folderPane.css
+++ b/mail/themes/linux/mail/folderPane.css
@@ -1,254 +1,30 @@
 /* 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/. */
 
-/* ::::: Folder Pane ::::: */
-#folderTree > treechildren::-moz-tree-image {
-  width: 16px;
-  height: 16px;
-}
-
-/* reduce the padding set from messenger.css */
-#folderTree > treechildren::-moz-tree-cell-text {
-  padding-inline-start: 2px;
-}
-
-/* this needs a different rule from the tree because otherwise the margin
-   applies to the tab */
-.tabmail-tab[type="folder"] {
-  list-style-image: url("moz-icon://stock/gtk-directory?size=menu");
-}
-
-treechildren::-moz-tree-image(folderNameCol) {
-  list-style-image: url("moz-icon://stock/gtk-directory?size=menu");
-  margin-inline-end: 2px;
-}
-
-/* ..... Shared folders .....
-treechildren::-moz-tree-image(folderNameCol, imapShared-true) {
-} */
-
-treechildren::-moz-tree-image(folderNameCol, newMessages-true) {
-  list-style-image: url("moz-icon://stock/gtk-directory?size=menu");
-}
-
-/* ..... Inbox ..... */
-
-.tabmail-tab[type="folder"][SpecialFolder="Inbox"],
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Inbox) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  -moz-image-region: rect(64px 16px 80px 0px);
-}
-
-/* ..... Sent ..... */
-
-.tabmail-tab[type="folder"][SpecialFolder="Sent"],
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Sent) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  -moz-image-region: rect(144px 16px 160px 0px);
-}
-
-/* ..... Outbox ..... */
-
-.tabmail-tab[type="folder"][SpecialFolder="Outbox"],
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Outbox) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  -moz-image-region: rect(96px 16px 112px 0px);
-}
-
-/* ..... Drafts ..... */
-
-.tabmail-tab[type="folder"][SpecialFolder="Drafts"],
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Drafts) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  -moz-image-region: rect(48px 16px 64px 0px);
-}
-
-/* ..... Templates ..... */
-
-.tabmail-tab[type="folder"][SpecialFolder="Templates"],
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Templates) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  -moz-image-region: rect(160px 16px 176px 0px);
-}
-
-/* ..... Junk ..... */
-
-.tabmail-tab[type="folder"][SpecialFolder="Junk"],
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Junk) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  -moz-image-region: rect(80px 16px 96px 0px);
-}
-
-/* ..... Trash ..... */
-
-.tabmail-tab[type="folder"][SpecialFolder="Trash"],
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Trash) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  -moz-image-region: rect(176px 16px 192px 0px) !important;
-}
-
-/* ..... Archives ..... */
-
-.tabmail-tab[type="folder"][SpecialFolder="Archive"],
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Archive) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  -moz-image-region: rect(192px 16px 208px 0px);
-}
+@import url("chrome://messenger/skin/shared/folderPane.css");
 
-/* ..... Saved Search Folder ..... */
-
-.tabmail-tab[type="folder"][SpecialFolder="Virtual"],
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Virtual) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  -moz-image-region: rect(128px 16px 144px 0px) !important;
-}
-
-/* ..... Newsgroup ..... */
-
-.tabmail-tab[type="folder"][ServerType="nntp"],
-treechildren::-moz-tree-image(folderNameCol, serverType-nntp) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  -moz-image-region: rect(208px 16px 224px 0px);
-}
-
-/* ..... Feed folder, feed item ..... */
-
-treechildren::-moz-tree-image(folderNameCol, isFeed-true) {
-  list-style-image: url("chrome://messenger-newsblog/skin/rss-feed.png");
-  -moz-image-region: rect(32px 16px 48px 0);
-}
-.tabmail-tab[type="folder"][IsFeedFolder="true"],
-treechildren::-moz-tree-image(folderNameCol, isFeedFolder-true) {
-  list-style-image: url("chrome://messenger-newsblog/skin/rss-feed-folder.png");
-  -moz-image-region: auto;
-}
-treechildren::-moz-tree-image(folderNameCol, serverIsPaused),
-treechildren::-moz-tree-cell-text(folderNameCol, serverIsPaused),
-treechildren::-moz-tree-image(folderNameCol, isPaused),
-treechildren::-moz-tree-cell-text(folderNameCol, isPaused) {
-  opacity: 0.4;
-}
-treechildren::-moz-tree-image(folderNameCol, isBusy) {
-  list-style-image: url("chrome://messenger/skin/icons/waiting.svg");
-  -moz-image-region: rect(0 16px 16px 0);
-}
-treechildren::-moz-tree-image(folderNameCol, hasError) {
-  list-style-image: url("chrome://global/skin/icons/warning.svg");
-  -moz-image-region: rect(0 16px 16px 0);
-  fill: #e62117;
-}
-
-treechildren::-moz-tree-cell-text(folderNameCol, newMessages-true),
-treechildren::-moz-tree-cell-text(folderNameCol, specialFolder-Inbox, newMessages-true) {
-  font-weight: bold;
-}
-
-/* ..... Mail server  ..... */
-
-.tabmail-tab[type="folder"][IsServer="true"],
-treechildren::-moz-tree-image(folderNameCol, isServer-true) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  -moz-image-region: rect(16px 16px 32px 0px);
-}
-
-/* ..... Secure mail server ..... */
-
-.tabmail-tab[type="folder"][IsServer="true"][ServerType="imap"][IsSecure="true"],
-.tabmail-tab[type="folder"][IsServer="true"][ServerType="pop3"][IsSecure="true"],
-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/folder-pane.png");
-  -moz-image-region: rect(16px 32px 32px 16px);
-}
-
-/* ..... Local folders ..... */
-
-.tabmail-tab[type="folder"][IsServer="true"][ServerType="none"],
-treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-none) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  -moz-image-region: rect(0px 16px 16px 0px);
-}
-
-/* ..... News server ..... */
-
-.tabmail-tab[type="folder"][IsServer="true"][ServerType="nntp"],
-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);
-}
-
-.tabmail-tab[type="folder"][IsServer="true"][ServerType="nntp"][IsSecure="true"],
-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 80px 16px 64px);
-}
-
-/* ..... Feed server ..... */
-
-.tabmail-tab[type="folder"][IsServer="true"][ServerType="rss"],
-treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-rss) {
-  list-style-image: url("chrome://messenger-newsblog/skin/rss-feed.png");
-  -moz-image-region: rect(0 16px 16px 0);
+#folderTree > treechildren::-moz-tree-row {
+  min-height: 1.6rem;
 }
 
 /* ::::: All Servers ::::: */
 
+treechildren::-moz-tree-image(folderNameCol, newMessages-true),
 treechildren::-moz-tree-cell-text(folderNameCol, isServer-true, biffState-NewMail),
 treechildren::-moz-tree-cell-text(folderNameCol, newMessages-true),
 treechildren::-moz-tree-cell-text(folderNameCol, specialFolder-Inbox, newMessages-true) {
   color: -moz-hyperlinktext !important;
 }
 
+treechildren::-moz-tree-image(folderNameCol, newMessages-true, selected, focus),
 treechildren::-moz-tree-cell-text(folderNameCol, isServer-true, biffState-NewMail, selected, focus),
 treechildren::-moz-tree-cell-text(folderNameCol, newMessages-true, selected, focus),
 treechildren::-moz-tree-cell-text(folderNameCol, specialFolder-Inbox, newMessages-true, selected, focus) {
   color: HighlightText !important;
 }
 
-treechildren::-moz-tree-cell-text(hasUnreadMessages-true),
-treechildren::-moz-tree-cell-text(folderNameCol, isServer-true),
-treechildren::-moz-tree-cell-text(closed, subfoldersHaveUnreadMessages-true) {
-  font-weight: bold;
-}
-
 treechildren::-moz-tree-cell-text(folderNameCol, noSelect-true) {
   color: GrayText !important;
   font-style: italic;
 }
-
-treechildren::-moz-tree-cell-text(imapdeleted) {
-  text-decoration: line-through;
-}
-
-.tree-folder-checkbox {
-  list-style-image: none;
-}
-
-/* ::::: Folder Summary Popup ::::: */
-
-.folderSummary-message-row {
-  /* This max width ends up dictating the overall width of the popup
-     because it controls how large the preview, subject and sender text can be
-     before cropping kicks in */
-  max-width: 450px;
-}
-
-.folderSummary-subject {
-  font-weight: bold;
-}
-
-.folderSummary-previewText {
-  opacity: 0.6;
-}
-
-/* Make sidebar look normal. */
-
-#folderTree treechildren::-moz-tree-cell-text(folderNameCol, newMessages-true) {
-  font-weight: bold;
-  margin-left: -16px;
-  padding-left: 18px;
-  background-image: url("chrome://messenger/skin/icons/folder-new-star.png");
-  background-repeat: no-repeat;
-  background-position: left;
-}
--- a/mail/themes/osx/mail/folderPane.css
+++ b/mail/themes/osx/mail/folderPane.css
@@ -1,370 +1,35 @@
 /* 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/. */
 
-/* ::::: Folder Pane ::::: */
-.tabmail-tab[type="folder"] {
-  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  -moz-image-region: rect(0 16px 16px 0);
-}
-
-treechildren::-moz-tree-image(folderNameCol) {
-  margin-inline-end: 4px;
-  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  -moz-image-region: rect(0 16px 16px 0);
-  width: 16px;
-  height: 16px;
-}
-
-/* Disable Shared Folder Rule for now
-treechildren::-moz-tree-image(folderNameCol, imapShared-true) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-share.png");
-}
-*/
-
-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);
-}
-
-/* ..... News Folders ..... */
-.tabmail-tab[type="folder"][ServerType="nntp"],
-treechildren::-moz-tree-image(folderNameCol, serverType-nntp) {
-  -moz-image-region: rect(0 160px 16px 144px);
-}
-
-/* ..... Feed folder, feed item ..... */
-treechildren::-moz-tree-image(folderNameCol, isFeed-true) {
-  list-style-image: url("chrome://messenger-newsblog/skin/rss-feed.png");
-  -moz-image-region: rect(16px 16px 32px 0);
-}
-.tabmail-tab[type="folder"][IsFeedFolder="true"],
-treechildren::-moz-tree-image(folderNameCol, isFeedFolder-true) {
-  list-style-image: url("chrome://messenger-newsblog/skin/rss-feed-folder.png");
-  -moz-image-region: auto;
-}
-treechildren::-moz-tree-image(folderNameCol, serverIsPaused),
-treechildren::-moz-tree-cell-text(folderNameCol, serverIsPaused),
-treechildren::-moz-tree-image(folderNameCol, isPaused),
-treechildren::-moz-tree-cell-text(folderNameCol, isPaused) {
-  opacity: 0.4;
-}
-treechildren::-moz-tree-image(folderNameCol, isBusy) {
-  list-style-image: url("chrome://messenger/skin/icons/waiting.svg");
-  -moz-image-region: rect(0 16px 16px 0);
-}
-treechildren::-moz-tree-image(folderNameCol, hasError) {
-  list-style-image: url("chrome://global/skin/icons/warning.svg");
-  -moz-image-region: rect(0 16px 16px 0);
-  fill: #e62117;
-}
-
-/* ..... Inbox ..... */
-.tabmail-tab[type="folder"][SpecialFolder="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 ..... */
-.tabmail-tab[type="folder"][SpecialFolder="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 ..... */
-.tabmail-tab[type="folder"][SpecialFolder="Outbox"],
-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 ..... */
-.tabmail-tab[type="folder"][SpecialFolder="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 ..... */
-.tabmail-tab[type="folder"][SpecialFolder="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 ..... */
-.tabmail-tab[type="folder"][SpecialFolder="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 ..... */
-.tabmail-tab[type="folder"][SpecialFolder="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);
-}
-
-/* ..... Saved Search Folder ..... */
-.tabmail-tab[type="folder"][SpecialFolder="Virtual"],
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Virtual) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  -moz-image-region: rect(0 176px 16px 160px);
-}
-
-/* ..... Archive Folder ..... */
-.tabmail-tab[type="folder"][SpecialFolder="Archive"],
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Archive) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-pane.png") !important;
-  -moz-image-region: rect(0 208px 16px 192px) !important;
-}
-
-@media (min-resolution: 2dppx) {
-  .tabmail-tab[type="folder"],
-  treechildren::-moz-tree-image(folderNameCol) {
-    list-style-image: url("chrome://messenger/skin/icons/folder-pane@2x.png");
-    -moz-image-region: rect(0 32px 32px 0);
-  }
-
-  treechildren::-moz-tree-image(folderNameCol, newMessages-true) {
-    list-style-image: url("chrome://messenger/skin/icons/folder-pane@2x.png");
-    -moz-image-region: rect(0 32px 32px 0);
-  }
-
-  /* ..... News Folders ..... */
-  .tabmail-tab[type="folder"][ServerType="nntp"],
-  treechildren::-moz-tree-image(folderNameCol, serverType-nntp) {
-    -moz-image-region: rect(0 320px 32px 288px);
-  }
+ @import url("chrome://messenger/skin/shared/folderPane.css");
 
-  /* ..... Feed folder, feed item ..... */
-  treechildren::-moz-tree-image(folderNameCol, isFeed-true) {
-    list-style-image: url("chrome://messenger-newsblog/skin/rss-feed@2x.png");
-    -moz-image-region: rect(32px 32px 64px 0);
-  }
-  .tabmail-tab[type="folder"][IsFeedFolder="true"],
-  treechildren::-moz-tree-image(folderNameCol, isFeedFolder-true) {
-    list-style-image: url("chrome://messenger-newsblog/skin/rss-feed-folder@2x.png");
-    -moz-image-region: auto;
-  }
-  treechildren::-moz-tree-image(folderNameCol, isBusy) {
-    list-style-image: url("chrome://messenger/skin/icons/status@2x.png");
-    -moz-image-region: rect(0 64px 32px 32px);
-  }
-  treechildren::-moz-tree-image(folderNameCol, hasError) {
-    list-style-image: url("chrome://global/skin/icons/warning.svg");
-    -moz-image-region: rect(0 16px 16px 0);
-    fill: #e62117;
-  }
-
-  /* ..... Inbox ..... */
-  .tabmail-tab[type="folder"][SpecialFolder="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@2x.png");
-    -moz-image-region: rect(0 96px 32px 64px);
-  }
-
-  /* ..... Sent ..... */
-  .tabmail-tab[type="folder"][SpecialFolder="Sent"],
-  treechildren::-moz-tree-image(folderNameCol, specialFolder-Sent) {
-    list-style-image: url("chrome://messenger/skin/icons/folder-pane@2x.png");
-    -moz-image-region: rect(0 128px 32px 96px);
-  }
-
-  /* ..... Unsent ..... */
-  .tabmail-tab[type="folder"][SpecialFolder="Outbox"],
-  treechildren::-moz-tree-image(folderNameCol, specialFolder-Outbox) {
-    list-style-image: url("chrome://messenger/skin/icons/folder-pane@2x.png");
-    -moz-image-region: rect(0 160px 32px 128px);
-  }
-
-  /* ..... Drafts ..... */
-  .tabmail-tab[type="folder"][SpecialFolder="Drafts"],
-  treechildren::-moz-tree-image(folderNameCol, specialFolder-Drafts) {
-    list-style-image: url("chrome://messenger/skin/icons/folder-pane@2x.png");
-    -moz-image-region: rect(0 192px 32px 160px);
-  }
-
-  /* ..... Templates ..... */
-  .tabmail-tab[type="folder"][SpecialFolder="Templates"],
-  treechildren::-moz-tree-image(folderNameCol, specialFolder-Templates) {
-    list-style-image: url("chrome://messenger/skin/icons/folder-pane@2x.png");
-    -moz-image-region: rect(0 224px 32px 192px);
-  }
-
-  /* ..... Junk ..... */
-  .tabmail-tab[type="folder"][SpecialFolder="Junk"],
-  treechildren::-moz-tree-image(folderNameCol, specialFolder-Junk) {
-    list-style-image: url("chrome://messenger/skin/icons/folder-pane@2x.png");
-    -moz-image-region: rect(0 256px 32px 224px);
-  }
-
-  /* ..... Trash ..... */
-  .tabmail-tab[type="folder"][SpecialFolder="Trash"],
-  treechildren::-moz-tree-image(folderNameCol, specialFolder-Trash) {
-    list-style-image: url("chrome://messenger/skin/icons/folder-pane@2x.png");
-    -moz-image-region: rect(0 288px 32px 256px);
-  }
-
-  /* ..... Saved Search Folder ..... */
-  .tabmail-tab[type="folder"][SpecialFolder="Virtual"],
-  treechildren::-moz-tree-image(folderNameCol, specialFolder-Virtual) {
-    list-style-image: url("chrome://messenger/skin/icons/folder-pane@2x.png");
-    -moz-image-region: rect(0 352px 32px 320px);
-  }
-
-  /* ..... Archive Folder ..... */
-  .tabmail-tab[type="folder"][SpecialFolder="Archive"],
-  treechildren::-moz-tree-image(folderNameCol, specialFolder-Archive) {
-    list-style-image: url("chrome://messenger/skin/icons/folder-pane@2x.png") !important;
-    -moz-image-region: rect(0 416px 32px 384px) !important;
-  }
-}
-
-/* ..... Server Folders ..... */
-
-/* ..... Account nodes ..... */
-.tabmail-tab[type="folder"][IsServer="true"],
-treechildren::-moz-tree-image(folderNameCol, isServer-true),
-treechildren::-moz-tree-image(folderNameCol, isServer-true, biffState-NewMail) {
-  list-style-image: url("chrome://messenger/skin/icons/server.png");
-  -moz-image-region: rect(0 16px 16px 0);
-}
-
-/* ..... Secure IMAP/POP account nodes ..... */
-.tabmail-tab[type="folder"][IsServer="true"][ServerType="imap"][IsSecure="true"],
-.tabmail-tab[type="folder"][IsServer="true"][ServerType="pop3"][IsSecure="true"],
-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);
-}
-
-/* ..... Local folders ..... */
-.tabmail-tab[type="folder"][IsServer="true"][ServerType="none"],
-treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-none) {
-  list-style-image: url("chrome://messenger/skin/icons/server.png");
-  -moz-image-region: rect(0 48px 16px 32px);
-}
-
-/* ..... News Folders ..... */
-.tabmail-tab[type="folder"][IsServer="true"][ServerType="nntp"],
-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);
-}
-
-/* ..... Secure news server ..... */
-.folderMenuItem[IsServer="true"][ServerType="nntp"][IsSecure="true"],
-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 80px 16px 64px);
-}
-
-/* ..... Feed server ..... */
-.tabmail-tab[type="folder"][IsServer="true"][ServerType="rss"],
-treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-rss) {
-  list-style-image: url("chrome://messenger-newsblog/skin/rss-feed.png");
-  -moz-image-region: rect(0 16px 16px 0);
-}
-
-@media (min-resolution: 2dppx) {
-  /* ..... Account nodes ..... */
-  .tabmail-tab[type="folder"][IsServer="true"],
-  treechildren::-moz-tree-image(folderNameCol, isServer-true),
-  treechildren::-moz-tree-image(folderNameCol, isServer-true, biffState-NewMail) {
-    list-style-image: url("chrome://messenger/skin/icons/server@2x.png");
-    -moz-image-region: rect(0 32px 32px 0);
-  }
-
-  /* ..... Secure IMAP/POP account nodes ..... */
-  .tabmail-tab[type="folder"][IsServer="true"][ServerType="imap"][IsSecure="true"],
-  .tabmail-tab[type="folder"][IsServer="true"][ServerType="pop3"][IsSecure="true"],
-  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@2x.png");
-    -moz-image-region: rect(0 64px 32px 32px);
-  }
-
-  /* ..... Local folders ..... */
-  .tabmail-tab[type="folder"][IsServer="true"][ServerType="none"],
-  treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-none) {
-    list-style-image: url("chrome://messenger/skin/icons/server@2x.png");
-    -moz-image-region: rect(0 96px 32px 64px);
-  }
-
-  /* ..... News Folders ..... */
-  .tabmail-tab[type="folder"][IsServer="true"][ServerType="nntp"],
-  treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp) {
-    list-style-image: url("chrome://messenger/skin/icons/server@2x.png");
-    -moz-image-region: rect(0 128px 32px 96px);
-  }
-
-  /* ..... Secure news server ..... */
-  .folderMenuItem[IsServer="true"][ServerType="nntp"][IsSecure="true"],
-  treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp, isSecure-true) {
-    list-style-image: url("chrome://messenger/skin/icons/server@2x.png");
-    -moz-image-region: rect(0 160px 32px 128px);
-  }
-
-  /* ..... Feed server ..... */
-  .tabmail-tab[type="folder"][IsServer="true"][ServerType="rss"],
-  treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-rss) {
-    list-style-image: url("chrome://messenger-newsblog/skin/rss-feed@2x.png");
-    -moz-image-region: rect(0 32px 32px 0);
-  }
+#folderTree > treechildren::-moz-tree-row {
+  min-height: 1.7rem;
 }
 
 /* ::::: All Servers ::::: */
 
+treechildren::-moz-tree-image(folderNameCol, newMessages-true),
 treechildren::-moz-tree-cell-text(folderNameCol, isServer-true, biffState-NewMail),
 treechildren::-moz-tree-cell-text(folderNameCol, newMessages-true),
 treechildren::-moz-tree-cell-text(folderNameCol, specialFolder-Inbox, newMessages-true) {
   color: blue !important;
 }
 
+treechildren::-moz-tree-image(folderNameCol, newMessages-true),
+treechildren::-moz-tree-image(folderNameCol, isServer-true, biffState-NewMail) {
+  fill: blue !important;
+}
+
+treechildren::-moz-tree-image(folderNameCol, newMessages-true, selected, focus),
 treechildren::-moz-tree-cell-text(folderNameCol, isServer-true, biffState-NewMail, selected, focus),
 treechildren::-moz-tree-cell-text(folderNameCol, newMessages-true, selected, focus),
 treechildren::-moz-tree-cell-text(folderNameCol, specialFolder-Inbox, newMessages-true, selected, focus) {
   color: HighlightText !important;
 }
 
-treechildren::-moz-tree-cell-text(hasUnreadMessages-true),
-treechildren::-moz-tree-cell-text(closed, subfoldersHaveUnreadMessages-true) {
-  font-weight: bold !important;
-}
-
 treechildren::-moz-tree-cell-text(folderNameCol, noSelect-true) {
   color: gray !important;
   font-style: italic;
 }
-
-treechildren::-moz-tree-cell-text(imapdeleted) {
-  text-decoration: line-through;
-}
-
-.tree-folder-checkbox {
-  list-style-image: none;
-}
-
-/* ::::: Folder Summary Popup ::::: */
-
-.folderSummary-message-row {
-  /* This max width ends up dictating the overall width of the popup
-     because it controls how large the preview, subject and sender text can be
-     before cropping kicks in */
-  max-width: 450px;
-}
-
-.folderSummary-subject {
-  font-weight: bold;
-}
-
-.folderSummary-previewText {
-  opacity: 0.6;
-}
--- a/mail/themes/osx/mail/mailWindow1.css
+++ b/mail/themes/osx/mail/mailWindow1.css
@@ -58,31 +58,33 @@
 }
 
 @media (-moz-mac-yosemite-theme: 0) {
   :root:not([lwt-tree]) #folderTree treechildren::-moz-tree-row(selected, focus) {
     -moz-appearance: -moz-mac-active-source-list-selection;
     -moz-font-smoothing-background-color: -moz-mac-active-source-list-selection;
   }
 
-  #folderTree treechildren::-moz-tree-twisty(selected),
-  #folderTree treechildren::-moz-tree-cell-text(selected) {
+  :root:not([lwt-tree]) #folderTree treechildren::-moz-tree-image(selected),
+  :root:not([lwt-tree]) #folderTree treechildren::-moz-tree-twisty(selected),
+  :root:not([lwt-tree]) #folderTree treechildren::-moz-tree-cell-text(selected) {
     color: white;
   }
 }
 
 @media (-moz-mac-yosemite-theme) {
   #folderTree treechildren::-moz-tree-cell-text {
     font-family: -apple-system;
     font-size: 9pt;
     font-weight: 400;
   }
 
-  #folderTree treechildren::-moz-tree-twisty(selected, focus),
-  #folderTree treechildren::-moz-tree-cell-text(selected, focus) {
+  :root:not([lwt-tree]) #folderTree treechildren::-moz-tree-image(selected, focus),
+  :root:not([lwt-tree]) #folderTree treechildren::-moz-tree-twisty(selected, focus),
+  :root:not([lwt-tree]) #folderTree treechildren::-moz-tree-cell-text(selected, focus) {
     color: #282828;
   }
 }
 
 /* ::::: thread decoration ::::: */
 
 /* ::::: group rows ::::: */
 treechildren::-moz-tree-row(dummy) {
--- a/mail/themes/shared/jar.inc.mn
+++ b/mail/themes/shared/jar.inc.mn
@@ -59,16 +59,17 @@
   skin/classic/messenger/icons/developer.svg                  (../shared/mail/icons/developer.svg)
   skin/classic/messenger/icons/exclude.svg                    (../shared/mail/icons/exclude.svg)
   skin/classic/messenger/icons/encryption-key.svg             (../shared/mail/icons/encryption-key.svg)
   skin/classic/messenger/icons/file.svg                       (../shared/mail/icons/file.svg)
   skin/classic/messenger/icons/file-item.svg                  (../shared/mail/icons/file-item.svg)
   skin/classic/messenger/icons/filter.svg                     (../shared/mail/icons/filter.svg)
   skin/classic/messenger/icons/flag-col.svg                   (../shared/mail/icons/flag-col.svg)
   skin/classic/messenger/icons/folder.svg                     (../shared/mail/icons/folder.svg)
+  skin/classic/messenger/icons/folder-local.svg               (../shared/mail/icons/folder-local.svg)
   skin/classic/messenger/icons/forward.svg                    (../shared/mail/icons/forward.svg)
   skin/classic/messenger/icons/getmsg.svg                     (../shared/mail/icons/getmsg.svg)
   skin/classic/messenger/icons/goback.svg                     (../shared/mail/icons/goback.svg)
   skin/classic/messenger/icons/goforward.svg                  (../shared/mail/icons/goforward.svg)
   skin/classic/messenger/icons/globe.svg                      (../shared/mail/icons/globe.svg)
   skin/classic/messenger/icons/globe-secure.svg               (../shared/mail/icons/globe-secure.svg)
   skin/classic/messenger/icons/help.svg                       (../shared/mail/icons/help.svg)
   skin/classic/messenger/icons/hidden.svg                     (../shared/mail/icons/hidden.svg)
@@ -85,29 +86,32 @@
   skin/classic/messenger/icons/junk.svg                       (../shared/mail/icons/junk.svg)
   skin/classic/messenger/icons/junk-col.svg                   (../shared/mail/icons/junk-col.svg)
   skin/classic/messenger/icons/justify.svg                    (../shared/mail/icons/justify.svg)
   skin/classic/messenger/icons/left-align.svg                 (../shared/mail/icons/left-align.svg)
   skin/classic/messenger/icons/link.svg                       (../shared/mail/icons/link.svg)
   skin/classic/messenger/icons/login.svg                      (../shared/mail/icons/login.svg)
   skin/classic/messenger/icons/mark.svg                       (../shared/mail/icons/mark.svg)
   skin/classic/messenger/icons/message.svg                    (../shared/mail/icons/message.svg)
+  skin/classic/messenger/icons/message-secure.svg             (../shared/mail/icons/message-secure.svg)
   skin/classic/messenger/icons/more.svg                       (../shared/mail/icons/more.svg)
   skin/classic/messenger/icons/move-bottom.svg                (../shared/mail/icons/move-bottom.svg)
   skin/classic/messenger/icons/move-down.svg                  (../shared/mail/icons/move-down.svg)
   skin/classic/messenger/icons/move-together.svg              (../shared/mail/icons/move-together.svg)
   skin/classic/messenger/icons/move-top.svg                   (../shared/mail/icons/move-top.svg)
   skin/classic/messenger/icons/move-up.svg                    (../shared/mail/icons/move-up.svg)
   skin/classic/messenger/icons/navigation.svg                 (../shared/mail/icons/navigation.svg)
   skin/classic/messenger/icons/new.svg                        (../shared/mail/icons/new.svg)
   skin/classic/messenger/icons/newmsg.svg                     (../shared/mail/icons/newmsg.svg)
+  skin/classic/messenger/icons/newsgroup.svg                  (../shared/mail/icons/newsgroup.svg)
   skin/classic/messenger/icons/new-window.svg                 (../shared/mail/icons/new-window.svg)
   skin/classic/messenger/icons/nextmsg.svg                    (../shared/mail/icons/nextmsg.svg)
   skin/classic/messenger/icons/nextunread.svg                 (../shared/mail/icons/nextunread.svg)
   skin/classic/messenger/icons/number-list.svg                (../shared/mail/icons/number-list.svg)
+  skin/classic/messenger/icons/outbox.svg                     (../shared/mail/icons/outbox.svg)
   skin/classic/messenger/icons/outdent.svg                    (../shared/mail/icons/outdent.svg)
   skin/classic/messenger/icons/overflow-indicator.png         (../shared/mail/icons/overflow-indicator.png)
   skin/classic/messenger/icons/overflow.svg                   (../shared/mail/icons/overflow.svg)
   skin/classic/messenger/icons/panel-icon-folder.svg          (../shared/mail/icons/panel-icon-folder.svg)
   skin/classic/messenger/icons/paste.svg                      (../shared/mail/icons/paste.svg)
   skin/classic/messenger/icons/pluginBlocked.svg              (../shared/mail/icons/pluginBlocked.svg)
   skin/classic/messenger/icons/previousmsg.svg                (../shared/mail/icons/previousmsg.svg)
   skin/classic/messenger/icons/previousunread.svg             (../shared/mail/icons/previousunread.svg)
@@ -118,37 +122,40 @@
   skin/classic/messenger/icons/reader-mode.svg                (../shared/mail/icons/reader-mode.svg)
   skin/classic/messenger/icons/readcol.svg                    (../shared/mail/icons/readcol.svg)
   skin/classic/messenger/icons/restore.svg                    (../shared/mail/icons/restore.svg)
   skin/classic/messenger/icons/remote-blocked.svg             (../shared/mail/icons/remote-blocked.svg)
   skin/classic/messenger/icons/reply.svg                      (../shared/mail/icons/reply.svg)
   skin/classic/messenger/icons/replyall.svg                   (../shared/mail/icons/replyall.svg)
   skin/classic/messenger/icons/replylist.svg                  (../shared/mail/icons/replylist.svg)
   skin/classic/messenger/icons/right-align.svg                (../shared/mail/icons/right-align.svg)
+  skin/classic/messenger/icons/search-folder.svg              (../shared/mail/icons/search-folder.svg)
   skin/classic/messenger/icons/search-glass.svg               (../shared/mail/icons/search-glass.svg)
   skin/classic/messenger/icons/save.svg                       (../shared/mail/icons/save.svg)
   skin/classic/messenger/icons/save-as.svg                    (../shared/mail/icons/save-as.svg)
   skin/classic/messenger/icons/search-not-found.svg           (../shared/mail/icons/search-not-found.svg)
   skin/classic/messenger/icons/search-spinner.svg             (../shared/mail/icons/search-spinner.svg)
   skin/classic/messenger/icons/security.svg                   (../shared/mail/icons/security.svg)
   skin/classic/messenger/icons/send.svg                       (../shared/mail/icons/send.svg)
+  skin/classic/messenger/icons/sent.svg                       (../shared/mail/icons/sent.svg)
   skin/classic/messenger/icons/sidebar-left.svg               (../shared/mail/icons/sidebar-left.svg)
   skin/classic/messenger/icons/size.svg                       (../shared/mail/icons/size.svg)
   skin/classic/messenger/icons/smiley.svg                     (../shared/mail/icons/smiley.svg)
   skin/classic/messenger/icons/sort.svg                       (../shared/mail/icons/sort.svg)
   skin/classic/messenger/icons/spelling.svg                   (../shared/mail/icons/spelling.svg)
   skin/classic/messenger/icons/spring.svg                     (../shared/mail/icons/spring.svg)
   skin/classic/messenger/icons/star.svg                       (../shared/mail/icons/star.svg)
   skin/classic/messenger/icons/starred.svg                    (../shared/mail/icons/starred.svg)
   skin/classic/messenger/icons/sticky.svg                     (../shared/mail/icons/sticky.svg)
   skin/classic/messenger/icons/stop.svg                       (../shared/mail/icons/stop.svg)
   skin/classic/messenger/icons/subscribe.svg                  (../shared/mail/icons/subscribe.svg)
   skin/classic/messenger/icons/tab-drag-indicator.svg         (../shared/mail/icons/tab-drag-indicator.svg)
   skin/classic/messenger/icons/table.svg                      (../shared/mail/icons/table.svg)
   skin/classic/messenger/icons/tag.svg                        (../shared/mail/icons/tag.svg)
+  skin/classic/messenger/icons/template.svg                   (../shared/mail/icons/template.svg)
   skin/classic/messenger/icons/thread-col.svg                 (../shared/mail/icons/thread-col.svg)
   skin/classic/messenger/icons/tick.png                       (../shared/mail/icons/tick.png)
   skin/classic/messenger/icons/timeline.svg                   (../shared/mail/icons/timeline.svg)
   skin/classic/messenger/icons/toolbarbutton-arrow.svg        (../shared/mail/icons/toolbarbutton-arrow.svg)
   skin/classic/messenger/icons/underline.svg                  (../shared/mail/icons/underline.svg)
   skin/classic/messenger/icons/userIcon.svg                   (../shared/mail/icons/userIcon.svg)
   skin/classic/messenger/icons/visible.svg                    (../shared/mail/icons/visible.svg)
   skin/classic/messenger/icons/waiting.svg                    (../shared/mail/icons/waiting.svg)
@@ -157,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/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)
   skin/classic/messenger/shared/preferences/security.svg      (../shared/mail/preferences/security.svg)
new file mode 100644
--- /dev/null
+++ b/mail/themes/shared/mail/folderPane.css
@@ -0,0 +1,216 @@
+/* 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/. */
+
+:root {
+  --default: #363959;
+  --primary: #0060df;
+}
+
+:root[lwt-tree-brighttext] {
+  --default: #f9f9fa;
+  --primary: #45a1ff;
+}
+
+/* ::::: Tabmail ::::: */
+.tabmail-tab,
+#folderTree > treechildren::-moz-tree-image {
+  -moz-context-properties: fill, fill-opacity;
+}
+
+/**
+ * This needs a different rule from the tree because otherwise the margin
+ * applies to the tab.
+ */
+.tabmail-tab[type="folder"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder.svg");
+}
+
+/* ::::: Folder Pane ::::: */
+
+#folderTree > treechildren::-moz-tree-image,
+#accounttree > treechildren::-moz-tree-image {
+  opacity: 0.85;
+  width: 16px;
+  height: auto;
+}
+
+/* reduce the padding set from messenger.css */
+#folderTree > treechildren::-moz-tree-cell-text {
+  padding-inline-start: 3px;
+}
+
+treechildren::-moz-tree-image(folderNameCol) {
+  list-style-image: url("chrome://messenger/skin/icons/folder.svg");
+  margin-inline-end: 2px;
+  fill: var(--default);
+}
+
+/* ..... Inbox ..... */
+.tabmail-tab[type="folder"][SpecialFolder="Inbox"],
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Inbox) {
+  list-style-image: url("chrome://messenger/skin/icons/inbox.svg");
+}
+
+/* ..... Sent ..... */
+.tabmail-tab[type="folder"][SpecialFolder="Sent"],
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Sent) {
+  list-style-image: url("chrome://messenger/skin/icons/sent.svg");
+}
+
+/* ..... Outbox ..... */
+.tabmail-tab[type="folder"][SpecialFolder="Outbox"],
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Outbox) {
+  list-style-image: url("chrome://messenger/skin/icons/outbox.svg");
+}
+
+/* ..... Drafts ..... */
+.tabmail-tab[type="folder"][SpecialFolder="Drafts"],
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Drafts) {
+  list-style-image: url("chrome://messenger/skin/icons/file-item.svg");
+}
+
+/* ..... Trash ..... */
+.tabmail-tab[type="folder"][SpecialFolder="Trash"],
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Trash) {
+  list-style-image: url("chrome://messenger/skin/icons/delete.svg");
+}
+
+/* ..... Archives ..... */
+.tabmail-tab[type="folder"][SpecialFolder="Archive"],
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Archive) {
+  list-style-image: url("chrome://messenger/skin/icons/archive.svg");
+}
+
+/* ..... Templates ..... */
+.tabmail-tab[type="folder"][SpecialFolder="Templates"],
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Templates) {
+  list-style-image: url("chrome://messenger/skin/icons/template.svg");
+}
+
+/* ..... Junk ..... */
+.tabmail-tab[type="folder"][SpecialFolder="Junk"],
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Junk) {
+  list-style-image: url("chrome://messenger/skin/icons/junk.svg");
+}
+
+/* ..... Saved Search Folder ..... */
+.tabmail-tab[type="folder"][SpecialFolder="Virtual"],
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Virtual) {
+  list-style-image: url("chrome://messenger/skin/icons/search-folder.svg");
+}
+
+/* ..... Newsgroup ..... */
+.tabmail-tab[type="folder"][ServerType="nntp"],
+treechildren::-moz-tree-image(folderNameCol, serverType-nntp) {
+  list-style-image: url("chrome://messenger/skin/icons/newsgroup.svg");
+}
+
+/* ..... Mail server  ..... */
+.tabmail-tab[type="folder"][IsServer="true"],
+treechildren::-moz-tree-image(folderNameCol, isServer-true) {
+  list-style-image: url("chrome://messenger/skin/icons/message.svg");
+  fill: var(--primary);
+}
+
+/* ..... Feed folder, feed item ..... */
+treechildren::-moz-tree-image(folderNameCol, isFeed-true),
+.tabmail-tab[type="folder"][IsServer="true"][ServerType="rss"],
+treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-rss),
+.tabmail-tab[type="folder"][IsFeedFolder="true"],
+treechildren::-moz-tree-image(folderNameCol, isFeedFolder-true) {
+  list-style-image: url("chrome://messenger/skin/icons/subscribe.svg");
+  fill: var(--primary);
+}
+
+treechildren::-moz-tree-image(folderNameCol, serverIsPaused),
+treechildren::-moz-tree-cell-text(folderNameCol, serverIsPaused),
+treechildren::-moz-tree-image(folderNameCol, isPaused),
+treechildren::-moz-tree-cell-text(folderNameCol, isPaused) {
+  opacity: 0.4;
+}
+
+treechildren::-moz-tree-image(folderNameCol, isBusy) {
+  list-style-image: url("chrome://messenger/skin/icons/waiting.svg");
+}
+
+treechildren::-moz-tree-image(folderNameCol, hasError) {
+  list-style-image: url("chrome://global/skin/icons/warning.svg");
+  fill: #e62117;
+}
+
+/* ..... Local folders ..... */
+.tabmail-tab[type="folder"][IsServer="true"][ServerType="none"],
+treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-none) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-local.svg");
+  fill: var(--primary);
+}
+
+/* ..... Secure mail server ..... */
+.tabmail-tab[type="folder"][IsServer="true"][ServerType="imap"][IsSecure="true"],
+.tabmail-tab[type="folder"][IsServer="true"][ServerType="pop3"][IsSecure="true"],
+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/message-secure.svg");
+  fill: var(--primary);
+}
+
+/* ..... News server ..... */
+.tabmail-tab[type="folder"][IsServer="true"][ServerType="nntp"],
+treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp) {
+  list-style-image: url("chrome://messenger/skin/icons/globe.svg");
+  fill: var(--primary);
+}
+
+.tabmail-tab[type="folder"][IsServer="true"][ServerType="nntp"][IsSecure="true"],
+treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp, isSecure-true) {
+  list-style-image: url("chrome://messenger/skin/icons/globe-secure.svg");
+  fill: var(--primary);
+}
+
+/* ::::: All Servers ::::: */
+
+treechildren::-moz-tree-cell-text(hasUnreadMessages-true),
+treechildren::-moz-tree-cell-text(folderNameCol, isServer-true),
+treechildren::-moz-tree-cell-text(closed, subfoldersHaveUnreadMessages-true),
+treechildren::-moz-tree-cell-text(folderNameCol, newMessages-true),
+treechildren::-moz-tree-cell-text(folderNameCol, specialFolder-Inbox, newMessages-true) {
+  font-weight: bold !important;
+}
+
+treechildren::-moz-tree-image(folderNameCol, newMessages-true),
+treechildren::-moz-tree-image(folderNameCol, isServer-true, biffState-NewMail) {
+  opacity: 1 !important;
+  fill: -moz-hyperlinktext !important;
+}
+
+treechildren::-moz-tree-image(folderNameCol, selected, focus),
+treechildren::-moz-tree-image(folderNameCol, newMessages-true, selected, focus) {
+  opacity: 1 !important;
+  fill: currentColor !important;
+}
+
+treechildren::-moz-tree-cell-text(imapdeleted) {
+  text-decoration: line-through;
+}
+
+.tree-folder-checkbox {
+  list-style-image: none;
+}
+
+/* ::::: Folder Summary Popup ::::: */
+
+.folderSummary-message-row {
+  /* This max width ends up dictating the overall width of the popup
+     because it controls how large the preview, subject and sender text can be
+     before cropping kicks in */
+  max-width: 450px;
+}
+
+.folderSummary-subject {
+  font-weight: bold;
+}
+
+.folderSummary-previewText {
+  opacity: 0.6;
+}
new file mode 100644
--- /dev/null
+++ b/mail/themes/shared/mail/icons/folder-local.svg
@@ -0,0 +1,7 @@
+<!-- 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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity" width="16" height="16" viewBox="0 0 16 16">
+  <path d="M14 3H8.151L6.584 1.538A2 2 0 0 0 5.219 1H2a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V5a2 2 0 0 0-2-2zM5.219 3l1.072 1H2V3zM14 13H2V5h6v-.014c.05 0 .1.014.151.014H14z"/>
+  <path fill-opacity=".3" d="M 14,13 H 2 V 5 h 12 z"/>
+</svg>
new file mode 100644
--- /dev/null
+++ b/mail/themes/shared/mail/icons/message-secure.svg
@@ -0,0 +1,4 @@
+<!-- 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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity" width="16" height="16"><path d="M3 2C1.35 2 0 3.35 0 5v6c0 1.65 1.35 3 3 3h5v-2H3a1 1 0 01-1-1V5a1 1 0 011-1h10a1 1 0 011 1v2.5c.53.37.96.98 1 2.04.01.37.53.43 1 .46V5c0-1.65-1.35-3-3-3z"/><path d="M8 9a.5.5 0 01-.3-.1l-5.5-4a.5.5 0 11.6-.8L8 7.88l5.2-3.78a.5.5 0 01.6.8l-5.5 4A.5.5 0 018 9zm6 2h.5c.28 0 .5.22.5.5v3a.5.5 0 01-.5.5h-5a.5.5 0 01-.5-.5v-3c0-.28.22-.5.5-.5h.5v-1a2 2 0 014 0zm-1 0v-1a1 1 0 00-2 0v1z"/></svg>
new file mode 100644
--- /dev/null
+++ b/mail/themes/shared/mail/icons/newsgroup.svg
@@ -0,0 +1,4 @@
+<!-- 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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity"><path d="M3 16h10a3 3 0 003-3V3a3 3 0 00-3-3H7a3 3 0 00-3 3v10c0 1.08-1.03 1-1.03 1M3 16s3 0 3-3V3a1 1 0 011-1h6a1 1 0 011 1v10a1 1 0 01-1 1H3"/><path d="M11.75 4.88h-3.5c-.55 0-.55-1 0-1h3.5c.54 0 .54 1 0 1zm0 2h-3.5c-.55 0-.55-1 0-1h3.5c.54 0 .54 1 0 1zm0 2h-3.5c-.55 0-.55-1 0-1h3.5c.54 0 .54 1 0 1zm-2.02 2H8.24c-.55 0-.55-1 0-1h1.48c.54 0 .54 1 0 1zM5 4H3a3 3 0 00-3 3v6a3 3 0 003 3h2m0-2H3a1 1 0 01-1-1V7a1 1 0 011-1h2"/></svg>
new file mode 100644
--- /dev/null
+++ b/mail/themes/shared/mail/icons/outbox.svg
@@ -0,0 +1,4 @@
+<!-- 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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity" width="16" height="16"><path d="M13.5 1H11c-1.33 0-1.33 2 0 2h2.5c.28 0 .5.23.5.5v9.12a.5.5 0 01-.5.5h-11a.5.5 0 01-.5-.5V3.5c0-.27.22-.5.5-.5H5c1.33 0 1.33-2 0-2H2.5A2.5 2.5 0 000 3.5v9.12a2.5 2.5 0 002.5 2.5h11a2.5 2.5 0 002.5-2.5V3.5A2.5 2.5 0 0013.5 1z"/><path d="M14.67 9.01L10.98 9c-.13 1.89-1.04 3-2.48 3h-1c-1.44 0-2.35-1.11-2.48-3l-3.64-.01v-.96L5.5 8c.27 0 .5.22.5.5 0 .75.14 2.5 1.5 2.5h1C9.85 11 10 9.25 10 8.5c0-.28.22-.5.5-.5l4.17.01"/><path d="M12.02 5.74a.97.97 0 00-.4-.72L8 2 4.38 5.02c-.98.85.25 2.33 1.27 1.53L7 5.43v2.64c0 1.25 2 1.23 2 0V5.43l1.35 1.12c.77.67 1.7-.05 1.67-.81z"/></svg>
new file mode 100644
--- /dev/null
+++ b/mail/themes/shared/mail/icons/search-folder.svg
@@ -0,0 +1,7 @@
+<!-- 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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity" width="16" height="16" viewBox="0 0 16 16">
+  <path d="M14 3H8.15L6.58 1.54A2 2 0 005.22 1H2a2 2 0 00-2 2v10a2 2 0 002 2h12a2 2 0 002-2V5a2 2 0 00-2-2zM5.22 3l1.07 1H2V3zM14 13H2V5h6v-.01l.15.01H14z"/>
+  <path d="M10.9 11.37L9.08 9.56a2.25 2.25 0 10-.53.53l1.8 1.8a.37.37 0 00.53-.52zM7.25 9.76a1.5 1.5 0 111.5-1.5 1.5 1.5 0 01-1.5 1.5z"/>
+</svg>
new file mode 100644
--- /dev/null
+++ b/mail/themes/shared/mail/icons/sent.svg
@@ -0,0 +1,7 @@
+<!-- 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/. -->
+
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M12 14.12s.14.03.22.03a1 1 0 00.95-.8L14.98 2.2a1 1 0 00-1.23-1.17L1.4 8s-.5.3-.41 1c.09.65.82.9.82.9L5 11.18v3.4s0 .33.3.41c.3.08.48-.1.7-.35.56-.65 2-2.21 2-2.21zM4 8.57l9-5.12-1.61 8.23-2.69-1.11L10 7 6.15 9.48z"/>
+</svg>
--- a/mail/themes/shared/mail/icons/subscribe.svg
+++ b/mail/themes/shared/mail/icons/subscribe.svg
@@ -1,4 +1,4 @@
 <!-- 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/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill="context-fill" d="M3.5 10A2.5 2.5 0 1 0 6 12.5 2.5 2.5 0 0 0 3.5 10zM2 1a1 1 0 0 0 0 2 10.883 10.883 0 0 1 11 11 1 1 0 0 0 2 0A12.862 12.862 0 0 0 2 1zm0 4a1 1 0 0 0 0 2 6.926 6.926 0 0 1 7 7 1 1 0 0 0 2 0 8.9 8.9 0 0 0-9-9z"></path></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path d="M3.5 10A2.5 2.5 0 1 0 6 12.5 2.5 2.5 0 0 0 3.5 10zM2 1a1 1 0 0 0 0 2 10.883 10.883 0 0 1 11 11 1 1 0 0 0 2 0A12.862 12.862 0 0 0 2 1zm0 4a1 1 0 0 0 0 2 6.926 6.926 0 0 1 7 7 1 1 0 0 0 2 0 8.9 8.9 0 0 0-9-9z"></path></svg>
new file mode 100644
--- /dev/null
+++ b/mail/themes/shared/mail/icons/template.svg
@@ -0,0 +1,6 @@
+<!-- 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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
+  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M3 0a2 2 0 00-2 2v12c0 1.1.9 2 2 2h10a2 2 0 002-2V2a2 2 0 00-2-2H3zm1 2h8a1 1 0 011 1v10a1 1 0 01-1 1H4a1 1 0 01-1-1V3a1 1 0 011-1zm1.5 2c-.24 0-.5.26-.5.5v2c0 .24.26.5.5.5h2c.24 0 .5-.26.5-.5v-2c0-.24-.26-.5-.5-.5h-2zm4 0c-.67 0-.67 1 0 1h1c.67 0 .67-1 0-1h-1zM6 5h1v1H6V5zm3.5 1c-.67 0-.67 1 0 1h1c.67 0 .67-1 0-1h-1zm-4 2c-.67 0-.67 1 0 1h5c.67 0 .67-1 0-1h-5zm0 2c-.67 0-.67 1 0 1h2c.67 0 .67-1 0-1h-2zm3 2c-.66 0-.66 1 0 1h2c.67 0 .67-1 0-1h-2z"/>
+</svg>
--- a/mail/themes/windows/mail/folderPane.css
+++ b/mail/themes/windows/mail/folderPane.css
@@ -1,274 +1,49 @@
 /* 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/. */
 
-/* ::::: Folder Pane ::::: */
-
-.tabmail-tab[type="folder"],
-treechildren::-moz-tree-image(folderNameCol) {
-  list-style-image: url("chrome://messenger/skin/icons/folder.png");
-  -moz-image-region: rect(0 16px 16px 0);
-}
-
-.tabmail-tab[type="folder"][selected="true"] {
-  -moz-image-region: rect(0 32px 16px 16px);
-}
+@import url("chrome://messenger/skin/shared/folderPane.css");
 
 treechildren::-moz-tree-image(folderNameCol) {
-  margin-inline-end: 2px;
-  width: 16px;
-  height: 16px;
-}
-
-/* ..... Shared folders .....
-
-treechildren::-moz-tree-image(folderNameCol, imapShared-true) {
-  -moz-image-region: rect(0 192px 16px 176px);
-}
-
-*/
-
-treechildren::-moz-tree-image(folderNameCol, newMessages-true) {
-  -moz-image-region: rect(16px 16px 32px 0);
-}
-
-treechildren::-moz-tree-image(folderNameCol, selected, open) {
-  -moz-image-region: rect(0 32px 16px 16px);
-}
-
-/* ..... Newsgroup ..... */
-
-.tabmail-tab[type="folder"][ServerType="nntp"],
-treechildren::-moz-tree-image(folderNameCol, serverType-nntp),
-treechildren::-moz-tree-image(folderNameCol, serverType-nntp, open) {
-  -moz-image-region: rect(0 160px 16px 144px);
-}
-
-/* ..... Feed folder, feed item ..... */
-
-treechildren::-moz-tree-image(folderNameCol, isFeed-true) {
-  list-style-image: url("chrome://messenger-newsblog/skin/rss-feed.png");
-  -moz-image-region: rect(32px 16px 48px 0);
-}
-.tabmail-tab[type="folder"][IsFeedFolder="true"],
-treechildren::-moz-tree-image(folderNameCol, isFeedFolder-true) {
-  list-style-image: url("chrome://messenger-newsblog/skin/rss-feed-folder.png");
-  -moz-image-region: auto;
-}
-treechildren::-moz-tree-image(folderNameCol, serverIsPaused),
-treechildren::-moz-tree-cell-text(folderNameCol, serverIsPaused),
-treechildren::-moz-tree-image(folderNameCol, isPaused),
-treechildren::-moz-tree-cell-text(folderNameCol, isPaused) {
-  opacity: 0.4;
-}
-treechildren::-moz-tree-image(folderNameCol, isBusy) {
-  list-style-image: url("chrome://messenger/skin/icons/waiting.svg");
-  -moz-image-region: rect(0 16px 16px 0);
-}
-treechildren::-moz-tree-image(folderNameCol, hasError) {
-  list-style-image: url("chrome://global/skin/icons/warning.svg");
-  -moz-image-region: rect(0 16px 16px 0);
-  fill: #e62117;
-}
-
-/* ..... Inbox ..... */
-
-.tabmail-tab[type="folder"][SpecialFolder="Inbox"],
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Inbox),
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Inbox, open) {
-  -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 ..... */
-
-.tabmail-tab[type="folder"][SpecialFolder="Sent"],
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Sent),
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Sent, open) {
-  -moz-image-region: rect(0 64px 16px 48px);
-}
-
-/* ..... Unsent ..... */
-
-.tabmail-tab[type="folder"][SpecialFolder="Outbox"],
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Outbox),
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Outbox, open) {
-  -moz-image-region: rect(0 80px 16px 64px);
+  margin-top: 2px;
 }
 
-/* ..... Drafts ..... */
-
-.tabmail-tab[type="folder"][SpecialFolder="Drafts"],
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Drafts),
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Drafts, open) {
-  -moz-image-region: rect(0 96px 16px 80px);
-}
-
-/* ..... Templates ..... */
-
-.tabmail-tab[type="folder"][SpecialFolder="Templates"],
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Templates),
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Templates, open) {
-  -moz-image-region: rect(0 112px 16px 96px);
-}
-
-/* ..... Junk ..... */
-
-.tabmail-tab[type="folder"][SpecialFolder="Junk"],
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Junk),
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Junk, open) {
-  -moz-image-region: rect(0 128px 16px 112px);
-}
-
-/* ..... Trash ..... */
-
-.tabmail-tab[type="folder"][SpecialFolder="Trash"],
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Trash),
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Trash, open) {
-  -moz-image-region: rect(0 144px 16px 128px);
-}
-
-/* ..... Archives ..... */
-
-.tabmail-tab[type="folder"][SpecialFolder="Archive"],
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Archive),
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Archive, open) {
-  -moz-image-region: rect(0 208px 16px 192px);
-}
-
-/* ..... Saved Search Folder ..... */
-
-.tabmail-tab[type="folder"][SpecialFolder="Virtual"],
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Virtual),
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Virtual, open) {
-  -moz-image-region: rect(0 176px 16px 160px);
-}
-
-treechildren::-moz-tree-cell-text(folderNameCol, newMessages-true),
-treechildren::-moz-tree-cell-text(folderNameCol, specialFolder-Inbox, newMessages-true) {
-  font-weight: bold;
-}
-
-/* ..... Mail server  ..... */
-
-.tabmail-tab[type="folder"][IsServer="true"],
-treechildren::-moz-tree-image(folderNameCol, isServer-true),
-treechildren::-moz-tree-image(folderNameCol, isServer-true, open) {
-  list-style-image: url("chrome://messenger/skin/icons/server.png");
-  -moz-image-region: rect(0 16px 16px 0);
-}
-
-treechildren::-moz-tree-image(folderNameCol, isServer-true, biffState-NewMail) {
-  -moz-image-region: rect(16px 16px 32px 0);
-}
-
-/* ..... Secure mail server ..... */
-
-.tabmail-tab[type="folder"][IsServer="true"][ServerType="imap"][IsSecure="true"],
-.tabmail-tab[type="folder"][IsServer="true"][ServerType="pop3"][IsSecure="true"],
-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, isServer-true, biffState-NewMail, isSecure-true) {
-  -moz-image-region: rect(16px 32px 32px 16px);
-}
-
-/* ..... Local folders ..... */
-
-.tabmail-tab[type="folder"][IsServer="true"][ServerType="none"],
-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 ..... */
-
-.tabmail-tab[type="folder"][IsServer="true"][ServerType="nntp"],
-treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp) {
-  -moz-image-region: rect(0 64px 16px 48px) !important;
-}
-
-.tabmail-tab[type="folder"][IsServer="true"][ServerType="nntp"][IsSecure="true"],
-treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp, isSecure-true) {
-  -moz-image-region: rect(0 80px 16px 64px) !important;
-}
-
-/* ..... Feed server ..... */
-
-.tabmail-tab[type="folder"][IsServer="true"][ServerType="rss"],
-treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-rss) {
-  list-style-image: url("chrome://messenger-newsblog/skin/rss-feed.png");
-  -moz-image-region: rect(0 16px 16px 0);
+#folderTree > treechildren::-moz-tree-row {
+  min-height: 1.6rem;
 }
 
 /* ::::: All Servers ::::: */
 
+treechildren::-moz-tree-image(folderNameCol, newMessages-true),
 treechildren::-moz-tree-cell-text(folderNameCol, isServer-true, biffState-NewMail),
 treechildren::-moz-tree-cell-text(folderNameCol, newMessages-true),
 treechildren::-moz-tree-cell-text(folderNameCol, specialFolder-Inbox, newMessages-true) {
   color: -moz-hyperlinktext !important;
 }
 
 @media (-moz-windows-default-theme: 0) {
+  treechildren::-moz-tree-image(folderNameCol, newMessages-true, selected, focus),
   treechildren::-moz-tree-cell-text(folderNameCol, isServer-true, biffState-NewMail, selected, focus),
   treechildren::-moz-tree-cell-text(folderNameCol, newMessages-true, selected, focus),
   treechildren::-moz-tree-cell-text(folderNameCol, specialFolder-Inbox, newMessages-true, selected, focus) {
     color: HighlightText !important;
   }
 }
 
 @media (-moz-windows-default-theme) {
+  treechildren::-moz-tree-image(folderNameCol, newMessages-true, selected, focus),
   treechildren::-moz-tree-cell-text(folderNameCol, isServer-true, biffState-NewMail, selected, focus),
   treechildren::-moz-tree-cell-text(folderNameCol, newMessages-true, selected, focus),
   treechildren::-moz-tree-cell-text(folderNameCol, specialFolder-Inbox, newMessages-true, selected, focus) {
     color: -moz-DialogText !important;
   }
 }
 
-treechildren::-moz-tree-cell-text(hasUnreadMessages-true),
-treechildren::-moz-tree-cell-text(folderNameCol, isServer-true),
-treechildren::-moz-tree-cell-text(closed, subfoldersHaveUnreadMessages-true) {
-  font-weight: bold;
-}
-
 treechildren::-moz-tree-cell-text(folderNameCol, noSelect-true) {
   color: GrayText !important;
   font-style: italic;
 }
 
 #folderTree treechildren::-moz-tree-indentation {
   width: 8px;
 }
-
-treechildren::-moz-tree-cell-text(imapdeleted) {
-  text-decoration: line-through;
-}
-
-.tree-folder-checkbox {
-  list-style-image: none;
-}
-
-/* ::::: Folder Summary Popup ::::: */
-
-.folderSummary-message-row {
-  /* This max width ends up dictating the overall width of the popup
-     because it controls how large the preview, subject and sender text can be
-     before cropping kicks in */
-  max-width: 450px;
-}
-
-.folderSummary-subject {
-  font-weight: bold;
-}
-
-.folderSummary-previewText {
-  opacity: 0.6;
-}