Backed out changeset def852abeaf2 (bug 1404696) for package problems. a=backout
authorJorg K <jorgk@jorgk.com>
Sat, 07 Oct 2017 00:35:02 +0200
changeset 29113 55159bf4efc9b3960577e5c6f55e334a061a3723
parent 29112 dbfda895d18d111772e4ebf0002ccb97c77eaf31
child 29114 91eec4d4f89b73547050d1e6bfbde7e40c90ba4a
push id2068
push userclokep@gmail.com
push dateMon, 13 Nov 2017 19:02:14 +0000
treeherdercomm-beta@9c7e7ce8672b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1404696
backs outdef852abeaf2ead9b650f43516aff015aed2c6d9
Backed out changeset def852abeaf2 (bug 1404696) for package problems. a=backout
calendar/lightning/themes/common/lightning.css
calendar/lightning/themes/linux/lightning.css
calendar/lightning/themes/osx/lightning.css
calendar/lightning/themes/windows/lightning.css
mail/components/im/themes/chat.css
mail/themes/linux/mail/addrbook/addressbook.css
mail/themes/linux/mail/chat.css
mail/themes/linux/mail/compose/messengercompose.css
mail/themes/linux/mail/messageHeader.css
mail/themes/linux/mail/messenger.css
mail/themes/linux/mail/primaryToolbar.css
mail/themes/osx/mail/addrbook/addressbook.css
mail/themes/osx/mail/chat.css
mail/themes/osx/mail/compose/messengercompose.css
mail/themes/osx/mail/messageHeader.css
mail/themes/osx/mail/messenger.css
mail/themes/osx/mail/primaryToolbar.css
mail/themes/shared/jar.inc.mn
mail/themes/shared/mail/addressbook.css
mail/themes/shared/mail/icons/accounts.svg
mail/themes/shared/mail/icons/addcontact.svg
mail/themes/shared/mail/icons/addlist.svg
mail/themes/shared/mail/icons/address.svg
mail/themes/shared/mail/icons/addressbook-toolbar-osxlion.svg
mail/themes/shared/mail/icons/addressbook-toolbar.svg
mail/themes/shared/mail/icons/appbutton.svg
mail/themes/shared/mail/icons/archive.svg
mail/themes/shared/mail/icons/chat-toolbar-osxlion.svg
mail/themes/shared/mail/icons/chat-toolbar.svg
mail/themes/shared/mail/icons/chat.svg
mail/themes/shared/mail/icons/compact.svg
mail/themes/shared/mail/icons/compose-toolbar-osxlion.svg
mail/themes/shared/mail/icons/compose-toolbar.svg
mail/themes/shared/mail/icons/conversation.svg
mail/themes/shared/mail/icons/copy.svg
mail/themes/shared/mail/icons/cut.svg
mail/themes/shared/mail/icons/delete.svg
mail/themes/shared/mail/icons/file.svg
mail/themes/shared/mail/icons/filter.svg
mail/themes/shared/mail/icons/forward.svg
mail/themes/shared/mail/icons/getmsg.svg
mail/themes/shared/mail/icons/goback.svg
mail/themes/shared/mail/icons/goforward.svg
mail/themes/shared/mail/icons/join.svg
mail/themes/shared/mail/icons/junk.svg
mail/themes/shared/mail/icons/mail-toolbar-osxlion.svg
mail/themes/shared/mail/icons/mail-toolbar.svg
mail/themes/shared/mail/icons/mark.svg
mail/themes/shared/mail/icons/newmsg.svg
mail/themes/shared/mail/icons/nextmsg.svg
mail/themes/shared/mail/icons/nextunread.svg
mail/themes/shared/mail/icons/paste.svg
mail/themes/shared/mail/icons/previousmsg.svg
mail/themes/shared/mail/icons/previousunread.svg
mail/themes/shared/mail/icons/print.svg
mail/themes/shared/mail/icons/quote.svg
mail/themes/shared/mail/icons/reply.svg
mail/themes/shared/mail/icons/replyall.svg
mail/themes/shared/mail/icons/replylist.svg
mail/themes/shared/mail/icons/save.svg
mail/themes/shared/mail/icons/security.svg
mail/themes/shared/mail/icons/send.svg
mail/themes/shared/mail/icons/spelling.svg
mail/themes/shared/mail/icons/stop.svg
mail/themes/shared/mail/icons/tag.svg
mail/themes/windows/mail/addrbook/addressbook.css
mail/themes/windows/mail/chat.css
mail/themes/windows/mail/compose/messengercompose.css
mail/themes/windows/mail/mailWindow1.css
mail/themes/windows/mail/messageHeader.css
mail/themes/windows/mail/messenger.css
mail/themes/windows/mail/primaryToolbar.css
mail/themes/windows/mail/tabmail.css
--- a/calendar/lightning/themes/common/lightning.css
+++ b/calendar/lightning/themes/common/lightning.css
@@ -30,13 +30,8 @@
 #task-tab-button .toolbarbutton-icon,
 #calendar-tab-button .toolbarbutton-icon,
 .calbar-toolbarbutton-1 .toolbarbutton-icon,
 toolbarpaletteitem > .msgHeaderView-button .toolbarbutton-icon,
 #task-actions-toolbar > .msgHeaderView-button .toolbarbutton-icon {
   width: 18px;
   height: 18px;
 }
-
-/* Write button */
-#newMsgButton-mail-menuitem {
-  list-style-image: url(chrome://messenger/skin/icons/newmsg.svg);
-}
--- a/calendar/lightning/themes/linux/lightning.css
+++ b/calendar/lightning/themes/linux/lightning.css
@@ -106,16 +106,22 @@ radio[pane=paneLightning] {
 }
 
 /* Lightning sidebar in calendar and task mode */
 #ltnSidebar {
   background-color: -moz-field;
   border-bottom: 1px solid ThreeDShadow;
 }
 
+/* Write button */
+#newMsgButton-mail-menuitem {
+  list-style-image: url(chrome://messenger/skin/icons/mail-toolbar.svg#newmsg);
+}
+
+#newMsgButton-mail-menuitem > .menu-iconic-left > .menu-iconic-icon,
 #newMsgButton-calendar-menuitem > .menu-iconic-left > .menu-iconic-icon,
 #newMsgButton-task-menuitem > .menu-iconic-left > .menu-iconic-icon {
   width: 18px;
   height: 18px;
   margin: -1px;
 }
 
 /* Today pane button in status bar */
--- a/calendar/lightning/themes/osx/lightning.css
+++ b/calendar/lightning/themes/osx/lightning.css
@@ -81,35 +81,44 @@ radio[pane=paneLightning] {
 
 /* Lightning sidebar background in calendar and task mode */
 #ltnSidebar {
   background-color: -moz-field;
 }
 
 /* Write button */
 @media not all and (-moz-mac-yosemite-theme) {
+  #newMsgButton-mail-menuitem {
+      list-style-image: url(chrome://messenger/skin/icons/mail-toolbar-osxlion.svg#newmsg);
+  }
+
   #newMsgButton-calendar-menuitem {
       list-style-image: url(chrome://calendar-common/skin/calendar-toolbar-osxlion.svg#calendar-tab);
   }
 
   #newMsgButton-task-menuitem {
       list-style-image: url(chrome://calendar-common/skin/calendar-toolbar-osxlion.svg#task-tab);
   }
 }
 
 @media (-moz-mac-yosemite-theme) {
+  #newMsgButton-mail-menuitem {
+      list-style-image: url(chrome://messenger/skin/icons/mail-toolbar.svg#newmsg-flat);
+  }
+
   #newMsgButton-calendar-menuitem {
       list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#calendar-tab-flat);
   }
 
   #newMsgButton-task-menuitem {
       list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#task-tab-flat);
   }
 }
 
+#newMsgButton-mail-menuitem > .menu-iconic-left > .menu-iconic-icon,
 #newMsgButton-calendar-menuitem > .menu-iconic-left > .menu-iconic-icon,
 #newMsgButton-task-menuitem > .menu-iconic-left > .menu-iconic-icon {
   width: 18px;
   height: 18px;
   margin: -1px;
 }
 
 /* Today pane button in status bar */
--- a/calendar/lightning/themes/windows/lightning.css
+++ b/calendar/lightning/themes/windows/lightning.css
@@ -81,16 +81,20 @@ radio[pane=paneLightning] {
 }
 
 #task-tab-button,
 #newMsgButton-task-menuitem {
   list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#task-tab);
   -moz-image-region: auto;
 }
 
+#newMsgButton-mail-menuitem {
+  list-style-image: url(chrome://messenger/skin/icons/mail-toolbar.svg#newmsg);
+}
+
 #tabs-toolbar[brighttext] #calendar-tab-button {
   list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#calendar-tab-inverted);
 }
 
 #tabs-toolbar[brighttext] #task-tab-button {
   list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#task-tab-inverted);
 }
 
@@ -154,16 +158,17 @@ radio[pane=paneLightning] {
 .imipDeleteButton {
   list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#delete);
 }
 
 .imipReconfirmButton {
   list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#priority);
 }
 
+#newMsgButton-mail-menuitem > .menu-iconic-left > .menu-iconic-icon,
 #newMsgButton-calendar-menuitem > .menu-iconic-left > .menu-iconic-icon,
 #newMsgButton-task-menuitem > .menu-iconic-left > .menu-iconic-icon {
   width: 18px;
   height: 18px;
   margin: -1px;
 }
 
 #calsidebar_splitter,
@@ -225,16 +230,20 @@ radio[pane=paneLightning] {
   }
 
   #task-tab-button,
   #newMsgButton-task-menuitem {
     list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#task-tab-flat);
     -moz-image-region: auto;
   }
 
+  #newMsgButton-mail-menuitem {
+    list-style-image: url(chrome://messenger/skin/icons/mail-toolbar.svg#newmsg-flat);
+  }
+
   #calendar-status-todaypane-button > stack > .toolbarbutton-icon-begin {
     list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#pane-flat);
   }
 
   /* ::: imip button icons ::: */
   .imipAcceptButton,
   .imipAcceptRecurrencesButton {
     list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#complete-flat);
--- a/mail/components/im/themes/chat.css
+++ b/mail/components/im/themes/chat.css
@@ -228,24 +228,26 @@ imcontact[aliasing] .contactDisplayName 
   height: 16px;
   min-height: 16px;
   min-width: 16px;
   -moz-appearance: none;
   background-color: transparent;
   border: none;
 }
 
+
 .statusTypeIcon[typing] {
   list-style-image: url('chrome://chat/skin/typing-16.png');
 }
 
 .statusTypeIcon[typed] {
   list-style-image: url('chrome://chat/skin/typed-16.png');
 }
 
+
 .statusMessage {
   margin: 0 0 !important;
 %ifdef XP_MACOSX
   min-height: 16px;
 %endif
 }
 
 .statusMessage[noTopic]:not([editing]),
@@ -329,16 +331,17 @@ imcontact[aliasing] .contactDisplayName 
 }
 
 %ifndef XP_MACOSX
 .conv-messages[chat] {
   border-right: solid 1px GrayText;
 }
 %endif
 
+
 /* Animation copied from the find bar in Firefox - http://dxr.mozilla.org/mozilla-central/source/toolkit/themes/linux/global/findBar.css#7 */
 .conv-status-container {
   display: block;
   height: 20px;
   padding: 3px;
   border-bottom: 1px solid ThreeDShadow;
   transition-property: margin-top, opacity, visibility;
   transition-duration: 150ms, 150ms, 0s;
@@ -541,16 +544,17 @@ grippy {
   color: -moz-cellhighlighttext !important;
 %endif
 }
 
 .conv-nicklist:focus > .listitem-iconic[inactive][selected] > .listcell-iconic > .listcell-label {
   color: HighlightText !important;
 }
 
+
 /* from instantbird/themes/blist.css */
 %ifdef XP_WIN
 imgroup .twisty {
   padding-top: 1px;
   width: 9px; /* The image's width is 9 pixels */
   height: 9px;
   margin-inline-end: 3px;
   margin-inline-start: 3px;
@@ -634,20 +638,8 @@ toolbar[mode="text"] #statusTypeIcon > .
 }
 
 .tabmail-tab[type="chat"],
 .alltabs-item[type="chat"] {
   list-style-image: url("chrome://messenger/skin/icons/chat.svg");
   -moz-context-properties: fill;
   fill: currentColor;
 }
-
-#button-add-buddy {
-  list-style-image: url("chrome://messenger/skin/icons/addcontact.svg");
-}
-
-#button-join-chat {
-  list-style-image: url("chrome://messenger/skin/icons/join.svg");
-}
-
-#button-chat-accounts {
-  list-style-image: url("chrome://messenger/skin/icons/accounts.svg");
-}
--- a/mail/themes/linux/mail/addrbook/addressbook.css
+++ b/mail/themes/linux/mail/addrbook/addressbook.css
@@ -15,16 +15,66 @@
   border-bottom: 1px solid hsl(0, 0%, 60%);
 }
 
 #ab-toolbox > toolbar {
   /* force iconsize="small" on these toolbars */
   counter-reset: smallicons;
 }
 
+/* ::::: primary toolbar buttons ::::: */
+
+#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.svg#newlist");
+}
+
+#button-editcard {
+  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.svg#newmessage");
+}
+
+#button-newim {
+  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.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");
+}
+
 /* ::::: directory pane adjustments ::::: */
 
 #abDirTreeHeader {
   border-bottom: 1px solid ThreeDShadow;
 }
 
 #abDirTreeHeader-title {
   padding-inline-start: 4px;
--- a/mail/themes/linux/mail/chat.css
+++ b/mail/themes/linux/mail/chat.css
@@ -84,16 +84,40 @@ imcontact {
   color: HighlightText;
   border: 1px dotted #F3D982;
 }
 
 .conv-hbox {
   -moz-box-align: center;
 }
 
+#button-add-buddy {
+  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.svg#join");
+}
+
+#button-chat-accounts {
+  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.svg#accounts");
+}
+
+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");
+}
+
 #statusTypeIcon[status="available"],
 #statusTypeAvailable,
 .statusTypeIcon[status="available"],
 #imStatusAvailable,
 #appmenu_imStatusAvailable,
 richlistitem[state="connected"] .accountStateIcon {
   list-style-image: url("chrome://messenger/skin/icons/status.png");
   -moz-image-region: rect(0px 16px 16px 0px);
--- a/mail/themes/linux/mail/compose/messengercompose.css
+++ b/mail/themes/linux/mail/compose/messengercompose.css
@@ -68,58 +68,102 @@
 
 #menu_styleStrikeThru {
   list-style-image: url("moz-icon://stock/gtk-strikethrough?size=menu");
 }
 
 /* ::::: primary toolbar buttons ::::: */
 
 #button-send {
-  list-style-image: url("chrome://messenger/skin/icons/send.svg");
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#send");
 }
 
 #button-contacts {
-  list-style-image: url("chrome://messenger/skin/icons/address.svg");
+  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/icons/spelling.svg");
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#spelling");
 }
 
 #button-attach {
-  list-style-image: url("chrome://messenger/skin/icons/attach.svg");
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#attach");
 }
 
 #button-security {
-  list-style-image: url("chrome://messenger/skin/icons/security.svg");
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#security");
 }
 
 #button-save {
-  list-style-image: url("chrome://messenger/skin/icons/save.svg");
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#save");
 }
 
 #quoteButton {
-  list-style-image: url("chrome://messenger/skin/icons/quote.svg");
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#quote");
 }
 
 #cut-button {
-  list-style-image: url("chrome://messenger/skin/icons/cut.svg");
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#cut");
 }
 
 #copy-button {
-  list-style-image: url("chrome://messenger/skin/icons/copy.svg");
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#copy");
 }
 
 #paste-button {
-  list-style-image: url("chrome://messenger/skin/icons/paste.svg");
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#paste");
 }
 
 #button-print {
-  list-style-image: url("chrome://messenger/skin/icons/print.svg");
+  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");
+}
+
+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");
 }
 
 /* ::::: menulists on toolbar ::::: */
 
 menulist {
   -moz-appearance: none;
   min-height: 24px;
   color: inherit;
@@ -765,21 +809,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/icons/newmsg.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#newmsg");
 }
 
 #menu_NewContact {
