Bug 1202846 - Make icons sharp on scaled desktops and slimmer on Yosemite and Win 8/10. r=Fallen
authorRichard Marti <richard.marti@gmail.com>
Mon, 28 Sep 2015 19:36:37 +0200
changeset 18462 1eee99e7b54c1f720d0bb27b1e9fb1f1ae5048c0
parent 18461 83aebb7cdda71b2c1caa4cc724c71a24c4d06ec4
child 18463 c4ee04b393f7cb4012c680983b09005a6a3b3207
push id11304
push useraleth@instantbird.org
push dateTue, 29 Sep 2015 22:57:33 +0000
treeherdercomm-central@3ddf3a3eaf07 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersFallen
bugs1202846
Bug 1202846 - Make icons sharp on scaled desktops and slimmer on Yosemite and Win 8/10. r=Fallen
calendar/base/themes/common/calendar-toolbar.svg
calendar/base/themes/osx/calendar-task-view.css
calendar/base/themes/osx/dialogs/calendar-event-dialog.css
calendar/base/themes/osx/today-pane.css
calendar/base/themes/windows/calendar-task-view.css
calendar/base/themes/windows/dialogs/calendar-event-dialog.css
calendar/base/themes/windows/today-pane.css
calendar/lightning/themes/osx/lightning-toolbar.css
calendar/lightning/themes/osx/lightning.css
calendar/lightning/themes/windows/lightning-toolbar.css
calendar/lightning/themes/windows/lightning.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/primaryToolbar.css
mail/themes/shared/mail/icons/addressbook-toolbar.svg
mail/themes/shared/mail/icons/chat-toolbar.svg
mail/themes/shared/mail/icons/compose-toolbar.svg
mail/themes/shared/mail/icons/mail-toolbar.svg
mail/themes/windows/mail/addrbook/addressbook.css
mail/themes/windows/mail/chat.css
mail/themes/windows/mail/compose/messengercompose.css
mail/themes/windows/mail/messageHeader.css
mail/themes/windows/mail/primaryToolbar.css
--- a/calendar/base/themes/common/calendar-toolbar.svg
+++ b/calendar/base/themes/common/calendar-toolbar.svg
@@ -12,54 +12,61 @@
     .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;
+        fill-opacity: 1;
         stroke: #797c80;
