Bug 1150627 - Use SVG graphics for the toolbars. ui-r+r=josiah
authorRichard Marti <richard.marti@gmail.com>
Mon, 08 Jun 2015 18:10:32 +0200
changeset 22768 ab0a4209f0b55ad12086a3b3f6c89b9489733bc2
parent 22767 2970e7c552aafd7266cea1bacd97a5173a468a05
child 22769 9615c8997cba8053beb736c320324a18248fba7f
push id1443
push usermbanner@mozilla.com
push dateMon, 10 Aug 2015 18:31:17 +0000
treeherdercomm-beta@8fe07d686c22 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1150627
Bug 1150627 - Use SVG graphics for the toolbars. ui-r+r=josiah CLOSED TREE seamonkey
calendar/base/themes/windows/win-aero/lightning-toolbar.css
calendar/base/themes/windows/win-aero/lightning.css
mail/themes/linux/jar.mn
mail/themes/linux/mail/addrbook/addressbook.css
mail/themes/linux/mail/chat.css
mail/themes/linux/mail/compose/compose-toolbar-small.png
mail/themes/linux/mail/compose/compose-toolbar.png
mail/themes/linux/mail/compose/messengercompose.css
mail/themes/linux/mail/icons/addressbook-toolbar-small.png
mail/themes/linux/mail/icons/addressbook-toolbar.png
mail/themes/linux/mail/icons/button-archive.svg
mail/themes/linux/mail/icons/button-delete.svg
mail/themes/linux/mail/icons/button-forward.svg
mail/themes/linux/mail/icons/button-junk.svg
mail/themes/linux/mail/icons/button-reply-all.svg
mail/themes/linux/mail/icons/button-reply-list.svg
mail/themes/linux/mail/icons/button-reply.svg
mail/themes/linux/mail/icons/button-tag.svg
mail/themes/linux/mail/icons/chat-toolbar-small.png
mail/themes/linux/mail/icons/chat-toolbar.png
mail/themes/linux/mail/icons/mail-toolbar-small.png
mail/themes/linux/mail/icons/mail-toolbar.png
mail/themes/linux/mail/messageHeader.css
mail/themes/linux/mail/primaryToolbar.css
mail/themes/linux/mail/quickFilterBar.css
mail/themes/linux/mail/smime/msgCompSMIMEOverlay.css
mail/themes/osx/jar.mn
mail/themes/osx/mail/addrbook/addressbook-toolbar.png
mail/themes/osx/mail/addrbook/addressbook-toolbar@2x.png
mail/themes/osx/mail/addrbook/addressbook.css
mail/themes/osx/mail/chat.css
mail/themes/osx/mail/compose/compose-toolbar.png
mail/themes/osx/mail/compose/compose-toolbar@2x.png
mail/themes/osx/mail/compose/messengercompose.css
mail/themes/osx/mail/icons/chat-toolbar.png
mail/themes/osx/mail/icons/chat-toolbar@2x.png
mail/themes/osx/mail/icons/download.png
mail/themes/osx/mail/icons/mail-toolbar.png
mail/themes/osx/mail/icons/mail-toolbar@2x.png
mail/themes/osx/mail/mailWindow1.css
mail/themes/osx/mail/messageHeader.css
mail/themes/osx/mail/primaryToolbar.css
mail/themes/osx/mail/quickFilterBar.css
mail/themes/osx/mail/smime/msgCompSMIMEOverlay.css
mail/themes/shared/mail/icons/addressbook-toolbar.svg
mail/themes/shared/mail/icons/chat-toolbar.svg
mail/themes/shared/mail/icons/compose-toolbar.svg
mail/themes/shared/mail/icons/mail-toolbar.svg
mail/themes/shared/mail/messageHeader.css
mail/themes/windows/jar.mn
mail/themes/windows/mail/addrbook/addressbook-aero.css
mail/themes/windows/mail/addrbook/addressbook-toolbar-aero-inverted.png
mail/themes/windows/mail/addrbook/addressbook-toolbar-aero.png
mail/themes/windows/mail/chat-aero.css
mail/themes/windows/mail/chat.css
mail/themes/windows/mail/compose/compose-toolbar-aero-inverted.png
mail/themes/windows/mail/compose/compose-toolbar-aero.png
mail/themes/windows/mail/compose/messengercompose-aero.css
mail/themes/windows/mail/compose/messengercompose.css
mail/themes/windows/mail/icons/chat-toolbar-aero-inverted.png
mail/themes/windows/mail/icons/chat-toolbar-aero.png
mail/themes/windows/mail/icons/download-inverted.png
mail/themes/windows/mail/icons/download.png
mail/themes/windows/mail/messageHeader-aero.css
mail/themes/windows/mail/primaryToolbar-aero.css
mail/themes/windows/mail/primaryToolbar.css
mail/themes/windows/mail/quickFilterBar-aero.css
mail/themes/windows/mail/quickFilterBar.css
mail/themes/windows/mail/smime/msgCompSMIMEOverlay.css
--- a/calendar/base/themes/windows/win-aero/lightning-toolbar.css
+++ b/calendar/base/themes/windows/win-aero/lightning-toolbar.css
@@ -79,20 +79,16 @@
 #tabs-toolbar[brighttext] #extractEventButton,
 #mail-toolbox > toolbar[brighttext] #extractTaskButton,
 #mail-toolbox > toolbar[brighttext] #extractEventButton,
 #header-view-toolbox > toolbar[brighttext] #hdrExtractTaskButton,
 #header-view-toolbox > toolbar[brighttext] #hdrExtractEventButton {
   list-style-image: url(chrome://calendar/skin/toolbar-aero-inverted.png) !important;
 }
 
-toolbar[brighttext] .button-appmenu {
-  list-style-image: url(chrome://messenger/skin/icons/mail-toolbar-inverted.png);
-}
-
 @media (-moz-windows-glass) {
   #calendar-toolbox:not(:-moz-lwtheme) {
     border-bottom-color: #AABCCF;
   }
 }
 
 #tabs-toolbar[brighttext] #lightning-button-calendar,
 #tabs-toolbar[brighttext] #lightning-button-tasks,
--- a/calendar/base/themes/windows/win-aero/lightning.css
+++ b/calendar/base/themes/windows/win-aero/lightning.css
@@ -1,15 +1,15 @@
 /* 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/. */
 
 #newMsgButton-mail-menuitem {
-  list-style-image: url(chrome://messenger/skin/icons/mail-toolbar.png) !important;
-  -moz-image-region: rect(1px 35px 17px 19px) !important;
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#newmsg") !important;
+  -moz-image-region: auto !important;
 }
 
 #calendar-tab-button,
 #button-newmsg #newMsgButton-calendar-menuitem {
   list-style-image: url(chrome://lightning/skin/mode-switch-icons-aero.png);
   -moz-image-region: rect(0px 16px 16px 0px);
 }
 
--- a/mail/themes/linux/jar.mn
+++ b/mail/themes/linux/jar.mn
@@ -77,30 +77,28 @@ classic.jar:
   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/addressbook-toolbar.png         (mail/addrbook/addressbook-toolbar.png)
-  skin/classic/messenger/addressbook/icons/addressbook-toolbar-small.png   (mail/addrbook/addressbook-toolbar-small.png)
+  skin/classic/messenger/addressbook/icons/addressbook-toolbar.svg         (../shared/mail/icons/addressbook-toolbar.svg)
   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/cloudfile/addAccountDialog.css       (mail/cloudfile/addAccountDialog.css)
   skin/classic/messenger/cloudfile/Hightail/settings.css               (mail/cloudfile/Hightail/settings.css)
   skin/classic/messenger/cloudfile/Hightail/fileExceedsLimit.css       (mail/cloudfile/Hightail/fileExceedsLimit.css)
   skin/classic/messenger/cloudfile/Hightail/check.png                  (mail/cloudfile/Hightail/check.png)
   skin/classic/messenger/messengercompose/messengercompose.css (mail/compose/messengercompose.css)
   skin/classic/messenger/messengercompose/editorOverlay.css    (mail/compose/editorOverlay.css)
-  skin/classic/messenger/messengercompose/compose-toolbar.png  (mail/compose/compose-toolbar.png)
-  skin/classic/messenger/messengercompose/compose-toolbar-small.png   (mail/compose/compose-toolbar-small.png)
+  skin/classic/messenger/messengercompose/compose-toolbar.svg  (../shared/mail/icons/compose-toolbar.svg)
   skin/classic/messenger/messengercompose/format-buttons.png  (mail/compose/format-buttons.png)
   skin/classic/messenger/messengercompose/linux-noise.png     (mail/compose/linux-noise.png)
   skin/classic/messenger/downloads/download.svg               (mail/downloads/download.svg)
   skin/classic/messenger/downloads/aboutDownloads.css         (mail/downloads/aboutDownloads.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/icons/rss-feed.png          (mail/newsblog/rss-feed.png)
   skin/classic/messenger-newsblog/icons/server-rss.png        (mail/newsblog/server-rss.png)
@@ -145,18 +143,17 @@ classic.jar:
   skin/classic/messenger/icons/empty-search-results.png       (mail/icons/empty-search-results.png)
   skin/classic/messenger/icons/secure.png                     (mail/icons/secure.png)
   skin/classic/messenger/icons/update.png                     (mail/icons/update.png)
   skin/classic/messenger/icons/insecure.png                   (mail/icons/insecure.png)
   skin/classic/messenger/icons/identity.png                   (mail/icons/identity.png)
   skin/classic/messenger/icons/tick.png                       (mail/icons/tick.png)
   skin/classic/messenger/icons/error.png                      (mail/icons/error.png)
   skin/classic/messenger/icons/cancel.png                     (mail/icons/cancel.png)
-  skin/classic/messenger/icons/mail-toolbar.png               (mail/icons/mail-toolbar.png)
-  skin/classic/messenger/icons/mail-toolbar-small.png         (mail/icons/mail-toolbar-small.png)
+  skin/classic/messenger/icons/mail-toolbar.svg               (../shared/mail/icons/mail-toolbar.svg)
   skin/classic/messenger/icons/folder-pane.png                (mail/icons/folder-pane.png)
   skin/classic/messenger/icons/folder-blank.png               (mail/icons/folder-blank.png)
   skin/classic/messenger/icons/folder-new-star.png            (mail/icons/folder-new-star.png)
   skin/classic/messenger/icons/message-list.png               (mail/icons/message-list.png)
   skin/classic/messenger/icons/message.png                    (mail/icons/message.png)
   skin/classic/messenger/icons/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)
@@ -195,26 +192,17 @@ classic.jar:
   skin/classic/messenger/tabs/closeTab.svg                    (mail/tabs/closeTab.svg)
   skin/classic/messenger/tabs/selected-end.svg                (mail/tabs/selected-end.svg)
   skin/classic/messenger/tabs/selected-start.svg              (mail/tabs/selected-start.svg)
   skin/classic/messenger/tabs/separator.png                   (mail/tabs/separator.png)
   skin/classic/messenger/tabs/stroke-end.png                  (mail/tabs/stroke-end.png)
   skin/classic/messenger/tabs/stroke-start.png                (mail/tabs/stroke-start.png)
   skin/classic/messenger/tabs/dragIndicator.png               (mail/tabs/dragIndicator.png)
   skin/classic/messenger/tabs/overflow-indicator.png          (mail/tabs/overflow-indicator.png)
-  skin/classic/messenger/icons/button-archive.svg             (mail/icons/button-archive.svg)
-  skin/classic/messenger/icons/button-delete.svg              (mail/icons/button-delete.svg)
-  skin/classic/messenger/icons/button-forward.svg             (mail/icons/button-forward.svg)
-  skin/classic/messenger/icons/button-junk.svg                (mail/icons/button-junk.svg)
-  skin/classic/messenger/icons/button-reply.svg               (mail/icons/button-reply.svg)
-  skin/classic/messenger/icons/button-reply-all.svg           (mail/icons/button-reply-all.svg)
-  skin/classic/messenger/icons/button-reply-list.svg          (mail/icons/button-reply-list.svg)
-  skin/classic/messenger/icons/button-tag.svg                 (mail/icons/button-tag.svg)
-  skin/classic/messenger/icons/chat-toolbar.png               (mail/icons/chat-toolbar.png)
-  skin/classic/messenger/icons/chat-toolbar-small.png         (mail/icons/chat-toolbar-small.png)
+  skin/classic/messenger/icons/chat-toolbar.svg               (../shared/mail/icons/chat-toolbar.svg)
   skin/classic/messenger/icons/status.png                     (mail/icons/status.png)
   skin/classic/messenger/icons/status-small.png               (mail/icons/status-small.png)
 % skin communicator classic/1.0 %skin/classic/communicator/
   skin/classic/communicator/communicator.css                      (mail/communicator.css)
   skin/classic/communicator/icons/smileys/smiley-smile.png        (mail/icons/smiley-smile.png)
   skin/classic/communicator/icons/smileys/smiley-frown.png        (mail/icons/smiley-frown.png)
   skin/classic/communicator/icons/smileys/smiley-wink.png         (mail/icons/smiley-wink.png)
   skin/classic/communicator/icons/smileys/smiley-tongue-out.png  (mail/icons/smiley-tongue-out.png)
--- a/mail/themes/linux/mail/addrbook/addressbook.css
+++ b/mail/themes/linux/mail/addrbook/addressbook.css
@@ -4,137 +4,95 @@
 
 /* ===== addressbook.css ================================================
   == Styles for the main Address Book window.
   ======================================================================= */
 
 @import url("chrome://messenger/skin/");
 @import url("chrome://messenger/skin/shared/addressbook.css");
 
+#ab-toolbox > toolbar {
+  /* force iconsize="small" on these toolbars */
+  counter-reset: smallicons;
+}
+
 /* ::::: primary toolbar buttons ::::: */
 
 .toolbarbutton-1 {
   -moz-box-orient: vertical;
   min-width: 0px;
 }
 
 toolbox[labelalign="end"] .toolbarbutton-1 {
   -moz-box-orient: horizontal;
 }
 
 toolbox[labelalign="end"] > toolbar[mode="full"] .toolbarbutton-1 .toolbarbutton-text {
   -moz-padding-start: 2px;
 }
 
-#button-newcard {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
-  -moz-image-region: rect(44px 22px 66px 0px); /* contact-add.png */
+.toolbarbutton-1[disabled=true] .toolbarbutton-icon,
+.toolbarbutton-1[disabled=true] .toolbarbutton-menu-dropmarker,
+.toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-dropmarker,
+.toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-button >
+.toolbarbutton-icon {
+  opacity: .4;
+}
+.toolbarbutton-menubutton-button > .toolbarbutton-icon,
+.toolbarbutton-1 .toolbarbutton-icon {
+  width: 18px;
+  height: 18px;
 }
 
-#button-newcard[disabled="true"] {
-  -moz-image-region: rect(66px 22px 88px 0px); /* contact-add-disabled.png */
+#button-newcard {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newcard");
 }
 
 #button-newlist {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
-  -moz-image-region: rect(88px 22px 110px 0px); /* contact-list-add.png */
-}
-
-#button-newlist[disabled="true"] {
-  -moz-image-region: rect(110px 22px 132px 0px); /* contact-list-add-disabled.png */
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newlist");
 }
 
 #button-editcard {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
-  -moz-image-region: rect(132px 22px 154px 0px); /* contact-properties.png */
-}
-
-#button-editcard[disabled="true"] {
-  -moz-image-region: rect(154px 22px 176px 0px); /* contact-properties-disabled.png */
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#editcard");
 }
 
 #button-newmessage {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
-  -moz-image-region: rect(176px 22px 198px 0px); /* message-compose.png */
-}
-
-#button-newmessage[disabled] {
-  -moz-image-region: rect(198px 22px 220px 0px); /* message-compose-disabled.png */
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newmessage");
 }
 
 #button-newim {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
-  -moz-image-region: rect(0px 22px 22px 0px); /* chat-new.png */
-}
-
-#button-newim[disabled] {
-  -moz-image-region: rect(22px 22px 44px 0px); /* chat-new-disabled.png */
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newim");
 }
 
 #button-abdelete {
-  list-style-image: url("moz-icon://stock/gtk-delete?size=toolbar")
-}
-
-#button-abdelete[disabled] {
-  list-style-image: url("moz-icon://stock/gtk-delete?size=toolbar&state=disabled")
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#abdelete");
 }
 
-/* ::::: small primary toolbar buttons ::::: */
-
-toolbar[iconsize="small"] #button-newcard {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-small.png");
-  -moz-image-region: rect(32px 16px 48px 0px); /* contact-add-small.png */
+#ab-bar2[brighttext] #button-newcard {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newcard-inverted");
 }
 
-toolbar[iconsize="small"] #button-newcard[disabled] {
-  -moz-image-region: rect(48px 16px 64px 0px); /* contact-add-small-disabled.png */
-}
-
-toolbar[iconsize="small"] #button-newlist {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-small.png");
-  -moz-image-region: rect(64px 16px 80px 0px); /* contact-list-add-small.png */
-}
-
-toolbar[iconsize="small"] #button-newlist[disabled] {
-  -moz-image-region: rect(80px 16px 96px 0px); /* contact-list-add-small-disabled.png */
+#ab-bar2[brighttext] #button-newlist {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newlist-inverted");
 }
 
-toolbar[iconsize="small"] #button-editcard {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-small.png");
-  -moz-image-region: rect(96px 16px 112px 0px); /* contact-properties-small.png */
-}
-
-toolbar[iconsize="small"] #button-editcard[disabled="true"] {
-  -moz-image-region: rect(112px 16px 128px 0px); /* contact-properties-small-disabled.png */
-}
-
-toolbar[iconsize="small"] #button-newmessage {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-small.png");
-  -moz-image-region: rect(128px 16px 144px 0px); /* message-compose-small.png */
+#ab-bar2[brighttext] #button-editcard {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#editcard-inverted");
 }
 
-toolbar[iconsize="small"] #button-newmessage[disabled] {
-  -moz-image-region: rect(144px 16px 160px 0px); /* message-compose-small-disabled.png */
-}
-
-toolbar[iconsize="small"] #button-newim {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-small.png");
-  -moz-image-region: rect(0px 16px 16px 0px); /* chat-new-small.png */
+#ab-bar2[brighttext] #button-newmessage {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newmessage-inverted");
 }
 
-toolbar[iconsize="small"] #button-newim[disabled] {
-  -moz-image-region: rect(16px 16px 32px 0px); /* chat-new-small-disabled.png */
+#ab-bar2[brighttext] #button-newim {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newim-inverted");
 }
 
-toolbar[iconsize="small"] #button-abdelete {
-  list-style-image: url("moz-icon://stock/gtk-delete?size=menu");
-}
-
-toolbar[iconsize="small"] #button-abdelete[disabled] {
-  list-style-image: url("moz-icon://stock/gtk-delete?size=menu&state=disabled");
+#ab-bar2[brighttext] #button-abdelete {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#abdelete-inverted");
 }
 
 #abContent {
   text-shadow: none;
   background-color: -moz-Dialog;
 }
 
 /* ::::: directory pane adjustments ::::: */
--- a/mail/themes/linux/mail/chat.css
+++ b/mail/themes/linux/mail/chat.css
@@ -68,75 +68,37 @@ imcontact {
   border: 1px dotted #F3D982;
 }
 
 .conv-hbox {
   -moz-box-align: center;
 }
 
 #button-add-buddy {
-  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.png");
-  -moz-image-region: rect(0px 22px 22px 0px);
-}
-
-#button-add-buddy[disabled] {
-  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.png");
-  -moz-image-region: rect(22px 22px 44px 0px);
+  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.svg#add");
 }
 
 #button-join-chat {
-  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.png");
-  -moz-image-region: rect(0px 44px 22px 22px);
-}
-
-#button-join-chat[disabled] {
-  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.png");
-  -moz-image-region: rect(22px 44px 44px 22px);
+  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.svg#join");
 }
 
 #button-chat-accounts {
-  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.png");
-  -moz-image-region: rect(0px 66px 22px 44px);
+  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.svg#accounts");
 }
 
-#button-chat-accounts[disabled] {
-  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.png");
-  -moz-image-region: rect(22px 66px 44px 44px);
-}
-
-/* Small toolbar icons */
-
-toolbar[iconsize="small"] #button-add-buddy {
-  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar-small.png");
-  -moz-image-region: rect(0px 16px 16px 0px);
+toolbar[brighttext] #button-add-buddy {
+  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.svg#add-inverted");
 }
 
-toolbar[iconsize="small"] #button-add-buddy[disabled] {
-  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar-small.png");
-  -moz-image-region: rect(16px 16px 32px 0px);
-}
-
-toolbar[iconsize="small"] #button-join-chat {
-  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar-small.png");
-  -moz-image-region: rect(0px 32px 16px 16px);
+toolbar[brighttext] #button-join-chat {
+  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.svg#join-inverted");
 }
 
-toolbar[iconsize="small"] #button-join-chat[disabled] {
-  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar-small.png");
-  -moz-image-region: rect(16px 32px 32px 16px);
-}
-
-toolbar[iconsize="small"] #button-chat-accounts {
-  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar-small.png");
-  -moz-image-region: rect(0px 48px 16px 32px);
-}
-
-toolbar[iconsize="small"] #button-chat-accounts[disabled] {
-  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar-small.png");
-  -moz-image-region: rect(16px 48px 32px 32px);
+toolbar[brighttext] #button-chat-accounts {
+  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.svg#accounts-inverted");
 }
 
 #statusTypeIcon[status="available"],
 #statusTypeAvailable,
 .statusTypeIcon[status="available"],
 #imStatusAvailable,
 #appmenu_imStatusAvailable,
 richlistitem[state="connected"] .accountStateIcon {
@@ -189,11 +151,20 @@ richlistitem[state="disconnected"] .acco
 
 #setStatusTypeMenupopup .menu-iconic-icon,
 #imAccountsStatus .menu-iconic-icon {
   visibility: visible;
 }
 
 .tabmail-tab[type="chat"],
 .alltabs-item[type="chat"] {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
-  -moz-image-region: rect(0px 240px 16px 224px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#chat");
+  -moz-image-region: auto;
 }
+
+.tabmail-tab[type="chat"] > .tab-stack > .tab-content > .tab-icon-image {
+  width: 18px;
+  height: 18px;
+  margin-top: 0;
+  -moz-margin-end: 5px;
+  margin-bottom: -1px;
+  -moz-margin-start: -1px;
+}
deleted file mode 100644
index f8354dea9dd4de60660c0c5426fef7af6d2d0849..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 8e8bd0ade61a089ba8b91f5af92869875aa612cd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/mail/themes/linux/mail/compose/messengercompose.css
+++ b/mail/themes/linux/mail/compose/messengercompose.css
@@ -16,16 +16,21 @@
   background-position: top right;
 }
 
 #attachmentBucket {
   width: 15em;
   min-width: 15em;
 }
 
+#compose-toolbox > toolbar {
+  /* force iconsize="small" on these toolbars */
+  counter-reset: smallicons;
+}
+
 /* ::::: primary toolbar buttons ::::: */
 
 .toolbarbutton-1 {
   -moz-box-orient: vertical;
   min-width: 0px;
 }
 
 toolbox[labelalign="end"] .toolbarbutton-1 {
@@ -39,184 +44,117 @@ toolbox[labelalign="end"] .toolbarbutton
 toolbox[labelalign="end"] > toolbar[mode="full"] .toolbarbutton-1 .toolbarbutton-text {
   -moz-padding-start: 2px;
 }
 
 toolbox[labelalign="end"] > toolbar[mode="full"] deck .toolbarbutton-text {
   text-align: start;
 }
 
-#button-send {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png");
-  -moz-image-region: rect(198px 22px 220px 0px);
+.toolbarbutton-1[disabled=true] .toolbarbutton-icon,
+.toolbarbutton-1[disabled=true] .toolbarbutton-menu-dropmarker,
+.toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-dropmarker,
+.toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-button >
+.toolbarbutton-icon {
+  opacity: .4;
 }
 
-#button-send[disabled="true"] {
-  -moz-image-region: rect(176px 22px 198px 0px) !important;
+.toolbarbutton-menubutton-button > .toolbarbutton-icon,
+.toolbarbutton-1 .toolbarbutton-icon {
+  width: 18px;
+  height: 18px;
+}
+
+#button-send {
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#send");
 }
 
 #button-contacts {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png");
-  -moz-image-region: rect(22px 22px 44px 0px) !important;
-}
-
-#button-contacts[disabled="true"] {
-  -moz-image-region: rect(0px 22px 22px 0px) !important;
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#contacts");
+  -moz-image-region: auto !important;
 }
 
 #spellingButton {
-  list-style-image: url("moz-icon://stock/gtk-spell-check?size=toolbar");
-}
-
-#spellingButton[disabled="true"] {
-  list-style-image: url("moz-icon://stock/tools-check-spelling?size=toolbar&state=disabled");
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#spelling");
 }
 
 #button-attach {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png");
-  -moz-image-region: rect(66px 22px 88px 0px);
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#attach");
 }
 
-#button-attach[disabled="true"] {
-  -moz-image-region: rect(44px 22px 66px 0px) !important;
+#button-security {
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#security");
 }
 
 #button-save {
-  list-style-image: url("moz-icon://stock/gtk-save?size=toolbar");
-}
-
-#button-save[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-save?size=toolbar&state=disabled");
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#save");
 }
 
 #quoteButton {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png");
-  -moz-image-region: rect(110px 22px 132px 0px);
-}
-
-#quoteButton[disabled="true"] {
-  -moz-image-region: rect(88px 22px 110px 0px) !important;
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#quote");
 }
 
 #cut-button {
-  list-style-image: url("moz-icon://stock/gtk-cut?size=toolbar");
-}
-
-#cut-button[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-cut?size=toolbar&state=disabled");
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#cut");
 }
 
 #copy-button {