-  list-style-image: url("chrome://messenger/skin/icons/addcontact.svg");
+  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");
--- a/mail/themes/linux/mail/messageHeader.css
+++ b/mail/themes/linux/mail/messageHeader.css
@@ -168,55 +168,99 @@ toolbar[mode="text"] toolbarpaletteitem 
  */
 toolbox[labelalign="end"] toolbar[mode="full"] .msgHeaderView-button .toolbarbutton-text {
   margin-inline-start: 2px !important;
 }
 
 .hdrReplyToSenderButton,
 .hdrDummyReplyButton,
 .hdrReplyButton {
-  list-style-image: url("chrome://messenger/skin/icons/reply.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#reply");
 }
 
 .hdrReplyAllButton {
-  list-style-image: url("chrome://messenger/skin/icons/replyall.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replyall");
 }
 
 .hdrReplyListButton,
 .hdrFollowupButton {
-  list-style-image: url("chrome://messenger/skin/icons/replylist.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replylist");
 }
 
 .hdrForwardButton {
-  list-style-image: url("chrome://messenger/skin/icons/forward.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#forward");
 }
 
 .hdrArchiveButton {
-  list-style-image: url("chrome://messenger/skin/icons/archive.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#archive");
 }
 
 .hdrJunkButton {
-  list-style-image: url("chrome://messenger/skin/icons/junk.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#junk");
 }
 
 .hdrTrashButton {
-  list-style-image: url("chrome://messenger/skin/icons/delete.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#delete");
 }
 
 .hdrTagButton {
-  list-style-image: url("chrome://messenger/skin/icons/tag.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#tag");
 }
 
 .hdrConversationButton {
-  list-style-image: url("chrome://messenger/skin/icons/conversation.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#conversation");
 }
 
 #attachmentSaveAllSingle,
 #attachmentSaveAllMultiple {
-  list-style-image: url("chrome://messenger/skin/icons/file.svg");
+  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] .hdrConversationButton {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#conversation-inverted");
+}
+
+toolbar[brighttext] #attachmentSaveAllSingle,
+toolbar[brighttext] #attachmentSaveAllMultiple {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#file-inverted");
 }
 
 toolbar[mode="icons"] > #otherActionsButton > .toolbarbutton-menu-dropmarker {
   margin-inline-start: 0;
 }
 
 /* show a icon in customize window */
 #CustomizeToolbarWindow toolbarpaletteitem > #otherActionsButton >
@@ -380,19 +424,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/archive.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#archive");
 }
 
 .hdrTrashButton > .button-box > .button-icon {
-  list-style-image: url("chrome://messenger/skin/icons/tag.svg");
+  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/messenger.css
+++ b/mail/themes/linux/mail/messenger.css
@@ -19,42 +19,35 @@
 
   --toolbar-non-lwt-bgcolor: -moz-dialog;
   --toolbar-non-lwt-textcolor: -moz-dialogtext;
   --toolbar-non-lwt-bgimage: linear-gradient(rgba(255,255,255,.15), rgba(255,255,255,.15));
   --toolbar-bgcolor: var(--toolbar-non-lwt-bgcolor);
   --toolbar-bgimage: var(--toolbar-non-lwt-bgimage);
 
   --toolbarbutton-border-radius: 2px;
-  --toolbarbutton-icon-fill-opacity: .85;
+  --toolbarbutton-icon-fill-opacity: 1;
   --toolbarbutton-text-color: #222;
   --toolbarbutton-hover-background: rgba(255, 255, 255, .5) linear-gradient(rgba(255, 255, 255, .5), transparent);
   --toolbarbutton-hover-bordercolor: rgba(0, 0, 0, .25);
   --toolbarbutton-header-bordercolor: rgba(0, 0, 0, .25);
   --toolbarbutton-hover-boxshadow: none;
 
   --toolbarbutton-active-background: rgba(154, 154, 154, .5) linear-gradient(rgba(255, 255, 255, .7), rgba(255, 255, 255, .4));
   --toolbarbutton-active-bordercolor: rgba(0, 0, 0, .3);
   --toolbarbutton-active-boxshadow: 0 1px 1px rgba(0, 0, 0, .1) inset, 0 0 1px rgba(0, 0, 0, .3) inset;
 
   --toolbarbutton-checkedhover-backgroundcolor: rgba(200, 200, 200, .5);
-  --toolbarbutton-icon-fill-attention: #0a84ff;
 
   --lwt-header-image: none;
 }
 
 :root:-moz-lwtheme {
   --toolbar-bgcolor: rgba(255,255,255,.4);
   --toolbar-bgimage: none;
-
-  --toolbarbutton-icon-fill-opacity: 1;
-}
-
-toolbar[brighttext] {
-  --toolbarbutton-icon-fill-attention: #45a1ff;
 }
 
 #header-view-toolbar[brighttext],
 #ab-toolbox > toolbar[brighttext],
 .mail-toolbox > toolbar[brighttext],
 #event-toolbox > toolbar[brighttext],
 #compose-toolbox > toolbar[brighttext] {
   --toolbarbutton-text-color: #fff;
@@ -218,16 +211,18 @@ toolbox[labelalign="end"] .toolbarbutton
 .toolbarbutton-1 .toolbarbutton-menu-dropmarker > .dropmarker-icon,
 .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
   width: 17px;
   height: 7px;
   background-image: url("chrome://messenger/skin/icons/toolbarbutton-arrow.svg");
   background-position: center;
   background-repeat: no-repeat;
   background-size: 9px 7px;
+  -moz-context-properties: fill;
+  fill: currentColor;
 }
 
 .toolbarbutton-1 > .toolbarbutton-menu-dropmarker {
   width: 9px;
 }
 
 .toolbarbutton-1:not(:hover):not(:active):not([open]) > .toolbarbutton-menubutton-dropmarker::before {
   content: "";
@@ -275,17 +270,18 @@ toolbar:not(.inline-toolbar):not(:-moz-l
 .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 {
-  padding: 1px;
+  width: 18px;
+  height: 18px;
 }
 
 .toolbarbutton-1[disabled=true]:-moz-lwtheme,
 .toolbarbutton-menubutton-button[disabled=true]:-moz-lwtheme {
   color: inherit;
 }
 
 toolbar[mode="full"] .toolbarbutton-1 {
--- a/mail/themes/linux/mail/primaryToolbar.css
+++ b/mail/themes/linux/mail/primaryToolbar.css
@@ -48,124 +48,228 @@
 /* remove the small icons checkbox in Customize window */
 #smallicons {
   display: none;
 }
 
 /* ::::: primary toolbar buttons ::::: */
 
 #button-getmsg {
-  list-style-image: url("chrome://messenger/skin/icons/getmsg.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#getmsg");
 }
 
 #button-newmsg {
-  list-style-image: url("chrome://messenger/skin/icons/newmsg.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#newmsg");
 }
 
 #button-address {
-  list-style-image: url("chrome://messenger/skin/icons/address.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#address");
 }
 
 #button-reply {
-  list-style-image: url("chrome://messenger/skin/icons/reply.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#reply");
 }
 
 #button-replyall {
-  list-style-image: url("chrome://messenger/skin/icons/replyall.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replyall");
 }
 
 #button-replylist {
-  list-style-image: url("chrome://messenger/skin/icons/replylist.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replylist");
 }
 
 #button-forward {
-  list-style-image: url("chrome://messenger/skin/icons/forward.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#forward");
 }
 
 .delete-button {
-  list-style-image: url("chrome://messenger/skin/icons/delete.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#delete");
 }
 
 .junk-button {
-  list-style-image: url("chrome://messenger/skin/icons/junk.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#junk");
 }
 
 #button-print {
-  list-style-image: url("chrome://messenger/skin/icons/print.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#print");
 }
 
 #button-stop {
-  list-style-image: url("chrome://messenger/skin/icons/stop.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#stop");
 }
 
 #button-file {
-  list-style-image: url("chrome://messenger/skin/icons/file.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#file");
 }
 
 #button-nextUnread {
-  list-style-image: url("chrome://messenger/skin/icons/nextunread.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#nextUnread");
 }
 
 #button-previousUnread {
-  list-style-image: url("chrome://messenger/skin/icons/previousunread.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#previousUnread");
 }
 
 #button-mark {
-  list-style-image: url("chrome://messenger/skin/icons/mark.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#mark");
 }
 
 #button-tag {
-  list-style-image: url("chrome://messenger/skin/icons/tag.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#tag");
 }
 
 #button-goback {
-  list-style-image: url("chrome://messenger/skin/icons/goback.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#goback");
 }
 
 #button-goforward {
-  list-style-image: url("chrome://messenger/skin/icons/goforward.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#goforward");
 }
 
 #button-compact {
-  list-style-image: url("chrome://messenger/skin/icons/compact.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#compact");
 }
 
 #button-archive {
-  list-style-image: url("chrome://messenger/skin/icons/archive.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#archive");
 }
 
 #button-chat {
-  list-style-image: url("chrome://messenger/skin/icons/chat.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#chat");
 }
 
 #button-nextMsg {
-  list-style-image: url("chrome://messenger/skin/icons/nextmsg.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#nextMsg");
 }
 
 #button-previousMsg {
-  list-style-image: url("chrome://messenger/skin/icons/previousmsg.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#previousMsg");
 }
 
 #qfb-show-filter-bar {
-  list-style-image: url("chrome://messenger/skin/icons/filter.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#filter");
 }
 
 #button-showconversation {
-  list-style-image: url("chrome://messenger/skin/icons/conversation.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#conversation");
 }
 
 .button-appmenu {
-  list-style-image: url("chrome://messenger/skin/icons/appbutton.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#appButton");
   min-width: 35px !important;
   margin-right: 4px;
   margin-left: 4px;
 }
 
-#button-chat[unreadMessages="true"] {
-  fill: var(--toolbarbutton-icon-fill-attention);
+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");
+}
+
+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-showconversation {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#conversation-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 {
@@ -182,16 +286,20 @@ toolbar[mode="text"] .button-appmenu .to
 #folderPane-toolbar > toolbaritem > menulist {
   margin: 0;
 }
 
 #folderPane-toolbar > :-moz-any(*) + :-moz-any(*) {
   margin-inline-start: 2px;
 }
 
+#palette-box #qfb-show-filter-bar {
+  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 #folderpane-mode-selector,
 #palette-box #viewPicker {
   -moz-box-flex: 1;
 }
--- a/mail/themes/osx/mail/addrbook/addressbook.css
+++ b/mail/themes/osx/mail/addrbook/addressbook.css
@@ -17,16 +17,92 @@
   -moz-appearance: none;
 }
 
 #ab-toolbox > toolbar {
   /* force iconsize="small" on these toolbars */
   counter-reset: smallicons;
 }
 
+@media not all and (-moz-mac-yosemite-theme) {
+  #button-newcard {
+    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-osxlion.svg#newcard");
+  }
+
+  #button-newlist {
+    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-osxlion.svg#newlist");
+  }
+
+  #button-editcard {
+    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-osxlion.svg#editcard");
+  }
+
+  #button-newmessage {
+    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-osxlion.svg#newmessage");
+  }
+
+  #button-newim {
+    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-osxlion.svg#newim");
+  }
+
+  #button-abdelete {
+    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-osxlion.svg#abdelete");
+  }
+}
+
+@media (-moz-mac-yosemite-theme) {
+  #button-newcard {
+    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newcard-flat");
+  }
+
+  #button-newlist {
+    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newlist-flat");
+  }
+
+  #button-editcard {
+    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#editcard-flat");
+  }
+
+  #button-newmessage {
+    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newmessage-flat");
+  }
+
+  #button-newim {
+    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newim-flat");
+  }
+
+  #button-abdelete {
+    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-flat");
+}
+
+#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");
+}
+
 /* ::::: directory pane icons ::::: */
 
 #abDirTreeHeader {
   -moz-appearance: treeheadercell;
   height: 16px;
 }
 
 #dirTree {
--- a/mail/themes/osx/mail/chat.css
+++ b/mail/themes/osx/mail/chat.css
@@ -85,16 +85,56 @@
   -moz-appearance: none !important;
 }
 
 /* Set a background color to avoid lightweight theme backgrounds */
 #contextPane {
   background-color: #FFFFFF;
 }
 
+@media not all and (-moz-mac-yosemite-theme) {
+  #button-add-buddy {
+    list-style-image: url("chrome://messenger/skin/icons/chat-toolbar-osxlion.svg#add");
+  }
+
+  #button-join-chat {
+    list-style-image: url("chrome://messenger/skin/icons/chat-toolbar-osxlion.svg#join");
+  }
+
+  #button-chat-accounts {
+    list-style-image: url("chrome://messenger/skin/icons/chat-toolbar-osxlion.svg#accounts");
+  }
+}
+
+@media (-moz-mac-yosemite-theme) {
+  #button-add-buddy {
+    list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.svg#add-flat");
+  }
+
+  #button-join-chat {
+    list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.svg#join-flat");
+  }
+
+  #button-chat-accounts {
+    list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.svg#accounts-flat");
+  }
+}
+
+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");
+}
+
 #statusTypeIcon[status="available"],
 #statusTypeAvailable,
 .statusTypeIcon[status="available"],
 #imStatusAvailable,
 #appmenu_imStatusAvailable,
 richlistitem[state="connected"] .accountStateIcon {
   list-style-image: url("chrome://messenger/skin/icons/status.png");
   -moz-image-region: rect(0px 16px 16px 0px);
--- a/mail/themes/osx/mail/compose/messengercompose.css
+++ b/mail/themes/osx/mail/compose/messengercompose.css
@@ -55,59 +55,152 @@ toolbar[nowindowdrag="true"] {
   margin-inline-start: 5px;
 }
 
 #compose-toolbox > toolbar {
   /* force iconsize="small" on these toolbars */
   counter-reset: smallicons;
 }
 
-#button-send {
-  list-style-image: url("chrome://messenger/skin/icons/send.svg");
-}
+@media not all and (-moz-mac-yosemite-theme) {
+  #button-send {
+    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar-osxlion.svg#send");
+  }
+
+  #button-contacts {
+    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar-osxlion.svg#contacts");
+    -moz-image-region: auto !important;
+  }
 
-#button-contacts {
-  list-style-image: url("chrome://messenger/skin/icons/address.svg");
-  -moz-image-region: auto !important;
-}
+  #spellingButton {
+    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar-osxlion.svg#spelling");
+  }
+
+  #button-attach {
+    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar-osxlion.svg#attach");
+  }
+
+  #button-security {
+    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar-osxlion.svg#security");
+  }
 
-#spellingButton {
-  list-style-image: url("chrome://messenger/skin/icons/spelling.svg");
-}
+  #button-save {
+    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar-osxlion.svg#save");
+  }
+
+  #quoteButton {
+    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar-osxlion.svg#quote");
+  }
+
+  #cut-button {
+    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar-osxlion.svg#cut");
+  }
 
-#button-attach {
-  list-style-image: url("chrome://messenger/skin/icons/attach.svg");
-}
+  #copy-button {
+    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar-osxlion.svg#copy");
+  }
 
-#button-security {
-  list-style-image: url("chrome://messenger/skin/icons/security.svg");
+  #paste-button {
+    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar-osxlion.svg#paste");
+  }
+
+  #button-print {
+    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar-osxlion.svg#print");
+  }
 }
 
-#button-save {
-  list-style-image: url("chrome://messenger/skin/icons/save.svg");
-}
+@media (-moz-mac-yosemite-theme) {
+  #button-send {
+    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#send-flat");
+  }
+
+  #button-contacts {
+    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#contacts-flat");
+    -moz-image-region: auto !important;
+  }
+
+  #spellingButton {
+    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#spelling");
+  }
+
+  #button-attach {
+    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#attach-flat");
+  }
+
+  #button-security {
+    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#security-flat");
+  }
 
-#quoteButton {
-  list-style-image: url("chrome://messenger/skin/icons/quote.svg");
+  #button-save {
+    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#save-flat");
+  }
+
+  #quoteButton {
+    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#quote-flat");
+  }
+
+  #cut-button {
+    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#cut-flat");
+  }
+
+  #copy-button {
+    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#copy-flat");
+  }
+
+  #paste-button {
+    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#paste-flat");
+  }
+
+  #button-print {
+    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#print-flat");
+  }
 }
 
-#cut-button {
-  list-style-image: url("chrome://messenger/skin/icons/cut.svg");
+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");
+}
+
+toolbar[brighttext] #button-security {
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#security-inverted");
 }
 
-#copy-button {
-  list-style-image: url("chrome://messenger/skin/icons/copy.svg");
+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");
 }
 
-#paste-button {
-  list-style-image: url("chrome://messenger/skin/icons/paste.svg");
+toolbar[brighttext] #cut-button {
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#cut-inverted");
 }
 
-#button-print {
-  list-style-image: url("chrome://messenger/skin/icons/print.svg");
+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 ::::: */
 
 #composeContentBox {
   box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.6) inset;
   background-color: rgb(242, 242, 242);
 
--- a/mail/themes/osx/mail/messageHeader.css
+++ b/mail/themes/osx/mail/messageHeader.css
@@ -213,58 +213,150 @@ attachmentlist:focus >attachmentitem[sel
   box-shadow: 0 0 0 1px hsla(0, 0%, 100%, .2);
 }
 
 toolbar[mode="text"] .msgHeaderView-button .toolbarbutton-text {
   margin-right: 2px;
   margin-left: 2px;
 }
 