+        stroke-width: 0;
       }
     }
     @media (-moz-windows-default-theme) and (-moz-os-version: windows-win10) {
       .normal {
         fill: #4c4c4c;
-      fill-opacity: 1;
+        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;
+        fill-opacity: 1;
         stroke: url(#win2);
       }
     }
     @media (-moz-mac-lion-theme) {
       .normal {
         fill: url(#osx1);
-      fill-opacity: 1;
+        fill-opacity: 1;
         stroke: url(#osx2);
       }
     }
     @media (-moz-mac-yosemite-theme) {
       .normal {
         fill: #4d4d4d;
-      fill-opacity: 1;
-        stroke: #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"
@@ -94,54 +101,75 @@
        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="calendar-tab" class="normal" d="m 1.5,2.5 0,14 15,0 0,-14 -2,0 0,2 -2,0 0,-3.5 0,3.5 -2,0 0,-2 -3,0 0,2 -2,0 0,-3.5 0,3.5 -2,0 0,-2 z m 0,3 15,0 0,11 -15,0 z m 4,2 6.5,0 -3,7 -2.5,0 2,-5 -3,0 z"/>
+  <path id="calendar-tab-flat" class="normal" d="M 2,3 2,16 16,16 16,3 14,3 14,5 13,5 13,2 12,2 12,5 11,5 11,3 7,3 7,5 6,5 6,2 5,2 5,5 4,5 4,3 Z m 1,3 12,0 0,9 -12,0 z m 3,2 6,0 -3,6 -2.5,0 2,-4 -2.5,0 z"/>
   <path id="calendar-tab-inverted" class="inverted" d="m 1.5,3.5 0,13 15,0 0,-13 -3,0 0,1 -3,0 0,-1 -3,0 0,1 -3,0 0,-1 z m 3,3 9,0 0,7 -9,0 z m 0,-5 0,3 3,0 0,-3 z m 6,0 0,3 3,0 0,-3 z m -5,5 7,0 -3,7 -3,0 1.7,-4 -2.7,0 z"/>
   <path id="task-tab" class="normal" d="m 4.5,2.5 -2,0 0,14 13,0 0,-14 -2,0 0,3 1,0 0,10 -11,0 0,-10 1,0 z m 2,-1 5,0 0,4 -5,0 z M 5.1,11.8 6.7,10.2 8.5,11.7 12,8 l 1.5,1.5 -5,5 z"/>
+  <path id="task-tab-flat" class="normal" d="m 5,3 -2,0 0,13 12,0 0,-13 -2,0 0,3 1,0 0,9 L 4,15 4,6 5,6 Z M 6,2 12,2 12,6 6,6 Z M 5.4,11.3 6.7,9.7 8.5,11.2 11.5,7.5 13,9 8.5,14 Z"/>
   <path id="task-tab-inverted" class="inverted" d="m 5.5,2.5 -3,0 0,14 13,0 0,-14 -3,0 0,3 0,0 0,8 -7,0 0,-8 0,0 z m 0,-1 7,0 0,4 -7,0 z m 0.1,9.3 1.5,-2.1 1.3,1.2 2.4,-3 1.7,1.6 -4,4.8 z"/>
   <path id="synchronize" class="normal" d="m 11.5,1.9 0,3.7 c 3.7,1.8 1.7,5.5 -1,6.8 l -2,-1.9 0,6 5.7,0 -1.6,-1.6 C 18.5,12.5 18.2,2.7 11.5,1.9 Z m -3.8,3.8 1.8,1.8 0,-6 -5.8,0 L 5.3,3 C -0.9,6.3 0.4,15 6.5,16.1 l 0,-3.6 C 3,10.7 4.5,7 7.7,5.7 Z"/>
+  <path id="synchronize-flat" class="normal" d="m 11,2.4 0,3.7 c 3,1.6 2.4,4.4 0,5.8 L 9,10 l 0,6 5.7,0 -1.6,-1.6 C 17.6,12 17,3.2 11,2.4 Z M 7.2,6.2 9,8 9,2 3.2,2 4.8,3.5 C -0.4,6.7 2.3,14.4 7,15.6 L 7,12 C 4.1,10.2 4.3,7.3 7.2,6.2 Z"/>
   <path id="synchronize-inverted" class="inverted" d="m 11.5,1.9 0,3.7 c 3.6,1.2 2.1,5.4 -0.7,6.5 L 8.5,9.5 l 0,7 6.7,0 -1.9,-2 C 18.6,11.6 18,2.8 11.5,1.9 Z M 7,6 9.5,8.5 l 0,-7 -6.8,0 2.2,2.1 C -0.9,6.8 0.6,14.8 6.5,16.1 l 0,-3.6 C 3.5,11 4,7.3 7,6 Z"/>
   <path id="newevent" class="normal" d="m 1.5,2.5 0,14 15,0 0,-14 -2,0 0,2 -2,0 0,-3.5 0,3.5 -2,0 0,-2 -3,0 0,2 -2,0 0,-3.5 0,3.5 -2,0 0,-2 z m 0,3 15,0 0,11 -15,0 z m 6,2 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="newevent-flat" class="normal" d="M 2,3 2,16 16,16 16,3 14,3 14,5 13,5 13,2 12,2 12,5 11,5 11,3 7,3 7,5 6,5 6,2 5,2 5,5 4,5 4,3 Z m 1,3 12,0 0,9 -12,0 z m 5,2 2,0 0,2 2,0 0,2 -2,0 0,2 -2,0 0,-2 -2,0 0,-2 2,0 z"/>
   <path id="newevent-inverted" class="inverted" d="m 1.5,3.5 0,13 15,0 0,-13 -3,0 0,1 -3,0 0,-1 -3,0 0,1 -3,0 0,-1 z m 3,3 9,0 0,7 -9,0 z m 0,-5 0,3 3,0 0,-3 z m 6,0 0,3 3,0 0,-3 z m 0,5 0,2 2,0 0,3 -2,0 0,2 -3,0 0,-2 -2,0 0,-3 2,0 0,-2 z"/>
-  <path id="newtask" class="normal" d="m 4.5,1.5 -3,0 0,16 15,0 0,-16 -3,0 0,3 2,0 0,12 -13,0 0,-12 2,0 z m 2,-1 5,0 0,4 -5,0 z m 1,7 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="newtask" class="normal" d="m 4.5,2.5 -2,0 0,14 13,0 0,-14 -2,0 0,3 1,0 0,10 -11,0 0,-10 1,0 z m 2,-1 5,0 0,4 -5,0 z m 1,7 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="newtask-flat" class="normal" d="m 5,3 -2,0 0,13 12,0 0,-13 -2,0 0,3 1,0 0,9 -10,0 0,-9 1,0 z m 1,-1 6,0 0,4 -6,0 z m 2,6 2,0 0,2 2,0 0,2 -2,0 0,2 -2,0 0,-2 -2,0 0,-2 2,0 z"/>
   <path id="newtask-inverted" class="inverted" d="m 5.5,2.5 -3,0 0,14 13,0 0,-14 -3,0 0,3 0,0 0,8 -7,0 0,-8 0,0 z m 0,-1 7,0 0,4 -7,0 z m 2,5 3,0 0,2 2,0 0,3 -2,0 0,2 -3,0 0,-2 -2,0 0,-3 2,0 z"/>
   <path id="edit" class="normal" d="M 3.6,11.5 2.2,15.7 6.5,14.3 15.8,5 13,2.2 Z m 0,0 L 4.1,11 7,13.8 6.5,14.3 2.2,15.7 Z"/>
+  <path id="edit-flat" class="normal" d="M 4.2,11 2.5,15.5 7,13.8 Z M 7.7,13 15.5,5.3 12.7,2.5 5,10.3 Z"/>
   <path id="edit-inverted" class="inverted" d="M 3.6,11.5 2.2,15.7 6.5,14.3 15.8,4.9 13,2.1 Z m 1,-1 0.4,-0.4 2.8,2.8 -0.4,0.4 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="today" class="normal" d="m 1.5,2.5 0,14 15,0 0,-14 -2,0 0,2 -2,0 0,-3.5 0,3.5 -2,0 0,-2 -3,0 0,2 -2,0 0,-3.5 0,3.5 -2,0 0,-2 z m 0,3 15,0 0,11 -15,0 z m 6,2 3,0 0,4 2,0 -3.5,3 -3.5,-3 2,0 z"/>
+  <path id="today-flat" class="normal" d="M 2,3 2,16 16,16 16,3 14,3 14,5 13,5 13,2 12,2 12,5 11,5 11,3 7,3 7,5 6,5 6,2 5,2 5,5 4,5 4,3 Z m 1,3 12,0 0,9 -12,0 z m 5,1 2,0 0,3 2,0 -3,4 -3,-4 2,0 z"/>
   <path id="today-inverted" class="inverted" d="m 1.5,3.5 0,13 15,0 0,-13 -3,0 0,1 -3,0 0,-1 -3,0 0,1 -3,0 0,-1 z m 3,3 9,0 0,7 -9,0 z m 0,-5 0,3 3,0 0,-3 z m 6,0 0,3 3,0 0,-3 z m -3,5 3,0 0,3 3,0 -4.5,4 -4.5,-4 3,0 z"/>
-  <path id="print" class="normal" d="m 4.5,2.5 0,4 -1.5,0 c -0.8,0 -1.5,1.1 -1.5,2 l 0,3 c 0,1 1.4,2 2.5,2 l 1.5,0 0,-1 7,0 0,1 1.5,0 c 1,0 2.5,-1 2.5,-2 l 0,-3 c 0,-0.8 -0.6,-2 -1.5,-2 l -1.5,0 0,-4 z m 0,0 9,0 0,6 -9,0 z m 4,6 2,0 0,2 -2,0 z m -4,0 3,0 0,2 -3,0 z m 0,5.4 0,1.6 m -2.5,0 14,0 m -2.5,0 0,-1.6"/>
-  <path id="print-inverted" class="inverted" d="m 3.5,2.5 0,5 -0.5,0 c -0.8,0 -1.5,1.1 -1.5,2 l 0,2 c 0,0.8 0.4,2 2.5,2 l -1.5,0 0,2 13,0 0,-2 -1.5,0 c 2,0 2.5,-1.1 2.5,-2 l 0,-2 c 0,-0.8 -0.6,-2 -1.5,-2 l -0.5,0 0,-5 z m 2,2 7,0 0,3 -7,0 z m -2,5 3,0 0,1 -3,0 z m 5,0 2,0 0,1 -2,0 z m -3,3 7,0 0,1 -7,0 z"/>
+  <path id="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="find" class="normal" d="M 8,2.5 C 5,2.5 2.5,5 2.5,8 c 0,3 2.5,5.5 5.5,5.5 3,0 5.5,-2.4 5.5,-5.5 C 13.5,5 11,2.5 8,2.5 Z m 0,2 c 2,0 3.5,1.5 3.5,3.5 0,2 -1.5,3.5 -3.5,3.5 C 6,11.5 4.5,10 4.5,8 4.5,6 6,4.5 8,4.5 Z m 4.5,7 -1,1 3,3 1,-1 z"/>
+  <path id="find-flat" class="normal" d="M 8 3 A 5 5 0 0 0 3 8 A 5 5 0 0 0 8 13 A 5 5 0 0 0 13 8 A 5 5 0 0 0 8 3 z M 8 4 A 4 4 0 0 1 12 8 A 4 4 0 0 1 8 12 A 4 4 0 0 1 4 8 A 4 4 0 0 1 8 4 z m 4,7 -1,1 3,3 1,-1 z"/>
   <path id="find-inverted" class="inverted" d="M 11,12.7 14.3,16 16,14 12.7,10.9 C 13.1,10 13.5,9 13.5,8 13.5,5 11,2.5 8,2.5 5,2.5 2.5,5 2.5,8 c 0,3 2.5,5.5 5.5,5.5 1,0 2,0 3,-0.8 z M 8,5 c 1.6,0 3,1.3 3,3 0,1.6 -1.3,3 -3,3 C 6.3,11 5,9.6 5,8 5,6.3 6.3,5 8,5 Z"/>
   <path id="category" 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="category-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="category-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="complete" 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="complete-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="complete-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="priority" class="normal" d="m 7.5,2.5 3,0 0,8 -3,0 z m 0,10 3,0 0,3 -3,0 z"/>
+  <path id="priority" class="normal" d="m 7.5,2.5 3,0 0,8 -3,0 z M 10.5,14 A 1.5,1.5 0 0 1 9,15.5 1.5,1.5 0 0 1 7.5,14 1.5,1.5 0 0 1 9,12.5 1.5,1.5 0 0 1 10.5,14 Z"/>
+  <path id="priority-flat" class="normal" d="m 7,3 4,0 -1,7.9 -2,0 z m 3.5,11 c 0,0.8 -0.6,1.5 -1.5,1.5 -0.8,0 -1.5,-0.6 -1.5,-1.5 0,-0.8 0.6,-1.5 1.5,-1.5 0.8,0 1.5,0.6 1.5,1.5 z"/>
   <path id="priority-inverted" class="inverted" d="m 7.5,2.5 3,0 0,8 -3,0 z m 0,10 3,0 0,3 -3,0 z"/>
   <path id="pane" class="normal" d="m 1.5,2.5 0,14 15,0 0,-14 -2,0 0,2 -2,0 0,-3.5 0,3.5 -2,0 0,-2 -3,0 0,2 -2,0 0,-3.5 0,3.5 -2,0 0,-2 z m 0,3 15,0 0,11 -15,0 z"/>
-  <path id="pane-inverted" class="inverted" d="m 0.5,2.5 0,15 17,0 0,-15 -4,0 0,2 -3,0 0,-2 -3,0 0,2 -3,0 0,-2 z m 3,4 11,0 0,8 -11,0 z m 1,-6 0,4 3,0 0,-4 z m 6,0 0,4 3,0 0,-4 z"/>
+  <path id="pane-flat" class="normal" d="M 2,3 2,16 16,16 16,3 14,3 14,5 13,5 13,2 12,2 12,5 11,5 11,3 7,3 7,5 6,5 6,2 5,2 5,5 4,5 4,3 Z m 1,3 12,0 0,9 -12,0 z"/>
+  <path id="pane-inverted" class="inverted" d="m 0.5,2.5 0,15 17,0 0,-15 -4,0 0,1 -3,0 0,-1 -3,0 0,1 -3,0 0,-1 z m 2,3 13,0 0,10 -13,0 z m 2,-5 0,3 3,0 0,-3 z m 6,0 0,3 3,0 0,-3 z"/>
   <path id="save" class="normal" d="m 2.5,2.5 0,13 2,0 0,-6 8,0 0,6 3,0 0,-13 z m 2,0 9,0 0,5 -9,0 z m 2,9 4,0 0,4 -4,0 z"/>
+  <path id="save-flat" class="normal" d="M 3 3 L 3 15 L 15 15 L 15 3 L 3 3 z M 5 4 L 13 4 L 13 8 L 5 8 L 5 4 z M 5 10 L 11 10 L 11 14 L 5 14 L 5 10 z M 6 11 L 6 13 L 7 13 L 7 11 L 6 11 z"/>
   <path id="save-inverted" class="inverted" d="m 2.5,2.5 0,13 2.1,0 0,-5 6.9,0 0,5 4,0 0,-13 z m 2,0 9,0 0,5 -9,0 z m 0.1,8 6.9,0 0,5 -6.9,0 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="security" class="normal" d="m 9,2.5 c -2.5,0 -4.4,1.8 -4.5,5 l 0,1 -2,0 0,7 13,0 0,-7 -2,0 0,-1 C 13.4,3.9 11.3,2.5 9,2.5 Z m 0,2.2 c 2.2,0 2.5,1.8 2.5,3.8 l -5,0 C 6.5,6.5 6.6,4.7 9,4.7 Z"/>
+  <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="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" 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="status" class="normal" d="M 16.5,9 A 7.5,7.5 0 0 1 9,16.5 7.5,7.5 0 0 1 1.5,9 7.5,7.5 0 0 1 9,1.5 7.5,7.5 0 0 1 16.5,9 Z M 12.5,9 A 3.5,3.5 0 0 1 9,12.5 3.5,3.5 0 0 1 5.5,9 3.5,3.5 0 0 1 9,5.5 3.5,3.5 0 0 1 12.5,9 Z" style="fill-opacity:0.5"/>
+  <path id="status-flat" class="normal" d="M 9 2 A 7 7 0 0 0 2 9 A 7 7 0 0 0 9 16 A 7 7 0 0 0 16 9 A 7 7 0 0 0 9 2 z M 9 5 A 4 4 0 0 1 13 9 A 4 4 0 0 1 9 13 A 4 4 0 0 1 5 9 A 4 4 0 0 1 9 5 z M 12,9 A 3,3 0 0 1 9,12 3,3 0 0 1 6,9 3,3 0 0 1 9,6 3,3 0 0 1 12,9 Z"/>
   <path id="status-inverted" class="inverted" d="M 16.5,9 A 7.5,7.5 0 0 1 9,16.5 7.5,7.5 0 0 1 1.5,9 7.5,7.5 0 0 1 9,1.5 7.5,7.5 0 0 1 16.5,9 Z M 12.5,9 A 3.5,3.5 0 0 1 9,12.5 3.5,3.5 0 0 1 5.5,9 3.5,3.5 0 0 1 9,5.5 3.5,3.5 0 0 1 12.5,9 Z"/>
   <path id="freebusy" class="normal" d="M 9,1.5 C 4.8,1.5 1.5,4.8 1.5,9 1.5,13.1 5.2,16.3 9,16.5 13,16.7 16.5,13.2 16.5,9 16.5,4.8 13.1,1.5 9,1.5 Z m 0,0 c 0.7,0 1.5,0 2.5,0.5 l 0,4.5 4,0 0,5 -6,0 0,5 C 4.5,16.3 1.5,12.5 1.5,9 1.5,5.3 4.2,1.6 9,1.5 Z m -0.5,2 1,0 0,5 4,0 0,1 -5,0 z"/>
+  <path id="freebusy-flat" class="normal" d="M 9,2 C 4.8,2 2,4.8 2,9 c 0,4.1 4,7 7,7 4,0 7,-2.8 7,-7 C 16,4.8 13.1,2 9,2 Z m 0,1 c 0.7,0 1,0 2,0.3 l 0,3.7 3,0 0,4 -5,0 0,4 C 5,15 3,11 3,9 3,6 5,3 9,3 Z m -1,1 2,0 0,4 3,0 0,2 -5,0 z"/>
   <path id="freebusy-inverted" class="inverted" d="M 9,1.5 C 4.8,1.5 1.5,4.8 1.5,9 1.5,13.1 5.2,16.3 9,16.5 13,16.7 16.5,13.2 16.5,9 16.5,4.8 13.1,1.5 9,1.5 Z m -1.5,3.7 0,-1.7 3,0 0,4 4,0 0,3 -5,0 0,3 C 6.2,13.4 4.4,11.5 4.5,9 4.5,6.4 6,5.2 7.5,5.2 Z m 0,-1.7 3,0 0,4 4,0 0,3 -7,0 z"/>
   <path id="timezones" class="normal" d="M 9,1.5 C 4.8,1.5 1.5,4.8 1.5,9 1.5,13.1 5.2,16.3 9,16.5 13,16.7 16.5,13.2 16.5,9 16.5,4.8 13.1,1.5 9,1.5 Z M 7,3.8 6.3,4.6 6.3,5.7 7.1,6.8 7.8,8.2 9.4,8.3 10.4,6.1 9.8,3.8 11.3,1.9 c 1.5,0.5 3,1.5 3.8,3 l -3.4,2.5 1.6,-0.1 1.3,2 -0.3,1.8 -0.8,1.4 0.7,1.8 c -0.5,0.7 -1.5,1.3 -2.6,1.7 L 9.7,14 11.2,11.1 9.7,9.9 8.3,9 6.8,10.2 5.9,12.2 6,14 7,16 C 4.7,15.4 3.3,14 2.3,12.2 L 3.5,10.4 3.4,8.9 4.3,8 3.7,7.1 3.7,5.4 2.8,4.7 C 4,3 5.8,1.8 7.8,1.6 Z"/>
+  <path id="timezones-flat" class="normal" d="M 9,2 C 4.8,2 2,4.8 2,9 c 0,4.1 3,7 7,7 4,0 7,-2.8 7,-7 C 16,4.8 13.1,2 9,2 Z m -2,2.3 -0.7,0.8 0,1.1 0.8,1.1 0.7,0.7 1.6,0 1,-1.4 -0.6,-2.3 1.4,-1 c 0,0 1,0 2.4,1.6 l -2.4,2.5 1.3,0.5 1.6,1.4 -0.3,1.8 -1,1.2 1,0.8 -2,1.4 -1.9,-1 L 11.5,11 8.3,9 5.9,11.8 6,13.1 7,14.5 C 6,14 4,13 3.9,12.2 L 4.7,10.5 3.9,8.4 4.8,7.5 4.2,6.6 4.2,5.4 4.3,4.8 C 5,4 6,3 8,3 Z"/>
   <path id="timezones-inverted" class="inverted" d="M 9,1.5 C 4.8,1.5 1.5,4.8 1.5,9 1.5,13.1 5.2,16.3 9,16.5 13,16.7 16.5,13.2 16.5,9 16.5,4.8 13.1,1.5 9,1.5 Z m -2.8,3.3 0.8,2.8 L 7.5,9 9.9,8.6 10,5.7 9.8,3.6 c 1.5,0.5 1.8,0.1 2.6,1.6 l -1,2 0.3,2.7 2.6,-0.7 C 14.2,12 12.6,13.4 10.2,14.3 L 11.1,13.3 11,11.2 10.1,8.7 7,9 5.8,13.4 8,14.5 c -2.3,-0.6 -3.5,-2 -4.5,-3.8 C 5.6,9.3 6,8 4.3,5.7 5.6,4.3 6,4 7.7,3.5 Z"/>
   <path id="decline" class="normal" d="M 2.5,5 5,2.5 l 4,4 4,-4 2.5,2.5 -4,4 4,4 -2.5,2.5 -4,-4 -4,4 -2.5,-2.5 4,-4 z"/>
+  <path id="decline-flat" class="normal" d="M 3,5.5 5.5,3 9,6.5 12.5,3 15,5.5 11.5,9 15,12.5 12.5,15 9,11.5 5.5,15 3,12.5 6.5,9 Z"/>
   <path id="decline-inverted" class="inverted" d="M 2.5,5 5,2.5 l 4,4 4,-4 2.5,2.5 -4,4 4,4 -2.5,2.5 -4,-4 -4,4 -2.5,-2.5 4,-4 z"/>
   <path id="tentative" class="normal" d="m 8.2,6.5 -2.7,0 c 0,-1.4 0.5,-4 3.5,-4 2.3,0 4.4,1 4.5,4 0,2.8 -3,2.5 -3,5 l -3,0 C 7.4,8 10.3,8.5 10.2,6.5 10,5.5 9.3,5.5 9,5.5 c 0,0 -0.8,0 -0.8,1 z m -0.7,7 3,0 0,2 -3,0 z"/>
+  <path id="tentative-flat" class="normal" d="M 8,7 6,7 C 6,5.6 6,3 9,3 c 2,0 4,0 4,3.5 0,3 -3,3 -3,5.5 L 8,12 C 8,8.5 11.1,8.5 11,6.5 11,5 10,5 9,5 8,5 8,6 8,7 Z m 0,6 2,0 0,2 -2,0 z"/>
   <path id="tentative-inverted" class="inverted" d="m 8.2,6.5 -2.7,0 c 0,-1.4 0.5,-4 3.5,-4 2.3,0 4.4,1 4.5,4 0,2.8 -3,2.5 -3,5 l -3,0 C 7.4,8 10.3,8.5 10.2,6.5 10,5.5 9.3,5.5 9,5.5 c 0,0 -0.8,0 -0.8,1 z m -0.7,7 3,0 0,2 -3,0 z"/>
 </svg>
--- a/calendar/base/themes/osx/calendar-task-view.css
+++ b/calendar/base/themes/osx/calendar-task-view.css
@@ -33,30 +33,60 @@
     margin: 4px 5px;
 }
 
 #task-actions-toolbar {
     min-width: 50px !important;
     min-height: 14px !important;
 }
 
-#task-actions-category {
-  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#category);
+@media not all and (-moz-mac-yosemite-theme) {
+  #task-actions-category {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#category);
+  }
+
+  #task-actions-markcompleted {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#complete);
+  }
+
+  #task-actions-priority {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#priority);
+  }
+
+  #calendar-delete-task-button {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#delete);
+  }
+
+  #calendar-add-task-button {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#newtask);
+      -moz-image-region: rect(0 18px 18px 0);
+  }
 }
 