-  list-style-image: url("moz-icon://stock/gtk-copy?size=toolbar");
-}
-
-#copy-button[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-copy?size=toolbar&state=disabled");
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#copy");
 }
 
 #paste-button {
-  list-style-image: url("moz-icon://stock/gtk-paste?size=toolbar");
-}
-
-#paste-button[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-paste?size=toolbar&state=disabled");
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#paste");
 }
 
 #button-print {
-  list-style-image: url("moz-icon://stock/gtk-print?size=toolbar");
-}
-
-#button-print[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-print?size=toolbar&state=disabled");
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#print");
 }
 
-/* ::::: small primary toolbar buttons ::::: */
-
-toolbar[iconsize="small"] #button-send {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar-small.png");
-  -moz-image-region: rect(144px 16px 160px 0px);
+toolbar[brighttext] #button-send {
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#send-inverted");
 }
 
-toolbar[iconsize="small"] #button-send[disabled="true"] {
-  -moz-image-region: rect(128px 16px 144px 0px) !important;
+toolbar[brighttext] #button-contacts {
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#contacts-inverted");
 }
 
-toolbar[iconsize="small"] #button-contacts {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar-small.png");
-  -moz-image-region: rect(16px 16px 32px 0px) !important;
-}
-
-toolbar[iconsize="small"] #button-contacts[disabled="true"] {
-  -moz-image-region: rect(0px 16px 16px 0px) !important;
+toolbar[brighttext] #spellingButton {
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#spelling-inverted");
 }
 
-toolbar[iconsize="small"] #spellingButton {
-  list-style-image: url("moz-icon://stock/gtk-spell-check?size=menu");
-}
-
-toolbar[iconsize="small"] #spellingButton[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-spell-check?size=menu&state=disabled");
+toolbar[brighttext] #button-attach {
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#attach-inverted");
 }
 
-toolbar[iconsize="small"] #button-attach {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar-small.png");
-  -moz-image-region: rect(48px 16px 64px 0px);
-}
-
-toolbar[iconsize="small"] #button-attach[disabled="true"] {
-  -moz-image-region: rect(32px 16px 48px 0px) !important;
+toolbar[brighttext] #button-security {
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#security-inverted");
 }
 
-toolbar[iconsize="small"] #button-save {
-  list-style-image: url("moz-icon://stock/gtk-save?size=menu");
-}
-
-toolbar[iconsize="small"] #button-save[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-save?size=menu&state=disabled");
+toolbar[brighttext] #button-save {
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#save-inverted");
 }
 
-toolbar[iconsize="small"] #quoteButton {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar-small.png");
-  -moz-image-region: rect(80px 16px 96px 0px);
-}
-
-toolbar[iconsize="small"] #quoteButton[disabled="true"] {
-  -moz-image-region: rect(64px 16px 80px 0px) !important;
-}
-
-toolbar[iconsize="small"] #cut-button {
-  list-style-image: url("moz-icon://stock/gtk-cut?size=menu");
+toolbar[brighttext] #quoteButton {
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#quote-inverted");
 }
 
-toolbar[iconsize="small"] #cut-button[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-cut?size=menu&state=disabled");
-}
-
-toolbar[iconsize="small"] #copy-button {
-  list-style-image: url("moz-icon://stock/gtk-copy?size=menu");
-}
-
-toolbar[iconsize="small"] #copy-button[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-copy?size=menu&state=disabled");
+toolbar[brighttext] #cut-button {
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#cut-inverted");
 }
 
-toolbar[iconsize="small"] #paste-button {
-  list-style-image: url("moz-icon://stock/gtk-paste?size=menu");
+toolbar[brighttext] #copy-button {
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#copy-inverted");
 }
 
-toolbar[iconsize="small"] #paste-button[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-paste?size=menu&state=disabled");
+toolbar[brighttext] #paste-button {
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#paste-inverted");
 }
 
-toolbar[iconsize="small"] #button-print {
-  list-style-image: url("moz-icon://stock/gtk-print?size=menu");
-}
-
-toolbar[iconsize="small"] #button-print[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-print?size=menu&state=disabled");
+toolbar[brighttext] #button-print {
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#print-inverted");
 }
 
 #priority-button:not(:-moz-lwtheme) > label {
   color: MenuText;
 }
 
 /* ::::: special toolbar colors ::::: */
 
@@ -817,23 +755,21 @@ toolbarbutton.formatting-button {
 #sidebar-box sidebarheader {
   color: -moz-DialogText;
   text-shadow: none;
   background-color: -moz-Dialog;
 }
 
 /** Stock icons for the menu items. */
 #menu_NewMessage {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
-  -moz-image-region: rect(176px 22px 198px 0px); /* message-compose.png */
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#newmsg");
 }
 
 #menu_NewContact {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
-  -moz-image-region: rect(44px 22px 66px 0px); /* contact-add.png */
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newcard");
 }
 
 #menu_SaveCmd {
   list-style-image: url("moz-icon://stock/gtk-save?size=menu");
 }
 
 #menu_SaveAsCmd {
   -moz-binding: url("chrome://global/content/bindings/menu.xml#menu-iconic");
deleted file mode 100644
index f87ee907b746e07b1eff99b85009c230b161760b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index fa887fd11515fa93437efbb3ff8c51492c238409..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/mail/themes/linux/mail/icons/button-archive.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="16"
-  height="16">
-<path
-  d="m 4,1.03125 0,1 8,0 0,-1 -8,0 z m -1,2 0,1.03125 10,0 0,-1.03125 -10,0 z M 2.0625,5 l 0,0.21875 5.96875,5.625 5.875,-5.6875 L 13.90625,5 2.0625,5 z M 14,6.5625 8.0625,12.1875 2,6.59375 2,14 14,14 14,6.5625 z"
-  fill="-moz-dialogtext"/>
-</svg>
deleted file mode 100644
--- a/mail/themes/linux/mail/icons/button-delete.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="16"
-   height="16">
-<path
-  d="m 8.0069177,2.00696 c -3.31231,0 -6.0000001,2.687692 -6.0000001,5.9999999 0,3.3123071 2.6876901,6.0312491 6.0000001,6.0312491 3.3123103,0 6.0312503,-2.718942 6.0312503,-6.0312491 0,-3.3123079 -2.71895,-5.9999999 -6.0312503,-5.9999999 z m 0,1.96875 c 2.2314203,0 4.0312503,1.799822 4.0312503,4.0312499 0,0.762167 -0.22915,1.456378 -0.59375,2.0624991 L 5.9444177,4.56946 c 0.60612,-0.364607 1.30033,-0.59375 2.0625,-0.59375 z m -3.53125,2.125 5.4375,5.437499 c -0.56766,0.304927 -1.21394,0.5 -1.90625,0.5 -2.23143,0 -4.03125,-1.799823 -4.03125,-4.0312491 0,-0.694785 0.19303,-1.3371649 0.5,-1.9062499 z"
-  fill="-moz-dialogtext"/>
-</svg>
deleted file mode 100644
--- a/mail/themes/linux/mail/icons/button-forward.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="16"
-   height="16">
-<path
-  d="m 8.0004841,3.0594868 6.2890599,5.09375 -6.27734,5.1562502 -0.008,-3.304691 -7.003516,-0.004 0.002,-3.9946592 7.001776,-0.009 -0.004,-2.9375 z"
-  fill="-moz-dialogtext"/>
-</svg>
deleted file mode 100644
--- a/mail/themes/linux/mail/icons/button-junk.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="16"
-   height="16">
-  <path
-     d="M 8.4186815,0.99282044 C 5.0035218,2.7250555 3.0771607,4.9869425 3.0055454,8.2886388 l -0.028345,0.8851549 c 0,2.6266693 2.249058,4.8521803 5.0163615,4.8521803 2.7673031,0 4.9880211,-2.225511 4.9880211,-4.8521803 l 0.02833,-1.2070291 c 0,-1.873651 -1.544654,-3.5113539 -2.720739,-4.291658 0.834762,1.8479469 0.820088,3.3261888 -0.793543,4.5562536 L 8.9854978,8.5568672 8.4186777,8.2618161 c -1.9643362,-2.4155855 -1.2746045,-4.8534101 0,-7.26899566 z"
-  fill="-moz-dialogtext" />
-</svg>
deleted file mode 100644
--- a/mail/themes/linux/mail/icons/button-reply-all.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="16"
-   height="16">
-  <path
-     d="m 6.03125,1.6875 -5.96875,4.84375 -0.03125,0.5 6,4.90625 0,-2.3125 L 2.8125,6.84375 6.03125,4.125 z M 10.0625,1.75 3.75,6.84375 10.0625,12 l 0,-2.875 c 1.079556,-0.01378 1.956215,0.043735 2.875,0.4375 0.13984,0.104613 0.19041,0.1529523 0.1875,0.28125 -0.0476,2.102937 -2.15625,4.375 -2.15625,4.375 l 0.5625,0.8125 c 0,0 1.09889,-0.448862 2.21875,-1.3125 C 14.86986,12.855112 16.0625,11.535608 16.0625,9.75 16.0625,8.598578 15.64384,7.659522 15,7 14.35617,6.340478 13.52173,5.929331 12.71875,5.65625 11.91578,5.383169 11.12272,5.248405 10.53125,5.1875 10.33819,5.16762 10.2085,5.16332 10.0625,5.15625 z"
-  fill="-moz-dialogtext" />
-</svg>
deleted file mode 100644
--- a/mail/themes/linux/mail/icons/button-reply-list.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="16"
-   height="16">
-<path
-  d="m 2.1894775,0.99358449 c -0.66506,0 -1.1875,0.44600001 -1.1875,1.00000001 l 0,11.0000005 c 0,0.554 0.52244,1 1.1875,1 l 4.5625,0 c 0.805574,1.21621 2.1819426,2 3.7500005,2 2.48528,0 4.5,-2.014719 4.5,-4.5 0,-1.568059 -0.78379,-2.9444266 -2,-3.7500006 l 0,-5.7499999 c 0,-0.554 -0.52244,-1.00000001 -1.1875,-1.00000001 l -9.6250005,0 z m -0.1875,1.03125001 10.0000005,0 0,1.96875 -10.0000005,0 0,-1.96875 z m 0,3.96875 10.0000005,0 0,1.28125 c -0.47255,-0.1685377 -0.969567,-0.28125 -1.5,-0.28125 -1.0630539,0 -2.0424819,0.3836145 -2.8125009,0.9999999 l -5.6874996,0 0,-1.9999999 z m 8.9687505,1.9687499 0,2.0625006 c 1.83059,0.130318 2.69558,1.283347 3.09375,2.9375 -0.92438,-0.744456 -1.92258,-1.202523 -3.0625,-0.9375 l 0,1.90625 -4.0000005,-2.96875 3.9687505,-3.0000006 z m -8.9687505,2.0312496 4.28125,0 c -0.168538,0.472551 -0.28125,0.969567 -0.28125,1.500001 0,0.171777 0.04376,0.333229 0.0625,0.5 l -4.0625,0 0,-2.000001 z"
-  fill="-moz-dialogtext"/>
-</svg>
deleted file mode 100644
--- a/mail/themes/linux/mail/icons/button-reply.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="16"
-   height="16">
-<path
-  d="m 8.0218007,1.6463683 -6.3125004,5.09375 6.3125004,5.1562497 0,-2.8749997 C 9.2495757,8.9702943 10.270794,9.0825713 11.0843,9.7401182 11.0367,11.843055 8.9280507,14.115118 8.9280507,14.115118 l 0.5625,0.8125 c 0,0 1.0988893,-0.448862 2.2187493,-1.3125 1.11986,-0.863638 2.3125,-2.183142 2.3125,-3.9687497 0,-3.2907358 -3.128053,-4.59375 -5.9999993,-4.59375 z"
-  fill="-moz-dialogtext"/>
-</svg>
deleted file mode 100644
--- a/mail/themes/linux/mail/icons/button-tag.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="16"
-  height="16">
-<path
-  d="m 2.5147716,1.0320002 c -0.4184879,0 -0.7690635,0.1639495 -1.0421316,0.4370229 C 1.1995613,1.7420965 1.002,2.126284 1.002,2.5447716 l 0,4.6727833 c 0.098216,0.6933029 0.4302887,1.0354003 0.8740458,1.479154 l 5.9838519,5.9838521 c 0.4232534,0.423252 1.1231354,0.423252 1.5463887,0 L 14.65056,9.4362863 c 0.423253,-0.4232524 0.423253,-1.1231376 0,-1.5463884 L 8.6667093,1.9060459 C 8.2209513,1.4473607 7.8314334,1.1117014 7.1875548,1.0320002 l -4.6727832,0 z m 1.142983,1.0421315 c 0.8927206,0 1.6136229,0.7208978 1.6136229,1.6136228 0,0.8927251 -0.7209023,1.6472401 -1.6136229,1.6472401 -0.8927209,0 -1.613623,-0.754515 -1.613623,-1.6472401 0,-0.892725 0.7209021,-1.6136228 1.613623,-1.6136228 z"
-  fill="-moz-dialogtext"/>
-</svg>
deleted file mode 100644
index e517df533b70270205050b682ed97fc287ccb5ad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 7ed1e61a0f72ae5e390a709d2a0b3da1234b87c2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 1fd617221976df4a2fd5d373f10fd6a2bd1700a7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 775656c97fabf58439020c1a83ecd0153cccec1b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/mail/themes/linux/mail/messageHeader.css
+++ b/mail/themes/linux/mail/messageHeader.css
@@ -181,46 +181,91 @@ toolbar[mode="text"] toolbarpaletteitem 
  */
 toolbox[labelalign="end"] toolbar[mode="full"] .msgHeaderView-button .toolbarbutton-text {
   -moz-margin-start: 2px !important;
 }
 
 .hdrReplyToSenderButton,
 .hdrDummyReplyButton,
 .hdrReplyButton {
-  list-style-image: url("chrome://messenger/skin/icons/button-reply.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#reply");
 }
 
 .hdrReplyAllButton {
-  list-style-image: url("chrome://messenger/skin/icons/button-reply-all.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replyall");
 }
 
 .hdrReplyListButton,
 .hdrFollowupButton {
-  list-style-image: url("chrome://messenger/skin/icons/button-reply-list.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replylist");
 }
 
 .hdrForwardButton {
-  list-style-image: url("chrome://messenger/skin/icons/button-forward.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#forward");
 }
 
 .hdrArchiveButton {
-  list-style-image: url("chrome://messenger/skin/icons/button-archive.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#archive");
 }
 
 .hdrJunkButton {
-  list-style-image: url("chrome://messenger/skin/icons/button-junk.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#junk");
 }
 
 .hdrTrashButton {
-  list-style-image: url("chrome://messenger/skin/icons/button-delete.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#delete");
 }
 
 .hdrTagButton {
-  list-style-image: url("chrome://messenger/skin/icons/button-tag.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#tag");
+}
+
+#attachmentSaveAllSingle,
+#attachmentSaveAllMultiple {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#file");
+}
+
+toolbar[brighttext] .hdrReplyToSenderButton,
+toolbar[brighttext] .hdrDummyReplyButton,
+toolbar[brighttext] .hdrReplyButton {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#reply-inverted");
+}
+
+toolbar[brighttext] .hdrReplyAllButton {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replyall-inverted");
+}
+
+toolbar[brighttext] .hdrReplyListButton,
+toolbar[brighttext] .hdrFollowupButton {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replylist-inverted");
+}
+
+toolbar[brighttext] .hdrForwardButton {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#forward-inverted");
+}
+
+toolbar[brighttext] .hdrArchiveButton {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#archive-inverted");
+}
+
+toolbar[brighttext] .hdrJunkButton {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#junk-inverted");
+}
+
+toolbar[brighttext] .hdrTrashButton {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#delete-inverted");
+}
+
+toolbar[brighttext] .hdrTagButton {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#tag-inverted");
+}
+
+toolbar[brighttext] #attachmentSaveAllSingle,
+toolbar[brighttext] #attachmentSaveAllMultiple {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#file-inverted");
 }
 
 #otherActionsButton > .toolbarbutton-icon {
   display: none;
 }
 
 /* show a icon in customize window */
 #CustomizeToolbarWindow toolbarpaletteitem > #otherActionsButton >
@@ -388,20 +433,27 @@ mail-emailaddress[selected="true"] .emai
 
 window[inlinetoolbox] #smallicons,
 window[inlinetoolbox] #newtoolbar {
   display: none;
 }
 
 /* This is a workaround for #562608 in the rare case where the buttons_have_icons gconf key is set to true */
 .hdrArchiveButton > .button-box > .button-icon {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
-  -moz-image-region: rect(0px 224px 16px 208px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#archive");
 }
 
 .hdrTrashButton > .button-box > .button-icon {
-  list-style-image: url("moz-icon://stock/gtk-delete?size=menu");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#tag");
+}
+
+toolbar[brighttext] .hdrArchiveButton > .button-box > .button-icon {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#archive-inverted");
+}
+
+toolbar[brighttext] .hdrTrashButton > .button-box > .button-icon {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#tag-inverted");
 }
 
 #header-view-toolbox {
   float: right;
   padding-top: 2px;
 }
--- a/mail/themes/linux/mail/primaryToolbar.css
+++ b/mail/themes/linux/mail/primaryToolbar.css
@@ -8,16 +8,26 @@
    == native-OS-style toolbars at the top of various windows, as well as
    == the specifically about the ones that appear on the 3-pane window and
    == the standalone message window.  The other native-OS-style toolbars
    == (addressbook and compose) are already styled elsewhere.
    ====================================================================== */
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
+.mail-toolbox > toolbar {
+  /* force iconsize="small" on these toolbars */
+  counter-reset: smallicons;
+}
+
+/* remove the small icons checkbox in Customize window */
+#smallicons {
+  display: none;
+}
+
 /* ::::: primary toolbar buttons ::::: */
 
 .toolbarbutton-1 {
   -moz-box-orient: vertical;
 }
 
 toolbox[labelalign="end"] .toolbarbutton-1,
 toolbox[labelalign="end"] .toolbarbutton-1[type="menu-button"]
@@ -36,492 +46,245 @@ toolbox[labelalign="end"] > toolbar[mode
 .toolbarbutton-1[type="menu"] {
   -moz-binding: url("chrome://global/content/bindings/toolbarbutton.xml#menu-vertical");
 }
 
 toolbox[labelalign="end"] .toolbarbutton-1[type="menu"] {
   -moz-binding: url("chrome://global/content/bindings/toolbarbutton.xml#menu");
 }
 
-#button-getmsg {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 24px 24px 0px);
+.toolbarbutton-1[disabled=true] .toolbarbutton-icon,
+.toolbarbutton-1[disabled=true] .toolbarbutton-menu-dropmarker,
+.toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-dropmarker,
+.toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-button >
+.toolbarbutton-icon {
+  opacity: .4;
 }
 
-#button-getmsg[disabled] {
-  -moz-image-region: rect(24px 24px 48px 0px) !important;
+.toolbarbutton-menubutton-button > .toolbarbutton-icon,
+.toolbarbutton-1 .toolbarbutton-icon {
+  width: 18px;
+  height: 18px;
+}
+
+#button-getmsg {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#getmsg");
 }
 
 #button-newmsg {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 48px 24px 24px);
-}
-
-#button-newmsg[disabled] {
-  -moz-image-region: rect(24px 48px 48px 24px) !important;
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#newmsg");
 }
 
 #button-address {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 72px 24px 48px);
-}
-
-#button-address[disabled="true"] {
-  -moz-image-region: rect(24px 72px 48px 48px) !important;
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#address");
 }
 
 #button-reply {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 96px 24px 72px);
-}
-
-#button-reply[disabled] {
-  -moz-image-region: rect(24px 96px 48px 72px) !important;
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#reply");
 }
 
 #button-replyall {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 120px 24px 96px);
-}
-
-#button-replyall[disabled] {
-  -moz-image-region: rect(24px 120px 48px 96px) !important;
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replyall");
 }
 
 #button-replylist {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 144px 24px 120px);
-}
-
-#button-replylist[disabled] {
-  -moz-image-region: rect(24px 144px 48px 120px) !important;
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replylist");
 }
 
 #button-forward {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 168px 24px 144px);
-}
-
-#button-forward[disabled] {
-  -moz-image-region: rect(24px 168px 48px 144px) !important;
-}
-
-.junk-button {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 192px 24px 168px);
-}
-
-.junk-button[disabled="true"] {
-  -moz-image-region: rect(24px 192px 48px 168px) !important;
-}
-
-#button-mark {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 216px 24px 192px);
-}
-
-#button-mark[disabled] {
-  -moz-image-region: rect(24px 216px 48px 192px) !important;
-}
-
-#button-nextUnread {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 240px 24px 216px);
-}
-
-#button-nextUnread[disabled] {
-  -moz-image-region: rect(24px 240px 48px 216px) !important;
-}
-
-#button-previousUnread {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 264px 24px 240px);
-}
-
-#button-previousUnread[disabled] {
-  -moz-image-region: rect(24px 264px 48px 240px) !important;
-}
-
-#button-tag {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 288px 24px 264px);
-}
-
-#button-tag[disabled] {
-  -moz-image-region: rect(24px 288px 48px 264px) !important;
-}
-
-#button-compact {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 312px 24px 288px);
-}
-
-#button-compact[disabled] {
-  -moz-image-region: rect(24px 312px 48px 288px) !important;
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#forward");
 }
 
 .delete-button {
-  list-style-image: url("moz-icon://stock/gtk-delete?size=toolbar");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#delete");
 }
 
-.delete-button[disabled] {
-  list-style-image: url("moz-icon://stock/gtk-delete?size=toolbar&state=disabled");
+.junk-button {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#junk");
 }
 
 #button-print {
-  list-style-image: url("moz-icon://stock/gtk-print?size=toolbar");
-}
-
-#button-print[disabled] {
-  list-style-image: url("moz-icon://stock/gtk-print?size=toolbar&state=disabled");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#print");
 }
 
 #button-stop {
-  list-style-image: url("moz-icon://stock/gtk-stop?size=toolbar");
-}
-
-#button-stop[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-stop?size=toolbar&state=disabled");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#stop");
 }
 
 #button-file {
-  list-style-image: url("moz-icon://stock/gtk-save-as?size=toolbar");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#file");
+}
+
+#button-nextUnread {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#nextUnread");
 }
 
-#button-archive {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 336px 24px 312px);
+#button-previousUnread {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#previousUnread");
 }
 
-#button-archive[disabled] {
-  -moz-image-region: rect(24px 336px 48px 312px);
+#button-mark {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#mark");
 }
 
-#button-file[disabled] {
-  list-style-image: url("moz-icon://stock/gtk-save-as?size=toolbar&state=disabled");
+#button-tag {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#tag");
 }
 
 #button-goback {
-  list-style-image: url("moz-icon://stock/gtk-go-back-ltr?size=toolbar");
-}
-
-#button-goback[disabled] {
-  list-style-image: url("moz-icon://stock/gtk-go-back-ltr?size=toolbar&state=disabled");
-}
-
-#button-goback:-moz-locale-dir(rtl) {
-  list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=toolbar");
-}
-
-#button-goback:-moz-locale-dir(rtl)[disabled] {
-  list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=toolbar&state=disabled");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#goback");
 }
 
 #button-goforward {
-  list-style-image: url("moz-icon://stock/gtk-go-forward-ltr?size=toolbar");
-}
-
-#button-goforward:-moz-locale-dir(rtl) {
-  list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=toolbar");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#goforward");
 }
 
-#button-goforward[disabled] {
-  list-style-image: url("moz-icon://stock/gtk-go-forward-ltr?size=toolbar&state=disabled");
+#button-compact {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#compact");
 }
 
-#button-goforward:-moz-locale-dir(rtl)[disabled] {
-  list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=toolbar&state=disabled");
+#button-archive {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#archive");
 }
 
 #button-chat {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 360px 24px 336px);
-}
-
-#button-chat[disabled] {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(24px 360px 48px 336px);
-}
-
-#button-chat[unreadMessages="true"] {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(48px 360px 72px 336px);
-  font-weight: bold;
-}
-
-toolbar[iconsize="small"]:not([mode="text"]) .badgeButton-badge {
-  margin-bottom: 4px;
-}
-
-toolbar[iconsize="large"]:not([mode="text"]) .badgeButton-badge {
-  margin-bottom: 12px;
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#chat");
 }
 
 #button-nextMsg {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 384px 24px 360px);
-}
-
-#button-nextMsg[disabled] {
-  -moz-image-region: rect(24px 384px 48px 360px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#nextMsg");
 }
 
 #button-previousMsg {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 408px 24px 384px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#previousMsg");
 }
 
-#button-previousMsg[disabled] {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(24px 408px 48px 384px);
+#qfb-show-filter-bar {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#filter");
 }
 
 .button-appmenu {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 432px 24px 408px);
-  min-width: 35px !important;
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#appButton");
+}
+
+toolbar[brighttext] #button-getmsg {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#getmsg-inverted");
+}
+
+toolbar[brighttext] #button-newmsg {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#newmsg-inverted");
+}
+
+toolbar[brighttext] #button-address {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#address-inverted");
+}
+
+toolbar[brighttext] #button-reply {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#reply-inverted");
+}
+
+toolbar[brighttext] #button-replyall {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replyall-inverted");
+}
+
+toolbar[brighttext] #button-replylist {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replylist-inverted");
+}
+
+toolbar[brighttext] #button-forward {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#forward-inverted");
+}
+
+toolbar[brighttext] .delete-button {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#delete-inverted");
+}
+
+toolbar[brighttext] .junk-button {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#junk-inverted");
+}
+
+toolbar[brighttext] #button-print {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#print-inverted");
+}
+
+toolbar[brighttext] #button-stop {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#stop-inverted");
+}
+
+toolbar[brighttext] #button-file {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#file-inverted");
 }
 
