Bug 1631779 - Implement photon icons for the address book. r=aleca
authorRichard Marti <richard.marti@gmail.com>
Tue, 21 Apr 2020 15:27:14 +0200
changeset 38897 2051df2a9ea4e2dded3de3901ffe7448a7b74ce5
parent 38896 4217f78f73fc7033e91f8351ef84ac4ce737c87e
child 38898 dda8f7871fbbeea697ce53a0f7a45c5dced29b69
push id401
push userclokep@gmail.com
push dateMon, 01 Jun 2020 20:41:59 +0000
reviewersaleca
bugs1631779
Bug 1631779 - Implement photon icons for the address book. r=aleca
mail/themes/linux/jar.mn
mail/themes/linux/mail/addrbook/abResultsPane.css
mail/themes/linux/mail/addrbook/abcard-large.png
mail/themes/linux/mail/addrbook/abcard.png
mail/themes/linux/mail/addrbook/ablist.png
mail/themes/linux/mail/addrbook/cardDialog.css
mail/themes/linux/mail/addrbook/remote-addrbook-error.png
mail/themes/linux/mail/addrbook/remote-addrbook.png
mail/themes/linux/mail/addrbook/secure-remote-addrbook.png
mail/themes/osx/jar.mn
mail/themes/osx/mail/addrbook/abResultsPane.css
mail/themes/osx/mail/addrbook/abcard.png
mail/themes/osx/mail/addrbook/ablist.png
mail/themes/osx/mail/addrbook/addrbook.png
mail/themes/osx/mail/addrbook/addressbook.css
mail/themes/osx/mail/addrbook/addressbook@2x.png
mail/themes/osx/mail/addrbook/cardDialog.css
mail/themes/osx/mail/addrbook/remote-addrbook-error.png
mail/themes/osx/mail/addrbook/remote-addrbook.png
mail/themes/osx/mail/addrbook/secure-remote-addrbook.png
mail/themes/osx/mail/compose/messengercompose.css
mail/themes/shared/jar.inc.mn
mail/themes/shared/mail/abResultsPane.css
mail/themes/shared/mail/addressbook.css
mail/themes/shared/mail/icons/ablist.svg
mail/themes/shared/mail/icons/address.svg
mail/themes/shared/mail/icons/contact.svg
mail/themes/shared/mail/icons/globe-secure.svg
mail/themes/shared/mail/messenger.css
mail/themes/shared/mail/messengercompose.css
mail/themes/windows/jar.mn
mail/themes/windows/mail/addrbook/abResultsPane.css
mail/themes/windows/mail/addrbook/abcard-large.png
mail/themes/windows/mail/addrbook/abcard.png
mail/themes/windows/mail/addrbook/ablist.png
mail/themes/windows/mail/addrbook/addrbook.png
mail/themes/windows/mail/addrbook/cardDialog.css
mail/themes/windows/mail/addrbook/remote-addrbook-error.png
mail/themes/windows/mail/addrbook/remote-addrbook.png
mail/themes/windows/mail/addrbook/secure-remote-addrbook.png
--- a/mail/themes/linux/jar.mn
+++ b/mail/themes/linux/jar.mn
@@ -69,27 +69,20 @@ classic.jar:
   skin/classic/messenger/activity/moveMailIcon.png            (mail/activity/moveMailIcon.png)
   skin/classic/messenger/activity/copyMailIcon.png            (mail/activity/copyMailIcon.png)
   skin/classic/messenger/activity/deleteMailIcon.png          (mail/activity/deleteMailIcon.png)
   skin/classic/messenger/activity/compactMailIcon.png         (mail/activity/compactMailIcon.png)
   skin/classic/messenger/activity/indexMailIcon.png           (mail/activity/indexMailIcon.png)
   skin/classic/messenger/addressbook/addressbook.css          (mail/addrbook/addressbook.css)
   skin/classic/messenger/addressbook/abContactsPanel.css      (mail/addrbook/abContactsPanel.css)
   skin/classic/messenger/addressbook/cardDialog.css           (mail/addrbook/cardDialog.css)
-  skin/classic/messenger/addressbook/abResultsPane.css        (mail/addrbook/abResultsPane.css)
-  skin/classic/messenger/addressbook/icons/abcard.png         (mail/addrbook/abcard.png)
   skin/classic/messenger/addressbook/icons/addrbook.png       (mail/addrbook/addrbook.png)
   skin/classic/messenger/addressbook/icons/addressbook-toolbar-small.png   (mail/addrbook/addressbook-toolbar-small.png)