-#task-actions-markcompleted {
-  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#complete);
-}
+@media (-moz-mac-yosemite-theme) {
+  #task-actions-category {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#category-flat);
+  }
+
+  #task-actions-markcompleted {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#complete-flat);
+  }
 
-#task-actions-priority {
-  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#priority);
-}
+  #task-actions-priority {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#priority-flat);
+  }
 
-#calendar-delete-task-button {
-  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#delete);
+  #calendar-delete-task-button {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#delete);
+  }
+
+  #calendar-add-task-button {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#newtask-flat);
+      -moz-image-region: rect(0 18px 18px 0);
+  }
 }
 
 #task-actions-toolbar[brighttext] > #task-actions-category {
   list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#category-inverted);
 }
 
 #task-actions-toolbar[brighttext] > #task-actions-markcompleted {
   list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#complete-inverted);
@@ -66,21 +96,16 @@
   list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#priority-inverted);
 }
 
 
 #task-actions-toolbar[brighttext] > #calendar-delete-task-button {
   list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#delete-inverted);
 }
 
-#calendar-add-task-button {
-  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#newtask);
-    -moz-image-region: rect(0 18px 18px 0);
-}
-
 #calendar-add-task-button > .toolbarbutton-icon {
   width: 18px;
   height: 18px;
   margin: -1px;
 }
 
 #calendar-add-task-button[disabled="true"] > .toolbarbutton-icon {
   opacity: .5;