-.button-appmenu[disabled] {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(24px 432px 48px 408px);
+toolbar[brighttext] #button-next > #button-nextUnread {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#nextUnread-inverted");
+}
+
+toolbar[brighttext] #button-previous > #button-previousUnread {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#previousUnread-inverted");
+}
+
+toolbar[brighttext] #button-mark {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#mark-inverted");
+}
+
+toolbar[brighttext] #button-tag {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#tag-inverted");
+}
+
+toolbar[brighttext] #button-goback {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#goback-inverted");
+}
+
+toolbar[brighttext] #button-goforward {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#goforward-inverted");
+}
+
+toolbar[brighttext] #button-compact {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#compact-inverted");
+}
+
+toolbar[brighttext] #button-archive {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#archive-inverted");
+}
+
+toolbar[brighttext] #button-chat {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#chat-inverted");
+}
+
+toolbar[brighttext] #button-nextMsg {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#nextMsg-inverted");
+}
+
+toolbar[brighttext] #button-previousMsg {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#previousMsg-inverted");
+}
+
+toolbar[brighttext] #qfb-show-filter-bar {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#filter-inverted");
+}
+
+toolbar[brighttext] .button-appmenu {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#appButton-inverted");
+}
+
+toolbar > #button-chat[unreadMessages="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#chat-unread");
 }
 
 .button-appmenu .toolbarbutton-text,
 .button-appmenu .toolbarbutton-menu-dropmarker {
   display: none;
 }
 
 toolbar[mode="text"] .button-appmenu .toolbarbutton-icon {
   display: -moz-box;
 }
 
-/* ::::: small primary toolbar buttons ::::: */
-
-toolbar[iconsize="small"] #button-getmsg {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
-  -moz-image-region: rect(0px 16px 16px 0px);
-}
-
-toolbar[iconsize="small"] #button-getmsg[disabled] {
-  -moz-image-region: rect(16px 16px 32px 0px) !important;
-}
-
-toolbar[iconsize="small"] #button-newmsg {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
-  -moz-image-region: rect(0px 32px 16px 16px);
-}
-
-toolbar[iconsize="small"] #button-newmsg[disabled] {
-  -moz-image-region: rect(16px 32px 32px 16px) !important;
-}
-
-toolbar[iconsize="small"] #button-address {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
-  -moz-image-region: rect(0px 48px 16px 32px);
-}
-
-toolbar[iconsize="small"] #button-address[disabled="true"] {
-  -moz-image-region: rect(16px 48px 32px 32px) !important;
-}
-
-toolbar[iconsize="small"] #button-reply {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
-  -moz-image-region: rect(0px 64px 16px 48px);
-}
-
-toolbar[iconsize="small"] #button-reply[disabled] {
-  -moz-image-region: rect(16px 64px 32px 48px) !important;
-}
-
-toolbar[iconsize="small"] #button-replyall {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
-  -moz-image-region: rect(0px 80px 16px 64px);
-}
-
-toolbar[iconsize="small"] #button-replyall[disabled] {
-  -moz-image-region: rect(16px 80px 32px 64px) !important;
-}
-
-toolbar[iconsize="small"] #button-replylist {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
-  -moz-image-region: rect(0px 96px 16px 80px);
-}
-
-toolbar[iconsize="small"] #button-replylist[disabled] {
-  -moz-image-region: rect(16px 96px 32px 80px) !important;
-}
-
-toolbar[iconsize="small"] #button-forward {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
-  -moz-image-region: rect(0px 112px 16px 96px);
-}
-
-toolbar[iconsize="small"] #button-forward[disabled] {
-  -moz-image-region: rect(16px 112px 32px 96px) !important;
-}
-
-toolbar[iconsize="small"] .junk-button {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
-  -moz-image-region: rect(0px 128px 16px 112px);
-}
-
-toolbar[iconsize="small"] .junk-button[disabled="true"] {
-  -moz-image-region: rect(16px 128px 32px 112px) !important;
-}
-
-toolbar[iconsize="small"] #button-mark {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
-  -moz-image-region: rect(0px 144px 16px 128px);
-}
-
-toolbar[iconsize="small"] #button-mark[disabled] {
-  -moz-image-region: rect(16px 144px 32px 128px) !important;
-}
-
-toolbar[iconsize="small"] #button-nextUnread {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
-  -moz-image-region: rect(0px 160px 16px 144px);
-}
-
-toolbar[iconsize="small"] #button-nextUnread[disabled] {
-  -moz-image-region: rect(16px 160px 32px 144px) !important;
-}
-
-toolbar[iconsize="small"] #button-previousUnread {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
-  -moz-image-region: rect(0px 176px 16px 160px);
-}
-
-toolbar[iconsize="small"] #button-previousUnread[disabled] {
-  -moz-image-region: rect(16px 176px 32px 160px) !important;
-}
-
-toolbar[iconsize="small"] #button-tag {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
-  -moz-image-region: rect(0px 192px 16px 176px);
-}
-
-toolbar[iconsize="small"] #button-tag[disabled] {
-  -moz-image-region: rect(16px 192px 32px 176px) !important;
-}
-
-toolbar[iconsize="small"] #button-compact {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
-  -moz-image-region: rect(0px 208px 16px 192px);
-}
-
-toolbar[iconsize="small"] #button-compact[disabled] {
-  -moz-image-region: rect(16px 208px 32px 192px) !important;
-}
-
-toolbar[iconsize="small"] #button-goback {
-  list-style-image: url("moz-icon://stock/gtk-go-back-ltr?size=menu");
-}
-
-toolbar[iconsize="small"] #button-goback[disabled] {
-  list-style-image: url("moz-icon://stock/gtk-go-back-ltr?size=menu&state=disabled");
-}
-
-toolbar[iconsize="small"] #button-goforward {
-  list-style-image: url("moz-icon://stock/gtk-go-forward-ltr?size=menu");
-}
-
-toolbar[iconsize="small"] #button-goforward[disabled] {
-  list-style-image: url("moz-icon://stock/gtk-go-forward-ltr?size=menu&state=disabled");
-}
-
-toolbar[iconsize="small"] #button-print {
-  list-style-image: url("moz-icon://stock/gtk-print?size=menu");
-}
-
-toolbar[iconsize="small"] .delete-button {
-  list-style-image: url("moz-icon://stock/gtk-delete?size=menu");
-}
-
-toolbar[iconsize="small"] .delete-button[disabled] {
-  list-style-image: url("moz-icon://stock/gtk-delete?size=menu&state=disabled");
-}
-
-toolbar[iconsize="small"] #button-print[disabled] {
-  list-style-image: url("moz-icon://stock/gtk-print?size=menu&state=disabled");
-}
-
-toolbar[iconsize="small"] #button-stop {
-  list-style-image: url("moz-icon://stock/gtk-stop?size=menu");
-}
-
-toolbar[iconsize="small"] #button-stop[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-stop?size=menu&state=disabled");
-}
-
-toolbar[iconsize="small"] #button-file {
-  list-style-image: url("moz-icon://stock/gtk-save-as?size=menu");
-}
-
-toolbar[iconsize="small"] #button-file[disabled] {
-  list-style-image: url("moz-icon://stock/gtk-save-as?size=menu&state=disabled");
-}
-
-toolbar[iconsize="small"] #button-archive {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
-  -moz-image-region: rect(0px 224px 16px 208px);
-}
-
-toolbar[iconsize="small"] #button-archive[disabled] {
-  -moz-image-region: rect(16px 224px 32px 208px);
-}
-
-toolbar[iconsize="small"] #button-chat {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
-  -moz-image-region: rect(0px 240px 16px 224px);
-}
-
-toolbar[iconsize="small"] #button-chat[disabled] {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
-  -moz-image-region: rect(16px 240px 32px 224px);
-}
-
-toolbar[iconsize="small"] #button-chat[unreadMessages="true"] {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
-  -moz-image-region: rect(32px 240px 48px 224px);
-  font-weight: bold;
-}
-
-toolbar[iconsize="small"] #button-nextMsg {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
-  -moz-image-region: rect(0px 256px 16px 240px);
-}
-
-toolbar[iconsize="small"] #button-nextMsg[disabled] {
-  -moz-image-region: rect(16px 256px 32px 240px);
-}
-
-toolbar[iconsize="small"] #button-previousMsg {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
-  -moz-image-region: rect(0px 272px 16px 256px);
-}
-
-toolbar[iconsize="small"] #button-previousMsg[disabled] {
-  -moz-image-region: rect(16px 272px 32px 256px);
-}
-
-toolbar[iconsize="small"] .button-appmenu {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
-  -moz-image-region: rect(0px 288px 16px 272px);
-}
-
-toolbar[iconsize="small"] .button-appmenu[disabled] {
-  -moz-image-region: rect(16px 288px 32px 272px);
-}
-
-/* ::::: end small primary toolbar buttons ::::: */
-
 #palette-box #qfb-show-filter-bar {
-  list-style-image: url("moz-icon://stock/gtk-find?size=toolbar") !important;
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#filter") !important;
 }
 
 /* Force the folder location and mail view items to fit in the available width
    in the Customize Toolbar dialog. */
 #palette-box #locationFolders,
 #palette-box #folder-location-container,
 #palette-box #viewPicker {
   -moz-box-flex: 1;
--- a/mail/themes/linux/mail/quickFilterBar.css
+++ b/mail/themes/linux/mail/quickFilterBar.css
@@ -1,32 +1,14 @@
 /* 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/. */
 
 @import url("chrome://messenger/content/quickFilterBar.css");
 
-/* :::: Filter Tab Bar Button :::: */
-
-#qfb-show-filter-bar {
-  list-style-image: url("moz-icon://stock/gtk-find?size=menu");
-}
-
-toolbar[iconsize="large"] #qfb-show-filter-bar {
-  list-style-image: url("moz-icon://stock/gtk-find?size=toolbar");
-}
-
-#qfb-show-filter-bar[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-find?size=menu&state=disabled");
-}
-
-toolbar[iconsize="large"] #qfb-show-filter-bar[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-find?size=toolbar&state=disabled");
-}
-
 /* :::: Filter Bar :::: */
 
 #quick-filter-bar-main-bar {
   -moz-padding-start: 4px;
 }
 
 #quick-filter-bar-expando {
   margin-top: -1px;
--- a/mail/themes/linux/mail/smime/msgCompSMIMEOverlay.css
+++ b/mail/themes/linux/mail/smime/msgCompSMIMEOverlay.css
@@ -3,35 +3,16 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== msgCompSMIMEOverlay.css ========================================
   == Styles for the S/Mime in composer window.
   ======================================================================= */
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-#button-security {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png");
-  -moz-image-region: rect(154px 22px 176px 0px);
-}
-
-#button-security[disabled="true"] {
-  -moz-image-region: rect(132px 22px 154px 0px);
-}
-
-
-toolbar[iconsize="small"] #button-security {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar-small.png");
-  -moz-image-region: rect(112px 16px 128px 0px);
-}
-
-toolbar[iconsize="small"] #button-security[disabled] {
-  -moz-image-region: rect(96px 16px 112px 0px);
-}
-
 #msgcomposeWindow #signing-status {
   list-style-image: none;
   visibility: collapse;
 }
 
 #msgcomposeWindow[signing="ok"] #signing-status {
   list-style-image: url("chrome://messenger/skin/smime/icons/sbSignOk.png");
   visibility: visible;
--- a/mail/themes/osx/jar.mn
+++ b/mail/themes/osx/jar.mn
@@ -71,33 +71,31 @@ classic.jar:
   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-toolbar.png         (mail/addrbook/addressbook-toolbar.png)
-  skin/classic/messenger/addressbook/icons/addressbook-toolbar@2x.png      (mail/addrbook/addressbook-toolbar@2x.png)
+  skin/classic/messenger/addressbook/icons/addressbook-toolbar.svg         (../shared/mail/icons/addressbook-toolbar.svg)
   skin/classic/messenger/addressbook/icons/addressbook@2x.png    (mail/addrbook/addressbook@2x.png)
   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/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/cloudfile/addAccountDialog.css          (mail/cloudfile/addAccountDialog.css)
   skin/classic/messenger/cloudfile/Hightail/settings.css               (mail/cloudfile/Hightail/settings.css)
   skin/classic/messenger/cloudfile/Hightail/fileExceedsLimit.css       (mail/cloudfile/Hightail/fileExceedsLimit.css)
   skin/classic/messenger/cloudfile/Hightail/check.png                  (mail/cloudfile/Hightail/check.png)
   skin/classic/messenger/messengercompose/messengercompose.css    (mail/compose/messengercompose.css)
   skin/classic/messenger/messengercompose/attachmentnotification.png     (mail/compose/attachmentnotification.png)
-  skin/classic/messenger/messengercompose/compose-toolbar.png     (mail/compose/compose-toolbar.png)
-  skin/classic/messenger/messengercompose/compose-toolbar@2x.png  (mail/compose/compose-toolbar@2x.png)
+  skin/classic/messenger/messengercompose/compose-toolbar.svg     (../shared/mail/icons/compose-toolbar.svg)
   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)
   skin/classic/messenger/messengercompose/emoticon_laughing.png   (mail/compose/emoticon_laughing.png)
@@ -171,18 +169,17 @@ classic.jar:
   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/junk-column-header.png            (mail/icons/junk-column-header.png)
-  skin/classic/messenger/icons/mail-toolbar.png                  (mail/icons/mail-toolbar.png)
-  skin/classic/messenger/icons/mail-toolbar@2x.png               (mail/icons/mail-toolbar@2x.png)
+  skin/classic/messenger/icons/mail-toolbar.svg                  (../shared/mail/icons/mail-toolbar.svg)
   skin/classic/messenger/icons/message-mail-attach.png           (mail/icons/message-mail-attach.png)
   skin/classic/messenger/icons/message-mail-imapdelete.png       (mail/icons/message-mail-imapdelete.png)
   skin/classic/messenger/icons/message-mail-new.png              (mail/icons/message-mail-new.png)
   skin/classic/messenger/icons/message-mail.png                  (mail/icons/message-mail.png)
   skin/classic/messenger/icons/message-news-attach-offl.png      (mail/icons/message-news-attach-offl.png)
   skin/classic/messenger/icons/message-news-attach.png           (mail/icons/message-news-attach.png)
   skin/classic/messenger/icons/message-news-new-attach.png       (mail/icons/message-news-new-attach.png)
   skin/classic/messenger/icons/message-news-new.png              (mail/icons/message-news-new.png)
@@ -235,18 +232,17 @@ classic.jar:
   skin/classic/messenger/icons/zoomout-hover.png                 (mail/icons/zoomout-hover.png)
   skin/classic/messenger/icons/timeline.png                      (mail/icons/timeline.png)
   skin/classic/messenger/icons/timeline-inverted.png             (mail/icons/timeline-inverted.png)
   skin/classic/messenger/icons/empty-search-results.png          (mail/icons/empty-search-results.png)
   skin/classic/messenger/icons/QFB-toolbar.png                   (mail/icons/QFB-toolbar.png)
   skin/classic/messenger/icons/QFB-toolbar@2x.png                (mail/icons/QFB-toolbar@2x.png)
   skin/classic/messenger/icons/search-tab.png                    (mail/icons/search-tab.png)
   skin/classic/messenger/icons/search-tab@2x.png                 (mail/icons/search-tab@2x.png)
-  skin/classic/messenger/icons/chat-toolbar.png                  (mail/icons/chat-toolbar.png)
-  skin/classic/messenger/icons/chat-toolbar@2x.png               (mail/icons/chat-toolbar@2x.png)
+  skin/classic/messenger/icons/chat-toolbar.svg                  (../shared/mail/icons/chat-toolbar.svg)
   skin/classic/messenger/icons/status.png                        (mail/icons/status.png)
   skin/classic/messenger/icons/status@2x.png                     (mail/icons/status@2x.png)
   skin/classic/messenger/icons/status-small.png                  (mail/icons/status-small.png)
   skin/classic/messenger/icons/status-small@2x.png               (mail/icons/status-small@2x.png)
   skin/classic/messenger/icons/connecting.png                    (mail/icons/connecting.png)
   skin/classic/messenger/icons/loading.png                       (mail/icons/loading.png)
   skin/classic/messenger/icons/notloading.png                    (mail/icons/notloading.png)
   skin/classic/messenger/icons/loading@2x.png                    (mail/icons/loading@2x.png)
@@ -322,17 +318,16 @@ classic.jar:
   skin/classic/messenger/icons/arrow/arrow-right.png             (mail/icons/arrow/arrow-right.png)
   skin/classic/messenger/icons/arrow/arrow-up.png                (mail/icons/arrow/arrow-up.png)
   skin/classic/messenger/icons/arrow/arrow-down.png              (mail/icons/arrow/arrow-down.png)
   skin/classic/messenger/icons/arrow/arrow-left-dim.png          (mail/icons/arrow/arrow-left-dim.png)
   skin/classic/messenger/icons/arrow/arrow-right-dim.png         (mail/icons/arrow/arrow-right-dim.png)
   skin/classic/messenger/icons/arrow/arrow-up-dim.png            (mail/icons/arrow/arrow-up-dim.png)
   skin/classic/messenger/icons/arrow/arrow-down-dim.png          (mail/icons/arrow/arrow-down-dim.png)
   skin/classic/messenger/tagbg.png                               (mail/tagbg.png)
-  skin/classic/messenger/icons/download.png                      (mail/icons/download.png)
 % skin editor classic/1.0 %skin/classic/editor/
   skin/classic/editor/editor.css                                 (editor/editor.css)
   skin/classic/editor/EditorDialog.css                           (editor/EditorDialog.css)
   skin/classic/editor/icons/img-align-bottom.gif                 (editor/img-align-bottom.gif)
   skin/classic/editor/icons/img-align-left.gif                   (editor/img-align-left.gif)
   skin/classic/editor/icons/img-align-middle.gif                 (editor/img-align-middle.gif)
   skin/classic/editor/icons/img-align-right.gif                  (editor/img-align-right.gif)
   skin/classic/editor/icons/img-align-top.gif                    (editor/img-align-top.gif)
deleted file mode 100644
index 216c51d6434a34ff34fc67758923ba8fdb20befd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 0e5519cf662d7389fed48e6d29b0c201ac7ddc2d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/mail/themes/osx/mail/addrbook/addressbook.css
+++ b/mail/themes/osx/mail/addrbook/addressbook.css
@@ -88,16 +88,21 @@ toolbox[labelalign="end"] toolbarpalette
   margin: 0;
 }
 
 .toolbarbutton-1 {
   margin: 4px 2px;
   margin-bottom: 4px;
 }
 
+.toolbarbutton-1:-moz-lwtheme {
+  color: inherit;
+  text-shadow: inherit;
+}
+
 .toolbarbutton-1[open],
 .toolbarbutton-1[open] > .toolbarbutton-menubutton-button {
   text-shadow: none;
 }
 
 .toolbarbutton-1:not([type="menu-button"]),
 .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   -moz-box-orient: vertical;
@@ -233,135 +238,61 @@ toolbar[mode="icons"] .toolbarbutton-1 >
 }
 
 #ab-toolbox > toolbar {
   /* force iconsize="small" on these toolbars */
   counter-reset: smallicons;
 }
 
 #button-newcard {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
-  -moz-image-region: rect(0px 18px 18px 0px);
-}
-
-#button-newcard:not([disabled="true"]):active {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
-  -moz-image-region: rect(18px 18px 36px 0px);
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newcard");
 }
 
 #button-newlist {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
-  -moz-image-region: rect(0px 36px 18px 18px);
-}
-
-#button-newlist:not([disabled="true"]):active {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
-  -moz-image-region: rect(18px 36px 36px 18px);
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newlist");
 }
 
 #button-editcard {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
-  -moz-image-region: rect(0px 54px 18px 36px);
-}
-
-#button-editcard:not([disabled="true"]):active {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
-  -moz-image-region: rect(18px 54px 36px 36px);
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#editcard");
 }
 
 #button-newmessage {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
-  -moz-image-region: rect(0px 72px 18px 54px);
-}
-
-#button-newmessage:not([disabled="true"]):active {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
-  -moz-image-region: rect(18px 72px 36px 54px);
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newmessage");
 }
 
 #button-newim {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
-  -moz-image-region: rect(0px 90px 18px 72px);
-}
-
-#button-newim:not([disabled="true"]):active {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
-  -moz-image-region: rect(18px 90px 36px 72px);
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newim");
 }
 
 #button-abdelete {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
-  -moz-image-region: rect(0px 108px 18px 90px);
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#abdelete");
 }
 
-#button-abdelete:not([disabled="true"]):active {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
-  -moz-image-region: rect(18px 108px 36px 90px);
+#ab-bar2[brighttext] #button-newcard {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newcard-inverted");
+}
+
+#ab-bar2[brighttext] #button-newlist {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newlist-inverted");
 }
 
-@media (min-resolution: 2dppx) {
-  #button-newcard {
-    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar@2x.png");
-    -moz-image-region: rect(0px 36px 36px 0px);
-  }
-
-  #button-newcard:not([disabled="true"]):active {
-    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar@2x.png");
-    -moz-image-region: rect(36px 36px 72px 0px);
-  }
-
-  #button-newlist {
-    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar@2x.png");
-    -moz-image-region: rect(0px 72px 36px 36px);
-  }
-
-  #button-newlist:not([disabled="true"]):active {
-    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar@2x.png");
-    -moz-image-region: rect(36px 72px 72px 36px);
-  }
-
-  #button-editcard {
-    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar@2x.png");
-    -moz-image-region: rect(0px 108px 36px 72px);
-  }
+#ab-bar2[brighttext] #button-editcard {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#editcard-inverted");
+}
 
-  #button-editcard:not([disabled="true"]):active {
-    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar@2x.png");
-    -moz-image-region: rect(36px 108px 72px 72px);
-  }
-
-  #button-newmessage {
-    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar@2x.png");
-    -moz-image-region: rect(0px 144px 36px 108px);
-  }
-
-  #button-newmessage:not([disabled="true"]):active {
-    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar@2x.png");
-    -moz-image-region: rect(36px 144px 72px 108px);
-  }
+#ab-bar2[brighttext] #button-newmessage {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newmessage-inverted");
+}
 
-  #button-newim {
-    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar@2x.png");
-    -moz-image-region: rect(0px 180px 36px 144px);
-  }
-
-  #button-newim:not([disabled="true"]):active {
-    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar@2x.png");
-    -moz-image-region: rect(36px 180px 72px 144px);
-  }
+#ab-bar2[brighttext] #button-newim {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newim-inverted");
+}
 
-  #button-abdelete {
-    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar@2x.png");
-    -moz-image-region: rect(0px 216px 36px 180px);
-  }
-
-  #button-abdelete:not([disabled="true"]):active {
-    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar@2x.png");
-    -moz-image-region: rect(36px 216px 72px 180px);
-  }
+#ab-bar2[brighttext] #button-abdelete {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#abdelete-inverted");
 }
 
 #abContent {
   color: -moz-DialogText;
   text-shadow: none;
   background-color: -moz-Dialog;
 }
 
--- a/mail/themes/osx/mail/chat.css
+++ b/mail/themes/osx/mail/chat.css
@@ -99,73 +99,37 @@
   margin: 0 !important;
 }
 
 #IMSearchInput:-moz-lwtheme:not([focused="true"]) {
   opacity: .9;
 }
 
 #button-add-buddy {
-  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.png");
-  -moz-image-region: rect(0px 18px 18px 0px);
-}
-
-#button-add-buddy:not([disabled="true"]):active {
-  -moz-image-region: rect(18px 18px 36px 0px);
-}
-
-@media (min-resolution: 2dppx) {
-  #button-add-buddy {
-    list-style-image: url("chrome://messenger/skin/icons/chat-toolbar@2x.png");
-    -moz-image-region: rect(0px 36px 36px 0px);
-  }
-
-  #button-add-buddy:not([disabled="true"]):active {
-    -moz-image-region: rect(36px 36px 72px 0px);
-  }
+  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.svg#add");
 }
 
 #button-join-chat {
-  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.png");
-  -moz-image-region: rect(0px 36px 18px 18px);
-}
-
-#button-join-chat:not([disabled="true"]):active {
-  -moz-image-region: rect(18px 36px 36px 18px);
-}
-
-@media (min-resolution: 2dppx) {
-  #button-join-chat {
-    list-style-image: url("chrome://messenger/skin/icons/chat-toolbar@2x.png");
-    -moz-image-region: rect(0px 72px 36px 36px);
-  }
-
-  #button-join-chat:not([disabled="true"]):active {
-    -moz-image-region: rect(36px 72px 72px 36px);
-  }
+  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.svg#join");
 }
 
 #button-chat-accounts {
-  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.png");
-  -moz-image-region: rect(0px 54px 18px 36px);
+  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.svg#accounts");
 }
 
-#button-chat-accounts:not([disabled="true"]):active {
-  -moz-image-region: rect(18px 54px 36px 36px);
+toolbar[brighttext] #button-add-buddy {
+  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.svg#add-inverted");
 }
 
-@media (min-resolution: 2dppx) {
-  #button-chat-accounts {
-    list-style-image: url("chrome://messenger/skin/icons/chat-toolbar@2x.png");
-    -moz-image-region: rect(0px 108px 36px 72px);
-  }
+toolbar[brighttext] #button-join-chat {
+  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.svg#join-inverted");
+}
 