-  skin/classic/messenger/addressbook/icons/ablist.png         (mail/addrbook/ablist.png)
   skin/classic/messenger/addressbook/icons/contact-generic.png             (mail/addrbook/contact-generic.png)
   skin/classic/messenger/addressbook/icons/contact-generic-tiny.png        (mail/addrbook/contact-generic-tiny.png)
-  skin/classic/messenger/addressbook/icons/abcard-large.png   (mail/addrbook/abcard-large.png)
-  skin/classic/messenger/addressbook/icons/remote-addrbook.png (mail/addrbook/remote-addrbook.png)
-  skin/classic/messenger/addressbook/icons/remote-addrbook-error.png      (mail/addrbook/remote-addrbook-error.png)
-  skin/classic/messenger/addressbook/icons/secure-remote-addrbook.png     (mail/addrbook/secure-remote-addrbook.png)
   skin/classic/messenger/messengercompose/messengercompose.css (mail/compose/messengercompose.css)
   skin/classic/messenger/downloads/aboutDownloads.css         (mail/downloads/aboutDownloads.css)
   skin/classic/messenger/customizableui/panelUI.css           (customizableui/panelUI.css)
 % skin messenger-newsblog classic/1.0 %skin/classic/messenger-newsblog/
   skin/classic/messenger-newsblog/feed-subscriptions.css      (mail/newsblog/feed-subscriptions.css)
   skin/classic/messenger-newsblog/rss-feed.png                (mail/newsblog/rss-feed.png)
   skin/classic/messenger-newsblog/rss-feed-folder.png         (mail/newsblog/rss-feed-folder.png)
   skin/classic/messenger/preferences/alwaysAsk.png            (mail/preferences/alwaysAsk.png)
deleted file mode 100644
index 9b8eeb20849bc7d8bb0af51f5831d9eb79d57c5f..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index fdc4e140b12c74945487c31166005146a2d55089..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 47e987672d660ff4d05cb2f919b76e23e61de3d8..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/mail/themes/linux/mail/addrbook/cardDialog.css
+++ b/mail/themes/linux/mail/addrbook/cardDialog.css
@@ -72,17 +72,17 @@
 
 .dummy-row-cell:first-child {
   border-top: none;
   border-bottom: 1px solid #CACAFF;
 }
 
 .person-icon {
   margin: 0 3px;
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/abcard.png");
+  list-style-image: url("chrome://messenger/skin/icons/contact.svg");
 }
 
 #photo {
   list-style-image: url("chrome://messenger/skin/addressbook/icons/contact-generic.png");
 }
 
 #GenericPhotoList {
   margin-inline-start: 27px;
deleted file mode 100644
index f4ca45af12b15604ed108836af067c40438638e2..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index ac5957ad62d73408cd754a27453b4ce601a2b042..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 0413a504b0f132f3a8ca071c6d62d3436afd5f4b..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/mail/themes/osx/jar.mn
+++ b/mail/themes/osx/jar.mn
@@ -64,28 +64,20 @@ classic.jar:
   skin/classic/messenger/activity/copyMailIcon.png               (mail/activity/copyMailIcon.png)
   skin/classic/messenger/activity/deleteMailIcon.png             (mail/activity/deleteMailIcon.png)
   skin/classic/messenger/activity/compactMailIcon.png            (mail/activity/compactMailIcon.png)
   skin/classic/messenger/activity/indexMailIcon.png              (mail/activity/indexMailIcon.png)
   skin/classic/messenger/activity/warning.png                    (mail/activity/warning.png)
   skin/classic/messenger/addressbook/addressbook.css             (mail/addrbook/addressbook.css)
   skin/classic/messenger/addressbook/abContactsPanel.css         (mail/addrbook/abContactsPanel.css)
   skin/classic/messenger/addressbook/cardDialog.css              (mail/addrbook/cardDialog.css)
-  skin/classic/messenger/addressbook/abResultsPane.css           (mail/addrbook/abResultsPane.css)
-  skin/classic/messenger/addressbook/icons/abcard.png            (mail/addrbook/abcard.png)
-  skin/classic/messenger/addressbook/icons/ablist.png            (mail/addrbook/ablist.png)
   skin/classic/messenger/addressbook/icons/contact-generic.png             (mail/addrbook/contact-generic.png)
   skin/classic/messenger/addressbook/icons/contact-generic@2x.png          (mail/addrbook/contact-generic@2x.png)
   skin/classic/messenger/addressbook/icons/contact-generic-tiny.png        (mail/addrbook/contact-generic-tiny.png)
   skin/classic/messenger/addressbook/icons/contact-generic-tiny@2x.png     (mail/addrbook/contact-generic-tiny@2x.png)
