Bug 1559176 - Make the Account Central use the dark theme when when 'prefers-color-scheme: dark' is set. r=aleca
authorRichard Marti <richard.marti@gmail.com>
Wed, 12 Jun 2019 17:01:34 +0200
changeset 35890 ab5f92797df27cba2bfa0a6cfd0f7926346689f4
parent 35889 f6ecf44bd9bef23513a7a4e473dc021b44269da1
child 35891 97ad6c0239473731c93b0b971dfaf03a46d834e1
push id392
push userclokep@gmail.com
push dateMon, 02 Sep 2019 20:17:19 +0000
reviewersaleca
bugs1559176
Bug 1559176 - Make the Account Central use the dark theme when when 'prefers-color-scheme: dark' is set. r=aleca
calendar/base/jar.mn
calendar/lightning/content/messenger-overlay-accountCentral.xul
calendar/lightning/jar.mn
calendar/lightning/themes/common/accountCentral.css
calendar/lightning/themes/linux/accountCentral.css
calendar/lightning/themes/osx/accountCentral.css
calendar/lightning/themes/windows/accountCentral.css
mail/installer/allowed-dupes.mn
mail/themes/linux/mail/accountCentral.css
mail/themes/osx/mail/accountCentral.css
mail/themes/shared/jar.inc.mn
mail/themes/shared/mail/accountCentral.css
mail/themes/windows/mail/accountCentral.css
--- a/calendar/base/jar.mn
+++ b/calendar/base/jar.mn
@@ -112,16 +112,17 @@ calendar.jar:
     ../icons/default/calendar-event-dialog.png        (themes/common/icons/calendar-event-dialog.png)
     ../icons/default/calendar-event-summary-dialog.png (themes/common/icons/calendar-event-summary-dialog.png)
     ../icons/default/calendar-task-dialog.png         (themes/common/icons/calendar-task-dialog.png)
     ../icons/default/calendar-task-summary-dialog.png (themes/common/icons/calendar-task-summary-dialog.png)
     ../skin/common/icons/address.svg                  (themes/common/icons/address.svg)
     ../skin/common/icons/alarm.svg                    (themes/common/icons/alarm.svg)
     ../skin/common/icons/alarm-no.svg                 (themes/common/icons/alarm-no.svg)
     ../skin/common/icons/attach.svg                   (themes/common/icons/attach.svg)
+    ../skin/common/icons/cal-icon24.png               (themes/linux/images/cal-icon24.png)
     ../skin/common/icons/calendar-tab.svg             (themes/common/icons/calendar-tab.svg)
     ../skin/common/icons/category.svg                 (themes/common/icons/category.svg)
     ../skin/common/icons/complete.svg                 (themes/common/icons/complete.svg)
     ../skin/common/icons/confidential.svg             (themes/common/icons/confidential.svg)
     ../skin/common/icons/decline.svg                  (themes/common/icons/decline.svg)
     ../skin/common/icons/delete.svg                   (themes/common/icons/delete.svg)
     ../skin/common/icons/edit.svg                     (themes/common/icons/edit.svg)
     ../skin/common/icons/email.svg                    (themes/common/icons/email.svg)
@@ -194,31 +195,29 @@ calendar.jar:
     ../skin/common/calendar-invitations-dialog-list-images.png   (themes/common/dialogs/images/calendar-invitations-dialog-list-images.png)
     ../skin/common/calendar-properties-dialog.css     (themes/common/dialogs/calendar-properties-dialog.css)
     ../skin/common/calendar-subscriptions-dialog.css  (themes/common/dialogs/calendar-subscriptions-dialog.css)
     ../skin/common/calendar-timezone-highlighter.css  (themes/common/dialogs/calendar-timezone-highlighter.css)
     ../skin/common/widgets/calendar-widgets.css       (themes/common/widgets/calendar-widgets.css)
     ../skin/common/widgets/minimonth.css              (themes/common/widgets/minimonth.css)
 
 # Linux theme files
-    ../skin/linux/calendar/cal-icon24.png                                 (themes/linux/images/cal-icon24.png)
     ../skin/linux/calendar/calendar-alarm-dialog.css                      (themes/linux/dialogs/calendar-alarm-dialog.css)
     ../skin/linux/calendar/calendar-daypicker.css                         (themes/linux/calendar-daypicker.css)
     ../skin/linux/calendar/calendar-event-dialog.css                      (themes/linux/dialogs/calendar-event-dialog.css)
     ../skin/linux/calendar/calendar-invitations-dialog.css                (themes/linux/dialogs/calendar-invitations-dialog.css)
     ../skin/linux/calendar/calendar-management.css                        (themes/linux/calendar-management.css)
     ../skin/linux/calendar/calendar-task-tree.css                         (themes/linux/calendar-task-tree.css)
     ../skin/linux/calendar/calendar-task-view.css                         (themes/linux/calendar-task-view.css)
     ../skin/linux/calendar/calendar-unifinder.css                         (themes/linux/calendar-unifinder.css)
     ../skin/linux/calendar/calendar-views.css                             (themes/linux/calendar-views.css)
     ../skin/linux/calendar/today-pane.css                                 (themes/linux/today-pane.css)
     ../skin/linux/calendar/widgets/calendar-widgets.css                   (themes/linux/widgets/calendar-widgets.css)
 
 # OS X theme files
-    ../skin/osx/calendar/cal-icon32.png                                 (themes/osx/images/cal-icon32.png)
     ../skin/osx/calendar/calendar-alarm-dialog.css                      (themes/osx/dialogs/calendar-alarm-dialog.css)
     ../skin/osx/calendar/calendar-daypicker.css                         (themes/osx/calendar-daypicker.css)
     ../skin/osx/calendar/calendar-event-dialog.css                      (themes/osx/dialogs/calendar-event-dialog.css)
     ../skin/osx/calendar/calendar-invitations-dialog.css                (themes/osx/dialogs/calendar-invitations-dialog.css)
     ../skin/osx/calendar/calendar-management.css                        (themes/osx/calendar-management.css)
     ../skin/osx/calendar/calendar-task-tree.css                         (themes/osx/calendar-task-tree.css)
     ../skin/osx/calendar/calendar-task-view.css                         (themes/osx/calendar-task-view.css)
     ../skin/osx/calendar/calendar-unifinder.css                         (themes/osx/calendar-unifinder.css)
