Bug 1452201 - Use a shared messengercompose.css where possible. r=jorgk a=jorgk
authorRichard Marti <richard.marti@gmail.com>
Fri, 06 Apr 2018 21:04:32 +0200
changeset 31363 63d73d4ad8fb8f2e5ffde1c315caada905ec61df
parent 31362 f7940352f84428705799d049a1c92f136c5da4ab
child 31364 2f9d4cc61c2fc58b2d4f628120b622dd7115da8a
push id383
push userclokep@gmail.com
push dateMon, 07 May 2018 21:52:48 +0000
reviewersjorgk, jorgk
bugs1452201
Bug 1452201 - Use a shared messengercompose.css where possible. r=jorgk a=jorgk
mail/themes/linux/mail/compose/messengercompose.css
mail/themes/osx/mail/compose/messengercompose.css
mail/themes/shared/jar.inc.mn
mail/themes/shared/mail/messengercompose.css
mail/themes/windows/mail/compose/messengercompose.css
--- a/mail/themes/linux/mail/compose/messengercompose.css
+++ b/mail/themes/linux/mail/compose/messengercompose.css
@@ -2,33 +2,24 @@
  * 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/. */
 
 /* ===== messengercompose.css ===========================================
   == Styles for the main Messenger Compose window.
   ======================================================================= */
 
 @import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/shared/messengercompose.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-@namespace html url("http://www.w3.org/1999/xhtml");
-
-#attachmentBucket {
-  width: 15em;
-  min-width: 15em;
-}
 
 #attachmentBucket[empty]:focus {
   box-shadow: 0 0 2px Highlight inset, 0 0 2px Highlight inset;
 }
 
-#attachmentBucket > scrollbox > .scrollbox-innerbox {
-  padding: 1px;
-}
-
 #attachmentBucket attachmentitem {
   border-top: 1px solid transparent;
 }
 
 #attachmentBucket attachmentitem:last-child {
   border-bottom: 1px solid transparent;
 }
 
@@ -49,21 +40,16 @@
 #compose-toolbox:-moz-lwtheme {
   background-color: var(--toolbar-bgcolor);
   color: var(--toolbar-color, inherit);
   /* Uses a background image instead of a border to avoid jumping of the toolbar
      when a theme is enabled. */
   background-image: linear-gradient(to bottom, var(--tabs-border-color, transparent) 1px, transparent 1px);
 }
 
-#compose-toolbox > toolbar {
-  /* force iconsize="small" on these toolbars */
-  counter-reset: smallicons;
-}
-
 /** Stock icons for the menu items. */
 .formatting-button > .toolbarbutton-icon {
   width: 16px;
   height: 16px;
 }
 
 #fontFaceMenu {
   -moz-binding: url("chrome://global/content/bindings/menu.xml#menu-iconic");
@@ -93,63 +79,16 @@
 #menu_styleUnderline {
   list-style-image: url("moz-icon://stock/gtk-underline?size=menu");
 }
 
 #menu_styleStrikeThru {
   list-style-image: url("moz-icon://stock/gtk-strikethrough?size=menu");
 }
 
-/* ::::: primary toolbar buttons ::::: */
-
-#button-send {
-  list-style-image: url("chrome://messenger/skin/icons/send.svg");
-}
-
-#button-contacts {
-  list-style-image: url("chrome://messenger/skin/icons/address.svg");
-  -moz-image-region: auto !important;
-}
-
-#spellingButton {
-  list-style-image: url("chrome://messenger/skin/icons/spelling.svg");
-}
-
-#button-attach {
-  list-style-image: url("chrome://messenger/skin/icons/attach.svg");
-}
-
-#button-security {
-  list-style-image: url("chrome://messenger/skin/icons/security.svg");
-}
-
-#button-save {
-  list-style-image: url("chrome://messenger/skin/icons/save.svg");
-}
-
-#quoteButton {
-  list-style-image: url("chrome://messenger/skin/icons/quote.svg");
-}
-
-#cut-button {
-  list-style-image: url("chrome://messenger/skin/icons/cut.svg");
-}
-
-#copy-button {
-  list-style-image: url("chrome://messenger/skin/icons/copy.svg");
-}
-
-#paste-button {
-  list-style-image: url("chrome://messenger/skin/icons/paste.svg");
-}
-
-#button-print {
-  list-style-image: url("chrome://messenger/skin/icons/print.svg");
-}
-
 /* ::::: menulists on toolbar ::::: */
 
 menulist {
   -moz-appearance: none;
   min-height: 24px;
   color: inherit;
   margin: 1px 4px;
   padding: 1px 6px;
@@ -204,38 +143,16 @@ menulist:-moz-locale-dir(rtl) > .menulis
   color: GrayText;
   padding-inline-end: 2px;
 }
 
 #attachmentBucketCloseButton {
   padding: 0 1px;
 }
 
-/* ::::: attachment reminder ::::: */
-
-#attachmentNotificationBox b {
-  font-weight: bold;
-}
-
-#attachmentNotificationBox > notification[image="null"] .messageImage {
-  background-image: url("chrome://messenger/skin/icons/attach.svg");
-}
-
-#attachmentReminderText {
-  margin-inline-start: 0;
-  cursor: pointer;
-}
-
-#attachmentKeywords {
-  font-weight: bold;
-  margin-inline-start: 0;
-  text-decoration: underline;
-  cursor: pointer;
-}
-
 /* XXX I should really have a selector rule here to select just .listcell-icon objects underneath the attachmentList listbox */
 
 .listcell-icon {
   margin-inline-start: 2px;
   margin-top: 2px;
 }
 
 #subjectLabel {
@@ -261,68 +178,26 @@ menulist:-moz-locale-dir(rtl) > .menulis
 }
 
 #msgSubject:hover,
 #msgSubject[focused="true"] {
   background-color: -moz-field;
   border-color: var(--toolbarbutton-hover-bordercolor);
 }
 
-.autocomplete-richlistitem:hover {
-  background-color: var(--arrowpanel-dimmed);
-}
-
-.autocomplete-richlistitem[selected] {
-  background-color: Highlight;
-  color: HighlightText;
-}
-
 /* ::::: autocomplete icons ::::: */
 