-.hdrReplyToSenderButton,
-.hdrDummyReplyButton,
-.hdrReplyButton {
-  list-style-image: url("chrome://messenger/skin/icons/reply.svg");
-}
+@media not all and (-moz-mac-yosemite-theme) {
+  .hdrReplyToSenderButton,
+  .hdrDummyReplyButton,
+  .hdrReplyButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-osxlion.svg#reply");
+  }
+
+  .hdrReplyAllButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-osxlion.svg#replyall");
+  }
+
+  .hdrReplyListButton,
+  .hdrFollowupButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-osxlion.svg#replylist");
+  }
+
+  .hdrForwardButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-osxlion.svg#forward");
+  }
 
-.hdrReplyAllButton {
-  list-style-image: url("chrome://messenger/skin/icons/replyall.svg");
-}
+  .hdrArchiveButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-osxlion.svg#archive");
+  }
+
+  .hdrJunkButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-osxlion.svg#junk");
+  }
+
+  .hdrTrashButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-osxlion.svg#delete");
+  }
 
-.hdrReplyListButton,
-.hdrFollowupButton {
-  list-style-image: url("chrome://messenger/skin/icons/replylist.svg");
-}
+  .hdrTagButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-osxlion.svg#tag");
+  }
 
-.hdrForwardButton {
-  list-style-image: url("chrome://messenger/skin/icons/forward.svg");
+  .hdrConversationButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-osxlion.svg#conversation");
+  }
+
+  #attachmentSaveAllSingle,
+  #attachmentSaveAllMultiple {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-osxlion.svg#file");
+  }
 }
 
-.hdrArchiveButton {
-  list-style-image: url("chrome://messenger/skin/icons/archive.svg");
-}
+@media (-moz-mac-yosemite-theme) {
+  .hdrReplyToSenderButton,
+  .hdrDummyReplyButton,
+  .hdrReplyButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#reply-flat");
+  }
+
+  .hdrReplyAllButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replyall-flat");
+  }
+
+  .hdrReplyListButton,
+  .hdrFollowupButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replylist-flat");
+  }
+
+  .hdrForwardButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#forward-flat");
+  }
 
-.hdrJunkButton {
-  list-style-image: url("chrome://messenger/skin/icons/junk.svg");
-}
+  .hdrArchiveButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#archive-flat");
+  }
+
+  .hdrJunkButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#junk-flat");
+  }
+
+  .hdrTrashButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#delete");
+  }
 
-.hdrTrashButton {
-  list-style-image: url("chrome://messenger/skin/icons/delete.svg");
+  .hdrTagButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#tag-flat");
+  }
+
+  .hdrConversationButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#conversation-flat");
+  }
+
+  #attachmentSaveAllSingle,
+  #attachmentSaveAllMultiple {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#file-flat");
+  }
 }
 
-.hdrTagButton {
-  list-style-image: url("chrome://messenger/skin/icons/tag.svg");
+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");
 }
 
-.hdrConversationButton {
-  list-style-image: url("chrome://messenger/skin/icons/conversation.svg");
+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");
 }
 
-#attachmentSaveAllSingle,
-#attachmentSaveAllMultiple {
-  list-style-image: url("chrome://messenger/skin/icons/file.svg");
+toolbar[brighttext] .hdrTagButton {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#tag-inverted");
+}
+
+toolbar[brighttext] .hdrConversationButton {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#conversation-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 {
--- a/mail/themes/osx/mail/messenger.css
+++ b/mail/themes/osx/mail/messenger.css
@@ -17,17 +17,17 @@
 
   --toolbar-non-lwt-bgcolor: #f9f9fa;
   --toolbar-non-lwt-textcolor: #0c0c0d;
   --toolbar-non-lwt-bgimage: none;
   --toolbar-bgcolor: var(--toolbar-non-lwt-bgcolor);
   --toolbar-bgimage: var(--toolbar-non-lwt-bgimage);
 
   --toolbarbutton-border-radius: 3px;
-  --toolbarbutton-icon-fill-opacity: .85;
+  --toolbarbutton-icon-fill-opacity: 1;
   --toolbarbutton-hover-background: hsla(0, 0%, 100%, .1)
                                     linear-gradient(hsla(0, 0%, 100%, .3),
                                     hsla(0, 0%, 100%, .1)) padding-box;
   --toolbarbutton-hover-bordercolor: hsla(0, 0%, 0%, .2);
   --toolbarbutton-header-bordercolor: hsla(0, 0%, 0%, .2);
   --toolbarbutton-hover-boxshadow: 0 1px 0 hsla(0, 0%, 100%, .5),
                                    0 1px 0 hsla(0, 0%, 100%, .5) inset;
 
@@ -36,34 +36,27 @@
                                      transparent) border-box;
   --toolbarbutton-active-bordercolor: hsla(0, 0%, 0%, .3);
   --toolbarbutton-active-boxshadow: 0 1px 0 hsla(0, 0%, 100%, .5),
                                     0 1px 0 hsla(0, 0%, 0%, .05) inset,
                                     0 1px 1px hsla(0, 0%, 0%, .2) inset;
   --toolbarbutton-inactive-bordercolor: rgba(0, 0, 0, 0.1);
   --toolbarbutton-inactive-boxshadow: 0 1px 0 hsla(0, 0%, 0%, .05) inset;
   --toolbarbutton-checkedhover-backgroundcolor: hsla(0, 0%, 0%, .09);
-  --toolbarbutton-icon-fill-attention: #0a84ff;
 
   --lwt-header-image: none;
 }
 
 :root:-moz-window-inactive {
   --toolbar-bgcolor: -moz-mac-chrome-inactive;
 }
 
 :root:-moz-lwtheme {
   --toolbar-bgcolor: rgba(255,255,255,.4);
   --toolbar-bgimage: none;
-
-  --toolbarbutton-icon-fill-opacity: 1;
-}
-
-toolbar[brighttext] {
-  --toolbarbutton-icon-fill-attention: #45a1ff;
 }
 
 #messengerWindow:not([tabsintitlebar]) #titlebar {
   height: 22px;
 }
 
 @media (-moz-mac-yosemite-theme) {
   :root:not(:-moz-lwtheme) {
@@ -234,17 +227,18 @@ toolbox[labelalign="end"] > toolbar[mode
 }
 
 toolbar:not([mode="icons"]) .toolbarbutton-1:not([type="menu-button"]),
 toolbar:not([mode="icons"]) .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   min-width: 0;
 }
 
 .toolbarbutton-1 .toolbarbutton-icon {
-  padding: 1px;
+  width: 18px;
+  height: 18px;
 }
 
 .toolbarbutton-1[disabled=true]:-moz-lwtheme,
 .toolbarbutton-menubutton-button[disabled=true]:-moz-lwtheme {
   color: inherit !important;
 }
 
 .toolbarbutton-1[disabled="true"] .toolbarbutton-text,
@@ -287,16 +281,18 @@ toolbar:not([mode="icons"]) .toolbarbutt
 .toolbarbutton-1:-moz-window-inactive[type="menu-button"]
   > .toolbarbutton-menubutton-button[disabled="true"] > .toolbarbutton-icon {
   opacity: .25;
 }
 
 .toolbarbutton-1 > .toolbarbutton-menu-dropmarker,
 .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
   list-style-image: url(chrome://messenger/skin/icons/toolbarbutton-arrow.svg);
+  -moz-context-properties: fill;
+  fill: currentColor;
 }
 
 .toolbarbutton-menu-dropmarker > .dropmarker-icon,
 .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
   width: 7px;
   height: 5px;
 }
 
--- a/mail/themes/osx/mail/primaryToolbar.css
+++ b/mail/themes/osx/mail/primaryToolbar.css
@@ -62,126 +62,336 @@
   counter-reset: smallicons;
 }
 
 /* remove the small icons checkbox in Customize window */
 #smallicons {
   display: none;
 }
 
+@media not all and (-moz-mac-yosemite-theme) {
+  #button-getmsg {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-osxlion.svg#getmsg");
+  }
 
+  #button-newmsg {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-osxlion.svg#newmsg");
+  }
 
-#button-getmsg {
-  list-style-image: url("chrome://messenger/skin/icons/getmsg.svg");
-}
+  #button-address {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-osxlion.svg#address");
+  }
+
+  #button-reply {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-osxlion.svg#reply");
+  }
 
-#button-newmsg {
-  list-style-image: url("chrome://messenger/skin/icons/newmsg.svg");
-}
+  #button-replyall {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-osxlion.svg#replyall");
+  }
+
+  #button-replylist {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-osxlion.svg#replylist");
+  }
 
-#button-address {
-  list-style-image: url("chrome://messenger/skin/icons/address.svg");
-}
+  #button-forward {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-osxlion.svg#forward");
+  }
 
-#button-reply {
-  list-style-image: url("chrome://messenger/skin/icons/reply.svg");
-}
+  .delete-button {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-osxlion.svg#delete");
+  }
+
+  .junk-button {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-osxlion.svg#junk");
+  }
 
-#button-replyall {
-  list-style-image: url("chrome://messenger/skin/icons/replyall.svg");
-}
+  #button-print {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-osxlion.svg#print");
+  }
+
+  #button-stop {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-osxlion.svg#stop");
+  }
 
-#button-replylist {
-  list-style-image: url("chrome://messenger/skin/icons/replylist.svg");
-}
+  #button-file {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-osxlion.svg#file");
+  }
+
+  #button-nextUnread {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-osxlion.svg#nextUnread");
+  }
 
-#button-forward {
-  list-style-image: url("chrome://messenger/skin/icons/forward.svg");
-}
+  #button-previousUnread {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-osxlion.svg#previousUnread");
+  }
+
+  #button-mark {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-osxlion.svg#mark");
+  }
+
+  #button-tag {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-osxlion.svg#tag");
+  }
 
-.delete-button {
-  list-style-image: url("chrome://messenger/skin/icons/delete.svg");
-}
+  #button-goback {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-osxlion.svg#goback");
+  }
 
-.junk-button {
-  list-style-image: url("chrome://messenger/skin/icons/junk.svg");
-}
+  #button-goforward {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-osxlion.svg#goforward");
+  }
+
+  #button-compact {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-osxlion.svg#compact");
+  }
 
-#button-print {
-  list-style-image: url("chrome://messenger/skin/icons/print.svg");
-}
+  #button-archive {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-osxlion.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-osxlion.svg#nextMsg");
+  }
 
-#button-stop {
-  list-style-image: url("chrome://messenger/skin/icons/stop.svg");
-}
+  #button-previousMsg {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-osxlion.svg#previousMsg");
+  }
 
-#button-file {
-  list-style-image: url("chrome://messenger/skin/icons/file.svg");
-}
+  #qfb-show-filter-bar,
+  #palette-box #qfb-show-filter-bar {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-osxlion.svg#filter");
+  }
 
-#button-nextUnread {
-  list-style-image: url("chrome://messenger/skin/icons/nextunread.svg");
+  #button-showconversation {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-osxlion.svg#conversation");
+  }
+
+  .button-appmenu {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-osxlion.svg#appButton");
+  }
 }
 
-#button-previousUnread {
-  list-style-image: url("chrome://messenger/skin/icons/previousunread.svg");
-}
+@media (-moz-mac-yosemite-theme) {
+  #button-getmsg {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#getmsg-flat");
+  }
+
+  #button-newmsg {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#newmsg-flat");
+  }
+
+  #button-address {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#address-flat");
+  }
+
+  #button-reply {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#reply-flat");
+  }
+
+  #button-replyall {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replyall-flat");
+  }
+
+  #button-replylist {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replylist-flat");
+  }
 
-#button-mark {
-  list-style-image: url("chrome://messenger/skin/icons/mark.svg");
-}
+  #button-forward {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#forward-flat");
+  }
+
+  .delete-button {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#delete");
+  }
+
+  .junk-button {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#junk-flat");
+  }
 
-#button-tag {
-  list-style-image: url("chrome://messenger/skin/icons/tag.svg");
-}
+  #button-print {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#print-flat");
+  }
+
+  #button-stop {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#stop-flat");
+  }
+
+  #button-file {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#file-flat");
+  }
+
+  #button-nextUnread {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#nextUnread-flat");
+  }
 
-#button-goback {
-  list-style-image: url("chrome://messenger/skin/icons/goback.svg");
-}
+  #button-previousUnread {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#previousUnread-flat");
+  }
+
+  #button-mark {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#mark-flat");
+  }
+
+  #button-tag {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#tag-flat");
+  }
+
+  #button-goback {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#goback-flat");
+  }
+
+  #button-goforward {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#goforward-flat");
+  }
+
+  #button-compact {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#compact-flat");
+  }
 
-#button-goforward {
-  list-style-image: url("chrome://messenger/skin/icons/goforward.svg");
-}
+  #button-archive {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#archive-flat");
+  }
+
+  #button-chat {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#chat-flat");
+  }
+
+  #button-nextMsg {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#nextMsg-flat");
+  }
 
-#button-compact {
-  list-style-image: url("chrome://messenger/skin/icons/compact.svg");
-}
+  #button-previousMsg {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#previousMsg-flat");
+  }
 
-#button-archive {
-  list-style-image: url("chrome://messenger/skin/icons/archive.svg");
+  #qfb-show-filter-bar,
+  #palette-box #qfb-show-filter-bar {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#filter-flat");
+  }
+
+  #button-showconversation {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#conversation-flat");
+  }
+
+  .button-appmenu {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#appButton-flat");
+  }
 }
 
-#button-chat {
-  list-style-image: url("chrome://messenger/skin/icons/chat.svg");
+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-nextMsg {
-  list-style-image: url("chrome://messenger/skin/icons/nextmsg.svg");
+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");
 }
 
-#button-previousMsg {
-  list-style-image: url("chrome://messenger/skin/icons/previousmsg.svg");
+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");
 }
 
-#qfb-show-filter-bar {
-  list-style-image: url("chrome://messenger/skin/icons/filter.svg");
+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");
 }
 
-#button-showconversation {
-  list-style-image: url("chrome://messenger/skin/icons/conversation.svg");
+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");
 }
 
-.button-appmenu {
-  list-style-image: url("chrome://messenger/skin/icons/appbutton.svg");
-  margin-right: 7px;
-  margin-left: 7px;
+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");
 }
 
-#button-chat[unreadMessages="true"] {
-  fill: var(--toolbarbutton-icon-fill-attention);
+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-showconversation {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#conversation-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;
 }
 
@@ -189,16 +399,21 @@
   padding-inline-end: 1px;
 }
 
 toolbar:not([mode="text"]) .badgeButton-badge {
   margin-inline-start: 11px;
   margin-bottom: 12px;
 }
 
+.button-appmenu {
+  margin-right: 7px;
+  margin-left: 7px;
+}
+
 .button-appmenu .toolbarbutton-text,
 .button-appmenu .toolbarbutton-menu-dropmarker {
   display: none;
 }
 
 toolbar[mode="text"] .button-appmenu .toolbarbutton-icon {
   display: -moz-box;
 }
--- a/mail/themes/shared/jar.inc.mn
+++ b/mail/themes/shared/jar.inc.mn
@@ -4,67 +4,34 @@
 
 # This is not a complete / proper jar manifest. It is included by the
 # actual theme-specific manifests, so that shared resources need only
 # be specified once. As a result, the source file paths are relative
 # to the location of the actual manifest.
 
   skin/classic/messenger/aboutNetError.css                    (../shared/mail/aboutNetError.css)
   skin/classic/messenger/aboutSupport.css                     (../shared/mail/aboutSupport.css)
+  skin/classic/messenger/addressbook/icons/addressbook-toolbar.svg (../shared/mail/icons/addressbook-toolbar.svg)
   skin/classic/messenger/addressbook/icons/menu.svg           (../shared/mail/icons/menu.svg)
   skin/classic/messenger/downloads/download.svg               (../shared/mail/icons/download.svg)
   skin/classic/messenger/extensionsOverlay.css                (../shared/mail/extensionsOverlay.css)