@@ -226,17 +225,16 @@ calendar.jar:
     ../skin/osx/calendar/checkbox-images.png                            (themes/osx/images/checkbox-images.png)
     ../skin/osx/calendar/today-pane.css                                 (themes/osx/today-pane.css)
     ../skin/osx/calendar/widgets/calendar-widgets.css                   (themes/osx/widgets/calendar-widgets.css)
     ../skin/osx/calendar/checkbox-images-graphite.png                   (themes/osx/images/checkbox-images-graphite.png)
     ../skin/osx/calendar/locked-selected-mac.svg                        (themes/osx/images/locked-selected-mac.svg)
     ../skin/osx/calendar/warn-selected-mac.svg                          (themes/osx/images/warn-selected-mac.svg)
 
 # Windows theme files
-    ../skin/windows/calendar/cal-icon24.png                                 (themes/windows/images/cal-icon24.png)
     ../skin/windows/calendar/calendar-alarm-dialog.css                      (themes/windows/dialogs/calendar-alarm-dialog.css)
     ../skin/windows/calendar/calendar-daypicker.css                         (themes/windows/calendar-daypicker.css)
     ../skin/windows/calendar/calendar-event-dialog.css                      (themes/windows/dialogs/calendar-event-dialog.css)
     ../skin/windows/calendar/calendar-invitations-dialog.css                (themes/windows/dialogs/calendar-invitations-dialog.css)
     ../skin/windows/calendar/calendar-management.css                        (themes/windows/calendar-management.css)
     ../skin/windows/calendar/calendar-task-tree.css                         (themes/windows/calendar-task-tree.css)
     ../skin/windows/calendar/calendar-task-view.css                         (themes/windows/calendar-task-view.css)
     ../skin/windows/calendar/calendar-unifinder.css                         (themes/windows/calendar-unifinder.css)
--- a/calendar/lightning/content/messenger-overlay-accountCentral.xul
+++ b/calendar/lightning/content/messenger-overlay-accountCentral.xul
@@ -5,17 +5,17 @@
 
 <!DOCTYPE overlay [
   <!ENTITY % lightningDTD SYSTEM "chrome://lightning/locale/lightning.dtd">
   <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
   %lightningDTD;
   %globalDTD;
 ]>
 
-<?xml-stylesheet href="chrome://lightning/skin/accountCentral.css" type="text/css"?>
+<?xml-stylesheet href="chrome://lightning-common/skin/accountCentral.css" type="text/css"?>
 
 <overlay id="calendar-list-overlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
   <rows id="acctCentralRows">
     <spacer id="lightning-newCalendar-separator"
             flex="1"
             insertbefore="AccountsSection.spacer"/>
     <row id="lightning-newCalendar-row"
--- a/calendar/lightning/jar.mn
+++ b/calendar/lightning/jar.mn
@@ -22,17 +22,17 @@ lightning.jar:
 % overlay chrome://lightning/content/messenger-overlay-sidebar.xul chrome://calendar/content/calendar-unifinder-todo.xul
 % overlay chrome://lightning/content/messenger-overlay-sidebar.xul chrome://calendar/content/calendar-task-view.xul
 % overlay chrome://lightning/content/messenger-overlay-sidebar.xul chrome://calendar/content/today-pane.xul
 % overlay chrome://lightning/content/messenger-overlay-sidebar.xul chrome://lightning/content/suite-overlay-sidebar.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
 % overlay chrome://calendar/content/calendarCreation.xul chrome://lightning/content/lightning-calendar-creation.xul
 % overlay chrome://calendar/content/calendar-properties-dialog.xul chrome://lightning/content/lightning-calendar-properties.xul
 % overlay chrome://lightning/content/lightning-calendar-creation.xul chrome://lightning/content/caldav-lightning-calendar-creation.xul
 % overlay chrome://lightning/content/lightning-calendar-properties.xul chrome://lightning/content/caldav-lightning-calendar-properties.xul
-% override chrome://lightning/skin/accountCentral.css chrome://lightning-common/skin/suite-accountCentral.css application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
+% override chrome://lightning-common/skin/accountCentral.css chrome://lightning-common/skin/suite-accountCentral.css application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
 % content lightning %content/lightning/
     content/lightning/imip-bar.js                          (content/imip-bar.js)
     content/lightning/imip-bar-overlay.xul                 (content/imip-bar-overlay.xul)
     content/lightning/lightning-calendar-creation.xul      (content/lightning-calendar-creation.xul)
     content/lightning/lightning-calendar-creation.js       (content/lightning-calendar-creation.js)
     content/lightning/lightning-calendar-properties.xul    (content/lightning-calendar-properties.xul)
     content/lightning/lightning-calendar-properties.js     (content/lightning-calendar-properties.js)
     content/lightning/lightning-invitation.xhtml           (content/lightning-invitation.xhtml)
@@ -71,40 +71,38 @@ lightning.jar:
 % style chrome://messenger/content/customizeToolbar.xul chrome://lightning/skin/lightning-toolbar.css
 % style chrome://calendar/content/calendar-event-dialog.xul chrome://communicator/skin/communicator.css application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
 % style chrome://messenger/content/customizeToolbar.xul chrome://lightning-common/skin/lightning.css application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
 % style chrome://messenger/content/customizeToolbar.xul chrome://calendar-common/skin/dialogs/calendar-event-dialog.css application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
     ../skin/lightning-common/todayButton-arrow.svg            (themes/common/images/todayButton-arrow.svg)
     ../skin/lightning-common/suite-accountCentral.css         (themes/common/suite-accountCentral.css)
 
 # Linux theme files
-    ../skin/linux/lightning/accountCentral.css                (themes/linux/accountCentral.css)
     ../skin/linux/lightning/imip.css                          (themes/linux/imip.css)
     ../skin/linux/lightning/lightning.css                     (themes/linux/lightning.css)
     ../skin/linux/lightning/lightning-toolbar.css             (themes/linux/lightning-toolbar.css)
 
 # OS X theme files