-html|span.ac-emphasize-text {
-  font-weight: bold;
-}
-
-.autocomplete-richlistitem:not([ac-comment=""]) > .ac-url,
-.autocomplete-richlistitem:not([ac-comment=""]) > .ac-separator {
-  display: -moz-box;
-}
-
-.autocomplete-richlistitem:not([ac-comment=""]) > .ac-url {
-  -moz-box-ordinal-group: 1;
-}
-
-.autocomplete-richlistitem:not([ac-comment=""]) > .ac-separator {
-  -moz-box-ordinal-group: 2;
-}
-
-.autocomplete-richlistitem:not([ac-comment=""]) > .ac-title {
-  -moz-box-ordinal-group: 3;
-}
-
 .ac-site-icon {
   display: -moz-box;
   margin: 1px 5px;
 }
 
-.autocomplete-richlistitem[type="local-abook"] > .ac-site-icon {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addrbook.png");
-}
-
-.autocomplete-richlistitem[type="remote-abook"] > .ac-site-icon {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/remote-addrbook.png");
-}
-
-.autocomplete-richlistitem[type="remote-err"] > .ac-site-icon {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/remote-addrbook-error.png");
-}
-
 .autocomplete-richlistitem[type="subscribed-news"] > .ac-site-icon {
   list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-  -moz-image-region: rect(208px 16px 224px 0px);
+  -moz-image-region: rect(208px 16px 224px 0);
 }
 
 /* ::::: addressing widget ::::: */
 
 #addressingWidget {
   -moz-user-focus: none;
   -moz-appearance: none;
   width: 0;
@@ -420,28 +295,17 @@ html|span.ac-emphasize-text {
 }
 
 .aw-menulist > .menulist-dropmarker {
   height: 11px;
 }
 
 #composeContentBox {
   background-color: -moz-dialog;
-  box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.4) inset;
-
-  /*
-   * In order to remove the shadow border on left/right edges elegantly,
-   * use left/right margins of -3px. We make up for this by adding 3px
-   * of padding instead.
-   */
-
-  margin-right: -3px;
-  margin-left: -3px;
-  padding-right: 3px;
-  padding-left: 3px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4) inset;
 }
 
 #composeContentBox:-moz-window-inactive {
   box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.3) inset;
 }
 
 #headers-box {
   background-color: transparent;
@@ -504,55 +368,30 @@ html|span.ac-emphasize-text {
   -moz-context-properties: fill;
   fill: currentColor;
 }
 
 #msgIdentity[editable="true"] > .menulist-dropmarker {
   display: none;
 }
 
-#msgIdentityPopup > menuitem[_moz-menuactive="true"] > .menu-description {
-  color: HighlightText;
-  opacity: .7;
-}
-
-.menu-description {
-  font-style: italic;
-  color: GrayText;
-  margin-inline-start: 1ex !important;
-}
-
-.menulist-description {
-  font-style: italic;
-  color: GrayText;
-  margin-inline-start: 1ex !important;
-}
-
 /* ::::: format toolbar ::::: */
 
 #FormatToolbar {
   -moz-appearance: none;
   color: WindowText;
   margin-left: 3px;
   margin-right: 3px;
   background-image: url("chrome://messenger/skin/messengercompose/linux-noise.png");
 }
 
-#FontFaceSelect {
-  max-width: 35ch;
-}
-
 toolbarbutton.formatting-button {
   list-style-image: url("chrome://messenger/skin/messengercompose/format-buttons.png");
 }
 
-#FormatToolbar > toolbarbutton > .toolbarbutton-text {
-  display: none;
-}
-
 #AbsoluteFontSizeButton {
   -moz-image-region: rect(272px 16px 288px 0px);
 }
 #AbsoluteFontSizeButton[disabled="true"] {
   -moz-image-region: rect(256px 16px 272px 0px);
 }
 
 #DecreaseFontSizeButton {
@@ -627,17 +466,16 @@ toolbarbutton.formatting-button {
 
 #InsertPopupButton {
   -moz-image-region: rect(80px 16px 96px 0px);
 }
 #InsertPopupButton[disabled="true"] {
   -moz-image-region: rect(64px 16px 80px 0px);
 }
 
-
 #smileButtonMenu {
   -moz-image-region: rect(32px 16px 48px 0px);
 }
 #smileButtonMenu[disabled="true"] {
   -moz-image-region: rect(16px 16px 32px 0px);
 }
 /* ..... align menu ..... */
 
@@ -688,92 +526,92 @@ toolbarbutton.formatting-button {
 #smileButtonMenu .menu-iconic-left {
   /* Ensure that the smileys are visible even if the Gnome theme says menus
      shouldn't have icons. */
   visibility: visible;
 }
 
 #smileySmile > .menu-iconic-left {
   list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-smile.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 #smileyFrown > .menu-iconic-left {
   list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-frown.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 #smileyWink > .menu-iconic-left {
   list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-wink.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 #smileyTongue > .menu-iconic-left {
   list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-tongue-out.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 #smileyLaughing > .menu-iconic-left {
   list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-laughing.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 #smileyEmbarassed > .menu-iconic-left {
   list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-embarassed.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 #smileyUndecided > .menu-iconic-left {
   list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-undecided.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 #smileySurprise > .menu-iconic-left {
   list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-surprised.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 #smileyKiss > .menu-iconic-left {
   list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-kiss.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 #smileyYell > .menu-iconic-left {
   list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-yell.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 #smileyCool > .menu-iconic-left {
   list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-cool.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 #smileyMoney > .menu-iconic-left {
   list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-money-mouth.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 #smileyFoot > .menu-iconic-left {
   list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-foot-in-mouth.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 #smileyInnocent > .menu-iconic-left {
   list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-innocent.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 #smileyCry > .menu-iconic-left {
   list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-cry.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 #smileySealed > .menu-iconic-left {
   list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-sealed.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 /* ..... fg/bg color picker ..... */
 
 .ColorPickerLabel {
   border: 1px inset ThreeDFace;
   margin: 0px;
   padding: 2px;
@@ -792,35 +630,16 @@ toolbarbutton.formatting-button {
 }
 
 .color-button[disabled="true"],
 .color-button[disabled="true"]:hover {
   border: 1px inset ThreeDFace;
   opacity: 0.5;
 }
 
-#TextColorButton {
-  margin-top: 2px;
-  margin-bottom: 9px;
-  margin-inline-start: 2px;
-  margin-inline-end: 9px;
-}
-
-#TextColorButton[color="mixed"] {
-  background-image: url("chrome://messenger/skin/icons/multicolor.png");
-  background-size: cover;
-}
-
-#BackgroundColorButton {
-  margin-top: 9px;
-  margin-bottom: 2px;
-  margin-inline-start: 9px;
-  margin-inline-end: 2px;
-}
-
 #HighlightColorButton {
   -moz-image-region: rect(260px 16px 272px 0px);
   background-color: transparent;
 }
 
 #HighlightColorButton:hover {
   -moz-image-region: rect(260px 32px 272px 16px);
 }