-  skin/classic/messenger/icons/address.svg                    (../shared/mail/icons/address.svg)
-  skin/classic/messenger/icons/addcontact.svg                 (../shared/mail/icons/addcontact.svg)
-  skin/classic/messenger/icons/addlist.svg                    (../shared/mail/icons/addlist.svg)
-  skin/classic/messenger/icons/accounts.svg                   (../shared/mail/icons/accounts.svg)
-  skin/classic/messenger/icons/appbutton.svg                  (../shared/mail/icons/appbutton.svg)
-  skin/classic/messenger/icons/archive.svg                    (../shared/mail/icons/archive.svg)
   skin/classic/messenger/icons/arrow-dropdown.svg             (../shared/mail/icons/arrow-dropdown.svg)
   skin/classic/messenger/icons/arrow-left.svg                 (../shared/mail/icons/arrow-left.svg)
   skin/classic/messenger/icons/attach.svg                     (../shared/mail/icons/attach.svg)
   skin/classic/messenger/icons/blacklist.svg                  (../shared/mail/icons/blacklist.svg)
   skin/classic/messenger/icons/cert-error.svg                 (../shared/mail/icons/cert-error.svg)
   skin/classic/messenger/icons/chat.svg                       (../shared/mail/icons/chat.svg)
-  skin/classic/messenger/icons/copy.svg                       (../shared/mail/icons/copy.svg)
-  skin/classic/messenger/icons/cut.svg                        (../shared/mail/icons/cut.svg)
+  skin/classic/messenger/icons/chat-toolbar.svg               (../shared/mail/icons/chat-toolbar.svg)
   skin/classic/messenger/icons/correspondents.svg             (../shared/mail/icons/correspondents.svg)
-  skin/classic/messenger/icons/compact.svg                    (../shared/mail/icons/compact.svg)
-  skin/classic/messenger/icons/conversation.svg               (../shared/mail/icons/conversation.svg)
-  skin/classic/messenger/icons/delete.svg                     (../shared/mail/icons/delete.svg)
-  skin/classic/messenger/icons/file.svg                       (../shared/mail/icons/file.svg)
-  skin/classic/messenger/icons/filter.svg                     (../shared/mail/icons/filter.svg)
-  skin/classic/messenger/icons/forward.svg                    (../shared/mail/icons/forward.svg)
-  skin/classic/messenger/icons/getmsg.svg                     (../shared/mail/icons/getmsg.svg)
-  skin/classic/messenger/icons/goback.svg                     (../shared/mail/icons/goback.svg)
-  skin/classic/messenger/icons/goforward.svg                  (../shared/mail/icons/goforward.svg)
-  skin/classic/messenger/icons/join.svg                       (../shared/mail/icons/join.svg)
-  skin/classic/messenger/icons/junk.svg                       (../shared/mail/icons/junk.svg)
-  skin/classic/messenger/icons/mark.svg                       (../shared/mail/icons/mark.svg)
-  skin/classic/messenger/icons/newmsg.svg                     (../shared/mail/icons/newmsg.svg)
-  skin/classic/messenger/icons/nextmsg.svg                    (../shared/mail/icons/nextmsg.svg)
-  skin/classic/messenger/icons/nextunread.svg                 (../shared/mail/icons/nextunread.svg)
+  skin/classic/messenger/icons/mail-toolbar.svg               (../shared/mail/icons/mail-toolbar.svg)
   skin/classic/messenger/icons/overflow-indicator.png         (../shared/mail/icons/overflow-indicator.png)
-  skin/classic/messenger/icons/paste.svg                      (../shared/mail/icons/paste.svg)
-  skin/classic/messenger/icons/previousmsg.svg                (../shared/mail/icons/previousmsg.svg)
-  skin/classic/messenger/icons/previousunread.svg             (../shared/mail/icons/previousunread.svg)
-  skin/classic/messenger/icons/print.svg                      (../shared/mail/icons/print.svg)
-  skin/classic/messenger/icons/quote.svg                      (../shared/mail/icons/quote.svg)
   skin/classic/messenger/icons/remote-blocked.svg             (../shared/mail/icons/remote-blocked.svg)
-  skin/classic/messenger/icons/reply.svg                      (../shared/mail/icons/reply.svg)
-  skin/classic/messenger/icons/replyall.svg                   (../shared/mail/icons/replyall.svg)
-  skin/classic/messenger/icons/replylist.svg                  (../shared/mail/icons/replylist.svg)
   skin/classic/messenger/icons/search-glass.svg               (../shared/mail/icons/search-glass.svg)
-  skin/classic/messenger/icons/save.svg                       (../shared/mail/icons/save.svg)
-  skin/classic/messenger/icons/security.svg                   (../shared/mail/icons/security.svg)
-  skin/classic/messenger/icons/send.svg                       (../shared/mail/icons/send.svg)
-  skin/classic/messenger/icons/spelling.svg                   (../shared/mail/icons/spelling.svg)
-  skin/classic/messenger/icons/stop.svg                       (../shared/mail/icons/stop.svg)
-  skin/classic/messenger/icons/tag.svg                        (../shared/mail/icons/tag.svg)
   skin/classic/messenger/icons/toolbarbutton-arrow.svg        (../shared/mail/icons/toolbarbutton-arrow.svg)
+  skin/classic/messenger/messengercompose/compose-toolbar.svg (../shared/mail/icons/compose-toolbar.svg)
   skin/classic/messenger/shared/accountProvisioner.css        (../shared/mail/accountProvisioner.css)
   skin/classic/messenger/shared/addressbook.css               (../shared/mail/addressbook.css)
   skin/classic/messenger/shared/in-content/dialog.css         (../shared/mail/incontentprefs/dialog.css)
   skin/classic/messenger/shared/in-content/aboutPreferences.css (../shared/mail/incontentprefs/aboutPreferences.css)
   skin/classic/messenger/shared/in-content/account.svg        (../shared/mail/incontentprefs/account.svg)
   skin/classic/messenger/shared/in-content/advanced.svg       (../shared/mail/incontentprefs/advanced.svg)
   skin/classic/messenger/shared/in-content/attachment.svg     (../shared/mail/incontentprefs/attachment.svg)
   skin/classic/messenger/shared/in-content/calendar.svg       (../shared/mail/incontentprefs/calendar.svg)
@@ -75,9 +42,14 @@
   skin/classic/messenger/shared/in-content/privacy.svg        (../shared/mail/incontentprefs/privacy.svg)
   skin/classic/messenger/shared/in-content/security.svg       (../shared/mail/incontentprefs/security.svg)
   skin/classic/messenger/shared/mailWindow1.css               (../shared/mail/mailWindow1.css)
   skin/classic/messenger/shared/messageHeader.css             (../shared/mail/messageHeader.css)
   skin/classic/messenger/shared/messenger.css                 (../shared/mail/messenger.css)
   skin/classic/messenger/shared/tabmail.css                   (../shared/mail/tabmail.css)
 #ifndef XP_MACOSX
   skin/classic/messenger/icons/search-close.svg               (../shared/mail/icons/search-close.svg)
+#else
+  skin/classic/messenger/addressbook/icons/addressbook-toolbar-osxlion.svg (../shared/mail/icons/addressbook-toolbar-osxlion.svg)
+  skin/classic/messenger/icons/mail-toolbar-osxlion.svg       (../shared/mail/icons/mail-toolbar-osxlion.svg)
+  skin/classic/messenger/icons/chat-toolbar-osxlion.svg       (../shared/mail/icons/chat-toolbar-osxlion.svg)
+  skin/classic/messenger/messengercompose/compose-toolbar-osxlion.svg (../shared/mail/icons/compose-toolbar-osxlion.svg)
 #endif
--- a/mail/themes/shared/mail/addressbook.css
+++ b/mail/themes/shared/mail/addressbook.css
@@ -9,42 +9,16 @@
   background-color: var(--toolbar-bgcolor);
   color: var(--toolbar-color, inherit);
 }
 
 toolbox[labelalign="end"] > toolbar[mode="full"] deck .toolbarbutton-text {
   text-align: start;
 }
 
-/* ::::: primary toolbar buttons ::::: */
-
-#button-newcard {
-  list-style-image: url("chrome://messenger/skin/icons/addcontact.svg");
-}
-
-#button-newlist {
-  list-style-image: url("chrome://messenger/skin/icons/addlist.svg");
-}
-
-#button-editcard {
-  list-style-image: url("chrome://messenger/skin/icons/accounts.svg");
-}
-
-#button-newmessage {
-  list-style-image: url("chrome://messenger/skin/icons/newmsg.svg");
-}
-
-#button-newim {
-  list-style-image: url("chrome://messenger/skin/icons/chat.svg");
-}
-
-#button-abdelete {
-  list-style-image: url("chrome://messenger/skin/icons/delete.svg");
-}
-
 #abContent {
   text-shadow: none;
   color: -moz-DialogText;
   background-color: -moz-Dialog;
 }
 
 #dirTree [sortDirection="ascending"],
 #dirTree [sortDirection="descending"] {