-    ../skin/osx/lightning/accountCentral.css                  (themes/osx/accountCentral.css)
     ../skin/osx/lightning/imip.css                            (themes/osx/imip.css)
     ../skin/osx/lightning/lightning.css                       (themes/osx/lightning.css)
     ../skin/osx/lightning/lightning-toolbar.css               (themes/osx/lightning-toolbar.css)
 
 # Windows theme files
-    ../skin/windows/lightning/accountCentral.css              (themes/windows/accountCentral.css)
     ../skin/windows/lightning/imip.css                        (themes/windows/imip.css)
     ../skin/windows/lightning/lightning.css                   (themes/windows/lightning.css)
     ../skin/windows/lightning/lightning-toolbar.css           (themes/windows/lightning-toolbar.css)
 
 calendar.jar:
     content/calendar/calendarCreation.xul                  (../resources/content/calendarCreation.xul)
     content/calendar/calendarCreation.js                   (../resources/content/calendarCreation.js)
     content/calendar/datetimepickers/datetimepickers.js    (../resources/content/datetimepickers/datetimepickers.js)
     content/calendar/mouseoverPreviews.js                  (../resources/content/mouseoverPreviews.js)
     content/calendar/publish.js                            (../resources/content/publish.js)
     content/calendar/publishDialog.js                      (../resources/content/publishDialog.js)
     content/calendar/publishDialog.xul                     (../resources/content/publishDialog.xul)
     content/calendar/sound.wav                             (../resources/content/sound.wav)
     ../skin/lightning-common/datetimepickers.css           (../resources/skin/datetimepickers.css)
     ../skin/lightning-common/dialogOverlay.css             (../resources/skin/dialogOverlay.css)
+    ../skin/lightning-common/accountCentral.css            (themes/common/accountCentral.css)
     ../skin/lightning-common/imip.css                      (themes/common/imip.css)
     ../skin/lightning-common/lightning.css                 (themes/common/lightning.css)
     ../skin/lightning-common/lightning-toolbar.css         (themes/common/lightning-toolbar.css)
     ../skin/lightning-common/html-item-editing.css         (themes/common/html-item-editing.css)
rename from calendar/lightning/themes/windows/accountCentral.css
rename to calendar/lightning/themes/common/accountCentral.css
--- a/calendar/lightning/themes/windows/accountCentral.css
+++ b/calendar/lightning/themes/common/accountCentral.css
@@ -1,11 +1,11 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #lightning-newCalendar-row > hbox > label:-moz-locale-dir(rtl) {
-  background-position: right !important;
+  background-position: right;
 }
 
 #lightning-newCalendar-row > hbox > label {
-  background: url(chrome://calendar/skin/cal-icon24.png) no-repeat !important;
+  background: url(chrome://calendar-common/skin/icons/cal-icon24.png) no-repeat;
 }
deleted file mode 100644
--- a/calendar/lightning/themes/linux/accountCentral.css
+++ /dev/null
@@ -1,11 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#lightning-newCalendar-row > hbox > label:-moz-locale-dir(rtl) {
-  background-position: right !important;
-}
-
-#lightning-newCalendar-row > hbox > label {
-  background: url(chrome://calendar/skin/cal-icon24.png) no-repeat !important;
-}
deleted file mode 100644
--- a/calendar/lightning/themes/osx/accountCentral.css
+++ /dev/null
@@ -1,7 +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/. */
-
-#lightning-newCalendar-row > hbox > label {
-  background: url(chrome://calendar/skin/cal-icon32.png) no-repeat !important;
-}
--- a/mail/installer/allowed-dupes.mn
+++ b/mail/installer/allowed-dupes.mn
@@ -60,18 +60,16 @@ extensions/{e2fda1a4-762b-4020-b5ad-a41d
 extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/linux/lightning/imip.css
 extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/lightning/imip.css
 extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/linux/calendar/calendar-event-dialog.css
 extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/calendar/calendar-event-dialog.css
 extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/linux/calendar/calendar-invitations-dialog.css
 extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/calendar/calendar-invitations-dialog.css
 extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/linux/lightning/lightning-toolbar.css
 extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/osx/lightning/lightning-toolbar.css
-extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/linux/lightning/accountCentral.css
-extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/lightning/accountCentral.css
 extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/linux/calendar/calendar-daypicker.css
 extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/calendar/calendar-daypicker.css
 extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/linux/calendar/calendar-alarm-dialog.css
 extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/calendar/calendar-alarm-dialog.css
 extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/linux/calendar/calendar-management.css
 extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/calendar/calendar-management.css
 extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/linux/calendar/widgets/calendar-widgets.css
 extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/calendar/widgets/calendar-widgets.css
@@ -93,18 +91,16 @@ distribution/extensions/{e2fda1a4-762b-4
 distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/linux/lightning/imip.css
 distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/lightning/imip.css
 distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/linux/calendar/calendar-event-dialog.css
 distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/calendar/calendar-event-dialog.css
 distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/linux/calendar/calendar-invitations-dialog.css
 distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/calendar/calendar-invitations-dialog.css
 distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/linux/lightning/lightning-toolbar.css
 distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/osx/lightning/lightning-toolbar.css
-distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/linux/lightning/accountCentral.css
-distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/lightning/accountCentral.css
 distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/linux/calendar/calendar-daypicker.css
 distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/calendar/calendar-daypicker.css
 distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/linux/calendar/calendar-alarm-dialog.css
 distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/calendar/calendar-alarm-dialog.css
 distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/linux/calendar/calendar-management.css
 distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/calendar/calendar-management.css
 distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/linux/calendar/widgets/calendar-widgets.css
 distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/calendar/widgets/calendar-widgets.css
--- a/mail/themes/linux/mail/accountCentral.css
+++ b/mail/themes/linux/mail/accountCentral.css
@@ -1,158 +1,51 @@
 /* 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/. */
 
 /* ===== accountCentral.css ==========================================
   == Styles for the Messenger Account Central panel.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-#acctCentralGrid {
-  background-color: -moz-Field;
-  color: -moz-FieldText;
-}
-
-spacer {
-  max-height: .5em;
-}
-
-spacer.big {
-  max-height: 4em;
-}
-
-/* ::::: rows ::::: */
-
-#acctCentralHeaderRow {
-  padding-top: 10px;
-  padding-bottom: 10px;
-  padding-inline-start: 10px;
-  padding-inline-end: 0px;
-  font-size: 180%;
-  font-weight: bold;
-}
-
-.acctCentralRow {
-  margin-inline-start: 10px;
-  font-size: 125%;
-}
-
-.row-iconic-icon {
-  list-style-image: inherit;
-  margin-inline-end: 10px;
-}
-
-.acctCentralRowTitleBox {
-  background-color: ButtonFace;
-  border: 1px solid ThreeDDarkShadow;
-  margin: 15px 6px 0px;
-  border-radius: 3px;
-  color: -moz-DialogText;
-  padding-top: 2px;
-  padding-bottom: 0;
-  padding-inline-start: 8px;
-  padding-inline-end: 4px;
-  font-size: 150%;
-  font-weight: bold;
-}
+@import url("chrome://messenger/skin/shared/accountCentral.css");
 
 /* ::::: links ::::: */
 
-.acctCentralText {
-  padding-inline-start: 45px;
-  margin-top: .55em;
-  margin-bottom: .55em;
-  min-height: 24px; /* icon height */
-}
-
-.acctCentralNewAcctText {
-  color: WindowText;
-  padding-inline-start: 20px;
-  padding-inline-end: 10px;
-}
-
-.acctCentralLinkText {
-  cursor: pointer;
-}
-
-.acctCentralLinkText:hover,
-.acctCentralLinkText:focus {
-  color: -moz-nativehyperlinktext;
-}
-
-.acctCentralLinkText:active {
-  color: -moz-activehyperlinktext;
-}
-
-#CreateAccountsList {
-  display: block;
-  padding-inline-start: 45px;
-  margin-bottom: .7em;
-}
-
 #ReadMessages label {