@@ -889,42 +708,8 @@ toolbarbutton.formatting-button {
 }
 
 menu[command="cmd_attachCloud"] .menu-iconic-left,
 menu[command="cmd_convertCloud"] .menu-iconic-left {
   /* Ensure that the provider icons are visible even if the Gnome theme says
      menus shouldn't have icons. */
   visibility: visible;
 }
-
-/* ::::: Reorder Attachments Panel ::::: */
-
-#reorderAttachmentsPanel > .panel-arrowcontainer > .panel-arrowcontent {
-  --arrowpanel-padding: 4px;
-}
-
-#btn_moveAttachmentTop {
-  list-style-image: url("chrome://messenger/skin/icons/move-top.svg");
-}
-
-#btn_moveAttachmentUp {
-  list-style-image: url("chrome://messenger/skin/icons/move-up.svg");
-}
-
-#btn_moveAttachmentDown {
-  list-style-image: url("chrome://messenger/skin/icons/move-down.svg");
-}
-
-#btn_moveAttachmentBottom {
-  list-style-image: url("chrome://messenger/skin/icons/move-bottom.svg");
-}
-
-#btn_moveAttachmentBundleUp {
-  list-style-image: url("chrome://messenger/skin/icons/move-together.svg");
-}
-
-#btn_sortAttachmentsToggle {
-  list-style-image: url("chrome://messenger/skin/icons/sort.svg");
-}
-
-#btn_sortAttachmentsToggle[sortdirection="descending"] > .toolbarbutton-icon {
-  transform: scaleY(-1);
-}
--- a/mail/themes/osx/mail/compose/messengercompose.css
+++ b/mail/themes/osx/mail/compose/messengercompose.css
@@ -2,19 +2,19 @@
  * 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/. */
 
 /* ===== messengercompose.css ===========================================
   == Styles for the main Messenger Compose window.
   ======================================================================= */
 
 @import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/shared/messengercompose.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-@namespace html url("http://www.w3.org/1999/xhtml");
 
 #compose-toolbox:-moz-lwtheme {
   -moz-appearance: none;
   background-color: var(--toolbar-bgcolor);
   color: var(--toolbar-color, inherit);
   /* Uses a background image instead of a border to avoid jumping of the toolbar
      when a theme is enabled. */
   background-image: linear-gradient(to bottom, var(--tabs-border-color, transparent) 1px, transparent 1px);
@@ -23,29 +23,20 @@
 #compose-toolbox:-moz-lwtheme::after {
   content: "";
   display: -moz-box;
   margin-top: -1px;
   height: 1px;
   border-bottom: 1px solid var(--toolbox-border-bottom-color);
 }
 
-#attachmentBucket {
-  width: 15em;
-  min-width: 15em;
-}
-
 #attachmentBucket[empty]:focus {
   box-shadow: 0 0 1.5px 1px -moz-mac-focusring inset;
 }
 
-#attachmentBucket > scrollbox > .scrollbox-innerbox {
-  padding: 1px;
-}
-
 #attachmentBucket attachmentitem {
   border-top: 1px solid transparent;
   border-bottom: 1px solid #fff;
 }
 
 #attachmentBucket attachmentitem[dropOn="top"] {
   border-top-color: #000;
   outline-color: transparent;
@@ -84,93 +75,32 @@ toolbar[nowindowdrag="true"] {
   padding-bottom: 2px;
 }
 
 #findbar-replaceButton {
   padding: 2px 9px;
   margin-inline-start: 5px;
 }
 
-#compose-toolbox > toolbar {
-  /* force iconsize="small" on these toolbars */
-  counter-reset: smallicons;
-}
-
-#button-send {
-  list-style-image: url("chrome://messenger/skin/icons/send.svg");
-}
-
-#button-contacts {
-  list-style-image: url("chrome://messenger/skin/icons/address.svg");
-  -moz-image-region: auto !important;
-}
-
-#spellingButton {
-  list-style-image: url("chrome://messenger/skin/icons/spelling.svg");
-}
-
-#button-attach {
-  list-style-image: url("chrome://messenger/skin/icons/attach.svg");
-}
-
-#button-security {
-  list-style-image: url("chrome://messenger/skin/icons/security.svg");
-}
-
-#button-save {
-  list-style-image: url("chrome://messenger/skin/icons/save.svg");
-}
-
-#quoteButton {
-  list-style-image: url("chrome://messenger/skin/icons/quote.svg");
-}
-
-#cut-button {
-  list-style-image: url("chrome://messenger/skin/icons/cut.svg");
-}
-
-#copy-button {
-  list-style-image: url("chrome://messenger/skin/icons/copy.svg");
-}
-
-#paste-button {
-  list-style-image: url("chrome://messenger/skin/icons/paste.svg");
-}
-
-#button-print {
-  list-style-image: url("chrome://messenger/skin/icons/print.svg");
-}
-
 /* ::::: special toolbar colors ::::: */
 
 #composeContentBox {
-  box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.6) inset;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.6) inset;
   background-color: rgb(242, 242, 242);
-
-  /*
-   * In order to remove the shadow border on left/right edges elegantly,
-   * use left/right margins of -3px. We make up for this by adding 3px
-   * of padding instead.
-   */
-
-  margin-right: -3px;
-  margin-left: -3px;
-  padding-right: 3px;
-  padding-left: 3px;
 }
 
 #composeContentBox:-moz-window-inactive {
-  box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.2) inset;
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset;
 }
 
 #MsgHeadersToolbar {
   color: -moz-DialogText;
   text-shadow: none;
   background-image: url("chrome://messenger/skin/noise.png");
-  border-bottom: 0px solid;
+  border-bottom: 0 solid;
 }
 
 #addresses-box {
   padding-top: 5px;
 }
 
 #msgIdentity {
   margin: 0;