-  skin/classic/messenger/addressbook/icons/addressbook@2x.png              (mail/addrbook/addressbook@2x.png)
-  skin/classic/messenger/addressbook/icons/addrbook.png                    (mail/addrbook/addrbook.png)
-  skin/classic/messenger/addressbook/icons/remote-addrbook-error.png       (mail/addrbook/remote-addrbook-error.png)
-  skin/classic/messenger/addressbook/icons/remote-addrbook.png             (mail/addrbook/remote-addrbook.png)
-  skin/classic/messenger/addressbook/icons/secure-remote-addrbook.png      (mail/addrbook/secure-remote-addrbook.png)
   skin/classic/messenger/messengercompose/messengercompose.css             (mail/compose/messengercompose.css)
   skin/classic/messenger/messengercompose/emoticon_cool.png                (mail/compose/emoticon_cool.png)
   skin/classic/messenger/messengercompose/emoticon_cry.png                 (mail/compose/emoticon_cry.png)
   skin/classic/messenger/messengercompose/emoticon_embarrassed.png         (mail/compose/emoticon_embarrassed.png)
   skin/classic/messenger/messengercompose/emoticon_foot_in_mouth.png       (mail/compose/emoticon_foot_in_mouth.png)
   skin/classic/messenger/messengercompose/emoticon_frown.png               (mail/compose/emoticon_frown.png)
   skin/classic/messenger/messengercompose/emoticon_innocent.png            (mail/compose/emoticon_innocent.png)
   skin/classic/messenger/messengercompose/emoticon_kiss.png                (mail/compose/emoticon_kiss.png)
deleted file mode 100644
--- a/mail/themes/osx/mail/addrbook/abResultsPane.css
+++ /dev/null
@@ -1,27 +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/. */
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-treechildren::-moz-tree-image(GeneratedName) {
-  margin-inline-end: 2px;
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/abcard.png");
-}
-
-treechildren::-moz-tree-image(GeneratedName, MailList) {
-  margin-inline-end: 2px;
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/ablist.png");
-}
-
-@media (min-resolution: 2dppx) {
-  treechildren::-moz-tree-image(GeneratedName) {
-    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook@2x.png");
-    -moz-image-region: rect(0px 160px 32px 128px);
-  }
-
-  treechildren::-moz-tree-image(GeneratedName, MailList) {
-    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook@2x.png");
-    -moz-image-region: rect(0px 64px 32px 32px);
-  }
-}
deleted file mode 100644
index d0d850044b5e96f14310fdc20fc8b75064019167..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 4a792a5d616a6b20fecd32dfbc3f101fb1f68e00..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 15b413d1fe58c485fcc2eca19b809ab8f8a7352e..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/mail/themes/osx/mail/addrbook/addressbook.css
+++ b/mail/themes/osx/mail/addrbook/addressbook.css
@@ -51,63 +51,43 @@
   background-color: transparent;
 }
 
 :root:not([lwt-tree]) #dirTree treechildren::-moz-tree-row(selected) {
   -moz-appearance: -moz-mac-source-list-selection;
   -moz-font-smoothing-background-color: -moz-mac-source-list-selection;
 }
 
-@media not all and (-moz-mac-yosemite-theme) {
+@media (-moz-mac-yosemite-theme: 0) {
   :root:not([lwt-tree]) #dirTree 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;
   }
 
-  #dirTree treechildren::-moz-tree-cell-text(selected) {
+  :root:not([lwt-tree]) #dirTree treechildren::-moz-tree-image(selected),
+  :root:not([lwt-tree]) #dirTree treechildren::-moz-tree-twisty(selected),
+  :root:not([lwt-tree]) #dirTree treechildren::-moz-tree-cell-text(selected) {
     color: white;
   }
 }
 
 @media (-moz-mac-yosemite-theme) {
   #dirTree treechildren::-moz-tree-cell-text {
     font-family: -apple-system;
     font-size: 9pt;
     font-weight: 400;
   }
 
-  #dirTree treechildren::-moz-tree-cell-text(selected, focus) {
+  :root:not([lwt-tree]) #dirTree treechildren::-moz-tree-image(selected, focus),
+  :root:not([lwt-tree]) #dirTree treechildren::-moz-tree-twisty(selected, focus),
+  :root:not([lwt-tree]) #dirTree treechildren::-moz-tree-cell-text(selected, focus) {
     color: #282828;
   }
 }
 