-  #button-chat-accounts:not([disabled="true"]):active {
-    -moz-image-region: rect(36px 108px 72px 72px);
-  }
+toolbar[brighttext] #button-chat-accounts {
+  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.svg#accounts-inverted");
 }
 
 #statusTypeIcon[status="available"],
 #statusTypeAvailable,
 .statusTypeIcon[status="available"],
 #imStatusAvailable,
 #appmenu_imStatusAvailable,
 richlistitem[state="connected"] .accountStateIcon {
@@ -315,19 +279,20 @@ richlistitem[state="disconnected"] .acco
   .closeConversationButton > .button-image-icon {
     width: 16px;
     height: 16px;
   }
 }
 
 .tabmail-tab[type="chat"],
 .alltabs-item[type="chat"] {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(1px, 395px, 17px, 379px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#chat");
+  -moz-image-region: auto;
 }
 
-@media (min-resolution: 2dppx) {
-  .tabmail-tab[type="chat"],
-  .alltabs-item[type="chat"] {
-    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar@2x.png");
-    -moz-image-region: rect(0px 792px 36px 756px);
-  }
+.tabmail-tab[type="chat"] > .tab-stack > .tab-content > .tab-icon-image {
+  width: 18px;
+  height: 18px;
+  margin-top: 0;
+  -moz-margin-end: 5px;
+  margin-bottom: -1px;
+  -moz-margin-start: -1px;
 }
deleted file mode 100644
index 6e415f67dc48b5ba9afa9cf00bf55bbbaf23397e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 511b3ebcfa7a7117ac012ff4c0a1fe42537d1133..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/mail/themes/osx/mail/compose/messengercompose.css
+++ b/mail/themes/osx/mail/compose/messengercompose.css
@@ -139,16 +139,21 @@ toolbox[labelalign="end"] toolbarpalette
 .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
   margin: 0;
 }
 
 .toolbarbutton-1 {
   margin: 4px 2px;
 }
 
+.toolbarbutton-1:-moz-lwtheme {
+  color: inherit;
+  text-shadow: inherit;
+}
+
 .toolbarbutton-1[open],
 .toolbarbutton-1[open] > .toolbarbutton-menubutton-button {
   text-shadow: none;
 }
 
 .toolbarbutton-1:not([type="menu-button"]),
 .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   -moz-box-orient: vertical;
@@ -293,215 +298,102 @@ toolbar[mode="icons"] .toolbarbutton-1 >
 }
 
 #compose-toolbox > toolbar {
   /* force iconsize="small" on these toolbars */
   counter-reset: smallicons;
 }
 
 #button-send {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png");
-  -moz-image-region: rect(0px 18px 18px 0px);
-}
-
-#button-send:not([disabled="true"]):active {
-  -moz-image-region: rect(18px 18px 36px 0px);
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#send");
 }
 
 #button-contacts {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png");
-  -moz-image-region: rect(0px 36px 18px 18px) !important;
-}
-
-#button-contacts:not([disabled="true"]):active,
-#button-contacts[checked="true"] {
-  -moz-image-region: rect(18px 36px 36px 18px) !important;
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#contacts");
+  -moz-image-region: auto !important;
 }
 
 #spellingButton {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png");
-  -moz-image-region: rect(0px 54px 18px 36px);
-}
-
-#spellingButton:not([disabled="true"]):active {
-  -moz-image-region: rect(18px 54px 36px 36px);
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#spelling");
 }
 
 #button-attach {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png");
-  -moz-image-region: rect(0px 72px 18px 54px);
-}
-
-#button-attach:not([disabled="true"]):active {
-  -moz-image-region: rect(18px 72px 36px 54px);
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#attach");
 }
 
 #button-security {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png") !important;
-  -moz-image-region: rect(0px 90px 18px 72px) !important;
-}
-
-#button-security:not([disabled="true"]):active {
-  -moz-image-region: rect(18px 90px 36px 72px) !important;
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#security");
 }
 
 #button-save {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png");
-  -moz-image-region: rect(0px 108px 18px 90px);
-}
-
-#button-save:not([disabled="true"]):active {
-  -moz-image-region: rect(18px 108px 36px 90px);
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#save");
 }
 
 #quoteButton {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png");
-  -moz-image-region: rect(0px 126px 18px 108px);
-}
-
-#quoteButton:not([disabled="true"]):active {
-  -moz-image-region: rect(18px 126px 36px 108px);
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#quote");
 }
 
 #cut-button {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png");
-  -moz-image-region: rect(0px 144px 18px 126px);
-}
-
-#cut-button:not([disabled="true"]):active {
-  -moz-image-region: rect(18px 144px 36px 126px);
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#cut");
 }
 
 #copy-button {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png");
-  -moz-image-region: rect(0px 162px 18px 144px);
-}
-
-#copy-button:not([disabled="true"]):active {
-  -moz-image-region: rect(18px 162px 36px 144px);
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#copy");
 }
 
 #paste-button {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png");
-  -moz-image-region: rect(0px 180px 18px 162px);
-}
-
-#paste-button:not([disabled="true"]):active {
-  -moz-image-region: rect(18px 180px 36px 162px);
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#paste");
 }
 
 #button-print {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png");
-  -moz-image-region: rect(0px 198px 18px 180px);
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#print");
+}
+
+toolbar[brighttext] #button-send {
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#send-inverted");
+}
+
+toolbar[brighttext] #button-contacts {
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#contacts-inverted");
 }
 
-#button-print:not([disabled="true"]):active {
-  -moz-image-region: rect(18px 198px 36px 180px);
+toolbar[brighttext] #spellingButton {
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#spelling-inverted");
+}
+
+toolbar[brighttext] #button-attach {
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#attach-inverted");
+}
+
+toolbar[brighttext] #button-security {
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#security-inverted");
 }
 
-@media (min-resolution: 2dppx) {
-  #button-send {
-    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar@2x.png");
-    -moz-image-region: rect(0px 36px 36px 0px);
-  }
-
-  #button-send:not([disabled="true"]):active {
-    -moz-image-region: rect(36px 36px 72px 0px);
-  }
-
-  #button-contacts {
-    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar@2x.png");
-    -moz-image-region: rect(0px 72px 36px 36px) !important;
-  }
-
-  #button-contacts:not([disabled="true"]):active,
-  #button-contacts[checked="true"] {
-    -moz-image-region: rect(36px 72px 72px 36px) !important;
-  }
+toolbar[brighttext] #button-save {
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#save-inverted");
+}
 
-  #spellingButton {
-    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar@2x.png");
-    -moz-image-region: rect(0px 108px 36px 72px);
-  }
-
-  #spellingButton:not([disabled="true"]):active {
-    -moz-image-region: rect(36px 108px 72px 72px);
-  }
-
-  #button-attach {
-    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar@2x.png");
-    -moz-image-region: rect(0px 144px 36px 108px);
-  }
-
-  #button-attach:not([disabled="true"]):active {
-    -moz-image-region: rect(36px 144px 72px 108px);
-  }
-
-  #button-security {
-    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar@2x.png") !important;
-    -moz-image-region: rect(0px 180px 36px 144px) !important;
-  }
-
-  #button-security:not([disabled="true"]):active {
-    -moz-image-region: rect(36px 180px 72px 144px) !important;
-  }
+toolbar[brighttext] #quoteButton {
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#quote-inverted");
+}
 
-  #button-save {
-    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar@2x.png");
-    -moz-image-region: rect(0px 216px 36px 180px);
-  }
-
-  #button-save:not([disabled="true"]):active {
-    -moz-image-region: rect(36px 216px 72px 180px);
-  }
-
-  #quoteButton {
-    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar@2x.png");
-    -moz-image-region: rect(0px 252px 36px 216px);
-  }
-
-  #quoteButton:not([disabled="true"]):active {
-    -moz-image-region: rect(36px 252px 72px 216px);
-  }
-
-  #cut-button {
-    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar@2x.png");
-    -moz-image-region: rect(0px 288px 36px 252px);
-  }
-
-  #cut-button:not([disabled="true"]):active {
-    -moz-image-region: rect(36px 288px 72px 252px);
-  }
+toolbar[brighttext] #cut-button {
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#cut-inverted");
+}
 
-  #copy-button {
-    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar@2x.png");
-    -moz-image-region: rect(0px 324px 36px 288px);
-  }
-
-  #copy-button:not([disabled="true"]):active {
-    -moz-image-region: rect(36px 324px 72px 288px);
-  }
+toolbar[brighttext] #copy-button {
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#copy-inverted");
+}
 
-  #paste-button {
-    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar@2x.png");
-    -moz-image-region: rect(0px 360px 36px 324px);
-  }
-
-  #paste-button:not([disabled="true"]):active {
-    -moz-image-region: rect(36px 360px 72px 324px);
-  }
+toolbar[brighttext] #paste-button {
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#paste-inverted");
+}
 
-  #button-print {
-    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar@2x.png");
-    -moz-image-region: rect(0px 396px 36px 360px);
-  }
-
-  #button-print:not([disabled="true"]):active {
-    -moz-image-region: rect(36px 396px 72px 360px);
-  }
+toolbar[brighttext] #button-print {
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#print-inverted");
 }
 
 /* ::::: special toolbar colors ::::: */
 
 #composeContentBox {
   box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.6) inset;
   background-color: rgb(242, 242, 242);
 
deleted file mode 100644
index ab1b74e4ba66f8daf91f248e7d8eac4fe90d0b38..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index e60d396574335b03f6663fd8b8b26bca965eca56..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index c53394657559cbca2d976cddc07d48938e5845d5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 6c36a9aeab8110e76de545e4ad32e0908b8f3323..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index b5b5f7544af3d4ea6a11d16e3a210d0ae39b1829..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/mail/themes/osx/mail/mailWindow1.css
+++ b/mail/themes/osx/mail/mailWindow1.css
@@ -40,17 +40,21 @@ treechildren::-moz-tree-twisty {
   margin-bottom: 0px !important;
   -moz-margin-start: 0px !important;
   -moz-margin-end: -4px !important;
 }
 
 /* :::::::::::::::::::::::::::::::::::: */
 
 #tabmail:-moz-lwtheme {
-  color: -moz-DialogText;
+  text-shadow: inherit;
+}
+
+#messengerBox:-moz-lwtheme {
+  text-shadow: none;
 }
 
 #folderPaneBox {
   -moz-border-end: 1px solid #BDBDBD;
   -moz-margin-end: -3px !important;
 }
 
 #folderTree {
--- a/mail/themes/osx/mail/messageHeader.css
+++ b/mail/themes/osx/mail/messageHeader.css
@@ -72,28 +72,16 @@
 }
 
 #attachmentSize {
   margin: 0;
   -moz-margin-start: 8px;
   color: #888a85; /* the same color as .headerName */
 }
 
-#attachmentSaveAllSingle,
-#attachmentSaveAllMultiple {
-  list-style-image: url("chrome://messenger/skin/icons/download.png");
-  -moz-image-region: rect(0px 18px 18px 0px);
-}
-
-#attachmentSaveAllSingle:not([disabled="true"]):active,
-#attachmentSaveAllMultiple:not([disabled="true"]):active {
-  list-style-image: url("chrome://messenger/skin/icons/download.png");
-  -moz-image-region: rect(18px 18px 36px 0px);
-}
-
 #attachmentSaveAllSingle > .toolbarbutton-menubutton-button,
 #attachmentSaveAllMultiple > .toolbarbutton-menubutton-button {
   /* Make sure that the icon is vertically centered */
   padding-bottom: 0px !important;
 }
 
 #attachmentView {
   border-top: 1px solid ThreeDShadow;
@@ -231,54 +219,91 @@ attachmentlist:focus >attachmentitem[sel
 toolbar[mode="text"] .msgHeaderView-button .toolbarbutton-text {
   -moz-margin-start: 2px;
   -moz-margin-end: 2px;
 }
 
 .hdrReplyToSenderButton,
 .hdrDummyReplyButton,
 .hdrReplyButton {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 72px 18px 54px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#reply");
+}
+
+.hdrReplyAllButton {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replyall");
 }
 
 .hdrReplyListButton,
 .hdrFollowupButton {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 126px 18px 108px);
-}
-
-.hdrReplyAllButton {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 90px 18px 72px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replylist");
 }
 
 .hdrForwardButton {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 108px 18px 90px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#forward");
 }
 
 .hdrArchiveButton {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 360px 18px 342px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#archive");
 }
 
 .hdrJunkButton {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 162px 18px 144px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#junk");
 }
 
 .hdrTrashButton {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 144px 18px 126px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#delete");
 }
 
 .hdrTagButton {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 288px 18px 270px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#tag");
+}
+
+#attachmentSaveAllSingle,
+#attachmentSaveAllMultiple {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#file");
+}
+
+toolbar[brighttext] .hdrReplyToSenderButton,
+toolbar[brighttext] .hdrDummyReplyButton,
+toolbar[brighttext] .hdrReplyButton {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#reply-inverted");
+}
+
+toolbar[brighttext] .hdrReplyAllButton {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replyall-inverted");
+}
+
+toolbar[brighttext] .hdrReplyListButton,
+toolbar[brighttext] .hdrFollowupButton {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replylist-inverted");
+}
+
+toolbar[brighttext] .hdrForwardButton {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#forward-inverted");
+}
+
+toolbar[brighttext] .hdrArchiveButton {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#archive-inverted");
+}
+
+toolbar[brighttext] .hdrJunkButton {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#junk-inverted");
+}
+
+toolbar[brighttext] .hdrTrashButton {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#delete-inverted");
+}
+
+toolbar[brighttext] .hdrTagButton {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#tag-inverted");
+}
+
+toolbar[brighttext] #attachmentSaveAllSingle,
+toolbar[brighttext] #attachmentSaveAllMultiple {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#file-inverted");
 }
 
 #otherActionsButton > .toolbarbutton-icon {
   display: none;
 }
 
 toolbar[mode="icons"] > #otherActionsButton > .toolbarbutton-menu-dropmarker >
   .dropmarker-icon {
@@ -290,73 +315,16 @@ toolbar[mode="icons"] > #otherActionsBut
   .toolbarbutton-icon {
   display: -moz-box;
   width: 7px;
   padding-top: 5px;
   padding-bottom: 5px;
   list-style-image: url(chrome://messenger/skin/icons/toolbarbutton-dropmarker-lion.png);
 }
 
-@media (min-resolution: 2dppx) {
-  .hdrReplyToSenderButton,
-  .hdrDummyReplyButton,
-  .hdrReplyButton {
-    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar@2x.png");
-    -moz-image-region: rect(0px 144px 36px 108px);
-  }
-
-  .hdrReplyListButton,
-  .hdrFollowupButton {
-    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar@2x.png");
-    -moz-image-region: rect(0px 252px 36px 216px);
-  }
-
-  .hdrReplyAllButton {
-    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar@2x.png");
-    -moz-image-region: rect(0px 180px 36px 144px);
-  }
-
-  .hdrForwardButton {
-    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar@2x.png");
-    -moz-image-region: rect(0px 216px 36px 180px);
-  }
-
-  .hdrArchiveButton {
-    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar@2x.png");
-    -moz-image-region: rect(0px 720px 36px 684px);
-  }
-
-  .hdrJunkButton {
-    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar@2x.png");
-    -moz-image-region: rect(0px 324px 36px 288px);
-  }
-
-  .hdrTrashButton {
-    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar@2x.png");
-    -moz-image-region: rect(0px 288px 36px 252px);
-  }
-
-  .hdrTagButton {
-    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar@2x.png");
-    -moz-image-region: rect(0px 576px 36px 540px);
-  }
-
-  #attachmentSaveAllSingle,
-  #attachmentSaveAllMultiple {
-    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar@2x.png");
-    -moz-image-region: rect(0px 432px 36px 396px);
-  }
-
-  #attachmentSaveAllSingle:not([disabled="true"]):active,
-  #attachmentSaveAllMultiple:not([disabled="true"]):active {
-    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar@2x.png");
-    -moz-image-region: rect(36px 432px 72px 396px);
-  }
-}
-
 .inline-toolbox[doCustomization] .inline-toolbar {
   min-width: 100px;
   min-height: 10px;
 }
 
 .inline-toolbar {
   -moz-box-pack: end;
   min-width: 50px !important;
--- a/mail/themes/osx/mail/primaryToolbar.css
+++ b/mail/themes/osx/mail/primaryToolbar.css
@@ -151,16 +151,21 @@ toolbox[labelalign="end"] toolbarpalette
 .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
   margin: 0;
 }
 
 .toolbarbutton-1 {
   margin: 4px 2px;
 }
 
+.toolbarbutton-1:-moz-lwtheme {
+  color: inherit;
+  text-shadow: inherit;
+}
+
 .toolbarbutton-1[open],
 .toolbarbutton-1[open] > .toolbarbutton-menubutton-button {
   text-shadow: none;
 }
 
 .toolbarbutton-1:not([type="menu-button"]),
 .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   -moz-box-orient: vertical;
@@ -295,501 +300,245 @@ toolbar[mode="icons"] .toolbarbutton-1 >
 }
 
 /* remove the small icons checkbox in Customize window */
 #smallicons {
   display: none;
 }
 
 #button-getmsg {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 18px 18px 0px);
-}
-
-#button-getmsg:not([disabled="true"]):active {
-  -moz-image-region: rect(18px 18px 36px 0px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#getmsg");
 }
 
 #button-newmsg {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 36px 18px 18px);
-}
-
-#button-newmsg:not([disabled="true"]):active {
-  -moz-image-region: rect(18px 36px 36px 18px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#newmsg");
 }
 
 #button-address {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 54px 18px 36px);
-}
-
-#button-address:not([disabled="true"]):active {
-  -moz-image-region: rect(18px 54px 36px 36px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#address");
 }
 
 #button-reply {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 72px 18px 54px);
-}
-
-#button-reply:not([disabled="true"]):active {
-  -moz-image-region: rect(18px 72px 36px 54px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#reply");
 }
 
 #button-replyall {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 90px 18px 72px);
-}
-
-#button-replyall:not([disabled="true"]):active {
-  -moz-image-region: rect(18px 90px 36px 72px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replyall");
 }
 
 #button-replylist {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 126px 18px 108px);
-}
-
-#button-replylist:not([disabled="true"]):active {
-  -moz-image-region: rect(18px 126px 36px 108px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replylist");
 }
 
 #button-forward {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 108px 18px 90px);
-}
-
-#button-forward:not([disabled="true"]):active {
-  -moz-image-region: rect(18px 108px 36px 90px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#forward");
 }
 
 .delete-button {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 144px 18px 126px);
-}
-
-.delete-button:not([disabled="true"]):active {
-  -moz-image-region: rect(18px 144px 36px 126px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#delete");
 }
 
 .junk-button {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 162px 18px 144px);
-}
-
-.junk-button:not([disabled="true"]):active {
-  -moz-image-region: rect(18px 162px 36px 144px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#junk");
 }
 
 #button-print {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 180px 18px 162px);
-}
-
-#button-print:not([disabled="true"]):active {
-  -moz-image-region: rect(18px 180px 36px 162px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#print");
 }
 
 #button-stop {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 198px 18px 180px);
-}
-
-#button-stop:not([disabled="true"]):active {
-  -moz-image-region: rect(18px 198px 36px 180px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#stop");
 }
 
 #button-file {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 216px 18px 198px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#file");
+}
+
+#button-nextUnread {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#nextUnread");
+}
+
+#button-previousUnread {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#previousUnread");
+}
+
+#button-mark {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#mark");
+}
+
+#button-tag {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#tag");
+}
+
+#button-goback {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#goback");
+}
+
+#button-goforward {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#goforward");
+}
+
+#button-compact {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#compact");
+}
+
+#button-archive {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#archive");
+}
+
+#button-chat {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#chat");
+}
+
+#button-nextMsg {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#nextMsg");
+}
+
+#button-previousMsg {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#previousMsg");
+}
+
+#qfb-show-filter-bar {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#filter");
+}
+
+.button-appmenu {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#appButton");
+}
+
+toolbar[brighttext] #button-getmsg {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#getmsg-inverted");
+}
+
+toolbar[brighttext] #button-newmsg {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#newmsg-inverted");
+}
+
+toolbar[brighttext] #button-address {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#address-inverted");
+}
+
+toolbar[brighttext] #button-reply {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#reply-inverted");
+}
+
+toolbar[brighttext] #button-replyall {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replyall-inverted");
+}
+
+toolbar[brighttext] #button-replylist {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replylist-inverted");
 }
 
-#button-file:not([disabled="true"]):active {
-  -moz-image-region: rect(18px 216px 36px 198px);
+toolbar[brighttext] #button-forward {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#forward-inverted");
+}
+
+toolbar[brighttext] .delete-button {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#delete-inverted");
+}
+
+toolbar[brighttext] .junk-button {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#junk-inverted");
+}
+
+toolbar[brighttext] #button-print {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#print-inverted");
+}
+
+toolbar[brighttext] #button-stop {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#stop-inverted");
+}
+
+toolbar[brighttext] #button-file {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#file-inverted");
+}
+
+toolbar[brighttext] #button-next > #button-nextUnread {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#nextUnread-inverted");
+}
+
+toolbar[brighttext] #button-previous > #button-previousUnread {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#previousUnread-inverted");
+}
+
+toolbar[brighttext] #button-mark {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#mark-inverted");
+}
+
+toolbar[brighttext] #button-tag {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#tag-inverted");
+}
+
+toolbar[brighttext] #button-goback {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#goback-inverted");
+}
+
+toolbar[brighttext] #button-goforward {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#goforward-inverted");
+}
+
+toolbar[brighttext] #button-compact {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#compact-inverted");
+}
+
+toolbar[brighttext] #button-archive {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#archive-inverted");
+}
+
+toolbar[brighttext] #button-chat {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#chat-inverted");
+}
+
+toolbar[brighttext] #button-nextMsg {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#nextMsg-inverted");
+}
+
+toolbar[brighttext] #button-previousMsg {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#previousMsg-inverted");
+}
+
+toolbar[brighttext] #qfb-show-filter-bar {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#filter-inverted");
+}
+
+toolbar[brighttext] .button-appmenu {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#appButton-inverted");
+}
+
+toolbar > #button-chat[unreadMessages="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#chat-unread");
+  color: #0969b2;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.4);
 }
 
 #button-file > dropmarker {
   display: none;
 }
 
-#button-nextUnread {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 234px 18px 216px);
-}
-
-#button-nextUnread:not([disabled="true"]):active {
-  -moz-image-region: rect(18px 234px 36px 216px);
-}
-
-#button-previousUnread {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 252px 18px 234px);
-}
-
-#button-previousUnread:not([disabled="true"]):active {
-  -moz-image-region: rect(18px 252px 36px 234px);
-}
-
-#button-mark {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 270px 18px 252px);
-}
-
-#button-mark:not([disabled="true"]):active {
-  -moz-image-region: rect(18px 270px 36px 252px);
-}
-
-#button-tag {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 288px 18px 270px);
-}
-
-#button-tag:not([disabled="true"]):active {
-  -moz-image-region: rect(18px 288px 36px 270px);
-}
-
-#button-goback {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 306px 18px 288px);
-}
-
-#button-goback:not([disabled="true"]):active {
-  -moz-image-region: rect(18px 306px 36px 288px);
-}
-
-#button-goforward {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 324px 18px 306px);
-}
-
-#button-goforward:not([disabled="true"]):active {
-  -moz-image-region: rect(18px 324px 36px 306px);
-}
-
-#button-compact {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 342px 18px 324px);
-}
-
-#button-compact:not([disabled="true"]):active {
-  -moz-image-region: rect(18px 342px 36px 324px);
-}
-
-#button-archive {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 360px 18px 342px);
-}
-
-#button-archive:not([disabled="true"]):active {
-  -moz-image-region: rect(18px 360px 36px 342px);
-}
-
-#button-chat {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px, 396px, 18px, 378px);
-}
-
-#button-chat:not([disabled="true"]):active {
-  -moz-image-region: rect(18px, 396px, 36px, 378px);
-}
-
-#button-chat[unreadMessages="true"] {
-  -moz-image-region: rect(36px, 396px, 54px, 378px);
-  color: #0969b2;
-  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.4);
-}
-
 #button-chat > stack > .badgeButton-badge {
   -moz-padding-end: 1px;
 }
 
 toolbar:not([mode="text"]) .badgeButton-badge {
   -moz-margin-start: 11px;
   margin-bottom: 12px;
 }
 
