Bug 1489840 - Use context-fill for the treecol icons. r=jorgk
authorRichard Marti <richard.marti@gmail.com>
Sun, 09 Sep 2018 11:41:11 +0200
changeset 33110 a682d50b9f77d581c589af056c5fe49b40a8b436
parent 33109 4eec6def8a100730fef0fcd861272998640189ab
child 33111 2cfa24cfd1ac6984457e9bd952fb2e347670faba
push id387
push userclokep@gmail.com
push dateMon, 10 Dec 2018 21:30:47 +0000
reviewersjorgk
bugs1489840
Bug 1489840 - Use context-fill for the treecol icons. r=jorgk
mail/themes/linux/jar.mn
mail/themes/linux/mail/icons/columnpicker.svg
mail/themes/linux/mail/icons/flag-col.svg
mail/themes/linux/mail/icons/junk-col.svg
mail/themes/linux/mail/icons/readcol.svg
mail/themes/linux/mail/icons/thread-col.svg
mail/themes/linux/mail/messageIcons.css
mail/themes/osx/jar.mn
mail/themes/osx/mail/icons/column-headers.png
mail/themes/osx/mail/icons/column-headers@2x.png
mail/themes/osx/mail/messageIcons.css
mail/themes/shared/jar.inc.mn
mail/themes/shared/mail/icons/columnpicker.svg
mail/themes/shared/mail/icons/flag-col.svg
mail/themes/shared/mail/icons/junk-col.svg
mail/themes/shared/mail/icons/readcol.svg
mail/themes/shared/mail/icons/thread-col.svg
mail/themes/windows/jar.mn
mail/themes/windows/mail/icons/columnpicker.svg
mail/themes/windows/mail/icons/flag-col.svg
mail/themes/windows/mail/icons/junk-col.svg
mail/themes/windows/mail/icons/readcol.svg
mail/themes/windows/mail/icons/thread-col.svg
mail/themes/windows/mail/messageIcons.css
--- a/mail/themes/linux/jar.mn
+++ b/mail/themes/linux/jar.mn
@@ -131,27 +131,22 @@ classic.jar:
   skin/classic/messenger/icons/cancel.png                     (mail/icons/cancel.png)
   skin/classic/messenger/icons/folder-pane.png                (mail/icons/folder-pane.png)
   skin/classic/messenger/icons/folder-new-star.png            (mail/icons/folder-new-star.png)
   skin/classic/messenger/icons/message-list.png               (mail/icons/message-list.png)
   skin/classic/messenger/icons/message.png                    (mail/icons/message.png)
   skin/classic/messenger/icons/multicolor.png                 (mail/icons/multicolor.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/columnpicker.svg               (mail/icons/columnpicker.svg)
-  skin/classic/messenger/icons/junk-col.svg                   (mail/icons/junk-col.svg)
-  skin/classic/messenger/icons/thread-col.svg                 (mail/icons/thread-col.svg)
   skin/classic/messenger/icons/thread.png                     (mail/icons/thread.png)
   skin/classic/messenger/icons/thread-ignored.png             (mail/icons/thread-ignored.png)
   skin/classic/messenger/icons/message-ignored.png            (mail/icons/message-ignored.png)
   skin/classic/messenger/icons/thread-watched.png             (mail/icons/thread-watched.png)
   skin/classic/messenger/icons/flag-col.png                   (mail/icons/flag-col.png)
-  skin/classic/messenger/icons/flag-col.svg                   (mail/icons/flag-col.svg)
   skin/classic/messenger/icons/server.png                     (mail/icons/server.png)
-  skin/classic/messenger/icons/readcol.svg                    (mail/icons/readcol.svg)
   skin/classic/messenger/icons/search-arrow.png               (mail/icons/search-arrow.png)
   skin/classic/messenger/icons/close-button.png               (mail/icons/close-button.png)
   skin/classic/messenger/icons/phishing.png                   (mail/icons/phishing.png)
   skin/classic/messenger/icons/junk.png                       (mail/icons/junk.png)
   skin/classic/messenger/icons/check.gif                      (mail/icons/check.gif)
   skin/classic/messenger/icons/notchecked.gif                 (mail/icons/notchecked.gif)
   skin/classic/messenger/icons/online.png                     (mail/icons/online.png)
   skin/classic/messenger/icons/offline.png                    (mail/icons/offline.png)
deleted file mode 100644
--- a/mail/themes/linux/mail/icons/columnpicker.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- 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="14"
-   height="12">
-  <path
-     d="M 2.03125 2.0625 L 2 10.0625 L 6 10.0625 L 6 9.0625 L 3 9.0625 L 3.03125 5.0625 L 6 5.0625 L 6 7.03125 L 7 7.03125 L 7 5.0625 L 9.96875 5.0625 L 9.96875 7.0625 L 10.96875 7.0625 L 10.96875 2.0625 L 2.03125 2.0625 z M 3.03125 3.0625 L 6 3.0625 L 6 4.0625 L 3.03125 4.0625 L 3.03125 3.0625 z M 7 3.0625 L 9.96875 3.0625 L 9.96875 4.0625 L 7 4.0625 L 7 3.0625 z M 12.53125 8.03125 L 6.59375 8.0625 L 9.5 11.40625 L 12.53125 8.03125 z "
-     fill="-moz-dialogtext"/>
-</svg>
deleted file mode 100644
--- a/mail/themes/linux/mail/icons/flag-col.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- 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="12"
-   height="12">
-  <path
-     d="M 9.3000057,11 6,9.3366653 2.7392307,10.973952 3.510138,7.3579828 0.87239158,4.9758703 4.4391416,4.5075268 6.0596956,0.89092 7.5139407,4.4799772 11.127608,4.9758703 8.6691294,7.4315414 z"
-     fill="-moz-dialogtext"/>
-</svg>
deleted file mode 100644
--- a/mail/themes/linux/mail/icons/junk-col.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- 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="12"
-   height="12">
-  <path
-     d="M 7.3346056,0.14866353 C 4.6465523,1.5909133 3.1303244,3.4741487 3.0739564,6.2231237 L 3.0516494,6.9600989 C 3.0516494,9.14705 4.821871,11 7,11 9.1781292,11 10.926043,9.14705 10.926043,6.9600989 l 0.0223,-1.004966 c 0,-1.559992 -1.2157885,-2.9235349 -2.141478,-3.573212 0.6570366,1.5385909 0.6454872,2.7693674 -0.6245932,3.7935129 L 7.780747,6.4464492 7.3346056,6.2007912 c -1.5461179,-2.0112039 -1.0032341,-4.0409238 0,-6.05212767 z"
-     fill="-moz-dialogtext"/>
-</svg>
deleted file mode 100644
--- a/mail/themes/linux/mail/icons/readcol.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 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="12"
-   height="12">
-  <circle
-     cx="3.5" cy="6.3" r="2"
-     fill="-moz-dialogtext" fill-opacity="0.5" />
-  <circle
-     cx="9" cy="6.3" r="2"
-     fill="-moz-dialogtext" fill-opacity="0.5" />
-  <path
-     d="m 3.53125,4.015625 c -1.3738231,0 -2.5,1.1261771 -2.5,2.5 0,1.373823 1.1261769,2.5 2.5,2.5 C 4.9050729,9.015625 6,7.889448 6,6.515625 6,6.3866621 5.987523,6.2645792 5.96875,6.140625 6.1088838,6.085794 6.3459473,5.984375 6.5,5.984375 c 0.254885,0 0.4164559,0.102189 0.5625,0.1875 -0.016013,0.1134588 -0.03125,0.2261825 -0.03125,0.34375 0,1.3738231 1.126177,2.5 2.5,2.5 1.373823,0 2.5,-1.1261769 2.5,-2.5 0,-1.373823 -1.126177,-2.5 -2.5,-2.5 -0.899176,0 -1.682789,0.4986821 -2.125,1.21875 -0.26345,-0.1223 -0.61176,-0.25 -0.96875,-0.25 -0.2933382,0 -0.5893514,0.1288339 -0.8125,0.21875 -0.4382768,-0.7008678 -1.2091151,-1.1875 -2.09375,-1.1875 z m 0,1.03125 C 4.3646327,5.046875 5,5.6822422 5,6.515625 c 0,0.8333829 -0.6353672,1.53125 -1.46875,1.53125 -0.833383,0 -1.5,-0.6978671 -1.5,-1.53125 0,-0.8333828 0.666617,-1.46875 1.5,-1.46875 z m 6,0 c 0.833383,0 1.5,0.6353672 1.5,1.46875 0,0.8333829 -0.666617,1.53125 -1.5,1.53125 -0.8333829,0 -1.5,-0.6978671 -1.5,-1.53125 0,-0.8333828 0.6666171,-1.46875 1.5,-1.46875 z"
-     fill="-moz-dialogtext"/>
-</svg>
deleted file mode 100644
--- a/mail/themes/linux/mail/icons/thread-col.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- 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="12"
-   height="12">
-  <path
-     d="M 3,1 3,3 3,3.53125 3,4 5,4 5,10 8,10 8,9 6,9 6,7 8,7 8,6 6,6 6,3 4,3 4,1 3,1 z"
-     fill="-moz-dialogtext" />
-</svg>
--- a/mail/themes/linux/mail/messageIcons.css
+++ b/mail/themes/linux/mail/messageIcons.css
@@ -1,14 +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/. */
 
 /* ::::: message column icons ::::: */
 
+.treecol-image image {
+  -moz-context-properties: fill;
+  fill: currentColor;
+}
+
 treecol.treecol-image:hover:active {
   padding-inline-start: 1px;
 }
 
 /* ..... column picker ..... */
 
 .tree-columnpicker-icon  {
   list-style-image: url(chrome://messenger/skin/icons/columnpicker.svg);
@@ -53,18 +58,16 @@ treechildren::-moz-tree-image(unreadButt
   -moz-image-region: rect(16px 16px 32px 0);
 }
 
 /* ..... attachment column ..... */
 
 .attachmentColumnHeader {
   list-style-image: url(chrome://messenger/skin/icons/attachment-col.svg);
   padding-inline-end: 2px;
-  -moz-context-properties: fill;
-  fill: currentColor;
 }
 
 treechildren::-moz-tree-image(attachmentCol, attach) {
   list-style-image: url(chrome://messenger/skin/icons/attachment-col.svg);
   padding-inline-start: 6px;
 }
 
 /* ..... flag column ..... */
--- a/mail/themes/osx/jar.mn
+++ b/mail/themes/osx/jar.mn
@@ -141,18 +141,16 @@ classic.jar:
   skin/classic/messenger/smime/icons/hdrSignNotOk.png            (mail/smime/hdrSignNotOk.png)
   skin/classic/messenger/smime/icons/hdrCryptoOk.png             (mail/smime/hdrCryptoOk.png)
   skin/classic/messenger/smime/icons/hdrCryptoNotOk.png          (mail/smime/hdrCryptoNotOk.png)
   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/column-headers.png                (mail/icons/column-headers.png)
-  skin/classic/messenger/icons/column-headers@2x.png             (mail/icons/column-headers@2x.png)
   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/group-background.gif              (mail/icons/group-background.gif)
   skin/classic/messenger/icons/multicolor.png                    (mail/icons/multicolor.png)
deleted file mode 100644
index d955b0f67b10703248052601fae4945e9859b12a..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 3d575a33e680da72ff8b307ea11aaabb19943331..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/mail/themes/osx/mail/messageIcons.css
+++ b/mail/themes/osx/mail/messageIcons.css
@@ -1,17 +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/. */
 
 /* ..... thread column ..... */
 
+.treecol-image image {
+  -moz-context-properties: fill;
+  fill: currentColor;
+}
+
 .threadColumnHeader {
-  list-style-image: url(chrome://messenger/skin/icons/column-headers.png);
-  -moz-image-region: rect(0 80px 16px 64px);
+  list-style-image: url(chrome://messenger/skin/icons/thread-col.svg);
 }
 
 treechildren::-moz-tree-image(threadCol, container) {
   list-style-image: url(chrome://messenger/skin/icons/threadpane-col.png);
   -moz-image-region: rect(0 16px 16px 0);
 }
 
 treechildren::-moz-tree-image(threadCol, container, focus, selected) {
@@ -24,18 +28,19 @@ treechildren::-moz-tree-image(threadCol,
 
 treechildren::-moz-tree-image(threadCol, container, hasUnread, focus, selected) {
   -moz-image-region: rect(16px 32px 32px 16px);
 }
 
 /* ..... read column ..... */
 
 .readColumnHeader {
-  list-style-image: url(chrome://messenger/skin/icons/column-headers.png);
-  -moz-image-region: rect(0 64px 16px 48px);
+  list-style-image: url(chrome://messenger/skin/icons/readcol.svg);
+  padding-inline-start: 2px;
+  padding-inline-end: 3px;
 }
 
 treechildren::-moz-tree-image(unreadButtonColHeader) {
   list-style-image: url(chrome://messenger/skin/icons/threadpane-col.png);
   -moz-image-region: rect(0 48px 16px 32px);
 }
 
 treechildren::-moz-tree-image(unreadButtonColHeader, focus, selected) {
@@ -76,34 +81,28 @@ treechildren::-moz-tree-image(subjectCol
 }
 
 /* ..... attachment column ..... */
 
 .attachmentColumnHeader {
   list-style-image: url(chrome://messenger/skin/icons/attachment-col.svg);
   padding-inline-start: 2px;
   padding-inline-end: 3px;
-  -moz-context-properties: fill;
-  fill: currentColor;
 }
 
 treechildren::-moz-tree-image(attachmentCol, attach) {
   list-style-image: url(chrome://messenger/skin/icons/attachment-col.svg);
 }
 
-#threadCols > .attachmentColumnHeader > .treecol-icon {
-  width: 14px;
-  height: 14px;
-}
-
 /* ..... flag column ..... */
 
 .flagColumnHeader {
-  list-style-image: url(chrome://messenger/skin/icons/column-headers.png);
-  -moz-image-region: rect(0 32px 16px 16px);
+  list-style-image: url(chrome://messenger/skin/icons/flag-col.svg);
+  padding-right: 3px;
+  padding-left: 3px;
 }
 
 treechildren::-moz-tree-image(flaggedCol) {
   list-style-image: url(chrome://messenger/skin/icons/threadpane-col.png);
   -moz-image-region: rect(0 48px 16px 32px);
 }
 
 treechildren::-moz-tree-image(flaggedCol, focus, selected) {
@@ -116,19 +115,19 @@ treechildren::-moz-tree-image(flaggedCol
 
 treechildren::-moz-tree-image(flaggedCol, flagged, focus, selected) {
   -moz-image-region: rect(16px 80px 32px 64px);
 }
 
 /* ..... junkStatus column ..... */
 
 .junkStatusHeader {
-  list-style-image: url(chrome://messenger/skin/icons/column-headers.png);
-  -moz-image-region: rect(0 48px 16px 32px);
-  padding-inline-start: 2px;
+  list-style-image: url(chrome://messenger/skin/icons/junk-col.svg);
+  padding-inline-start: 3px;
+  padding-inline-end: 5px !important;
 }
 
 /* "unknown" now looks like "not junk".  see bug #182386 */
 treechildren::-moz-tree-image(junkStatusCol) {
   list-style-image: url(chrome://messenger/skin/icons/threadpane-col.png);
   -moz-image-region: rect(0 96px 16px 80px);
   margin-inline-start: 1px;
 }
@@ -214,22 +213,23 @@ treechildren::-moz-tree-image(threadCol,
   -moz-image-region: auto !important;
 }
 
 treechildren::-moz-tree-image(threadCol, ignoreSubthread) {
   list-style-image: url(chrome://messenger/skin/icons/message-closed-kill.png) !important;
   -moz-image-region: auto !important;
 }
 
+/* ..... column picker ..... */
+
+.tree-columnpicker-icon  {
+  list-style-image: url(chrome://messenger/skin/icons/columnpicker.svg);
+}
+
 @media (min-resolution: 2dppx) {
-  .threadColumnHeader {
-    list-style-image: url(chrome://messenger/skin/icons/column-headers@2x.png);
-    -moz-image-region: rect(0 160px 32px 128px);
-  }
-
   treechildren::-moz-tree-image(threadCol, container) {
     list-style-image: url(chrome://messenger/skin/icons/threadpane-col@2x.png);
     -moz-image-region: rect(0 32px 32px 0);
   }
 
   treechildren::-moz-tree-image(threadCol, container, focus, selected) {
     -moz-image-region: rect(32px 32px 64px 0);
   }
@@ -237,35 +237,25 @@ treechildren::-moz-tree-image(threadCol,
   treechildren::-moz-tree-image(threadCol, container, hasUnread) {
     -moz-image-region: rect(0 64px 32px 32px);
   }
 
   treechildren::-moz-tree-image(threadCol, container, hasUnread, focus, selected) {
     -moz-image-region: rect(32px 64px 64px 32px);
   }
 
-  .readColumnHeader {
-    list-style-image: url(chrome://messenger/skin/icons/column-headers@2x.png);
-    -moz-image-region: rect(0 128px 32px 96px);
-  }
-
   treechildren::-moz-tree-image(unreadButtonColHeader) {
     list-style-image: url(chrome://messenger/skin/icons/threadpane-col@2x.png);
     -moz-image-region: rect(0 96px 32px 64px);
   }
 
   treechildren::-moz-tree-image(unreadButtonColHeader, focus, selected) {
     -moz-image-region: rect(32px 96px 64px 64px);
   }
 
-  .flagColumnHeader {
-    list-style-image: url(chrome://messenger/skin/icons/column-headers@2x.png);
-    -moz-image-region: rect(0 64px 32px 32px);
-  }
-
   treechildren::-moz-tree-image(flaggedCol) {
     list-style-image: url(chrome://messenger/skin/icons/threadpane-col@2x.png);
     -moz-image-region: rect(0 96px 32px 64px);
   }
 
   treechildren::-moz-tree-image(flaggedCol, focus, selected) {
     -moz-image-region: rect(32px 96px 64px 64px);
   }
@@ -273,41 +263,29 @@ treechildren::-moz-tree-image(threadCol,
   treechildren::-moz-tree-image(flaggedCol, flagged) {
     -moz-image-region: rect(0 160px 32px 128px);
   }
 
   treechildren::-moz-tree-image(flaggedCol, flagged, focus, selected) {
     -moz-image-region: rect(32px 160px 64px 128px);
   }
 
-  .junkStatusHeader {
-    list-style-image: url(chrome://messenger/skin/icons/column-headers@2x.png);
-    -moz-image-region: rect(0 96px 32px 64px);
-  }
-
   treechildren::-moz-tree-image(junkStatusCol) {
     list-style-image: url(chrome://messenger/skin/icons/threadpane-col@2x.png);
     -moz-image-region: rect(0 192px 32px 160px);
   }
 
   treechildren::-moz-tree-image(junkStatusCol, notjunk) {
     -moz-image-region: rect(0 192px 32px 160px);
   }
 
   treechildren::-moz-tree-image(junkStatusCol, junk) {
     -moz-image-region: rect(32px 192px 64px 160px);
   }
 
-  .tree-columnpicker-icon {
-    list-style-image: url(chrome://messenger/skin/icons/column-headers@2x.png);
-    -moz-image-region: rect(0 192px 32px 160px);
-  }
-
-  .tree-columnpicker-icon,
-  #threadCols > treecol > .treecol-icon,
   treechildren::-moz-tree-image(threadCol, container),
   treechildren::-moz-tree-image(unreadButtonColHeader),
   treechildren::-moz-tree-image(flaggedCol),
   treechildren::-moz-tree-image(junkStatusCol),
   treechildren::-moz-tree-image(correspondentCol) {
     width: 16px;
     height: 16px;
   }
--- a/mail/themes/shared/jar.inc.mn
+++ b/mail/themes/shared/jar.inc.mn
@@ -21,31 +21,34 @@
   skin/classic/messenger/icons/archive.svg                    (../shared/mail/icons/archive.svg)
   skin/classic/messenger/icons/arrow-dropdown.svg             (../shared/mail/icons/arrow-dropdown.svg)
   skin/classic/messenger/icons/arrow-left.svg                 (../shared/mail/icons/arrow-left.svg)
   skin/classic/messenger/icons/attach.svg                     (../shared/mail/icons/attach.svg)
   skin/classic/messenger/icons/attachment-col.svg             (../shared/mail/icons/attachment-col.svg)
   skin/classic/messenger/icons/blacklist.svg                  (../shared/mail/icons/blacklist.svg)
   skin/classic/messenger/icons/cert-error.svg                 (../shared/mail/icons/cert-error.svg)
   skin/classic/messenger/icons/chat.svg                       (../shared/mail/icons/chat.svg)
+  skin/classic/messenger/icons/columnpicker.svg               (../shared/mail/icons/columnpicker.svg)
   skin/classic/messenger/icons/copy.svg                       (../shared/mail/icons/copy.svg)
   skin/classic/messenger/icons/cut.svg                        (../shared/mail/icons/cut.svg)
   skin/classic/messenger/icons/correspondents.svg             (../shared/mail/icons/correspondents.svg)
   skin/classic/messenger/icons/compact.svg                    (../shared/mail/icons/compact.svg)
   skin/classic/messenger/icons/conversation.svg               (../shared/mail/icons/conversation.svg)
   skin/classic/messenger/icons/delete.svg                     (../shared/mail/icons/delete.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/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/join.svg                       (../shared/mail/icons/join.svg)
   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/mark.svg                       (../shared/mail/icons/mark.svg)
   skin/classic/messenger/icons/message.svg                    (../shared/mail/icons/message.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)
@@ -54,31 +57,33 @@
   skin/classic/messenger/icons/nextunread.svg                 (../shared/mail/icons/nextunread.svg)
   skin/classic/messenger/icons/overflow-indicator.png         (../shared/mail/icons/overflow-indicator.png)
   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)
   skin/classic/messenger/icons/print.svg                      (../shared/mail/icons/print.svg)
   skin/classic/messenger/icons/quote.svg                      (../shared/mail/icons/quote.svg)
+  skin/classic/messenger/icons/readcol.svg                    (../shared/mail/icons/readcol.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/search-glass.svg               (../shared/mail/icons/search-glass.svg)
   skin/classic/messenger/icons/save.svg                       (../shared/mail/icons/save.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/sort.svg                       (../shared/mail/icons/sort.svg)
   skin/classic/messenger/icons/spelling.svg                   (../shared/mail/icons/spelling.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/tag.svg                        (../shared/mail/icons/tag.svg)
+  skin/classic/messenger/icons/thread-col.svg                 (../shared/mail/icons/thread-col.svg)
   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/waiting.svg                    (../shared/mail/icons/waiting.svg)
   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/in-content/dialog.css         (../shared/mail/incontentprefs/dialog.css)
   skin/classic/messenger/shared/in-content/aboutPreferences.css (../shared/mail/incontentprefs/aboutPreferences.css)
rename from mail/themes/windows/mail/icons/columnpicker.svg
rename to mail/themes/shared/mail/icons/columnpicker.svg
--- a/mail/themes/windows/mail/icons/columnpicker.svg
+++ b/mail/themes/shared/mail/icons/columnpicker.svg
@@ -1,11 +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="14"
-   height="12">
-  <path
-     d="M 2.03125 2.0625 L 2 10.0625 L 6 10.0625 L 6 9.0625 L 3 9.0625 L 3.03125 5.0625 L 6 5.0625 L 6 7.03125 L 7 7.03125 L 7 5.0625 L 9.96875 5.0625 L 9.96875 7.0625 L 10.96875 7.0625 L 10.96875 2.0625 L 2.03125 2.0625 z M 3.03125 3.0625 L 6 3.0625 L 6 4.0625 L 3.03125 4.0625 L 3.03125 3.0625 z M 7 3.0625 L 9.96875 3.0625 L 9.96875 4.0625 L 7 4.0625 L 7 3.0625 z M 12.53125 8.03125 L 6.59375 8.0625 L 9.5 11.40625 L 12.53125 8.03125 z "
-     fill="-moz-dialogtext"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12" fill="context-fill">
+  <path d="M2.03 2.06l-.03 8h4v-1H3l.03-4H6v1.97h1V5.06h2.97v2h1v-5H2.03zm1 1H6v1H3.03v-1zm3.97 0h2.97v1H7v-1zm5.53 4.97l-5.94.03 2.91 3.35 3.03-3.38z"/>
 </svg>
rename from mail/themes/windows/mail/icons/flag-col.svg
rename to mail/themes/shared/mail/icons/flag-col.svg
--- a/mail/themes/windows/mail/icons/flag-col.svg
+++ b/mail/themes/shared/mail/icons/flag-col.svg
@@ -1,11 +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="12"
-   height="12">
-  <path
-     d="M 9.3000057,11 6,9.3366653 2.7392307,10.973952 3.510138,7.3579828 0.87239158,4.9758703 4.4391416,4.5075268 6.0596956,0.89092 7.5139407,4.4799772 11.127608,4.9758703 8.6691294,7.4315414 z"
-     fill="-moz-dialogtext"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12" fill="context-fill">
+  <path d="M9.3 11L6 9.34l-3.26 1.63.77-3.61L.87 4.98l3.57-.47L6.06.89l1.45 3.59 3.62.5-2.46 2.45z"/>
 </svg>
rename from mail/themes/windows/mail/icons/junk-col.svg
rename to mail/themes/shared/mail/icons/junk-col.svg
--- a/mail/themes/windows/mail/icons/junk-col.svg
+++ b/mail/themes/shared/mail/icons/junk-col.svg
@@ -1,10 +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="12"
-  height="12">
-    <path d="M 7.3465084,1.1244305 C 4.6584551,2.5666803 3.1422272,4.4499157 3.0858592,7.1988907 l -0.022307,0.7369752 c 0,2.1869511 1.7702216,4.0399011 3.9483506,4.0399011 2.1781292,0 3.9260432,-1.85295 3.9260432,-4.0399011 l 0.0223,-1.004966 c 0,-1.559992 -1.2157887,-2.9235349 -2.1414782,-3.573212 C 9.4758044,4.8962788 9.464255,6.1270553 8.1941746,7.1512008 L 7.7926498,7.4222162 7.3465084,7.1765582 c -1.5461179,-2.0112039 -1.0032341,-4.0409238 0,-6.0521277 z"
-       fill="-moz-dialogtext" />
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12" fill="context-fill">
+    <path d="M7.35 1.12c-2.7 1.45-4.2 3.33-4.26 6.08l-.03.74a4.03 4.03 0 0 0 3.95 4.04 4 4 0 0 0 3.93-4.04l.02-1c0-1.57-1.22-2.93-2.14-3.58.66 1.54.64 2.77-.63 3.8l-.4.26-.44-.24c-1.55-2.01-1-4.04 0-6.06z"/>
 </svg>
rename from mail/themes/windows/mail/icons/readcol.svg
rename to mail/themes/shared/mail/icons/readcol.svg
--- a/mail/themes/windows/mail/icons/readcol.svg
+++ b/mail/themes/shared/mail/icons/readcol.svg
@@ -1,17 +1,9 @@
 <!-- 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="12"
-   height="12">
-  <circle
-     cx="3.5" cy="6.3" r="2"
-     fill="-moz-dialogtext" fill-opacity="0.5" />
-  <circle
-     cx="9" cy="6.3" r="2"
-     fill="-moz-dialogtext" fill-opacity="0.5" />
-  <path
-     d="m 2.9375,4.015625 c -1.3738231,0 -2.5,1.1261771 -2.5,2.5 0,1.373823 1.1261769,2.5 2.5,2.5 1.3738229,0 2.46875,-1.126177 2.46875,-2.5 0,-0.1289629 -0.012477,-0.2510458 -0.03125,-0.375 0.1401338,-0.054831 0.3771973,-0.15625 0.53125,-0.15625 0.254885,0 0.4164559,0.102189 0.5625,0.1875 -0.016013,0.1134588 -0.03125,0.2261825 -0.03125,0.34375 0,1.3738231 1.126177,2.5 2.5,2.5 1.373823,0 2.5,-1.1261769 2.5,-2.5 0,-1.373823 -1.126177,-2.5 -2.5,-2.5 -0.899176,0 -1.682789,0.4986821 -2.125,1.21875 -0.26345,-0.1223 -0.61176,-0.25 -0.96875,-0.25 -0.2933382,0 -0.5893514,0.1288339 -0.8125,0.21875 C 4.5929732,4.5022572 3.8221349,4.015625 2.9375,4.015625 z m 0,1.03125 c 0.8333827,0 1.46875,0.6353672 1.46875,1.46875 0,0.8333829 -0.6353672,1.53125 -1.46875,1.53125 -0.833383,0 -1.5,-0.6978671 -1.5,-1.53125 0,-0.8333828 0.666617,-1.46875 1.5,-1.46875 z m 6,0 c 0.8333829,0 1.5,0.6353672 1.5,1.46875 0,0.8333829 -0.6666171,1.53125 -1.5,1.53125 -0.8333829,0 -1.5,-0.6978671 -1.5,-1.53125 0,-0.8333828 0.6666171,-1.46875 1.5,-1.46875 z"
-     fill="-moz-dialogtext"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12" fill="context-fill">
+  <circle cx="3.5" cy="6.3" r="2" fill-opacity=".5" />
+  <circle cx="9" cy="6.3" r="2" fill-opacity=".5" />
+  <path d="M2.94 4.02a2.5 2.5 0 0 0-2.5 2.5 2.48 2.48 0 1 0 4.94-.38c.14-.05.37-.16.53-.16.25 0 .41.1.56.2a2.5 2.5 0 0 0 2.47 2.84 2.5 2.5 0 0 0 2.5-2.5 2.5 2.5 0 0 0-2.5-2.5c-.9 0-1.69.5-2.13 1.21a2.38 2.38 0 0 0-.97-.25c-.29 0-.59.13-.8.22a2.48 2.48 0 0 0-2.1-1.18zm0 1.03c.83 0 1.47.63 1.47 1.47a1.5 1.5 0 0 1-1.47 1.53c-.84 0-1.5-.7-1.5-1.53 0-.84.66-1.47 1.5-1.47zm6 0c.83 0 1.5.63 1.5 1.47 0 .83-.67 1.53-1.5 1.53-.84 0-1.5-.7-1.5-1.53 0-.84.66-1.47 1.5-1.47z"/>
 </svg>
rename from mail/themes/windows/mail/icons/thread-col.svg
rename to mail/themes/shared/mail/icons/thread-col.svg
--- a/mail/themes/windows/mail/icons/thread-col.svg
+++ b/mail/themes/shared/mail/icons/thread-col.svg
@@ -1,11 +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="12"
-   height="12">
-  <path
-     d="M 3,1 3,3 3,3.53125 3,4 5,4 5,10 8,10 8,9 6,9 6,7 8,7 8,6 6,6 6,3 4,3 4,1 3,1 z"
-     fill="-moz-dialogtext" />
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12" fill="context-fill">
+  <path d="M3 1v3h2v6h3V9H6V7h2V6H6V3H4V1H3z"/>
 </svg>
--- a/mail/themes/windows/jar.mn
+++ b/mail/themes/windows/jar.mn
@@ -121,29 +121,24 @@ classic.jar:
   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/columnpicker.svg               (mail/icons/columnpicker.svg)
-  skin/classic/messenger/icons/junk-col.svg                   (mail/icons/junk-col.svg)
-  skin/classic/messenger/icons/thread-col.svg                 (mail/icons/thread-col.svg)
   skin/classic/messenger/icons/thread.png                     (mail/icons/thread.png)
   skin/classic/messenger/icons/thread-ignored.png             (mail/icons/thread-ignored.png)
   skin/classic/messenger/icons/message-ignored.png            (mail/icons/message-ignored.png)
   skin/classic/messenger/icons/thread-watched.png             (mail/icons/thread-watched.png)
   skin/classic/messenger/icons/flag-col.png                   (mail/icons/flag-col.png)
-  skin/classic/messenger/icons/flag-col.svg                   (mail/icons/flag-col.svg)
   skin/classic/messenger/icons/flag-empty.png                 (mail/icons/flag-empty.png)
   skin/classic/messenger/icons/server.png                     (mail/icons/server.png)
   skin/classic/messenger/icons/read.png                       (mail/icons/read.png)
-  skin/classic/messenger/icons/readcol.svg                    (mail/icons/readcol.svg)
   skin/classic/messenger/icons/unreadmail.png                 (mail/icons/unreadmail.png)
   skin/classic/messenger/icons/search-arrow.gif               (mail/icons/search-arrow.gif)
   skin/classic/messenger/icons/phishing.png                   (mail/icons/phishing.png)
   skin/classic/messenger/icons/junk.png                       (mail/icons/junk.png)
   skin/classic/messenger/icons/check.gif                      (mail/icons/check.gif)
   skin/classic/messenger/icons/notchecked.gif                 (mail/icons/notchecked.gif)
   skin/classic/messenger/icons/online.png                     (mail/icons/online.png)
   skin/classic/messenger/icons/offline.png                    (mail/icons/offline.png)
--- a/mail/themes/windows/mail/messageIcons.css
+++ b/mail/themes/windows/mail/messageIcons.css
@@ -1,16 +1,18 @@
 /* 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/. */
 
 .treecol-image image {
   padding-inline-start: 1px;
   padding-inline-end: 2px;
   padding-bottom: 3px;
+  -moz-context-properties: fill;
+  fill: currentColor;
 }
 
 @media (-moz-windows-classic) {
   .treecol-image image {
     padding-bottom: 2px;
   }
 }
 
@@ -55,18 +57,16 @@ treechildren::-moz-tree-image(unreadButt
 treechildren::-moz-tree-image(unreadButtonColHeader, unread) {
   list-style-image: url(chrome://messenger/skin/icons/unreadmail.png);
 }
 
 /* ..... attachment column ..... */
 
 .attachmentColumnHeader {
   list-style-image: url(chrome://messenger/skin/icons/attachment-col.svg);
-  -moz-context-properties: fill;
-  fill: currentColor;
 }
 
 treechildren::-moz-tree-image(attachmentCol, attach) {
   margin-inline-start: 3px;
   list-style-image: url(chrome://messenger/skin/icons/attachment-col.svg);
 }
 
 /* ..... flag column ..... */