Bug 1192497 - Get rid of messageHeader-aero.css. r=Fallen
authorRichard Marti <richard.marti@gmail.com>
Sat, 08 Aug 2015 09:37:30 +0200
changeset 23074 863ae7f4ea843e3746ac0041a5c3008f27b5a7fd
parent 23073 210a91d661ea28d947dd2e0881a85d071861f270
child 23075 18dc81215fb9622fed2d5e4e485eaa839f13fd02
push id1474
push usermbanner@mozilla.com
push dateMon, 21 Sep 2015 17:20:48 +0000
treeherdercomm-beta@3094bab4c31f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersFallen
bugs1192497
Bug 1192497 - Get rid of messageHeader-aero.css. r=Fallen
mail/themes/windows/jar.mn
mail/themes/windows/mail/messageHeader-aero.css
mail/themes/windows/mail/messageHeader.css
--- a/mail/themes/windows/jar.mn
+++ b/mail/themes/windows/jar.mn
@@ -316,17 +316,17 @@ classic.jar:
 * skin/classic/aero/messenger/imRichlistbox.css                    (../../components/im/themes/imRichlistbox.css)
   skin/classic/aero/messenger/founder.png                          (../../components/im/themes/founder.png)
   skin/classic/aero/messenger/operator.png                         (../../components/im/themes/operator.png)
   skin/classic/aero/messenger/half-operator.png                    (../../components/im/themes/half-operator.png)
   skin/classic/aero/messenger/voice.png                            (../../components/im/themes/voice.png)
   skin/classic/aero/messenger/browserRequest.css                   (mail/browserRequest.css)
   skin/classic/aero/messenger/section_collapsed.png                (mail/section_collapsed.png)
   skin/classic/aero/messenger/section_expanded.png                 (mail/section_expanded.png)
-  skin/classic/aero/messenger/messageHeader.css                    (mail/messageHeader-aero.css)
+  skin/classic/aero/messenger/messageHeader.css                    (mail/messageHeader.css)
   skin/classic/aero/messenger/messageBody.css                      (mail/messageBody.css)
   skin/classic/aero/messenger/messageQuotes.css                    (mail/messageQuotes.css)
   skin/classic/aero/messenger/messenger.css                        (mail/messenger.css)
 * skin/classic/aero/messenger/messengerLWTheme.css                 (mail/messengerLWTheme.css)
   skin/classic/aero/messenger/attachmentList.css                   (mail/attachmentList.css)
   skin/classic/aero/messenger/imageFilters.svg                     (mail/imageFilters.svg)
   skin/classic/aero/messenger/mailWindow1.css                      (mail/mailWindow1.css)
   skin/classic/aero/messenger/tagColors.css                        (mail/tagColors.css)