-  background: url("chrome://messenger/skin/accountcentral/read-messages.png")  no-repeat !important;
-}
-
-#ReadMessages label:-moz-locale-dir(rtl) {
-  background: url("chrome://messenger/skin/accountcentral/read-messages.png") right no-repeat !important;
+  background: url("chrome://messenger/skin/accountcentral/read-messages.png")  no-repeat;
 }
 
 #ComposeMessage label {
-  background: url("chrome://messenger/skin/accountcentral/write-message.png")  no-repeat !important;
-}
-
-#ComposeMessage label:-moz-locale-dir(rtl) {
-  background: url("chrome://messenger/skin/accountcentral/write-message.png") right no-repeat !important;
+  background: url("chrome://messenger/skin/accountcentral/write-message.png")  no-repeat;
 }
 
 #AccountSettings label {
-  background: url("chrome://messenger/skin/accountcentral/account-settings.png")  no-repeat !important;
-}
-
-#AccountSettings label:-moz-locale-dir(rtl) {
-  background: url("chrome://messenger/skin/accountcentral/account-settings.png") right no-repeat !important;
+  background: url("chrome://messenger/skin/accountcentral/account-settings.png")  no-repeat;
 }
 
 #CreateAccount label {
-  background: url("chrome://messenger/skin/accountcentral/create-account.png")  no-repeat !important;
-  background-position: 0% -2px !important;
+  background: url("chrome://messenger/skin/accountcentral/create-account.png")  no-repeat;
+  background-position: 0% -2px;
 }
 
 #CreateAccount label:-moz-locale-dir(rtl) {
-  background: url("chrome://messenger/skin/accountcentral/create-account.png") right no-repeat !important;
-  background-position: 0% -2px !important;
+  background-position: 100% -2px;
 }
 
 #SearchMessages label {
-  background: url("chrome://messenger/skin/accountcentral/search-messages.png")  no-repeat !important;
-}
-
-#SearchMessages label:-moz-locale-dir(rtl) {
-  background: url("chrome://messenger/skin/accountcentral/search-messages.png") right no-repeat !important;
+  background: url("chrome://messenger/skin/accountcentral/search-messages.png")  no-repeat;
 }
 
 #CreateFilters label {
-  background: url("chrome://messenger/skin/accountcentral/manage-filters.png")  no-repeat !important;
-}
-
-#CreateFilters label:-moz-locale-dir(rtl) {
-  background: url("chrome://messenger/skin/accountcentral/manage-filters.png") right no-repeat !important;
+  background: url("chrome://messenger/skin/accountcentral/manage-filters.png")  no-repeat;
 }
 
 #OfflineSettings label {
-  background: url("chrome://messenger/skin/accountcentral/offline-settings.png")  no-repeat !important;
-}
-
-#OfflineSettings label:-moz-locale-dir(rtl) {
-  background: url("chrome://messenger/skin/accountcentral/offline-settings.png") right no-repeat !important;
+  background: url("chrome://messenger/skin/accountcentral/offline-settings.png")  no-repeat;
 }
 
 #CreateAccountMail,
 #CreateAccountMovemail {
   background-image: -moz-image-rect(url("chrome://messenger/skin/icons/folder-pane.png"), 16, 16, 32, 0);
   background-repeat: no-repeat;
 }
 
@@ -166,40 +59,19 @@ spacer.big {
   background-repeat: no-repeat;
 }
 
 #CreateAccountRSS {
   background-image: -moz-image-rect(url("chrome://messenger-newsblog/skin/rss-feed.png"), 0, 16, 16, 0);
   background-repeat: no-repeat;
 }
 
-#CreateAccountMail:-moz-locale-dir(rtl),
-#CreateAccountMovemail:-moz-locale-dir(rtl),
-#CreateAccountChat:-moz-locale-dir(rtl),
-#CreateAccountNewsgroups:-moz-locale-dir(rtl),
-#CreateAccountRSS:-moz-locale-dir(rtl) {
-  background-position: right center;
-}
-
 #SubscribeImapFolders label {
-  background: url("chrome://messenger/skin/accountcentral/manage-imap.png")  no-repeat !important;
-}
-
-#SubscribeImapFolders label:-moz-locale-dir(rtl) {
-  background: url("chrome://messenger/skin/accountcentral/manage-imap.png") right no-repeat !important;
+  background: url("chrome://messenger/skin/accountcentral/manage-imap.png")  no-repeat;
 }
 
 #SubscribeNewsgroups label {