--- a/calendar/base/themes/osx/dialogs/calendar-event-dialog.css
+++ b/calendar/base/themes/osx/dialogs/calendar-event-dialog.css
@@ -13,54 +13,90 @@
 #timezone-endtime {
     -moz-margin-start: 15px;
 }
 
 /*--------------------------------------------------------------------
  *   Event dialog toolbar buttons
  *-------------------------------------------------------------------*/
 
-#button-save {
-  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#save);
+@media not all and (-moz-mac-yosemite-theme) {
+  #button-save {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#save);
+  }
+
+  #button-attendees {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#address);
+  }
+
+  #button-privacy {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#security);
+  }
+
+  #button-url {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#attach);
+  }
+
+  #button-priority {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#priority);
+  }
+
+  #button-status {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#status);
+  }
+
+  #button-freebusy {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#freebusy);
+  }
+
+  #button-timezones {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#timezones);
+  }
 }
 
-#button-attendees {
-  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#address);
-}
+@media (-moz-mac-yosemite-theme) {
+  #button-save {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#save-flat);
+  }
+
+  #button-attendees {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#address-flat);
+  }
+
+  #button-privacy {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#security-flat);
+  }
 
-#button-privacy {
-  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#security);
-}
+  #button-url {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#attach);
+  }
+
+  #button-priority {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#priority-flat);
+  }
 
-#button-url {
-  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#attach);
+  #button-status {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#status-flat);
+  }
+
+  #button-freebusy {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#freebusy-flat);
+  }
+
+  #button-timezones {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#timezones-flat);
+  }
 }
 
 #button-delete.cal-event-toolbarbutton {
-    /* !important to override the SM #button-delete states */
+  /* !important to override the SM #button-delete states */
   list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#delete) !important;
   -moz-image-region: auto !important;
 }
 
-#button-priority {
-  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#priority);
-}
-
-#button-status {
-  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#status);
-}
-
-#button-freebusy {
-  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#freebusy);
-}
-
-#button-timezones {
-  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#timezones);
-}
-
 toolbar[brighttext] #button-save {
   list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#save-inverted);
 }
 
 toolbar[brighttext] #button-attendees {
   list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#address-inverted);
 }
 
@@ -83,11 +119,11 @@ toolbar[brighttext] #button-priority {
 toolbar[brighttext] #button-status {
   list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#status-inverted);
 }
 
 toolbar[brighttext] #button-freebusy {
   list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#freebusy-inverted);
 }
 
-toolbar[brighttext] #button-timezones {
-  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#timezones-inverted);
-}
+  toolbar[brighttext] #button-timezones {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#timezones-inverted);
+  }
--- a/calendar/base/themes/osx/today-pane.css
+++ b/calendar/base/themes/osx/today-pane.css
@@ -27,18 +27,26 @@
    display: none;
 }
 
 #agenda-toolbar {
   background-color: -moz-dialog;
   color: -moz-dialogtext;
 }
 
-#todaypane-new-event-button {
-  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#newevent);
+@media not all and (-moz-mac-yosemite-theme) {
+  #todaypane-new-event-button {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#newevent);
+  }
+}
+
+@media (-moz-mac-yosemite-theme) {
+  #todaypane-new-event-button {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#newevent-flat);
+  }
 }
 
 #todaypane-new-event-button[disabled="true"] > .toolbarbutton-icon {
   opacity: .5;
 }
 
 #todaypane-new-event-button > .toolbarbutton-text {
   -moz-margin-start: 0px;
--- a/calendar/base/themes/windows/calendar-task-view.css
+++ b/calendar/base/themes/windows/calendar-task-view.css
@@ -188,16 +188,35 @@
 
   #view-task-edit-field:not(:-moz-lwtheme):hover,
   #task-text-filter-field:not(:-moz-lwtheme):hover {
     border-color: hsla(210, 54%, 20%, .35) hsla(210, 54%, 20%, .37)
                   hsla(210, 54%, 20%, .4);
   }
 }
 
+@media (-moz-windows-default-theme) and (-moz-os-version: windows-win8),
+       (-moz-windows-default-theme) and (-moz-os-version: windows-win10) {
+  #task-actions-category {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#category-flat);
+  }
+
+  #task-actions-markcompleted {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#complete-flat);
+  }
+
+  #task-actions-priority {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#priority-flat);
+  }
+
+  #calendar-add-task-button {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#newtask-flat);
+  }
+}
+
 @media (-moz-windows-default-theme) and (-moz-os-version: windows-win10) {
   #view-task-edit-field,
   #task-text-filter-field {
     min-height: 28px;
     border-color: hsl(0, 0%, 90%);
     border-radius: 1px;
     transition-property: border-color;
     transition-duration: .1s;
--- a/calendar/base/themes/windows/dialogs/calendar-event-dialog.css
+++ b/calendar/base/themes/windows/dialogs/calendar-event-dialog.css
@@ -262,13 +262,44 @@
   /* < Win8 */
   #event-toolbox {
     background-color: hsl(210, 75%, 92%);
     background-image: linear-gradient(rgba(255, 255, 255, .5),
                       rgba(255, 255, 255, 0));
   }
 }
 
+@media (-moz-windows-default-theme) and (-moz-os-version: windows8),
+       (-moz-windows-default-theme) and (-moz-os-version: windows-win10) {
+  #button-save {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#save-flat);
+  }
+
+  #button-attendees {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#address-flat);
+  }
+
+  #button-privacy {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#security-flat);
+  }
+
+  #button-priority {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#priority-flat);
+  }
+
+  #button-status {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#status-flat);
+  }
+
+  #button-freebusy {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#freebusy-flat);
+  }
+
+  #button-timezones {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#timezones-flat);
+  }
+}
+
 @media (-moz-windows-glass) {
   #event-toolbox {
     border-bottom-color: #AABCCF;
   }
 }
--- a/calendar/base/themes/windows/today-pane.css
+++ b/calendar/base/themes/windows/today-pane.css
@@ -105,8 +105,15 @@
   .today-closebutton:hover {
     -moz-image-region: rect(0 40px 20px 20px);
   }
 
   .today-closebutton:hover:active {
     -moz-image-region: rect(0 60px 20px 40px);
   }
 }
+
+@media (-moz-windows-default-theme) and (-moz-os-version: windows-win8),
+       (-moz-windows-default-theme) and (-moz-os-version: windows-win10) {
+  #todaypane-new-event-button {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#newevent-flat);
+  }
+}
--- a/calendar/lightning/themes/osx/lightning-toolbar.css
+++ b/calendar/lightning/themes/osx/lightning-toolbar.css
@@ -1,64 +1,122 @@
 /* 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/. */
 
-/* Lightning "Calendar" Toolbarbutton */
-#lightning-button-calendar {
-  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#calendar-tab);
-}
+@media not all and (-moz-mac-yosemite-theme) {
+  /* Lightning "Calendar" Toolbarbutton */
+  #lightning-button-calendar {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#calendar-tab);
+  }
+
+  /* Lightning "Tasks" Toolbarbutton */
+  #lightning-button-tasks {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#task-tab);
+  }
 
-/* Lightning "Tasks" Toolbarbutton */
-#lightning-button-tasks {
-  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#task-tab);
-}
+  /* Toolbar buttons */
+
+  #calendar-synchronize-button,
+  #task-synchronize-button {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#synchronize);
+  }
+
+  #extractEventButton,
+  #task-newevent-button,
+  #hdrExtractEventButton,
+  #calendar-newevent-button {
+      list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#newevent);
+  }
 
-/* Toolbar buttons */
+  #extractTaskButton,
+  #task-newtask-button,
+  #hdrExtractTaskButton,
+  #calendar-newtask-button {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#newtask);
+  }
+
+  #calendar-edit-button,
+  #task-edit-button {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#edit);
+  }
 
-#calendar-synchronize-button,
-#task-synchronize-button {
-  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#synchronize);
-}
+  #calendar-delete-button,
+  #task-delete-button {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#delete);
+  }
+
+  #calendar-goto-today-button {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#today);
+  }
 
-#extractEventButton,
-#task-newevent-button,
-#hdrExtractEventButton,
-#calendar-newevent-button {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#newevent);
+  #calendar-print-button,
+  #task-print-button {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#print);
+  }
+
+  #calendar-unifinder-button {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#find);
+  }
 }
 
-#extractTaskButton,
-#task-newtask-button,
-#hdrExtractTaskButton,
-#calendar-newtask-button {
-  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#newtask);
-}
+@media (-moz-mac-yosemite-theme) {
+  /* Lightning "Calendar" Toolbarbutton */
+  #lightning-button-calendar {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#calendar-tab-flat);
+  }
+
+  /* Lightning "Tasks" Toolbarbutton */
+  #lightning-button-tasks {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#task-tab-flat);
+  }
 