@@ -215,33 +145,16 @@ toolbar[nowindowdrag="true"] {
 #msgIdentity[editable="true"] > menupopup > menuitem {
   -moz-appearance: menuitem;
 }
 
 #msgIdentityPopup {
   margin-inline-start: initial;
 }
 
-#msgIdentityPopup > menuitem[_moz-menuactive="true"] > .menu-description {
-  color: HighlightText;
-  opacity: .7;
-}
-
-.menu-description {
-  font-style: italic;
-  color: GrayText;
-  margin-inline-start: 1ex !important;
-}
-
-.menulist-description {
-  font-style: italic;
-  color: GrayText;
-  margin-inline-start: 1ex !important;
-}
-
 #addresses-box {
   margin: 4px 6px;
 }
 
 #attachmentbucket-sizer {
   border-top: none;
   border-bottom: none;
   height: 7px;
@@ -263,36 +176,16 @@ toolbar[nowindowdrag="true"] {
 
 #attachmentBucketCloseButton {
   padding: 0 1px;
   margin-top: 1px;
 }
 
 /* ::::: attachment reminder ::::: */
 
-#attachmentNotificationBox b {
-  font-weight: bold;
-}
-
-#attachmentNotificationBox > notification[image="null"] .messageImage {
-  background-image: url("chrome://messenger/skin/icons/attach.svg");
-}
-
-#attachmentReminderText {
-  margin-inline-start: 0px;
-  cursor: pointer;
-}
-
-#attachmentKeywords {
-  font-weight: bold;
-  margin-inline-start: 0px;
-  text-decoration: underline;
-  cursor: pointer;
-}
-
 .notification-button[type="menu-button"] {
   padding-top: 0;
 }
 
 .notification-button[type="menu-button"] > button {
   -moz-appearance: none;
   margin-bottom: -1px;
   margin-inline-start: -3px;
@@ -317,79 +210,37 @@ toolbar[nowindowdrag="true"] {
 #msgSubject {
   margin-top: 0;
   margin-inline-start: 0;
   margin-inline-end: 1px;
   min-height: 20px;
   background-color: inherit;
   -moz-appearance: none;
   border: 1px solid transparent;
-  border-bottom-color: #C6C6C6;
+  border-bottom-color: #c6c6c6;
   border-radius: 2px;
   padding: 1px 2px;
   padding-inline-start: 5px;
   transition: border .2s, background-color .2s;
 }
 
 #msgSubject:hover,
 #msgSubject[focused="true"] {
   background-color: white;
   background-image: none;
-  border-color: #C6C6C6;
-}
-
-.autocomplete-richlistitem:hover {
-  background-color: var(--arrowpanel-dimmed);
-}
-
-.autocomplete-richlistitem[selected] {
-  background-color: Highlight;
-  color: HighlightText;
+  border-color: #c6c6c6;
 }
 
 /* ::::: autocomplete icons ::::: */
 
-html|span.ac-emphasize-text {
-  font-weight: bold;
-}
-
-.autocomplete-richlistitem:not([ac-comment=""]) > .ac-url,
-.autocomplete-richlistitem:not([ac-comment=""]) > .ac-separator {
-  display: -moz-box;
-}
-
-.autocomplete-richlistitem:not([ac-comment=""]) > .ac-url {
-  -moz-box-ordinal-group: 1;
-}
-
-.autocomplete-richlistitem:not([ac-comment=""]) > .ac-separator {
-  -moz-box-ordinal-group: 2;
-}
-
-.autocomplete-richlistitem:not([ac-comment=""]) > .ac-title {
-  -moz-box-ordinal-group: 3;
-}
-
 .ac-site-icon {
   display: -moz-box;
   margin: 2px 5px;
 }
 
-.autocomplete-richlistitem[type="local-abook"] > .ac-site-icon {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addrbook.png");
-}
-
-.autocomplete-richlistitem[type="remote-abook"] > .ac-site-icon {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/remote-addrbook.png");
-}
-
-.autocomplete-richlistitem[type="remote-err"] > .ac-site-icon {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/remote-addrbook-error.png");
-}
-
 @media (min-resolution: 2dppx) {
   .autocomplete-richlistitem[type="local-abook"] > .ac-site-icon {
     width: 16px;
     height: 16px;
     list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook@2x.png");
     -moz-image-region: rect(0px 32px 32px 0px);
   }
 
@@ -526,20 +377,16 @@ html|span.ac-emphasize-text {
   border-bottom: none;
   background-image: url("chrome://messenger/skin/messengercompose/osx-noise.png");
   background-color: rgb(242, 242, 242) !important;
   padding-top: 2px;
   margin-left: 3px;
   margin-right: 3px;
 }
 
-#FontFaceSelect {
-  max-width: 35ch;
-}
-
 #FormatToolbar toolbarseparator {
   background-image: none;
 }
 
 toolbarbutton.formatting-button {
   -moz-appearance: toolbarbutton;
   height: 22px;
   margin: 0px;
@@ -604,20 +451,16 @@ toolbarbutton.formatting-button > .toolb
 }
 
 toolbarbutton.toolbarbutton-1 .toolbarbutton-menu-dropmarker > .dropmarker-icon,
 toolbarbutton.toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
   width: 9px;
   height: 7px;
 }
 
-#FormatToolbar > toolbarbutton > .toolbarbutton-text {
-  display: none;
-}
-
 #AbsoluteFontSizeButton {
   -moz-image-region: rect(180px 20px 192px 0px);
 }
 
 #AbsoluteFontSizeButton[disabled="true"] {
   -moz-image-region: rect(180px 60px 192px 40px) !important;
 }
 