-  background: url("chrome://messenger/skin/accountcentral/manage-newsgroups.png")  no-repeat !important;
-}
-
-#SubscribeNewsgroups label:-moz-locale-dir(rtl) {
-  background: url("chrome://messenger/skin/accountcentral/manage-newsgroups.png") right no-repeat !important;
+  background: url("chrome://messenger/skin/accountcentral/manage-newsgroups.png")  no-repeat;
 }
 
 #SubscribeRSS label {
-  background: url("chrome://messenger/skin/accountcentral/manage-rss.png")  no-repeat !important;
+  background: url("chrome://messenger/skin/accountcentral/manage-rss.png")  no-repeat;
 }
-
-#SubscribeRSS label:-moz-locale-dir(rtl) {
-  background: url("chrome://messenger/skin/accountcentral/manage-rss.png") right no-repeat !important;
-}
-
--- a/mail/themes/osx/mail/accountCentral.css
+++ b/mail/themes/osx/mail/accountCentral.css
@@ -1,153 +1,81 @@
 /* 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/. */
 
 /* ===== accountCentral.css ==========================================
   == Styles for the Messenger Account Central panel.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@import url("chrome://messenger/skin/shared/accountCentral.css");
 
 #acctCentralGrid {
-  background-color: -moz-Field;
-  color: -moz-FieldText;
-}
-
-spacer {
-  display: none;
-}
-
-/* ::::: rows ::::: */
-
-#acctCentralHeaderRow {
-  padding-top: 10px;
-  padding-bottom: 5px;
-  padding-inline-start: 10px;
-  padding-inline-end: 0px;
   font: menu;
-  font-weight: bold;
-  font-size: 150%;
-  margin: 0px;
 }
 
-.acctCentralRow {
-  height: 48px;
-  margin: 0px 20px !important;
-}
-
-.acctCentralRow > hbox {
-  margin: 0px 6px;
-  padding: 8px 7px;
-}
-
-
-.row-iconic-icon {
-  list-style-image: inherit;
-  margin-inline-end: 10px;
-}
-
-.acctCentralRowTitleBox {
-  background-color: -moz-Dialog;
-  border: 1px solid ThreeDDarkShadow;
-  color: -moz-DialogText;
-  margin: 15px 6px 0px;
-  border-top-left-radius: 7px;
-  border-top-right-radius: 7px;
-  padding-top: 4px;
-  padding-bottom: 2px;
-  padding-inline-start: 8px;
-  padding-inline-end: 4px;
-  font-weight: bold;
-  font: menu;
+.acctCentralText {
+  padding-top: 3px;
 }
 
 /* ::::: links ::::: */
 
-.acctCentralText {
-  padding-inline-start: 50px;
-  font-size: 11px;
-  padding-top: 7px;
-  min-height: 32px;
-}
-
-.acctCentralNewAcctText {
-  padding-inline-start: 20px;
-  padding-inline-end: 10px;
-  min-height: 20px;
-}
-
-.acctCentralLinkText {
-  cursor: pointer;
-}
-
-.acctCentralLinkText:hover {
-  color: -moz-nativehyperlinktext;
-  text-decoration: underline;
-}
-
-.acctCentralLinkText:hover,
-.acctCentralLinkText:focus {
-  color: -moz-activehyperlinktext;
-}
-
-#CreateAccounts {
-  height: 30px;
-}
-
-#CreateAccountsList {
-  display: block;
-  padding-inline-start: 50px;
-}
-
 #ReadMessages label {
-  background: url("chrome://messenger/skin/accountcentral/mailbox.png")  no-repeat !important;
+  background: url("chrome://messenger/skin/accountcentral/mailbox.png") no-repeat;
+  background-size: 24px 24px;
 }
 
 #ComposeMessage label {
-  background: url("chrome://messenger/skin/accountcentral/writemail.png")  no-repeat !important;
+  background: url("chrome://messenger/skin/accountcentral/writemail.png") no-repeat;
+  background-size: 24px 24px;
 }
 
 #JunkSettingsMail label {
-  background: url("chrome://messenger/skin/accountcentral/junk.png")  no-repeat !important;
+  background: url("chrome://messenger/skin/accountcentral/junk.png") no-repeat;
+  background-size: 24px 24px;
 }
 
 #SubscribeNewsgroups label {
-  background: url("chrome://messenger/skin/accountcentral/manage-subscriptions.png")  no-repeat !important;
+  background: url("chrome://messenger/skin/accountcentral/manage-subscriptions.png") no-repeat;
+  background-size: 24px 24px;
 }
 
 #AccountSettings label {
-  background: url("chrome://messenger/skin/accountcentral/accountsettings.png")  no-repeat !important;
+  background: url("chrome://messenger/skin/accountcentral/accountsettings.png") no-repeat;
+  background-size: 24px 24px;
 }
 
 #CreateAccount label {
-  background: url("chrome://messenger/skin/accountcentral/newaccount.png")  no-repeat !important;
+  background: url("chrome://messenger/skin/accountcentral/newaccount.png") no-repeat;
+  background-size: 24px 24px;
 }
 
 #SearchMessages label {
-  background: url("chrome://messenger/skin/accountcentral/search-messages.png")  no-repeat !important;
+  background: url("chrome://messenger/skin/accountcentral/search-messages.png") no-repeat;
+  background-size: 24px 24px;
 }
 
 #CreateFilters label {
-  background: url("chrome://messenger/skin/accountcentral/mailbox.png")  no-repeat !important;
+  background: url("chrome://messenger/skin/accountcentral/mailbox.png") no-repeat;
+  background-size: 24px 24px;
 }
 
 #SubscribeImapFolders label {
-  background: url("chrome://messenger/skin/accountcentral/folder.png")  no-repeat !important;
+  background: url("chrome://messenger/skin/accountcentral/folder.png") no-repeat;
+  background-size: 24px 24px;
 }
 
 #SubscribeRSS label {
-  background: url("chrome://messenger/skin/accountcentral/manage-rss.png")  no-repeat !important;
+  background: url("chrome://messenger/skin/accountcentral/manage-rss.png") no-repeat;
+  background-size: 24px 24px;
 }
 
 #OfflineSettings label {