-#calendar-edit-button,
-#task-edit-button {
-  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#edit);
-}
+  /* Toolbar buttons */
+
+  #calendar-synchronize-button,
+  #task-synchronize-button {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#synchronize-flat);
+  }
+
+  #extractEventButton,
+  #task-newevent-button,
+  #hdrExtractEventButton,
+  #calendar-newevent-button {
+      list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#newevent-flat);
+  }
 
-#calendar-delete-button,
-#task-delete-button {
-  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#delete);
-}
+  #extractTaskButton,
+  #task-newtask-button,
+  #hdrExtractTaskButton,
+  #calendar-newtask-button {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#newtask-flat);
+  }
+
+  #calendar-edit-button,
+  #task-edit-button {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#edit-flat);
+  }
 
-#calendar-goto-today-button {
-  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#today);
-}
+  #calendar-delete-button,
+  #task-delete-button {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#delete);
+  }
+
+  #calendar-goto-today-button {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#today-flat);
+  }
 
-#calendar-print-button,
-#task-print-button {
-  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#print);
-}
+  #calendar-print-button,
+  #task-print-button {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#print-flat);
+  }
 
-#calendar-unifinder-button {
-  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#find);
+  #calendar-unifinder-button {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#find-flat);
+  }
 }
 
 toolbar[brighttext] #lightning-button-calendar {
   list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#calendar-tab-inverted);
 }
 
 toolbar[brighttext] #lightning-button-tasks {
   list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#task-tab-inverted);
--- a/calendar/lightning/themes/osx/lightning.css
+++ b/calendar/lightning/themes/osx/lightning.css
@@ -18,22 +18,34 @@ radio[pane=paneLightning] {
 #imip-bar > image {
     list-style-image: url("chrome://calendar/skin/cal-icon32.png");
     -moz-margin-end: 8px;
 }
 
 /* ::::: tabs ::::: */
 
 /* ::: new tab buttons ::: */
-#calendar-tab-button {
-  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#calendar-tab);
+@media not all and (-moz-mac-yosemite-theme) {
+  #calendar-tab-button {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#calendar-tab);
+  }
+
+  #task-tab-button {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#task-tab);
+  }
 }
 
-#task-tab-button {
-  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#task-tab);
+@media (-moz-mac-yosemite-theme) {
+  #calendar-tab-button {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#calendar-tab-flat);
+  }
+
+  #task-tab-button {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#task-tab-flat);
+  }
 }
 
 /* ::: tab icons ::: */
 .icon-holder[type="calendar"],
 .tabmail-tab[type="calendar"] {
     list-style-image: url(chrome://lightning-common/skin/mode-switch-icons.png);
     -moz-image-region: rect(0px 64px 16px 48px);
 }
@@ -55,26 +67,42 @@ radio[pane=paneLightning] {
 }
 
 /* Lightning sidebar background in calendar and task mode */
 #ltnSidebar {
   background-color: -moz-field;
 }
 
 /* Write button */
-#newMsgButton-mail-menuitem {
-    list-style-image: url(chrome://messenger/skin/icons/mail-toolbar.svg#newmsg-osx);
+@media not all and (-moz-mac-yosemite-theme) {
+  #newMsgButton-mail-menuitem {
+      list-style-image: url(chrome://messenger/skin/icons/mail-toolbar.svg#newmsg);
+  }
+
+  #newMsgButton-calendar-menuitem {
+      list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#calendar-tab);
+  }
+
+  #newMsgButton-task-menuitem {
+      list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#task-tab);
+  }
 }
 
-#newMsgButton-calendar-menuitem {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#calendar-tab-osx);
-}
+@media (-moz-mac-yosemite-theme) {
+  #newMsgButton-mail-menuitem {
+      list-style-image: url(chrome://messenger/skin/icons/mail-toolbar.svg#newmsg-flat);
+  }
 
-#newMsgButton-task-menuitem {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#task-tab-osx);
+  #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;
@@ -108,19 +136,29 @@ radio[pane=paneLightning] {
               hsla(0, 0%, 0%, 0)) border-box;
   border-color: hsla(0, 0%, 0%, .3);
   box-shadow: 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;
   transition-duration: 10ms;
 }
 
-#calendar-status-todaypane-button > stack > .toolbarbutton-icon-begin {
-  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#pane);
-  -moz-image-region: rect(0 18px 18px 0);
+@media not all and (-moz-mac-yosemite-theme) {
+  #calendar-status-todaypane-button > stack > .toolbarbutton-icon-begin {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#pane);
+    -moz-image-region: rect(0 18px 18px 0);
+  }
+}
+
+@media (-moz-mac-yosemite-theme) {
+  #calendar-status-todaypane-button > stack > .toolbarbutton-icon-begin {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#pane-flat);
+    width: 18px;
+    height:18px;
+  }
 }
 
 #calendar-status-todaypane-button:-moz-lwtheme-brighttext > stack >
   .toolbarbutton-icon-begin {
   list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#pane-inverted);
 }
 
 #calendar-status-todaypane-button > stack > .toolbarbutton-day-text {
@@ -188,42 +226,81 @@ radio[pane=paneLightning] {
 }
 
 #ltnSidebar {
   -moz-border-end: 1px solid #8B8B8B;
   -moz-margin-end: -3px !important;
 }
 
 /* ::: imip button icons ::: */
-.imipAcceptRecurrencesButton,
-.imipAcceptButton {
-  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#complete);
-}
+@media not all and (-moz-mac-yosemite-theme) {
+  .imipAcceptRecurrencesButton,
+  .imipAcceptButton {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#complete);
+  }
+
+  .imipDeclineRecurrencesButton,
+  .imipDeclineButton {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#decline);
+  }
+
+  .imipTentativeRecurrencesButton,
+  .imipTentativeButton {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#tentative);
+  }
 
-.imipDeclineRecurrencesButton,
-.imipDeclineButton {
-  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#decline);
-}
+  .imipDetailsButton {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#find);
+  }
+
+  .imipAddButton {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#newevent);
+  }
 
-.imipTentativeRecurrencesButton,
-.imipTentativeButton {
-  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#tentative);
+  .imipUpdateButton {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#synchronize);
+  }
+
+  .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);
+  }
 }
 
-.imipDetailsButton {
-  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#find);
-}
+@media (-moz-mac-yosemite-theme) {
+  .imipAcceptRecurrencesButton,
+  .imipAcceptButton {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#complete-flat);
+  }
 
-.imipAddButton {
-  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#newevent);
-}
+  .imipDeclineRecurrencesButton,
+  .imipDeclineButton {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#decline-flat);
+  }
+
+  .imipTentativeRecurrencesButton,
+  .imipTentativeButton {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#tentative-flat);
+  }
 
-.imipUpdateButton {
-  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#synchronize);
-}
+  .imipDetailsButton {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#find-flat);
+  }
+
+  .imipAddButton {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#newevent-flat);
+  }
 
-.imipDeleteButton {
-  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#delete);
-}
+  .imipUpdateButton {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#synchronize-flat);
+  }
 
-.imipReconfirmButton {
-  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#priority);
+  .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-flat);
+  }
 }
--- a/calendar/lightning/themes/windows/lightning-toolbar.css
+++ b/calendar/lightning/themes/windows/lightning-toolbar.css
@@ -307,8 +307,56 @@
   toolbar[brighttext] #task-print-button {
     list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#print-inverted);
   }
 
   toolbar[brighttext] #calendar-unifinder-button {
     list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#find-inverted);
   }
 }
+
+@media (-moz-windows-default-theme) and (-moz-os-version: windows-win8),
+       (-moz-windows-default-theme) and (-moz-os-version: windows-win10) {
+  #lightning-button-calendar {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#calendar-tab);
+  }
+
+  #lightning-button-tasks {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#task-tab);
+  }
+
+  #calendar-synchronize-button,
+  #task-synchronize-button {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#synchronize-flat);
+  }
+
+  #extractEventButton,
+  #task-newevent-button,
+  #hdrExtractEventButton,
+  #calendar-newevent-button {
+      list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#newevent-flat);
+  }
+
+  #extractTaskButton,
+  #task-newtask-button,
+  #hdrExtractTaskButton,
+  #calendar-newtask-button {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#newtask-flat);
+  }
+
+  #calendar-edit-button,
+  #task-edit-button {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#edit-flat);
+  }
+
+  #calendar-goto-today-button {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#today-flat);
+  }
+
+  #calendar-print-button,
+  #task-print-button {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#print-flat);
+  }
+
+  #calendar-unifinder-button {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#find-flat);
+  }
+}
--- a/calendar/lightning/themes/windows/lightning.css
+++ b/calendar/lightning/themes/windows/lightning.css
@@ -207,19 +207,19 @@ radio[pane=paneLightning] {
     list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#task-tab-inverted);
   }
 
   #calendar-status-todaypane-button > stack > .toolbarbutton-icon-begin {
     list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#pane);
     -moz-image-region: rect(0 18px 18px 0);
   }
 
-  #calendar-status-todaypane-button:-moz-lwtheme-brighttext > stack >
-    .toolbarbutton-icon-begin {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#pane-inverted);
+#calendar-status-todaypane-button:-moz-lwtheme-brighttext > stack >
+  .toolbarbutton-icon-begin {
+  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#pane-inverted);
   }
   /* compensate the 18px icon height */
   #calendar-status-todaypane-button > stack > .toolbarbutton-icon-begin {
     margin-top: -1px;
     margin-bottom: -1px;
   }
 
   .icon-holder[type="calendar"],