@@ -1023,92 +866,92 @@ toolbarbutton.toolbarbutton-1 > .toolbar
     -moz-image-region: rect(128px 32px 160px 0px);
   }
 }
 
 /* ..... smiley menu ..... */
 
 #smileySmile > .menu-iconic-left {
   list-style-image: url("chrome://messenger/skin/messengercompose/emoticon_smile.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 #smileyFrown > .menu-iconic-left {
   list-style-image: url("chrome://messenger/skin/messengercompose/emoticon_frown.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 #smileyWink > .menu-iconic-left {
   list-style-image: url("chrome://messenger/skin/messengercompose/emoticon_wink.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 #smileyTongue > .menu-iconic-left {
   list-style-image: url("chrome://messenger/skin/messengercompose/emoticon_tongue_out.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 #smileyLaughing > .menu-iconic-left {
   list-style-image: url("chrome://messenger/skin/messengercompose/emoticon_laughing.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 #smileyEmbarassed > .menu-iconic-left {
   list-style-image: url("chrome://messenger/skin/messengercompose/emoticon_embarrassed.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 #smileyUndecided > .menu-iconic-left {
   list-style-image: url("chrome://messenger/skin/messengercompose/emoticon_undecided.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 #smileySurprise > .menu-iconic-left {
   list-style-image: url("chrome://messenger/skin/messengercompose/emoticon_surprised.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 #smileyKiss > .menu-iconic-left {
   list-style-image: url("chrome://messenger/skin/messengercompose/emoticon_kiss.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 #smileyYell > .menu-iconic-left {
   list-style-image: url("chrome://messenger/skin/messengercompose/emoticon_yell.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 #smileyCool > .menu-iconic-left {
   list-style-image: url("chrome://messenger/skin/messengercompose/emoticon_cool.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 #smileyMoney > .menu-iconic-left {
   list-style-image: url("chrome://messenger/skin/messengercompose/emoticon_money_mouth.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 #smileyFoot > .menu-iconic-left {
   list-style-image: url("chrome://messenger/skin/messengercompose/emoticon_foot_in_mouth.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 #smileyInnocent > .menu-iconic-left {
   list-style-image: url("chrome://messenger/skin/messengercompose/emoticon_innocent.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 #smileyCry > .menu-iconic-left {
   list-style-image: url("chrome://messenger/skin/messengercompose/emoticon_cry.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 #smileySealed > .menu-iconic-left {
   list-style-image: url("chrome://messenger/skin/messengercompose/emoticon_sealed.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 @media (min-resolution: 2dppx) {
   #smileySmile > .menu-iconic-left {
     list-style-image: url("chrome://messenger/skin/messengercompose/emotes@2x.png");
     -moz-image-region: rect(1px 35px 35px 1px);
   }
 
@@ -1205,35 +1048,16 @@ toolbarbutton.toolbarbutton-1 > .toolbar
 }
 
 .color-button[disabled="true"],
 .color-button[disabled="true"]:hover {
   border: 1px inset #A0A0A0;
   opacity: 0.5;
 }
 
-#TextColorButton {
-  margin-top: 2px;
-  margin-bottom: 9px;
-  margin-inline-start: 2px;
-  margin-inline-end: 9px;
-}
-
-#TextColorButton[color="mixed"] {
-  background-image: url("chrome://messenger/skin/icons/multicolor.png");
-  background-size: cover;
-}
-
-#BackgroundColorButton {
-  margin-top: 9px;
-  margin-bottom: 2px;
-  margin-inline-start: 9px;
-  margin-inline-end: 2px;
-}
-
 #HighlightColorButton {
   -moz-image-region: rect(260px 16px 272px 0px);
   background-color: transparent;
 }
 
 #HighlightColorButton:hover {
   -moz-image-region: rect(260px 32px 272px 16px);
 }
@@ -1287,42 +1111,8 @@ toolbarbutton.toolbarbutton-1 > .toolbar
 #titlebar {
   display: none;
 }
 
 #titlebar-buttonbox-container {
   margin-top: 3px;
   margin-inline-start: 7px;
 }
-
-/* ::::: Reorder Attachments Panel ::::: */
-
-#reorderAttachmentsPanel > .panel-arrowcontainer > .panel-arrowcontent {
-  --arrowpanel-padding: 4px;
-}
-
-#btn_moveAttachmentTop {
-  list-style-image: url("chrome://messenger/skin/icons/move-top.svg");
-}
-
-#btn_moveAttachmentUp {
-  list-style-image: url("chrome://messenger/skin/icons/move-up.svg");
-}
-
-#btn_moveAttachmentDown {
-  list-style-image: url("chrome://messenger/skin/icons/move-down.svg");
-}
-
-#btn_moveAttachmentBottom {
-  list-style-image: url("chrome://messenger/skin/icons/move-bottom.svg");
-}
-
-#btn_moveAttachmentBundleUp {
-  list-style-image: url("chrome://messenger/skin/icons/move-together.svg");
-}
-
-#btn_sortAttachmentsToggle {
-  list-style-image: url("chrome://messenger/skin/icons/sort.svg");
-}
-
-#btn_sortAttachmentsToggle[sortdirection="descending"] > .toolbarbutton-icon {
-  transform: scaleY(-1);
-}
--- a/mail/themes/shared/jar.inc.mn
+++ b/mail/themes/shared/jar.inc.mn
@@ -86,13 +86,14 @@
   skin/classic/messenger/shared/in-content/compose.svg        (../shared/mail/incontentprefs/compose.svg)
   skin/classic/messenger/shared/in-content/display.svg        (../shared/mail/incontentprefs/display.svg)
   skin/classic/messenger/shared/in-content/general.svg        (../shared/mail/incontentprefs/general.svg)
   skin/classic/messenger/shared/in-content/privacy.svg        (../shared/mail/incontentprefs/privacy.svg)
   skin/classic/messenger/shared/in-content/security.svg       (../shared/mail/incontentprefs/security.svg)
   skin/classic/messenger/shared/mailWindow1.css               (../shared/mail/mailWindow1.css)
   skin/classic/messenger/shared/messageHeader.css             (../shared/mail/messageHeader.css)
   skin/classic/messenger/shared/messenger.css                 (../shared/mail/messenger.css)
+  skin/classic/messenger/shared/messengercompose.css          (../shared/mail/messengercompose.css)
   skin/classic/messenger/shared/tabmail.css                   (../shared/mail/tabmail.css)
 #ifndef XP_MACOSX
   skin/classic/messenger/icons/search-close.svg               (../shared/mail/icons/search-close.svg)
   skin/classic/messenger/icons/quit.svg                       (../shared/mail/icons/quit.svg)
 #endif