-#button-nextMsg {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px, 414px, 18px, 396px);
-}
-
-#button-nextMsg:not([disabled="true"]):active {
-  -moz-image-region: rect(18px, 414px, 36px, 396px);
-}
-
-#button-previousMsg {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px, 432px, 18px, 414px);
-}
-
-#button-previousMsg:not([disabled="true"]):active {
-  -moz-image-region: rect(18px, 432px, 36px, 414px);
-}
-
-.button-appmenu {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px, 450px, 18px, 432px);
-}
-
-.button-appmenu:not([disabled="true"]):active,
-.button-appmenu[open="true"] {
-  -moz-image-region: rect(18px, 450px, 36px, 432px);
-}
-
-@media (min-resolution: 2dppx) {
-  #button-getmsg {
-    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar@2x.png");
-    -moz-image-region: rect(0px 36px 36px 0px);
-  }
-
-  #button-getmsg:not([disabled="true"]):active {
-    -moz-image-region: rect(36px 36px 72px 0px);
-  }
-
-  #button-newmsg {
-    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar@2x.png");
-    -moz-image-region: rect(0px 72px 36px 36px);
-  }
-
-  #button-newmsg:not([disabled="true"]):active {
-    -moz-image-region: rect(36px 72px 72px 36px);
-  }
-
-  #button-address {
-    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar@2x.png");
-    -moz-image-region: rect(0px 108px 36px 72px);
-  }
-
-  #button-address:not([disabled="true"]):active {
-    -moz-image-region: rect(36px 108px 72px 72px);
-  }
-
-  #button-reply {
-    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar@2x.png");
-    -moz-image-region: rect(0px 144px 36px 108px);
-  }
-
-  #button-reply:not([disabled="true"]):active {
-    -moz-image-region: rect(36px 144px 72px 108px);
-  }
-
-  #button-replyall {
-    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar@2x.png");
-    -moz-image-region: rect(0px 180px 36px 144px);
-  }
-
-  #button-replyall:not([disabled="true"]):active {
-    -moz-image-region: rect(36px 180px 72px 144px);
-  }
-
-  #button-replylist {
-    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar@2x.png");
-    -moz-image-region: rect(0px 252px 36px 216px);
-  }
-
-  #button-replylist:not([disabled="true"]):active {
-    -moz-image-region: rect(36px 252px 72px 216px);
-  }
-
-  #button-forward {
-    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar@2x.png");
-    -moz-image-region: rect(0px 216px 36px 180px);
-  }
-
-  #button-forward:not([disabled="true"]):active {
-    -moz-image-region: rect(36px 216px 72px 180px);
-  }
-
-  .delete-button {
-    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar@2x.png");
-    -moz-image-region: rect(0px 288px 36px 252px);
-  }
-
-  .delete-button:not([disabled="true"]):active {
-    -moz-image-region: rect(36px 288px 72px 252px);
-  }
-
-  .junk-button {
-    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar@2x.png");
-    -moz-image-region: rect(0px 324px 36px 288px);
-  }
-
-  .junk-button:not([disabled="true"]):active {
-    -moz-image-region: rect(36px 324px 72px 288px);
-  }
-
-  #button-print {
-    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar@2x.png");
-    -moz-image-region: rect(0px 360px 36px 324px);
-  }
-
-  #button-print:not([disabled="true"]):active {
-    -moz-image-region: rect(36px 360px 72px 324px);
-  }
-
-  #button-stop {
-    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar@2x.png");
-    -moz-image-region: rect(0px 396px 36px 360px);
-  }
-
-  #button-stop:not([disabled="true"]):active {
-    -moz-image-region: rect(36px 396px 72px 360px);
-  }
-
-  #button-file {
-    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar@2x.png");
-    -moz-image-region: rect(0px 432px 36px 396px);
-  }
-
-  #button-file:not([disabled="true"]):active {
-    -moz-image-region: rect(36px 432px 72px 396px);
-  }
-
-  #button-nextUnread {
-    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar@2x.png");
-    -moz-image-region: rect(0px 468px 36px 432px);
-  }
-
-  #button-nextUnread:not([disabled="true"]):active {
-    -moz-image-region: rect(36px 468px 72px 432px);
-  }
-
-  #button-previousUnread {
-    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar@2x.png");
-    -moz-image-region: rect(0px 504px 36px 468px);
-  }
-
-  #button-previousUnread:not([disabled="true"]):active {
-    -moz-image-region: rect(36px 504px 72px 468px);
-  }
-
-  #button-mark {
-    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar@2x.png");
-    -moz-image-region: rect(0px 540px 36px 504px);
-  }
-
-  #button-mark:not([disabled="true"]):active {
-    -moz-image-region: rect(36px 540px 72px 504px);
-  }
-
-  #button-tag {
-    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar@2x.png");
-    -moz-image-region: rect(0px 576px 36px 540px);
-  }
-
-  #button-tag:not([disabled="true"]):active {
-    -moz-image-region: rect(36px 576px 72px 540px);
-  }
-
-  #button-goback {
-    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar@2x.png");
-    -moz-image-region: rect(0px 612px 36px 576px);
-  }
-
-  #button-goback:not([disabled="true"]):active {
-    -moz-image-region: rect(36px 612px 72px 576px);
-  }
-
-  #button-goforward {
-    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar@2x.png");
-    -moz-image-region: rect(0px 648px 36px 612px);
-  }
-
-  #button-goforward:not([disabled="true"]):active {
-    -moz-image-region: rect(36px 648px 72px 612px);
-  }
-
-  #button-compact {
-    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar@2x.png");
-    -moz-image-region: rect(0px 684px 36px 648px);
-  }
-
-  #button-compact:not([disabled="true"]):active {
-    -moz-image-region: rect(36px 684px 72px 648px);
-  }
-
-  #button-archive {
-    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar@2x.png");
-    -moz-image-region: rect(0px 720px 36px 684px);
-  }
-
-  #button-archive:not([disabled="true"]):active {
-    -moz-image-region: rect(36px 720px 72px 684px);
-  }
-
-  #button-chat {
-    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar@2x.png");
-    -moz-image-region: rect(0px 792px 36px 756px);
-  }
-
-  #button-chat:not([disabled="true"]):active {
-    -moz-image-region: rect(36px 792px 72px 756px);
-  }
-
-  #button-chat[unreadMessages="true"] {
-    -moz-image-region: rect(72px 792px 108px 756px);
-  }
-
-  #button-nextMsg {
-    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar@2x.png");
-    -moz-image-region: rect(0px 828px 36px 792px);
-  }
-
-  #button-nextMsg:not([disabled="true"]):active {
-    -moz-image-region: rect(36px 828px 72px 792px);
-  }
-
-  #button-previousMsg {
-    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar@2x.png");
-    -moz-image-region: rect(0px 864px 36px 828px);
-  }
-
-  #button-previousMsg:not([disabled="true"]):active {
-    -moz-image-region: rect(36px 864px 72px 828px);
-  }
-
-  .button-appmenu {
-    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar@2x.png");
-    -moz-image-region: rect(0px 900px 36px 864px);
-  }
-
-  .button-appmenu:not([disabled="true"]):active,
-  .button-appmenu[open="true"] {
-    -moz-image-region: rect(36px 900px 72px 864px);
-  }
-}
-
 .button-appmenu .toolbarbutton-text,
 .button-appmenu .toolbarbutton-menu-dropmarker {
   display: none;
 }
 
 toolbar[mode="text"] .button-appmenu .toolbarbutton-icon {
   display: -moz-box;
 }
 
 #palette-box #qfb-show-filter-bar {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 378px 18px 360px);
-}
-
-#palette-box #qfb-show-filter-bar:not([disabled="true"]):active {
-  -moz-image-region: rect(18px 378px 36px 360px);
-}
-
-@media (min-resolution: 2dppx) {
-  #palette-box #qfb-show-filter-bar {
-    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar@2x.png");
-    -moz-image-region: rect(0px 756px 36px 720px);
-  }
-
-  #palette-box #qfb-show-filter-bar:not([disabled="true"]):active {
-    -moz-image-region: rect(36px 756px 72px 720px);
-  }
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#filter");
 }
 
 /* Force the folder location and mail view items to fit in the available width
    in the Customize Toolbar dialog. */
 #palette-box #locationFolders,
 #palette-box #folder-location-container,
 #palette-box #viewPicker {
   -moz-box-flex: 1;
--- a/mail/themes/osx/mail/quickFilterBar.css
+++ b/mail/themes/osx/mail/quickFilterBar.css
@@ -1,38 +1,14 @@
 /* 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/. */
 
 @import url("chrome://messenger/content/quickFilterBar.css");
 
-/* :::: Filter Tab Bar Button :::: */
-
-#qfb-show-filter-bar {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 378px 18px 360px);
-}
-
-#qfb-show-filter-bar:not([disabled="true"]):active,
-#qfb-show-filter-bar[checked="true"] {
-  -moz-image-region: rect(18px 378px 36px 360px);
-}
-
-@media (min-resolution: 2dppx) {
-  #qfb-show-filter-bar {
-    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar@2x.png");
-    -moz-image-region: rect(0px 756px 36px 720px);
-  }
-
-  #qfb-show-filter-bar:not([disabled="true"]):active,
-  #qfb-show-filter-bar[checked="true"] {
-    -moz-image-region: rect(36px 756px 72px 720px);
-  }
-}
-
 /* :::: Filter Bar :::: */
 
 #quick-filter-bar {
   height: 25px;
 }
 
 #quick-filter-bar-main-bar {
   background: linear-gradient(#f3f3f3, #ebebeb);
--- a/mail/themes/osx/mail/smime/msgCompSMIMEOverlay.css
+++ b/mail/themes/osx/mail/smime/msgCompSMIMEOverlay.css
@@ -3,44 +3,16 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== msgCompSMIMEOverlay.css ========================================
   == Styles for the S/Mime in composer window.
   ======================================================================= */
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-#button-security {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png");
-  -moz-image-region: rect(0px 160px 32px 128px);
-}
-
-#button-security:hover:active,
-#button-security[open="true"] {
-  -moz-image-region: rect(32px 160px 64px 128px);
-}
-
-#button-security[disabled] {
-  -moz-image-region: rect(64px 160px 96px 128px) !important;
-}
-
-toolbar[iconsize="small"] #button-security {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar-small.png");
-  -moz-image-region: rect(0px 120px 24px 96px);
-}
-
-toolbar[iconsize="small"] #button-security:hover:active,
-toolbar[iconsize="small"] #button-security[open="true"] {
-  -moz-image-region: rect(24px 120px 48px 96px);
-}
-
-toolbar[iconsize="small"] #button-security[disabled] {
-  -moz-image-region: rect(48px 120px 72px 96px) !important;
-}
-
 #msgcomposeWindow #signing-status {
   list-style-image: none;
   visibility: collapse;
 }
 
 #msgcomposeWindow[signing="ok"] #signing-status {
   list-style-image: url("chrome://messenger/skin/smime/icons/sbSignOk.png");
   visibility: visible;