deleted file mode 100644
--- a/mail/themes/windows/mail/messageHeader-aero.css
+++ /dev/null
@@ -1,601 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/* ===== messageHeader.css ==============================================
- == Styles for the header toolbars of a mail message.
- ======================================================================= */
-
-@import url("chrome://messenger/skin/shared/messageHeader.css");
-
-/* ::::: for the entire area ::::: */
-.main-header-area {
-  color: WindowText;
-  background-color: ButtonFace;
-  border-bottom: 1px solid #A9B7C9; /* The same color as the splitters */
-  padding: 0.4ex;
-}
-
-/* :::::  message in a tab ::::: */
-
-@media not all and (-moz-windows-default-theme) {
-  #displayDeck[collapsed="true"] + splitter + #messagepaneboxwrapper
-  .main-header-area {
-    background-image: linear-gradient(rgba(255, 255, 255, .5),
-                                      rgba(255, 255, 255, .5) 100%);
-  }
-}
-
-@media (-moz-windows-default-theme) and (-moz-os-version: windows-vista),
-       (-moz-windows-default-theme) and (-moz-os-version: windows-win7) {
-  #displayDeck[collapsed="true"] + splitter + #messagepaneboxwrapper
-  .main-header-area {
-    background-image: none;
-    background-color: rgb(233, 239, 245);
-  }
-}
-
-/* ::::: msg header toolbars ::::: */
-#expandedHeaderView[show_header_mode="all"] {
-  overflow-y: auto;
-  overflow-x: hidden;
-  max-height: 14em;
-}
-
-/* ::::: msg header buttons ::::: */
-
-#expandedBoxSpacer {
-  display: block;
-  height: 6px;
-}
-
-/* ::::: expanded header pane ::::: */
-
-/* toolbars are optimized to look like OS-provided widgets; override this */
-.inline-toolbox {
-  border-top-width: 0;
-  -moz-appearance: none;
-  background-color: transparent;
-}
-
-/* ::::: attachment view ::::: */
-
-#attachmentList {
-  -moz-appearance: none;
-  border-top: 1px solid #A9B7C9; /* The same color as the splitters */
-  background-color: -moz-Field;
-  color: -moz-FieldText;
-}
-
-#attachmentToggle {
-  /* Override button appearance */
-  -moz-appearance: none;
-  min-width: 0;
-  margin: 0;
-  border: 0;
-  background-color: transparent;
-  -moz-user-focus: normal;
-
-  list-style-image: url("chrome://global/skin/tree/twisty-clsd.png");
-}
-
-#attachmentToggle[checked="true"] {
-  list-style-image: url("chrome://global/skin/tree/twisty-open.png");
-}
-
-#attachmentToggle:hover {
-  list-style-image: url("chrome://global/skin/tree/twisty-clsd-hover.png");
-}
-
-#attachmentToggle[checked="true"]:hover {
-  list-style-image: url("chrome://global/skin/tree/twisty-open-hover.png");
-}
-
-#attachmentToggle:-moz-locale-dir(rtl) {
-  list-style-image: url("chrome://global/skin/tree/twisty-clsd-rtl.png");
-}
-
-#attachmentToggle[checked="true"]:-moz-locale-dir(rtl) {
-  list-style-image: url("chrome://global/skin/tree/twisty-open-rtl.png");
-}
-
-#attachmentToggle:hover:-moz-locale-dir(rtl) {
-  list-style-image: url("chrome://global/skin/tree/twisty-clsd-hover-rtl.png");
-}
-
-#attachmentToggle[checked="true"]:hover:-moz-locale-dir(rtl) {
-  list-style-image: url("chrome://global/skin/tree/twisty-open-hover-rtl.png");
-}
-
-#attachmentIcon {
-  list-style-image: url("chrome://messenger/skin/icons/attachment-col.png");
-  -moz-margin-start: 5px;
-}
-
-#attachmentName:hover,
-#attachmentName[selected="true"] {
-  cursor: pointer;
-  color: HighlightText;
-  background-color: Highlight;
-}
-
-#attachmentSize {
-  margin: 0;
-  -moz-margin-start: 8px;
-  color: #888a85; /* the same color as .headerName */
-}
-
-#attachmentView {
-  border-top: 1px solid #A9B7C9; /* The same color as the splitters */
-}
-
-#attachmentBar {
-  color: -moz-dialogtext;
-  background-color: -moz-Dialog;
-}
-
-@media (-moz-windows-default-theme) and (-moz-os-version: windows-vista),
-       (-moz-windows-default-theme) and (-moz-os-version: windows-win7) {
-  #attachmentBar {
-    background-color: #eef3fa;
-  }
-
-  findbar {
-    background-color: #eef3fa;
-  }
-}
-
-.findbar-container {
-  padding-top: 2px;
-  padding-bottom: 2px;
-}
-
-/* ::::: msg header captions ::::: */
-
-#msgHeaderView {
-  padding: 0 !important;
-  margin: 0 !important;
-}
-
-@media (-moz-windows-default-theme) and (-moz-windows-compositor) {
-  #msgHeaderView {
-    background: #f8f8f8;
-  }
-}
-
-.dateLabel {
-  line-height: 1.5em;
-  margin: 0;
-  padding: .1em 0;
-  -moz-padding-end: 6px;
-  -moz-user-select: text;
-  -moz-user-focus: normal;
-  cursor: text;
-}
-
-.toolbarbutton-1.msgHeaderView-button {
-  min-width: 1em;
-  -moz-margin-start: 2px !important;
-  -moz-margin-end: 2px !important;
-  margin-top: 1px;
-  margin-bottom: 2px;
-  vertical-align: middle;
-  /* important required to override primaryToolbar.css rules */
-  -moz-padding-start: 3px !important;
-  -moz-padding-end: 3px !important;
-}
-
-@media not all and (-moz-windows-default-theme) {
-  .toolbarbutton-1.msgHeaderView-button:not([type="menu-button"]),
-  .toolbarbutton-1.msgHeaderView-button > .toolbarbutton-menubutton-button,
-  .toolbarbutton-1.msgHeaderView-button > .toolbarbutton-menubutton-dropmarker {
-    -moz-appearance: button;
-    padding-top: 1px !important;
-    padding-bottom: 1px !important;
-  }
-
-  .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
-    -moz-padding-start: 3px !important;
-    -moz-padding-end: 3px !important;
-  }
-}
-
-@media (-moz-windows-default-theme) {
-  toolbar[mode="icons"] .msgHeaderView-button.toolbarbutton-menubutton-button,
-  toolbar[mode="icons"] .msgHeaderView-button:not([type="menu-button"]) {
-    -moz-padding-start: 3px !important;
-    -moz-padding-end: 3px !important;
-  }
-}
-
-@media (-moz-windows-default-theme) and (-moz-os-version: windows-vista),
-       (-moz-windows-default-theme) and (-moz-os-version: windows-win7) {
-  .toolbarbutton-1.msgHeaderView-button,
-  .toolbarbutton-1.msgHeaderView-button > .toolbarbutton-menubutton-button,
-  .toolbarbutton-1.msgHeaderView-button > .toolbarbutton-menubutton-dropmarker {
-    background-image: linear-gradient(hsla(0, 0%, 100%, .6),
-                      hsla(0, 0%, 100%, .1));
-    background-color: hsla(210, 32%, 93%, .2);
-    border-color: hsla(210, 54%, 20%, .2) hsla(210, 54%, 20%, .25)
-                  hsla(210, 54%, 20%, .3);
-    box-shadow: 0 1px hsla(0, 0%, 100%, .3) inset,
-                0 1px hsla(210, 54%, 20%, .03),
-                0 0 2px hsla(210, 54%, 20%, .1);
-  }
-
-  .msgHeaderView-button:not([type="menu-button"]):not([disabled="true"]):not([checked="true"]):not([open="true"]):not(:active):hover {
-    border-color: hsla(210, 54%, 20%, .4) hsla(210, 54%, 20%, .45)
-                  hsla(210, 54%, 20%, .5);
-    background-color: hsla(210, 48%, 96%, .75);
-    box-shadow: 0 0 1px hsla(210, 54%, 20%, .1),
-                0 0 2px hsla(210, 54%, 20%, .1);
-  }
-}
-
-@media (-moz-windows-default-theme) and (-moz-os-version: windows-win8),
-       (-moz-windows-default-theme) and (-moz-os-version: windows-win10) {
-  .toolbarbutton-1.msgHeaderView-button,
-  .toolbarbutton-1.msgHeaderView-button > .toolbarbutton-menubutton-button,
-  .toolbarbutton-1.msgHeaderView-button > .toolbarbutton-menubutton-dropmarker {
-    background-color: hsla(210, 4%, 10%, .08);
-    border-color: hsla(210, 4%, 10%, .1);
-  }
-
-  .toolbarbutton-1:not([disabled=true]):-moz-any(:hover,[open]) >
-  .toolbarbutton-menubutton-button,
-  .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);
-  }
-}
-
-.msgHeaderView-button > .toolbarbutton-icon,
-.msgHeaderView-button[type="menu-button"] > .toolbarbutton-menubutton-button
-> .toolbarbutton-icon {
- /* Needed to make the buttons w/o icons the same height as those with icons */
-  min-height: 16px;
-}
-
-.msgHeaderView-button[type="menu-button"] {
-  /* Need to override both rules from messenger.css and msgHeaderView-button */
-  padding: 0 !important;
-}
-
-.msgHeaderView-button[type="menu-button"] > .toolbarbutton-menubutton-button {
-  min-width: 1em;
-  margin: 0px;
-  /* important required to override primaryToolbar.css rules */
-  -moz-padding-start: 3px !important;
-  -moz-padding-end: 3px !important;
-}
-
-/* toolbar[mode="text"] is necessary so that we end up with more specificity
-*  than the !important rule in toolkit's toolbar.css.
-*/
-toolbar[mode="text"] .msgHeaderView-button .toolbarbutton-text,
-toolbar[mode="text"] toolbarpaletteitem
-.msgHeaderView-button .toolbarbutton-text {
-  margin: 0 !important;
-  padding-top: 1px !important;
-  padding-bottom: 0px !important;
-  -moz-padding-start: 0px !important;
-  -moz-padding-end: 0px !important;
-}
-
-toolbar[iconsize="small"] .msgHeaderView-button .toolbarbutton-text {
-  margin-bottom: 1px !important;
-}
-
-toolbar[mode="text"] .msgHeaderView-button .toolbarbutton-text {
-  padding-top: 0 !important;
-}
-
-/* For unclear reasons, toolkit's toolbarbutton.css forces a margin of 0,
-*  jamming the image up against the text, so we need this !important
-*  rule to override that.
-*
-*  The second selector is a descendent selector rather than a child selector
-*  so that we effect both buttons and menubuttons.
-*/
-
-toolbox[labelalign="end"] toolbar[mode="full"]
-toolbarpaletteitem .msgHeaderView-button .toolbarbutton-text,
-toolbox[labelalign="end"] toolbar[mode="full"]
-.msgHeaderView-button .toolbarbutton-text {
-  -moz-margin-start: 2px !important;
-}
-
-.hdrReplyToSenderButton,
-.hdrDummyReplyButton,
-.hdrReplyButton {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.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");
-}
-
-.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");
-}
-
-.hdrTrashButton {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#delete");
-}
-
-.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");
-}
-
-toolbar[brighttext] .hdrReplyToSenderButton,
-toolbar[brighttext] .hdrDummyReplyButton,
-toolbar[brighttext] .hdrReplyButton {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#reply-inverted");
-}
-
-toolbar[brighttext] .hdrReplyAllButton {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replyall-inverted");
-}
-
-toolbar[brighttext] .hdrReplyListButton,
-toolbar[brighttext] .hdrFollowupButton {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replylist-inverted");
-}
-
-toolbar[brighttext] .hdrForwardButton {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#forward-inverted");
-}
-
-toolbar[brighttext] .hdrArchiveButton {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#archive-inverted");
-}
-
-toolbar[brighttext] .hdrJunkButton {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#junk-inverted");
-}
-
-toolbar[brighttext] .hdrTrashButton {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#delete-inverted");
-}
-
-toolbar[brighttext] .hdrTagButton {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#tag-inverted");
-}
-
-toolbar[brighttext] #attachmentSaveAllSingle,
-toolbar[brighttext] #attachmentSaveAllMultiple {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#file-inverted");
-}
-
-#otherActionsButton > hbox > vbox > .toolbarbutton-icon {
-  display: none;
-}
-
-#otherActionsButton > hbox > .toolbarbutton-menu-dropmarker {
-  -moz-padding-end: 3px;
-}
-
-/* show a icon in customize window */
-#CustomizeToolbarWindow toolbarpaletteitem > #otherActionsButton >
-  .toolbarbutton-icon {
-  display: -moz-box;
-  width: 9px;
-  padding-top: 4px;
-  padding-bottom: 4px;
-  list-style-image: url("chrome://messenger/skin/icons/toolbarbutton-arrow.png");
-}
-
-toolbar[brighttext] .toolbarbutton-1 .toolbarbutton-menu-dropmarker,
-toolbar[brighttext] .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
-  list-style-image: url("chrome://messenger/skin/icons/toolbarbutton-arrow-inverted.png");
-}
-
-.inline-toolbar toolbarpaletteitem toolbarseparator,
-.inline-toolbar toolbarseparator {
-  height: 24px;
-  margin-top: 1px;
-  -moz-margin-start: 1px; /* make it symetrical */
-}
-
-.inline-toolbar toolbarspacer {
-  height: 20px;
-}
-
-.inline-toolbar {
-  -moz-appearance: none;
-  -moz-box-pack: end;
-  border-bottom-width: 0 !important;
-}
-
-window[inlinetoolbox] #newtoolbar {
-  display: none;
-}
-
-.inline-toolbox[doCustomization] .inline-toolbar {
-  min-width: 100px;
-  min-height: 10px;
-}
-
-.msgHeaderView-button,
-toolbarpaletteitem .msgHeaderView-button {
-  -moz-appearance: none;
-}
-
-.msgHeaderView-button[type="menu-button"] {
-  padding-top: 1px;
-}
-
-.msgHeaderView-button[type="menu-button"] > .button-menubutton-button:hover {
-  border-right-color: ButtonShadow;
-}
-
-.headerName {
-  color: #888a85; /* lower contrast */
-  text-align: right;
-  background-color: transparent;
-  padding: 0px;
-  margin-top: 0;
-  -moz-margin-end: 3px;
-}
-
-.headerValueBox {
-  overflow:visible;
-  margin-bottom: 0 !important;
-  padding-bottom: 0 !important;
-}
-
-.headerValue {
-  min-width: 50px;
-  white-space: normal;
-  color: WindowText;
-  line-height: 1.5em;
-  -moz-appearance: none;
-  padding: .1em 0px;
-  margin: 0px;
-  margin-bottom: 3px !important;
-  -moz-margin-start: 3px;
-  border-width: 0px;
-  background-color: transparent;
-}
-
-.headerValueUrl {
-  cursor: pointer;
-  color: -moz-hyperlinktext;
-  text-decoration: underline;
-}
-
-.headerValueUrl:hover {
-  color: -moz-activehyperlinktext;
-}
-
-.moreIndicator {
-  font-weight: bold;
-}
-
-/* ::::: msg header message ids ::::: */
-
-.messageIdDisplayButton {
-  cursor: pointer;
-  color: -moz-hyperlinktext;
-  text-decoration: underline;
-  margin: 0;
-  background-color: transparent;
-}
-
-.messageIdDisplayButton:hover {
-  color: -moz-activehyperlinktext;
-}
-
-.messageIdDisplayImage {
-  -moz-padding-start: 2px;
-  -moz-box-pack: end;
-}
-
-
-/* ::::: msg header email addresses ::::: */
-
-.emailDisplayButton {
-  margin: 0;
-  -moz-padding-start: 2px !important;
-  -moz-padding-end: 2px !important;
-  background-color: transparent;
-  border-radius: 2px;
-  border: 1px dotted transparent;
-}
-
-.emailDisplayButton:hover {
-  cursor: pointer;
-  color: HighlightText;
-  background-color: Highlight;
-}
-
-mail-emailaddress[selected="true"] .emailDisplayButton{
-  /* when an email address context menu is selected,
-   make sure that the email bubble stays displayed, and
-   tweak the bottom to blend in more w/ the menu */
-  cursor: pointer;
-  border-radius: 3px;
-  color: HighlightText;
-  background-color: Highlight;
-  border-bottom-left-radius: 0;
-  border-bottom-right-radius: 0;
-}
-
-.emailSeparator {
-  /* this is for the comma in between email addresses/newsgroups */
-  -moz-margin-start: -3px; /* squeeze it inside the bubble, by the star */
-}
-
-.emailDisplayButton:focus {
-  border: 1px dotted Highlight;
-}
-
-.emailStar {
-  max-width: 1em;
-  max-height: 1em;
-  -moz-appearance: none;
-  -moz-box-orient: vertical;
-  padding: 0px;
-  -moz-margin-start: -2px !important;
-  /*margin: 0px 2px;*/
-  list-style-image: url("chrome://messenger/skin/starContact.png");
-  -moz-image-region: rect(0px, 16px, 16px, 0px);
-}
-
-.emailStar:hover {
-  -moz-image-region:rect(0px 32px 16px 16px);
-}
-
-.emailStar:hover:active {
-  -moz-image-region:rect(0px 48px 16px 32px);
-}
-
-.emailStar[hascard="true"] {
-  list-style-image: url("chrome://messenger/skin/contactStarred.png");
-}
-
-.emailPresence {
-  padding: 0px;
-  -moz-margin-start: -2px !important;
-  -moz-image-region: rect(6px, 16px, 16px, 6px);
-}
-
-.emailPopup {
-  font-size: inherit;
-  max-height: 7px; /* the height of the image */
-  margin: 0.2em 2px 0px; /* 0.2em just to move it off the top of the text */
-  list-style-image: url("chrome://messenger/skin/icons/arrow-dn-grey.png");
-}
-
-/* ::::: view expand and collapse twisties  ::::: */
-
-.expandHeaderViewButton {
-  list-style-image: url("chrome://global/skin/tree/twisty-open.png");
-}
-
-#header-view-toolbox {
-  float: right;
-  padding-top: 1px;
-}
--- a/mail/themes/windows/mail/messageHeader.css
+++ b/mail/themes/windows/mail/messageHeader.css
@@ -7,68 +7,56 @@
   ======================================================================= */
 
 @import url("chrome://messenger/skin/shared/messageHeader.css");
 
 /* ::::: for the entire area ::::: */
 .main-header-area {
   color: WindowText;
   background-color: ButtonFace;
-  border-bottom: 1px solid ThreeDDarkShadow;
   padding: 0.4ex;
 }
 