new file mode 100644
--- /dev/null
+++ b/mail/themes/shared/mail/messengercompose.css
@@ -0,0 +1,225 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace html url("http://www.w3.org/1999/xhtml");
+
+#attachmentBucket {
+  width: 15em;
+  min-width: 15em;
+}
+
+#attachmentBucket > scrollbox > .scrollbox-innerbox {
+  padding: 1px;
+}
+
+#compose-toolbox > toolbar {
+  /* force iconsize="small" on these toolbars */
+  counter-reset: smallicons;
+}
+
+#composeContentBox {
+  /*
+  * In order to remove the shadow border on left/right edges elegantly,
+  * use left/right margins of -3px. We make up for this by adding 3px
+  * of padding instead.
+  */
+  margin-right: -3px;
+  margin-left: -3px;
+  padding-right: 3px;
+  padding-left: 3px;
+}
+
+/* :::: primary toolbar buttons :::: */
+
+#button-send {
+  list-style-image: url("chrome://messenger/skin/icons/send.svg");
+}
+
+#button-contacts {
+  list-style-image: url("chrome://messenger/skin/icons/address.svg");
+  -moz-image-region: auto !important;
+}
+
+#spellingButton {
+  list-style-image: url("chrome://messenger/skin/icons/spelling.svg");
+}
+
+#button-attach {
+  list-style-image: url("chrome://messenger/skin/icons/attach.svg");
+}
+
+#button-security {
+  list-style-image: url("chrome://messenger/skin/icons/security.svg");
+}
+
+#button-save {
+  list-style-image: url("chrome://messenger/skin/icons/save.svg");
+}
+
+#quoteButton {
+  list-style-image: url("chrome://messenger/skin/icons/quote.svg");
+}
+
+#cut-button {
+  list-style-image: url("chrome://messenger/skin/icons/cut.svg");
+}
+
+#copy-button {
+  list-style-image: url("chrome://messenger/skin/icons/copy.svg");
+}
+
+#paste-button {
+  list-style-image: url("chrome://messenger/skin/icons/paste.svg");
+}
+
+#button-print {
+  list-style-image: url("chrome://messenger/skin/icons/print.svg");
+}
+
+#msgIdentityPopup > menuitem[_moz-menuactive="true"] > .menu-description {
+  color: HighlightText;
+  opacity: .7;
+}
+
+.menu-description {
+  font-style: italic;
+  color: GrayText;
+  margin-inline-start: 1ex !important;
+}
+
+.menulist-description {
+  font-style: italic;
+  color: GrayText;
+  margin-inline-start: 1ex !important;
+}
+
+/* :::: Format toolbar :::: */
+
+#FormatToolbar > toolbarbutton > .toolbarbutton-text {
+  display: none;
+}
+
+#FontFaceSelect {
+  max-width: 35ch;
+}
+
+#TextColorButton {
+  margin-top: 2px;
+  margin-bottom: 9px;
+  margin-inline-start: 2px;
+  margin-inline-end: 9px;
+}
+
+#TextColorButton[color="mixed"] {
+  background-image: url("chrome://messenger/skin/icons/multicolor.png");
+  background-size: cover;
+}
+
+#BackgroundColorButton {
+  margin-top: 9px;
+  margin-bottom: 2px;
+  margin-inline-start: 9px;
+  margin-inline-end: 2px;
+}
+
+/* :::: Reorder Attachments Panel :::: */
+
+#reorderAttachmentsPanel > .panel-arrowcontainer > .panel-arrowcontent {
+  --arrowpanel-padding: 4px;
+}
+
+#btn_moveAttachmentTop {
+  list-style-image: url("chrome://messenger/skin/icons/move-top.svg");
+}
+
+#btn_moveAttachmentUp {
+  list-style-image: url("chrome://messenger/skin/icons/move-up.svg");
+}
+
+#btn_moveAttachmentDown {
+  list-style-image: url("chrome://messenger/skin/icons/move-down.svg");
+}
+
+#btn_moveAttachmentBottom {
+  list-style-image: url("chrome://messenger/skin/icons/move-bottom.svg");
+}
+
+#btn_moveAttachmentBundleUp {
+  list-style-image: url("chrome://messenger/skin/icons/move-together.svg");
+}
+
+#btn_sortAttachmentsToggle {
+  list-style-image: url("chrome://messenger/skin/icons/sort.svg");
+}
+
+#btn_sortAttachmentsToggle[sortdirection="descending"] > .toolbarbutton-icon {
+  transform: scaleY(-1);
+}
+
+.autocomplete-richlistitem:hover {
+  background-color: var(--arrowpanel-dimmed);
+}
+
+.autocomplete-richlistitem[selected] {
+  background-color: Highlight;
+  color: HighlightText;
+}
+
+/* :::: autocomplete icons :::: */
+
+html|span.ac-emphasize-text {
+  font-weight: bold;
+}
+
+.autocomplete-richlistitem:not([ac-comment=""]) > .ac-url,
+.autocomplete-richlistitem:not([ac-comment=""]) > .ac-separator {
+  display: -moz-box;
+}
+
+.autocomplete-richlistitem:not([ac-comment=""]) > .ac-url {
+  -moz-box-ordinal-group: 1;
+}
+
+.autocomplete-richlistitem:not([ac-comment=""]) > .ac-separator {
+  -moz-box-ordinal-group: 2;
+}
+
+.autocomplete-richlistitem:not([ac-comment=""]) > .ac-title {
+  -moz-box-ordinal-group: 3;
+}
+
+.autocomplete-richlistitem[type="local-abook"] > .ac-site-icon {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addrbook.png");
+}
+
+.autocomplete-richlistitem[type="remote-abook"] > .ac-site-icon {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/remote-addrbook.png");
+}
+
+.autocomplete-richlistitem[type="remote-err"] > .ac-site-icon {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/remote-addrbook-error.png");
+}
+
+/* ::::: attachment reminder ::::: */
+
+#attachmentNotificationBox b {
+  font-weight: bold;
+}
+
+#attachmentNotificationBox > notification[image="null"] .messageImage {
+  background-image: url("chrome://messenger/skin/icons/attach.svg");
+}
+
+#attachmentReminderText {
+  margin-inline-start: 0;
+  cursor: pointer;
+}
+
+#attachmentKeywords {
+  font-weight: bold;
+  margin-inline-start: 0;
+  text-decoration: underline;
+  cursor: pointer;
+}
--- a/mail/themes/windows/mail/compose/messengercompose.css
+++ b/mail/themes/windows/mail/compose/messengercompose.css
@@ -2,38 +2,32 @@
  * 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/. */
 
 /* ===== messengercompose.css ===========================================
   == Styles for the main Messenger Compose window.
   ======================================================================= */
 
 @import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/shared/messengercompose.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-@namespace html url("http://www.w3.org/1999/xhtml");
 
 #attachmentBucket {
   -moz-appearance: none;