new file mode 100644
--- /dev/null
+++ b/mail/themes/shared/mail/icons/addressbook-toolbar.svg
@@ -0,0 +1,115 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     viewBox="0 0 18 18">
+  <style>
+    path {
+      display: none;
+    }
+    path:target {
+      display: block;
+      stroke-width: 1;
+    }
+    .normal {
+      fill: #505050;
+      fill-opacity: 0.8;
+      stroke: #404040;
+    }
+    @media (-moz-windows-default-theme) and (-moz-os-version: windows-win8) {
+      .normal {
+        fill: #797c80;
+      fill-opacity: 1;
+        stroke: #797c80;
+      }
+    }
+    @media (-moz-windows-default-theme) and (-moz-os-version: windows-win10) {
+      .normal {
+        fill: #616161;
+      fill-opacity: 1;
+        stroke: #616161;
+      }
+    }
+    @media (-moz-windows-default-theme) and (-moz-os-version: windows-vista),
+       (-moz-windows-default-theme) and (-moz-os-version: windows-win7) {
+      .normal {
+        fill: url(#win1);
+      fill-opacity: 1;
+        stroke: url(#win2);
+      }
+    }
+    @media (-moz-mac-lion-theme) {
+      .normal {
+        fill: url(#osx1);
+      fill-opacity: 1;
+        stroke: url(#osx2);
+      }
+    }
+    @media (-moz-mac-yosemite-theme) {
+      .normal {
+        fill: #4d4d4d;
+      fill-opacity: 1;
+        stroke: #4d4d4d;
+      }
+    }
+    .inverted {
+      fill: #fff;
+      fill-opacity: 1;
+      stroke: #111922;
+    }
+  </style>
+  <defs>
+    <linearGradient
+       id="win1"
+       x1="8"
+       y1="1"
+       x2="8"
+       y2="15"
+       gradientUnits="userSpaceOnUse">
+       <stop stop-color="#3f4f5a" offset="0"/>
+       <stop stop-color="#7e8c97" offset="1"/>
+    </linearGradient>
+    <linearGradient
+       id="win2"
+       x1="8"
+       y1="1"
+       x2="8"
+       y2="15"
+       gradientUnits="userSpaceOnUse">
+      <stop stop-color="#0c1b25" offset="0"/>
+      <stop stop-color="#4f585f" stop-opacity="0.9" offset="1"/>
+    </linearGradient>
+    <linearGradient
+       id="osx1"
+       x1="8"
+       y1="1"
+       x2="8"
+       y2="15"
+       gradientUnits="userSpaceOnUse">
+       <stop stop-color="#4f4f4f" stop-opacity="0.76" offset="0"/>
+       <stop stop-color="#717171" stop-opacity="0.6" offset="1"/>
+    </linearGradient>
+    <linearGradient
+       id="osx2"
+       x1="8"
+       y1="1"
+       x2="8"
+       y2="15"
+       gradientUnits="userSpaceOnUse">
+      <stop stop-color="#252525" stop-opacity="0.88" offset="0"/>
+      <stop stop-color="#505050" stop-opacity="0.68" offset="1"/>
+    </linearGradient>
+  </defs>
+  <path id="newcard" class="normal" d="M 9,2 C 7.8,2 6.28,2.4 5.5,3 4.5,3.7 4.6,6.1 4.5,6.5 4.3,6.8 4,7.1 4,7.5 c 0,0.3 0.4,0.6 0.5,1 0.2,1.5 1,1.8 3,3 l 0,1 c -2.4,0.1 -5.7,-0.6 -6,3 l 15,0 c -0.3,-3.5 -3.6,-3 -6,-3 l 0,-1 c 2,-1.1 2.7,-1.6 3,-3 C 13.5,8.2 14,7.9 14,7.5 14,7.1 13.6,6.8 13.5,6.5 13.3,6.1 13.4,3.7 12.5,3 11.7,2.4 10,2 9,2 Z m -1.5,1.5 3,0 0,2 2,0 0,3 -2,0 0,2 -3,0 0,-2 -2,0 0,-3 2,0 z"/>
+  <path id="newcard-inverted" class="inverted" d="M 9,2 C 7.8,2 6.28,2.4 5.5,3 4.5,3.7 4.6,6.1 4.5,6.5 4.3,6.8 4,7.1 4,7.5 c 0,0.3 0.4,0.6 0.5,1 0.2,1.5 1,1.8 3,3 l 0,1 c -2.4,0.1 -5.7,-0.6 -6,3 l 15,0 c -0.3,-3.5 -3.6,-3 -6,-3 l 0,-1 c 2,-1.1 2.7,-1.6 3,-3 C 13.5,8.2 14,7.9 14,7.5 14,7.1 13.6,6.8 13.5,6.5 13.3,6.1 13.4,3.7 12.5,3 11.7,2.4 10,2 9,2 Z m -0.5,2.5 1,0 0,2 2,0 0,1 -2,0 0,2 -1,0 0,-2 -2,0 0,-1 2,0 z"/>
+  <path id="newlist" class="normal" d="M 11,3 C 9.8,3 8.2,3.4 7.5,4 6.5,4.7 6.6,7.1 6.5,7.5 6.3,7.8 6,8.1 6,8.5 c 0,0.3 0.4,0.6 0.5,1 0.2,1.5 1,1.8 3,3 l 0,1 c -2.3,0 -4,-0.2 -4,2 l 11,0 c 0,-2.1 -1.7,-2 -4,-2 l 0,-1 c 2,-1.1 2.7,-1.6 3,-3 C 15.5,9.2 16,8.9 16,8.5 16,8.1 15.6,7.8 15.5,7.5 15.3,7.1 15.4,4.7 14.5,4 13.7,3.4 12,3 11,3 Z m -1.5,1.5 3,0 0,2 2,0 0,3 -2,0 0,2 -3,0 0,-2 -2,0 0,-3 2,0 z
+    M 7,2 C 5.8,2 4.3,2.4 3.5,3 2.5,3.7 2.6,5.1 2.5,5.5 2.3,5.8 2,6.1 2,6.5 2,6.8 2.3,7.1 2.5,7.5 3,9.6 2.8,11 5,11.4 2.4,11.4 1.5,11.3 1.5,13.5 l 2.5,0 C 4.5,12.5 4.4,11.6 5,11.4 4.4,10.7 4.5,9.2 4,8.5 4,8 4.6,7 4.5,6.5 4.7,4.6 5,2.4 7,2 Z"/>
+  <path id="newlist-inverted" class="inverted" d="M 11,3 C 9.8,3 8.2,3.4 7.5,4 6.5,4.7 6.6,7.1 6.5,7.5 6.3,7.8 6,8.1 6,8.5 c 0,0.3 0.4,0.6 0.5,1 0.2,1.5 1,1.8 3,3 l 0,1 c -2.3,0 -4,-0.2 -4,2 l 11,0 c 0,-2.1 -1.7,-2 -4,-2 l 0,-1 c 2,-1.1 2.7,-1.6 3,-3 C 15.5,9.2 16,8.9 16,8.5 16,8.1 15.6,7.8 15.5,7.5 15.3,7.1 15.4,4.7 14.5,4 13.7,3.4 12,3 11,3 Z m -0.5,2.5 1,0 0,2 2,0 0,1 -2,0 0,2 -1,0 0,-2 -2,0 0,-1 2,0 z
+    M 7,2 C 5.8,2 4.3,2.4 3.5,3 2.5,3.7 2.6,5.1 2.5,5.5 2.3,5.8 2,6.1 2,6.5 c 0,0.3 0.5,0.6 0.5,1 0,2.2107935 1,3.4 3,4 -2.5,0 -4,-0.2 -4,2 l 8,0 0,-1 C 7.8,11.5 6.8,11.4 6.5,9.5 6.5,9 6,9 6,8.5 6,8 6.6,8 6.5,7.5 6.5,4.1 7.6,3.5 9.6,3 9,2.4 8.2,2 7,2 Z"/>
+  <path id="editcard" class="normal" d="M 9,1.5 C 4.8,1.5 1.5,4.8 1.5,9 c 0,4.1 3.3,7.5 7.5,7.5 4.1,0 7.5,-3.3 7.5,-7.5 C 16.5,4.8 13.1,1.5 9,1.5 Z m -1.5,2 3,0 0,3 -3,0 z m 0,5 3,0 0,6 -3,0 z"/>
+  <path id="editcard-inverted" class="inverted" d="M 9,1.5 C 4.8,1.5 1.5,4.8 1.5,9 c 0,4.1 3.3,7.5 7.5,7.5 4.1,0 7.5,-3.3 7.5,-7.5 C 16.5,4.8 13.1,1.5 9,1.5 Z m -1.5,2 3,0 0,3 -3,0 z m 0,5 3,0 0,6 -3,0 z"/>
+  <path id="newmessage" class="normal" d="m 1.5,2.5 10,0 0,0.5 -7,6.5 0,5 5,0 2,-2 0,3 -10,0 z m 5,10 2,0 8,-7.5 -2,-2 -8,7.5 z"/>
+  <path id="newmessage-inverted" class="inverted" d="m 1.5,2.5 10,0 0,4.3 -5,4.7 0,2 2,0 3,-2.8 0,4.8 -10,0 z m 5,11 2,0 8,-7.5 -2,-2 -8,7.5 z"/>
+  <path id="newim" class="normal" d="M 16.5,5 C 16.5,3.8 15.2,2.5 14,2.5 L 4,2.5 C 2.8,2.5 1.5,3.8 1.5,5 l 0,5 c 0,1.2 1.3,2.5 2.5,2.5 l 1.5,0 0,3 3.5,-3 5,0 c 1.2,0 2.5,-1.3 2.5,-2.5 z"/>
+  <path id="newim-inverted" class="inverted" d="M 16.5,5 C 16.5,3.8 15.2,2.5 14,2.5 L 4,2.5 C 2.8,2.5 1.5,3.8 1.5,5 l 0,5 c 0,1.2 1.3,2.5 2.5,2.5 l 1.5,0 0,3 3.5,-3 5,0 c 1.2,0 2.5,-1.3 2.5,-2.5 z"/>
+  <path id="abdelete" class="normal" d="m 9,1.5 c 4.2,0 7.5,3.3 7.5,7.5 0,4.1 -3.3,7.5 -7.5,7.5 C 4.9,16.5 1.5,13.2 1.5,9 1.5,4.8 4.9,1.5 9,1.5 Z m -3,3 7.5,7.5 C 16.3,7.1 11,1.7 6,4.5 Z M 4.5,6 c -3.1,5.4 2.9,10 7.5,7.5 z"/>
+  <path id="abdelete-inverted" class="inverted" d="m 9,1.5 c 4.2,0 7.5,3.3 7.5,7.5 0,4.1 -3.3,7.5 -7.5,7.5 C 4.9,16.5 1.5,13.2 1.5,9 1.5,4.8 4.9,1.5 9,1.5 Z M 7,5 13,11 C 14.5,6.6 11.2,3.6 7,5 Z M 5,7 c -1.6,4.3 1.5,7.7 6,6 z"/>
+</svg>
new file mode 100644
--- /dev/null
+++ b/mail/themes/shared/mail/icons/chat-toolbar.svg
@@ -0,0 +1,107 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     viewBox="0 0 18 18">
+  <style>
+    path {
+      display: none;
+    }
+    path:target {
+      display: block;
+      stroke-width: 1;
+    }
+    .normal {
+      fill: #505050;
+      fill-opacity: 0.8;
+      stroke: #404040;
+    }
+    @media (-moz-windows-default-theme) and (-moz-os-version: windows-win8) {
+      .normal {
+        fill: #797c80;
+      fill-opacity: 1;
+        stroke: #797c80;
+      }
+    }
+    @media (-moz-windows-default-theme) and (-moz-os-version: windows-win10) {
+      .normal {
+        fill: #616161;
+      fill-opacity: 1;
+        stroke: #616161;
+      }
+    }
+    @media (-moz-windows-default-theme) and (-moz-os-version: windows-vista),
+       (-moz-windows-default-theme) and (-moz-os-version: windows-win7) {
+      .normal {
+        fill: url(#win1);
+      fill-opacity: 1;
+        stroke: url(#win2);
+      }
+    }
+    @media (-moz-mac-lion-theme) {
+      .normal {
+        fill: url(#osx1);
+      fill-opacity: 1;
+        stroke: url(#osx2);
+      }
+    }
+    @media (-moz-mac-yosemite-theme) {
+      .normal {
+        fill: #4d4d4d;
+      fill-opacity: 1;
+        stroke: #4d4d4d;
+      }
+    }
+    .inverted {
+      fill: #fff;
+      fill-opacity: 1;
+      stroke: #111922;
+    }
+  </style>
+  <defs>
+    <linearGradient
+       id="win1"
+       x1="8"
+       y1="1"
+       x2="8"
+       y2="15"
+       gradientUnits="userSpaceOnUse">
+       <stop stop-color="#3f4f5a" offset="0"/>
+       <stop stop-color="#7e8c97" offset="1"/>
+    </linearGradient>
+    <linearGradient
+       id="win2"
+       x1="8"
+       y1="1"
+       x2="8"
+       y2="15"
+       gradientUnits="userSpaceOnUse">
+      <stop stop-color="#0c1b25" offset="0"/>
+      <stop stop-color="#4f585f" stop-opacity="0.9" offset="1"/>
+    </linearGradient>
+    <linearGradient
+       id="osx1"
+       x1="8"
+       y1="1"
+       x2="8"
+       y2="15"
+       gradientUnits="userSpaceOnUse">
+       <stop stop-color="#4f4f4f" stop-opacity="0.76" offset="0"/>
+       <stop stop-color="#717171" stop-opacity="0.6" offset="1"/>
+    </linearGradient>
+    <linearGradient
+       id="osx2"
+       x1="8"
+       y1="1"
+       x2="8"
+       y2="15"
+       gradientUnits="userSpaceOnUse">
+      <stop stop-color="#252525" stop-opacity="0.88" offset="0"/>
+      <stop stop-color="#505050" stop-opacity="0.68" offset="1"/>
+    </linearGradient>
+  </defs>
+  <path id="add" class="normal" d="M 9,2 C 7.8,2 6.28,2.4 5.5,3 4.5,3.7 4.6,6.1 4.5,6.5 4.3,6.8 4,7.1 4,7.5 c 0,0.3 0.4,0.6 0.5,1 0.2,1.5 1,1.8 3,3 l 0,1 c -2.4,0.1 -5.7,-0.6 -6,3 l 15,0 c -0.3,-3.5 -3.6,-3 -6,-3 l 0,-1 c 2,-1.1 2.7,-1.6 3,-3 C 13.5,8.2 14,7.9 14,7.5 14,7.1 13.6,6.8 13.5,6.5 13.3,6.1 13.4,3.7 12.5,3 11.7,2.4 10,2 9,2 Z m -1.5,1.5 3,0 0,2 2,0 0,3 -2,0 0,2 -3,0 0,-2 -2,0 0,-3 2,0 z"/>
+  <path id="add-inverted" class="inverted" d="M 9,2 C 7.8,2 6.28,2.4 5.5,3 4.5,3.7 4.6,6.1 4.5,6.5 4.3,6.8 4,7.1 4,7.5 c 0,0.3 0.4,0.6 0.5,1 0.2,1.5 1,1.8 3,3 l 0,1 c -2.4,0.1 -5.7,-0.6 -6,3 l 15,0 c -0.3,-3.5 -3.6,-3 -6,-3 l 0,-1 c 2,-1.1 2.7,-1.6 3,-3 C 13.5,8.2 14,7.9 14,7.5 14,7.1 13.6,6.8 13.5,6.5 13.3,6.1 13.4,3.7 12.5,3 11.7,2.4 10,2 9,2 Z m -0.5,2.5 1,0 0,2 2,0 0,1 -2,0 0,2 -1,0 0,-2 -2,0 0,-1 2,0 z"/>
+  <path id="join" class="normal" d="m 7.5,6.5 8,0 c 0.5,0 1,0.5 1,1 l 0,4 c 0,0.5 -0.5,1 -1,1 l -5,0 -2,4 0,-4 -1,0 c -0.5,0 -1,-0.5 -1,-1 l 0,-4 c 0,-0.5 0.5,-1 1,-1 z m -5,-4 9,0 c 0.5,0 1,0.5 1,1 l 0,1 -6,0 c -1,0 -2,1 -2,2 l 0,3.5 -1,2.5 0,-4 -1,0 c -0.5,0 -1,-0.5 -1,-1 l 0,-4 c 0,-0.5 0.5,-1 1,-1 z"/>
+  <path id="join-inverted" class="inverted" d="m 7.5,6.5 8,0 c 0.5,0 1,0.5 1,1 l 0,4 c 0,0.5 -0.5,1 -1,1 l -4,0 -2,4 -1,0 0,-4 -1,0 c -0.5,0 -1,-0.5 -1,-1 l 0,-4 c 0,-0.5 0.5,-1 1,-1 z m 4,-4 c 0.5,0 1,0.5 1,1 l 0,3 -5,0 c -0.5,0 -1,0.5 -1,1 l 0,1 -2,4 -1,0 0,-4 -1,0 C 2.1,8.5 1.6,8 1.6,7.5 l 0,-4 c 0,-0.5 0.5,-1 1,-1 z"/>
+  <path id="accounts" class="normal" d="M 9,1.5 C 4.8,1.5 1.5,4.8 1.5,9 c 0,4.1 3.3,7.5 7.5,7.5 4.1,0 7.5,-3.3 7.5,-7.5 C 16.5,4.8 13.1,1.5 9,1.5 Z m -1.5,2 3,0 0,3 -3,0 z m 0,5 3,0 0,6 -3,0 z"/>
+  <path id="accounts-inverted" class="inverted" d="M 9,1.5 C 4.8,1.5 1.5,4.8 1.5,9 c 0,4.1 3.3,7.5 7.5,7.5 4.1,0 7.5,-3.3 7.5,-7.5 C 16.5,4.8 13.1,1.5 9,1.5 Z m -1.5,2 3,0 0,3 -3,0 z m 0,5 3,0 0,6 -3,0 z"/>
+</svg>
new file mode 100644
--- /dev/null
+++ b/mail/themes/shared/mail/icons/compose-toolbar.svg
@@ -0,0 +1,125 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     viewBox="0 0 18 18">
+  <style>
+    path {
+      display: none;
+    }
+    path:target {
+      display: block;
+      stroke-width: 1;
+    }
+    .normal {
+      fill: #505050;
+      fill-opacity: 0.8;
+      stroke: #404040;
+    }
+    @media (-moz-windows-default-theme) and (-moz-os-version: windows-win8) {
+      .normal {
+        fill: #797c80;
+      fill-opacity: 1;
+        stroke: #797c80;
+      }
+    }
+    @media (-moz-windows-default-theme) and (-moz-os-version: windows-win10) {
+      .normal {
+        fill: #616161;
+      fill-opacity: 1;
+        stroke: #616161;
+      }
+    }
+    @media (-moz-windows-default-theme) and (-moz-os-version: windows-vista),
+       (-moz-windows-default-theme) and (-moz-os-version: windows-win7) {
+      .normal {
+        fill: url(#win1);
+      fill-opacity: 1;
+        stroke: url(#win2);
+      }
+    }
+    @media (-moz-mac-lion-theme) {
+      .normal {
+        fill: url(#osx1);
+      fill-opacity: 1;
+        stroke: url(#osx2);
+      }
+    }
+    @media (-moz-mac-yosemite-theme) {
+      .normal {
+        fill: #4d4d4d;
+      fill-opacity: 1;
+        stroke: #4d4d4d;
+      }
+    }
+    .inverted {
+      fill: #fff;
+      fill-opacity: 1;
+      stroke: #111922;
+    }
+  </style>
+  <defs>
+    <linearGradient
+       id="win1"
+       x1="8"
+       y1="1"
+       x2="8"
+       y2="15"
+       gradientUnits="userSpaceOnUse">
+       <stop stop-color="#3f4f5a" offset="0"/>
+       <stop stop-color="#7e8c97" offset="1"/>
+    </linearGradient>
+    <linearGradient
+       id="win2"
+       x1="8"
+       y1="1"
+       x2="8"
+       y2="15"
+       gradientUnits="userSpaceOnUse">
+      <stop stop-color="#0c1b25" offset="0"/>
+      <stop stop-color="#4f585f" stop-opacity="0.9" offset="1"/>
+    </linearGradient>
+    <linearGradient
+       id="osx1"
+       x1="8"
+       y1="1"
+       x2="8"
+       y2="15"
+       gradientUnits="userSpaceOnUse">
+       <stop stop-color="#4f4f4f" stop-opacity="0.76" offset="0"/>
+       <stop stop-color="#717171" stop-opacity="0.6" offset="1"/>
+    </linearGradient>
+    <linearGradient
+       id="osx2"
+       x1="8"
+       y1="1"
+       x2="8"
+       y2="15"
+       gradientUnits="userSpaceOnUse">
+      <stop stop-color="#252525" stop-opacity="0.88" offset="0"/>
+      <stop stop-color="#505050" stop-opacity="0.68" offset="1"/>
+    </linearGradient>
+  </defs>
+  <path id="send" class="normal" d="m 1.5,1.5 0,3 2,0 0,3 -2,0 0,3 2,0 0,3 -2,0 0,3 3,0 0,-2 3,0 0,2 3,0 0,-2 3,0 0,2 3,0 0,-3 -2,0 0,-3 2,0 0,-3 -2,0 0,-3 2,0 0,-3 -3,0 0,2 -3,0 0,-2 -3,0 0,2 -3,0 0,-2 z m 4,4 7,0 0,7 -7,0 z m 2,2 3,0 0,3 -3,0 z"/>
+  <path id="send-inverted" class="inverted" d="m 1.5,1.5 0,3 1,0 0,3 -1,0 0,3 1,0 0,3 -1,0 0,3 3,0 0,-1 3,0 0,1 3,0 0,-1 3,0 0,1 3,0 0,-3 -1,0 0,-3 1,0 0,-3 -1,0 0,-3 1,0 0,-3 -3,0 0,1 -3,0 0,-1 -3,0 0,1 -3,0 0,-1 z m 4,4 7,0 0,7 -7,0 z m 1,1 5,0 0,5 -5,0 z"/>
+  <path id="contacts" class="normal" d="m 2.5,15.5 13,0 c 0,-3.4 -2.2,-3 -5,-3 l 0,-1 C 12.5,10.4 12.7,9.4 13,8 13,7.7 13.5,7.4 13.5,7 13.5,6.6 13.1,6.3 13,6 12.8,5.6 12.9,3.7 12,3 10.4,1.8 7.56,1.8 6,3 5,3.7 5.1,5.6 5,6 4.8,6.3 4.5,6.6 4.5,7 c 0,0.3 0.4,0.6 0.5,1 0.2,1.5 0.5,2.3 2.5,3.5 l 0,1 c -2.5,0 -5,-0.5 -5,3 z"/>
+  <path id="contacts-inverted" class="inverted" d="m 2.5,15.5 13,0 c 0,-3.4 -2.2,-3 -5,-3 l 0,-1 C 12.5,10.4 12.7,9.4 13,8 13,7.7 13.5,7.4 13.5,7 13.5,6.6 13.1,6.3 13,6 12.8,5.6 12.9,3.7 12,3 10.4,1.8 7.56,1.8 6,3 5,3.7 5.1,5.6 5,6 4.8,6.3 4.5,6.6 4.5,7 c 0,0.3 0.4,0.6 0.5,1 0.2,1.5 0.5,2.3 2.5,3.5 l 0,1 c -2.5,0 -5,-0.5 -5,3 z"/>
+  <path id="spelling" class="normal" d="M 1.5,10.5 3,8.5 6.7,11.7 C 9,7.8 12.6,5.6 16.5,3.5 l 0,1 c -4,3.1 -7,6.7 -9,11.2 z"/>
+  <path id="spelling-inverted" class="inverted" d="M 1.5,10.5 3,7.5 6.7,10.7 C 9,6.8 12.6,4.6 16.5,2.5 l 0,2 c -4,3.1 -7,6.7 -9,11.2 z"/>
+  <path id="attach" class="normal" d="m 13.5,2.5 0,10.5 -4,3.5 -4,-3.5 0,-11.5 6,0 0,10 -2,2 -2,-2 0,-8 2,0 0,6.5" style="fill:none"/>
+  <path id="attach-inverted" class="inverted" d="m 11.5,3 2,0 0,10 L 9,16.5 4.5,13 l 0,-11.5 7,0 z m 0,0.5 0,8.5 -2.5,2 -2.5,-2 0,-8.5 3,0 0,7.5 L 9,11.4 8.5,11 8.5,4"/>
+  <path id="security" class="normal" d="m 9,2.5 c -2.75,0 -5.5,0.75 -5.5,5 l 0,1 -1,0 0,7 13,0 0,-7 -1,0 0,-1 c 0,-4 -3,-5 -5.5,-5 z m 0,3 c 2.5,0 2.5,1 2.5,3 l -5,0 c 0,-2 0,-3 2.5,-3 z"/>
+  <path id="security-inverted" class="inverted" d="m 9,2.5 c -2.75,0 -5.5,0.75 -5.5,5 l 0,1 -1,0 0,7 13,0 0,-7 -1,0 0,-1 c 0,-4 -3,-5 -5.5,-5 z m 0,3 c 2.5,0 2.5,1 2.5,3 l -5,0 c 0,-2 0,-3 2.5,-3 z"/>
+  <path id="save" class="normal" d="m 9,15 6.5,-6.5 -4,0 0,-5.5 C 11.5,2.75 11.25,2.5 11,2.5 l -4,0 C 6.75,2.5 6.5,2.75 6.5,3 l 0,5.5 -4,0 z"/>
+  <path id="save-inverted" class="inverted" d="m 9,15 6.5,-6.5 -4,0 0,-5.5 C 11.5,2.75 11.25,2.5 11,2.5 l -4,0 C 6.75,2.5 6.5,2.75 6.5,3 l 0,5.5 -4,0 z"/>
+  <path id="quote" class="normal" d="M 4.5,8 C -7.25,4 16.5,-5 4.5,14.5 Z M 13.5,8 c -11.75,-4 11.5,-13 0,6.5 Z"/>
+  <path id="quote-inverted" class="inverted" d="M 4.5,8 C -7.25,4 16.5,-5 4.5,14.5 Z M 13.5,8 c -11.75,-4 11.5,-13 0,6.5 Z"/>
+  <path id="cut" class="normal" d="m 4.5,11 c 1.1,0 2,1 2,2 0,1 -0.8,2 -2,2 -1.1,0 -2,-1 -2,-2 0,-1 0.8,-2 2,-2 z M 7.3,10.25 2.8,4.5 C 2,3.6 2.2,2.6 2.8,2 L 9,8.5 15.1,2 c 0.6,0.6 0.7,1.6 0.1,2.5 L 10.5,10.25 11.2,11
+    C 11.6,10.6 12.3,10 13.5,10 c 1.8,0 3,1.3 3,3 0,1.5 -1.6,3 -3,3 -1.9,0 -3,-2.3 -4.5,-4 -1.4,1.5 -2.5,4 -4.5,4 -1.4,0 -3,-1.3 -3,-3 0,-1.7 1.5,-3 3,-3 1.1,0 1.6,0.6 2,1 z M 13.5,11 c -1.3,0 -2,1 -2,2 0,1 1,2 2,2 1,0 2,-1 2,-2 0,-1 -0.7,-2 -2,-2 z"/>
+  <path id="cut-inverted" class="inverted" d="M 1.8,2.5 C 0.5,4 4.8,7.8 6.9,10.1 L 6.3,10.7 C 5.6,10.1 5.4,10 4,10 c -1.8,0 -3,1.2 -3,3 0,1.8 1.3,3 3,3 2,0 3.4,-2 4.9,-3.7 1.4,1.5 3,3.7 5.1,3.7 1.7,0 3,-1.2 3,-3 0,-2.1 -1.4,-3 -3,-3 -1.1,0 -1.8,0.2 -2.2,0.5 L 11.1,9.9
+    C 13.8,6.7 17,3.8 15.8,2.5 14.3,1.7 11,5.8 9,8 6.8,5.8 3.1,1.6 1.8,2.5 Z M 4,12.5 c 0.3,0 0.5,0.2 0.5,0.5 0,0.3 -0.2,0.5 -0.5,0.5 -0.3,0 -0.5,-0.2 -0.5,-0.5 0,-0.3 0.2,-0.5 0.5,-0.5 z m 10,0 c 0.3,0 0.5,0.2 0.5,0.5 0,0.3 -0.2,0.5 -0.5,0.5 -0.3,0 -0.5,-0.2 -0.5,-0.5 0,-0.3 0.2,-0.5 0.5,-0.5 z"/>
+  <path id="copy" class="normal" d="m 8.5,6.5 0,9 7,0 0,-5 -4,0 0,-4 z m 3.5,0 0.5,0 3,3 0,0.5 m -13,-7.5 0,9 4,0 0,-6 0,-3 z m 4.5,0 0.5,0 3,3 0,0.5"/>
+  <path id="copy-inverted" class="inverted" d="m 7.5,6.5 0,9 8,0 0,-5 -4,0 0,-4 z m 4,0 1,0 3,3 0,1 -4,0 z m -9,-4 0,9 5,0 0,-9 z m 5,0 0.5,0 3,3 0,1 -3.5,0 z"/>
+  <path id="paste" class="normal" d="m 6.5,2.5 -1,1 0,1 -2,0 0,11 11,0 0,-11 -2,0 0,-1 -1,-1 z M 6,5 l 6,0 0,1.5 -0.5,0 2,3.5 -7,3.5 L 4,9 8.7,6.5 6,6.5 Z m 2.7,1.5 2.7,0 -0.5,-1 z"/>
+  <path id="paste-inverted" class="inverted" d="m 6.5,2.5 -1,1 0,1 -2,0 0,11 11,0 0,-11 -2,0 0,-1 -1,-1 z M 6,5 12,5 12,6.5 10.5,6.5 12.6,10 7.5,13.2 5,9 9.1,6.5 6,6.5 Z m 3.1,1.5 1.4,0 -0.4,-0.7 z"/>
+  <path id="print" class="normal" d="m 4.5,2.5 0,4 -1.5,0 c -0.8,0 -1.5,1.1 -1.5,2 l 0,3 c 0,1 1.4,2 2.5,2 l 1.5,0 0,-1 7,0 0,1 1.5,0 c 1,0 2.5,-1 2.5,-2 l 0,-3 c 0,-0.8 -0.6,-2 -1.5,-2 l -1.5,0 0,-4 z m 0,0 9,0 0,6 -9,0 z m 4,6 2,0 0,2 -2,0 z m -4,0 3,0 0,2 -3,0 z m 0,5.4 0,1.6 m -2.5,0 14,0 m -2.5,0 0,-1.6"/>
+  <path id="print-inverted" class="inverted" d="m 3.5,2.5 0,5 -0.5,0 c -0.8,0 -1.5,1.1 -1.5,2 l 0,2 c 0,0.8 0.4,2 2.5,2 l -1.5,0 0,2 13,0 0,-2 -1.5,0 c 2,0 2.5,-1.1 2.5,-2 l 0,-2 c 0,-0.8 -0.6,-2 -1.5,-2 l -0.5,0 0,-5 z m 2,2 7,0 0,3 -7,0 z m -2,5 3,0 0,1 -3,0 z m 5,0 2,0 0,1 -2,0 z m -3,3 7,0 0,1 -7,0 z"/>
+</svg>
new file mode 100644
--- /dev/null
+++ b/mail/themes/shared/mail/icons/mail-toolbar.svg
@@ -0,0 +1,157 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     viewBox="0 0 18 18">
+  <style>
+    path {
+      display: none;
+    }
+    path:target {
+      display: block;
+      stroke-width: 1;
+    }
+    .normal {
+      fill: #505050;
+      fill-opacity: 0.8;
+      stroke: #404040;
+    }
+    @media (-moz-windows-default-theme) and (-moz-os-version: windows-win8) {
+      .normal {
+        fill: #797c80;
+      fill-opacity: 1;
+        stroke: #797c80;
+      }
+    }
+    @media (-moz-windows-default-theme) and (-moz-os-version: windows-win10) {
+      .normal {
+        fill: #616161;
+      fill-opacity: 1;
+        stroke: #616161;
+      }
+    }
+    @media (-moz-windows-default-theme) and (-moz-os-version: windows-vista),
+       (-moz-windows-default-theme) and (-moz-os-version: windows-win7) {
+      .normal {
+        fill: url(#win1);
+      fill-opacity: 1;
+        stroke: url(#win2);
+      }
+    }
+    @media (-moz-mac-lion-theme) {
+      .normal {
+        fill: url(#osx1);
+      fill-opacity: 1;
+        stroke: url(#osx2);
+      }
+    }
+    @media (-moz-mac-yosemite-theme) {
+      .normal {
+        fill: #4d4d4d;
+      fill-opacity: 1;
+        stroke: #4d4d4d;
+      }
+    }
+    .inverted {
+      fill: #fff;
+      fill-opacity: 1;
+      stroke: #111922;
+    }
+    .unread {
+      fill: #3971c3;
+      fill-opacity: 1;
+      stroke: #115174;
+    }
+  </style>
+  <defs>
+    <linearGradient
+       id="win1"
+       x1="8"
+       y1="1"
+       x2="8"
+       y2="15"
+       gradientUnits="userSpaceOnUse">
+       <stop stop-color="#3f4f5a" offset="0"/>
+       <stop stop-color="#7e8c97" offset="1"/>
+    </linearGradient>
+    <linearGradient
+       id="win2"
+       x1="8"
+       y1="1"
+       x2="8"
+       y2="15"
+       gradientUnits="userSpaceOnUse">
+      <stop stop-color="#0c1b25" offset="0"/>
+      <stop stop-color="#4f585f" stop-opacity="0.9" offset="1"/>
+    </linearGradient>
+    <linearGradient
+       id="osx1"
+       x1="8"
+       y1="1"
+       x2="8"
+       y2="15"
+       gradientUnits="userSpaceOnUse">
+       <stop stop-color="#4f4f4f" stop-opacity="0.76" offset="0"/>
+       <stop stop-color="#717171" stop-opacity="0.6" offset="1"/>
+    </linearGradient>
+    <linearGradient
+       id="osx2"
+       x1="8"
+       y1="1"
+       x2="8"
+       y2="15"
+       gradientUnits="userSpaceOnUse">
+      <stop stop-color="#252525" stop-opacity="0.88" offset="0"/>
+      <stop stop-color="#505050" stop-opacity="0.68" offset="1"/>
+    </linearGradient>
+  </defs>
+  <path id="getmsg" class="normal" d="m 1.5,10.5 2,0 0,3 11,0 0,-3 2,0 0,5 -15,0 z m 6,-8 3,0 0,4 3,0 -4.5,4 -4.5,-4 3,0 z"/>
+  <path id="getmsg-inverted" class="inverted" d="m 1.5,10.5 3,0 0,2 9,0 0,-2 3,0 0,5 -15,0 z m 5,-8 5,0 0,4 3.5,0 -6,5.5 -6,-5.5 3.5,0 z"/>
+  <path id="newmsg" class="normal" d="m 1.5,2.5 10,0 0,0.5 -7,6.5 0,5 5,0 2,-2 0,3 -10,0 z m 5,10 2,0 8,-7.5 -2,-2 -8,7.5 z"/>
+  <path id="newmsg-inverted" class="inverted" d="m 1.5,2.5 10,0 0,4.3 -5,4.7 0,2 2,0 3,-2.8 0,4.8 -10,0 z m 5,11 2,0 8,-7.5 -2,-2 -8,7.5 z"/>
+  <path id="address" class="normal" d="m 2.5,15.5 13,0 c 0,-3.4 -2.2,-3 -5,-3 l 0,-1 C 12.5,10.4 12.7,9.4 13,8 13,7.7 13.5,7.4 13.5,7 13.5,6.6 13.1,6.3 13,6 12.8,5.6 12.9,3.7 12,3 10.4,1.8 7.56,1.8 6,3 5,3.7 5.1,5.6 5,6 4.8,6.3 4.5,6.6 4.5,7 c 0,0.3 0.4,0.6 0.5,1 0.2,1.5 0.5,2.3 2.5,3.5 l 0,1 c -2.5,0 -5,-0.5 -5,3 z"/>
+  <path id="address-inverted" class="inverted" d="m 2.5,15.5 13,0 c 0,-3.4 -2.2,-3 -5,-3 l 0,-1 C 12.5,10.4 12.7,9.4 13,8 13,7.7 13.5,7.4 13.5,7 13.5,6.6 13.1,6.3 13,6 12.8,5.6 12.9,3.7 12,3 10.4,1.8 7.56,1.8 6,3 5,3.7 5.1,5.6 5,6 4.8,6.3 4.5,6.6 4.5,7 c 0,0.3 0.4,0.6 0.5,1 0.2,1.5 0.5,2.3 2.5,3.5 l 0,1 c -2.5,0 -5,-0.5 -5,3 z"/>
+  <path id="reply" class="normal" d="m 11,16.5 c 0,0 5.4,-2 5.5,-6 0,-2.4 -2,-4 -5.5,-4 L 7.5,6.5 7.5,3 2,8.5 7.5,14 l 0,-3.5 3.5,0 c 2.8,0 0.9,4.2 0,6 z"/>
+  <path id="reply-inverted" class="inverted" d="m 11,16.5 c 0,0 5.4,-2 5.5,-6 0,-2.4 -2,-4 -5.5,-4 L 7.5,6.5 7.5,3 2,8.5 7.5,14 l 0,-3.5 3.5,0 c 2.8,0 0.9,4.2 0,6 z"/>
+  <path id="replyall" class="normal" d="m 12,16.5 c 0,0 5.4,-2 5.5,-6 0,-2.4 -2,-4 -5.5,-4 l -1.5,0 0,-3.5 -5.5,5.5 5.5,5.5 0,-3.5 1.5,0 c 2.8,0 0.9,4.2 0,6 z M 6,5 6,3 0.5,8.5 6,14 6,12 2.5,8.5 Z"/>
+  <path id="replyall-inverted" class="inverted" d="m 12,16.5 c 0,0 5.4,-2 5.5,-6 0,-2.4 -2,-4 -5.5,-4 l -1.5,0 0,-3.5 -5.5,5.5 5.5,5.5 0,-3.5 1.5,0 c 2.8,0 0.9,4.2 0,6 z M 6,7 6,3 0.5,8.5 6,14 6,10 4.5,8.5 Z"/>
+  <path id="replylist" class="normal" d="m 1.5,2.5 0,11 5.7,0 -0.6,-2 -0.1,-1 -3,0 0,-2 3.4,0 C 8.1,6.6 11.5,5 13.5,6 l 0,-3.5 z m 2,2 8,0 0,0.8 -3.2,1.2 -4.8,0 z m 8,1 c -2.7,0 -5,2.2 -5,5 0,2.7 2.2,5 5,5 2.7,0 5,-2.2 5,-5 0,-2.7 -2.2,-5 -5,-5 z m 0,1 0,3 3,0 0,2 -3,0 0,3 -4,-4 z"/>
+  <path id="replylist-inverted" class="inverted" d="m 1.5,2.5 0,11 5.7,0 -0.6,-2 -0.1,-2 -3.5,0 3.5,0 C 7.4,5.8 11.5,5 13.5,6 l 0,-3.5 z m 6.8,4 -5.3,0 z m 3.2,-1 c -2.7,0 -5,2.2 -5,5 0,2.7 2.2,5 5,5 2.7,0 5,-2.2 5,-5 0,-2.7 -2.2,-5 -5,-5 z m 0,2 0,2 3,0 0,2 -3,0 0,2 -3.5,-3 z"/>
+  <path id="forward" class="normal" d="m 2.5,6.5 7,0 0,-3.5 5.5,5.5 -5.5,5.5 0,-3.5 -7,0 z"/>
+  <path id="forward-inverted" class="inverted" d="m 2.5,5.5 7,0 0,-3.5 6.5,6.5 -6.5,6.5 0,-3.5 -7,0 z"/>
+  <path id="delete" class="normal" d="m 9,1.5 c 4.2,0 7.5,3.3 7.5,7.5 0,4.1 -3.3,7.5 -7.5,7.5 C 4.9,16.5 1.5,13.2 1.5,9 1.5,4.8 4.9,1.5 9,1.5 Z m -3,3 7.5,7.5 C 16.3,7.1 11,1.7 6,4.5 Z M 4.5,6 c -3.1,5.4 2.9,10 7.5,7.5 z"/>
+  <path id="delete-inverted" class="inverted" d="m 9,1.5 c 4.2,0 7.5,3.3 7.5,7.5 0,4.1 -3.3,7.5 -7.5,7.5 C 4.9,16.5 1.5,13.2 1.5,9 1.5,4.8 4.9,1.5 9,1.5 Z M 7,5 13,11 C 14.5,6.6 11.2,3.6 7,5 Z M 5,7 c -1.6,4.3 1.5,7.7 6,6 z"/>
+  <path id="junk" class="normal" d="M 9,2.5 C 5,6.6 1.8,8.8 4.4,13.3 c 2.5,4.5 8.3,2.7 9.5,0.3 1.1,-2.4 0.5,-3.8 -1.5,-7.6 -1.2,-1.6 1.8,2.7 -0.7,4.3 -1.5,1 -3,0.8 -4,-0.2 C 5.3,7.5 9.4,2 9,2.5 Z"/>
+  <path id="junk-inverted" class="inverted" d="M 9,2.5 C 4.5,5.7 1.8,8.8 4.4,13.3 c 2.5,4.5 8.4,2.5 9.5,0.3 C 15,11.3 15,9.1 12.4,6 11.2,4.4 13,9 10.8,10.3 9.7,11.1 8.7,11.1 7.7,10.1 5.3,7.5 10.2,3.1 9,2.5 Z"/>
+  <path id="print" class="normal" d="m 4.5,2.5 0,4 -1.5,0 c -0.8,0 -1.5,1.1 -1.5,2 l 0,3 c 0,1 1.4,2 2.5,2 l 1.5,0 0,-1 7,0 0,1 1.5,0 c 1,0 2.5,-1 2.5,-2 l 0,-3 c 0,-0.8 -0.6,-2 -1.5,-2 l -1.5,0 0,-4 z m 0,0 9,0 0,6 -9,0 z m 4,6 2,0 0,2 -2,0 z m -4,0 3,0 0,2 -3,0 z m 0,5.4 0,1.6 m -2.5,0 14,0 m -2.5,0 0,-1.6"/>
+  <path id="print-inverted" class="inverted" d="m 3.5,2.5 0,5 -0.5,0 c -0.8,0 -1.5,1.1 -1.5,2 l 0,2 c 0,0.8 0.4,2 2.5,2 l -1.5,0 0,2 13,0 0,-2 -1.5,0 c 2,0 2.5,-1.1 2.5,-2 l 0,-2 c 0,-0.8 -0.6,-2 -1.5,-2 l -0.5,0 0,-5 z m 2,2 7,0 0,3 -7,0 z m -2,5 3,0 0,1 -3,0 z m 5,0 2,0 0,1 -2,0 z m -3,3 7,0 0,1 -7,0 z"/>
+  <path id="stop" class="normal" d="m 5.5,1.5 -4,4 0,7 4,4 7,0 4,-4 0,-7 -4,-4 z M 6.5,4 9,6.5 11.5,4 14,6.5 11.5,9 14,11.5 11.5,14 9,11.5 6.5,14 4,11.5 6.5,9 4,6.5 Z"/>
+  <path id="stop-inverted" class="inverted" d="m 5.5,1.5 -4,4 0,7 4,4 7,0 4,-4 0,-7 -4,-4 z m 1.5,4 2,2 2,-2 1.5,1.5 -2,2 2,2 -1.5,1.5 -2,-2 -2,2 -1.5,-1.5 2,-2 -2,-2 z"/>
+  <path id="file" class="normal" d="m 9,15 6.5,-6.5 -4,0 0,-5.5 C 11.5,2.75 11.25,2.5 11,2.5 l -4,0 C 6.75,2.5 6.5,2.75 6.5,3 l 0,5.5 -4,0 z"/>
+  <path id="file-inverted" class="inverted" d="m 9,15 6.5,-6.5 -4,0 0,-5.5 C 11.5,2.75 11.25,2.5 11,2.5 l -4,0 C 6.75,2.5 6.5,2.75 6.5,3 l 0,5.5 -4,0 z"/>
+  <path id="nextUnread" class="normal" d="m 3.5,2.5 11,0 L 9,9 Z m 5.5,13 5.5,-6 -11,0 z"/>
+  <path id="nextUnread-inverted" class="inverted" d="m 3.5,2.5 11,0 L 9,9 Z m 5.5,13 5.5,-6 -11,0 z"/>
+  <path id="previousUnread" class="normal" d="m 3.5,15.5 11,0 L 9,9 Z m 0,-7 11,0 -5.5,-6 z"/>
+  <path id="previousUnread-inverted" class="inverted" d="m 3.5,15.5 11,0 L 9,9 Z m 0,-7 11,0 -5.5,-6 z"/>
+  <path id="mark" class="normal" d="M 8,9 C 8,10.9 6.4,12.5 4.5,12.5 2.5,12.5 1,10.9 1,9 1,7 2.5,5.5 4.5,5.5 6.4,5.5 8,7 8,9 Z m 9,0 c 0,1.9 -1.5,3.5 -3.5,3.5 C 11.5,12.5 10,10.9 10,9 10,7 11.5,5.5 13.5,5.5 15.4,5.5 17,7 17,9 Z m -9,0 2,0"/>
+  <path id="mark-inverted" class="inverted" d="M 8,9 C 8,10.9 6.4,12.5 4.5,12.5 2.5,12.5 1,10.9 1,9 1,7 2.5,5.5 4.5,5.5 6.4,5.5 8,7 8,9 Z m 9,0 c 0,1.9 -1.5,3.5 -3.5,3.5 C 11.5,12.5 10,10.9 10,9 10,7 11.5,5.5 13.5,5.5 15.4,5.5 17,7 17,9 Z m -9,0 2,0"/>
+  <path id="tag" class="normal" d="M 4 2.5 C 3.3 2.5 2.5 3.3 2.5 4 L 2.5 8 L 10 15.5 L 15.5 10 L 8 2.5 L 4 2.5 z M 6 4 A 2 2 0 0 1 8 6 A 2 2 0 0 1 6 8 A 2 2 0 0 1 4 6 A 2 2 0 0 1 6 4 z"/>
+  <path id="tag-inverted" class="inverted" d="M 4 2.5 C 3.3 2.5 2.5 3.3 2.5 4 L 2.5 8 L 10 15.5 L 15.5 10 L 8 2.5 L 4 2.5 z M 6 4 A 2 2 0 0 1 8 6 A 2 2 0 0 1 6 8 A 2 2 0 0 1 4 6 A 2 2 0 0 1 6 4 z"/>
+  <path id="goback" class="normal" d="m 3.5,9 10,-6.5 0,13 z"/>
+  <path id="goback-inverted" class="inverted" d="m 3.5,9 10,-6.5 0,13 z"/>
+  <path id="goforward" class="normal" d="m 13.5,9 -10,-6.5 0,13 z"/>
+  <path id="goforward-inverted" class="inverted" d="m 13.5,9 -10,-6.5 0,13 z"/>
+  <path id="compact" class="normal" d="m 4.5,2.5 c 1.2,0.5 2.1,1.8 2.7,3 l 2.2,0 -4.7,4.3 0,-2 C 3.6,6.8 2.8,5.8 2.5,4.5 2.4,2.6 2.7,2.3 4.5,2.5 Z M 6,11 l 4.5,-4 1,0.6 4.2,2.2 -1,2.5 -3.2,-2 -0.7,0.8 L 13,14.2 l -1.6,1 -2.2,-3 -0.5,0.3 L 9.3,15.5 l -2.8,0 0,-3.4 z"/>
+  <path id="compact-inverted" class="inverted" d="m 4.5,2.5 c 1.2,0.5 2.35,1.8 3,3 L 10.1,6 5.2,10.4 4.7,7.8 C 3.5,6.8 2.8,5.8 2.5,4.5 2.4,2.6 2.7,2.3 4.5,2.5 Z m 1,7.5 4,-3.4 6.2,3.2 -1.4,2.9 -3,-2.2 -0.2,0.2 2.3,3 -2,1.6 -2.2,-2.9 -0.2,0.1 0.5,3 -3,0 0,-3.4 z"/>
+  <path id="archive" class="normal" d="m 1.5,6.5 0,9 15,0 0,-9 z m 4,1 3.5,3.5 3.5,-3.5 2,2 -5.5,5 -5.5,-5 z m -2.5,-3 12,0 m -10,-2 8,0"/>
+  <path id="archive-inverted" class="inverted" d="m 1.5,6.5 0,9 15,0 0,-9 z M 5.5,9 9,12.5 12.5,9 13,9.5 l -4,4 -4,-4 z m -3,-4.5 13,0 0,2 -13,0 z m 2,-2 9,0 0,2 -9,0 z"/>
+  <path id="chat" class="normal" d="M 16.5,5 C 16.5,3.8 15.2,2.5 14,2.5 L 4,2.5 C 2.8,2.5 1.5,3.8 1.5,5 l 0,5 c 0,1.2 1.3,2.5 2.5,2.5 l 1.5,0 0,3 3.5,-3 5,0 c 1.2,0 2.5,-1.3 2.5,-2.5 z"/>
+  <path id="chat-inverted" class="inverted" d="M 16.5,5 C 16.5,3.8 15.2,2.5 14,2.5 L 4,2.5 C 2.8,2.5 1.5,3.8 1.5,5 l 0,5 c 0,1.2 1.3,2.5 2.5,2.5 l 1.5,0 0,3 3.5,-3 5,0 c 1.2,0 2.5,-1.3 2.5,-2.5 z"/>
+  <path id="chat-unread" class="unread" d="M 16.5,5 C 16.5,3.8 15.2,2.5 14,2.5 L 4,2.5 C 2.8,2.5 1.5,3.8 1.5,5 l 0,5 c 0,1.2 1.3,2.5 2.5,2.5 l 1.5,0 0,3 3.5,-3 5,0 c 1.2,0 2.5,-1.3 2.5,-2.5 z"/>
+  <path id="filter" class="normal" d="m 2.5,3.5 13,0 -5,5.5 0,5.5 -3,0 0,-5.5 z"/>
+  <path id="filter-inverted" class="inverted" d="m 2.5,3.5 13,0 -5,5.5 0,5.5 -3,0 0,-5.5 z"/>
+  <path id="nextMsg" class="normal" d="m 2.5,3.5 13,0 -6.5,11 z"/>
+  <path id="nextMsg-inverted" class="inverted" d="m 2.5,3.5 13,0 -6.5,11 z"/>
+  <path id="previousMsg" class="normal" d="m 2.5,14.5 13,0 L 9,3.5 Z"/>
+  <path id="previousMsg-inverted" class="inverted" d="m 2.5,14.5 13,0 L 9,3.5 Z"/>
+  <path id="appButton" class="normal" d="M 3,2.5 c -2,0 -2,3 0,3 l 12,0 c 2,0 2,-3 0,-3 Z M 3,7.5 c -2,0 -2,3 0,3 L 15,10.5 c 2,0 2,-3 0,-3 Z M 3,12.5 c -2,0 -2,3 0,3 l 12,0 c 2,0 2,-3 0,-3 Z"/>
+  <path id="appButton-inverted" class="inverted" d="M 3,2.5 c -2,0 -2,3 0,3 l 12,0 c 2,0 2,-3 0,-3 Z M 3,7.5 c -2,0 -2,3 0,3 L 15,10.5 c 2,0 2,-3 0,-3 Z M 3,12.5 c -2,0 -2,3 0,3 l 12,0 c 2,0 2,-3 0,-3 Z"/>
+</svg>
--- a/mail/themes/shared/mail/messageHeader.css
+++ b/mail/themes/shared/mail/messageHeader.css
@@ -5,16 +5,20 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: msg header buttons ::::: */
 
 .headerContainer {
   min-width: 1px;
 }
 
+#otherActionsButton > .toolbarbutton-icon {
+  display: none;
+}
+
 /* ::::: msg header toolbars ::::: */
 
 #expandedHeaderRows > row,
 #expandedHeader2Rows > row {
   /* Ensure that the header names and values are aligned with each other. */
   -moz-box-align: baseline;
 }
 
--- a/mail/themes/windows/jar.mn
+++ b/mail/themes/windows/jar.mn
@@ -390,31 +390,29 @@ classic.jar:
   skin/classic/aero/messenger/activity/indexMailIcon.png              (mail/activity/indexMailIcon-aero.png)
   skin/classic/aero/messenger/addressbook/addressbook.css          (mail/addrbook/addressbook-aero.css)
 * skin/classic/aero/messenger/addressbook/abContactsPanel.css      (mail/addrbook/abContactsPanel-aero.css)
   skin/classic/aero/messenger/addressbook/cardDialog.css           (mail/addrbook/cardDialog.css)
   skin/classic/aero/messenger/addressbook/abResultsPane.css        (mail/addrbook/abResultsPane.css)
   skin/classic/aero/messenger/addressbook/icons/abcard.png         (mail/addrbook/abcard.png)
   skin/classic/aero/messenger/addressbook/icons/addrbook.png       (mail/addrbook/addrbook-aero.png)
   skin/classic/aero/messenger/addressbook/icons/ablist.png         (mail/addrbook/ablist.png)
-  skin/classic/aero/messenger/addressbook/icons/contact-generic.png             (mail/addrbook/contact-generic.png)
-  skin/classic/aero/messenger/addressbook/icons/contact-generic-tiny.png        (mail/addrbook/contact-generic-tiny.png)
-  skin/classic/aero/messenger/addressbook/icons/addressbook-toolbar.png         (mail/addrbook/addressbook-toolbar-aero.png)
-  skin/classic/aero/messenger/addressbook/icons/addressbook-toolbar-inverted.png         (mail/addrbook/addressbook-toolbar-aero-inverted.png)
+  skin/classic/aero/messenger/addressbook/icons/contact-generic.png       (mail/addrbook/contact-generic.png)
+  skin/classic/aero/messenger/addressbook/icons/contact-generic-tiny.png  (mail/addrbook/contact-generic-tiny.png)
+  skin/classic/aero/messenger/addressbook/icons/addressbook-toolbar.svg   (../shared/mail/icons/addressbook-toolbar.svg)
   skin/classic/aero/messenger/addressbook/icons/abcard-large.png   (mail/addrbook/abcard-large.png)
   skin/classic/aero/messenger/addressbook/icons/remote-addrbook.png (mail/addrbook/remote-addrbook-aero.png)
   skin/classic/aero/messenger/addressbook/icons/remote-addrbook-error.png      (mail/addrbook/remote-addrbook-error.png)
   skin/classic/aero/messenger/addressbook/icons/secure-remote-addrbook.png     (mail/addrbook/secure-remote-addrbook-aero.png)
 * skin/classic/aero/messenger/cloudfile/addAccountDialog.css       (mail/cloudfile/addAccountDialog-aero.css)
   skin/classic/aero/messenger/cloudfile/Hightail/settings.css               (mail/cloudfile/Hightail/settings.css)
   skin/classic/aero/messenger/cloudfile/Hightail/fileExceedsLimit.css       (mail/cloudfile/Hightail/fileExceedsLimit.css)
   skin/classic/aero/messenger/cloudfile/Hightail/check.png                  (mail/cloudfile/Hightail/check.png)
   skin/classic/aero/messenger/messengercompose/messengercompose.css (mail/compose/messengercompose-aero.css)
-  skin/classic/aero/messenger/messengercompose/compose-toolbar.png  (mail/compose/compose-toolbar-aero.png)
-  skin/classic/aero/messenger/messengercompose/compose-toolbar-inverted.png  (mail/compose/compose-toolbar-aero-inverted.png)
+  skin/classic/aero/messenger/messengercompose/compose-toolbar.svg  (../shared/mail/icons/compose-toolbar.svg)
   skin/classic/aero/messenger/messengercompose/noise.png           (mail/compose/noise.png)
   skin/classic/aero/messenger/messengercompose/format-buttons.png  (mail/compose/format-buttons-aero.png)
 * skin/classic/aero/messenger/downloads/aboutDownloads.css         (mail/downloads/aboutDownloads-aero.css)
   skin/classic/aero/messenger/downloads/download.svg               (mail/downloads/download.svg)
   skin/classic/aero/messenger/preferences/alwaysAsk.png            (mail/preferences/alwaysAsk.png)
   skin/classic/aero/messenger/preferences/application.png          (mail/preferences/application.png)
 * skin/classic/aero/messenger/preferences/preferences.css          (mail/preferences/preferences-aero.css)
   skin/classic/aero/messenger/preferences/general.png              (mail/preferences/general-aero.png)
@@ -452,18 +450,17 @@ classic.jar:
   skin/classic/aero/messenger/smime/icons/sbCryptoOk.png           (mail/smime/sbCryptoOk-aero.png)
   skin/classic/aero/messenger/smime/icons/sbSignNotOk.png          (mail/smime/sbSignNotOk-aero.png)
   skin/classic/aero/messenger/smime/icons/sbSignOk.png             (mail/smime/sbSignOk-aero.png)
   skin/classic/aero/messenger/smime/icons/sbSignUnknown.png        (mail/smime/sbSignUnknown-aero.png)
   skin/classic/aero/messenger/icons/timeline.png                   (mail/icons/timeline.png)
   skin/classic/aero/messenger/icons/timeline-inverted.png          (mail/icons/timeline-inverted.png)
   skin/classic/aero/messenger/icons/empty-search-results.png       (mail/icons/empty-search-results.png)
   skin/classic/aero/messenger/icons/readmail.png                   (mail/icons/readmail.png)
-  skin/classic/aero/messenger/icons/mail-toolbar.png               (mail/icons/mail-toolbar-aero.png)
-  skin/classic/aero/messenger/icons/mail-toolbar-inverted.png      (mail/icons/mail-toolbar-aero-inverted.png)
+  skin/classic/aero/messenger/icons/mail-toolbar.svg               (../shared/mail/icons/mail-toolbar.svg)
   skin/classic/aero/messenger/icons/arrow-dn-inverted.png          (mail/icons/arrow-dn-inverted.png)
   skin/classic/aero/messenger/icons/folder.png                     (mail/icons/folder-aero.png)
   skin/classic/aero/messenger/icons/message.png                    (mail/icons/message-aero.png)
   skin/classic/aero/messenger/icons/multicolor.png                 (mail/icons/multicolor.png)
   skin/classic/aero/messenger/icons/license.txt                    (mail/icons/license.txt)
   skin/classic/aero/messenger/icons/appmenu-icons.png              (mail/icons/appmenu-icons.png)
   skin/classic/aero/messenger/icons/attachment-deleted.png         (mail/icons/attachment-deleted.png)
   skin/classic/aero/messenger/icons/attachment-deleted-large.png   (mail/icons/attachment-deleted-large.png)
@@ -553,20 +550,17 @@ classic.jar:
   skin/classic/aero/messenger/icons/arrow/foldercycler-arrow-left.png        (mail/icons/arrow/foldercycler-arrow-left.png)
   skin/classic/aero/messenger/icons/arrow/foldercycler-arrow-right.png       (mail/icons/arrow/foldercycler-arrow-right.png)
   skin/classic/aero/messenger/icons/xp-pin-grey.png                (mail/icons/xp-pin-grey.png)
   skin/classic/aero/messenger/icons/xp-pin-red.png                 (mail/icons/xp-pin-red.png)
   skin/classic/aero/messenger/icons/connecting.png                 (mail/icons/connecting.png)
   skin/classic/aero/messenger/icons/loading.png                    (mail/icons/loading.png)
   skin/classic/aero/messenger/icons/notloading.png                 (mail/icons/notloading.png)
   skin/classic/aero/messenger/tagbg.png                            (mail/tagbg.png)
-  skin/classic/aero/messenger/icons/download.png                   (mail/icons/download.png)
-  skin/classic/aero/messenger/icons/download-inverted.png          (mail/icons/download-inverted.png)
-  skin/classic/aero/messenger/icons/chat-toolbar.png               (mail/icons/chat-toolbar-aero.png)
-  skin/classic/aero/messenger/icons/chat-toolbar-inverted.png      (mail/icons/chat-toolbar-aero-inverted.png)
+  skin/classic/aero/messenger/icons/chat-toolbar.svg               (../shared/mail/icons/chat-toolbar.svg)
   skin/classic/aero/messenger/icons/status.png                     (mail/icons/status-aero.png)
   skin/classic/aero/messenger/icons/status-small.png               (mail/icons/status-small-aero.png)
 % skin messenger-newsblog classic/1.0 %skin/classic/aero/messenger-newsblog/ os=WINNT osversion>=6
   skin/classic/aero/messenger-newsblog/feed-subscriptions.css      (mail/newsblog/feed-subscriptions.css)
   skin/classic/aero/messenger-newsblog/icons/rss-feed.png          (mail/newsblog/rss-feed.png)
   skin/classic/aero/messenger-newsblog/icons/server-rss.png        (mail/newsblog/server-rss-aero.png)
   skin/classic/aero/messenger/newmailaccount/accountProvisioner.css (mail/newmailaccount/accountProvisioner.css)
   skin/classic/aero/messenger/newmailaccount/search.gif            (mail/newmailaccount/search.gif)
--- a/mail/themes/windows/mail/addrbook/addressbook-aero.css
+++ b/mail/themes/windows/mail/addrbook/addressbook-aero.css
@@ -276,67 +276,80 @@ toolbox[labelalign="end"] .toolbarbutton
 .toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-dropmarker,
 .toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-button >
 .toolbarbutton-icon {
   opacity: .4;
 }
 
 .toolbarbutton-menubutton-button > .toolbarbutton-icon,
 .toolbarbutton-1 > .toolbarbutton-icon {
-  margin: 1px;
-  width: 16px;
-  height: 16px;
+  width: 18px;
+  height: 18px;
 }
 
 toolbox[labelalign="end"] > toolbar[mode="full"] .toolbarbutton-1
 .toolbarbutton-text {
   -moz-padding-start: 2px;
   -moz-padding-end: 2px;
 }
 
 @media (-moz-windows-glass) {
   #ab-toolbox:not(:-moz-lwtheme) {
     color: black;
     text-shadow: 0 0 .7em white, 0 0 .7em white, 0 1px 0 rgba(255, 255, 255, .4);
     border-bottom-color: #AABCCF;
   }
 }
 
-#ab-bar2[brighttext] .toolbarbutton-1 {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-inverted.png");
-}
-
 #button-newcard {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
-  -moz-image-region: rect(1px 17px 17px 1px);
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newcard");
 }
 
 #button-newlist {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
-  -moz-image-region: rect(1px 35px 17px 19px);
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newlist");
 }
 
 #button-editcard {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
-  -moz-image-region: rect(1px 53px 17px 37px);
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#editcard");
 }
 
 #button-newmessage {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
-  -moz-image-region: rect(1px 71px 17px 55px);
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newmessage");
 }
 
 #button-newim {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
-  -moz-image-region: rect(1px 89px 17px 73px);
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newim");
 }
 
 #button-abdelete {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
-  -moz-image-region: rect(1px 107px 17px 91px);
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#abdelete");
+}
+
+#ab-bar2[brighttext] #button-newcard {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newcard-inverted");
+}
+
+#ab-bar2[brighttext] #button-newlist {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newlist-inverted");
+}
+
+#ab-bar2[brighttext] #button-editcard {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#editcard-inverted");
+}
+
+#ab-bar2[brighttext] #button-newmessage {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newmessage-inverted");
+}
+
+#ab-bar2[brighttext] #button-newim {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newim-inverted");
+}
+
+#ab-bar2[brighttext] #button-abdelete {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#abdelete-inverted");
 }
 
 #abContent {
   text-shadow: none;
   background-color: -moz-Dialog;
 }
 
 /* ::::: Search Textbox ::::: */