@@ -326,8 +326,63 @@ radio[pane=paneLightning] {
     min-height: 0;
     height: 5px;
     background-color: transparent;
     margin-top: -3px;
     position: relative;
     z-index: 10;
   }
 }
+
+@media (-moz-windows-default-theme) and (-moz-os-version: windows-win8),
+       (-moz-windows-default-theme) and (-moz-os-version: windows-win10) {
+  #calendar-tab-button,
+  #newMsgButton-calendar-menuitem {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#calendar-tab-flat);
+    -moz-image-region: auto;
+  }
+
+  #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);
+  }
+
+  .imipDeclineButton,
+  .imipDeclineRecurrencesButton {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#decline-flat);
+  }
+
+  .imipTentativeButton,
+  .imipTentativeRecurrencesButton {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#tentative-flat);
+  }
+
+  .imipAddButton {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#newevent-flat);
+  }
+
+  .imipUpdateButton {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#synchronize-flat);
+  }
+
+  .imipDetailsButton {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#find-flat);
+  }
+
+  .imipReconfirmButton {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#priority-flat);
+  }
+}
--- a/mail/themes/osx/mail/addrbook/addressbook.css
+++ b/mail/themes/osx/mail/addrbook/addressbook.css
@@ -237,42 +237,70 @@ toolbar[mode="icons"] .toolbarbutton-1 >
   margin-top: 1px;
 }
 
 #ab-toolbox > toolbar {
   /* force iconsize="small" on these toolbars */
   counter-reset: smallicons;
 }
 
-#button-newcard {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newcard");
-}
+@media not all and (-moz-mac-yosemite-theme) {
+  #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-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");
+  }
 }
 
-#button-editcard {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#editcard");
-}
+@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-newmessage {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newmessage");
-}
+  #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");
-}
+  #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");
+  #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");
+  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");
--- a/mail/themes/osx/mail/chat.css
+++ b/mail/themes/osx/mail/chat.css
@@ -98,26 +98,42 @@
   height: 21px !important;
   margin: 0 !important;
 }
 
 #IMSearchInput:-moz-lwtheme:not([focused="true"]) {
   opacity: .9;
 }
 
-#button-add-buddy {
-  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.svg#add");
+@media not all and (-moz-mac-yosemite-theme) {
+  #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");
+  }
 }
 
-#button-join-chat {
-  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.svg#join");
-}
+@media (-moz-mac-yosemite-theme) {
+  #button-add-buddy {
+    list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.svg#add-flat");
+  }
 
-#button-chat-accounts {
-  list-style-image: url("chrome://messenger/skin/icons/chat-toolbar.svg#accounts");
+  #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");
@@ -277,20 +293,28 @@ richlistitem[state="disconnected"] .acco
   }
 
   .closeConversationButton > .button-image-icon {
     width: 16px;
     height: 16px;
   }
 }
 
-.tabmail-tab[type="chat"],
-.alltabs-item[type="chat"] {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#chat");
-  -moz-image-region: auto;
+@media not all and (-moz-mac-yosemite-theme) {
+  .tabmail-tab[type="chat"],
+  .alltabs-item[type="chat"] {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#chat");
+  }
+}
+
+@media (-moz-mac-yosemite-theme) {
+  .tabmail-tab[type="chat"],
+  .alltabs-item[type="chat"] {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#chat-flat");
+  }
 }
 
 .tabmail-tab[type="chat"] > .tab-stack > .tab-content > .tab-icon-image {
   width: 18px;
   height: 18px;
   margin-top: 0;
   -moz-margin-end: 5px;
   margin-bottom: -1px;
--- a/mail/themes/osx/mail/compose/messengercompose.css
+++ b/mail/themes/osx/mail/compose/messengercompose.css
@@ -297,59 +297,108 @@ toolbar[mode="icons"] .toolbarbutton-1 >
   margin-top: 1px;
 }
 
 #compose-toolbox > toolbar {
   /* force iconsize="small" on these toolbars */
   counter-reset: smallicons;
 }
 
-#button-send {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#send");
-}
+@media not all and (-moz-mac-yosemite-theme) {
+  #button-send {
+    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#send");
+  }
+
+  #button-contacts {
+    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#contacts");
+    -moz-image-region: auto !important;
+  }
 
-#button-contacts {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#contacts");
-  -moz-image-region: auto !important;
-}
+  #spellingButton {
+    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#spelling");
+  }
+
+  #button-attach {
+    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#attach");
+  }
+
+  #button-security {
+    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#security");
+  }
 
-#spellingButton {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#spelling");
-}
+  #button-save {
+    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#save");
+  }
+
+  #quoteButton {
+    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#quote");
+  }
+
+  #cut-button {
+    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#cut");
+  }
 
-#button-attach {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#attach");
-}
+  #copy-button {
+    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#copy");
+  }
 
-#button-security {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#security");
+  #paste-button {
+    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#paste");
+  }
+
+  #button-print {
+    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#print");
+  }
 }
 
-#button-save {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#save");
-}
+@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;
+  }
 
-#quoteButton {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#quote");
-}
+  #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");
+  }
 
-#cut-button {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#cut");
-}
+  #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");
-}
+  #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");
-}
+  #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");
+  #button-print {
+    list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#print-flat");
+  }
 }
 
 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");
--- a/mail/themes/osx/mail/messageHeader.css
+++ b/mail/themes/osx/mail/messageHeader.css
@@ -216,54 +216,98 @@ attachmentlist:focus >attachmentitem[sel
   box-shadow: 0 0 0 1px hsla(0, 0%, 100%, .2);
 }
 
 toolbar[mode="text"] .msgHeaderView-button .toolbarbutton-text {
   -moz-margin-start: 2px;
   -moz-margin-end: 2px;
 }
 
-.hdrReplyToSenderButton,
-.hdrDummyReplyButton,
-.hdrReplyButton {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#reply");
-}
+@media not all and (-moz-mac-yosemite-theme) {
+  .hdrReplyToSenderButton,
+  .hdrDummyReplyButton,
+  .hdrReplyButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#reply");
+  }
+
+  .hdrReplyAllButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replyall");
+  }
+
+  .hdrReplyListButton,
+  .hdrFollowupButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replylist");
+  }
+
+  .hdrForwardButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#forward");
+  }
 
-.hdrReplyAllButton {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replyall");
-}
+  .hdrArchiveButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#archive");
+  }
+
+  .hdrJunkButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#junk");
+  }
 
-.hdrReplyListButton,
-.hdrFollowupButton {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replylist");
-}
+  .hdrTrashButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#delete");
+  }
 
-.hdrForwardButton {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#forward");
+  .hdrTagButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#tag");
+  }
+
+  #attachmentSaveAllSingle,
+  #attachmentSaveAllMultiple {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#file");
+  }
 }
 
-.hdrArchiveButton {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#archive");
-}
+@media (-moz-mac-yosemite-theme) {
+  .hdrReplyToSenderButton,
+  .hdrDummyReplyButton,
+  .hdrReplyButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#reply-flat");
+  }
 
-.hdrJunkButton {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#junk");
-}
+  .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");
+  }
 
-.hdrTrashButton {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#delete");
-}
+  .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");
-}
+  .hdrTrashButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#delete");
+  }
 
-#attachmentSaveAllSingle,
-#attachmentSaveAllMultiple {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#file");
+  .hdrTagButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#tag-flat");
+  }
+
+  #attachmentSaveAllSingle,
+  #attachmentSaveAllMultiple {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#file-flat");
+  }
 }
 
 toolbar[brighttext] .hdrReplyToSenderButton,
 toolbar[brighttext] .hdrDummyReplyButton,
 toolbar[brighttext] .hdrReplyButton {
   list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#reply-inverted");
 }
 
--- a/mail/themes/osx/mail/primaryToolbar.css
+++ b/mail/themes/osx/mail/primaryToolbar.css
@@ -306,114 +306,218 @@ toolbar[mode="icons"] .toolbarbutton-1 >
   counter-reset: smallicons;
 }
 
 /* remove the small icons checkbox in Customize window */
 #smallicons {
   display: none;
 }
 
-#button-getmsg {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#getmsg");
-}
+@media not all and (-moz-mac-yosemite-theme) {
+  #button-getmsg {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#getmsg");
+  }
+
+  #button-newmsg {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#newmsg");
+  }
 
-#button-newmsg {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#newmsg");
-}
+  #button-address {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#address");
+  }
+
+  #button-reply {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#reply");
+  }
+
+  #button-replyall {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replyall");
+  }
 
-#button-address {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#address");
-}
+  #button-replylist {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replylist");
+  }
+
+  #button-forward {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#forward");
+  }
+
+  .delete-button {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#delete");
+  }
 
-#button-reply {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#reply");
-}
+  .junk-button {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#junk");
+  }
+
+  #button-print {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#print");
+  }
 
-#button-replyall {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replyall");
-}
+  #button-stop {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#stop");
+  }
+
+  #button-file {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#file");
+  }
 
-#button-replylist {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replylist");
-}
+  #button-nextUnread {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#nextUnread");
+  }
+
+  #button-previousUnread {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#previousUnread");
+  }
+
+  #button-mark {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#mark");
+  }
 
-#button-forward {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#forward");
-}
+  #button-tag {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#tag");
+  }
 
-.delete-button {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#delete");
-}
+  #button-goback {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#goback");
+  }
+
+  #button-goforward {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#goforward");
+  }
 