-  width: 15em;
-  min-width: 15em;
   border-top: 1px solid #A9B7C9; /* The same color as the splitters */
   border-bottom: 1px solid #A9B7C9;
   background-color: -moz-Field;
   color: -moz-FieldText;
 }
 
 #attachmentBucket[empty]:focus {
   box-shadow: 0 0 1px Highlight inset, 0 0 1px Highlight inset;
 }
 
-#attachmentBucket > scrollbox > .scrollbox-innerbox {
-  padding: 1px;
-}
-
 @media (-moz-windows-default-theme: 0) {
   #attachmentBucket attachmentitem {
     border-top: 1px solid transparent;
   }
 
   #attachmentBucket attachmentitem:last-child {
     border-bottom: 1px solid transparent;
   }
@@ -48,26 +42,17 @@
 }
 
 /* ::::: special toolbar colors ::::: */
 
 #composeContentBox {
   -moz-appearance: none;
   color: -moz-dialogtext;
   background-color: -moz-Dialog;
-  box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.4) inset;
-  /*
-  * In order to remove the shadow border on left/right edges elegantly,
-  * use left/right margins of -3px. We make up for this by adding 3px
-  * of padding instead.
-  */
-  margin-right: -3px;
-  margin-left: -3px;
-  padding-right: 3px;
-  padding-left: 3px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4) inset;
   border-top-width: 0;
   box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1) inset;
 }
 
 #composeContentBox:-moz-window-inactive {
   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05) inset;
 }
 
@@ -111,47 +96,16 @@
   #msgIdentity:hover,
   #msgIdentity:focus,
   #msgIdentity[focused="true"] {
     background-color: -moz-field;
     border-color: ThreeDShadow;
   }
 }
 
-#msgIdentityPopup > menuitem[_moz-menuactive="true"] > .menu-description {
-  color: HighlightText;
-  opacity: .7;
-}
-
-.menu-description {
-  font-style: italic;
-  color: GrayText;
-  margin-inline-start: 1ex !important;
-}
-
-.menulist-description {
-  font-style: italic;
-  color: GrayText;
-  margin-inline-start: 1ex !important;
-}
-
-/* ::::: attachment reminder ::::: */
-
-#attachmentReminderText {
-  margin-inline-start: 0;
-  cursor: pointer;
-}
-
-#attachmentKeywords {
-  font-weight: bold;
-  margin-inline-start: 0;
-  text-decoration: underline;
-  cursor: pointer;
-}
-
 /* XXX I should really have a selector rule here to select just .listcell-icon
    objects underneath the attachmentList listbox */
 
 .listcell-icon {
   margin-inline-start: 2px;
   margin-top: 2px;
 }
 
@@ -288,20 +242,16 @@
 #FormatToolbox {
   -moz-appearance: none;
 }
 
 #FontFaceSelect {
   max-width: 35ch;
 }
 
-#FormatToolbar > toolbarbutton > .toolbarbutton-text {
-  display: none;
-}
-
 toolbarbutton.formatting-button,
 #AlignPopup > menuitem,
 #InsertPopup > menuitem {
   list-style-image: url("chrome://messenger/skin/messengercompose/format-buttons.png");
 }
 
 #AbsoluteFontSizeButton {
   -moz-image-region: rect(0 320px 16px 304px);
@@ -433,92 +383,92 @@ toolbarbutton.formatting-button,
 #InsertTableItem {
   -moz-image-region: rect(0 288px 16px 272px);
 }
 
 /* ..... smiley menu ..... */
 
 #smileySmile > .menu-iconic-left {
   list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-smile.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 #smileyFrown > .menu-iconic-left {
   list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-frown.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 #smileyWink > .menu-iconic-left {
   list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-wink.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 #smileyTongue > .menu-iconic-left {
   list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-tongue-out.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 #smileyLaughing > .menu-iconic-left {
   list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-laughing.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 #smileyEmbarassed > .menu-iconic-left {
   list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-embarassed.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 #smileyUndecided > .menu-iconic-left {
   list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-undecided.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 #smileySurprise > .menu-iconic-left {
   list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-surprised.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 #smileyKiss > .menu-iconic-left {
   list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-kiss.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 #smileyYell > .menu-iconic-left {
   list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-yell.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 #smileyCool > .menu-iconic-left {
   list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-cool.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 #smileyMoney > .menu-iconic-left {
   list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-money-mouth.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 #smileyFoot > .menu-iconic-left {
   list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-foot-in-mouth.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 #smileyInnocent > .menu-iconic-left {
   list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-innocent.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 #smileyCry > .menu-iconic-left {
   list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-cry.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 #smileySealed > .menu-iconic-left {
   list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-sealed.png");
-  -moz-image-region: auto; /* cut off inheritance */
+  -moz-image-region: auto;
 }
 
 /* ..... fg/bg color picker ..... */
 
 .ColorPickerLabel {
   border: 1px inset ThreeDFace;
   margin: 0;
   padding: 2px;
@@ -537,35 +487,16 @@ toolbarbutton.formatting-button,
 }
 
 .color-button[disabled="true"],
 .color-button[disabled="true"]:hover {
   border: 1px inset ThreeDFace;
   opacity: 0.5;
 }
 
-#TextColorButton {
-  margin-top: 2px;
-  margin-bottom: 9px;
-  margin-inline-start: 2px;
-  margin-inline-end: 9px;
-}
-
-#TextColorButton[color="mixed"] {
-  background-image: url("chrome://messenger/skin/icons/multicolor.png");
-  background-size: cover;
-}
-
-#BackgroundColorButton {
-  margin-top: 9px;
-  margin-bottom: 2px;
-  margin-inline-start: 9px;
-  margin-inline-end: 2px;
-}
-
 #HighlightColorButton {
   -moz-image-region: rect(260px 16px 272px 0);
   background-color: transparent;
 }
 
 #HighlightColorButton:hover {
   -moz-image-region: rect(260px 32px 272px 16px);
 }