deleted file mode 100644
index 0aad2e450d1596b957617535276ca1a6526c19fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 5f2dfb5abed051a98296a5329414dc4d4864473c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/mail/themes/windows/mail/chat-aero.css
+++ b/mail/themes/windows/mail/chat-aero.css
@@ -242,46 +242,46 @@
 
   #contactlistbox:focus > :-moz-any(imconv, imcontact, imgroup)[selected] {
     background-image: linear-gradient(rgba(131, 183, 249, .375),
                                       rgba(131, 183, 249, .375));
     border-width: 1px;
   }
 }
 
-#button-add-buddy,
-#button-add-buddy[disabled],
-toolbar[iconsize="small"] #button-add-buddy,
-toolbar[iconsize="small"] #button-add-buddy[disabled] {
-  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.png");
-  -moz-image-region: rect(1px 17px 17px 1px);
+#button-add-buddy {
+  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.svg#add");
 }
 
-#button-join-chat,
-#button-join-chat[disabled],
-toolbar[iconsize="small"] #button-join-chat,
-toolbar[iconsize="small"] #button-join-chat[disabled] {
-  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.png");
-  -moz-image-region: rect(1px 35px 17px 19px);
+#button-join-chat {
+  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.svg#join");
 }
 
-#button-chat-accounts,
-#button-chat-accounts[disabled],
-toolbar[iconsize="small"] #button-chat-accounts,
-toolbar[iconsize="small"] #button-chat-accounts[disabled] {
-  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.png");
-  -moz-image-region: rect(1px 53px 17px 37px);
+#button-chat-accounts {
+  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.svg#accounts");
 }
 
-toolbar[brighttext] #button-add-buddy,
-toolbar[brighttext] #button-add-buddy[disabled],
-toolbar[brighttext] #button-join-chat,
-toolbar[brighttext] #button-join-chat[disabled],
-toolbar[brighttext] #button-chat-accounts,
-toolbar[brighttext] #button-chat-accounts[disabled] {
-  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar-inverted.png");
+toolbar[brighttext] #button-add-buddy {
+  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.svg#add-inverted");
+}
+
+toolbar[brighttext] #button-join-chat {
+  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.svg#join-inverted");
+}
+
+toolbar[brighttext] #button-chat-accounts {
+  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.svg#accounts-inverted");
 }
 
 .tabmail-tab[type="chat"],
 .alltabs-item[type="chat"] {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(1px, 395px, 17px, 379px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#chat");
+  -moz-image-region: auto;
 }
+
+.tabmail-tab[type="chat"] > .tab-stack > .tab-content > .tab-icon-image {
+  width: 18px;
+  height: 18px;
+  margin-top: 0;
+  -moz-margin-end: 5px;
+  margin-bottom: -1px;
+  -moz-margin-start: -1px;
+}
--- a/mail/themes/windows/mail/chat.css
+++ b/mail/themes/windows/mail/chat.css
@@ -123,76 +123,78 @@
 }
 
 #contactlistbox:focus > :-moz-any(imconv, imcontact, imgroup)[selected] {
   background-color: Highlight;
   color: HighlightText;
   border: 1px dotted #F3D982;
 }
 
-#button-add-buddy {
-  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.png");
-  -moz-image-region: rect(0px 22px 22px 0px);
-}
+@media (-moz-os-version: windows-xp) {
+  #button-add-buddy {
+    list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.png");
+    -moz-image-region: rect(0px 22px 22px 0px);
+  }
 
-#button-add-buddy[disabled] {
-  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.png");
-  -moz-image-region: rect(22px 22px 44px 0px);
-}
-
-#button-join-chat {
-  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.png");
-  -moz-image-region: rect(0px 44px 22px 22px);
-}
+  #button-add-buddy[disabled] {
+    list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.png");
+    -moz-image-region: rect(22px 22px 44px 0px);
+  }
 
-#button-join-chat[disabled] {
-  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.png");
-  -moz-image-region: rect(22px 44px 44px 22px);
-}
+  #button-join-chat {
+    list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.png");
+    -moz-image-region: rect(0px 44px 22px 22px);
+  }
+
+  #button-join-chat[disabled] {
+    list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.png");
+    -moz-image-region: rect(22px 44px 44px 22px);
+  }
 
-#button-chat-accounts {
-  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.png");
-  -moz-image-region: rect(0px 66px 22px 44px);
-}
+  #button-chat-accounts {
+    list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.png");
+    -moz-image-region: rect(0px 66px 22px 44px);
+  }
 
-#button-chat-accounts[disabled] {
-  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.png");
-  -moz-image-region: rect(22px 66px 44px 44px);
-}
+  #button-chat-accounts[disabled] {
+    list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.png");
+    -moz-image-region: rect(22px 66px 44px 44px);
+  }
 