-/* :::::  message in a tab ::::: */
-
-#displayDeck[collapsed="true"] + splitter + #messagepaneboxwrapper
-.main-header-area {
-  background-image: linear-gradient(rgba(255, 255, 255, .5),
-                                    rgba(255, 255, 255, .5) 100%);
-}
-
 /* ::::: msg header toolbars ::::: */
 
 #expandedHeaderView[show_header_mode="all"] {
   overflow-y: auto;
   overflow-x: hidden;
   max-height: 14em;
 }
 
 #expandedBoxSpacer {
   display: block;
-  height: 10px;
 }
 
 /* ::::: expanded header pane ::::: */
 
 /* toolbars are optimized to look like OS-provided widgets; override this */
 .inline-toolbox {
   border-top-width: 0;
   -moz-appearance: none;
   background-color: transparent;
 }
 
 /* ::::: attachment view ::::: */
 
 #attachmentList {
   -moz-appearance: none;
-  border-top: 1px solid ThreeDDarkShadow;
   background-color: -moz-Field;
   color: -moz-FieldText;
 }
 
 #attachmentToggle {
   /* Override button appearance */
   -moz-appearance: none;
   min-width: 0;
   margin: 0;
   border: 0;
   background-color: transparent;
   -moz-user-focus: normal;