deleted file mode 100644
--- a/mail/themes/shared/mail/icons/accounts.svg
+++ /dev/null
@@ -1,6 +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 fill="context-fill" fill-opacity="context-fill-opacity" d="M 8,0.5 C 3.929,0.5 0.5,3.821 0.5,8 c 0,4.07 3.321,7.5 7.5,7.5 4.07,0 7.5,-3.32 7.5,-7.5 C 15.5,3.929 12.18,0.5 8,0.5 Z m 0,1.607 c 0.857,0 1.61,0.643 1.61,1.607 C 9.61,4.571 8.857,5.321 8,5.321 7.036,5.321 6.393,4.571 6.393,3.714 6.393,2.75 7.036,2.107 8,2.107 Z M 9.61,12.29 c 0,0.85 -0.646,1.6 -1.61,1.6 -0.964,0 -1.607,-0.75 -1.607,-1.6 V 8 C 6.393,7.036 7.036,6.393 8,6.393 8.857,6.393 9.61,7.036 9.61,8 Z"/>
-</svg>
deleted file mode 100644
--- a/mail/themes/shared/mail/icons/addcontact.svg
+++ /dev/null
@@ -1,6 +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 fill="context-fill" fill-opacity="context-fill-opacity" d="m 3.3,6.5 c -0.2,0.3 -0.5,0.6 -0.5,1 0,0.3 0.4,0.6 0.5,1 0.2,1.5 1,2.5 3.2,3 V 12 C 4,12 1,11.5 1,15 h 14 c 0,-3.5 -3,-3 -5.5,-3 v -0.5 c 2,-0.5 2.9,-1.6 3.2,-3 0,-0.3 0.5,-0.6 0.5,-1 0,-0.4 -0.4,-0.7 -0.5,-1 0,-6 -9.4,-6 -9.4,0 z M 7,4 h 2 v 2 h 2 V 8 H 9 v 2 H 7 V 8 H 5 V 6 h 2 z"/>
-</svg>
deleted file mode 100644
--- a/mail/themes/shared/mail/icons/addlist.svg
+++ /dev/null
@@ -1,6 +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 fill="context-fill" fill-opacity="context-fill-opacity" d="M 5.5,7.5 C 5.3,7.8 5,8.1 5,8.5 c 0,0.3 0.4,0.6 0.5,1 0,1.8 2,3.5 3.5,3.5 -2.3,0 -4,-0.2 -4,2 h 10 c 0,-2.1 -1.7,-2 -4,-2 1.7,0 3.5,-2 3.5,-3.5 0,-0.3 0.5,-0.6 0.5,-1 0,-0.4 -0.4,-0.7 -0.5,-1 0,-6 -9,-6 -9,0 z M 9,5 h 2 v 2 h 2 v 2 h -2 v 2.1 H 9 V 9 H 7 V 7 H 9 Z M 7.5,2.5 C 5,1 2,2.8 2,5.5 1.8,5.8 1.5,6.1 1.5,6.5 1.5,6.8 1.8,7.1 2,7.5 2,9 2.5,11 4,11 1.4,11 1,11 1,13 H 4 C 4.5,12 4.8,12.2 5.5,12 3.5,11 4.2,9.2 3.7,8.5 3.5,7 4.2,7 4.2,6.5 4.2,5 5,3 7.5,2.5 Z"/>
-</svg>
deleted file mode 100644
--- a/mail/themes/shared/mail/icons/address.svg
+++ /dev/null
@@ -1,6 +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 fill="context-fill" fill-opacity="context-fill-opacity" d="m 2,14 h 12 c 0,-3 -1.2,-3 -4,-3 V 10 C 12,8.9 11.7,8.4 12,7 12,6.7 12.5,6.4 12.5,6 12.5,5.6 12.1,5.3 12,5 11.8,4.6 11.9,2.7 11,2 9.4,0.8 6.56,0.8 5,2 4,2.7 4.1,4.6 4,5 3.8,5.3 3.5,5.6 3.5,6 3.5,6.3 3.9,6.6 4,7 4.2,8.5 4,8.8 6,10 v 1 c -2.5,0 -4,0 -4,3 z"/>
-</svg>
new file mode 100644
--- /dev/null
+++ b/mail/themes/shared/mail/icons/addressbook-toolbar-osxlion.svg
@@ -0,0 +1,46 @@
+<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: url(#osx1);
+      fill-opacity: 1;
+      stroke: url(#osx2);
+    }
+  </style>
+  <defs>
+    <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 4.5,6.5 C 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 0.8,2.5 3,3 l 0,1 c -2.4,0.1 -6,-0.5 -6,3 l 15,0 c 0,-3.5 -3.6,-3 -6,-3 l 0,-1 c 2,-0.5 2.7,-1.6 3,-3 0,-0.3 0.5,-0.6 0.5,-1 0,-0.4 -0.4,-0.7 -0.5,-1 0,-6 -9,-6 -9,0 z m 3,-3 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="newlist" class="normal" d="M 6.5,7.5 C 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 0.8,2.3 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.3,-0.7 2.8,-1.5 3,-3 0,-0.3 0.5,-0.6 0.5,-1 0,-0.4 -0.4,-0.7 -0.5,-1 0,-6 -9,-6 -9,0 z m 3,-3 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 4.4,2.2 2.5,2.8 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.5,12.2 5.2,12 4,11 4.5,9.2 4,8.5 4,8 4.6,7 4.5,6.5 4.7,4.6 5.3,3 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 0,2 C 9.8,3.5 10.5,4.1 10.5,5 10.5,5.8 9.8,6.5 9,6.5 8.1,6.5 7.5,5.8 7.5,5 7.5,4.1 8.1,3.5 9,3.5 Z M 10.5,13 C 10.5,13.8 9.8,14.5 9,14.5 8.1,14.5 7.5,13.8 7.5,13 l 0,-4 C 7.5,8.1 8.1,7.5 9,7.5 c 0.8,0 1.5,0.6 1.5,1.5 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="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="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"/>
+</svg>
new file mode 100644
--- /dev/null
+++ b/mail/themes/shared/mail/icons/addressbook-toolbar.svg
@@ -0,0 +1,97 @@
+<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: none;
+      }
+    }
+    @media (-moz-windows-default-theme) and (-moz-os-version: windows-win10) {
+      .normal {
+        fill: #4c4c4c;
+        fill-opacity: 1;
+        stroke: none;
+      }
+    }
+    @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-yosemite-theme) {
+      .normal {
+        fill: #4d4d4d;
+        fill-opacity: 1;
+        stroke: none;
+      }
+    }
+    .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>
+  </defs>
+  <path id="newcard" class="normal" d="M 4.5,6.5 C 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 0.8,2.5 3,3 l 0,1 c -2.4,0.1 -6,-0.5 -6,3 l 15,0 c 0,-3.5 -3.6,-3 -6,-3 l 0,-1 c 2,-0.5 2.7,-1.6 3,-3 0,-0.3 0.5,-0.6 0.5,-1 0,-0.4 -0.4,-0.7 -0.5,-1 0,-6 -9,-6 -9,0 z m 3,-3 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-flat" class="normal" d="m 4.3,6.5 c -0.2,0.3 -0.5,0.6 -0.5,1 0,0.3 0.4,0.6 0.5,1 0.2,1.5 1,2.5 3.2,3 l 0,0.5 C 5,12 2,11.5 2,15 l 14,0 c 0,-3.5 -3,-3 -5.5,-3 l 0,-0.5 c 2,-0.5 2.9,-1.6 3.2,-3 0,-0.3 0.5,-0.6 0.5,-1 0,-0.4 -0.4,-0.7 -0.5,-1 0,-6 -9.4,-6 -9.4,0 z M 8,4 l 2,0 0,2 2,0 0,2 -2,0 0,2 L 8,10 8,8 6,8 6,6 8,6 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 6.5,7.5 C 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 0.8,2.3 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.3,-0.7 2.8,-1.5 3,-3 0,-0.3 0.5,-0.6 0.5,-1 0,-0.4 -0.4,-0.7 -0.5,-1 0,-6 -9,-6 -9,0 z m 3,-3 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 4.4,2.2 2.5,2.8 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.5,12.2 5.2,12 4,11 4.5,9.2 4,8.5 4,8 4.6,7 4.5,6.5 4.7,4.6 5.3,3 7,2 Z"/>
+  <path id="newlist-flat" class="normal" d="M 6.5,7.5 C 6.3,7.8 6,8.1 6,8.5 c 0,0.3 0.4,0.6 0.5,1 0,1.8 2,3.5 3.5,3.5 -2.3,0 -4,-0.2 -4,2 l 10,0 c 0,-2.1 -1.7,-2 -4,-2 1.7,0 3.5,-2 3.5,-3.5 0,-0.3 0.5,-0.6 0.5,-1 0,-0.4 -0.4,-0.7 -0.5,-1 0,-6 -9,-6 -9,0 z M 10,5 l 2,0 0,2 2,0 0,2 -2,0 0,2.1 -2,0 L 10,9 8,9 8,7 10,7 Z M 8.5,2.5 C 6,1 3,2.8 3,5.5 2.8,5.8 2.5,6.1 2.5,6.5 2.5,6.8 2.8,7.1 3,7.5 3,9 3.5,11 5,11 2.4,11 2,11 2,13 l 3,0 C 5.5,12 5.8,12.2 6.5,12 4.5,11 5.2,9.2 4.7,8.5 4.5,7 5.2,7 5.2,6.5 5.2,5 6,3 8.5,2.5 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.2 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 0,2 C 9.8,3.5 10.5,4.1 10.5,5 10.5,5.8 9.8,6.5 9,6.5 8.1,6.5 7.5,5.8 7.5,5 7.5,4.1 8.1,3.5 9,3.5 Z M 10.5,13 C 10.5,13.8 9.8,14.5 9,14.5 8.1,14.5 7.5,13.8 7.5,13 l 0,-4 C 7.5,8.1 8.1,7.5 9,7.5 c 0.8,0 1.5,0.6 1.5,1.5 z"/>
+  <path id="editcard-flat" class="normal" d="m 9.5,2 c -3.8,0 -7,3.1 -7,7 0,3.8 3.1,7 7,7 3.8,0 7,-3.1 7,-7 0,-3.8 -3.1,-7 -7,-7 z m 0,1.5 C 10.3,3.5 11,4.1 11,5 11,5.8 10.3,6.5 9.5,6.5 8.6,6.5 8,5.8 8,5 8,4.1 8.6,3.5 9.5,3.5 Z M 11,13 c 0,0.8 -0.6,1.5 -1.5,1.5 C 8.6,14.5 8,13.8 8,13 L 8,9 C 8,8.1 8.6,7.5 9.5,7.5 10.3,7.5 11,8.1 11,9 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 0,2 C 9.8,3.5 10.5,4.1 10.5,5 10.5,5.8 9.8,6.5 9,6.5 8.1,6.5 7.5,5.8 7.5,5 7.5,4.1 8.1,3.5 9,3.5 Z M 10.5,13 C 10.5,13.8 9.8,14.5 9,14.5 8.1,14.5 7.5,13.8 7.5,13 l 0,-4 C 7.5,8.1 8.1,7.5 9,7.5 c 0.8,0 1.5,0.6 1.5,1.5 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-flat" class="normal" d="m 2,3 9,0 0,1.5 -5,5 0,3.5 3.5,0 1.5,-1.5 0,3.5 -9,0 z m 5,9 2,0 7,-7 -2,-2 -7,7 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-flat" class="normal" d="M 16,5 C 16,3.8 15.2,3 14,3 L 4,3 C 2.8,3 2,3.8 2,5 l 0,5 c 0,1.2 0.8,2.1 2,2.1 l 2,0 0,3.9 3.5,-3.9 4.5,0 c 1.2,0 2,-0.9 2,-2.1 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>
deleted file mode 100644
--- a/mail/themes/shared/mail/icons/appbutton.svg
+++ /dev/null
@@ -1,6 +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" viewBox="0 0 16 16">
-  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M3,4H13a1,1,0,0,0,0-2H3A1,1,0,0,0,3,4ZM13,7H3A1,1,0,0,0,3,9H13a1,1,0,0,0,0-2Zm0,5H3a1,1,0,0,0,0,2H13a1,1,0,0,0,0-2Z"/>
-</svg>
deleted file mode 100644
--- a/mail/themes/shared/mail/icons/archive.svg
+++ /dev/null
@@ -1,6 +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 fill="context-fill" fill-opacity="context-fill-opacity" d="m 1,6 v 9 H 15 V 6 Z M 4.5,7 8,10.5 11.5,7 13.5,9 8,14 2.5,9 Z M 2,4 H 14 V 5 H 2 Z M 3,2 H 13 V 3 H 3 Z"/>
-</svg>
new file mode 100644
--- /dev/null
+++ b/mail/themes/shared/mail/icons/chat-toolbar-osxlion.svg
@@ -0,0 +1,50 @@
+<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;
+    }
+    @media (-moz-mac-lion-theme) {
+      .normal {
+        fill: url(#osx1);
+        fill-opacity: 1;
+        stroke: url(#osx2);
+      }
+    }
+    .normal {
+      fill: #4d4d4d;
+      fill-opacity: 1;
+      stroke: none;
+    }
+  </style>
+  <defs>
+    <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 4.5,6.5 C 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 0.8,2.5 3,3 l 0,1 c -2.4,0.1 -6,-0.5 -6,3 l 15,0 c 0,-3.5 -3.6,-3 -6,-3 l 0,-1 c 2,-0.5 2.7,-1.6 3,-3 0,-0.3 0.5,-0.6 0.5,-1 0,-0.4 -0.4,-0.7 -0.5,-1 0,-6 -9,-6 -9,0 z m 3,-3 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="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="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 0,2 C 9.8,3.5 10.5,4.1 10.5,5 10.5,5.8 9.8,6.5 9,6.5 8.1,6.5 7.5,5.8 7.5,5 7.5,4.1 8.1,3.5 9,3.5 Z M 10.5,13 C 10.5,13.8 9.8,14.5 9,14.5 8.1,14.5 7.5,13.8 7.5,13 l 0,-4 C 7.5,8.1 8.1,7.5 9,7.5 c 0.8,0 1.5,0.6 1.5,1.5 z"/>
+</svg>
new file mode 100644
--- /dev/null
+++ b/mail/themes/shared/mail/icons/chat-toolbar.svg
@@ -0,0 +1,88 @@
+<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: none;
+      }
+    }
+    @media (-moz-windows-default-theme) and (-moz-os-version: windows-win10) {
+      .normal {
+        fill: #4c4c4c;
+        fill-opacity: 1;
+        stroke: none;
+      }
+    }
+    @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-yosemite-theme) {
+      .normal {
+        fill: #4d4d4d;
+        fill-opacity: 1;
+        stroke: none;
+      }
+    }
+    .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>
+  </defs>
+  <path id="add" class="normal" d="M 4.5,6.5 C 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 0.8,2.5 3,3 l 0,1 c -2.4,0.1 -6,-0.5 -6,3 l 15,0 c 0,-3.5 -3.6,-3 -6,-3 l 0,-1 c 2,-0.5 2.7,-1.6 3,-3 0,-0.3 0.5,-0.6 0.5,-1 0,-0.4 -0.4,-0.7 -0.5,-1 0,-6 -9,-6 -9,0 z m 3,-3 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-flat" class="normal" d="m 4.3,6.5 c -0.2,0.3 -0.5,0.6 -0.5,1 0,0.3 0.4,0.6 0.5,1 0.2,1.5 1,2.5 3.2,3 l 0,0.5 C 5,12 2,11.5 2,15 l 14,0 c 0,-3.5 -3,-3 -5.5,-3 l 0,-0.5 c 2,-0.5 2.9,-1.6 3.2,-3 0,-0.3 0.5,-0.6 0.5,-1 0,-0.4 -0.4,-0.7 -0.5,-1 0,-6 -9.4,-6 -9.4,0 z M 8,4 l 2,0 0,2 2,0 0,2 -2,0 0,2 L 8,10 8,8 6,8 6,6 8,6 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-flat" class="normal" d="m 8,7 7,0 c 0.5,0 1,0.5 1,1 l 0,4.1 c 0,0.5 -0.5,1 -1,1 l -4,0 -2,2.9 0,-2.9 -1,0 c -0.5,0 -1,-0.5 -1,-1 L 7,8 C 7,7.5 7.5,7 8,7 Z M 3,3 11,3 c 0.5,0 1,0.5 1,1 L 12,6 8,6 C 7,6 6,7 6,8 L 6,9 4,12 4,9 3,9 C 2.5,9 2,8.5 2,8 L 2,4 C 2,3.5 2.5,3 3,3 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 0,2 C 9.8,3.5 10.5,4.1 10.5,5 10.5,5.8 9.8,6.5 9,6.5 8.1,6.5 7.5,5.8 7.5,5 7.5,4.1 8.1,3.5 9,3.5 Z M 10.5,13 C 10.5,13.8 9.8,14.5 9,14.5 8.1,14.5 7.5,13.8 7.5,13 l 0,-4 C 7.5,8.1 8.1,7.5 9,7.5 c 0.8,0 1.5,0.6 1.5,1.5 z"/>
+  <path id="accounts-flat" class="normal" d="m 9.5,2 c -3.8,0 -7,3.1 -7,7 0,3.8 3.1,7 7,7 3.8,0 7,-3.1 7,-7 0,-3.8 -3.1,-7 -7,-7 z m 0,1.5 C 10.3,3.5 11,4.1 11,5 11,5.8 10.3,6.5 9.5,6.5 8.6,6.5 8,5.8 8,5 8,4.1 8.6,3.5 9.5,3.5 Z M 11,13 c 0,0.8 -0.6,1.5 -1.5,1.5 C 8.6,14.5 8,13.8 8,13 L 8,9 C 8,8.1 8.6,7.5 9.5,7.5 10.3,7.5 11,8.1 11,9 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 0,2 C 9.8,3.5 10.5,4.1 10.5,5 10.5,5.8 9.8,6.5 9,6.5 8.1,6.5 7.5,5.8 7.5,5 7.5,4.1 8.1,3.5 9,3.5 Z M 10.5,13 C 10.5,13.8 9.8,14.5 9,14.5 8.1,14.5 7.5,13.8 7.5,13 l 0,-4 C 7.5,8.1 8.1,7.5 9,7.5 c 0.8,0 1.5,0.6 1.5,1.5 z"/>
+</svg>
--- a/mail/themes/shared/mail/icons/chat.svg
+++ b/mail/themes/shared/mail/icons/chat.svg
@@ -1,6 +1,6 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M 15,4 C 15,2.8 14.2,2 13,2 H 3 C 1.8,2 1,2.8 1,4 v 5 c 0,1.2 0.789,2 2,2 h 2 v 3.5 L 8.5,11 H 13 c 1.2,0 2,-0.8 2,-2 z"/>
+  <path fill="context-fill" d="M 15,4 C 15,2.8 14.2,2 13,2 H 3 C 1.8,2 1,2.8 1,4 v 5 c 0,1.2 0.789,2 2,2 h 2 v 3.5 L 8.5,11 H 13 c 1.2,0 2,-0.8 2,-2 z"/>
 </svg>