-  background: url("chrome://messenger/skin/accountcentral/offline.png")  no-repeat !important;
+  background: url("chrome://messenger/skin/accountcentral/offline.png") no-repeat;
+  background-size: 24px 24px;
 }
 
 #CreateAccountMail,
 #CreateAccountMovemail {
   background-image: -moz-image-rect(url("chrome://messenger/skin/icons/server.png"), 0, 16, 16, 0);
   background-repeat: no-repeat;
 }
 
@@ -162,72 +90,68 @@ spacer {
 
 #CreateAccountRSS {
   background-image: -moz-image-rect(url("chrome://messenger-newsblog/skin/rss-feed.png"), 0, 16, 16, 0);
   background-repeat: no-repeat;
 }
 
 @media (min-resolution: 2dppx) {
   #ReadMessages label {
-    background: url("chrome://messenger/skin/accountcentral/mailbox@2x.png")  no-repeat !important;
-    background-size: 32px 32px !important;
+    background: url("chrome://messenger/skin/accountcentral/mailbox@2x.png") no-repeat;
+    background-size: 24px 24px;
   }
 
   #ComposeMessage label {
-    background: url("chrome://messenger/skin/accountcentral/writemail@2x.png")  no-repeat !important;
-    background-size: 32px 32px !important;
+    background: url("chrome://messenger/skin/accountcentral/writemail@2x.png") no-repeat;
+    background-size: 24px 24px;
   }
 
   #JunkSettingsMail label {
-    background: url("chrome://messenger/skin/accountcentral/junk@2x.png")  no-repeat !important;
-    background-size: 32px 32px !important;
+    background: url("chrome://messenger/skin/accountcentral/junk@2x.png") no-repeat;
+    background-size: 24px 24px;
   }
 
   #SubscribeNewsgroups label {
-    background: url("chrome://messenger/skin/accountcentral/manage-subscriptions@2x.png")  no-repeat !important;
-    background-size: 32px 32px !important;
+    background: url("chrome://messenger/skin/accountcentral/manage-subscriptions@2x.png") no-repeat;
+    background-size: 24px 24px;
   }
 
   #AccountSettings label {
-    background: url("chrome://messenger/skin/accountcentral/accountsettings@2x.png")  no-repeat !important;
-    background-size: 32px 32px !important;
+    background: url("chrome://messenger/skin/accountcentral/accountsettings@2x.png") no-repeat;
+    background-size: 24px 24px;
   }
 
   #CreateAccount label {
-    background: url("chrome://messenger/skin/accountcentral/newaccount@2x.png")  no-repeat !important;
-    background-size: 32px 32px !important;
+    background: url("chrome://messenger/skin/accountcentral/newaccount@2x.png") no-repeat;
+    background-size: 24px 24px;
   }
 
   #SearchMessages label {
-    background: url("chrome://messenger/skin/accountcentral/search-messages@2x.png")  no-repeat !important;
-    background-size: 32px 32px !important;
+    background: url("chrome://messenger/skin/accountcentral/search-messages@2x.png") no-repeat;
+    background-size: 24px 24px;
   }
 
   #CreateFilters label {
-    background: url("chrome://messenger/skin/accountcentral/mailbox@2x.png")  no-repeat !important;
-    background-size: 32px 32px !important;
+    background: url("chrome://messenger/skin/accountcentral/mailbox@2x.png") no-repeat;
+    background-size: 24px 24px;
   }
 
   #SubscribeImapFolders label {
-    background: url("chrome://messenger/skin/accountcentral/folder@2x.png")  no-repeat !important;
-    background-size: 32px 32px !important;
+    background: url("chrome://messenger/skin/accountcentral/folder@2x.png") no-repeat;
+    background-size: 24px 24px;
   }
 
   #SubscribeRSS label {
-    background: url("chrome://messenger/skin/accountcentral/manage-rss@2x.png")  no-repeat !important;
-    background-size: 32px 32px !important;
+    background: url("chrome://messenger/skin/accountcentral/manage-rss@2x.png") no-repeat;
+    background-size: 24px 24px;
   }
 
   #OfflineSettings label {
-    background: url("chrome://messenger/skin/accountcentral/offline@2x.png")  no-repeat !important;
-    background-size: 32px 32px !important;
-  }
-
-  .acctCentralNewAcctText {
-    min-height: 32px;
+    background: url("chrome://messenger/skin/accountcentral/offline@2x.png") no-repeat;
+    background-size: 24px 24px;
   }
 
   #CreateAccountMail,
   #CreateAccountMovemail {
     background-image: -moz-image-rect(url("chrome://messenger/skin/icons/server@2x.png"), 0, 32, 32, 0);
     background-size: 16px 16px;
   }
 
--- a/mail/themes/shared/jar.inc.mn
+++ b/mail/themes/shared/jar.inc.mn
@@ -93,16 +93,17 @@
   skin/classic/messenger/icons/stop.svg                       (../shared/mail/icons/stop.svg)
   skin/classic/messenger/icons/tag.svg                        (../shared/mail/icons/tag.svg)
   skin/classic/messenger/icons/thread-col.svg                 (../shared/mail/icons/thread-col.svg)
   skin/classic/messenger/icons/tick.png                       (../shared/mail/icons/tick.png)
   skin/classic/messenger/icons/timeline.svg                   (../shared/mail/icons/timeline.svg)
   skin/classic/messenger/icons/toolbarbutton-arrow.svg        (../shared/mail/icons/toolbarbutton-arrow.svg)
   skin/classic/messenger/icons/userIcon.svg                   (../shared/mail/icons/userIcon.svg)
   skin/classic/messenger/icons/waiting.svg                    (../shared/mail/icons/waiting.svg)
+  skin/classic/messenger/shared/accountCentral.css            (../shared/mail/accountCentral.css)
   skin/classic/messenger/shared/accountCreation.css           (../shared/mail/accountCreation.css)
   skin/classic/messenger/shared/accountProvisioner.css        (../shared/mail/accountProvisioner.css)
   skin/classic/messenger/shared/addressbook.css               (../shared/mail/addressbook.css)
   skin/classic/messenger/shared/compacttheme.css              (../shared/mail/compacttheme.css)
   skin/classic/messenger/shared/in-content/dialog.css         (../shared/mail/incontentprefs/dialog.css)
   skin/classic/messenger/shared/in-content/aboutPreferences.css (../shared/mail/incontentprefs/aboutPreferences.css)
   skin/classic/messenger/shared/in-content/account.svg        (../shared/mail/incontentprefs/account.svg)
   skin/classic/messenger/shared/in-content/advanced.svg       (../shared/mail/incontentprefs/advanced.svg)