-
   list-style-image: url("chrome://global/skin/tree/twisty-clsd.png");
 }
 
 #attachmentToggle[checked="true"] {
   list-style-image: url("chrome://global/skin/tree/twisty-open.png");
 }
 
 #attachmentIcon {
@@ -81,31 +69,16 @@
   cursor: pointer;
   color: HighlightText;
   background-color: Highlight;
 }
 
 #attachmentSize {
   margin: 0;
   -moz-margin-start: 8px;
-  opacity: 0.5; /* lower contrast */
-}
-
-#attachment-view-toolbox {
-  background-color: transparent;
-}
-
-#attachmentSaveAllSingle,
-#attachmentSaveAllMultiple {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
-  -moz-image-region: rect(0px 192px 16px 176px);
-}
-
-#attachment-splitter[collapsed="true"] + #attachmentView {
-  border-top: 1px solid ThreeDShadow;
 }
 
 #attachmentBar {
   color: -moz-dialogtext;
   background-color: -moz-Dialog;
 }
 
 .findbar-container {
@@ -119,204 +92,52 @@
   padding: 0 !important;
   margin: 0 !important;
 }
 
 .dateLabel {
   line-height: 1.5em;
   margin: 0;
   padding: .1em 0;
-  -moz-padding-end: 8px;
   -moz-user-select: text;
   -moz-user-focus: normal;
   cursor: text;
 }
 