-@media (min-resolution: 2dppx) {
-  treechildren::-moz-tree-image(DirCol) {
-    width: 16px;
-    height: 16px;
-    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook@2x.png");
-    -moz-image-region: rect(0px 32px 32px 0px);
-  }
-
-  treechildren::-moz-tree-image(DirCol, IsMailList-true) {
-    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook@2x.png");
-    -moz-image-region: rect(0px 64px 32px 32px);
-  }
-
-  treechildren::-moz-tree-image(DirCol, IsRemote-true) {
-    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook@2x.png");
-    -moz-image-region: rect(0px 96px 32px 64px);
-  }
-
-  treechildren::-moz-tree-image(DirCol, IsRemote-true, IsSecure-true) {
-    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook@2x.png");
-    -moz-image-region: rect(0px 128px 32px 96px);
-  }
-}
-
 /* ::::: splitters ::::: */
 
 #dirTree-splitter {
   border-width: 0;
   border-inline-end: 1px solid var(--splitter-color);
   min-width: 0;
   width: 5px;
   background-color: transparent;
@@ -128,60 +108,46 @@
 }
 
 /* ::::: results pane ::::: */
 
 #GeneratedName {
   padding-inline-start: 42px;
 }
 
-@media (min-resolution: 2dppx) {
-  treechildren::-moz-tree-image(GeneratedName) {
-    width: 16px;
-    height: 16px;
-    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook@2x.png");
-    -moz-image-region: rect(0px 160px 32px 128px);
-  }
-
-  treechildren::-moz-tree-image(GeneratedName, MailList) {
-    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook@2x.png");
-    -moz-image-region: rect(0px 64px 32px 32px);
-  }
-}
-
 /* ::::: card view pane ::::: */
 
 #blankResultsPaneMessageBox {
   border-inline-start: 1px solid #bebebe;
 }
 
 #CardViewOuterBox {
   color: -moz-DialogText;
-  margin: 0px;
-  padding: 0px;
+  margin: 0;
+  padding: 0;
 }
 
 #CardViewInnerBox {
-  background-color: #FFFFFF;
+  background-color: #fff;
 }
 
 #CardViewInnerBox > hbox {
-  background-color: #FFFFFF;
+  background-color: #fff;
 }
 
 #CardTitle {
   margin: 6px;
   padding: 4px;
   -moz-box-pack: center;
   font-size: 150%;
   font-weight: bold;
 }
 
 .cardViewGroup {
-  margin: 0px;
+  margin: 0;
   padding: 6px;
   min-width: 50px;
 }
 
 .CardViewHeading {
   padding: 3px 5px;
   font: icon;
   font-weight: bold;
deleted file mode 100644
index ffaccf0a85d0b7b40affb64d92a8f282e9c1b3cc..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/mail/themes/osx/mail/addrbook/cardDialog.css
+++ b/mail/themes/osx/mail/addrbook/cardDialog.css
@@ -71,17 +71,17 @@
 
 .dummy-row-cell:first-child {
   border-top: none;
   border-bottom: 1px solid #DCDCDC;
 }
 
 .person-icon {
   margin: 0 3px;
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/abcard.png");
+  list-style-image: url("chrome://messenger/skin/icons/contact.svg");
 }
 
 menulist::part(icon) {
   margin-inline-end: 2px;
 }
 
 #photo {
   list-style-image: url("chrome://messenger/skin/addressbook/icons/contact-generic.png");
@@ -121,23 +121,16 @@ menulist::part(icon) {
 }
 
 #ProgressContainer.expanded {
   margin-top: 10px;
   max-height: 40px; /* something higher than the actual height, but not too large */
 }
 
 @media (min-resolution: 2dppx) {
-  .person-icon {
-    width: 16px;
-    height: 16px;
-    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook@2x.png");
-    -moz-image-region: rect(0px 160px 32px 128px);
-  }
-
   #photo {
     list-style-image: url("chrome://messenger/skin/addressbook/icons/contact-generic@2x.png");
   }
 
   #GenericPhotoList[value="default"] {
     list-style-image: url("chrome://messenger/skin/addressbook/icons/contact-generic-tiny@2x.png");
   }
 