-.junk-button {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#junk");
-}
+  #button-compact {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#compact");
+  }
+
+  #button-archive {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#archive");
+  }
+
+  #button-chat {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#chat");
+  }
 
-#button-print {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#print");
-}
+  #button-nextMsg {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#nextMsg");
+  }
+
+  #button-previousMsg {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#previousMsg");
+  }
 
-#button-stop {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#stop");
-}
+  #qfb-show-filter-bar {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#filter");
+  }
 
-#button-file {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#file");
+  .button-appmenu {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#appButton");
+  }
 }
 
-#button-nextUnread {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#nextUnread");
-}
+@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-previousUnread {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#previousUnread");
-}
+  #button-address {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#address-flat");
+  }
 
-#button-mark {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#mark");
-}
+  #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-tag {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#tag");
-}
+  #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");
+  }
+
+  .delete-button {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#delete");
+  }
 
-#button-goback {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#goback");
-}
+  .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-goforward {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#goforward");
-}
+  #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-compact {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#compact");
-}
+  #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-archive {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#archive");
-}
+  #button-tag {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#tag-flat");
+  }
 
-#button-chat {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#chat");
-}
+  #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-nextMsg {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#nextMsg");
-}
+  #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-previousMsg {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#previousMsg");
-}
+  #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");
-}
+  #qfb-show-filter-bar {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#filter-flat");
+  }
 
-.button-appmenu {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#appButton");
+  .button-appmenu {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#appButton-flat");
+  }
 }
 
 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");
--- a/mail/themes/shared/mail/icons/addressbook-toolbar.svg
+++ b/mail/themes/shared/mail/icons/addressbook-toolbar.svg
@@ -12,54 +12,59 @@
     .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;