-.msgHeaderView-button {
-  -moz-appearance: button;
-  min-height: 1ex;
-  -moz-margin-start: 2px;
-  -moz-margin-end: 2px;
-  margin-top: 1px;
-  margin-bottom: 2px;
-  vertical-align: middle;
-  /* important required to override messenger.css rules */
-  min-width: 1em !important;
-  -moz-padding-start: 4px !important;
-  -moz-padding-end: 3px !important;
-  padding-top: 3px !important;
-  padding-bottom: 2px !important;
-  list-style-image: none;
-}
-
-.msgHeaderView-button > .toolbarbutton-icon,
-.msgHeaderView-button[type="menu-button"] > .toolbarbutton-menubutton-button
-> .toolbarbutton-icon {
-  /* Needed to make the buttons w/o icons the same height as those with icons */
-  min-height: 16px;
-}
-
-.msgHeaderView-button[type="menu-button"] {
-  /* important required to override -moz-appearance from msgHdrView-button */
-  -moz-appearance: dualbutton !important;
-  -moz-margin-end: 0 !important;
-
-  /* Need to override both rules from messenger.css and msgHeaderView-button */
-  padding: 0 !important;
-}
-
-.msgHeaderView-button[type="menu-button"] > .toolbarbutton-menubutton-button {
-  -moz-appearance: button;
-  min-width: 1em;
-  min-height: 1ex;
-  margin: 0px;
-  /* important required to override messenger.css rules */
-  -moz-padding-start: 4px !important;
-  -moz-padding-end: 3px !important;
-  padding-top: 3px !important;
-  padding-bottom: 2px !important;
-}
-
-/* toolbar[mode="text"] is necessary so that we end up with more specificity
- * than the !important rule in toolkit's toolbar.css.
- */
-toolbar[mode="text"] .msgHeaderView-button .toolbarbutton-text,
-toolbar[mode="text"] toolbarpaletteitem .msgHeaderView-button .toolbarbutton-text {
-  margin: 0 !important;
-  padding-top: 1px !important;
-  padding-bottom: 0px !important;
-  -moz-padding-start: 0px !important;
-  -moz-padding-end: 0px !important;
-}
-
-/* For unclear reasons, toolkit's toolbarbutton.css forces a margin of 0,
- * jamming the image up against the text, so we need this !important
- * rule to override that.
- *
- * The second selector is a descendent selector rather than a child selector
- * so that we effect both buttons and menubuttons.
- */
-
-toolbox[labelalign="end"] toolbar[mode="full"] toolbarpaletteitem .msgHeaderView-button .toolbarbutton-text,
-toolbox[labelalign="end"] toolbar[mode="full"] .msgHeaderView-button .toolbarbutton-text {
-  -moz-margin-start: 2px !important;
-}
-
-.hdrReplyToSenderButton,
-.hdrDummyReplyButton,
-.hdrReplyButton {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
-  -moz-image-region: rect(0px 64px 16px 48px);
-}
-
-.hdrReplyAllButton {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
-  -moz-image-region: rect(0px 80px 16px 64px);
-}
-
-.hdrReplyListButton,
-.hdrFollowupButton {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
-  -moz-image-region: rect(0px 112px 16px 96px);
-}
-
-.hdrForwardButton {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
-  -moz-image-region: rect(0px 96px 16px 80px);
-}
-
-.hdrArchiveButton {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
-  -moz-image-region: rect(0px 320px 16px 304px);
-}
-
-.hdrJunkButton {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
-  -moz-image-region: rect(0px 144px 16px 128px);
-}
-
-.hdrTrashButton {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
-  -moz-image-region: rect(0px 128px 16px 112px);
-}
-
-.hdrTagButton {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
-  -moz-image-region: rect(0px 256px 16px 240px);
-}
-
-#otherActionsButton > .toolbarbutton-icon {
-  display: none;
-}
-
-#otherActionsButton > hbox > .toolbarbutton-menu-dropmarker {
-  -moz-padding-end: 3px;
-  list-style-image: url(chrome://messenger/skin/icons/mainwindow-dropdown-arrow.png);
-  -moz-image-region: rect(0 13px 11px 0);
-}
-
-#header-view-toolbar[brighttext] #otherActionsButton > hbox >
-  .toolbarbutton-menu-dropmarker {
-  list-style-image: url(chrome://messenger/skin/icons/mainwindow-dropdown-arrow-inverted.png);
-}
-
-/* show a icon in customize window */
-#CustomizeToolbarWindow toolbarpaletteitem > #otherActionsButton >
-  .toolbarbutton-icon {
-  display: -moz-box;
-  width: 13px;
-  padding-top: 2px;
-  padding-bottom: 2px;
-  list-style-image: url(chrome://messenger/skin/icons/mainwindow-dropdown-arrow.png);
-  -moz-image-region: rect(0 13px 11px 0);
-}
-
-.inline-toolbar toolbarpaletteitem toolbarseparator,
-.inline-toolbar toolbarseparator {
-  height: 27px;
-  margin-top: 1px;
-  -moz-margin-start: 1px; /* make it symetrical */
-}
-
-.inline-toolbar toolbarspacer {
-  height: 23px;
-}
-
 .inline-toolbar {
   -moz-appearance: none;
   -moz-box-pack: end;
   border-bottom-width: 0 !important;
 }
 
+.inline-toolbar toolbarpaletteitem toolbarseparator,
+.inline-toolbar toolbarseparator {
+  margin-top: 1px;
+  -moz-margin-start: 1px; /* make it symetrical */
+}
+
 window[inlinetoolbox] #smallicons,
 window[inlinetoolbox] #newtoolbar {
   display: none;
 }
 
 .inline-toolbox[doCustomization] #attachment-view-toolbar {
   min-width: 100px;
   min-height: 10px;
 }
 
-.msgHeaderView-button,
-toolbarpaletteitem .msgHeaderView-button {
-  min-height: 27px;
-}
-
 .msgHeaderView-button[type="menu-button"] {
   padding-top: 1px;
 }
 
 .msgHeaderView-button[type="menu-button"] > .button-menubutton-button:hover {
   border-right-color: ButtonShadow;
 }
 
 .headerName {
-  color: windowtext;
-  opacity: 0.5; /* lower contrast */
   text-align: right;
   background-color: transparent;
   padding: 0px;
   margin-top: 0;
   -moz-margin-end: 3px;
 }
 
 .headerValueBox {
@@ -326,21 +147,21 @@ toolbarpaletteitem .msgHeaderView-button
 }
 
 .headerValue {
   min-width: 50px;
   white-space: normal;
   color: WindowText;
   line-height: 1.5em;
   -moz-appearance: none;
-  padding: .1em 0px;
-  margin: 0px;
+  padding: .1em 0;
+  margin: 0;
   margin-bottom: 3px !important;
   -moz-margin-start: 3px;
-  border-width: 0px;
+  border-width: 0;
   background-color: transparent;
 }
 
 .headerValueUrl {
   cursor: pointer;
   color: -moz-hyperlinktext;
   text-decoration: underline;
 }