deleted file mode 100644
--- a/mail/themes/shared/mail/icons/compact.svg
+++ /dev/null
@@ -1,6 +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 fill="context-fill" fill-opacity="context-fill-opacity" d="M 4,2 C 5.2,2.5 6.1,3.8 6.7,5 H 8.9 L 4.2,9.3 v -2 C 3.1,6.3 2.3,5.3 2,4 1.9,2.1 2.2,1.8 4,2 Z m 1,8 4.5,-4 1,0.6 3.7,2.2 -1,2.5 -2.7,-2 -0.7,0.8 2.2,2.6 -1.6,1 L 8.2,11.2 7.7,11.5 8.3,14 H 5.5 v -2.9 z"/>
-</svg>
new file mode 100644
--- /dev/null
+++ b/mail/themes/shared/mail/icons/compose-toolbar-osxlion.svg
@@ -0,0 +1,51 @@
+<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: url(#osx1);
+      fill-opacity: 1;
+      stroke: url(#osx2);
+    }
+  </style>
+  <defs>
+    <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="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="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="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="security" class="normal" d="m 9,2.5 c -3,0 -5,1 -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 z m 0,2 c 3,0 3.5,1 3.5,4 l -7,0 c 0,-3 1,-4 3.5,-4 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="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="cut" class="normal" d="M 2.8,2 C 2,2.6 2,3.6 2.8,4.5 L 7.5,10.1 6.7,11 C 6.3,10.6 5.6,10 4.5,10 c -1.5,0 -3,1.3 -3,3 0,1.7 1.6,3 3,3 2,0 3.1,-2.5 4.5,-4 1.5,1.7 2.6,4 4.5,4 1.4,0 3,-1.5 3,-3 0,-1.7 -1.2,-3 -3,-3 -1.2,0 -1.8,0.6 -2.2,1 L 10.5,10.1 15.2,4.5 C 15.8,3.6 15.7,2.6 15,2 L 9,8.5 Z m 10.7,9 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 m -9,0 C 5.6,11 6.5,12 6.5,13 6.5,14 5.6,15 4.5,15 3.4,15 2.5,14 2.5,13 2.5,12 3.4,11 4.5,11 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="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="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 0,6 2,0 0,2 -2,0 z m 0,5.4 0,1.6 m -2.5,0 14,0 m -2.5,0 0,-1.6"/>
+</svg>
new file mode 100644
--- /dev/null
+++ b/mail/themes/shared/mail/icons/compose-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;
+        stroke-opacity: 0;
+      }
+    }
+    @media (-moz-windows-default-theme) and (-moz-os-version: windows-win10) {
+      .normal {
+        fill: #4c4c4c;
+        fill-opacity: 1;
+        stroke: #4c4c4c;
+        stroke-opacity: 0;
+      }
+    }
+    @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-yosemite-theme) {
+      .normal {
+        fill: #4d4d4d;
+        fill-opacity: 1;
+        stroke-opacity: 0;
+      }
+    }
+    .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>
+  </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-flat" class="normal" d="m 2,2 0,3 2,0 0,3 -2,0 0,2 2,0 0,3 -2,0 0,3 3,0 0,-2 3,0 0,2 2,0 0,-2 3,0 0,2 3,0 0,-3 -2,0 0,-3 2,0 0,-2 -2,0 0,-3 2,0 0,-3 -3,0 0,2 L 10,4 10,2 8,2 8,4 5,4 5,2 Z m 4,4 6,0 0,6 -6,0 z m 2,2 2,0 0,2 -2,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-flat" class="normal" d="m 3,15 12,0 c 0,-3 -1.2,-3 -4,-3 l 0,-1 C 13,9.9 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 4.5,7.3 4.9,7.6 5,8 5.2,9.5 5,9.8 7,11 l 0,1 c -2.5,0 -4,0 -4,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-flat" class="normal" d="m 2,10.5 1.5,-2 3.7,3 C 9.5,7.6 12.1,5.6 16,3.5 l 0,1 c -4,3.1 -8.5,11 -8.5,11 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-flat" 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; stroke-opacity:1"/>
+  <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 -3,0 -5,1 -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 z m 0,2 c 3,0 3.5,1 3.5,4 l -7,0 c 0,-3 1,-4 3.5,-4 z"/>
+  <path id="security-flat" class="normal" d="M 9,3 C 6.25,3 4,4 4,7.5 L 4,9 3,9 3,15 15,15 15,9 14,9 14,7.5 C 14,4 11.5,3 9,3 Z m 0,2 c 3,0 3,1 3,4 L 6,9 C 6,6 6,5 9,5 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-flat" class="normal" d="M 9,15 15,9 11,9 11,3.5 C 11,3.25 10.75,3 10.5,3 l -3,0 C 7.25,3 7,3.25 7,3.5 L 7,9 3,9 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-flat" class="normal" d="M 5,9 C -6,5 16,-5 5,15 Z m 8,0 C 2,5 24,-5 13,15 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 2.8,2 C 2,2.6 2,3.6 2.8,4.5 L 7.5,10.1 6.7,11 C 6.3,10.6 5.6,10 4.5,10 c -1.5,0 -3,1.3 -3,3 0,1.7 1.6,3 3,3 2,0 3.1,-2.5 4.5,-4 1.5,1.7 2.6,4 4.5,4 1.4,0 3,-1.5 3,-3 0,-1.7 -1.2,-3 -3,-3 -1.2,0 -1.8,0.6 -2.2,1 L 10.5,10.1 15.2,4.5 C 15.8,3.6 15.7,2.6 15,2 L 9,8.5 Z m 10.7,9 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 m -9,0 C 5.6,11 6.5,12 6.5,13 6.5,14 5.6,15 4.5,15 3.4,15 2.5,14 2.5,13 2.5,12 3.4,11 4.5,11 Z"/>
+  <path id="cut-flat" class="normal" d="M 3.301,2 C 2.7,2.6 2.5,3.6 3.3,4.5 l 4.5,6.1 -0.3,0.5 C 7,10.6 6.1,10 5,10 c -1.5,0 -3,1.3 -3,3 0,1.7 1.6,3 3,3 2.4,0 2.6,-2 4,-3.5 1.5,1.7 1.7,3.5 4,3.5 1.4,0 3,-1.5 3,-3 0,-1.7 -1,-3 -3,-3 -1,0 -2,0.7 -2.5,1.1 L 10.2,10.6 14.7,4.5 C 15.3,3.6 15.2,2.6 14.6,2 L 9,9 Z M 5,11 c 1,0 2,1 2,2 0,1 -1,2 -2,2 -1,0 -2,-1 -2,-2 0,-1 1,-2 2,-2 z m 8,0 c 1,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-flat" class="normal" d="m 8,7 0,9 7,0 0,-6 -3,-3 z m 4,1 2,2 -2,0 z M 3,2 3,11 7,11 7,6 10,6 10,5 7,2 Z m 4,1 L 9,5 7,5 Z"/>
+  <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-flat" class="normal" d="M 7,3 6,4 6,5 4,5 4,15 14,15 14,5 12,5 12,4 11,3 Z m -1,2 6,0 0,2 -1,0 1.5,3 -6,3 L 4.5,9 8.7,7 6,7 Z M 8.7,7 11,7 10.5,6 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 0,6 2,0 0,2 -2,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-flat" class="normal" d="M 5,3 5,7 4,7 C 3.2,7 2,7.6 2,8.5 l 0,3 c 0,1 0.9,1.5 2,1.5 l 1,0 0,1 -1,0 0,1 10,0 0,-1 -1,0 0,-1 1,0 c 1,0 2,-0.5 2,-1.5 l 0,-3 C 16,7.7 14.8,7 14,7 l -1,0 0,-4 z m 1,1 6,0 0,4 -6,0 z m -1,5 1,0 0,1 -1,0 z m 1,3 6,0 0,2 -6,0 z"/>
+  <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 -1,5 2,0 0,1 -2,0 z m 1,3 7,0 0,1 -7,0 z"/>
+</svg>
deleted file mode 100644
--- a/mail/themes/shared/mail/icons/conversation.svg
+++ /dev/null
@@ -1,6 +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 fill="context-fill" fill-opacity="context-fill-opacity" d="M 14.5,5 C 15.2,5 16,5.8 16,6.5 v 3 C 16,10.2 15.2,11 14.5,11 H 14 v 4 l -2.5,-4 h -2 C 8.8,11 8,10.2 8,9.5 v -3 C 8,5.8 8.8,5 9.5,5 Z M 0,3.5 C 0,2.8 0.8,2 1.5,2 h 7 C 9.2,2 10,2.8 10,3.5 V 4 H 9 C 8,4 7,5 7,6 V 9 H 4.5 L 2,13 V 9 H 1.5 C 0.8,9 0,8.2 0,7.5 Z"/>
-</svg>
deleted file mode 100644
--- a/mail/themes/shared/mail/icons/copy.svg
+++ /dev/null
@@ -1,6 +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" viewBox="0 0 16 16">
-  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M14.707 8.293l-3-3A1 1 0 0 0 11 5h-1V4a1 1 0 0 0-.293-.707l-3-3A1 1 0 0 0 6 0H3a2 2 0 0 0-2 2v7a2 2 0 0 0 2 2h3v3a2 2 0 0 0 2 2h5a2 2 0 0 0 2-2V9a1 1 0 0 0-.293-.707zM12.586 9H11V7.414zm-5-5H6V2.414zM6 7v2H3V2h2v2.5a.5.5 0 0 0 .5.5H8a2 2 0 0 0-2 2zm2 7V7h2v2.5a.5.5 0 0 0 .5.5H13v4z"/>
-</svg>
deleted file mode 100644
--- a/mail/themes/shared/mail/icons/cut.svg
+++ /dev/null
@@ -1,6 +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" viewBox="0 0 16 16">
-  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M11.5 10a2.481 2.481 0 0 0-.379.038L3.977 1.214a2.5 2.5 0 0 0-.371 3.515l2.789 3.444-1.51 1.866A2.486 2.486 0 0 0 4.5 10a2.522 2.522 0 1 0 2.329 1.609L8 10.159 9.172 11.6A2.5 2.5 0 1 0 11.5 10zm-7 3.75a1.25 1.25 0 1 1 1.25-1.25 1.251 1.251 0 0 1-1.25 1.25zm7 0a1.25 1.25 0 1 1 1.25-1.25 1.251 1.251 0 0 1-1.25 1.25zm.9-9.021a2.5 2.5 0 0 0-.371-3.515L8.5 5.569l1.608 1.986z"/>
-</svg>
deleted file mode 100644
--- a/mail/themes/shared/mail/icons/delete.svg
+++ /dev/null
@@ -1,6 +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 fill="context-fill" fill-opacity="context-fill-opacity" d="m 8,0.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 3.9,15.5 0.5,12.2 0.5,8 0.5,3.8 3.9,0.5 8,0.5 Z m -3,3 7.5,7.5 C 15.3,6.1 10,0.7 5,3.5 Z M 3.5,5 c -3.1,5.4 2.9,10 7.5,7.5 z"/>
-</svg>
deleted file mode 100644
--- a/mail/themes/shared/mail/icons/file.svg
+++ /dev/null
@@ -1,6 +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 fill="context-fill" fill-opacity="context-fill-opacity" d="M 8,14 14,8 H 10 V 2.5 C 10,2.25 9.75,2 9.5,2 h -3 C 6.25,2 6,2.25 6,2.5 V 8 H 2 Z"/>
-</svg>
deleted file mode 100644
--- a/mail/themes/shared/mail/icons/filter.svg
+++ /dev/null
@@ -1,6 +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 fill="context-fill" fill-opacity="context-fill-opacity" d="M 2,3 H 14 L 9,8 v 5 H 7 V 8 Z"/>
-</svg>
deleted file mode 100644
--- a/mail/themes/shared/mail/icons/forward.svg
+++ /dev/null
@@ -1,6 +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 fill="context-fill" fill-opacity="context-fill-opacity" d="M 1,6 H 8 V 2.5 L 14.5,8 8,13.5 V 10 H 1 Z"/>
-</svg>
deleted file mode 100644
--- a/mail/themes/shared/mail/icons/getmsg.svg
+++ /dev/null
@@ -1,6 +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 fill="context-fill" fill-opacity="context-fill-opacity" d="m 1,9 h 2 v 3 H 13 V 9 h 2 v 5 H 1 Z M 6,1 h 4 v 4 h 2.5 L 8,9.5 3.5,5 H 6 Z"/>
-</svg>
deleted file mode 100644
--- a/mail/themes/shared/mail/icons/goback.svg
+++ /dev/null
@@ -1,6 +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 fill="context-fill" fill-opacity="context-fill-opacity" d="m 3,8 9,-6.5 v 13 z"/>
-</svg>
deleted file mode 100644
--- a/mail/themes/shared/mail/icons/goforward.svg
+++ /dev/null
@@ -1,6 +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 fill="context-fill" fill-opacity="context-fill-opacity" d="M 13,8 4,1.5 v 13 z"/>
-</svg>
deleted file mode 100644
--- a/mail/themes/shared/mail/icons/join.svg
+++ /dev/null
@@ -1,6 +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 fill="context-fill" fill-opacity="context-fill-opacity" d="m 7,6 h 7 c 0.5,0 1,0.5 1,1 v 4.1 c 0,0.5 -0.5,1 -1,1 H 10 L 8,15 V 12.1 H 7 c -0.5,0 -1,-0.5 -1,-1 V 7 C 6,6.5 6.5,6 7,6 Z M 2,2 h 8 c 0.5,0 1,0.5 1,1 V 5 H 7 C 6,5 5,6 5,7 V 8 L 3,11 V 8 H 2 C 1.5,8 1,7.5 1,7 V 3 C 1,2.5 1.5,2 2,2 Z"/>
-</svg>
deleted file mode 100644
--- a/mail/themes/shared/mail/icons/junk.svg
+++ /dev/null
@@ -1,6 +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 fill="context-fill" fill-opacity="context-fill-opacity" d="m 8,1.36 c -4,2.5 -6.6,6.1 -4.6,10.8 2.5,4.5 8.3,2.7 9.5,0.3 0.9,-2.4 0.9,-3 -0.8,-7 -1.2,-1.6 0.1,2.4 -1.3,3.6 -1.5,1 -3,0.8 -4,-0.2 -2.5,-2.5 3.2,-7.6 1.2,-7.5 z"/>
-</svg>
new file mode 100644
--- /dev/null
+++ b/mail/themes/shared/mail/icons/mail-toolbar-osxlion.svg
@@ -0,0 +1,66 @@
+<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: url(#osx1);
+      fill-opacity: 1;
+      stroke: url(#osx2);
+    }
+  </style>
+  <defs>
+    <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="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="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="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="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="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="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="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="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="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 0,6 2,0 0,2 -2,0 z m 0,5.4 0,1.6 m -2.5,0 14,0 m -2.5,0 0,-1.6"/>
+  <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="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="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="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="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="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="goback" class="normal" 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="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="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="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="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="nextMsg" class="normal" 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="appButton" class="normal" d="m 2.625,2.5 c -1.5,0 -1.5,2 0,2 l 12.75,0 c 1.5,0 1.5,-2 0,-2 z m 0,5 c -1.5,0 -1.5,2 0,2 l 12.75,0 c 1.5,0 1.5,-2 0,-2 z m 0,5 c -1.5,0 -1.5,2 0,2 l 12.75,0 c 1.5,0 1.5,-2 0,-2 z"/>
+  <path id="conversation" class="normal" d="m 15,7.5 c 0.7,0 1.5,0.8 1.5,1.5 l 0,2 c 0,0.7 -0.8,1.5 -1.5,1.5 l -0.5,0 0,4 -2,-4 -1.5,0 C 10.3,12.5 9.5,11.7 9.5,11 l 0,-2 C 9.5,8.3 10.3,7.5 11,7.5 Z M 1.5,5 C 1.5,4.3 2.3,3.5 3,3.5 l 6,0 c 0.7,0 1.5,0.8 1.5,1.5 l 0,0.5 c -1.4,0 -3,1.4 -3,3 l 0,1 -1,0 -2,4 0,-4 -1.5,0 C 2.3,9.5 1.5,8.7 1.5,8 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: none;
+      }
+    }
+    @media (-moz-windows-default-theme) and (-moz-os-version: windows-win10) {
+      .normal {
+        fill: #4c4c4c;
+        fill-opacity: 1;
+        stroke: none;
+      }
+    }
+    @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-yosemite-theme) {
+      .normal {
+        fill: #4d4d4d;
+        fill-opacity: 1;
+        stroke: none;
+      }
+    }
+    .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>
+  </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-flat" class="normal" d="m 2,10 2,0 0,3 10,0 0,-3 2,0 0,5 -14,0 z M 7,2 11,2 11,6 13.5,6 9,10.5 4.5,6 7,6 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-flat" class="normal" d="m 2,3 9,0 0,1.5 -5,5 0,3.5 3.5,0 1.5,-1.5 0,3.5 -9,0 z m 5,9 2,0 7,-7 -2,-2 -7,7 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-flat" class="normal" d="m 3,15 12,0 c 0,-3 -1.2,-3 -4,-3 l 0,-1 C 13,9.9 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 4.5,7.3 4.9,7.6 5,8 5.2,9.5 5,9.8 7,11 l 0,1 c -2.5,0 -4,0 -4,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-flat" class="normal" d="m 10,16 c 0,0 4.9,-2.2 5,-6 0,-1.7 -1.5,-3 -5,-3 l -2,0 0,-3.5 -5.5,5 5.5,5 0,-3.5 2,0 c 3.7,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-flat" class="normal" d="m 11.5,16 c 0,0 4.9,-1.5 5,-5.5 C 16.5,8.4 15,7 11.5,7 l -1.5,0 0,-3.5 -5,5 5,5 0,-3.5 1.5,0 c 4.1,0 0.9,4.2 0,6 z m -5,-10.5 0,-2 -5,5 5,5 0,-2 -3,-3 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-flat" class="normal" d="M 2,3 2,13 7.4,13 6.6,11 4,11 4,9 6.9,9 11,6 13,6 13,3 Z M 4,5 11,5 11,6 8.3,7 4,7 Z m 7.5,0.5 c -2.7,0 -5,1.8 -5,4.6 0,2.7 2.2,5.4 5,5.4 2.7,0 5,-2.2 5,-5 0,-2.7 -2.2,-5 -5,-5 z M 11,7 l 0,2 1.5,0 c 0.9,0 2.1,0.6 2.3,1.5 0.3,1.3 -0.3,2.6 -2.3,3.5 1.1,-1.5 0.6,-2 0,-2 l -1.5,0 0,2 -3.5,-3.5 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-flat" class="normal" d="M 3,7 9,7 9,3.5 14.5,8.5 9,13.5 9,10 3,10 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-flat" class="normal" d="M 9,2.5 C 5,5 2.4,8.6 4.4,13.3 c 2.5,4.5 8.3,2.7 9.5,0.3 0.9,-2.4 0.9,-3 -0.8,-7 -1.2,-1.6 0.1,2.4 -1.3,3.6 -1.5,1 -3,0.8 -4,-0.2 C 5.3,7.5 11,2.4 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 0,6 2,0 0,2 -2,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-flat" class="normal" d="M 5,3 5,7 4,7 C 3.2,7 2,7.6 2,8.5 l 0,3 c 0,1 0.9,1.5 2,1.5 l 1,0 0,1 -1,0 0,1 10,0 0,-1 -1,0 0,-1 1,0 c 1,0 2,-0.5 2,-1.5 l 0,-3 C 16,7.7 14.8,7 14,7 l -1,0 0,-4 z m 1,1 6,0 0,4 -6,0 z m -1,5 1,0 0,1 -1,0 z m 1,3 6,0 0,2 -6,0 z"/>
+  <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 -1,5 2,0 0,1 -2,0 z m 1,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-flat" class="normal" d="m 6,2 -4,4 0,6 4,4 6,0 4,-4 0,-6 -4,-4 z M 6.5,4.5 9,7 l 2.5,-2.5 2,2 -2.5,2.5 2.5,2.5 -2,2 L 9,11 6.5,13.5 4.5,11.5 7,9 4.5,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-flat" class="normal" d="M 9,15 15,9 11,9 11,3.5 C 11,3.25 10.75,3 10.5,3 l -3,0 C 7.25,3 7,3.25 7,3.5 L 7,9 3,9 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-flat" class="normal" d="M 3.5,3 14.5,3 9,8 Z M 9,14 14.5,9 3.5,9 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-flat" class="normal" d="m 3.5,14 11,0 L 9,9 Z M 9,3 14.5,8 3.5,8 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-flat" 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 7,8 l 4,0 0,2 -4,0 z"/>
+  <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-flat" class="normal" d="M 4.5,3 C 3.8,3 3,3.8 3,4.5 L 3,8 10,15.5 15.5,10 8,3 Z m 2,1.5 c 1.1,0 2,0.9 2,2 0,1.1 -0.9,2 -2,2 -1.1,0 -2,-0.9 -2,-2 0,-1.1 0.9,-2 2,-2 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-flat" class="normal" d="m 4,9 9,-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-flat" class="normal" d="M 14,9 5,2.5 5,15.5 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-flat" class="normal" d="m 5,3 c 1.2,0.5 2.1,1.8 2.7,3 l 2.2,0 -4.7,4.3 0,-2 C 4.1,7.3 3.3,6.3 3,5 2.9,3.1 3.2,2.8 5,3 Z m 1,8 4.5,-4 1,0.6 3.7,2.2 -1,2.5 -2.7,-2 -0.7,0.8 2.2,2.6 -1.6,1 -2.2,-2.5 -0.5,0.3 0.6,2.5 -2.8,0 0,-2.9 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-flat" class="normal" d="m 2,6 0,9 14,0 0,-9 z M 5.5,7 9,10.5 12.5,7 14.5,9 9,14 3.5,9 Z M 3,4 15,4 15,5 3,5 Z M 4,2 14,2 14,3 4,3 Z"/>
+  <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-flat" class="normal" d="M 16,5 C 16,3.8 15.2,3 14,3 L 4,3 C 2.8,3 2,3.8 2,5 l 0,5 c 0,1.2 0.8,2.1 2,2.1 l 2,0 0,3.9 3.5,-3.9 4.5,0 c 1.2,0 2,-0.9 2,-2.1 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-flat" class="normal" d="m 3,4 12,0 -5,5 0,5 -2,0 0,-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-flat" class="normal" d="M 2.5,4 15.5,4 9,14 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-flat" class="normal" d="m 2.5,14 13,0 L 9,4 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 2.625,2.5 c -1.5,0 -1.5,2 0,2 l 12.75,0 c 1.5,0 1.5,-2 0,-2 z m 0,5 c -1.5,0 -1.5,2 0,2 l 12.75,0 c 1.5,0 1.5,-2 0,-2 z m 0,5 c -1.5,0 -1.5,2 0,2 l 12.75,0 c 1.5,0 1.5,-2 0,-2 z"/>
+  <path id="appButton-flat" class="normal" d="m 2.5,2 c -2,0 -2,3 0,3 l 13,0 c 2,0 2,-3 0,-3 z m 0,5 c -2,0 -2,3 0,3 l 13,0 c 2,0 2,-3 0,-3 z m 0,5 c -2,0 -2,3 0,3 l 13,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"/>
+  <path id="conversation" class="normal" d="m 15,7.5 c 0.7,0 1.5,0.8 1.5,1.5 l 0,2 c 0,0.7 -0.8,1.5 -1.5,1.5 l -0.5,0 0,4 -2,-4 -1.5,0 C 10.3,12.5 9.5,11.7 9.5,11 l 0,-2 C 9.5,8.3 10.3,7.5 11,7.5 Z M 1.5,5 C 1.5,4.3 2.3,3.5 3,3.5 l 6,0 c 0.7,0 1.5,0.8 1.5,1.5 l 0,0.5 c -1.4,0 -3,1.4 -3,3 l 0,1 -1,0 -2,4 0,-4 -1.5,0 C 2.3,9.5 1.5,8.7 1.5,8 Z"/>
+  <path id="conversation-flat" class="normal" d="M 15.5,6 C 16.2,6 17,6.8 17,7.5 l 0,3 c 0,0.7 -0.8,1.5 -1.5,1.5 l -0.5,0 0,4 -2.5,-4 -2,0 C 9.8,12 9,11.2 9,10.5 l 0,-3 C 9,6.8 9.8,6 10.5,6 Z M 1,4.5 C 1,3.8 1.8,3 2.5,3 l 7,0 C 10.2,3 11,3.8 11,4.5 L 11,5 10,5 C 9,5 8,6 8,7 L 8,10 5.5,10 3,14 3,10 2.5,10 C 1.8,10 1,9.2 1,8.5 Z"/>
+  <path id="conversation-inverted" class="inverted" d="m 15,6.5 c 0.7,0 1.5,0.8 1.5,1.5 l 0,3 c 0,0.7 -0.8,1.5 -1.5,1.5 l -0.5,0 0,4 -2,-4 -2.5,0 C 9.3,12.5 8.5,11.7 8.5,11 l 0,-3 C 8.5,7.3 9.3,6.5 10,6.5 Z M 1.5,4 C 1.5,3.3 2.3,2.5 3,2.5 l 6,0 c 0.7,0 1.5,0.8 1.5,1.5 l 0,2.5 -0.5,0 C 9.3,6.5 8.5,7.3 8.5,8 l 0,1.5 -2,0 -2,4 0,-4 -1.5,0 C 2.3,9.5 1.5,8.7 1.5,8 Z"/>
+</svg>
deleted file mode 100644
--- a/mail/themes/shared/mail/icons/mark.svg
+++ /dev/null
@@ -1,6 +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 fill="context-fill" fill-opacity="context-fill-opacity" d="M 7,8 C 7,9.9 5.4,11.5 3.5,11.5 1.5,11.5 0,9.9 0,8 0,6 1.5,4.5 3.5,4.5 5.4,4.5 7,6 7,8 Z m 9,0 c 0,1.9 -1.5,3.5 -3.5,3.5 C 10.5,11.5 9,9.9 9,8 9,6 10.5,4.5 12.5,4.5 14.4,4.5 16,6 16,8 Z M 6,7 h 4 V 9 H 6 Z"/>
-</svg>
deleted file mode 100644
--- a/mail/themes/shared/mail/icons/newmsg.svg
+++ /dev/null
@@ -1,6 +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 fill="context-fill" fill-opacity="context-fill-opacity" d="m 1,2 h 9 v 1.5 l -5,5 V 12 H 8.5 L 10,10.5 V 14 H 1 Z m 5,9 H 8 L 15,4 13,2 6,9 Z"/>
-</svg>
deleted file mode 100644
--- a/mail/themes/shared/mail/icons/nextmsg.svg
+++ /dev/null
@@ -1,6 +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 fill="context-fill" fill-opacity="context-fill-opacity" d="m 1.5,3 h 13 L 8,13 Z"/>
-</svg>
deleted file mode 100644
--- a/mail/themes/shared/mail/icons/nextunread.svg
+++ /dev/null
@@ -1,6 +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 fill="context-fill" fill-opacity="context-fill-opacity" d="m 2.5,2 h 11 L 8,7 Z M 8,14 13.5,9 h -11 z"/>
-</svg>
deleted file mode 100644
--- a/mail/themes/shared/mail/icons/paste.svg
+++ /dev/null
@@ -1,6 +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" viewBox="0 0 16 16">
-  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M11 2H9.95a2.5 2.5 0 0 0-4.9 0H4a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h7a2 2 0 0 0 2-2V4a2 2 0 0 0-2-2zm0 7a1 1 0 0 1-1 1H5a1 1 0 0 1-1-1V5h7zm0-5H4V3h1.05a1 1 0 0 0 .98-.8 1.5 1.5 0 0 1 2.939 0 1 1 0 0 0 .98.8H11zM7.5 2a.5.5 0 1 0 .5.5.5.5 0 0 0-.5-.5zm-2 5h4a.5.5 0 0 0 0-1h-4a.5.5 0 0 0 0 1zm0 2h2a.5.5 0 0 0 0-1h-2a.5.5 0 0 0 0 1z"/>
-</svg>
deleted file mode 100644
--- a/mail/themes/shared/mail/icons/previousmsg.svg
+++ /dev/null
@@ -1,6 +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 fill="context-fill" fill-opacity="context-fill-opacity" d="m 1.5,13 h 13 L 8,3 Z"/>
-</svg>
deleted file mode 100644
--- a/mail/themes/shared/mail/icons/previousunread.svg
+++ /dev/null
@@ -1,6 +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 fill="context-fill" fill-opacity="context-fill-opacity" d="m 2.5,14 h 11 L 8,9 Z M 8,2 13.5,7 h -11 z"/>
-</svg>
deleted file mode 100644
--- a/mail/themes/shared/mail/icons/print.svg
+++ /dev/null
@@ -1,6 +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" viewBox="0 0 16 16">
-  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M14 5h-1V1a1 1 0 0 0-1-1H4a1 1 0 0 0-1 1v4H2a2 2 0 0 0-2 2v5h3v3a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1v-3h3V7a2 2 0 0 0-2-2zM2.5 8a.5.5 0 1 1 .5-.5.5.5 0 0 1-.5.5zm9.5 7H4v-5h8zm0-10H4V1h8zm-6.5 7h4a.5.5 0 0 0 0-1h-4a.5.5 0 1 0 0 1zm0 2h5a.5.5 0 0 0 0-1h-5a.5.5 0 1 0 0 1z"/>
-</svg>
deleted file mode 100644
--- a/mail/themes/shared/mail/icons/quote.svg
+++ /dev/null
@@ -1,6 +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 fill="context-fill" fill-opacity="context-fill-opacity" d="M 4,8 C -7,4 15,-6 4,14 Z m 8,0 C 1,4 23,-6 12,14 Z"/>
-</svg>
deleted file mode 100644
--- a/mail/themes/shared/mail/icons/reply.svg
+++ /dev/null
@@ -1,6 +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 fill="context-fill" fill-opacity="context-fill-opacity" d="M 9,15 C 9,15 13.9,12.8 14,9 14,7.3 12.5,6 9,6 H 7 V 2.5 l -5.5,5 5.5,5 V 9 h 2 c 3.7,0 0.9,4.2 0,6 z"/>
-</svg>
deleted file mode 100644
--- a/mail/themes/shared/mail/icons/replyall.svg
+++ /dev/null
@@ -1,6 +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 fill="context-fill" fill-opacity="context-fill-opacity" d="m 10.5,15 c 0,0 4.9,-1.5 5,-5.5 C 15.5,7.4 14,6 10.5,6 H 9 V 2.5 l -5,5 5,5 V 9 h 1.5 c 4.1,0 0.9,4.2 0,6 z M 5.5,4.5 v -2 l -5,5 5,5 v -2 l -3,-3 z"/>
-</svg>
deleted file mode 100644
--- a/mail/themes/shared/mail/icons/replylist.svg
+++ /dev/null
@@ -1,6 +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 fill="context-fill" fill-opacity="context-fill-opacity" d="M 1,2 V 12 H 6.4 L 5.6,10 H 3 V 8 H 5.9 L 10,5 h 2 V 2 Z m 2,2 h 7 V 5 L 7.3,6 H 3 Z m 7.5,0.5 c -2.7,0 -5,1.8 -5,4.6 0,2.7 2.2,5.4 5,5.4 2.7,0 5,-2.2 5,-5 0,-2.7 -2.2,-5 -5,-5 z M 10,6 v 2 h 1.5 c 0.9,0 2.1,0.6 2.3,1.5 0.3,1.3 -0.3,2.6 -2.3,3.5 1.1,-1.5 0.6,-2 0,-2 H 10 v 2 L 6.5,9.5 Z"/>
-</svg>
deleted file mode 100644
--- a/mail/themes/shared/mail/icons/save.svg
+++ /dev/null
@@ -1,6 +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 fill="context-fill" fill-opacity="context-fill-opacity" d="M 8,14 14,8 H 10 V 2.5 C 10,2.25 9.75,2 9.5,2 h -3 C 6.25,2 6,2.25 6,2.5 V 8 H 2 Z"/>
-</svg>
deleted file mode 100644
--- a/mail/themes/shared/mail/icons/security.svg
+++ /dev/null
@@ -1,6 +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 fill="context-fill" fill-opacity="context-fill-opacity" d="M 8,2 C 5.25,2 3,3 3,6.5 V 8 H 2 v 6 H 14 V 8 H 13 V 6.5 C 13,3 10.5,2 8,2 Z m 0,2 c 3,0 3,1 3,4 H 5 C 5,5 5,4 8,4 Z"/>
-</svg>
deleted file mode 100644
--- a/mail/themes/shared/mail/icons/send.svg
+++ /dev/null
@@ -1,6 +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 fill="context-fill" fill-opacity="context-fill-opacity" d="M 1,1 V 4 H 3 V 7 H 1 v 2 h 2 v 3 H 1 v 3 h 3 v -2 h 3 v 2 h 2 v -2 h 3 v 2 h 3 V 12 H 13 V 9 h 2 V 7 H 13 V 4 h 2 V 1 H 12 V 3 H 9 V 1 H 7 V 3 H 4 V 1 Z m 4,4 h 6 v 6 H 5 Z M 7,7 H 9 V 9 H 7 Z"/>
-</svg>
deleted file mode 100644
--- a/mail/themes/shared/mail/icons/spelling.svg
+++ /dev/null
@@ -1,6 +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 fill="context-fill" fill-opacity="context-fill-opacity" d="m 1,9.5 1.5,-2 3.7,3 C 8.5,6.6 11.1,4.6 15,2.5 v 1 c -4,3.1 -8.5,11 -8.5,11 z"/>
-</svg>
deleted file mode 100644
--- a/mail/themes/shared/mail/icons/stop.svg
+++ /dev/null
@@ -1,6 +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 fill="context-fill" fill-opacity="context-fill-opacity" d="M 5,1 1,5 v 6 l 4,4 h 6 l 4,-4 V 5 L 11,1 Z M 5.5,3.5 8,6 l 2.5,-2.5 2,2 -2.5,2.5 2.5,2.5 -2,2 L 8,10 5.5,12.5 3.5,10.5 6,8 3.5,5.5 Z"/>
-</svg>
deleted file mode 100644
--- a/mail/themes/shared/mail/icons/tag.svg
+++ /dev/null
@@ -1,6 +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 fill="context-fill" fill-opacity="context-fill-opacity" d="M 3.5,2 C 2.8,2 2,2.8 2,3.5 V 7 L 9,14.5 14.5,9 7,2 Z m 2,1.5 c 1.1,0 2,0.9 2,2 0,1.1 -0.9,2 -2,2 -1.1,0 -2,-0.9 -2,-2 0,-1.1 0.9,-2 2,-2 z"/>
-</svg>
--- a/mail/themes/windows/mail/addrbook/addressbook.css
+++ b/mail/themes/windows/mail/addrbook/addressbook.css
@@ -92,16 +92,66 @@ toolbar:not(:-moz-lwtheme) {
   text-shadow: none;
 }
 
 toolbox > toolbar:last-of-type {
   padding-top: 1px;
   padding-bottom: 1px;
 }
 