new file mode 100644
--- /dev/null
+++ b/mail/themes/shared/mail/accountCentral.css
@@ -0,0 +1,130 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@import url("chrome://messenger/skin/");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+:root {
+  --body-background-color: -moz-Field;
+  --body-text-color: -moz-FieldText;
+  --head-background-color: ButtonFace;
+  --head-text-color: -moz-DialogText;
+  --head-border-color: ThreeDDarkShadow;
+  --link-color-hover: -moz-nativehyperlinktext;
+  --link-color-active: -moz-activehyperlinktext;
+}
+
+@media (prefers-color-scheme: dark) {
+  :root {
+    --body-background-color: #2a2a2e;
+    --body-text-color: rgb(249, 249, 250);
+    --head-background-color: #4a4a4f;
+    --head-text-color: var(--body-text-color);
+    --head-border-color: #737373;
+    --link-color-hover: #0060df;
+    --link-color-active: #003eaa;
+  }
+}
+
+#acctCentralGrid {
+  background-color: var(--body-background-color);
+  color: var(--body-text-color);
+}
+
+spacer {
+  max-height: .4em;
+}
+
+spacer.big {
+  max-height: 3em;
+}
+
+#acctCentralHeaderRow {
+  padding-top: 10px;
+  padding-bottom: 10px;
+  padding-inline-start: 10px;
+  padding-inline-end: 0;
+  font-size: 160%;
+  font-weight: bold;
+}
+
+.acctCentralRowTitleBox {
+  background-color: var(--head-background-color);
+  border: 1px solid var(--head-border-color);
+  margin: 15px 6px 0;
+  border-radius: 3px;
+  color: var(--head-text-color);
+  padding-top: 2px;
+  padding-bottom: 0;
+  padding-inline-start: 8px;
+  padding-inline-end: 4px;
+  font-size: 150%;
+  font-weight: bold;
+}
+
+.acctCentralRow {
+  margin-inline-start: 10px;
+  font-size: 125%;
+}
+
+.acctCentralRow > hbox {
+  margin-inline-start: 6px;
+}
+
+.row-iconic-icon {
+  list-style-image: inherit;
+  margin-inline-end: 10px;
+}
+
+.acctCentralText {
+  padding-inline-start: 45px;
+  margin-top: .5em;
+  margin-bottom: .5em;
+  min-height: 24px; /* icon height */
+}
+
+.acctCentralNewAcctText {
+  padding-inline-start: 20px;
+  padding-inline-end: 10px;
+}
+
+.acctCentralLinkText {
+  cursor: pointer;
+}
+
+.acctCentralLinkText:hover,
+.acctCentralLinkText:focus {
+  color: var(--link-color-hover);
+  text-decoration: underline;
+}
+
+.acctCentralLinkText:active {
+  color: var(--link-color-active);
+}
+
+#CreateAccountsList {
+  display: block;
+  padding-inline-start: 45px;
+  margin-bottom: .6em;
+}
+
+#ReadMessages label:-moz-locale-dir(rtl),
+#ComposeMessage label:-moz-locale-dir(rtl),
+#AccountSettings label:-moz-locale-dir(rtl),
+#CreateAccount label:-moz-locale-dir(rtl),
+#SearchMessages label:-moz-locale-dir(rtl),
+#CreateFilters label:-moz-locale-dir(rtl),
+#OfflineSettings label:-moz-locale-dir(rtl),
+#CreateAccountMail:-moz-locale-dir(rtl),
+#CreateAccountMovemail:-moz-locale-dir(rtl),
+#CreateAccountChat:-moz-locale-dir(rtl),
+#CreateAccountNewsgroups:-moz-locale-dir(rtl),
+#CreateAccountRSS:-moz-locale-dir(rtl),
+#SubscribeImapFolders label:-moz-locale-dir(rtl),
+#SubscribeNewsgroups label:-moz-locale-dir(rtl),
+#SubscribeRSS label:-moz-locale-dir(rtl),
+#JunkSettingsMail label:-moz-locale-dir(rtl) {
+  background-position: right center;
+}
--- a/mail/themes/windows/mail/accountCentral.css
+++ b/mail/themes/windows/mail/accountCentral.css
@@ -1,162 +1,61 @@
 /* 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/. */
 
 /* ===== accountCentral.css ==========================================
   == Styles for the Messenger Account Central panel.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-#acctCentralGrid {
-  background-color: Window;
-}
-
-spacer {
-  max-height: .5em;
-}
-
-spacer.big {
-  max-height: 4em;
-}
-
-/* ::::: rows ::::: */
-
-#acctCentralHeaderRow {
-  padding-top: 10px;
-  padding-bottom: 10px;
-  padding-inline-start: 10px;
-  padding-inline-end: 0px;
-  font-size: 180%;
-  font-weight: bold;
-  color: WindowText;
-}
-
-.acctCentralRow {
-  margin-inline-start: 10px;
-  font-size: 125%;
-  color: #000000;
-}
-
-.row-iconic-icon {
-  list-style-image: inherit;
-  margin-inline-end: 10px;
-}
-
-.acctCentralRowTitleBox {
-  background-color: ButtonFace;
-  border: 1px solid ThreeDDarkShadow;
-  margin: 15px 6px 0px;
-  border-radius: 3px;
-  color: -moz-DialogText;
-  padding-top: 2px;
-  padding-bottom: 0;
-  padding-inline-start: 8px;
-  padding-inline-end: 4px;
-  font-size: 150%;
-  font-weight: bold;
-}
+@import url("chrome://messenger/skin/shared/accountCentral.css");
 
 /* ::::: links ::::: */
 
-.acctCentralText {
-  color: WindowText;
-  padding-inline-start: 45px;
-  margin-top: .55em;
-  margin-bottom: .55em;
-  min-height: 24px; /* icon height */
-}
-
 .acctCentralNewAcctText {
-  color: WindowText;
-  padding-inline-start: 20px;
-  padding-inline-end: 10px;
-  background-position: 0 2px;
+  background-position: 0 4px;
 }
 