+        fill-opacity: 1;
+        stroke: none;
       }
     }
     @media (-moz-windows-default-theme) and (-moz-os-version: windows-win10) {
       .normal {
         fill: #4c4c4c;
-      fill-opacity: 1;
-        stroke: #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;
+        fill-opacity: 1;
         stroke: url(#win2);
       }
     }
     @media (-moz-mac-lion-theme) {
       .normal {
         fill: url(#osx1);
-      fill-opacity: 1;
+        fill-opacity: 1;
         stroke: url(#osx2);
       }
     }
     @media (-moz-mac-yosemite-theme) {
       .normal {
         fill: #4d4d4d;
-      fill-opacity: 1;
-        stroke: #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"
@@ -93,23 +98,27 @@
        y1="1"
        x2="8"
        y2="15"
        gradientUnits="userSpaceOnUse">
       <stop stop-color="#252525" stop-opacity="0.88" offset="0"/>
       <stop stop-color="#505050" stop-opacity="0.68" offset="1"/>
     </linearGradient>
   </defs>
-  <path id="newcard" class="normal" d="M 9,2 C 7.8,2 6.28,2.4 5.5,3 4.5,3.7 4.6,6.1 4.5,6.5 4.3,6.8 4,7.1 4,7.5 c 0,0.3 0.4,0.6 0.5,1 0.2,1.5 1,1.8 3,3 l 0,1 c -2.4,0.1 -5.7,-0.6 -6,3 l 15,0 c -0.3,-3.5 -3.6,-3 -6,-3 l 0,-1 c 2,-1.1 2.7,-1.6 3,-3 C 13.5,8.2 14,7.9 14,7.5 14,7.1 13.6,6.8 13.5,6.5 13.3,6.1 13.4,3.7 12.5,3 11.7,2.4 10,2 9,2 Z m -1.5,1.5 3,0 0,2 2,0 0,3 -2,0 0,2 -3,0 0,-2 -2,0 0,-3 2,0 z"/>
+  <path id="newcard" 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 11,3 C 9.8,3 8.2,3.4 7.5,4 6.5,4.7 6.6,7.1 6.5,7.5 6.3,7.8 6,8.1 6,8.5 c 0,0.3 0.4,0.6 0.5,1 0.2,1.5 1,1.8 3,3 l 0,1 c -2.3,0 -4,-0.2 -4,2 l 11,0 c 0,-2.1 -1.7,-2 -4,-2 l 0,-1 c 2,-1.1 2.7,-1.6 3,-3 C 15.5,9.2 16,8.9 16,8.5 16,8.1 15.6,7.8 15.5,7.5 15.3,7.1 15.4,4.7 14.5,4 13.7,3.4 12,3 11,3 Z m -1.5,1.5 3,0 0,2 2,0 0,3 -2,0 0,2 -3,0 0,-2 -2,0 0,-3 2,0 z
-    M 7,2 C 5.8,2 4.3,2.4 3.5,3 2.5,3.7 2.6,5.1 2.5,5.5 2.3,5.8 2,6.1 2,6.5 2,6.8 2.3,7.1 2.5,7.5 3,9.6 2.8,11 5,11.4 2.4,11.4 1.5,11.3 1.5,13.5 l 2.5,0 C 4.5,12.5 4.4,11.6 5,11.4 4.4,10.7 4.5,9.2 4,8.5 4,8 4.6,7 4.5,6.5 4.7,4.6 5,2.4 7,2 Z"/>
+  <path id="newlist" 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.2107935 1,3.4 3,4 -2.5,0 -4,-0.2 -4,2 l 8,0 0,-1 C 7.8,11.5 6.8,11.4 6.5,9.5 6.5,9 6,9 6,8.5 6,8 6.6,8 6.5,7.5 6.5,4.1 7.6,3.5 9.6,3 9,2.4 8.2,2 7,2 Z"/>
-  <path id="editcard" class="normal" d="M 9,1.5 C 4.8,1.5 1.5,4.8 1.5,9 c 0,4.1 3.3,7.5 7.5,7.5 4.1,0 7.5,-3.3 7.5,-7.5 C 16.5,4.8 13.1,1.5 9,1.5 Z m -1.5,2 3,0 0,3 -3,0 z m 0,5 3,0 0,6 -3,0 z"/>
-  <path id="editcard-inverted" class="inverted" d="M 9,1.5 C 4.8,1.5 1.5,4.8 1.5,9 c 0,4.1 3.3,7.5 7.5,7.5 4.1,0 7.5,-3.3 7.5,-7.5 C 16.5,4.8 13.1,1.5 9,1.5 Z m -1.5,2 3,0 0,3 -3,0 z m 0,5 3,0 0,6 -3,0 z"/>
+    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>
--- a/mail/themes/shared/mail/icons/chat-toolbar.svg
+++ b/mail/themes/shared/mail/icons/chat-toolbar.svg
@@ -12,54 +12,59 @@
     .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;
+        fill-opacity: 1;
+        stroke: none;
       }
     }
     @media (-moz-windows-default-theme) and (-moz-os-version: windows-win10) {
       .normal {
         fill: #4c4c4c;
-      fill-opacity: 1;
-        stroke: #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;
+        fill-opacity: 1;
         stroke: url(#win2);
       }
     }
     @media (-moz-mac-lion-theme) {
       .normal {
         fill: url(#osx1);
-      fill-opacity: 1;
+        fill-opacity: 1;
         stroke: url(#osx2);
       }
     }
     @media (-moz-mac-yosemite-theme) {
       .normal {
         fill: #4d4d4d;
-      fill-opacity: 1;
-        stroke: #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"
@@ -93,15 +98,18 @@
        y1="1"
        x2="8"
        y2="15"
        gradientUnits="userSpaceOnUse">
       <stop stop-color="#252525" stop-opacity="0.88" offset="0"/>
       <stop stop-color="#505050" stop-opacity="0.68" offset="1"/>
     </linearGradient>
   </defs>
-  <path id="add" class="normal" d="M 9,2 C 7.8,2 6.28,2.4 5.5,3 4.5,3.7 4.6,6.1 4.5,6.5 4.3,6.8 4,7.1 4,7.5 c 0,0.3 0.4,0.6 0.5,1 0.2,1.5 1,1.8 3,3 l 0,1 c -2.4,0.1 -5.7,-0.6 -6,3 l 15,0 c -0.3,-3.5 -3.6,-3 -6,-3 l 0,-1 c 2,-1.1 2.7,-1.6 3,-3 C 13.5,8.2 14,7.9 14,7.5 14,7.1 13.6,6.8 13.5,6.5 13.3,6.1 13.4,3.7 12.5,3 11.7,2.4 10,2 9,2 Z m -1.5,1.5 3,0 0,2 2,0 0,3 -2,0 0,2 -3,0 0,-2 -2,0 0,-3 2,0 z"/>
+  <path id="add" 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 -1.5,2 3,0 0,3 -3,0 z m 0,5 3,0 0,6 -3,0 z"/>
-  <path id="accounts-inverted" class="inverted" d="M 9,1.5 C 4.8,1.5 1.5,4.8 1.5,9 c 0,4.1 3.3,7.5 7.5,7.5 4.1,0 7.5,-3.3 7.5,-7.5 C 16.5,4.8 13.1,1.5 9,1.5 Z m -1.5,2 3,0 0,3 -3,0 z m 0,5 3,0 0,6 -3,0 z"/>
+  <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/compose-toolbar.svg
+++ b/mail/themes/shared/mail/icons/compose-toolbar.svg
@@ -12,54 +12,61 @@
     .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;
+        fill-opacity: 1;
         stroke: #797c80;
+        stroke-width: 0;
       }
     }
     @media (-moz-windows-default-theme) and (-moz-os-version: windows-win10) {
       .normal {
         fill: #4c4c4c;
-      fill-opacity: 1;
+        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;
+        fill-opacity: 1;
         stroke: url(#win2);
       }
     }
     @media (-moz-mac-lion-theme) {
       .normal {
         fill: url(#osx1);
-      fill-opacity: 1;
+        fill-opacity: 1;
         stroke: url(#osx2);
       }
     }
     @media (-moz-mac-yosemite-theme) {
       .normal {
         fill: #4d4d4d;
-      fill-opacity: 1;
-        stroke: #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"
@@ -94,32 +101,42 @@
        x2="8"
        y2="15"
        gradientUnits="userSpaceOnUse">
       <stop stop-color="#252525" stop-opacity="0.88" offset="0"/>
       <stop stop-color="#505050" stop-opacity="0.68" offset="1"/>
     </linearGradient>
   </defs>
   <path id="send" class="normal" d="m 1.5,1.5 0,3 2,0 0,3 -2,0 0,3 2,0 0,3 -2,0 0,3 3,0 0,-2 3,0 0,2 3,0 0,-2 3,0 0,2 3,0 0,-3 -2,0 0,-3 2,0 0,-3 -2,0 0,-3 2,0 0,-3 -3,0 0,2 -3,0 0,-2 -3,0 0,2 -3,0 0,-2 z m 4,4 7,0 0,7 -7,0 z m 2,2 3,0 0,3 -3,0 z"/>
+  <path id="send-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 -2.75,0 -5.5,0.75 -5.5,5 l 0,1 -1,0 0,7 13,0 0,-7 -1,0 0,-1 c 0,-4 -3,-5 -5.5,-5 z m 0,3 c 2.5,0 2.5,1 2.5,3 l -5,0 c 0,-2 0,-3 2.5,-3 z"/>
+  <path id="security" 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 4.5,11 c 1.1,0 2,1 2,2 0,1 -0.8,2 -2,2 -1.1,0 -2,-1 -2,-2 0,-1 0.8,-2 2,-2 z M 7.3,10.25 2.8,4.5 C 2,3.6 2.2,2.6 2.8,2 L 9,8.5 15.1,2 c 0.6,0.6 0.7,1.6 0.1,2.5 L 10.5,10.25 11.2,11
-    C 11.6,10.6 12.3,10 13.5,10 c 1.8,0 3,1.3 3,3 0,1.5 -1.6,3 -3,3 -1.9,0 -3,-2.3 -4.5,-4 -1.4,1.5 -2.5,4 -4.5,4 -1.4,0 -3,-1.3 -3,-3 0,-1.7 1.5,-3 3,-3 1.1,0 1.6,0.6 2,1 z M 13.5,11 c -1.3,0 -2,1 -2,2 0,1 1,2 2,2 1,0 2,-1 2,-2 0,-1 -0.7,-2 -2,-2 z"/>
+  <path id="cut" 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 4,6 2,0 0,2 -2,0 z m -4,0 3,0 0,2 -3,0 z m 0,5.4 0,1.6 m -2.5,0 14,0 m -2.5,0 0,-1.6"/>
-  <path id="print-inverted" class="inverted" d="m 3.5,2.5 0,5 -0.5,0 c -0.8,0 -1.5,1.1 -1.5,2 l 0,2 c 0,0.8 0.4,2 2.5,2 l -1.5,0 0,2 13,0 0,-2 -1.5,0 c 2,0 2.5,-1.1 2.5,-2 l 0,-2 c 0,-0.8 -0.6,-2 -1.5,-2 l -0.5,0 0,-5 z m 2,2 7,0 0,3 -7,0 z m -2,5 3,0 0,1 -3,0 z m 5,0 2,0 0,1 -2,0 z m -3,3 7,0 0,1 -7,0 z"/>
+  <path id="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>
--- a/mail/themes/shared/mail/icons/mail-toolbar.svg
+++ b/mail/themes/shared/mail/icons/mail-toolbar.svg
@@ -12,47 +12,47 @@
     .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;
+        fill-opacity: 1;
+        stroke: none;
       }
     }
     @media (-moz-windows-default-theme) and (-moz-os-version: windows-win10) {
       .normal {
         fill: #4c4c4c;
-      fill-opacity: 1;
-        stroke: #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;
+        fill-opacity: 1;
         stroke: url(#win2);
       }
     }
     @media (-moz-mac-lion-theme) {
       .normal {
         fill: url(#osx1);
-      fill-opacity: 1;
+        fill-opacity: 1;
         stroke: url(#osx2);
       }
     }
     @media (-moz-mac-yosemite-theme) {
       .normal {
         fill: #4d4d4d;
-      fill-opacity: 1;
-        stroke: #4d4d4d;
+        fill-opacity: 1;
+        stroke: none;
       }
     }
     .inverted {
       fill: #fff;
       fill-opacity: 1;
       stroke: #111922;
     }
     .unread {
@@ -99,59 +99,83 @@
        x2="8"
        y2="15"
        gradientUnits="userSpaceOnUse">
       <stop stop-color="#252525" stop-opacity="0.88" offset="0"/>
       <stop stop-color="#505050" stop-opacity="0.68" offset="1"/>
     </linearGradient>
   </defs>
   <path id="getmsg" class="normal" d="m 1.5,10.5 2,0 0,3 11,0 0,-3 2,0 0,5 -15,0 z m 6,-8 3,0 0,4 3,0 -4.5,4 -4.5,-4 3,0 z"/>
+  <path id="getmsg-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 4,6 2,0 0,2 -2,0 z m -4,0 3,0 0,2 -3,0 z m 0,5.4 0,1.6 m -2.5,0 14,0 m -2.5,0 0,-1.6"/>
-  <path id="print-inverted" class="inverted" d="m 3.5,2.5 0,5 -0.5,0 c -0.8,0 -1.5,1.1 -1.5,2 l 0,2 c 0,0.8 0.4,2 2.5,2 l -1.5,0 0,2 13,0 0,-2 -1.5,0 c 2,0 2.5,-1.1 2.5,-2 l 0,-2 c 0,-0.8 -0.6,-2 -1.5,-2 l -0.5,0 0,-5 z m 2,2 7,0 0,3 -7,0 z m -2,5 3,0 0,1 -3,0 z m 5,0 2,0 0,1 -2,0 z m -3,3 7,0 0,1 -7,0 z"/>
+  <path id="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 2.5,4 13,0 -4.5,5 0,5 -4,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 3,2.5 c -2,0 -2,3 0,3 l 12,0 c 2,0 2,-3 0,-3 Z M 3,7.5 c -2,0 -2,3 0,3 L 15,10.5 c 2,0 2,-3 0,-3 Z M 3,12.5 c -2,0 -2,3 0,3 l 12,0 c 2,0 2,-3 0,-3 Z"/>
+  <path id="appButton" 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"/>
 </svg>
--- a/mail/themes/windows/mail/addrbook/addressbook.css
+++ b/mail/themes/windows/mail/addrbook/addressbook.css
@@ -764,9 +764,29 @@ toolbox[labelalign="end"] > toolbar[mode
     text-shadow: none;
     transition: none;
   }
 
   .toolbarbutton-1[checked=true]:not(:active):hover {
     background-color: rgba(90%, 90%, 90%, .4);
     transition: background-color .4s;
   }
+
+  #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
@@ -562,9 +562,26 @@
                                       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");
+  }
+
+  .tabmail-tab[type="chat"],
+  .alltabs-item[type="chat"] {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#chat-flat");
+  }
 }
--- a/mail/themes/windows/mail/compose/messengercompose.css
+++ b/mail/themes/windows/mail/compose/messengercompose.css
@@ -1803,16 +1803,57 @@ toolbox[labelalign="end"] > toolbar[mode
     transition: none;
   }
 
   .toolbarbutton-1[checked=true]:not(:active):hover {
     background-color: rgba(90%, 90%, 90%, .4);
     transition: background-color .4s;
   }
 
+  #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;
     -moz-margin-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/messageHeader.css
+++ b/mail/themes/windows/mail/messageHeader.css
@@ -812,9 +812,45 @@ mail-emailaddress[selected="true"] .emai
   .toolbarbutton-1:not([disabled=true]):-moz-any(:hover,[open]) >
   .toolbarbutton-menubutton-dropmarker,
   .toolbarbutton-1:not([disabled=true]):not([checked=true]):not([open]):not(:active):hover,
   .toolbarbutton-1:not([buttonover]):not([open]):not(:active):hover >
   .toolbarbutton-menubutton-dropmarker:not([disabled]) {
     background-color: hsla(210, 4%, 10%, .1);
     border-color: hsla(210, 4%, 10%, .2);
   }
+
+  .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");
+  }
+
+  #attachmentSaveAllSingle,
+  #attachmentSaveAllMultiple {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#file-flat");
+  }
 }
--- a/mail/themes/windows/mail/primaryToolbar.css
+++ b/mail/themes/windows/mail/primaryToolbar.css
@@ -2010,9 +2010,105 @@ toolbar[mode="text"] .button-appmenu .to
     text-shadow: none;
     transition: none;
   }
 
   .toolbarbutton-1[checked=true]:not(:active):hover {
     background-color: rgba(90%, 90%, 90%, .4);
     transition: background-color .4s;
   }
+
+  #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-appmenu {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#appButton-flat");
+  }
 }