@@ -643,21 +574,16 @@ toolbarbutton.formatting-button,
      when a theme is enabled. */
   background-image: linear-gradient(to bottom, var(--tabs-border-color, transparent) 1px, transparent 1px);
 }
 
 toolbar:not(:-moz-lwtheme) {
   -moz-appearance: none;
 }
 
-#compose-toolbox > toolbar {
-  /* force iconsize="small" on these toolbars */
-  counter-reset: smallicons;
-}
-
 #compose-toolbox > toolbar:not([type="menubar"]) {
   padding: 2px 1px;
 }
 
 #compose-toolbox > toolbar:not([type="menubar"]):-moz-lwtheme {
   text-shadow: none;
 }
 
@@ -708,61 +634,16 @@ toolbar:not(:-moz-lwtheme) {
   }
 }
 
 .findbar-container {
   padding-top: 2px;
   padding-bottom: 2px;
 }
 
-#button-send {
-  list-style-image: url("chrome://messenger/skin/icons/send.svg");
-}
-
-#button-contacts {
-  list-style-image: url("chrome://messenger/skin/icons/address.svg");
-  -moz-image-region: auto !important;
-}
-
-#spellingButton {
-  list-style-image: url("chrome://messenger/skin/icons/spelling.svg");
-}
-
-#button-attach {
-  list-style-image: url("chrome://messenger/skin/icons/attach.svg");
-}
-
-#button-security {
-  list-style-image: url("chrome://messenger/skin/icons/security.svg");
-}
-
-#button-save {
-  list-style-image: url("chrome://messenger/skin/icons/save.svg");
-}
-
-#quoteButton {
-  list-style-image: url("chrome://messenger/skin/icons/quote.svg");
-}
-
-#cut-button {
-  list-style-image: url("chrome://messenger/skin/icons/cut.svg");
-}
-
-#copy-button {
-  list-style-image: url("chrome://messenger/skin/icons/copy.svg");
-}
-
-#paste-button {
-  list-style-image: url("chrome://messenger/skin/icons/paste.svg");
-}
-
-#button-print {
-  list-style-image: url("chrome://messenger/skin/icons/print.svg");
-}
-
 /* ::::: special toolbar colors ::::: */
 
 #attachmentbucket-sizer {
   position: relative;
   z-index: 10;
   min-width: 0;
   width: 5px;
   margin-inline-end: -4px;
@@ -771,88 +652,38 @@ toolbar:not(:-moz-lwtheme) {
   background-color: transparent;
 }
 
 #attachmentBucketSize {
   padding-inline-end: 2px;
   color: GrayText;
 }
 
-#attachmentNotificationBox b {
-  font-weight: bold;
-}
-
-#attachmentNotificationBox > notification[image="null"] .messageImage {
-  background-image: url("chrome://messenger/skin/icons/attach.svg");
-}
-
 #compose-toolbar-sizer {
   position: relative;
   z-index: 10;
   min-height: 0;
   height: 5px;
   margin-top: -5px;
   border-top-width: 0;
   border-bottom-width: 0;
   background-color: transparent;
 }
 
 #subjectLabel {
   margin-top: 0;
 }
 
-.autocomplete-richlistitem:hover {
-  background-color: var(--arrowpanel-dimmed);
-}
-
-.autocomplete-richlistitem[selected] {
-  background-color: Highlight;
-  color: HighlightText;
-}
-
 /* ::::: autocomplete icons ::::: */
 
-html|span.ac-emphasize-text {
-  font-weight: bold;
-}
-
-.autocomplete-richlistitem:not([ac-comment=""]) > .ac-url,
-.autocomplete-richlistitem:not([ac-comment=""]) > .ac-separator {
-  display: -moz-box;
-}
-
-.autocomplete-richlistitem:not([ac-comment=""]) > .ac-url {
-  -moz-box-ordinal-group: 1;
-}
-
-.autocomplete-richlistitem:not([ac-comment=""]) > .ac-separator {
-  -moz-box-ordinal-group: 2;
-}
-
-.autocomplete-richlistitem:not([ac-comment=""]) > .ac-title {
-  -moz-box-ordinal-group: 3;
-}
-
 .ac-site-icon {
   display: -moz-box;
   margin: 1px 5px;
 }
 
-.autocomplete-richlistitem[type="local-abook"] > .ac-site-icon {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addrbook.png");
-}
-
-.autocomplete-richlistitem[type="remote-abook"] > .ac-site-icon {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/remote-addrbook.png");
-}
-
-.autocomplete-richlistitem[type="remote-err"] > .ac-site-icon {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/remote-addrbook-error.png");
-}
-
 .autocomplete-richlistitem[type="subscribed-news"] > .ac-site-icon {
   list-style-image: url("chrome://messenger/skin/icons/folder.png");
   -moz-image-region: rect(0 160px 16px 144px);
 }
 
 /* ::::: addressing widget ::::: */
 
 @media (-moz-windows-default-theme) {
@@ -1042,42 +873,8 @@ html|span.ac-emphasize-text {
   #headers-box {
     border-bottom-color: #aabccf;
   }
 
   #composeContentBox {
     background-image: url("chrome://messenger/skin/messengercompose/noise.png");
   }
 }
-
-/* ::::: Reorder Attachments Panel ::::: */
-
-#reorderAttachmentsPanel > .panel-arrowcontainer > .panel-arrowcontent {
-  --arrowpanel-padding: 4px;
-}
-
-#btn_moveAttachmentTop {
-  list-style-image: url("chrome://messenger/skin/icons/move-top.svg");
-}
-
-#btn_moveAttachmentUp {
-  list-style-image: url("chrome://messenger/skin/icons/move-up.svg");
-}
-
-#btn_moveAttachmentDown {
-  list-style-image: url("chrome://messenger/skin/icons/move-down.svg");
-}
-
-#btn_moveAttachmentBottom {
-  list-style-image: url("chrome://messenger/skin/icons/move-bottom.svg");
-}
-
-#btn_moveAttachmentBundleUp {
-  list-style-image: url("chrome://messenger/skin/icons/move-together.svg");
-}
-
-#btn_sortAttachmentsToggle {
-  list-style-image: url("chrome://messenger/skin/icons/sort.svg");
-}
-
-#btn_sortAttachmentsToggle[sortdirection="descending"] > .toolbarbutton-icon {
-  transform: scaleY(-1);
-}