-.acctCentralLinkText {
-  cursor: pointer;
-}
-
-.acctCentralLinkText:hover,
-.acctCentralLinkText:focus {
-  color: -moz-NativehyperlinkText;
-}
-
-.acctCentralLinkText:hover:active {
-  color: -moz-html-CellHighlight;
-}
-
-#CreateAccountsList {
-  display: block;
-  padding-inline-start: 45px;
-  margin-bottom: .6em;
+.acctCentralNewAcctText:-moz-locale-dir(rtl) {
+  background-position: 100% 4px;
 }
 
 #ReadMessages label {
-  background: url("chrome://messenger/skin/accountcentral/read-messages.png") no-repeat !important;
-}
-
-#ReadMessages label:-moz-locale-dir(rtl) {
-  background: url("chrome://messenger/skin/accountcentral/read-messages.png") right no-repeat !important;
+  background: url("chrome://messenger/skin/accountcentral/read-messages.png") no-repeat;
 }
 
 #ComposeMessage label {
-  background: url("chrome://messenger/skin/accountcentral/write-message.png") no-repeat !important;
-}
-
-#ComposeMessage label:-moz-locale-dir(rtl) {
-  background: url("chrome://messenger/skin/accountcentral/write-message.png") right no-repeat !important;
+  background: url("chrome://messenger/skin/accountcentral/write-message.png") no-repeat;
 }
 
 #AccountSettings label {
-  background: url("chrome://messenger/skin/accountcentral/account-settings.png") no-repeat !important;
-}
-
-#AccountSettings label:-moz-locale-dir(rtl) {
-  background: url("chrome://messenger/skin/accountcentral/account-settings.png") right no-repeat !important;
+  background: url("chrome://messenger/skin/accountcentral/account-settings.png") no-repeat;
 }
 
 #CreateAccount label {
-  background: url("chrome://messenger/skin/accountcentral/create-account.png") no-repeat !important;
-  background-position: 0% -4px !important;
+  background: url("chrome://messenger/skin/accountcentral/create-account.png") no-repeat;
+  background-position: 0% -4px;
 }
 
 #CreateAccount label:-moz-locale-dir(rtl) {
-  background: url("chrome://messenger/skin/accountcentral/create-account.png") right no-repeat !important;
-  background-position: 0% -4px !important;
+  background-position: 100% -4px;
 }
 
 #SearchMessages label {
-  background: url("chrome://messenger/skin/accountcentral/search-messages.png") no-repeat !important;
-}
-
-#SearchMessages label:-moz-locale-dir(rtl) {
-  background: url("chrome://messenger/skin/accountcentral/search-messages.png") right no-repeat !important;
+  background: url("chrome://messenger/skin/accountcentral/search-messages.png") no-repeat;
 }
 
 #CreateFilters label {
-  background: url("chrome://messenger/skin/accountcentral/manage-filters.png") no-repeat !important;
-}
-
-#CreateFilters label:-moz-locale-dir(rtl) {
-  background: url("chrome://messenger/skin/accountcentral/manage-filters.png") right no-repeat !important;
+  background: url("chrome://messenger/skin/accountcentral/manage-filters.png") no-repeat;
 }
 
 #OfflineSettings label {
-  background: url("chrome://messenger/skin/accountcentral/offline-settings.png") no-repeat !important;
+  background: url("chrome://messenger/skin/accountcentral/offline-settings.png") no-repeat;
 }
 
-#OfflineSettings label:-moz-locale-dir(rtl) {
-  background: url("chrome://messenger/skin/accountcentral/offline-settings.png") right no-repeat !important;
-}
 #CreateAccountChat {
   background-image: url("chrome://chat/skin/chat-16.png");
   background-repeat: no-repeat;
 }
 
 #CreateAccountMail,
 #CreateAccountMovemail {
   background-image: -moz-image-rect(url("chrome://messenger/skin/icons/server.png"), 0, 16, 16, 0);
@@ -168,47 +67,23 @@ spacer.big {
   background-repeat: no-repeat;
 }
 
 #CreateAccountRSS {
   background-image: -moz-image-rect(url("chrome://messenger-newsblog/skin/rss-feed.png"), 0, 16, 16, 0);
   background-repeat: no-repeat;
 }
 
-#CreateAccountMail:-moz-locale-dir(rtl),
-#CreateAccountMovemail:-moz-locale-dir(rtl),
-#CreateAccountChat:-moz-locale-dir(rtl),
-#CreateAccountNewsgroups:-moz-locale-dir(rtl),
-#CreateAccountRSS:-moz-locale-dir(rtl) {
-  background-position: right center;
-}
-
 #SubscribeImapFolders label {
-  background: url("chrome://messenger/skin/accountcentral/manage-imap.png") no-repeat !important;
-}
-
-#SubscribeImapFolders label:-moz-locale-dir(rtl) {
-  background: url("chrome://messenger/skin/accountcentral/manage-imap.png") right no-repeat !important;
+  background: url("chrome://messenger/skin/accountcentral/manage-imap.png") no-repeat;
 }
 
 #SubscribeNewsgroups label {
-  background: url("chrome://messenger/skin/accountcentral/manage-newsgroups.png") no-repeat !important;
-}
-
-#SubscribeNewsgroups label:-moz-locale-dir(rtl) {
-  background: url("chrome://messenger/skin/accountcentral/manage-newsgroups.png") right no-repeat !important;
+  background: url("chrome://messenger/skin/accountcentral/manage-newsgroups.png") no-repeat;
 }
 
 #SubscribeRSS label {
-  background: url("chrome://messenger/skin/accountcentral/manage-rss.png") no-repeat !important;
-}
-
-#SubscribeRSS label:-moz-locale-dir(rtl) {
-  background: url("chrome://messenger/skin/accountcentral/manage-rss.png") right no-repeat !important;
+  background: url("chrome://messenger/skin/accountcentral/manage-rss.png") no-repeat;
 }
 
 #JunkSettingsMail label {
-  background: url("chrome://messenger/skin/accountcentral/junk.png") no-repeat !important;
+  background: url("chrome://messenger/skin/accountcentral/junk.png") no-repeat;
 }
-
-#JunkSettingsMail label:-moz-locale-dir(rtl) {
-  background: url("chrome://messenger/skin/accountcentral/junk.png") right no-repeat !important;
-}