@@ -411,50 +232,582 @@ mail-emailaddress[selected="true"] .emai
   border: 1px dotted Highlight;
 }
 
 .emailStar {
   max-width: 1em;
   max-height: 1em;
   -moz-appearance: none;
   -moz-box-orient: vertical;
-  padding: 0px;
+  padding: 0;
   -moz-margin-start: -2px !important;
-  /*margin: 0px 2px;*/
   list-style-image: url("chrome://messenger/skin/starContact.png");
-  -moz-image-region: rect(0px, 16px, 16px, 0px);
+  -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
 .emailStar:hover {
-  -moz-image-region:rect(0px 32px 16px 16px);
+  -moz-image-region:rect(0 32px 16px 16px);
 }
 
 .emailStar:hover:active {
-  -moz-image-region:rect(0px 48px 16px 32px);
+  -moz-image-region:rect(0 48px 16px 32px);
 }
 
 .emailStar[hascard="true"] {
   list-style-image: url("chrome://messenger/skin/contactStarred.png");
 }
 
 .emailPresence {
   padding: 0px;
   -moz-margin-start: -2px !important;
   -moz-image-region: rect(6px, 16px, 16px, 6px);
 }
 
 .emailPopup {
   font-size: inherit;
   max-height: 7px; /* the height of the image */
-  margin: 0.2em 2px 0px; /* 0.2em just to move it off the top of the text */
+  margin: 0.2em 2px 0; /* 0.2em just to move it off the top of the text */
   list-style-image: url("chrome://messenger/skin/icons/arrow-dn-grey.png");
 }
 
 /* ::::: view expand and collapse twisties  ::::: */
 
 .expandHeaderViewButton {
   list-style-image: url("chrome://global/skin/tree/twisty-open.png");
 }
 
 #header-view-toolbox {
   float: right;
-  padding-top: 3px;
+}
+
+@media (-moz-os-version: windows-xp) {
+  .main-header-area {
+    border-bottom: 1px solid ThreeDDarkShadow;
+  }
+
+  #attachmentList {
+    border-top: 1px solid ThreeDDarkShadow;
+  }
+
+  #displayDeck[collapsed="true"] + splitter + #messagepaneboxwrapper
+  .main-header-area {
+    background-image: linear-gradient(rgba(255, 255, 255, .5),
+                                      rgba(255, 255, 255, .5) 100%);
+  }
+
+  #expandedBoxSpacer {
+    height: 10px;
+  }
+
+  #attachmentSize {
+    opacity: 0.5; /* lower contrast */
+  }
+
+  #attachment-splitter[collapsed="true"] + #attachmentView {
+    border-top: 1px solid ThreeDShadow;
+  }
+
+  #attachment-view-toolbox {
+    background-color: transparent;
+  }
+
+  #attachmentSaveAllSingle,
+  #attachmentSaveAllMultiple {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
+    -moz-image-region: rect(0px 192px 16px 176px);
+  }
+
+  .dateLabel {
+    -moz-padding-end: 8px;
+  }
+
+  .msgHeaderView-button {
+    -moz-appearance: button;
+    min-height: 1ex;
+    -moz-margin-start: 2px;
+    -moz-margin-end: 2px;
+    margin-top: 1px;
+    margin-bottom: 2px;
+    vertical-align: middle;
+    /* important required to override messenger.css rules */
+    min-width: 1em !important;
+    -moz-padding-start: 4px !important;
+    -moz-padding-end: 3px !important;
+    padding-top: 3px !important;
+    padding-bottom: 2px !important;
+    list-style-image: none;
+  }
+
+  .msgHeaderView-button > .toolbarbutton-icon,
+  .msgHeaderView-button[type="menu-button"] > .toolbarbutton-menubutton-button
+  > .toolbarbutton-icon {
+    /* Needed to make the buttons w/o icons the same height as those with icons */
+    min-height: 16px;
+  }
+
+  .msgHeaderView-button[type="menu-button"] {
+    /* important required to override -moz-appearance from msgHdrView-button */
+    -moz-appearance: dualbutton !important;
+    -moz-margin-end: 0 !important;
+    /* Need to override both rules from messenger.css and msgHeaderView-button */
+    padding: 0 !important;
+  }
+
+  .msgHeaderView-button[type="menu-button"] > .toolbarbutton-menubutton-button {
+    -moz-appearance: button;
+    min-width: 1em;
+    min-height: 1ex;
+    margin: 0px;
+    /* important required to override messenger.css rules */
+    -moz-padding-start: 4px !important;
+    -moz-padding-end: 3px !important;
+    padding-top: 3px !important;
+    padding-bottom: 2px !important;
+  }
+
+  /* toolbar[mode="text"] is necessary so that we end up with more specificity
+   * than the !important rule in toolkit's toolbar.css.
+   */
+  toolbar[mode="text"] .msgHeaderView-button .toolbarbutton-text,
+  toolbar[mode="text"] toolbarpaletteitem .msgHeaderView-button .toolbarbutton-text {
+    margin: 0 !important;
+    padding-top: 1px !important;
+    padding-bottom: 0px !important;
+    -moz-padding-start: 0px !important;
+    -moz-padding-end: 0px !important;
+  }
+
+  /* For unclear reasons, toolkit's toolbarbutton.css forces a margin of 0,
+   * jamming the image up against the text, so we need this !important
+   * rule to override that.
+   *
+   * The second selector is a descendent selector rather than a child selector
+   * so that we effect both buttons and menubuttons.
+   */
+
+  toolbox[labelalign="end"] toolbar[mode="full"] toolbarpaletteitem .msgHeaderView-button .toolbarbutton-text,
+  toolbox[labelalign="end"] toolbar[mode="full"] .msgHeaderView-button .toolbarbutton-text {
+    -moz-margin-start: 2px !important;
+  }
+
+  .hdrReplyToSenderButton,
+  .hdrDummyReplyButton,
+  .hdrReplyButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
+    -moz-image-region: rect(0px 64px 16px 48px);
+  }
+
+  .hdrReplyAllButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
+    -moz-image-region: rect(0px 80px 16px 64px);
+  }
+
+  .hdrReplyListButton,
+  .hdrFollowupButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
+    -moz-image-region: rect(0px 112px 16px 96px);
+  }
+
+  .hdrForwardButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
+    -moz-image-region: rect(0px 96px 16px 80px);
+  }
+
+  .hdrArchiveButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
+    -moz-image-region: rect(0px 320px 16px 304px);
+  }
+
+  .hdrJunkButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
+    -moz-image-region: rect(0px 144px 16px 128px);
+  }
+
+  .hdrTrashButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
+    -moz-image-region: rect(0px 128px 16px 112px);
+  }
+
+  .hdrTagButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
+    -moz-image-region: rect(0px 256px 16px 240px);
+  }
+
+  #otherActionsButton > .toolbarbutton-icon {
+    display: none;
+  }
+
+  #otherActionsButton > hbox > .toolbarbutton-menu-dropmarker {
+    -moz-padding-end: 3px;
+    list-style-image: url(chrome://messenger/skin/icons/mainwindow-dropdown-arrow.png);
+    -moz-image-region: rect(0 13px 11px 0);
+  }
+
+  #header-view-toolbar[brighttext] #otherActionsButton > hbox >
+    .toolbarbutton-menu-dropmarker {
+    list-style-image: url(chrome://messenger/skin/icons/mainwindow-dropdown-arrow-inverted.png);
+  }
+
+  /* show a icon in customize window */
+  #CustomizeToolbarWindow toolbarpaletteitem > #otherActionsButton >
+    .toolbarbutton-icon {
+    display: -moz-box;
+    width: 13px;
+    padding-top: 2px;
+    padding-bottom: 2px;
+    list-style-image: url(chrome://messenger/skin/icons/mainwindow-dropdown-arrow.png);
+    -moz-image-region: rect(0 13px 11px 0);
+  }
+
+  .inline-toolbar toolbarpaletteitem toolbarseparator,
+  .inline-toolbar toolbarseparator {
+    height: 27px;
+  }
+
+  .inline-toolbar toolbarspacer {
+    height: 23px;
+  }
+
+  .msgHeaderView-button,
+  toolbarpaletteitem .msgHeaderView-button {
+    min-height: 27px;
+  }
+
+  .headerName {
+    color: windowtext;
+    opacity: 0.5; /* lower contrast */
+  }
+
+  #header-view-toolbox {
+    padding-top: 3px;
+  }
 }
