Adding upstream version 1:115.7.0.upstream/1%115.7.0upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

78 files changed, 2242 insertions, 0 deletions

diff --git a/comm/mail/themes/osx/editor/EditorDialog.css b/comm/mail/themes/osx/editor/EditorDialog.css
new file mode 100644
index 0000000000..41b2e53542
--- /dev/null
+++ b/comm/mail/themes/osx/editor/EditorDialog.css
@@ -0,0 +1,18 @@
+/* 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/shared/EditorDialog.css");
+
+groupbox {
+  padding: 0 8px 5px;
+  margin: 6px;
+  margin-top: 1.5em;
+}
+
+groupbox > .groupbox-title > .header {
+  font-size: 1.18em;
+  margin-top: -1.3em;
+  margin-bottom: 5px;
+  margin-inline-start: -5px;
+}
diff --git a/comm/mail/themes/osx/editor/img-align-bottom.gif b/comm/mail/themes/osx/editor/img-align-bottom.gif
new file mode 100644
index 0000000000..a8ba157970
--- /dev/null
+++ b/comm/mail/themes/osx/editor/img-align-bottom.gif
diff --git a/comm/mail/themes/osx/editor/img-align-left.gif b/comm/mail/themes/osx/editor/img-align-left.gif
new file mode 100644
index 0000000000..117b93fcaf
--- /dev/null
+++ b/comm/mail/themes/osx/editor/img-align-left.gif
diff --git a/comm/mail/themes/osx/editor/img-align-middle.gif b/comm/mail/themes/osx/editor/img-align-middle.gif
new file mode 100644
index 0000000000..4189f7ac33
--- /dev/null
+++ b/comm/mail/themes/osx/editor/img-align-middle.gif
diff --git a/comm/mail/themes/osx/editor/img-align-right.gif b/comm/mail/themes/osx/editor/img-align-right.gif
new file mode 100644
index 0000000000..8e679f50a4
--- /dev/null
+++ b/comm/mail/themes/osx/editor/img-align-right.gif
diff --git a/comm/mail/themes/osx/editor/img-align-top.gif b/comm/mail/themes/osx/editor/img-align-top.gif
new file mode 100644
index 0000000000..d871945929
--- /dev/null
+++ b/comm/mail/themes/osx/editor/img-align-top.gif
diff --git a/comm/mail/themes/osx/jar.mn b/comm/mail/themes/osx/jar.mn
new file mode 100644
index 0000000000..a9641e5eb5
--- /dev/null
+++ b/comm/mail/themes/osx/jar.mn
@@ -0,0 +1,84 @@
+# 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/.
+
+classic.jar:
+% skin messenger classic/1.0 %skin/classic/messenger/
+#include ../shared/jar.inc.mn
+  skin/classic/messenger/glodaFacetView.css                      (mail/glodaFacetView.css)
+  skin/classic/messenger/multimessageview.css                    (mail/multimessageview.css)
+  skin/classic/messenger/messenger.css                           (mail/messenger.css)
+  skin/classic/messenger/primaryToolbar.css                      (mail/primaryToolbar.css)
+  skin/classic/messenger/accountCentral.css                      (mail/accountCentral.css)
+  skin/classic/messenger/accountManage.css                       (mail/accountManage.css)
+  skin/classic/messenger/chat.css                                (mail/chat.css)
+  skin/classic/messenger/common.css                              (mail/common.css)
+  skin/classic/messenger/contextMenu.css                         (mail/contextMenu.css)
+  skin/classic/messenger/imAccounts.css                          (mail/imAccounts.css)
+  skin/classic/messenger/compacttheme.css                        (mail/compacttheme.css)
+  skin/classic/messenger/customizeToolbar.css                    (mail/customizeToolbar.css)
+  skin/classic/messenger/menulist.css                            (mail/menulist.css)
+  skin/classic/messenger/messageBody.css                         (mail/messageBody.css)
+  skin/classic/messenger/message-bar.css                         (mail/message-bar.css)
+  skin/classic/messenger/messageHeader.css                       (mail/messageHeader.css)
+  skin/classic/messenger/messageIcons.css                        (mail/messageIcons.css)
+  skin/classic/messenger/messageWindow.css                       (mail/messageWindow.css)
+  skin/classic/messenger/attachmentList.css                      (mail/attachmentList.css)
+  skin/classic/messenger/mailWindow1.css                         (mail/mailWindow1.css)
+  skin/classic/messenger/searchBox.css                           (mail/searchBox.css)
+  skin/classic/messenger/junkMail.css                            (mail/junkMail.css)
+  skin/classic/messenger/input-fields.css                        (mail/input-fields.css)
+  skin/classic/messenger/folderMenus.css                         (mail/folderMenus.css)
+  skin/classic/messenger/folderPane.css                          (mail/folderPane.css)
+  skin/classic/messenger/searchDialog.css                        (mail/searchDialog.css)
+  skin/classic/messenger/spacesToolbar.css                       (mail/spacesToolbar.css)
+  skin/classic/messenger/filterDialog.css                        (mail/filterDialog.css)
+  skin/classic/messenger/panelUI.css                             (mail/panelUI.css)
+  skin/classic/messenger/tabmail.css                             (mail/tabmail.css)
+  skin/classic/messenger/themeableDialog.css                     (mail/themeableDialog.css)
+  skin/classic/messenger/popupPanel.css                          (mail/popupPanel.css)
+  skin/classic/messenger/variables.css                           (mail/variables.css)
+  skin/classic/messenger/activity/activity.css                   (mail/activity/activity.css)
+  skin/classic/messenger/activity/defaultProcessIcon.png         (mail/activity/defaultProcessIcon.png)
+  skin/classic/messenger/activity/defaultEventIcon.png           (mail/activity/defaultEventIcon.png)
+  skin/classic/messenger/activity/error.png                      (mail/activity/error.png)
+  skin/classic/messenger/activity/undoIcon.png                   (mail/activity/undoIcon.png)
+  skin/classic/messenger/activity/syncMailIcon.png               (mail/activity/syncMailIcon.png)
+  skin/classic/messenger/activity/sendMailIcon.png               (mail/activity/sendMailIcon.png)
+  skin/classic/messenger/activity/removeItemIcon.png             (mail/activity/removeItemIcon.png)
+  skin/classic/messenger/activity/addItemIcon.png                (mail/activity/addItemIcon.png)
+  skin/classic/messenger/activity/moveMailIcon.png               (mail/activity/moveMailIcon.png)
+  skin/classic/messenger/activity/copyMailIcon.png               (mail/activity/copyMailIcon.png)
+  skin/classic/messenger/activity/deleteMailIcon.png             (mail/activity/deleteMailIcon.png)
+  skin/classic/messenger/activity/compactMailIcon.png            (mail/activity/compactMailIcon.png)
+  skin/classic/messenger/activity/indexMailIcon.png              (mail/activity/indexMailIcon.png)
+  skin/classic/messenger/activity/warning.png                    (mail/activity/warning.png)
+  skin/classic/messenger/addressbook/abContactsPanel.css         (mail/addrbook/abContactsPanel.css)
+  skin/classic/messenger/addressbook/cardDialog.css              (mail/addrbook/cardDialog.css)
+  skin/classic/messenger/messengercompose/messengercompose.css   (mail/compose/messengercompose.css)
+  skin/classic/messenger/downloads/aboutDownloads.css            (mail/downloads/aboutDownloads.css)
+% skin messenger-newsblog classic/1.0 %skin/classic/messenger-newsblog/
+  skin/classic/messenger-newsblog/feed-subscriptions.css         (mail/newsblog/feed-subscriptions.css)
+  skin/classic/messenger/preferences/alwaysAsk.png               (mail/preferences/alwaysAsk.png)
+  skin/classic/messenger/preferences/application.png             (mail/preferences/application.png)
+  skin/classic/messenger/preferences/saveFile.png                (mail/preferences/saveFile.png)
+  skin/classic/messenger/preferences/preferences.css             (mail/preferences/preferences.css)
+  skin/classic/messenger/preferences/applications.css            (mail/preferences/applications.css)
+  skin/classic/messenger/icons/multicolor.png                    (mail/icons/multicolor.png)
+  skin/classic/messenger/icons/identity.png                      (mail/icons/identity.png)
+  skin/classic/messenger/icons/identity@2x.png                   (mail/icons/identity@2x.png)
+  skin/classic/messenger/icons/error.png                         (mail/icons/error.png)
+  skin/classic/messenger/icons/connecting.png                    (mail/icons/connecting.png)
+  skin/classic/messenger/icons/arrow/arrow-left.png              (mail/icons/arrow/arrow-left.png)
+  skin/classic/messenger/icons/arrow/arrow-right.png             (mail/icons/arrow/arrow-right.png)
+  skin/classic/messenger/icons/arrow/arrow-up.png                (mail/icons/arrow/arrow-up.png)
+  skin/classic/messenger/icons/arrow/arrow-down.png              (mail/icons/arrow/arrow-down.png)
+  skin/classic/messenger/icons/arrow/arrow-right-dim.png         (mail/icons/arrow/arrow-right-dim.png)
+  skin/classic/messenger/icons/arrow/arrow-down-dim.png          (mail/icons/arrow/arrow-down-dim.png)
+% skin editor classic/1.0 %skin/classic/editor/
+  skin/classic/editor/EditorDialog.css                           (editor/EditorDialog.css)
+  skin/classic/editor/icons/img-align-bottom.gif                 (editor/img-align-bottom.gif)
+  skin/classic/editor/icons/img-align-left.gif                   (editor/img-align-left.gif)
+  skin/classic/editor/icons/img-align-middle.gif                 (editor/img-align-middle.gif)
+  skin/classic/editor/icons/img-align-right.gif                  (editor/img-align-right.gif)
+  skin/classic/editor/icons/img-align-top.gif                    (editor/img-align-top.gif)
diff --git a/comm/mail/themes/osx/mail/accountCentral.css b/comm/mail/themes/osx/mail/accountCentral.css
new file mode 100644
index 0000000000..cd6332a4cb
--- /dev/null
+++ b/comm/mail/themes/osx/mail/accountCentral.css
@@ -0,0 +1,14 @@
+/* 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/shared/accountCentral.css");
+
+#accountName {
+  /* Prevents UI jumping when dynamically changing the content. */
+  min-height: 17px;
+}
diff --git a/comm/mail/themes/osx/mail/accountManage.css b/comm/mail/themes/osx/mail/accountManage.css
new file mode 100644
index 0000000000..468950217b
--- /dev/null
+++ b/comm/mail/themes/osx/mail/accountManage.css
@@ -0,0 +1,13 @@
+/* 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/shared/accountManage.css");
+
+description {
+  margin: 4px 4px 8px;
+}
+
+menulist > menupopup .menu-right {
+  margin-inline: 0;
+}
diff --git a/comm/mail/themes/osx/mail/activity/activity.css b/comm/mail/themes/osx/mail/activity/activity.css
new file mode 100644
index 0000000000..bf348bdf7c
--- /dev/null
+++ b/comm/mail/themes/osx/mail/activity/activity.css
@@ -0,0 +1,5 @@
+/* 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/shared/activity/activity.css");
diff --git a/comm/mail/themes/osx/mail/activity/addItemIcon.png b/comm/mail/themes/osx/mail/activity/addItemIcon.png
new file mode 100644
index 0000000000..2505f5fa79
--- /dev/null
+++ b/comm/mail/themes/osx/mail/activity/addItemIcon.png
diff --git a/comm/mail/themes/osx/mail/activity/compactMailIcon.png b/comm/mail/themes/osx/mail/activity/compactMailIcon.png
new file mode 100644
index 0000000000..501ee0d89c
--- /dev/null
+++ b/comm/mail/themes/osx/mail/activity/compactMailIcon.png
diff --git a/comm/mail/themes/osx/mail/activity/copyMailIcon.png b/comm/mail/themes/osx/mail/activity/copyMailIcon.png
new file mode 100644
index 0000000000..7fa1cfebc1
--- /dev/null
+++ b/comm/mail/themes/osx/mail/activity/copyMailIcon.png
diff --git a/comm/mail/themes/osx/mail/activity/defaultEventIcon.png b/comm/mail/themes/osx/mail/activity/defaultEventIcon.png
new file mode 100644
index 0000000000..033e7ec1b3
--- /dev/null
+++ b/comm/mail/themes/osx/mail/activity/defaultEventIcon.png
diff --git a/comm/mail/themes/osx/mail/activity/defaultProcessIcon.png b/comm/mail/themes/osx/mail/activity/defaultProcessIcon.png
new file mode 100644
index 0000000000..bcc073e95a
--- /dev/null
+++ b/comm/mail/themes/osx/mail/activity/defaultProcessIcon.png
diff --git a/comm/mail/themes/osx/mail/activity/deleteMailIcon.png b/comm/mail/themes/osx/mail/activity/deleteMailIcon.png
new file mode 100644
index 0000000000..ae7b9e23b7
--- /dev/null
+++ b/comm/mail/themes/osx/mail/activity/deleteMailIcon.png
diff --git a/comm/mail/themes/osx/mail/activity/error.png b/comm/mail/themes/osx/mail/activity/error.png
new file mode 100644
index 0000000000..de466bbfa5
--- /dev/null
+++ b/comm/mail/themes/osx/mail/activity/error.png
diff --git a/comm/mail/themes/osx/mail/activity/indexMailIcon.png b/comm/mail/themes/osx/mail/activity/indexMailIcon.png
new file mode 100644
index 0000000000..0ba1a64d53
--- /dev/null
+++ b/comm/mail/themes/osx/mail/activity/indexMailIcon.png
diff --git a/comm/mail/themes/osx/mail/activity/moveMailIcon.png b/comm/mail/themes/osx/mail/activity/moveMailIcon.png
new file mode 100644
index 0000000000..ab263d45e7
--- /dev/null
+++ b/comm/mail/themes/osx/mail/activity/moveMailIcon.png
diff --git a/comm/mail/themes/osx/mail/activity/removeItemIcon.png b/comm/mail/themes/osx/mail/activity/removeItemIcon.png
new file mode 100644
index 0000000000..4ca7df7e20
--- /dev/null
+++ b/comm/mail/themes/osx/mail/activity/removeItemIcon.png
diff --git a/comm/mail/themes/osx/mail/activity/sendMailIcon.png b/comm/mail/themes/osx/mail/activity/sendMailIcon.png
new file mode 100644
index 0000000000..1f2c042e4a
--- /dev/null
+++ b/comm/mail/themes/osx/mail/activity/sendMailIcon.png
diff --git a/comm/mail/themes/osx/mail/activity/syncMailIcon.png b/comm/mail/themes/osx/mail/activity/syncMailIcon.png
new file mode 100644
index 0000000000..f06a254930
--- /dev/null
+++ b/comm/mail/themes/osx/mail/activity/syncMailIcon.png
diff --git a/comm/mail/themes/osx/mail/activity/undoIcon.png b/comm/mail/themes/osx/mail/activity/undoIcon.png
new file mode 100644
index 0000000000..ed6f67fa7d
--- /dev/null
+++ b/comm/mail/themes/osx/mail/activity/undoIcon.png
diff --git a/comm/mail/themes/osx/mail/activity/warning.png b/comm/mail/themes/osx/mail/activity/warning.png
new file mode 100644
index 0000000000..7471e1e45f
--- /dev/null
+++ b/comm/mail/themes/osx/mail/activity/warning.png
diff --git a/comm/mail/themes/osx/mail/addrbook/abContactsPanel.css b/comm/mail/themes/osx/mail/addrbook/abContactsPanel.css
new file mode 100644
index 0000000000..6839fe3afd
--- /dev/null
+++ b/comm/mail/themes/osx/mail/addrbook/abContactsPanel.css
@@ -0,0 +1,22 @@
+/* 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/. */
+
+/* ===== sidebarPanel.css ===============================================
+  == Styles for the Address Book sidebar panel.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/shared/abContactsPanel.css");
+
+#AbPickerHeader > label {
+  margin-block: 6px 0;
+}
+
+#abContextMenuButton {
+  margin-block: -3px -1px;
+  padding-inline: 4px 0;
+}
+
+#GeneratedName {
+  padding-inline-start: 26px;
+}
diff --git a/comm/mail/themes/osx/mail/addrbook/cardDialog.css b/comm/mail/themes/osx/mail/addrbook/cardDialog.css
new file mode 100644
index 0000000000..9b4e96cc4b
--- /dev/null
+++ b/comm/mail/themes/osx/mail/addrbook/cardDialog.css
@@ -0,0 +1,13 @@
+/* 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/. */
+
+/* ===== cardViewOverlay.css ============================================
+  == Styles for the Address Book Card view.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/shared/cardDialog.css");
+
+menulist::part(icon) {
+  margin-inline-end: 2px;
+}
diff --git a/comm/mail/themes/osx/mail/attachmentList.css b/comm/mail/themes/osx/mail/attachmentList.css
new file mode 100644
index 0000000000..bfb960281b
--- /dev/null
+++ b/comm/mail/themes/osx/mail/attachmentList.css
@@ -0,0 +1,7 @@
+/* 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/shared/attachmentList.css");
+
+/* styles for the attachment list */
diff --git a/comm/mail/themes/osx/mail/chat.css b/comm/mail/themes/osx/mail/chat.css
new file mode 100644
index 0000000000..608d2c5854
--- /dev/null
+++ b/comm/mail/themes/osx/mail/chat.css
@@ -0,0 +1,117 @@
+/* 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/shared/chat.css");
+
+.convUnreadTargetedCount {
+  padding: 2px 7px;
+}
+
+.conv-counter[value^="-"] {
+  margin-bottom: 1px;
+  /* The 6px padding-end from .conv-counter is split into a 1px margin-end
+     (to avoid the border) and 5px padding-end (as regular padding). */
+  margin-inline-end: 1px;
+  padding-top: 1px;
+  padding-bottom: 0;
+  padding-inline-end: 5px;
+}
+
+.conv-nicklist > richlistitem > label {
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.4);
+}
+
+.conv-nicklist-header {
+  appearance: auto;
+  -moz-default-appearance: treeheadercell;
+  margin-right: -1px;
+}
+
+.conv-nicklist-header-label {
+  margin-inline: 3px 2px !important;
+  margin-block: 1px 0 !important;
+}
+
+.conv-nicklist, #logTree {
+  appearance: none;
+  width: 250px;
+  border: 0;
+}
+
+#nicklist > richlistitem[inactive][selected] > label {
+  color: -moz-DialogText !important;
+}
+
+richlistitem[is="chat-group-richlistitem"] .twisty {
+  margin-inline-end: 3px;
+}
+
+#chatPanel:-moz-lwtheme {
+  color: -moz-DialogText;
+  text-shadow: none;
+}
+
+/* Adaptation from #folderTree */
+:root:not([lwt-tree]) #chatPanel {
+  background-color: -moz-OddTreeRow;
+}
+
+@media (prefers-contrast) {
+  :root:not([lwt-tree]) #chatPanel {
+    background-color: Field;
+  }
+}
+
+#contactlistbox {
+  background: transparent;
+  appearance: none;
+}
+
+.convUnreadCount,
+.contactDisplayName,
+.convDisplayName,
+.contactStatusText,
+.convStatusText {
+  margin-top: 3px;
+}
+
+#statusTypeIcon:-moz-locale-dir(ltr) {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+
+#statusTypeIcon:-moz-locale-dir(rtl) {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+}
+
+#statusTypeIcon > .toolbarbutton-text {
+  display: none;
+}
+
+.statusMessageToolbarItem {
+  margin-inline-start: -3px;
+  margin-bottom: 2px;
+  padding-bottom: 3px;
+}
+
+/* Adaptation of #folderpane_splitter */
+#listSplitter,
+#contextSplitter {
+  min-width: 5px;
+}
+
+.conv-status-container {
+  border-bottom-color: #8B8B8B;
+}
+
+.startChatBubble > .button-box > .button-icon,
+.closeConversationButton > .button-box > .button-icon {
+  margin-inline-start: 0;
+}
+
+/* Set a background color to avoid lightweight theme backgrounds */
+#contextPane {
+  background-color: Field;
+}
diff --git a/comm/mail/themes/osx/mail/common.css b/comm/mail/themes/osx/mail/common.css
new file mode 100644
index 0000000000..8075f055d4
--- /dev/null
+++ b/comm/mail/themes/osx/mail/common.css
@@ -0,0 +1,76 @@
+/* - 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/shared/common.css");
+
+@namespace html "http://www.w3.org/1999/xhtml";
+@namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+
+xul|tabs {
+  padding-inline: 0;
+  position: static;
+}
+
+xul|button[dlgtype="help"] {
+  appearance: none;
+  width: auto;
+}
+
+xul|menulist > xul|menupopup > xul|menuitem[checked="true"]::before,
+xul|menulist > xul|menupopup > xul|menuitem[selected="true"]::before {
+  display: none;
+}
+
+xul|menulist > xul|menupopup xul|menu,
+xul|menulist > xul|menupopup xul|menuitem {
+  padding-inline-end: 34px;
+}
+
+xul|menulist > xul|menupopup xul|menuitem::after,
+xul|menulist > xul|menupopup xul|menuitem::before {
+  display: none;
+}
+
+xul|*.checkbox-icon,
+xul|*.radio-icon {
+  margin-inline-end: 0;
+}
+
+xul|*.text-link:-moz-focusring {
+  box-shadow: none;
+}
+
+xul|search-textbox::part(search-sign) {
+  -moz-context-properties: stroke, fill-opacity;
+  stroke: currentColor;
+  fill-opacity: 0.8;
+  list-style-image: url("chrome://messenger/skin/icons/new/compact/search.svg");
+  margin-inline-end: 5px;
+}
+
+html|button {
+  /* XUL button min-width */
+  min-width: 79px;
+}
+
+html|input[type="email"],
+html|input[type="tel"],
+html|input[type="text"],
+html|input[type="password"],
+html|input[type="number"],
+html|textarea {
+  margin: 4px;
+}
+
+xul|tab {
+  min-height: 2.5em;
+}
+
+:host(dialog[subdialog]) .dialog-button-box > button {
+  min-height: var(--in-content-button-height);
+  padding-block: initial;
+  padding-inline: 15px;
+  border-color: transparent;
+  border-radius: var(--in-content-button-border-radius);
+}
diff --git a/comm/mail/themes/osx/mail/compacttheme.css b/comm/mail/themes/osx/mail/compacttheme.css
new file mode 100644
index 0000000000..146ee15f46
--- /dev/null
+++ b/comm/mail/themes/osx/mail/compacttheme.css
@@ -0,0 +1,9 @@
+/* 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/shared/compacttheme.css");
+
+.tabmail-tab[selected="true"] {
+  -moz-font-smoothing-background-color: var(--toolbar-bgcolor);
+}
diff --git a/comm/mail/themes/osx/mail/compose/messengercompose.css b/comm/mail/themes/osx/mail/compose/messengercompose.css
new file mode 100644
index 0000000000..22af742cf5
--- /dev/null
+++ b/comm/mail/themes/osx/mail/compose/messengercompose.css
@@ -0,0 +1,217 @@
+/* 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/. */
+
+/* ===== messengercompose.css ===========================================
+  == Styles for the main Messenger Compose window.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/messenger.css");
+@import url("chrome://messenger/skin/shared/messengercompose.css");
+
+@namespace html url("http://www.w3.org/1999/xhtml");
+
+#compose-toolbox:-moz-lwtheme::after {
+  top: 100%;
+  margin-top: -1px;
+  border-bottom: 1px solid var(--chrome-content-separator-color);
+  z-index: 1;
+}
+
+#compose-toolbox toolbarbutton[checked="true"] {
+  background-color: transparent;
+}
+
+/* Inactive window state */
+#compose-toolbox > toolbar:-moz-window-inactive {
+  border-top-color: rgba(255,255,255,0.45);
+  border-bottom-color: rgba(0,0,0,0.35);
+}
+
+#compose-toolbox > toolbar:not(:-moz-lwtheme) {
+  background-color: #cfcfcf;
+}
+
+#composeToolbar2 {
+  /* Cover the titlebar with the toolbox background */
+  margin-top: -22px;
+  padding: 22px 4px 0;
+}
+
+toolbar[nowindowdrag="true"] {
+  appearance: none;
+}
+
+/* Findbar */
+
+#findbar-replaceButton {
+  height: 18px;
+  margin-inline-start: 5px;
+  padding-block: 2px;
+}
+
+/* ::::: special toolbar colors ::::: */
+
+#composeContentBox {
+  color: -moz-DialogText;
+  text-shadow: none;
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.2) inset;
+}
+
+#composeContentBox:-moz-window-inactive {
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1) inset;
+}
+
+#MsgHeadersToolbar {
+  padding-block-start: 5px;
+}
+
+#identityLabel-box {
+  margin-top: 3px;
+}
+
+#msgIdentity {
+  margin-block: 2px 0;
+  padding-block: 3px;
+  color: inherit;
+}
+
+#msgIdentity::part(text-input) {
+  color: inherit;
+  padding-inline-start: 3px;
+}
+
+#msgIdentity[is="menulist-editable"][editable="true"] > menupopup {
+  appearance: auto;
+  -moz-default-appearance: menupopup;
+  margin-inline-start: 0;
+}
+
+#msgIdentity[is="menulist-editable"][editable="true"] > menupopup > menuitem {
+  appearance: auto;
+  -moz-default-appearance: menuitem;
+}
+
+#msgIdentityPopup {
+  margin-inline-start: initial;
+}
+
+/* ::::: attachment reminder ::::: */
+
+.notification-button[is="toolbarbutton-menu-button"] {
+  padding-top: 0;
+}
+
+.notification-button[is="toolbarbutton-menu-button"] > button {
+  appearance: none;
+  margin-bottom: -1px;
+  margin-inline-start: -3px;
+  margin-inline-end: 3px;
+  padding-inline-end: 5px;
+  border-inline-end: 1px solid #9b9b9b;
+}
+
+#subjectLabel {
+  margin-top: 3px;
+  margin-inline-end: 6px;
+}
+
+.address-label-container {
+  padding-top: 7px;
+}
+
+.address-container {
+  padding: 1px 4px;
+}
+
+.address-container > .address-input {
+  padding-block: 5px;
+  min-height: 14px;
+}
+
+#msgIdentity,
+.address-container,
+#msgSubject {
+  min-height: 26px;
+}
+
+.address-pill {
+  padding-block: 2px;
+}
+
+.address-pill label {
+  margin-block: 0;
+}
+
+.pill-indicator {
+  margin-top: -2px;
+}
+
+/* ::::: autocomplete icons ::::: */
+
+.ac-site-icon {
+  display: flex;
+  margin: 2px 5px;
+}
+
+/* ::::: format toolbar ::::: */
+
+#FormatToolbar {
+  padding-block: 4px;
+  margin-inline: 3px;
+  margin-block-end: 3px;
+}
+
+#FormatToolbar toolbarseparator {
+  background-image: none;
+}
+
+toolbarbutton.formatting-button {
+  margin-inline: 1px;
+  padding-inline: 4px;
+}
+
+.formatting-button > .toolbarbutton-menu-dropmarker {
+  margin-inline-start: 3px;
+}
+
+#FontFaceSelect {
+   max-width: 15em;
+}
+
+/* ::::: address book sidebar ::::: */
+
+#contactsBrowserTitle {
+  font: icon;
+}
+
+#titlebar {
+  z-index: 1;
+  height: 22px;
+}
+
+.titlebar-buttonbox-container {
+  margin-top: 3px;
+  margin-inline-start: 7px;
+}
+
+.titlebar-buttonbox {
+  margin-inline: 0;
+}
+
+#titlebar-title {
+  overflow: hidden;
+  /* Equalize  the titlebar-buttonbox width */
+  padding-inline-end: 60px;
+}
+
+#titlebar-title-label {
+  justify-content: center;
+}
+
+/* Styles for the default system dark theme */
+
+:root[lwt-tree] #FormatToolbar {
+  background-image: none;
+  background-color: transparent !important;
+}
diff --git a/comm/mail/themes/osx/mail/contextMenu.css b/comm/mail/themes/osx/mail/contextMenu.css
new file mode 100644
index 0000000000..017001f801
--- /dev/null
+++ b/comm/mail/themes/osx/mail/contextMenu.css
@@ -0,0 +1,54 @@
+/* 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/shared/contextMenu.css");
+
+menupopup {
+  appearance: none;
+  background-color: transparent;
+}
+
+menupopup::part(content) {
+  margin: 1px;
+}
+
+menupopup .menu-iconic-icon {
+  width: 16px;
+  margin-inline-start: 0;
+}
+
+menupopup > menu::after {
+  line-height: 0;
+}
+
+menupopup > menu > .menu-text,
+menupopup > menuitem > .menu-text {
+  margin-inline-start: 21px !important;
+}
+
+menupopup > menuitem > .menu-right {
+  margin-inline-end: -4px;
+  appearance: none;
+}
+
+/* Only show the system checkmark on main window menu */
+#windowPopup > menuitem[checked="true"] {
+  list-style-image: none;
+}
+
+menupopup > menuseparator#customizeMailToolbarMenuSeparator {
+  display: none;
+}
+
+menulist > menupopup > menuitem::before {
+  margin-inline: 0 -10px;
+}
+
+menulist > menupopup > menuitem:is([checked="true"], [selected="true"])::before {
+  visibility: hidden;
+}
+
+menulist > menupopup > menuitem.menuitem-iconic::before {
+  display: none;
+}
diff --git a/comm/mail/themes/osx/mail/customizeToolbar.css b/comm/mail/themes/osx/mail/customizeToolbar.css
new file mode 100644
index 0000000000..6c0eb3847d
--- /dev/null
+++ b/comm/mail/themes/osx/mail/customizeToolbar.css
@@ -0,0 +1,25 @@
+/* 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/shared/customizeToolbar.css");
+
+#palette-box {
+  margin: 2px 6px 10px;
+}
+
+#titlebarSettings {
+  margin-inline-start: 6px;
+}
+
+hbox button {
+  font: menu;
+}
+
+#main-box > box > button {
+  font: message-box;
+}
+
+:root[toolboxId="mail-toolbox"] #titlebarSettings {
+  display: flex;
+}
diff --git a/comm/mail/themes/osx/mail/downloads/aboutDownloads.css b/comm/mail/themes/osx/mail/downloads/aboutDownloads.css
new file mode 100644
index 0000000000..413b63e318
--- /dev/null
+++ b/comm/mail/themes/osx/mail/downloads/aboutDownloads.css
@@ -0,0 +1,9 @@
+/* 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/shared/aboutDownloads.css");
+
+.downloadButton > .button-box > .button-icon {
+  list-style-image: url("chrome://global/skin/icons/search-glass.svg");
+}
diff --git a/comm/mail/themes/osx/mail/filterDialog.css b/comm/mail/themes/osx/mail/filterDialog.css
new file mode 100644
index 0000000000..d1c770a556
--- /dev/null
+++ b/comm/mail/themes/osx/mail/filterDialog.css
@@ -0,0 +1,58 @@
+/* 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/. */
+
+/* ===== filterDialog.css ===============================================
+  == Styles for the Mail Filters dialog.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/shared/filterDialog.css");
+
+#filterListDialog {
+  padding: 0;
+}
+
+#filterHeader {
+  margin: 8px;
+  font: menu;
+}
+
+#filterListGrid {
+  margin: 8px;
+}
+
+/* ::::: columns :::::: */
+
+.search-menulist,
+.search-value-menulist {
+  width: 14.5em;
+}
+
+.small-button {
+  min-width: 22px;
+  height: 20px;
+  padding-block: 0 1px;
+  padding-inline: 0 1px;
+  margin: 4px 0;
+}
+
+.small-button:first-child {
+  margin-inline-start: 2px;
+}
+
+listcell > hbox {
+  justify-content: flex-end;
+}
+
+/* No '.filler' here, so add margin to make more room. */
+hbox > .small-button + .small-button {
+  margin-inline-end: 2px;
+}
+
+#searchTermList > listitem[selected="true"] {
+  background-color: inherit;
+}
+
+toolbarbutton[is="toolbarbutton-menu-button"] > toolbarbutton {
+  min-height: 0;
+}
diff --git a/comm/mail/themes/osx/mail/folderMenus.css b/comm/mail/themes/osx/mail/folderMenus.css
new file mode 100644
index 0000000000..82446df1c3
--- /dev/null
+++ b/comm/mail/themes/osx/mail/folderMenus.css
@@ -0,0 +1,21 @@
+/* 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/. */
+
+/* ===== folderMenus.css ================================================
+  == Icons for menus which represent mail folder.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/shared/folderMenus.css");
+
+@media (min-resolution: 2dppx) {
+  .folderMenuItem > .menu-iconic-left > .menu-iconic,
+  .folderMenuItem::part(icon) {
+    width: 16px;
+    height: 16px;
+  }
+}
+
+.menulist-menupopup[is="folder-menupopup"] {
+  list-style-image: none;
+}
diff --git a/comm/mail/themes/osx/mail/folderPane.css b/comm/mail/themes/osx/mail/folderPane.css
new file mode 100644
index 0000000000..3bce538d55
--- /dev/null
+++ b/comm/mail/themes/osx/mail/folderPane.css
@@ -0,0 +1,19 @@
+/* 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/shared/folderPane.css");
+
+/* UI Density customization */
+
+#folderTree > treechildren::-moz-tree-row {
+  min-height: 2rem;
+}
+
+:root[uidensity="compact"] #folderTree > treechildren::-moz-tree-row {
+  min-height: 1.7rem;
+}
+
+:root[uidensity="touch"] #folderTree > treechildren::-moz-tree-row {
+  min-height: 2.4rem;
+}
diff --git a/comm/mail/themes/osx/mail/glodaFacetView.css b/comm/mail/themes/osx/mail/glodaFacetView.css
new file mode 100644
index 0000000000..dd4ddfaa01
--- /dev/null
+++ b/comm/mail/themes/osx/mail/glodaFacetView.css
@@ -0,0 +1,5 @@
+/* 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/shared/glodaFacetView.css");
diff --git a/comm/mail/themes/osx/mail/icons/arrow/arrow-down-dim.png b/comm/mail/themes/osx/mail/icons/arrow/arrow-down-dim.png
new file mode 100644
index 0000000000..4f7fcd5784
--- /dev/null
+++ b/comm/mail/themes/osx/mail/icons/arrow/arrow-down-dim.png
diff --git a/comm/mail/themes/osx/mail/icons/arrow/arrow-down.png b/comm/mail/themes/osx/mail/icons/arrow/arrow-down.png
new file mode 100644
index 0000000000..d2df341a58
--- /dev/null
+++ b/comm/mail/themes/osx/mail/icons/arrow/arrow-down.png
diff --git a/comm/mail/themes/osx/mail/icons/arrow/arrow-left.png b/comm/mail/themes/osx/mail/icons/arrow/arrow-left.png
new file mode 100644
index 0000000000..6607869ad0
--- /dev/null
+++ b/comm/mail/themes/osx/mail/icons/arrow/arrow-left.png
diff --git a/comm/mail/themes/osx/mail/icons/arrow/arrow-right-dim.png b/comm/mail/themes/osx/mail/icons/arrow/arrow-right-dim.png
new file mode 100644
index 0000000000..49dc2d55e4
--- /dev/null
+++ b/comm/mail/themes/osx/mail/icons/arrow/arrow-right-dim.png
diff --git a/comm/mail/themes/osx/mail/icons/arrow/arrow-right.png b/comm/mail/themes/osx/mail/icons/arrow/arrow-right.png
new file mode 100644
index 0000000000..f9e33978e7
--- /dev/null
+++ b/comm/mail/themes/osx/mail/icons/arrow/arrow-right.png
diff --git a/comm/mail/themes/osx/mail/icons/arrow/arrow-up.png b/comm/mail/themes/osx/mail/icons/arrow/arrow-up.png
new file mode 100644
index 0000000000..1eb4d4ceb2
--- /dev/null
+++ b/comm/mail/themes/osx/mail/icons/arrow/arrow-up.png
diff --git a/comm/mail/themes/osx/mail/icons/connecting.png b/comm/mail/themes/osx/mail/icons/connecting.png
new file mode 100644
index 0000000000..3c8e71f5db
--- /dev/null
+++ b/comm/mail/themes/osx/mail/icons/connecting.png
diff --git a/comm/mail/themes/osx/mail/icons/error.png b/comm/mail/themes/osx/mail/icons/error.png
new file mode 100644
index 0000000000..628cf2dae3
--- /dev/null
+++ b/comm/mail/themes/osx/mail/icons/error.png
diff --git a/comm/mail/themes/osx/mail/icons/identity.png b/comm/mail/themes/osx/mail/icons/identity.png
new file mode 100644
index 0000000000..8d4f3bc327
--- /dev/null
+++ b/comm/mail/themes/osx/mail/icons/identity.png
diff --git a/comm/mail/themes/osx/mail/icons/identity@2x.png b/comm/mail/themes/osx/mail/icons/identity@2x.png
new file mode 100644
index 0000000000..8fedc7953f
--- /dev/null
+++ b/comm/mail/themes/osx/mail/icons/identity@2x.png
diff --git a/comm/mail/themes/osx/mail/icons/multicolor.png b/comm/mail/themes/osx/mail/icons/multicolor.png
new file mode 100644
index 0000000000..b96853cf37
--- /dev/null
+++ b/comm/mail/themes/osx/mail/icons/multicolor.png
diff --git a/comm/mail/themes/osx/mail/imAccounts.css b/comm/mail/themes/osx/mail/imAccounts.css
new file mode 100644
index 0000000000..cf32eeb56d
--- /dev/null
+++ b/comm/mail/themes/osx/mail/imAccounts.css
@@ -0,0 +1,13 @@
+/* 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/shared/imAccounts.css");
+
+richlistitem .account-buttons {
+  margin-inline-start: 35px;
+}
+
+#statusTypeIcon .button-box {
+  padding: 0;
+}
diff --git a/comm/mail/themes/osx/mail/input-fields.css b/comm/mail/themes/osx/mail/input-fields.css
new file mode 100644
index 0000000000..2b6b4b981d
--- /dev/null
+++ b/comm/mail/themes/osx/mail/input-fields.css
@@ -0,0 +1,18 @@
+/* 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/shared/input-fields.css");
+@namespace html url("http://www.w3.org/1999/xhtml");
+
+html|input.input-inline {
+  padding-inline-start: 4px;
+}
+
+html|input.input-filefield {
+  background: center left 2px / 16px no-repeat;
+}
+
+html|input[type="number"] {
+  padding-inline-end: 0;
+}
diff --git a/comm/mail/themes/osx/mail/junkMail.css b/comm/mail/themes/osx/mail/junkMail.css
new file mode 100644
index 0000000000..5a4b3b3336
--- /dev/null
+++ b/comm/mail/themes/osx/mail/junkMail.css
@@ -0,0 +1,18 @@
+/*
+#
+# 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/.
+*/
+
+/*===== junkMail=======.css ==============================================
+  == Styles for the junk mail dialog
+ ======================================================================== */
+
+@import url("chrome://messenger/skin/messenger.css");
+
+/* ::::: account manager :::::: */
+
+.specialFolderPickerGrid {
+  margin-inline-start: 20px;
+}
diff --git a/comm/mail/themes/osx/mail/mailWindow1.css b/comm/mail/themes/osx/mail/mailWindow1.css
new file mode 100644
index 0000000000..4e606af6bc
--- /dev/null
+++ b/comm/mail/themes/osx/mail/mailWindow1.css
@@ -0,0 +1,76 @@
+/*
+# 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/.
+*/
+
+/* ===== mailWindow1.css ================================================
+  == Styles for the main Mail window in the default layout scheme.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/messenger.css");
+@import url("chrome://messenger/skin/primaryToolbar.css");
+@import url("chrome://messenger/skin/folderPane.css");
+@import url("chrome://messenger/skin/messageIcons.css");
+@import url("chrome://messenger/skin/shared/mailWindow1.css");
+
+:root:not([lwt-tree]) #folderTree {
+  background-color: -moz-OddTreeRow;
+}
+
+@media (prefers-contrast) {
+  :root:not([lwt-tree]) #folderTree {
+    background-color: Field;
+  }
+}
+
+#folderTree treechildren::-moz-tree-indentation {
+ background-color: black !important;
+}
+
+#folderTree treechildren::-moz-tree-row {
+  padding-inline-start: 2px !important;
+  padding-bottom: 2px;
+  background: transparent;
+}
+
+#folderTree treechildren::-moz-tree-row(hover) {
+  background-color: hsla(0, 0%, 50%, 0.15);
+}
+
+#folderTree treechildren::-moz-tree-row(selected) {
+  color: -moz-cellhighlighttext;
+  background-color: -moz-cellhighlight;
+}
+
+#folderTree treechildren::-moz-tree-row(selected, focus) {
+  background-color: var(--selected-item-color);
+}
+
+#folderTree treechildren::-moz-tree-cell-text {
+  font-family: -apple-system, sans-serif;
+  font-weight: 400;
+}
+
+/* ::::: thread decoration ::::: */
+
+/* ::::: group rows ::::: */
+treechildren::-moz-tree-row(dummy) {
+  padding-inline-start: 0;
+}
+
+.telemetry-text-link {
+  color: #fff;
+}
+
+/* Global notification popup */
+
+#notification-popup {
+  appearance: none;
+  background: transparent;
+  margin-top: 4px;
+}
+
+#notification-popup::part(content) {
+  margin: 1px;
+}
diff --git a/comm/mail/themes/osx/mail/menulist.css b/comm/mail/themes/osx/mail/menulist.css
new file mode 100644
index 0000000000..9323ced470
--- /dev/null
+++ b/comm/mail/themes/osx/mail/menulist.css
@@ -0,0 +1,29 @@
+/* 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/shared/menulist.css");
+
+menulist[is="menulist-editable"][editable="true"] {
+  margin: 4px 2px;
+}
+
+menulist[is="menulist-editable"][editable="true"]:focus-within {
+  outline: var(--focus-outline);
+}
+
+menulist[is="menulist-editable"][editable="true"] > menupopup,
+menulist[is="menulist-editable"][editable="true"] > menupopup > menuitem,
+menulist[is="menulist-editable"][editable="true"] > menupopup > menucaption {
+  appearance: none;
+}
+
+menulist[is="menulist-editable"][editable="true"] > menupopup > :is(menuitem,menucaption) > .menu-iconic-left {
+  display: none;
+}
+
+menulist[is="menulist-editable"][editable="true"] > menupopup > menuitem[checked="true"]::before,
+menulist[is="menulist-editable"][editable="true"] > menupopup > menuitem[selected="true"]::before {
+  display: none;
+  margin-inline-start: 0;
+}
diff --git a/comm/mail/themes/osx/mail/message-bar.css b/comm/mail/themes/osx/mail/message-bar.css
new file mode 100644
index 0000000000..514b4dad3f
--- /dev/null
+++ b/comm/mail/themes/osx/mail/message-bar.css
@@ -0,0 +1,9 @@
+/* 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/shared/message-bar.css");
+
+.notification-button.small-button {
+  padding-block: 4px;
+}
diff --git a/comm/mail/themes/osx/mail/messageBody.css b/comm/mail/themes/osx/mail/messageBody.css
new file mode 100644
index 0000000000..3641de574b
--- /dev/null
+++ b/comm/mail/themes/osx/mail/messageBody.css
@@ -0,0 +1,28 @@
+/* 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/shared/messageBody.css");
+
+mailattachcount {
+  border: blue;
+}
+
+/* ::::: message text, incl. quotes ::::: */
+
+.moz-text-plain pre {
+  margin: inherit;
+  font-family: inherit;
+}
+
+.moz-text-plain[graphical-quote="false"] blockquote {
+  margin: inherit;
+  border-left: inherit;
+  padding-inline-start: inherit;
+}
+
+.moz-text-plain[graphical-quote="true"] blockquote {
+  margin: inherit;
+  border-width: 2px;
+  border-color: gray;
+}
diff --git a/comm/mail/themes/osx/mail/messageHeader.css b/comm/mail/themes/osx/mail/messageHeader.css
new file mode 100644
index 0000000000..0f7bb251c5
--- /dev/null
+++ b/comm/mail/themes/osx/mail/messageHeader.css
@@ -0,0 +1,38 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* ===== messageHeader.css ==============================================
+  == Styles for the header toolbars of a mail message.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/shared/messageHeader.css");
+
+/* ::::: msg header toolbars ::::: */
+
+.inline-toolbox {
+  padding-inline-end: 3px;
+}
+
+/* ::::: collapsed view styles ::::: */
+
+.message-security-label {
+  /* Necessary to not cut the background icon */
+  min-height: 16px;
+}
+
+.button-focusable:focus-visible:not(:hover) {
+  outline-offset: -2px;
+}
+
+button.button-focusable:focus-visible:not(:hover) {
+  outline: none;
+  box-shadow: 0 0 0 3px -moz-mac-focusring;
+}
+
+
+/* Customization options */
+
+.message-header-buttons-only-icons .toolbarbutton-menu-dropmarker {
+  padding-inline-start: 0;
+}
diff --git a/comm/mail/themes/osx/mail/messageIcons.css b/comm/mail/themes/osx/mail/messageIcons.css
new file mode 100644
index 0000000000..1e44f588fe
--- /dev/null
+++ b/comm/mail/themes/osx/mail/messageIcons.css
@@ -0,0 +1,70 @@
+/* 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/shared/messageIcons.css");
+
+/* ..... select column ..... */
+
+treechildren::-moz-tree-image(selectCol) {
+  margin-inline-start: -1px;
+}
+
+/* ..... delete column ..... */
+
+treechildren::-moz-tree-image(deleteCol) {
+  margin-inline-start: -1px;
+}
+
+/* ..... thread column ..... */
+
+.threadColumnHeader {
+  padding-inline: 3px 2px;
+}
+
+/* ..... read column ..... */
+
+.readColumnHeader {
+  padding-inline: 2px 3px;
+}
+
+treechildren::-moz-tree-image(unreadButtonColHeader) {
+  margin-inline-start: -2px;
+}
+
+/* ..... attachment column ..... */
+
+.attachmentColumnHeader {
+  padding-inline: 2px 3px;
+}
+
+treechildren::-moz-tree-image(attachmentCol) {
+  margin-inline-start: -2px;
+}
+
+/* ..... flag column ..... */
+
+.flagColumnHeader {
+  padding-inline: 2px 3px;
+}
+
+/* ..... junkStatus column ..... */
+treechildren::-moz-tree-image(junkStatusCol) {
+  margin-inline-start: -1px;
+}
+
+/* ..... correspondent column ..... */
+
+#correspondentCol {
+  padding-inline-start: 20px;
+}
+
+/* ..... subject column ..... */
+
+#subjectCol {
+  padding-inline-start: 20px;
+}
+
+#subjectCol[primary="true"] {
+  padding-inline-start: 40px;
+}
diff --git a/comm/mail/themes/osx/mail/messageWindow.css b/comm/mail/themes/osx/mail/messageWindow.css
new file mode 100644
index 0000000000..fbd88547cb
--- /dev/null
+++ b/comm/mail/themes/osx/mail/messageWindow.css
@@ -0,0 +1,53 @@
+/* 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/. */
+
+/* ===== messageWindow.css ==============================================
+  == Styles for the message window.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/messenger.css");
+@import url("chrome://messenger/skin/primaryToolbar.css");
+
+/* ::::: Mail Toolbars and Menubars ::::: */
+
+#titlebar {
+  -moz-window-dragging: drag;
+  height: 22px;
+}
+
+.titlebar-buttonbox-container {
+  margin-top: 3px;
+  margin-inline-start: 7px;
+}
+
+.titlebar-buttonbox {
+  margin-inline: 0;
+}
+
+#titlebar-title {
+  /* Equalize the titlebar-buttonbox width */
+  padding-inline-end: 60px;
+}
+
+#titlebar-title-label {
+  justify-content: center;
+}
+
+.mail-toolbox {
+  border-bottom: 0;
+}
+
+#mail-toolbox:-moz-lwtheme {
+  box-shadow: none;
+}
+
+#messagepaneboxwrapper {
+  overflow: hidden;
+  min-height: 0;
+}
+
+#messagepanebox {
+  flex: 3 3;
+  text-shadow: none;
+}
diff --git a/comm/mail/themes/osx/mail/messenger.css b/comm/mail/themes/osx/mail/messenger.css
new file mode 100644
index 0000000000..431ad5068e
--- /dev/null
+++ b/comm/mail/themes/osx/mail/messenger.css
@@ -0,0 +1,460 @@
+/* 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/. */
+
+/* ===== messenger.css ==================================================
+  == Styles shared throughout the Messenger application.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/shared/messenger.css");
+
+#mail-menubar,
+#mailContext {
+  -moz-context-properties: fill, stroke;
+  fill: color-mix(in srgb, currentColor 20%, transparent);
+  stroke: currentColor;
+}
+
+.sidebar-header {
+  background-color: -moz-Dialog;
+  color: -moz-dialogText;
+  text-shadow: none;
+}
+
+.inline-toolbar,
+.contentTabToolbar {
+  appearance: none;
+  min-width: 50px;
+  min-height: 14px;
+}
+
+.inline-toolbar > toolbarseparator {
+  height: 20px;
+  margin-top: 2px;
+}
+
+#navigation-toolbox {
+  appearance: none;
+}
+
+/*
+  This is a workaround for Bug 1482157
+  -moz-default-appearance: toolbox; makes the macOS sheets attached to the
+  element's bottom border. We cannot put this property on the toolbox itself as
+  it cancels all backgrounds that are there, so we set it on the toolbox bottom
+  border.
+*/
+#navigation-toolbox::after {
+  content: "";
+  display: flex;
+  appearance: auto;
+  -moz-default-appearance: toolbox;
+  height: 1px;
+  margin-top: -1px;
+  opacity: 0.001;
+}
+
+#titlebar {
+  /* Centrally align content items vertically */
+  justify-content: center;
+}
+
+.titlebar-button {
+  display: none;
+}
+
+#titlebar:-moz-lwtheme {
+  appearance: none;
+}
+
+#toolbar-menubar {
+  visibility: collapse;
+}
+
+/* ::::: toolbarbutton menu-button ::::: */
+
+toolbarbutton[is="toolbarbutton-menu-button"] {
+  align-items: stretch;
+  flex-direction: row !important;
+  background-color: transparent;
+}
+
+.toolbarbutton-menubutton-button {
+  text-shadow: inherit;
+}
+
+/* .......... dropmarker .......... */
+
+.toolbarbutton-menubutton-dropmarker {
+  appearance: none;
+  border: none;
+  padding: 0 5px;
+}
+
+/* ::::: primary toolbar buttons ::::: */
+
+.toolbarbutton-1[open],
+.toolbarbutton-1[open] > .toolbarbutton-menubutton-button {
+  text-shadow: none;
+}
+
+.toolbarbutton-1[checked="true"]:-moz-window-inactive {
+  box-shadow: var(--toolbarbutton-inactive-boxshadow);
+  border-color: var(--toolbarbutton-inactive-bordercolor);
+  background: transparent !important;
+}
+
+.toolbarbutton-1[is="toolbarbutton-menu-button"] {
+  padding: 0;
+}
+
+.toolbarbutton-1[disabled="true"] .toolbarbutton-text,
+.toolbarbutton-1[is="toolbarbutton-menu-button"] > .toolbarbutton-menubutton-button[disabled="true"]
+  > .toolbarbutton-icon {
+  opacity: .4;
+}
+
+.toolbarbutton-1[disabled="true"] .toolbarbutton-icon,
+.toolbarbutton-1[is="toolbarbutton-menu-button"]
+  > .toolbarbutton-menubutton-button[disabled="true"] > .toolbarbutton-icon,
+.toolbarbutton-1[disabled="true"] > .toolbarbutton-menu-dropmarker,
+.toolbarbutton-1[disabled="true"] > .toolbarbutton-menubutton-dropmarker,
+.toolbarbutton-1:not(:hover):-moz-window-inactive .toolbarbutton-icon,
+.toolbarbutton-1:not(:hover):-moz-window-inactive
+  > .toolbarbutton-menu-dropmarker,
+.toolbarbutton-1:not(:hover):-moz-window-inactive
+  > .toolbarbutton-menubutton-dropmarker {
+  opacity: .5;
+}
+
+.toolbarbutton-1:-moz-window-inactive[disabled="true"] > .toolbarbutton-icon,
+.toolbarbutton-1:-moz-window-inactive[is="toolbarbutton-menu-button"]
+  > .toolbarbutton-menubutton-button[disabled="true"] > .toolbarbutton-icon {
+  opacity: .25;
+}
+
+.toolbarbutton-1 > .toolbarbutton-menu-dropmarker {
+  margin-inline-end: 1px;
+  padding-inline-start: 4px;
+}
+
+toolbar[mode="icons"] .toolbarbutton-1 > menupopup {
+  margin-top: 1px;
+}
+
+menulist {
+  padding: 1px 6px;
+}
+
+menulist > menupopup:not([position]) {
+  margin-inline-start: 0;
+}
+
+menulist > menupopup menu,
+menulist > menupopup menuitem,
+toolbarbutton > menupopup menu,
+toolbarbutton > menupopup menuitem {
+  appearance: none !important;
+  padding-block: 4px !important;
+}
+
+@media (-moz-mac-big-sur-theme) {
+  menulist > menupopup menu,
+  menulist > menupopup menuitem,
+  toolbarbutton > menupopup menu,
+  toolbarbutton > menupopup menuitem {
+    margin-inline:5px;
+    border-radius: 4px;
+  }
+}
+
+menupopup menu[disabled="true"][_moz-menuactive="true"],
+menupopup menuitem[disabled="true"][_moz-menuactive="true"] {
+  background-color: transparent !important;
+}
+
+menulist > menupopup menu .menu-right,
+toolbarbutton > menupopup menu .menu-right {
+  appearance: none;
+  list-style-image: url(chrome://global/skin/icons/arrow-right-12.svg);
+  -moz-context-properties: fill;
+  fill: currentColor;
+}
+
+menulist > menupopup menu .menu-right:-moz-locale-dir(rtl),
+toolbarbutton > menupopup menu .menu-right:-moz-locale-dir(rtl) {
+  list-style-image: url(chrome://global/skin/icons/arrow-left-12.svg);
+}
+
+/* :::::: throbber :::::::::: */
+
+#throbber-box {
+  margin: 0 4px;
+}
+
+/* ::::: online/offline icons ::::: */
+
+#offline-status {
+  padding-inline-start: 3px;
+}
+
+/* ::::: directional button icons ::::: */
+
+.up,
+.down {
+  min-width: 0;
+  -moz-context-properties: stroke, fill-opacity;
+  stroke: currentColor;
+  fill-opacity: 1;
+}
+
+.up {
+  list-style-image: url("chrome://global/skin/icons/arrow-up-12.svg");
+}
+
+.down {
+  list-style-image: url("chrome://global/skin/icons/arrow-down-12.svg");
+}
+
+.up[disabled="true"],
+.down[disabled="true"] {
+  fill-opacity: .5;
+}
+
+/* ::::: Tabs ::::: */
+
+tabmail > tabbox {
+  margin: 0;
+}
+
+/* ::::: Trees ::::: */
+
+treechildren::-moz-tree-cell-text {
+  padding-inline-start: 2px;
+}
+
+treechildren::-moz-tree-line {
+  border-color: inherit;
+}
+
+treechildren::-moz-tree-line(selected, focus) {
+  border-color: var(--selected-item-text-color);
+}
+
+/* message column icons */
+
+:root:not(:-moz-lwtheme) treecol:not([hideheader="true"]),
+:root:not(:-moz-lwtheme) .tree-columnpicker-button:not([hideheader="true"]) {
+  appearance: none;
+  color: inherit;
+  background-color: transparent;
+  padding-block: 2px;
+  border-bottom: 1px solid ThreeDShadow;
+}
+
+:root:not(:-moz-lwtheme) treecol {
+  border-inline-end: 1px solid ThreeDShadow;
+}
+
+:root:not(:-moz-lwtheme) treecol:hover:active,
+:root:not(:-moz-lwtheme) .tree-columnpicker-button:hover:active {
+  background-color: ThreeDFace;
+}
+
+.treecol-sortdirection {
+  appearance: none;
+  -moz-context-properties: fill;
+  fill: currentColor;
+}
+
+treecol[sortDirection="ascending"]:not([hideheader="true"]) > .treecol-sortdirection {
+  list-style-image: url("chrome://global/skin/icons/arrow-up-12.svg");
+}
+
+treecol[sortDirection="descending"]:not([hideheader="true"]) > .treecol-sortdirection {
+  list-style-image: url("chrome://global/skin/icons/arrow-down-12.svg");
+}
+
+:root[lwt-tree] treechildren::-moz-tree-row(odd) {
+  background-color: transparent;
+}
+
+:root[lwt-tree] treechildren::-moz-tree-row(odd, hover) {
+  background-color: hsla(0, 0%, 50%, 0.15);
+}
+
+/* ::::: Tabs in Titlebar :::::: */
+
+#messengerWindow[tabsintitlebar="true"]:not(:-moz-lwtheme) #titlebar {
+  appearance: auto;
+  -moz-default-appearance: -moz-window-titlebar;
+}
+
+.titlebar-buttonbox-container {
+  align-items: center;
+}
+
+@media not (-moz-mac-rtl) {
+  .titlebar-buttonbox-container:-moz-locale-dir(ltr) {
+    order: -1;
+  }
+}
+
+@media (-moz-mac-rtl) {
+  #unifiedToolbarContainer:-moz-locale-dir(rtl) {
+    flex-direction: row-reverse;
+  }
+
+  .titlebar-buttonbox-container:-moz-locale-dir(rtl) {
+    order: -1;
+  }
+}
+
+/* NB: these would be margin-inline-start/end if it wasn't for the fact that OS X
+ * doesn't reverse the order of the items in the titlebar in RTL mode. */
+.titlebar-buttonbox {
+  margin-inline: 12px;
+}
+
+.titlebar-buttonbox {
+  appearance: auto;
+  -moz-default-appearance: -moz-window-button-box;
+}
+
+#messengerWindow[sizemode="fullscreen"] .titlebar-buttonbox-container {
+  display: none;
+}
+
+button.notification-button[is="toolbarbutton-menu-button"] {
+  margin: 0 6px;
+}
+
+button[is="toolbarbutton-menu-button"] > .button-box > button {
+  margin-block: -4px;
+  margin-inline: -7px 2px;
+}
+
+.button-menubutton-dropmarker {
+  appearance: none;
+}
+
+button dropmarker::part(icon) {
+  margin-inline-start: 3px;
+}
+
+toolbarbutton.notification-button[is="toolbarbutton-menu-button"] > .button-box > dropmarker {
+  margin-inline-end: -5px;
+}
+
+/* Status bar */
+
+#status-bar:-moz-lwtheme  {
+  padding-top: 1px;
+}
+
+.statusbar {
+  min-width: 1px; /* DON'T DELETE!
+  Prevents hiding of scrollbars in browser when window is made smaller.*/
+  min-height: 15px !important;
+  margin: 0 !important;
+  /* need to use padding-inline-end when/if bug 631729 gets fixed: */
+  padding: 0 16px 1px 1px;
+  text-shadow: rgba(255, 255, 255, 0.4) 0 1px;
+}
+
+.statusbar:-moz-lwtheme {
+  background: none;
+  border-style: none;
+  text-shadow: inherit;
+}
+
+/* Status panel */
+
+.statuspanel-label {
+  margin: 0;
+  padding: 2px 4px;
+  background-color: #f9f9fa;
+  border: 1px none #ddd;
+  border-top-style: solid;
+  color: #444;
+  text-shadow: none;
+}
+
+.statuspanel-label:-moz-locale-dir(ltr):not([mirror]),
+.statuspanel-label:-moz-locale-dir(rtl)[mirror] {
+  border-right-style: solid;
+  border-top-right-radius: .3em;
+  margin-right: 1em;
+}
+
+.statuspanel-label:-moz-locale-dir(rtl):not([mirror]),
+.statuspanel-label:-moz-locale-dir(ltr)[mirror] {
+  border-left-style: solid;
+  border-top-left-radius: .3em;
+  margin-left: 1em;
+}
+
+.contentTabInstance {
+  background-color: -moz-dialog;
+}
+
+.contentTabInstance:-moz-lwtheme {
+  background-color: transparent;
+  background-image: linear-gradient(transparent 40px, -moz-dialog 40px);
+}
+
+.contentTabAddress * {
+  text-shadow: none;
+}
+
+fieldset {
+  padding: 0 8px 5px;
+  margin: 1.5em 6px 6px 6px;
+  border: none;
+}
+
+legend {
+  font-size: 1.18em;
+  margin-top: -1.3em;
+  margin-bottom: 5px;
+  margin-inline-start: -5px;
+  font-weight: bold;
+}
+
+fieldset > hbox,
+fieldset > vbox,
+fieldset > radiogroup {
+  width: -moz-available;
+}
+
+.menu-right,
+.menu-accel-container {
+  margin-inline-end: 0;
+}
+
+menupopup[type="arrow"] .menu-accel-container {
+  margin-inline-end: 0;
+}
+
+.menu-accel-container {
+  opacity: 0.5;
+}
+
+menuitem:not([disabled="true"]):hover .menu-accel-container,
+menuitem:not([disabled="true"]):focus .menu-accel-container {
+  opacity: 1;
+}
+
+/* UI Density customization */
+
+treechildren::-moz-tree-row {
+  min-height: 1.8rem;
+}
+
+:root[uidensity="compact"] treechildren::-moz-tree-row {
+  min-height: 1.6rem;
+}
+
+:root[uidensity="touch"] treechildren::-moz-tree-row {
+  min-height: 2.4rem;
+}
diff --git a/comm/mail/themes/osx/mail/multimessageview.css b/comm/mail/themes/osx/mail/multimessageview.css
new file mode 100644
index 0000000000..f3feac4f06
--- /dev/null
+++ b/comm/mail/themes/osx/mail/multimessageview.css
@@ -0,0 +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/. */
+
+@import url("chrome://messenger/skin/shared/multimessageview.css");
+
+/* osx-specific overrides for multimessageview.css*/
+
+.star {
+  top: 0.6em;
+}
diff --git a/comm/mail/themes/osx/mail/newsblog/feed-subscriptions.css b/comm/mail/themes/osx/mail/newsblog/feed-subscriptions.css
new file mode 100644
index 0000000000..162bb26989
--- /dev/null
+++ b/comm/mail/themes/osx/mail/newsblog/feed-subscriptions.css
@@ -0,0 +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/. */
+
+/* ::::: Feed Subscription styling :::::: */
+
+@import url("chrome://messenger/skin/shared/feedSubscribe.css");
+
+#subscriptionsDialog {
+  padding: 4px;
+}
diff --git a/comm/mail/themes/osx/mail/panelUI.css b/comm/mail/themes/osx/mail/panelUI.css
new file mode 100644
index 0000000000..808c135edc
--- /dev/null
+++ b/comm/mail/themes/osx/mail/panelUI.css
@@ -0,0 +1,58 @@
+/* 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/shared/panelUI.css");
+
+#appMenu-popup {
+  margin-top: 4px;
+}
+
+#appMenu-popup {
+  margin-inline: 0 -8px;
+}
+
+.panel-subview-body {
+  scrollbar-color: color-mix(in srgb, currentColor 26%, transparent) transparent;
+}
+
+.restoreallitem > .toolbarbutton-icon {
+  display: none;
+}
+
+panelmultiview .toolbaritem-combined-buttons > spacer.before-label {
+  /* 8px + 18px toolbarbutton margin start/padding + 16px icon + 4px label padding start */
+  width: 46px;
+}
+
+.subviewbutton[shortcut]::after {
+  opacity: 0.5;
+}
+
+.subviewbutton[shortcut]:not([disabled="true"]):hover::after,
+.subviewbutton[shortcut]:not([disabled="true"]):focus::after {
+  opacity: 1;
+}
+
+menupopup[type="arrow"] {
+  appearance: none;
+  background-color: transparent;
+}
+
+menupopup[type="arrow"]::part(content) {
+  margin: 1px;
+}
+
+menuitem.subviewbutton-iconic > .menu-iconic-left > .menu-iconic-icon {
+  width: 16px;
+}
+
+menu.subviewbutton > .menu-text,
+menuitem.subviewbutton > .menu-text {
+  margin-inline-start: 16px !important;
+}
+
+menuitem.subviewbutton > .menu-right {
+  margin-inline-end: -4px;
+  appearance: none;
+}
diff --git a/comm/mail/themes/osx/mail/popupPanel.css b/comm/mail/themes/osx/mail/popupPanel.css
new file mode 100644
index 0000000000..77379487f5
--- /dev/null
+++ b/comm/mail/themes/osx/mail/popupPanel.css
@@ -0,0 +1,29 @@
+/* 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/shared/popupPanel.css");
+
+@namespace html url("http://www.w3.org/1999/xhtml");
+
+#editContactAddressBookList {
+  margin-inline: 6px;
+  padding-inline-start: 8px;
+}
+
+#editContactAddressBookList:focus {
+  outline: var(--focus-outline);
+}
+
+#editContactAddressBookList[disabled="true"] {
+  opacity: .5;
+}
+
+html|input.editContactTextbox {
+  padding: 3px 8px;
+}
+
+#messageHeaderCustomizationPanel {
+  margin-top: -6px;
+  margin-inline-end: 6px;
+}
diff --git a/comm/mail/themes/osx/mail/preferences/alwaysAsk.png b/comm/mail/themes/osx/mail/preferences/alwaysAsk.png
new file mode 100644
index 0000000000..c792d14887
--- /dev/null
+++ b/comm/mail/themes/osx/mail/preferences/alwaysAsk.png
diff --git a/comm/mail/themes/osx/mail/preferences/application.png b/comm/mail/themes/osx/mail/preferences/application.png
new file mode 100644
index 0000000000..b4c1ca7d02
--- /dev/null
+++ b/comm/mail/themes/osx/mail/preferences/application.png
diff --git a/comm/mail/themes/osx/mail/preferences/applications.css b/comm/mail/themes/osx/mail/preferences/applications.css
new file mode 100644
index 0000000000..a02b123213
--- /dev/null
+++ b/comm/mail/themes/osx/mail/preferences/applications.css
@@ -0,0 +1,32 @@
+/* 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/shared/preferences/applications.css");
+
+/**
+ * Used by the cloudFile manager
+ */
+
+.cloudfileAccount description{
+  padding-inline-start: 3px;
+}
+
+.cloudfileAccount .typeIcon {
+  margin-inline-end: 5px;
+}
+
+.cloudfileAccount > input {
+  min-height: unset !important;
+  margin: 0 !important;
+  padding-block: 2px 3px !important;
+  padding-inline: 4px 3px !important;
+}
+
+.actionsMenu > menupopup {
+  margin: initial;
+}
+
+.actionsMenu > menupopup > menuitem {
+  padding-inline-start: 12px;
+}
diff --git a/comm/mail/themes/osx/mail/preferences/preferences.css b/comm/mail/themes/osx/mail/preferences/preferences.css
new file mode 100644
index 0000000000..7b0103a0b8
--- /dev/null
+++ b/comm/mail/themes/osx/mail/preferences/preferences.css
@@ -0,0 +1,33 @@
+/* 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/shared/preferences/preferences.css");
+@namespace html "http://www.w3.org/1999/xhtml";
+
+html|h2 {
+  border-bottom-width: 0;
+  padding-bottom: 2px !important;
+  padding-inline-start: 0;
+}
+
+html|legend {
+  margin: 0;
+}
+
+tab:-moz-focusring > .tab-middle > .tab-text {
+  outline: none;
+}
+
+/**
+ * Dialog
+ */
+
+/* Add to Cookies dialog a bottom padding */
+#CookiesDialog > hbox > .actionButtons {
+  padding-bottom: 10px;
+}
+
+#defaultWebSearchPopup > menuitem > .menu-iconic-left {
+  margin-inline: 5px 3px;
+}
diff --git a/comm/mail/themes/osx/mail/preferences/saveFile.png b/comm/mail/themes/osx/mail/preferences/saveFile.png
new file mode 100644
index 0000000000..7177f8df30
--- /dev/null
+++ b/comm/mail/themes/osx/mail/preferences/saveFile.png
diff --git a/comm/mail/themes/osx/mail/primaryToolbar.css b/comm/mail/themes/osx/mail/primaryToolbar.css
new file mode 100644
index 0000000000..f339f0182c
--- /dev/null
+++ b/comm/mail/themes/osx/mail/primaryToolbar.css
@@ -0,0 +1,44 @@
+/* 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/shared/primaryToolbar.css");
+
+/* ::::: Mail Toolbars and Menubars ::::: */
+
+/*
+  This is a workaround for Bug 1482157
+  -moz-default-appearance: toolbox; makes the macOS sheets attached to the
+  element's bottom border. We cannot put this property on the toolbox itself as
+  it cancels all backgrounds that are there, so we set it on the toolbox bottom
+  border.
+*/
+.mail-toolbox::after,
+.contentTabToolbox::after {
+  appearance: auto;
+  -moz-default-appearance: toolbox;
+  content: "";
+  display: flex;
+  margin-top: -1px;
+  height: 1px;
+  /* use inset box-shadow instead of border because -moz-default-appearance hides the border */
+  box-shadow: inset 0 -1px var(--chrome-content-separator-color);
+}
+
+.mail-toolbox > toolbar
+.contentTabToolbox > toolbar {
+  appearance: none;
+}
+
+#button-chat[unreadMessages="true"] {
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.4);
+}
+
+.button-appmenu {
+  margin-inline: 7px;
+}
+
+.msgNotificationBarText {
+  font: icon;
+  padding: 0;
+}
diff --git a/comm/mail/themes/osx/mail/searchBox.css b/comm/mail/themes/osx/mail/searchBox.css
new file mode 100644
index 0000000000..1e12d2f37d
--- /dev/null
+++ b/comm/mail/themes/osx/mail/searchBox.css
@@ -0,0 +1,44 @@
+/* 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/shared/searchBox.css");
+
+.search-icon {
+  margin-inline-start: 8px;
+  -moz-context-properties: fill, fill-opacity;
+  fill: currentColor;
+  fill-opacity: 0.8;
+}
+
+.searchBox,
+.themeableSearchBox {
+  margin-block: 3px 2px;
+  font: icon;
+  font-size: inherit;
+  padding: 1px 4px;
+}
+
+.searchBox:not(.gloda-search),
+.themeableSearchBox:not(.contentTabUrlInput) {
+  background-image: url("chrome://global/skin/icons/search-textbox.svg");
+  background-repeat: no-repeat;
+  background-position: 5px center;
+  padding-inline-start: 21px;
+  -moz-context-properties: fill, fill-opacity;
+  fill: currentColor;
+  fill-opacity: 0.8;
+}
+
+.gloda-search,
+#peopleSearchInput {
+  margin-block: 2px 3px;
+}
+
+.remote-gloda-search-container {
+  padding-block: 1px;
+}
+
+.autocomplete-richlistitem[type^="gloda-"] {
+  padding-inline-start: 13px;
+}
diff --git a/comm/mail/themes/osx/mail/searchDialog.css b/comm/mail/themes/osx/mail/searchDialog.css
new file mode 100644
index 0000000000..3b61a474fa
--- /dev/null
+++ b/comm/mail/themes/osx/mail/searchDialog.css
@@ -0,0 +1,56 @@
+/* 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/. */
+
+/* ===== searchDialog.css ===============================================
+  == Styles for the Mail Search dialog.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/shared/searchDialog.css");
+
+#searchTerms > vbox {
+  font: menu;
+}
+
+#checkSearchSubFolders,
+#checkSearchOnline {
+  margin-inline-start: 6px;
+}
+
+#booleanAndGroup {
+  margin-inline-start: 4px;
+}
+
+:root:not([lwt-tree]) #searchResultListBox {
+  appearance: auto;
+  -moz-default-appearance: listbox;
+}
+
+.search-menulist,
+.search-value-menulist {
+  width: 14.5em;
+}
+
+.small-button {
+  min-width: 22px;
+  height: 20px;
+  padding: 0;
+  padding-inline-end: 1px;
+  padding-bottom: 1px;
+  margin: 2px 0;
+}
+
+.small-button:first-child {
+  margin-inline-start: 2px;
+}
+
+#sizeCol,
+#unreadCol,
+#totalCol {
+  text-align: right;
+}
+
+#status-bar {
+  font: message-box;
+  margin-top: 8px;
+}
diff --git a/comm/mail/themes/osx/mail/spacesToolbar.css b/comm/mail/themes/osx/mail/spacesToolbar.css
new file mode 100644
index 0000000000..09a3a74d19
--- /dev/null
+++ b/comm/mail/themes/osx/mail/spacesToolbar.css
@@ -0,0 +1,9 @@
+/* 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/shared/spacesToolbar.css");
+
+:root:not([sizemode="fullscreen"]) .spaces-toolbar:not([hidden]) {
+  margin-top: 0;
+}
diff --git a/comm/mail/themes/osx/mail/tabmail.css b/comm/mail/themes/osx/mail/tabmail.css
new file mode 100644
index 0000000000..7470cafe67
--- /dev/null
+++ b/comm/mail/themes/osx/mail/tabmail.css
@@ -0,0 +1,147 @@
+/* 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/shared/tabmail.css");
+
+/**
+ * Tabmail Tabs
+ */
+
+#tabs-toolbar:not(:-moz-lwtheme) {
+  color: #333;
+  text-shadow: 0 1px rgba(255, 255, 255, 0.4);
+}
+
+/**
+ * Tab
+ */
+
+.tab-label {
+  margin-top: 1px;
+  margin-bottom: 0;
+}
+
+.tabmail-tab[type="glodaSearch"] .tab-icon-image {
+  transform: scaleX(-1);
+}
+
+.tabmail-tab:not(:hover) .tab-icon-image:not([selected="true"]) {
+  opacity: .9;
+}
+
+.tab-label-container:not([selected="true"]) {
+  opacity: .7;
+}
+
+.tabmail-tab,
+.tabs-newtab-button {
+  font: message-box;
+  font-size: inherit;
+  border: none;
+}
+
+/* override the selected tab toolkit color/text-shadow */
+.tabmail-tab[selected="true"]:not(:-moz-lwtheme) {
+  color: #333;
+  text-shadow: 0 1px rgba(255, 255, 255, 0.4);
+}
+
+.tabmail-tab[selected="true"]:not(:-moz-lwtheme) {
+  -moz-font-smoothing-background-color: var(--toolbar-bgcolor);
+}
+
+.tabmail-tab:focus .tab-label-container {
+  outline: var(--focus-outline);
+}
+
+#tabmail-tabs {
+  align-items: stretch;
+  font-size: inherit;
+  padding-left: 0;
+  padding-right: 0;
+  margin-bottom: 0;
+}
+
+:root[tabsintitlebar]:not([sizemode="fullscreen"]) #tabmail-tabs {
+  position: unset;
+}
+
+tabmail > tabbox > tabpanels {
+  appearance: none !important;
+}
+
+/**
+ * Tab Scrollbox Arrow Buttons
+ */
+
+#tabmail-arrowscrollbox::part(scrollbutton-up),
+#tabmail-arrowscrollbox::part(scrollbutton-down) {
+  padding: 0 4px !important;
+  margin: 0 0 var(--tabs-tabbar-border-size) !important;
+}
+
+#tabmail-arrowscrollbox:not([scrolledtostart=true])::part(scrollbutton-up):hover,
+#tabmail-arrowscrollbox:not([scrolledtoend=true])::part(scrollbutton-down):hover {
+  background-image: linear-gradient(transparent, rgba(0,0,0,0.15));
+}
+
+#tabmail-arrowscrollbox:not([scrolledtostart=true])::part(scrollbutton-up):hover:active,
+#tabmail-arrowscrollbox:not([scrolledtoend=true])::part(scrollbutton-down):hover:active {
+  background-image: linear-gradient(transparent, rgba(0,0,0,0.3));
+}
+
+#tabs-toolbar[brighttext]
+  #tabmail-arrowscrollbox:not([scrolledtostart=true])::part(scrollbutton-up):hover,
+#tabs-toolbar[brighttext]
+  #tabmail-arrowscrollbox:not([scrolledtoend=true])::part(scrollbutton-down):hover {
+  background-image: linear-gradient(rgba(255,255,255,0.25), rgba(255,255,255,0.25));
+}
+
+#tabs-toolbar[brighttext]
+  #tabmail-arrowscrollbox:not([scrolledtostart=true])::part(scrollbutton-up):hover:active,
+#tabs-toolbar[brighttext]
+  #tabmail-arrowscrollbox:not([scrolledtoend=true])::part(scrollbutton-down):hover:active {
+  background-image: linear-gradient(rgba(255,255,255,0.35), rgba(255,255,255,0.35));
+}
+
+#tabmail-arrowscrollbox[scrolledtostart=true]::part(scrollbutton-up),
+#tabmail-arrowscrollbox[scrolledtoend=true]::part(scrollbutton-down) {
+  --toolbarbutton-icon-fill-opacity: .5;
+  background-image: none;
+}
+
+/* Tab Overflow */
+#tabmail-arrowscrollbox:not([scrolledtostart])::part(arrowscrollbox-overflow-start-indicator),
+#tabmail-arrowscrollbox:not([scrolledtoend])::part(arrowscrollbox-overflow-end-indicator) {
+  margin-bottom: 0;
+}
+
+/**
+ * All Tabs Buttons
+ */
+
+.tabs-alltabs-box {
+  margin: 0;
+}
+
+/**
+ * All Tabs Menupopup
+ */
+
+@media (min-resolution: 1.1dppx) {
+  alltabs-item[busy] {
+    list-style-image: url("chrome://global/skin/icons/loading@2x.png") !important;
+  }
+}
+
+/* Content Tabs */
+.contentTabAddress {
+  height: 31px;
+  padding-left: 10px;
+  padding-right: 10px;
+}
+
+.contentTabUrlbarInput {
+  background-image: none;
+}
diff --git a/comm/mail/themes/osx/mail/themeableDialog.css b/comm/mail/themes/osx/mail/themeableDialog.css
new file mode 100644
index 0000000000..5bd2432aca
--- /dev/null
+++ b/comm/mail/themes/osx/mail/themeableDialog.css
@@ -0,0 +1,91 @@
+/* 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/shared/themeableDialog.css");
+
+@namespace html url("http://www.w3.org/1999/xhtml");
+
+@media (prefers-color-scheme: dark) {
+  :host,
+  :root:-moz-lwtheme {
+    --arrowpanel-color: #f9f9fa;
+    --arrowpanel-background: #282829;
+    --richlist-button-background: #1e1e1e;
+  }
+}
+
+:host,
+:root {
+  appearance: none;
+}
+
+button > .button-box {
+  padding-block: 3px;
+}
+
+#resetColor > .button-box {
+  padding-block: 0;
+}
+
+.button-menu-dropmarker {
+  display: flex;
+}
+
+menulist {
+  padding-inline-end: 0;
+}
+
+menulist::part(dropmarker) {
+  display: flex;
+  width: 20px;
+}
+
+html|input {
+  padding: 4px;
+}
+
+html|input[type="number"]::-moz-number-spin-up,
+html|input[type="number"]::-moz-number-spin-down {
+  min-height: 0.7em;
+}
+
+menulist[is="menulist-editable"][editable="true"] {
+  padding: 0;
+}
+
+menulist[is="menulist-editable"][editable="true"]::part(text-input) {
+  padding: 4px;
+  margin-block: -1px;
+  margin-inline: -1px 2px;
+}
+
+menulist[is="menulist-editable"][editable="true"]::part(dropmarker) {
+  display: flex;
+  width: initial;
+  min-width: 0;
+  margin-block: 0;
+  margin-inline-end: 3px;
+}
+
+menulist > menupopup:not([position]) {
+  margin-inline-start: 0;
+  margin-top: 0;
+}
+
+.menu-right {
+  margin-top: 3px;
+}
+
+tabbox {
+  margin-inline: 0;
+}
+
+.tab-middle {
+  padding: 0;
+}
+
+#commonDialog:not([subdialog]) {
+  color: var(--arrowpanel-color);
+  background-color: var(--arrowpanel-background);
+}
diff --git a/comm/mail/themes/osx/mail/toolbar.css b/comm/mail/themes/osx/mail/toolbar.css
new file mode 100644
index 0000000000..0f796a6a96
--- /dev/null
+++ b/comm/mail/themes/osx/mail/toolbar.css
@@ -0,0 +1,47 @@
+/* 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/. */
+
+/* ===== toolbar.css ====================================================
+  == Styles used by XUL toolbar-related elements.
+  ======================================================================= */
+
+/* ::::: toolbox ::::: */
+
+toolbox {
+  appearance: auto;
+  -moz-default-appearance: toolbox;
+  background-color: -moz-Dialog;
+  border-left: 1px solid ThreeDShadow;
+  border-top: 1px solid ThreeDShadow;
+  border-right: none;
+  border-bottom: 1px solid #000000;
+}
+
+/* ::::: toolbar & menubar ::::: */
+
+toolbar,
+menubar {
+  appearance: auto;
+  -moz-default-appearance: toolbar;
+  min-width: 1px; /* DON'T DELETE!
+    Prevents hiding of scrollbars in browser when window is made smaller.*/
+}
+
+.toolbar-holder {
+  border-left: 1px solid ThreeDHighlight;
+  border-top: 1px solid ThreeDHighlight;
+  border-right: 1px solid ThreeDShadow;
+  border-bottom: 1px solid ThreeDShadow;
+}
+
+/* ::::: toolbarseparator ::::: */
+
+toolbarseparator {
+  appearance: auto;
+  -moz-default-appearance: separator;
+  margin: 2px 0.2em;
+  border-right: 1px solid ThreeDHighlight;
+  border-left: 1px solid ThreeDShadow;
+  width: 2px;
+}
diff --git a/comm/mail/themes/osx/mail/variables.css b/comm/mail/themes/osx/mail/variables.css
new file mode 100644
index 0000000000..e008c12f02
--- /dev/null
+++ b/comm/mail/themes/osx/mail/variables.css
@@ -0,0 +1,26 @@
+/* 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/shared/variables.css");
+
+:root {
+  --tabline-color: AccentColor;
+  --toolbar-non-lwt-bgcolor: #f9f9fa;
+  --toolbar-non-lwt-textcolor: #0c0c0d;
+  --toolbar-non-lwt-bgimage: none;
+  --chrome-content-separator-color: hsl(0, 0%, 60%);
+  --row-grouped-header-bg-color: #d5d5d5;
+  --row-grouped-header-bg-color-selected: #3874d1;
+  --panel-separator-color: hsla(210, 4%, 10%, 0.14);
+  --autocomplete-popup-url-color: hsl(210, 77%, 47%);
+}
+
+:root:not(:-moz-lwtheme) {
+  --chrome-content-separator-color: hsl(0, 0%, 68%);
+}
+
+:root:not(:-moz-lwtheme):-moz-window-inactive {
+  --toolbar-bgcolor: -moz-mac-chrome-inactive;
+  --chrome-content-separator-color: hsl(0, 0%, 85%);
+}
diff --git a/comm/mail/themes/osx/moz.build b/comm/mail/themes/osx/moz.build
new file mode 100644
index 0000000000..de5cd1bf81
--- /dev/null
+++ b/comm/mail/themes/osx/moz.build
@@ -0,0 +1,6 @@
+# vim: set filetype=python:
+# 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/.
+
+JAR_MANIFESTS += ["jar.mn"]