deleted file mode 100644
index 85f855610437aac9279b67f298af39d4a3606746..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index f53a205174ccd0307dc364586f5c04ab8d9b1975..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index ea03eb5b228efa67d51e62c2a1d414147ab8da04..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/mail/themes/osx/mail/compose/messengercompose.css
+++ b/mail/themes/osx/mail/compose/messengercompose.css
@@ -215,32 +215,16 @@ toolbar[nowindowdrag="true"] {
 
 /* ::::: autocomplete icons ::::: */
 
 .ac-site-icon {
   display: -moz-box;
   margin: 2px 5px;
 }
 
-@media (min-resolution: 2dppx) {
-  .autocomplete-richlistitem[type="local-abook"] > .ac-site-icon {
-    width: 16px;
-    height: 16px;
-    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook@2x.png");
-    -moz-image-region: rect(0px 32px 32px 0px);
-  }
-
-  .autocomplete-richlistitem[type="remote-abook"] > .ac-site-icon {
-    width: 16px;
-    height: 16px;
-    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook@2x.png");
-    -moz-image-region: rect(0px 96px 32px 64px);
-  }
-}
-
 .autocomplete-richlistitem[type="subscribed-news"] > .ac-site-icon {
   list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
   -moz-image-region: rect(0 160px 16px 144px);
 }
 
 menulist::part(description) {
   color: #999;
 }
--- a/mail/themes/shared/jar.inc.mn
+++ b/mail/themes/shared/jar.inc.mn
@@ -5,19 +5,21 @@
 # This is not a complete / proper jar manifest. It is included by the
 # actual theme-specific manifests, so that shared resources need only
 # be specified once. As a result, the source file paths are relative
 # to the location of the actual manifest.
 
   skin/classic/messenger/aboutNetError.css                    (../shared/mail/aboutNetError.css)
   skin/classic/messenger/aboutSupport.css                     (../shared/mail/aboutSupport.css)
   skin/classic/messenger/messageQuotes.css                    (../shared/mail/messageQuotes.css)
+  skin/classic/messenger/addressbook/abResultsPane.css        (../shared/mail/abResultsPane.css)
   skin/classic/messenger/addressbook/icons/menu.svg           (../shared/mail/icons/menu.svg)
   skin/classic/messenger/downloads/download.svg               (../shared/mail/icons/download.svg)
   skin/classic/messenger/folderProps.css                      (../shared/mail/folderProps.css)
+  skin/classic/messenger/icons/ablist.svg                     (../shared/mail/icons/ablist.svg)
   skin/classic/messenger/icons/address.svg                    (../shared/mail/icons/address.svg)
   skin/classic/messenger/icons/addcontact.svg                 (../shared/mail/icons/addcontact.svg)
   skin/classic/messenger/icons/addlist.svg                    (../shared/mail/icons/addlist.svg)
   skin/classic/messenger/icons/accounts.svg                   (../shared/mail/icons/accounts.svg)
   skin/classic/messenger/icons/addon-install-blocked.svg      (../shared/mail/icons/addon-install-blocked.svg)
   skin/classic/messenger/icons/addon-install-confirm.svg      (../shared/mail/icons/addon-install-confirm.svg)
   skin/classic/messenger/icons/addon-install-downloading.svg  (../shared/mail/icons/addon-install-downloading.svg)
   skin/classic/messenger/icons/addon-install-error.svg        (../shared/mail/icons/addon-install-error.svg)
@@ -39,31 +41,33 @@
   skin/classic/messenger/icons/checkbox.svg                   (../shared/mail/icons/checkbox.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/connection-insecure.svg        (../shared/mail/icons/connection-insecure.svg)
   skin/classic/messenger/icons/connection-mixed.svg           (../shared/mail/icons/connection-mixed.svg)
   skin/classic/messenger/icons/connection-secure.svg          (../shared/mail/icons/connection-secure.svg)
+  skin/classic/messenger/icons/contact.svg                    (../shared/mail/icons/contact.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/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/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)
   skin/classic/messenger/icons/highlights.svg                 (../shared/mail/icons/highlights.svg)
   skin/classic/messenger/icons/import.svg                     (../shared/mail/icons/import.svg)
   skin/classic/messenger/icons/inbox.svg                      (../shared/mail/icons/inbox.svg)
   skin/classic/messenger/icons/info.svg                       (../shared/mail/icons/info.svg)
   skin/classic/messenger/icons/join.svg                       (../shared/mail/icons/join.svg)
   skin/classic/messenger/icons/junk.svg                       (../shared/mail/icons/junk.svg)
rename from mail/themes/linux/mail/addrbook/abResultsPane.css
rename to mail/themes/shared/mail/abResultsPane.css
--- a/mail/themes/linux/mail/addrbook/abResultsPane.css
+++ b/mail/themes/shared/mail/abResultsPane.css
@@ -1,16 +1,23 @@
 /* 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/. */
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
+.menu-iconic-icon {
+  opacity: 0.85;
+  -moz-context-properties: fill;
+  fill: currentColor;
+}
+
 treechildren::-moz-tree-image(GeneratedName) {
   margin-inline-end: 2px;
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/abcard.png");
+  list-style-image: url("chrome://messenger/skin/icons/contact.svg");
+  opacity: 0.85;
 }
 
 treechildren::-moz-tree-image(GeneratedName, MailList) {
   margin-inline-end: 2px;
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/ablist.png");
+  list-style-image: url("chrome://messenger/skin/icons/ablist.svg");
 }
 
--- a/mail/themes/shared/mail/addressbook.css
+++ b/mail/themes/shared/mail/addressbook.css
@@ -72,51 +72,49 @@ toolbox[labelalign="end"] > toolbar[mode
 #dirTree [sortDirection="descending"] {
   list-style-image: none;
 }
 
 /* ::::: directory pane icons ::::: */
 
 treechildren::-moz-tree-image(DirCol) {
   margin-inline-end: 2px;
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addrbook.png");
+  list-style-image: url("chrome://messenger/skin/icons/address.svg");
+  opacity: 0.85;
 }
 
 treechildren::-moz-tree-image(DirCol, IsMailList-true) {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/ablist.png");
+  list-style-image: url("chrome://messenger/skin/icons/ablist.svg");
 }
 
 treechildren::-moz-tree-image(DirCol, IsRemote-true) {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/remote-addrbook.png");
+  list-style-image: url("chrome://messenger/skin/icons/globe.svg");
 }
 
 treechildren::-moz-tree-image(DirCol, IsRemote-true, IsSecure-true) {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/secure-remote-addrbook.png");
+  list-style-image: url("chrome://messenger/skin/icons/globe-secure.svg");
 }
 
 /* ::::: results pane ::::: */
 
 :root[lwt-tree] #abResultsBox {
   background-color: var(--sidebar-background-color);
   background-image: linear-gradient(rgba(255,255,255,.15), rgba(255,255,255,.15));
   color: var(--sidebar-text-color);
 }
 
 treechildren::-moz-tree-image(GeneratedName) {
   margin-inline-end: 2px;
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/abcard.png");
+  list-style-image: url("chrome://messenger/skin/icons/contact.svg");
+  opacity: 0.85;
 }
 
 treechildren::-moz-tree-image(GeneratedName, MailList) {
   margin-inline-end: 2px;
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/ablist.png");
-}
-
-treechildren::-moz-tree-cell-text(GeneratedName) {
-  padding-inline-start: 0;
+  list-style-image: url("chrome://messenger/skin/icons/ablist.svg");
 }
 
 /* ::::: card view pane ::::: */
 
 #CardViewBox {
   -moz-user-focus: ignore;
   overflow: auto;
   min-width: 150px;
new file mode 100644
--- /dev/null
+++ b/mail/themes/shared/mail/icons/ablist.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 width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M6.812 9.349a4 4 0 1 1 4.377 0A7.003 7.003 0 0 1 16 16H2a7.003 7.003 0 0 1 4.812-6.651zM9 8a2 2 0 1 0 0-4 2 2 0 0 0 0 4zm0 3a5.001 5.001 0 0 0-4.584 3h9.168A5.001 5.001 0 0 0 9 11z"/>
+  <path d="M4.049 6.7A4 4 0 0 1 9.7 1.049 5 5 0 0 0 4.049 6.7zM1.252 14H0c0-2.89 1.75-5.37 4.249-6.439.178.543.447 1.045.788 1.488A8.016 8.016 0 0 0 1.252 14z"/>
+</svg>
--- a/mail/themes/shared/mail/icons/address.svg
+++ b/mail/themes/shared/mail/icons/address.svg
@@ -1,7 +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 width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M6.812 9.349a4 4 0 1 1 4.377 0A7.003 7.003 0 0 1 16 16H2a7.003 7.003 0 0 1 4.812-6.651zM9 8a2 2 0 1 0 0-4 2 2 0 0 0 0 4zm0 3a5.001 5.001 0 0 0-4.584 3h9.168A5.001 5.001 0 0 0 9 11z"/>
-  <path d="M4.049 6.7A4 4 0 0 1 9.7 1.049 5 5 0 0 0 4.049 6.7zM1.252 14H0c0-2.89 1.75-5.37 4.249-6.439.178.543.447 1.045.788 1.488A8.016 8.016 0 0 0 1.252 14z"/>
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg">
+  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M3 0a2 2 0 00-2 2v1.02c-1.32.11-1.32 1.84 0 1.96v2.04c-1.32.12-1.32 1.85 0 1.96v2.04c-1.32.12-1.32 1.84 0 1.96V14c0 1.1.9 2 2 2h11a2 2 0 002-2V2a2 2 0 00-2-2zm1 2h9a1 1 0 011 1v10a1 1 0 01-1 1H4a1 1 0 01-1-1c1.5 0 1.5-2 0-2V9c1.5 0 1.5-2 0-2V5c1.5 0 1.5-2 0-2a1 1 0 011-1zm9 10c0-3.1-.68-3.36-2.74-3.84C12.51 6.89 11.58 3.46 9 3.5c-2.53.02-3.44 3.36-1.26 4.65C5.68 8.67 5 9.02 5 12z"/>
 </svg>
new file mode 100644
--- /dev/null
+++ b/mail/themes/shared/mail/icons/contact.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 width="16" height="16" xmlns="http://www.w3.org/2000/svg">
+  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M5.81 8.35a4 4 0 114.38 0A7 7 0 0115 15H1a7 7 0 014.81-6.65zM8 7a2 2 0 100-4 2 2 0 000 4zm0 3a5 5 0 00-4.58 3h9.16A5 5 0 008 10z"/>
+</svg>
new file mode 100644
--- /dev/null
+++ b/mail/themes/shared/mail/icons/globe-secure.svg
@@ -0,0 +1,8 @@
+<!-- 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="M8 0A8 8 0 00-.03 8.86a8.06 8.06 0 008.96 7.11A5.1 5.1 0 017.68 14c-1.48-.75-1.88-1.81-2.24-2.96h2.41c.07-.37.18-.74.32-1.08H5.17c-.23-1.3-.23-2.62 0-3.92h5.65c.1.49.14.88.16 1.37.32-.12.65-.2.98-.22 0-.42-.1-.74-.12-1.15h1.82c.19.55.29.9.32 1.49.77.4 1.42 1.3 1.84 2.15A8 8 0 008 0zm0 2c1.07 0 2.04 1.2 2.57 2.96H5.43C5.96 3.2 6.93 2 8 2zm-2.56.58a7.7 7.7 0 00-1.05 2.38H2.84a6.03 6.03 0 012.6-2.38zm5.12 0a6.05 6.05 0 012.6 2.38h-1.55a7.7 7.7 0 00-1.05-2.38zM2.34 6.04h1.82c-.2 1.3-.2 2.62 0 3.92H2.34a5.98 5.98 0 010-3.92zm.5 5h1.55c.21.85.57 1.65 1.05 2.38a6.08 6.08 0 01-2.6-2.38z"/>
+  <path d="M14 11h.56c.24 0 .44.2.44.44v3.12c0 .24-.2.44-.44.44H9.44a.44.44 0 01-.44-.44v-3.12c0-.24.2-.44.44-.44H10v-.84c0-2.6 4-2.63 4 0zm-1 0v-.84c0-1.17-2-1.17-2 0V11z"/>
+</svg>
--- a/mail/themes/shared/mail/messenger.css
+++ b/mail/themes/shared/mail/messenger.css
@@ -429,29 +429,29 @@ toolbarpaletteitem toolbarbutton {
 
 #findbar-beforeReplaceSeparator {
   height: 16px;
 }
 
 /* ::::: Address Book menuitem icons ::::: */
 
 .abMenuItem[AddrBook="true"] {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addrbook.png");
+  list-style-image: url("chrome://messenger/skin/icons/address.svg");
 }
 
 .abMenuItem[MailList="true"] {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/ablist.png");
+  list-style-image: url("chrome://messenger/skin/icons/ablist.svg");
 }
 
 .abMenuItem[AddrBook="true"][IsRemote="true"] {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/remote-addrbook.png");
+  list-style-image: url("chrome://messenger/skin/icons/globe.svg");
 }
 
 .abMenuItem[AddrBook="true"][IsRemote="true"][IsSecure="true"] {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/secure-remote-addrbook.png");
+  list-style-image: url("chrome://messenger/skin/icons/globe-secure.svg");
 }
 
 /* ::::: Panel toolbarbuttons ::::: */
 
 .panelTitle {
   margin-top: 8px;
   margin-inline-start: 7px;
   margin-bottom: 6px;
--- a/mail/themes/shared/mail/messengercompose.css
+++ b/mail/themes/shared/mail/messengercompose.css
@@ -436,26 +436,30 @@ menulist::part(description) {
 
 .autocomplete-richlistitem[selected] {
   background-color: Highlight;
   color: HighlightText;
 }
 
 /* :::: autocomplete icons :::: */
 
+.autocomplete-richlistitem > .ac-site-icon {
+  opacity: 0.85;
+}
+
 .autocomplete-richlistitem[type="local-abook"] > .ac-site-icon {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addrbook.png");
+  list-style-image: url("chrome://messenger/skin/icons/address.svg");
 }
 
 .autocomplete-richlistitem[type="remote-abook"] > .ac-site-icon {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/remote-addrbook.png");
+  list-style-image: url("chrome://messenger/skin/icons/globe.svg");
 }
 
 .autocomplete-richlistitem[type="remote-err"] > .ac-site-icon {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/remote-addrbook-error.png");
+  list-style-image: url("chrome://global/skin/icons/error.svg");
 }
 
 /* :::: attachment notification :::: */
 
 #attachmentReminderText {
   margin-inline-start: 0;
   cursor: pointer;
 }
--- a/mail/themes/windows/jar.mn
+++ b/mail/themes/windows/jar.mn
@@ -67,26 +67,18 @@ classic.jar:
   skin/classic/messenger/activity/removeItemIcon.png          (mail/activity/removeItemIcon.png)
   skin/classic/messenger/activity/sendMailIcon.png            (mail/activity/sendMailIcon.png)
   skin/classic/messenger/activity/syncMailIcon.png            (mail/activity/syncMailIcon.png)
   skin/classic/messenger/activity/undoIcon.png                (mail/activity/undoIcon.png)
   skin/classic/messenger/activity/warning.png                 (mail/activity/warning.png)
   skin/classic/messenger/addressbook/addressbook.css          (mail/addrbook/addressbook.css)
   skin/classic/messenger/addressbook/abContactsPanel.css      (mail/addrbook/abContactsPanel.css)
   skin/classic/messenger/addressbook/cardDialog.css           (mail/addrbook/cardDialog.css)
-  skin/classic/messenger/addressbook/abResultsPane.css        (mail/addrbook/abResultsPane.css)
-  skin/classic/messenger/addressbook/icons/abcard.png         (mail/addrbook/abcard.png)
-  skin/classic/messenger/addressbook/icons/addrbook.png       (mail/addrbook/addrbook.png)
-  skin/classic/messenger/addressbook/icons/ablist.png         (mail/addrbook/ablist.png)
   skin/classic/messenger/addressbook/icons/contact-generic.png             (mail/addrbook/contact-generic.png)
   skin/classic/messenger/addressbook/icons/contact-generic-tiny.png        (mail/addrbook/contact-generic-tiny.png)
-  skin/classic/messenger/addressbook/icons/abcard-large.png                (mail/addrbook/abcard-large.png)
-  skin/classic/messenger/addressbook/icons/remote-addrbook.png             (mail/addrbook/remote-addrbook.png)
-  skin/classic/messenger/addressbook/icons/remote-addrbook-error.png       (mail/addrbook/remote-addrbook-error.png)
-  skin/classic/messenger/addressbook/icons/secure-remote-addrbook.png      (mail/addrbook/secure-remote-addrbook.png)
   skin/classic/messenger/messengercompose/messengercompose.css (mail/compose/messengercompose.css)
   skin/classic/messenger/downloads/aboutDownloads.css         (mail/downloads/aboutDownloads.css)
   skin/classic/messenger/preferences/alwaysAsk.png            (mail/preferences/alwaysAsk.png)
   skin/classic/messenger/preferences/application.png          (mail/preferences/application.png)
   skin/classic/messenger/preferences/applications.css         (mail/preferences/applications.css)
   skin/classic/messenger/preferences/dialog.css               (mail/preferences/dialog.css)
   skin/classic/messenger/preferences/preferences.css          (mail/preferences/preferences.css)
   skin/classic/messenger/preferences/saveFile.png             (mail/preferences/saveFile.png)
deleted file mode 100644
--- a/mail/themes/windows/mail/addrbook/abResultsPane.css
+++ /dev/null
@@ -1,16 +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/. */
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-treechildren::-moz-tree-image(GeneratedName) {
-  margin-inline-end: 2px;
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/abcard.png");
-}
-
-treechildren::-moz-tree-image(GeneratedName, MailList) {
-  margin-inline-end: 2px;
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/ablist.png");
-}
-
deleted file mode 100644
index 9b8eeb20849bc7d8bb0af51f5831d9eb79d57c5f..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index fdc4e140b12c74945487c31166005146a2d55089..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 47e987672d660ff4d05cb2f919b76e23e61de3d8..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 31488c819e1d860f3d229355d42dd1627c2ff53d..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/mail/themes/windows/mail/addrbook/cardDialog.css
+++ b/mail/themes/windows/mail/addrbook/cardDialog.css
@@ -72,17 +72,17 @@
 
 .dummy-row-cell:first-child {
   border-top: none;
   border-bottom: 1px solid #CACAFF;
 }
 
 .person-icon {
   margin: 0 3px;
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/abcard.png");
+  list-style-image: url("chrome://messenger/skin/icons/contact.svg");
 }
 
 menulist::part(icon) {
   margin-inline-end: 4px;
 }
 
 #photo {
   list-style-image: url("chrome://messenger/skin/addressbook/icons/contact-generic.png");
deleted file mode 100644
index f4ca45af12b15604ed108836af067c40438638e2..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index d81f056341e85dbede3ca5b02d35c2469969dde0..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index a446a6dd03f001e70c36316f3d7730169640082e..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001