-/* Small toolbar icons */
+  /* Small toolbar icons */
 
-toolbar[iconsize="small"] #button-add-buddy {
-  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar-small.png");
-  -moz-image-region: rect(0px 16px 16px 0px);
-}
+  toolbar[iconsize="small"] #button-add-buddy {
+    list-style-image: url("chrome://messenger/skin/icons/chat-toolbar-small.png");
+    -moz-image-region: rect(0px 16px 16px 0px);
+  }
 
-toolbar[iconsize="small"] #button-add-buddy[disabled] {
-  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar-small.png");
-  -moz-image-region: rect(16px 16px 32px 0px);
-}
+  toolbar[iconsize="small"] #button-add-buddy[disabled] {
+    list-style-image: url("chrome://messenger/skin/icons/chat-toolbar-small.png");
+    -moz-image-region: rect(16px 16px 32px 0px);
+  }
 
-toolbar[iconsize="small"] #button-join-chat {
-  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar-small.png");
-  -moz-image-region: rect(0px 32px 16px 16px);
-}
+  toolbar[iconsize="small"] #button-join-chat {
+    list-style-image: url("chrome://messenger/skin/icons/chat-toolbar-small.png");
+    -moz-image-region: rect(0px 32px 16px 16px);
+  }
+
+  toolbar[iconsize="small"] #button-join-chat[disabled] {
+    list-style-image: url("chrome://messenger/skin/icons/chat-toolbar-small.png");
+    -moz-image-region: rect(16px 32px 32px 16px);
+  }
 
-toolbar[iconsize="small"] #button-join-chat[disabled] {
-  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar-small.png");
-  -moz-image-region: rect(16px 32px 32px 16px);
-}
+  toolbar[iconsize="small"] #button-chat-accounts {
+    list-style-image: url("chrome://messenger/skin/icons/chat-toolbar-small.png");
+    -moz-image-region: rect(0px 48px 16px 32px);
+  }
 
-toolbar[iconsize="small"] #button-chat-accounts {
-  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar-small.png");
-  -moz-image-region: rect(0px 48px 16px 32px);
-}
-
-toolbar[iconsize="small"] #button-chat-accounts[disabled] {
-  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar-small.png");
-  -moz-image-region: rect(16px 48px 32px 32px);
+  toolbar[iconsize="small"] #button-chat-accounts[disabled] {
+    list-style-image: url("chrome://messenger/skin/icons/chat-toolbar-small.png");
+    -moz-image-region: rect(16px 48px 32px 32px);
+  }
 }
 
 #statusTypeIcon[status="available"],
 #statusTypeAvailable,
 .statusTypeIcon[status="available"],
 #imStatusAvailable,
 #appmenu_imStatusAvailable,
 richlistitem[state="connected"] .accountStateIcon {
deleted file mode 100644
index 077ee5980c870f8574a3c64beb9196e43028aff4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 55612fb756ff9601b2a632aa7474a26b939d914e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/mail/themes/windows/mail/compose/messengercompose-aero.css
+++ b/mail/themes/windows/mail/compose/messengercompose-aero.css
@@ -392,19 +392,18 @@ toolbox[labelalign="end"] .toolbarbutton
 .toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-dropmarker,
 .toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-button >
 .toolbarbutton-icon {
   opacity: .4;
 }
 
 .toolbarbutton-menubutton-button > .toolbarbutton-icon,
 .toolbarbutton-1 > .toolbarbutton-icon {
-  margin: 1px;
-  width: 16px;
-  height: 16px;
+  width: 18px;
+  height: 18px;
 }
 
 toolbox[labelalign="end"] > toolbar[mode="full"] .toolbarbutton-1
 .toolbarbutton-text {
   -moz-padding-start: 2px;
   -moz-padding-end: 2px;
 }
 
@@ -473,74 +472,103 @@ toolbox[labelalign="end"] > toolbar[mode
     border-bottom-color: #AABCCF;
   }
 
   #composeContentBox {
     background-image: url("chrome://messenger/skin/messengercompose/noise.png");
   }
 }
 
-#composeToolbar2[brighttext] .toolbarbutton-1 {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar-inverted.png");
-}
-
 #button-send {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png");
-  -moz-image-region: rect(1px 17px 17px 1px);
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#send");
 }
 
 #button-contacts {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png");
-  -moz-image-region: rect(1px 35px 17px 19px) !important;
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#contacts");
+  -moz-image-region: auto !important;
 }
 
 #spellingButton {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png");
-  -moz-image-region: rect(1px 53px 17px 37px);
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#spelling");
 }
 
 #button-attach {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png");
-  -moz-image-region: rect(1px 71px 17px 55px);
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#attach");
 }
 
 #button-security {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png") !important;
-  -moz-image-region: rect(1px 89px 17px 73px) !important;
-}
-
-toolbar[brighttext] #button-security {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar-inverted.png") !important;
-  -moz-image-region: rect(1px 89px 17px 73px) !important;
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#security");
 }
 
 #button-save {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png");
-  -moz-image-region: rect(1px 107px 17px 91px);
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#save");
 }
 
 #quoteButton {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png");
-  -moz-image-region: rect(1px 125px 17px 109px);
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#quote");
 }
+
 #cut-button {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png");
-  -moz-image-region: rect(1px 143px 17px 127px);
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#cut");
 }
+
 #copy-button {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png");
-  -moz-image-region: rect(1px 161px 17px 145px);
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#copy");
 }
+
 #paste-button {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png");
-  -moz-image-region: rect(1px 179px 17px 163px);
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#paste");
+}
+
+#button-print {
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#print");
+}
+
+toolbar[brighttext] #button-send {
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#send-inverted");
+}
+
+toolbar[brighttext] #button-contacts {
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#contacts-inverted");
+}
+
+toolbar[brighttext] #spellingButton {
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#spelling-inverted");
+}
+
+toolbar[brighttext] #button-attach {
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#attach-inverted");
 }
-#button-print {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png");
-  -moz-image-region: rect(1px 197px 17px 181px);
+
+toolbar[brighttext] #button-security {
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#security-inverted");
+}
+
+toolbar[brighttext] #button-save {
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#save-inverted");
+}
+
+toolbar[brighttext] #quoteButton {
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#quote-inverted");
+}
+
+toolbar[brighttext] #cut-button {
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#cut-inverted");
+}
+
+toolbar[brighttext] #copy-button {
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#copy-inverted");
+}
+
+toolbar[brighttext] #paste-button {
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#paste-inverted");
+}
+
+toolbar[brighttext] #button-print {
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#print-inverted");
 }
 
 /* ::::: special toolbar colors ::::: */
 
 #attachmentbucket-sizer {
   position: relative;
   z-index: 10;
   min-width: 0;
--- a/mail/themes/windows/mail/compose/messengercompose.css
+++ b/mail/themes/windows/mail/compose/messengercompose.css
@@ -96,16 +96,29 @@ toolbox[labelalign="end"] > toolbar[mode
 #button-attach:hover {
   -moz-image-region: rect(24px 96px 48px 72px);
 }
 
 #button-attach[disabled="true"] {
   -moz-image-region: rect(48px 96px 72px 72px) !important;
 }
 
+#button-security {
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png");
+  -moz-image-region: rect(0px 120px 24px 96px);
+}
+
+#button-security:hover {
+  -moz-image-region: rect(24px 120px 48px 96px);
+}
+
+#button-security[disabled] {
+  -moz-image-region: rect(48px 120px 72px 96px) !important;
+}
+
 #button-save {
   list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png");
   -moz-image-region: rect(0px 144px 24px 120px);
 }
 
 #button-save:hover {
   -moz-image-region: rect(24px 144px 48px 120px);
 }
@@ -228,16 +241,29 @@ toolbar[iconsize="small"] #button-attach
 toolbar[iconsize="small"] #button-attach:hover {
   -moz-image-region: rect(16px 64px 32px 48px);
 }
 
 toolbar[iconsize="small"] #button-attach[disabled="true"] {
   -moz-image-region: rect(32px 64px 48px 48px) !important;
 }
 
+toolbar[iconsize="small"] #button-security {
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar-small.png");
+  -moz-image-region: rect(0px 80px 16px 64px);
+}
+
+toolbar[iconsize="small"] #button-security:hover {
+  -moz-image-region: rect(16px 80px 32px 64px);
+}
+
+toolbar[iconsize="small"] #button-security[disabled] {
+  -moz-image-region: rect(32px 80px 48px 64px) !important;
+}
+
 toolbar[iconsize="small"] #button-save {
   list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar-small.png");
   -moz-image-region: rect(0px 96px 16px 80px);
 }
 
 toolbar[iconsize="small"] #button-save:hover {
   -moz-image-region: rect(16px 96px 32px 80px);
 }
deleted file mode 100644
index d57461a1a2b2a09bc353eeebae33f66f3bcd625e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 8ec3b4206931a90ec6046ea5c9b33f2b11d5b993..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 0492abd67fccb4ed1ce4ca451f0db6268c0ae599..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 19938e937fc5e5e737b10152120ab9a541aff3d9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/mail/themes/windows/mail/messageHeader-aero.css
+++ b/mail/themes/windows/mail/messageHeader-aero.css
@@ -120,26 +120,16 @@
 }
 
 #attachmentSize {
   margin: 0;
   -moz-margin-start: 8px;
   color: #888a85; /* the same color as .headerName */
 }
 
-#attachmentSaveAllSingle,
-#attachmentSaveAllMultiple {
-  list-style-image: url("chrome://messenger/skin/icons/download.png");
-}
-
-toolbar[brighttext] #attachmentSaveAllSingle,
-toolbar[brighttext] #attachmentSaveAllMultiple {
-  list-style-image: url("chrome://messenger/skin/icons/download-inverted.png");
-}
-
 #attachmentView {
   border-top: 1px solid #A9B7C9; /* The same color as the splitters */
 }
 
 #attachmentBar {
   color: -moz-dialogtext;
   background-color: -moz-Dialog;
 }
@@ -316,57 +306,94 @@ toolbarpaletteitem .msgHeaderView-button
 toolbox[labelalign="end"] toolbar[mode="full"]
 .msgHeaderView-button .toolbarbutton-text {
   -moz-margin-start: 2px !important;
 }
 
 .hdrReplyToSenderButton,
 .hdrDummyReplyButton,
 .hdrReplyButton {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(1px, 71px, 17px, 55px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#reply");
 }
 
 .hdrReplyAllButton {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(1px, 89px, 17px, 73px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replyall");
 }
 
 .hdrReplyListButton,
 .hdrFollowupButton {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(1px, 125px, 17px, 109px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replylist");
 }
 
 .hdrForwardButton {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(1px, 107px, 17px, 91px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#forward");
 }
 
 .hdrArchiveButton {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(1px, 359px, 17px, 343px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#archive");
 }
 
 .hdrJunkButton {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(1px, 161px, 17px, 145px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#junk");
 }
 
 .hdrTrashButton {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(1px, 143px, 17px, 127px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#delete");
 }
 
 .hdrTagButton {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(1px, 287px, 17px, 271px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#tag");
+}
+
+#attachmentSaveAllSingle,
+#attachmentSaveAllMultiple {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#file");
+}
+
+toolbar[brighttext] .hdrReplyToSenderButton,
+toolbar[brighttext] .hdrDummyReplyButton,
+toolbar[brighttext] .hdrReplyButton {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#reply-inverted");
+}
+
+toolbar[brighttext] .hdrReplyAllButton {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replyall-inverted");
+}
+
+toolbar[brighttext] .hdrReplyListButton,
+toolbar[brighttext] .hdrFollowupButton {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replylist-inverted");
 }
 
-#otherActionsButton > .toolbarbutton-icon {
+toolbar[brighttext] .hdrForwardButton {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#forward-inverted");
+}
+
+toolbar[brighttext] .hdrArchiveButton {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#archive-inverted");
+}
+
+toolbar[brighttext] .hdrJunkButton {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#junk-inverted");
+}
+
+toolbar[brighttext] .hdrTrashButton {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#delete-inverted");
+}
+
+toolbar[brighttext] .hdrTagButton {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#tag-inverted");
+}
+
+toolbar[brighttext] #attachmentSaveAllSingle,
+toolbar[brighttext] #attachmentSaveAllMultiple {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#file-inverted");
+}
+
+#otherActionsButton > hbox > vbox > .toolbarbutton-icon {
   display: none;
 }
 
 #otherActionsButton > hbox > .toolbarbutton-menu-dropmarker {
   -moz-padding-end: 3px;
 }
 
 /* show a icon in customize window */
@@ -374,20 +401,16 @@ toolbox[labelalign="end"] toolbar[mode="
   .toolbarbutton-icon {
   display: -moz-box;
   width: 9px;
   padding-top: 4px;
   padding-bottom: 4px;
   list-style-image: url("chrome://messenger/skin/icons/toolbarbutton-arrow.png");
 }
 
-#header-view-toolbox > toolbar[brighttext] .toolbarbutton-1 {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-inverted.png");
-}
-
 toolbar[brighttext] .toolbarbutton-1 .toolbarbutton-menu-dropmarker,
 toolbar[brighttext] .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
   list-style-image: url("chrome://messenger/skin/icons/toolbarbutton-arrow-inverted.png");
 }
 
 .inline-toolbar toolbarpaletteitem toolbarseparator,
 .inline-toolbar toolbarseparator {
   height: 24px;
@@ -566,23 +589,12 @@ mail-emailaddress[selected="true"] .emai
 }
 
 /* ::::: view expand and collapse twisties  ::::: */
 
 .expandHeaderViewButton {
   list-style-image: url("chrome://global/skin/tree/twisty-open.png");
 }
 
-/* This is a workaround for #562608 to make the buttons smaller */
-.hdrArchiveButton > .button-box > .button-icon {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(1px, 360px, 17px, 343px);
-}
-
-.hdrTrashButton > .button-box > .button-icon {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(1px, 144px, 17px, 127px);
-}
-
 #header-view-toolbox {
   float: right;
   padding-top: 1px;
 }
--- a/mail/themes/windows/mail/primaryToolbar-aero.css
+++ b/mail/themes/windows/mail/primaryToolbar-aero.css
@@ -274,20 +274,19 @@
 .toolbarbutton-1[disabled=true] .toolbarbutton-menu-dropmarker,
 .toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-dropmarker,
 .toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-button >
 .toolbarbutton-icon {
   opacity: .4;
 }
 
 .toolbarbutton-menubutton-button > .toolbarbutton-icon,
-.toolbarbutton-1 > .toolbarbutton-icon {
-  margin: 1px;
-  width: 16px;
-  height: 16px;
+.toolbarbutton-1 .toolbarbutton-icon {
+  width: 18px;
+  height: 18px;
 }
 
 toolbox[labelalign="end"] > toolbar[mode="full"] .toolbarbutton-1 .toolbarbutton-text {
   -moz-padding-end: 2px;
 }
 
 /* ::::: toolbar buttons on tabbar toolbar ::::: */
 
@@ -473,173 +472,249 @@ toolbox[labelalign="end"] > toolbar[mode
     }
 
     #messengerWindow:not([tabsintitlebar]) #mail-menubar > menu {
       -moz-appearance: none;
     }
   }
 }
 
-#mail-toolbox > toolbar[brighttext] .toolbarbutton-1,
-#navigation-toolbox > toolbar[brighttext] .toolbarbutton-1 {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-inverted.png");
-}
-
 toolbar[brighttext] .toolbarbutton-1 .toolbarbutton-menu-dropmarker,
 toolbar[brighttext] .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
   list-style-image: url("chrome://messenger/skin/icons/toolbarbutton-arrow-inverted.png");
 }
 
 #button-getmsg {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(1px, 17px, 17px, 1px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#getmsg");
 }
 
 #button-newmsg {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(1px, 35px, 17px, 19px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#newmsg");
 }
 
 #button-address {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(1px, 53px, 17px, 37px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#address");
 }
 
 #button-reply {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(1px, 71px, 17px, 55px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#reply");
 }
 
 #button-replyall {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(1px, 89px, 17px, 73px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replyall");
 }
 
 #button-replylist {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(1px, 125px, 17px, 109px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replylist");
 }
 
 #button-forward {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(1px, 107px, 17px, 91px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#forward");
 }
 
 .delete-button {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(1px, 143px, 17px, 127px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#delete");
 }
 
 .junk-button {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(1px, 161px, 17px, 145px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#junk");
 }
 
 #button-print {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(1px 179px 17px 163px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#print");
 }
 
 #button-stop {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(1px 197px 17px 181px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#stop");
 }
 
 #button-file {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(1px 215px 17px 199px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#file");
 }
 
 #button-nextUnread {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(1px 233px 17px 217px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#nextUnread");
 }
 
 #button-previousUnread {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(1px 251px 17px 235px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#previousUnread");
 }
 
 #button-mark {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(1px, 269px, 17px, 253px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#mark");
 }
 
 #button-tag {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(1px, 287px, 17px, 271px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#tag");
 }
 
 #button-goback {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(1px, 305px, 17px, 289px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#goback");
 }
 
 #button-goforward {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(1px, 323px, 17px, 307px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#goforward");
 }
 
 #button-compact {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(1px, 341px, 17px, 325px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#compact");
 }
 
 #button-archive {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(1px, 359px, 17px, 343px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#archive");
 }
 
 #button-chat {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(1px, 395px, 17px, 379px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#chat");
+}
+
+#button-nextMsg {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#nextMsg");
+}
+
+#button-previousMsg {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#previousMsg");
+}
+
+#qfb-show-filter-bar {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#filter");
+}
+
+.button-appmenu {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#appButton");
+}
+
+toolbar[brighttext] #button-getmsg {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#getmsg-inverted");
+}
+
+toolbar[brighttext] #button-newmsg {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#newmsg-inverted");
+}
+
+toolbar[brighttext] #button-address {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#address-inverted");
+}
+
+toolbar[brighttext] #button-reply {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#reply-inverted");
+}
+
+toolbar[brighttext] #button-replyall {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replyall-inverted");
+}
+
+toolbar[brighttext] #button-replylist {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replylist-inverted");
+}
+
+toolbar[brighttext] #button-forward {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#forward-inverted");
+}
+
+toolbar[brighttext] .delete-button {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#delete-inverted");
+}
+
+toolbar[brighttext] .junk-button {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#junk-inverted");
+}
+
+toolbar[brighttext] #button-print {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#print-inverted");
+}
+
+toolbar[brighttext] #button-stop {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#stop-inverted");
 }
 
-#button-chat[unreadMessages="true"] {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(19px, 395px, 35px, 379px);
+toolbar[brighttext] #button-file {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#file-inverted");
+}
+
+toolbar[brighttext] #button-next > #button-nextUnread {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#nextUnread-inverted");
+}
+
+toolbar[brighttext] #button-previous > #button-previousUnread {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#previousUnread-inverted");
+}
+
+toolbar[brighttext] #button-mark {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#mark-inverted");
+}
+
+toolbar[brighttext] #button-tag {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#tag-inverted");
+}
+
+toolbar[brighttext] #button-goback {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#goback-inverted");
+}
+
+toolbar[brighttext] #button-goforward {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#goforward-inverted");
+}
+
+toolbar[brighttext] #button-compact {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#compact-inverted");
+}
+
+toolbar[brighttext] #button-archive {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#archive-inverted");
+}
+
+toolbar[brighttext] #button-chat {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#chat-inverted");
+}
+
+toolbar[brighttext] #button-nextMsg {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#nextMsg-inverted");
+}
+
+toolbar[brighttext] #button-previousMsg {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#previousMsg-inverted");
+}
+
+toolbar[brighttext] #qfb-show-filter-bar {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#filter-inverted");
+}
+
+toolbar[brighttext] .button-appmenu {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#appButton-inverted");
+}
+
+toolbar > #button-chat[unreadMessages="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#chat-unread");
+}
+
+.button-appmenu {
+  min-width: 35px !important;
 }
 
 toolbar:not([mode="text"]) > #button-chat > stack,
 toolbar:not([mode="text"]) > toolbarpaletteitem > #button-chat > stack {
   margin: 1px;
 }
 
 toolbar[iconsize="large"]:not([mode="text"]) .badgeButton-badge {
-  -moz-margin-start: 5px;
-  margin-bottom: 5px;
-}
-
-#button-nextMsg {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(1px, 413px, 17px, 397px);
-}
-
-#button-previousMsg {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(1px, 431px, 17px, 415px);
-}
-
-.button-appmenu {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(1px, 449px, 17px, 433px);
-  min-width: 35px !important;
+  -moz-margin-start: 7px;
+  margin-bottom: 7px;
 }
 
 #palette-box .toolbarbutton-1,
 #palette-box .toolbarbutton-menubutton-button,
 #palette-box .toolbarbutton-menubutton-dropmarker {
   border: none;
   background: none;
   box-shadow: none;
 }
 
 #palette-box #qfb-show-filter-bar {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(1px, 377px, 17px, 361px);
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#filter");
 }
 
 /* remove the small icons checkbox in Customize window */
 #smallicons {
   display: none;
 }
 
 /* AppMenu styling */
--- a/mail/themes/windows/mail/primaryToolbar.css
+++ b/mail/themes/windows/mail/primaryToolbar.css
@@ -545,16 +545,25 @@ toolbox[labelalign="end"] > toolbar[mode
 #button-previousMsg:hover {
   -moz-image-region: rect(24px 576px 48px 552px);
 }
 
 #button-previousMsg[disabled] {
   -moz-image-region: rect(48px 576px 72px 552px) !important;
 }
 
+#qfb-show-filter-bar {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
+  -moz-image-region: rect(0px 336px 16px 320px);
+}
+
+#qfb-show-filter-bar[disabled="true"] {
+  -moz-image-region: rect(32px 336px 48px 320px);
+}
+
 .button-appmenu {
   list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
   -moz-image-region: rect(0px 600px 24px 576px);
   min-width: 35px !important;
 }
 
 .button-appmenu:hover {
   -moz-image-region: rect(24px 600px 48px 576px);
@@ -877,16 +886,25 @@ toolbar[iconsize="small"] #button-previo
 toolbar[iconsize="small"] #button-previousMsg:hover {
   -moz-image-region: rect(16px 384px 32px 368px);
 }
 
 toolbar[iconsize="small"] #button-previousMsg[disabled] {
   -moz-image-region: rect(32px 384px 48px 368px) !important;
 }
 
+toolbar[iconsize="large"] #qfb-show-filter-bar {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
+  -moz-image-region: rect(0px 504px 24px 480px);
+}
+
+toolbar[iconsize="large"] #qfb-show-filter-bar[disabled="true"] {
+  -moz-image-region: rect(48px 504px 72px 480px);
+}
+
 toolbar[iconsize="small"] .button-appmenu {
   list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
   -moz-image-region: rect(0px 400px 16px 384px);
 }
 
 toolbar[iconsize="small"] .button-appmenu:hover {
   -moz-image-region: rect(16px 400px 32px 384px);
 }
--- a/mail/themes/windows/mail/quickFilterBar-aero.css
+++ b/mail/themes/windows/mail/quickFilterBar-aero.css
@@ -1,21 +1,14 @@
 /* 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/. */
 
 @import url("chrome://messenger/content/quickFilterBar.css");
 
-/* :::: Filter Tab Bar Button :::: */
-
-#qfb-show-filter-bar {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(1px, 377px, 17px, 361px);
-}
-
 #tabbar-toolbar #qfb-show-filter-bar {
   padding-left: 4px !important;
   padding-right: 4px !important;
 }
 
 /* :::: Filter Bar :::: */
 
 #quick-filter-bar-main-bar {
--- a/mail/themes/windows/mail/quickFilterBar.css
+++ b/mail/themes/windows/mail/quickFilterBar.css
@@ -1,34 +1,16 @@
 /* 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/. */
 
 @import url("chrome://messenger/content/quickFilterBar.css");
 
 /* :::: Filter Tab Bar Button :::: */
 
-#qfb-show-filter-bar {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
-  -moz-image-region: rect(0px 336px 16px 320px);
-}
-
-toolbar[iconsize="large"] #qfb-show-filter-bar {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 504px 24px 480px);
-}
-
-#qfb-show-filter-bar[disabled="true"] {
-  -moz-image-region: rect(32px 336px 48px 320px);
-}
-
-toolbar[iconsize="large"] #qfb-show-filter-bar[disabled="true"] {
-  -moz-image-region: rect(48px 504px 72px 480px);
-}
-
 #qfb-show-filter-bar > .toolbarbutton-icon {
   padding: 0 3px;
 }
 
 /* ::::: QFB button on main toolbar ::::: */
 
 #mail-toolbox #qfb-show-filter-bar {
   margin: 0;
--- a/mail/themes/windows/mail/smime/msgCompSMIMEOverlay.css
+++ b/mail/themes/windows/mail/smime/msgCompSMIMEOverlay.css
@@ -3,42 +3,16 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== msgCompSMIMEOverlay.css ========================================
   == Styles for the S/Mime in composer window.
   ======================================================================= */
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-#button-security {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png");
-  -moz-image-region: rect(0px 120px 24px 96px);
-}
-
-#button-security:hover {
-  -moz-image-region: rect(24px 120px 48px 96px);
-}
-
-#button-security[disabled] {
-  -moz-image-region: rect(48px 120px 72px 96px) !important;
-}
-
-toolbar[iconsize="small"] #button-security {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar-small.png");
-  -moz-image-region: rect(0px 80px 16px 64px);
-}
-
-toolbar[iconsize="small"] #button-security:hover {
-  -moz-image-region: rect(16px 80px 32px 64px);
-}
-
-toolbar[iconsize="small"] #button-security[disabled] {
-  -moz-image-region: rect(32px 80px 48px 64px) !important;
-}
-
 #msgcomposeWindow #signing-status {
   list-style-image: none;
   visibility: collapse;
 }
 
 #msgcomposeWindow[signing="ok"] #signing-status {
   list-style-image: url("chrome://messenger/skin/smime/icons/sbSignOk.png");
   visibility: visible;