+
+@media not all and (-moz-os-version: windows-xp) {
+  .main-header-area {
+    border-bottom: 1px solid #a9b7c9; /* The same color as the splitters */
+  }
+
+  #attachmentView,
+  #attachmentList {
+    border-top: 1px solid #a9b7c9; /* The same color as the splitters */
+  }
+
+  @media not all and (-moz-windows-default-theme) {
+    #displayDeck[collapsed="true"] + splitter + #messagepaneboxwrapper
+    .main-header-area {
+      background-image: linear-gradient(rgba(255, 255, 255, .5),
+                                        rgba(255, 255, 255, .5) 100%);
+    }
+  }
+
+  #expandedBoxSpacer {
+    height: 6px;
+  }
+
+  #attachmentToggle:hover {
+    list-style-image: url("chrome://global/skin/tree/twisty-clsd-hover.png");
+  }
+
+  #attachmentToggle[checked="true"]:hover {
+    list-style-image: url("chrome://global/skin/tree/twisty-open-hover.png");
+  }
+
+  #attachmentToggle:-moz-locale-dir(rtl) {
+    list-style-image: url("chrome://global/skin/tree/twisty-clsd-rtl.png");
+  }
+
+  #attachmentToggle[checked="true"]:-moz-locale-dir(rtl) {
+    list-style-image: url("chrome://global/skin/tree/twisty-open-rtl.png");
+  }
+
+  #attachmentToggle:hover:-moz-locale-dir(rtl) {
+    list-style-image: url("chrome://global/skin/tree/twisty-clsd-hover-rtl.png");
+  }
+
+  #attachmentToggle[checked="true"]:hover:-moz-locale-dir(rtl) {
+    list-style-image: url("chrome://global/skin/tree/twisty-open-hover-rtl.png");
+  }
+
+  #attachmentSize {
+    color: #888a85; /* the same color as .headerName */
+  }
+
+  .dateLabel {
+    -moz-padding-end: 6px;
+  }
+
+  .toolbarbutton-1.msgHeaderView-button {
+    min-width: 1em;
+    -moz-margin-start: 2px !important;
+    -moz-margin-end: 2px !important;
+    margin-top: 1px;
+    margin-bottom: 2px;
+    vertical-align: middle;
+    /* important required to override primaryToolbar.css rules */
+    -moz-padding-start: 3px !important;
+    -moz-padding-end: 3px !important;
+  }
+
+  @media not all and (-moz-windows-default-theme) {
+    .toolbarbutton-1.msgHeaderView-button:not([type="menu-button"]),
+    .toolbarbutton-1.msgHeaderView-button > .toolbarbutton-menubutton-button,
+    .toolbarbutton-1.msgHeaderView-button > .toolbarbutton-menubutton-dropmarker {
+      -moz-appearance: button;
+      padding-top: 1px !important;
+      padding-bottom: 1px !important;
+    }
+
+    .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
+      -moz-padding-start: 3px !important;
+      -moz-padding-end: 3px !important;
+    }
+  }
+
+  @media (-moz-windows-default-theme) {
+    toolbar[mode="icons"] .msgHeaderView-button.toolbarbutton-menubutton-button,
+    toolbar[mode="icons"] .msgHeaderView-button:not([type="menu-button"]) {
+      -moz-padding-start: 3px !important;
+      -moz-padding-end: 3px !important;
+    }
+  }
+
+  .msgHeaderView-button > .toolbarbutton-icon,
+  .msgHeaderView-button[type="menu-button"] > .toolbarbutton-menubutton-button
+  > .toolbarbutton-icon {
+   /* Needed to make the buttons w/o icons the same height as those with icons */
+    min-height: 16px;
+  }
+
+  .msgHeaderView-button[type="menu-button"] {
+    /* Need to override both rules from messenger.css and msgHeaderView-button */
+    padding: 0 !important;
+  }
+
+  .msgHeaderView-button[type="menu-button"] > .toolbarbutton-menubutton-button {
+    min-width: 1em;
+    margin: 0px;
+    /* important required to override primaryToolbar.css rules */
+    -moz-padding-start: 3px !important;
+    -moz-padding-end: 3px !important;
+  }
+
+  /* toolbar[mode="text"] is necessary so that we end up with more specificity
+  *  than the !important rule in toolkit's toolbar.css.
+  */
+  toolbar[mode="text"] .msgHeaderView-button .toolbarbutton-text,
+  toolbar[mode="text"] toolbarpaletteitem
+  .msgHeaderView-button .toolbarbutton-text {
+    margin: 0 !important;
+    padding-top: 1px !important;
+    padding-bottom: 0px !important;
+    -moz-padding-start: 0px !important;
+    -moz-padding-end: 0px !important;
+  }
+
+  toolbar[iconsize="small"] .msgHeaderView-button .toolbarbutton-text {
+    margin-bottom: 1px !important;
+  }
+
+  toolbar[mode="text"] .msgHeaderView-button .toolbarbutton-text {
+    padding-top: 0 !important;
+  }
+
+  /* For unclear reasons, toolkit's toolbarbutton.css forces a margin of 0,
+  *  jamming the image up against the text, so we need this !important
+  *  rule to override that.
+  *
+  *  The second selector is a descendent selector rather than a child selector
+  *  so that we effect both buttons and menubuttons.
+  */
+
+  toolbox[labelalign="end"] toolbar[mode="full"]
+  toolbarpaletteitem .msgHeaderView-button .toolbarbutton-text,
+  toolbox[labelalign="end"] toolbar[mode="full"]
+  .msgHeaderView-button .toolbarbutton-text {
+    -moz-margin-start: 2px !important;
+  }
+
+  .hdrReplyToSenderButton,
+  .hdrDummyReplyButton,
+  .hdrReplyButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.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");
+  }
+
+  .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");
+  }
+
+  .hdrTrashButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#delete");
+  }
+
+  .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");
+  }
+
+  toolbar[brighttext] .hdrReplyToSenderButton,
+  toolbar[brighttext] .hdrDummyReplyButton,
+  toolbar[brighttext] .hdrReplyButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#reply-inverted");
+  }
+
+  toolbar[brighttext] .hdrReplyAllButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replyall-inverted");
+  }
+
+  toolbar[brighttext] .hdrReplyListButton,
+  toolbar[brighttext] .hdrFollowupButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#replylist-inverted");
+  }
+
+  toolbar[brighttext] .hdrForwardButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#forward-inverted");
+  }
+
+  toolbar[brighttext] .hdrArchiveButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#archive-inverted");
+  }
+
+  toolbar[brighttext] .hdrJunkButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#junk-inverted");
+  }
+
+  toolbar[brighttext] .hdrTrashButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#delete-inverted");
+  }
+
+  toolbar[brighttext] .hdrTagButton {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#tag-inverted");
+  }
+
+  toolbar[brighttext] #attachmentSaveAllSingle,
+  toolbar[brighttext] #attachmentSaveAllMultiple {
+    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.svg#file-inverted");
+  }
+
+  #otherActionsButton > hbox > vbox > .toolbarbutton-icon {
+    display: none;
+  }
+
+  #otherActionsButton > hbox > .toolbarbutton-menu-dropmarker {
+    -moz-padding-end: 3px;
+  }
+
+  /* show a icon in customize window */
+  #CustomizeToolbarWindow toolbarpaletteitem > #otherActionsButton >
+    .toolbarbutton-icon {
+    display: -moz-box;
+    width: 9px;
+    padding-top: 4px;
+    padding-bottom: 4px;
+    list-style-image: url("chrome://messenger/skin/icons/toolbarbutton-arrow.png");
+  }
+
+  .inline-toolbar toolbarpaletteitem toolbarseparator,
+  .inline-toolbar toolbarseparator {
+    height: 24px;
+  }
+
+  .inline-toolbar toolbarspacer {
+    height: 20px;
+  }
+
+  .msgHeaderView-button,
+  toolbarpaletteitem .msgHeaderView-button {
+    -moz-appearance: none;
+  }
+
+  .headerName {
+    color: #888a85; /* lower contrast */
+  }
+
+  #header-view-toolbox {
+    padding-top: 1px;
+  }
+}
+
+@media (-moz-windows-default-theme) and (-moz-windows-compositor) {
+  #msgHeaderView {
+    background: #f8f8f8;
+  }
+}
+
+@media (-moz-windows-default-theme) and (-moz-os-version: windows-vista),
+       (-moz-windows-default-theme) and (-moz-os-version: windows-win7) {
+  #displayDeck[collapsed="true"] + splitter + #messagepaneboxwrapper
+  .main-header-area {
+    background-image: none;
+    background-color: rgb(233, 239, 245);
+  }
+
+  #attachmentBar {
+    background-color: #eef3fa;
+  }
+
+  findbar {
+    background-color: #eef3fa;
+  }
+
+  .toolbarbutton-1.msgHeaderView-button,
+  .toolbarbutton-1.msgHeaderView-button > .toolbarbutton-menubutton-button,
+  .toolbarbutton-1.msgHeaderView-button > .toolbarbutton-menubutton-dropmarker {
+    background-image: linear-gradient(hsla(0, 0%, 100%, .6),
+                      hsla(0, 0%, 100%, .1));
+    background-color: hsla(210, 32%, 93%, .2);
+    border-color: hsla(210, 54%, 20%, .2) hsla(210, 54%, 20%, .25)
+                  hsla(210, 54%, 20%, .3);
+    box-shadow: 0 1px hsla(0, 0%, 100%, .3) inset,
+                0 1px hsla(210, 54%, 20%, .03),
+                0 0 2px hsla(210, 54%, 20%, .1);
+  }
+
+  .msgHeaderView-button:not([type="menu-button"]):not([disabled="true"]):not([checked="true"]):not([open="true"]):not(:active):hover {
+    border-color: hsla(210, 54%, 20%, .4) hsla(210, 54%, 20%, .45)
+                  hsla(210, 54%, 20%, .5);
+    background-color: hsla(210, 48%, 96%, .75);
+    box-shadow: 0 0 1px hsla(210, 54%, 20%, .1),
+                0 0 2px hsla(210, 54%, 20%, .1);
+  }
+}
+
+@media (-moz-windows-default-theme) and (-moz-os-version: windows-win8),
+       (-moz-windows-default-theme) and (-moz-os-version: windows-win10) {
+  .toolbarbutton-1.msgHeaderView-button,
+  .toolbarbutton-1.msgHeaderView-button > .toolbarbutton-menubutton-button,
+  .toolbarbutton-1.msgHeaderView-button > .toolbarbutton-menubutton-dropmarker {
+    background-color: hsla(210, 4%, 10%, .08);
+    border-color: hsla(210, 4%, 10%, .1);
+  }
+
+  .toolbarbutton-1:not([disabled=true]):-moz-any(:hover,[open]) >
+  .toolbarbutton-menubutton-button,
+  .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);
+  }
+}