+/* ::::: primary toolbar buttons ::::: */
+
+#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.svg#newlist");
+}
+
+#button-editcard {
+  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.svg#newmessage");
+}
+
+#button-newim {
+  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.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");
+}
+
 /* ::::: Search Textbox ::::: */
 
 #peopleSearchInput {
   width: 20em;
   padding-top: 3px;
   padding-bottom: 3px;
   padding-inline-start: 5px;
 }
@@ -169,8 +219,31 @@ toolbox > toolbar:last-of-type {
 @media (-moz-os-version: windows-win7) and (-moz-windows-default-theme) {
 
   #status-bar {
     -moz-appearance: none;
     border-style: none;
     border-top: 1px solid ThreeDShadow;
   }
 }
+
+@media (-moz-os-version: windows-win8) and (-moz-windows-default-theme),
+       (-moz-os-version: windows-win10) and (-moz-windows-default-theme) {
+  #button-newcard {
+    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newcard-flat");
+  }
+
+  #button-newlist {
+    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newlist-flat");
+  }
+
+  #button-editcard {
+    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#editcard-flat");
+  }
+
+  #button-newmessage {
+    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newmessage-flat");
+  }
+
+  #button-newim {
+    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newim-flat");
+  }
+}
--- a/mail/themes/windows/mail/chat.css
+++ b/mail/themes/windows/mail/chat.css
@@ -252,16 +252,40 @@
   }
 
   #nicklist > listitem {
     border-width: 1px !important;
     outline: none !important;
   }
 }
 
+#button-add-buddy {
+  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.svg#join");
+}
+
+#button-chat-accounts {
+  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.svg#accounts");
+}
+
+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");
+}
+
 #statusTypeIcon[status="available"],
 #statusTypeAvailable,
 .statusTypeIcon[status="available"],
 #imStatusAvailable,
 #appmenu_imStatusAvailable,
 richlistitem[state="connected"] .accountStateIcon {
   list-style-image: url("chrome://messenger/skin/icons/status.png");
   -moz-image-region: rect(0 16px 16px 0);
@@ -372,9 +396,21 @@ richlistitem[state="disconnected"] .acco
                                       rgba(131, 183, 249, .50));
   }
 
   #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 {
+    list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.svg#add-flat");
+  }
+
+  #button-join-chat {
+    list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.svg#join-flat");
+  }
+
+  #button-chat-accounts {
+    list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.svg#accounts-flat");
+  }
 }
--- a/mail/themes/windows/mail/compose/messengercompose.css
+++ b/mail/themes/windows/mail/compose/messengercompose.css
@@ -686,58 +686,102 @@ toolbar:not(:-moz-lwtheme) {
 }
 
 .findbar-container {
   padding-top: 2px;
   padding-bottom: 2px;
 }
 
 #button-send {
-  list-style-image: url("chrome://messenger/skin/icons/send.svg");
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#send");
 }
 
 #button-contacts {
-  list-style-image: url("chrome://messenger/skin/icons/address.svg");
+  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/icons/spelling.svg");
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#spelling");
 }
 
 #button-attach {
-  list-style-image: url("chrome://messenger/skin/icons/attach.svg");
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#attach");
 }
 
 #button-security {
-  list-style-image: url("chrome://messenger/skin/icons/security.svg");
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#security");
 }
 
 #button-save {
-  list-style-image: url("chrome://messenger/skin/icons/save.svg");
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#save");
 }
 
 #quoteButton {
-  list-style-image: url("chrome://messenger/skin/icons/quote.svg");
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#quote");
 }
 
 #cut-button {
-  list-style-image: url("chrome://messenger/skin/icons/cut.svg");
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#cut");
 }
 
 #copy-button {
-  list-style-image: url("chrome://messenger/skin/icons/copy.svg");
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#copy");
 }
 
 #paste-button {
-  list-style-image: url("chrome://messenger/skin/icons/paste.svg");
+  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#paste");
 }
 
 #button-print {
-  list-style-image: url("chrome://messenger/skin/icons/print.svg");
+  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");
+}
+
+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;
@@ -970,16 +1014,57 @@ treechildren::-moz-tree-image(subscribed
        (-moz-os-version: windows-win10) {
   #msgIdentity > .menulist-dropmarker > .dropmarker-icon {
     list-style-image: url("chrome://messenger/skin/icons/dropmarker.svg#win8");
   }
 }
 
 @media (-moz-os-version: windows-win8) and (-moz-windows-default-theme),
        (-moz-os-version: windows-win10) and (-moz-windows-default-theme) {
+  #button-send {
+    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#send-flat");
+  }
+
+  #button-contacts {
+    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#contacts-flat");
+    -moz-image-region: auto !important;
+  }
+
+  #button-attach {
+    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#attach-flat");
+  }
+
+  #button-security {
+    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#security-flat");
+  }
+
+  #button-save {
+    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#save-flat");
+  }
+
+  #quoteButton {
+    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#quote-flat");
+  }
+
+  #cut-button {
+    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#cut-flat");
+  }
+
+  #copy-button {
+    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#copy-flat");
+  }
+
+  #paste-button {
+    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#paste-flat");
+  }
+
+  #button-print {
+    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#print-flat");
+  }
+
   .aw-menulist {
     margin: 1px;
     margin-inline-end: 4px;
     padding: 2px 0 !important;
     background-color: hsla(210, 4%, 10%, .04);
     border-color: hsla(210, 4%, 10%, .05);
   }
 
--- a/mail/themes/windows/mail/mailWindow1.css
+++ b/mail/themes/windows/mail/mailWindow1.css
@@ -689,20 +689,16 @@ treechildren::-moz-tree-cell-text(imapde
     background-image: linear-gradient(rgba(131, 183, 249, .05), rgba(131, 183, 249, .16));
     background-color: transparent;
   }
 }
 
 @media (-moz-os-version: windows-win7) and (-moz-windows-default-theme),
        (-moz-os-version: windows-win8) and (-moz-windows-default-theme) {
   @media (-moz-windows-compositor) {
-    :root:not(:-moz-lwtheme) {
-      --tabs-border: rgba(10%, 10%, 10%, .4);
-    }
-
     #messengerWindow[sizemode=normal] #tabpanelcontainer {
       border: 1px solid rgba(10%, 10%, 10%, .4);
       border-top: none;
       background-clip: padding-box;
     }
 
     #messengerWindow[sizemode=normal] #mail-toolbar-menubar2 {
       border-right: 1px solid rgba(10%, 10%, 10%, .4);
--- a/mail/themes/windows/mail/messageHeader.css
+++ b/mail/themes/windows/mail/messageHeader.css
@@ -436,55 +436,99 @@ toolbarpaletteitem .msgHeaderView-button
 toolbox[labelalign="end"] toolbar[mode="full"]
 .msgHeaderView-button .toolbarbutton-text {
   margin-inline-start: 2px !important;
 }
 
 .hdrReplyToSenderButton,
 .hdrDummyReplyButton,
 .hdrReplyButton {
-  list-style-image: url("chrome://messenger/skin/icons/reply.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#reply");
 }
 
 .hdrReplyAllButton {
-  list-style-image: url("chrome://messenger/skin/icons/replyall.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replyall");
 }
 
 .hdrReplyListButton,
 .hdrFollowupButton {
-  list-style-image: url("chrome://messenger/skin/icons/replylist.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replylist");
 }
 
 .hdrForwardButton {
-  list-style-image: url("chrome://messenger/skin/icons/forward.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#forward");
 }
 
 .hdrArchiveButton {
-  list-style-image: url("chrome://messenger/skin/icons/archive.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#archive");
 }
 
 .hdrJunkButton {
-  list-style-image: url("chrome://messenger/skin/icons/junk.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#junk");
 }
 
 .hdrTrashButton {
-  list-style-image: url("chrome://messenger/skin/icons/delete.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#delete");
 }
 
 .hdrTagButton {
-  list-style-image: url("chrome://messenger/skin/icons/tag.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#tag");
 }
 
 .hdrConversationButton {
-  list-style-image: url("chrome://messenger/skin/icons/conversation.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#conversation");
 }
 
 #attachmentSaveAllSingle,
 #attachmentSaveAllMultiple {
-  list-style-image: url("chrome://messenger/skin/icons/file.svg");
+  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] .hdrConversationButton {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#conversation-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 {
   padding-inline-end: 3px;
@@ -553,8 +597,51 @@ toolbarpaletteitem .msgHeaderView-button
                 0 0 2px hsla(210, 54%, 20%, .1);
   }
 
   .msgHeaderView-button:not([type="menu-button"]):not([disabled="true"]):not([checked="true"]):not([open="true"]):not(:active):hover {
     box-shadow: 0 0 1px hsla(210, 54%, 20%, .1),
                 0 0 2px hsla(210, 54%, 20%, .1);
   }
 }
+
+@media (-moz-os-version: windows-win8) and (-moz-windows-default-theme),
+       (-moz-os-version: windows-win10) and (-moz-windows-default-theme) {
+  .hdrReplyToSenderButton,
+  .hdrDummyReplyButton,
+  .hdrReplyButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#reply-flat");
+  }
+
+  .hdrReplyAllButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replyall-flat");
+  }
+
+  .hdrReplyListButton,
+  .hdrFollowupButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replylist-flat");
+  }
+
+  .hdrForwardButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#forward-flat");
+  }
+
+  .hdrArchiveButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#archive-flat");
+  }
+
+  .hdrJunkButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#junk-flat");
+  }
+
+  .hdrTagButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#tag-flat");
+  }
+
+  .hdrConversationButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#conversation-flat");
+  }
+
+  #attachmentSaveAllSingle,
+  #attachmentSaveAllMultiple {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#file-flat");
+  }
+}
--- a/mail/themes/windows/mail/messenger.css
+++ b/mail/themes/windows/mail/messenger.css
@@ -16,54 +16,49 @@
   --tab-line-color: highlight;
 
   --toolbar-non-lwt-bgcolor: -moz-dialog;
   --toolbar-non-lwt-textcolor: -moz-dialogtext;
   --toolbar-non-lwt-bgimage: linear-gradient(rgba(255,255,255,.15), rgba(255,255,255,.15));
   --toolbar-bgcolor: var(--toolbar-non-lwt-bgcolor);
   --toolbar-bgimage: var(--toolbar-non-lwt-bgimage);
   --toolbarbutton-border-radius: 2px;
-  --toolbarbutton-icon-fill-opacity: .85;
+  --toolbarbutton-icon-fill-opacity: 1;
   --toolbarbutton-hover-background: rgba(0, 0, 0, .1);
   --toolbarbutton-hover-bordercolor: rgba(0, 0, 0, .1);
   --toolbarbutton-header-bordercolor: rgba(0, 0, 0, .1);
   --toolbarbutton-hover-boxshadow: none;
 
   --toolbarbutton-active-background: rgba(0, 0, 0, .15);
   --toolbarbutton-active-bordercolor: rgba(0, 0, 0, .15);
   --toolbarbutton-active-boxshadow: 0 0 0 1px rgba(0, 0, 0, .15) inset;
 
   --toolbarbutton-checkedhover-backgroundcolor: rgba(0, 0, 0, .2);
-  --toolbarbutton-icon-fill-attention: #0a84ff;
 
   --lwt-header-image: none;
 }
 
 @media (-moz-windows-default-theme) {
   :root {
     --tabs-border: rgba(0,0,0,.3);
     --tab-line-color: #0a84ff;
 
     --toolbar-non-lwt-bgcolor: #f9f9fa;
     --toolbar-non-lwt-textcolor: #0c0c0d;
     --toolbar-non-lwt-bgimage: none;
+
+    --toolbarbutton-icon-fill-opacity: 1;
   }
 }
 
 :root:-moz-lwtheme {
   --tabs-border: rgba(0,0,0,.3);
 
   --toolbar-bgcolor: rgba(255,255,255,.4);
   --toolbar-bgimage: none;
-
-  --toolbarbutton-icon-fill-opacity: 1;
-}
-
-toolbar[brighttext] {
-  --toolbarbutton-icon-fill-attention: #45a1ff;
 }
 
 .toolbar-primary {
   -moz-appearance: none;
 }
 
 .menu-iconic > .menu-iconic-left,
 .menuitem-iconic > .menu-iconic-left {
@@ -297,28 +292,31 @@ button[type="menu-button"] > button {
 .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 {
-  padding: 1px;
+  width: 18px;
+  height: 18px;
 }
 
 toolbox[labelalign="end"] > toolbar[mode="full"] .toolbarbutton-1
 .toolbarbutton-text {
   padding-inline-start: 2px;
   padding-inline-end: 2px;
 }
 
 .toolbarbutton-1 .toolbarbutton-menu-dropmarker,
 .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
   list-style-image: url("chrome://messenger/skin/icons/toolbarbutton-arrow.svg");
+  -moz-context-properties: fill;
+  fill: currentColor;
 }
 
 .toolbarbutton-1 .toolbarbutton-menu-dropmarker > .dropmarker-icon,
 .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
   width: 9px;
   height: 7px;
 }
 
--- a/mail/themes/windows/mail/primaryToolbar.css
+++ b/mail/themes/windows/mail/primaryToolbar.css
@@ -212,16 +212,22 @@ toolbar[mode="text"] .button-appmenu .to
   font-weight: bold;
 }
 
 .msgNotificaton-smallText {
   padding-inline-start: 10px;
   font-size: 90%;
 }
 
+.button-appmenu {
+  min-width: 35px !important;
+  margin-right: 3px;
+  margin-left: 3px;
+}
+
 /* AppMenu styling */
 
 .splitmenu-menuitem {
   -moz-appearance: menuitem;
   -moz-box-align: center;
   color: MenuText;
   font: menu;
   list-style-image: none;
@@ -435,139 +441,244 @@ toolbar[mode="text"] .button-appmenu .to
 
   #tabbar-toolbar
     .toolbarbutton-menubutton-button:not([disabled]):hover:-moz-locale-dir(rtl) {
     background-position: 1px -1px, 100% -1px;
   }
 }
 
 #button-getmsg {
-  list-style-image: url("chrome://messenger/skin/icons/getmsg.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#getmsg");
 }
 
 #button-newmsg {
-  list-style-image: url("chrome://messenger/skin/icons/newmsg.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#newmsg");
 }
 
 #button-address {
-  list-style-image: url("chrome://messenger/skin/icons/address.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#address");
 }
 
 #button-reply {
-  list-style-image: url("chrome://messenger/skin/icons/reply.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#reply");
 }
 
 #button-replyall {
-  list-style-image: url("chrome://messenger/skin/icons/replyall.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replyall");
 }
 
 #button-replylist {
-  list-style-image: url("chrome://messenger/skin/icons/replylist.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replylist");
 }
 
 #button-forward {
-  list-style-image: url("chrome://messenger/skin/icons/forward.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#forward");
 }
 
 .delete-button {
-  list-style-image: url("chrome://messenger/skin/icons/delete.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#delete");
 }
 
 .junk-button {
-  list-style-image: url("chrome://messenger/skin/icons/junk.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#junk");
 }
 
 #button-print {
-  list-style-image: url("chrome://messenger/skin/icons/print.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#print");
 }
 
 #button-stop {
-  list-style-image: url("chrome://messenger/skin/icons/stop.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#stop");
 }
 
 #button-file {
-  list-style-image: url("chrome://messenger/skin/icons/file.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#file");
 }
 
 #button-nextUnread {
-  list-style-image: url("chrome://messenger/skin/icons/nextunread.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#nextUnread");
 }
 
 #button-previousUnread {
-  list-style-image: url("chrome://messenger/skin/icons/previousunread.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#previousUnread");
 }
 
 #button-mark {
-  list-style-image: url("chrome://messenger/skin/icons/mark.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#mark");
 }
 
 #button-tag {
-  list-style-image: url("chrome://messenger/skin/icons/tag.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#tag");
 }
 
 #button-goback {
-  list-style-image: url("chrome://messenger/skin/icons/goback.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#goback");
 }
 
 #button-goforward {
-  list-style-image: url("chrome://messenger/skin/icons/goforward.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#goforward");
 }
 
 #button-compact {
-  list-style-image: url("chrome://messenger/skin/icons/compact.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#compact");
 }
 
 #button-archive {
-  list-style-image: url("chrome://messenger/skin/icons/archive.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#archive");
 }
 
 #button-chat {
-  list-style-image: url("chrome://messenger/skin/icons/chat.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#chat");
 }
 
 #button-nextMsg {
-  list-style-image: url("chrome://messenger/skin/icons/nextmsg.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#nextMsg");
 }
 
 #button-previousMsg {
-  list-style-image: url("chrome://messenger/skin/icons/previousmsg.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#previousMsg");
 }
 
 #qfb-show-filter-bar {
-  list-style-image: url("chrome://messenger/skin/icons/filter.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#filter");
 }
 
 #button-showconversation {
-  list-style-image: url("chrome://messenger/skin/icons/conversation.svg");
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#conversation");
 }
 
 .button-appmenu {
-  list-style-image: url("chrome://messenger/skin/icons/appbutton.svg");
-  min-width: 35px !important;
-  margin-right: 3px;
-  margin-left: 3px;
+  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");
+}
+
+toolbar[brighttext] #button-next > #button-nextUnread {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#nextUnread-inverted");
 }
 
-#button-chat[unreadMessages="true"] {
-  fill: var(--toolbarbutton-icon-fill-attention);
+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-showconversation {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#conversation-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");
 }
 
 toolbar:not([mode="text"]) > #button-chat > stack,
 toolbar:not([mode="text"]) > toolbarpaletteitem > #button-chat > stack {
   margin: 1px;
 }
 
 #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.svg#filter");
+}
+
 /* remove the small icons checkbox in Customize window */
 #smallicons {
   display: none;
 }
 
 /* AppMenu styling */
 
 .splitmenu-menuitem {
@@ -919,9 +1030,109 @@ toolbar:not([mode="text"]) > toolbarpale
     padding-top: 0;
     padding-bottom: 0 !important;
   }
 
   .mail-toolbox::after,
   .contentTabToolbox::after {
     border-bottom-color: #c2c2c2;
   }
+
+  #button-getmsg {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#getmsg-flat");
+  }
+
+  #button-newmsg {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#newmsg-flat");
+  }
+
+  #button-address {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#address-flat");
+  }
+
+  #button-reply {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#reply-flat");
+  }
+
+  #button-replyall {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replyall-flat");
+  }
+
+  #button-replylist {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replylist-flat");
+  }
+
+  #button-forward {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#forward-flat");
+  }
+
+  .junk-button {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#junk-flat");
+  }
+
+  #button-print {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#print-flat");
+  }
+
+  #button-stop {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#stop-flat");
+  }
+
+  #button-file {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#file-flat");
+  }
+
+  #button-nextUnread {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#nextUnread-flat");
+  }
+
+  #button-previousUnread {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#previousUnread-flat");
+  }
+
+  #button-mark {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#mark-flat");
+  }
+
+  #button-tag {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#tag-flat");
+  }
+
+  #button-goback {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#goback-flat");
+  }
+
+  #button-goforward {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#goforward-flat");
+  }
+
+  #button-compact {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#compact-flat");
+  }
+
+  #button-archive {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#archive-flat");
+  }
+
+  #button-chat {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#chat-flat");
+  }
+
+  #button-nextMsg {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#nextMsg-flat");
+  }
+
+  #button-previousMsg {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#previousMsg-flat");
+  }
+
+  #qfb-show-filter-bar {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#filter-flat");
+  }
+
+  #button-showconversation {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#conversation-flat");
+  }
+
+  .button-appmenu {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#appButton-flat");
+  }
 }
--- a/mail/themes/windows/mail/tabmail.css
+++ b/mail/themes/windows/mail/tabmail.css
@@ -92,21 +92,16 @@ tabpanels {
  */
 
 .tabmail-arrowscrollbox > .scrollbutton-up:not([disabled]):hover,
 .tabmail-arrowscrollbox > stack > .scrollbutton-down:not([disabled]):hover {
   background: var(--toolbarbutton-active-background);
 }
 
 @media (-moz-windows-glass) {
-  /* Set to full fill-opacity to improve visibility of toolbar buttons on aero glass. */
-  :root[tabsintitlebar] #tabs-toolbar {
-    --toolbarbutton-icon-fill-opacity: 1;
-  }
-
   :root[tabsintitlebar][sizemode=normal] #tabs-toolbar {
     margin-top: 6px;
   }
 
   #mail-toolbar-menubar2:not([autohide=true]) ~ #tabs-toolbar > .tabmail-tabs >
     .tabmail-tab > .tab-stack > .tab-background {
     border-top-style: none;
   }