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

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

498 files changed, 19224 insertions, 0 deletions

diff --git a/comm/suite/themes/classic/Makefile.in b/comm/suite/themes/classic/Makefile.in
new file mode 100644
index 0000000000..1cdce732af
--- /dev/null
+++ b/comm/suite/themes/classic/Makefile.in
@@ -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/.
+
+CLASSIC_EXTENSION_DIR = {972ce4c6-7e08-4474-a285-3208198ce6fd}
+
+INSTALL_RDF = $(srcdir)/install.rdf
+INSTALL_RDF_PATH = $(FINAL_TARGET)/extensions/$(CLASSIC_EXTENSION_DIR)
+PP_TARGETS += INSTALL_RDF
diff --git a/comm/suite/themes/classic/README b/comm/suite/themes/classic/README
new file mode 100644
index 0000000000..9f5a75a341
--- /dev/null
+++ b/comm/suite/themes/classic/README
@@ -0,0 +1,19 @@
+Welcome to the Classic Skin, a contemporary native look for Mozilla. 
+
+Notes:
+
+Unix builds the Windows version, and all Unix subdirectories are ignored. Should get around to 
+removing them some day.
+
+Many aspects of this skin have been tuned for optimum performance. Barring style sheet scoping
+work, the rules here are generally good. 
+
+Do NOT inject Dumb-Ass style rules into this skin, or I will hunt you down and kill you. 
+
+Do NOT inject Tabs into skins in this skin, even the Mac files, or I will hunt you down and kill you. Configure your editor to insert Tabs as spaces.
+
+Please conform to the indentation style standard set by the Windows version of this skin. 
+
+This skin uses System Colours in the Windows version, and is slowly picking up System Colour usage in the Macintosh version as support is implemented. Please don't check in hard coded colour values into the Windows version or the Macintosh version where an appropriate System Colour exists. 
+
+Send comments and questions to <ben@netscape.com>
diff --git a/comm/suite/themes/classic/communicator/about.css b/comm/suite/themes/classic/communicator/about.css
new file mode 100644
index 0000000000..cfe6b54648
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/about.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/. */
+
+html {
+  background: -moz-Dialog;
+  padding: 0 1em;
+  font: message-box;
+}
+
+body {
+  color: -moz-FieldText;
+  position: relative;
+  min-width: 330px;
+  max-width: 50em;
+  margin: 4em auto;
+  border: 1px solid ThreeDShadow;
+  border-radius: 10px;
+  padding: 3em;
+  padding-inline-start: 30px;
+  background: -moz-Field;
+}
+
+.aboutPageWideContainer {
+  max-width: 80%;
+}
+
+#aboutLogoContainer {
+  border: 1px solid ThreeDLightShadow;
+  width: 300px;
+  margin-bottom: 2em;
+}
+
+img {
+  border: 0;
+}
+
+#version {
+  font-weight: bold;
+  color: #909090;
+  margin: -24px 0 9px 17px;
+  text-align: left; /* Override direction alignment on RTL to make sure that the version will fit well on the background. bug 1325232 */
+}
+
+ul {
+  margin: 0;
+  margin-inline-start: 1.5em;
+  padding: 0;
+  list-style: square;
+}
+
+ul > li {
+  margin-top: .5em;
+}
+
+th, td {
+  padding: 0 5px;
+}
diff --git a/comm/suite/themes/classic/communicator/aboutPrivateBrowsing.css b/comm/suite/themes/classic/communicator/aboutPrivateBrowsing.css
new file mode 100644
index 0000000000..4d34fcd5e9
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/aboutPrivateBrowsing.css
@@ -0,0 +1,86 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#warningScreen {
+  background-color: -moz-Dialog;
+}
+
+#warningBox {
+  background-color: -moz-Field;
+  color: -moz-FieldText;
+  border: 1px solid ThreeDShadow;
+  border-radius: 10px;
+  padding: 3em;
+  padding-inline-start: 30px;
+  margin-left: 1em;
+  margin-right: 1em;
+}
+
+#warningInnerBox {
+ max-width: 50em;
+}
+
+#warningTitle {
+  margin: 0 0 .6em 0;
+  font-size: 160%;
+  border-bottom: 1px solid ThreeDLightShadow
+}
+
+#warningText {
+  font-size: 110%;
+  margin-left: 0;
+}
+
+/* Pick the desired icons depending on the window's context */
+
+#warningBox.private > #warningBoxIcon {
+  list-style-image: url("chrome://communicator/skin/icons/information-48.png");
+
+  width: 48px;
+  height: 48px;
+  margin-inline-end: 3em;
+}
+
+#warningBox.normal > #warningBoxIcon {
+  list-style-image: url("chrome://communicator/skin/icons/question-48.png");
+  width: 48px;
+  height: 48px;
+  margin-inline-end: 3em;
+}
+
+#trackWarnBox {
+  margin-top: 0.6em;
+  margin-inline-end: 7em;
+  -moz-box-align: center;
+}
+
+#trackWarnIcon {
+  list-style-image: url("chrome://communicator/skin/icons/warning-24.png");
+  width: 24px;
+  height: 24px;
+}
+
+/* Define additional styles to look similar to the netError/certError pages */
+
+#warningTitle {
+  font-weight: bold;
+}
+
+#warningStatus {
+  margin: 0.4em 0 1.2em 0;
+  padding-bottom: 1.2em;
+  border-bottom: 1px solid ThreeDLightShadow;
+  font-size: 135%;
+}
+
+#warningInnerBox > button {
+  margin: 0.8em 0 1em 0;
+}
+
+#warningOuterBox > vbox > label,
+#warningInnerBox > description {
+  margin-inline-start: 0;
+}
diff --git a/comm/suite/themes/classic/communicator/aboutSessionRestore.css b/comm/suite/themes/classic/communicator/aboutSessionRestore.css
new file mode 100644
index 0000000000..d1b9921d03
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/aboutSessionRestore.css
@@ -0,0 +1,52 @@
+/* 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/. */
+
+#tabList {
+  width: 100%;
+  height: 12em;
+}
+
+treechildren::-moz-tree-image(icon),
+treechildren::-moz-tree-image(noicon) {
+  padding-right: 2px;
+  margin: 0px 2px;
+  width: 16px;
+  height: 16px;
+}
+
+treechildren::-moz-tree-image(noicon) {
+  list-style-image: url("chrome://communicator/skin/places/bookmark-item.svg");
+}
+
+treechildren::-moz-tree-image(container, noicon) {
+  list-style-image: url("chrome://communicator/skin/places/bookmark-folder-closed.png");
+}
+
+treechildren::-moz-tree-image(container, noicon, open) {
+  list-style-image: url("chrome://communicator/skin/places/bookmark-folder-open.png");
+}
+
+treechildren::-moz-tree-checkbox(checked) {
+  list-style-image: url("chrome://global/skin/checkbox/cbox-check.gif");
+}
+
+treechildren::-moz-tree-checkbox(partial) {
+  list-style-image: url("chrome://global/skin/checkbox/cbox-check-dis.gif");
+}
+
+treechildren::-moz-tree-row(alternate) {
+  background-color: -moz-oddtreerow;
+}
+
+treechildren::-moz-tree-row(alternate, selected) {
+  background-color: Highlight;
+}
+
+#buttons {
+  margin-inline-start: 80px;
+}
+#buttons > button {
+  margin-top: 2em;
+  margin-inline-start: 5px;
+}
diff --git a/comm/suite/themes/classic/communicator/aboutSupport.css b/comm/suite/themes/classic/communicator/aboutSupport.css
new file mode 100644
index 0000000000..248700dffb
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/aboutSupport.css
@@ -0,0 +1,139 @@
+/* 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://communicator/skin/common.css");
+
+html {
+  background-color: var(--in-content-page-background);
+  color: -moz-FieldText;
+  font: message-box;
+}
+
+body {
+  width: 90%;
+  margin-left: 5%;
+  margin-right: 5%;
+}
+
+.page-subtitle {
+  margin-bottom: 1.5em;
+}
+
+.major-section {
+  margin-top: 2em;
+  margin-bottom: 1em;
+  font-size: large;
+  text-align: start;
+  font-weight: bold;
+}
+
+button {
+  margin-inline-start: 0;
+  margin-inline-end: 8px;
+  border-radius: 3px;
+}
+
+table {
+  background-color: var(--in-content-table-background);
+  color: var(--in-content-text-color);
+  font: message-box;
+  text-align: start;
+  width: 100%;
+  border: 1px solid var(--in-content-border-color);
+  border-spacing: 0px;
+}
+
+th, td {
+  border: var(--in-content-border-dotted-color);
+  padding: 3px;
+}
+
+thead th {
+  text-align: center;
+}
+
+th {
+  text-align: start;
+  background-color: var(--in-content-table-header-background);
+  color: var(--in-content-selected-text);
+}
+
+th.title-column {
+  white-space: nowrap;
+  width: 0px;
+  font-size: medium;
+}
+
+th.column {
+  white-space: nowrap;
+  width: 0px;
+}
+
+td {
+  text-align: start;
+  border-top: var(--in-content-border-dotted-color);
+}
+
+.prefs-table {
+  table-layout: fixed;
+}
+
+.name {
+  width: 70%;
+}
+
+.value {
+  width: 30%;
+}
+
+.pref-name,
+.pref-value {
+  white-space: nowrap;
+  overflow: hidden;
+}
+
+#action-box {
+  background-color: var(--in-content-table-background);
+  border: 1px solid var(--in-content-border-color);
+  border-radius: 6px;
+  color: var(--in-content-text-color);
+  float: right;
+  margin-top: 2em;
+  margin-bottom: 20px;
+  margin-inline-start: 20px;
+  margin-inline-end: 0;
+  padding: 16px;
+  width: 30%;
+}
+
+#action-box,
+#reset-box,
+#safe-mode-box {
+  display: none;
+}
+
+#action-box:dir(rtl) {
+  float: left;
+}
+
+#reset-box > h3 {
+  margin-top: 0;
+}
+
+#action-box button {
+  display: block;
+}
+
+#verify-place-result {
+  max-height: 200px;
+  overflow: auto;
+}
+
+.block {
+  display: block;
+}
+
+.hidden {
+  display: none;
+}
diff --git a/comm/suite/themes/classic/communicator/aboutSyncTabs.css b/comm/suite/themes/classic/communicator/aboutSyncTabs.css
new file mode 100644
index 0000000000..8308d5ab77
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/aboutSyncTabs.css
@@ -0,0 +1,88 @@
+/* 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/. */
+
+#tabsList {
+  background: #FFFFFF url(chrome://communicator/skin/sync/sync-bg.png) repeat-x center -80px;
+}
+
+#headers {
+  background: url(chrome://communicator/skin/sync/sync-32.png) no-repeat;
+  width: 45em;
+  height: 32px;
+  margin: 4px 2em 0px;
+}
+
+#tabsListHeading {
+  font-size: 140%;
+  font-weight: bold;
+  margin-inline-start: 40px;
+}
+
+richlistitem {
+  margin-inline-end: 2em;
+}
+
+richlistitem[selected="true"],
+richlistitem:focus {
+  outline-style: none;
+}
+
+richlistitem[type="tab"] {
+  min-height: 3em;
+  border: #999999 1px solid !important;
+  padding: 2px 5px;
+  margin-bottom: 4px;
+  margin-inline-start: 4em;
+  border-radius: 6px;
+  background-color: menu;
+  width: 44em;
+  opacity: 0.9;
+  box-shadow:
+    inset rgba(255, 255, 255, 0.5) 0 1px 0px,
+    inset rgba(0, 0, 0, 0.1) 0 -2px 0px,
+    rgba(0, 0, 0, 0.1) 0px 1px 0px;
+}
+
+richlistitem[type="tab"][selected="true"] {
+  background-color: Highlight;
+}
+
+richlistitem[type="client"] {
+  min-height: 2em;
+  color: #000000;
+  margin-inline-start: 2em;
+  margin-top: 2px;
+  margin-bottom: 3px;
+  width: 42em;
+  border-radius: 6px;
+  background-color: transparent;
+  -moz-user-focus: ignore !important;
+}
+
+.mobile[type="client"] {
+  list-style-image: url("chrome://communicator/skin/sync/sync-mobileIcon.png");
+}
+
+.desktop[type="client"] {
+  list-style-image: url("chrome://communicator/skin/sync/sync-desktopIcon.png");
+}
+
+.title,
+.clientName {
+  font-size: 1.1em;
+}
+
+.url {
+  color: -moz-nativehyperlinktext;
+  font-size: 0.95em;
+}
+
+.url[selected="true"] {
+  color: inherit;
+}
+
+.tabIcon {
+  padding-inline-start: 2px;
+  padding-top: 2px;
+}
diff --git a/comm/suite/themes/classic/communicator/blockedSite.css b/comm/suite/themes/classic/communicator/blockedSite.css
new file mode 100644
index 0000000000..c695b3c974
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/blockedSite.css
@@ -0,0 +1,20 @@
+/* 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/. */
+
+#buttons > span {
+  float: left;
+}
+
+#buttons > #ignoreWarningButton {
+  float: right;
+  font-size: smaller;
+}
+
+/* the following ids refer to <span> elements defined in safeBrowsing.dtd */
+
+#malware_sitename,
+#phishing_sitename,
+#unwanted_sitename {
+  word-wrap: break-word;
+}
diff --git a/comm/suite/themes/classic/communicator/brand.css b/comm/suite/themes/classic/communicator/brand.css
new file mode 100644
index 0000000000..d80d5afbb7
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/brand.css
@@ -0,0 +1,59 @@
+/* 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/. */
+
+/* ==== brand.css ===========================================================
+   == Styles related to branding in the Communicator suite.
+   ========================================================================== */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#wrapper-throbber-box > #throbber-box > #navigator-throbber,
+#navigator-throbber {
+  -moz-user-focus: ignore;
+  -moz-box-align: center;
+  -moz-box-pack: center;
+  margin-top: 1px;
+  margin-bottom: 1px;
+  margin-inline-start: 10px;
+  margin-inline-end: 5px;
+  border: none;
+  padding: 1px;
+  min-width: 0;
+  list-style-image: url("chrome://communicator/skin/brand/throbber-single.png");
+  background-color: transparent;
+  -moz-appearance:none !important;
+}
+
+#navigator-throbber .button-box {
+  padding: 0;
+  margin: 0;
+}
+
+#navigator-throbber .button-icon {
+  margin-inline-start: 0;
+  margin-inline-end: 0;
+}
+
+#navigator-throbber .button-text {
+  display: none;
+}
+
+#navigator-throbber[busy="true"] {
+  list-style-image: url("chrome://communicator/skin/brand/throbber-anim.png");
+}
+
+window[chromehidden~="toolbar"] #navigator-throbber,
+toolbar[mode="text"] #wrapper-throbber-box > #throbber-box > #navigator-throbber,
+toolbar[iconsize="small"] #wrapper-throbber-box > #throbber-box > #navigator-throbber,
+toolbar[mode="text"] #navigator-throbber,
+toolbar[iconsize="small"] #navigator-throbber {
+  margin: 0 5px;
+  list-style-image: url("chrome://communicator/skin/brand/throbber16-single.png");
+}
+
+window[chromehidden~="toolbar"] #navigator-throbber[busy="true"],
+toolbar[mode="text"] #navigator-throbber[busy="true"],
+toolbar[iconsize="small"] #navigator-throbber[busy="true"] {
+  list-style-image: url("chrome://communicator/skin/brand/throbber16-anim.png");
+}
diff --git a/comm/suite/themes/classic/communicator/brand/throbber-anim.png b/comm/suite/themes/classic/communicator/brand/throbber-anim.png
new file mode 100644
index 0000000000..c946b2e5a1
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/brand/throbber-anim.png
diff --git a/comm/suite/themes/classic/communicator/brand/throbber-single.png b/comm/suite/themes/classic/communicator/brand/throbber-single.png
new file mode 100644
index 0000000000..609352f86a
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/brand/throbber-single.png
diff --git a/comm/suite/themes/classic/communicator/brand/throbber16-anim.png b/comm/suite/themes/classic/communicator/brand/throbber16-anim.png
new file mode 100644
index 0000000000..480ef01635
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/brand/throbber16-anim.png
diff --git a/comm/suite/themes/classic/communicator/brand/throbber16-single.png b/comm/suite/themes/classic/communicator/brand/throbber16-single.png
new file mode 100644
index 0000000000..c8a8c52aee
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/brand/throbber16-single.png
diff --git a/comm/suite/themes/classic/communicator/button.css b/comm/suite/themes/classic/communicator/button.css
new file mode 100644
index 0000000000..50fff7c831
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/button.css
@@ -0,0 +1,235 @@
+/* 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/. */
+
+/* ==== button.css ==========================================================
+   == Styles for special buttons in the Communicator suite.
+   ========================================================================== */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* Restore Windows Classic fallbacks removed by bug 1340495 */
+
+@media (-moz-windows-classic) {
+
+  /* ::::: toolbarbutton ::::: */
+
+  toolbarbutton {
+    border: 1px solid transparent;
+    background-color: transparent;
+  }
+
+  toolbarbutton:hover:not([disabled="true"]) {
+    border-color: ThreeDHighlight ThreeDShadow ThreeDShadow ThreeDHighlight;
+  }
+
+  toolbarbutton:hover:active:not([disabled="true"]),
+  toolbarbutton[open="true"]:hover,
+  toolbarbutton[open="true"] {
+    border-color: ThreeDShadow ThreeDHighlight ThreeDHighlight ThreeDShadow;
+  }
+
+  toolbarbutton[checked="true"]:not([disabled="true"]) {
+    border-color: ThreeDShadow ThreeDHighlight ThreeDHighlight ThreeDShadow;
+    background-color: rgba(255,255,255,0.5);
+  }
+
+  /* ::::: toolbarbutton menu ::::: */
+
+  .toolbarbutton-menu-dropmarker {
+    border: none !important;
+    background-color: transparent !important;
+  }
+
+  /* ::::: toolbarbutton menu-button ::::: */
+
+  toolbarbutton[type="menu-button"],
+  toolbarbutton[type="menu-button"]:hover,
+  toolbarbutton[type="menu-button"]:hover:active,
+  toolbarbutton[type="menu-button"][open="true"],
+  toolbarbutton[type="menu-button"][disabled="true"],
+  toolbarbutton[type="menu-button"][disabled="true"]:hover,
+  toolbarbutton[type="menu-button"][disabled="true"]:hover:active {
+    border-style: none;
+  }
+
+  /* .......... dropmarker .......... */
+
+  .toolbarbutton-menubutton-dropmarker {
+    background-color: transparent;
+  }
+
+}
+
+/* End restore Windows Classic fallbacks removed by bug 1340495 */
+
+/* ::::: large toolbar buttons ::::: */
+
+.toolbarbutton-1,
+.toolbarbutton-1 > .toolbarbutton-menubutton-button {
+  min-width: 47px;
+  -moz-box-orient: vertical;
+}
+
+.toolbarbutton-1[type="menu-button"] {
+  -moz-box-orient: horizontal;
+}
+
+.toolbarbutton-1,
+.toolbarbutton-1 > .toolbarbutton-menubutton-button,
+.toolbarbutton-1[disabled="true"]:hover:active,
+.toolbarbutton-1[disabled="true"]:hover:active > .toolbarbutton-menubutton-button {
+  padding-top: 2px;
+  padding-bottom: 2px;
+  padding-inline-start: 2px;
+  padding-inline-end: 3px;
+}
+
+.toolbarbutton-1:hover:active,
+.toolbarbutton-1[open="true"],
+.toolbarbutton-1:hover:active > .toolbarbutton-menubutton-button {
+  padding-top: 3px;
+  padding-bottom: 1px;
+  padding-inline-start: 3px;
+  padding-inline-end: 2px;
+}
+
+.toolbarbutton-1[type="menu-button"],
+.toolbarbutton-1[type="menu-button"]:hover:active,
+.toolbarbutton-1[type="menu-button"][open="true"] {
+  padding: 0;
+}
+
+.toolbarbutton-1[type="menu"] {
+  -moz-binding: url("chrome://communicator/content/bindings/generalBindings.xml#menu-vertical");
+}
+
+toolbar[mode="icons"] .toolbarbutton-1,
+toolbar[mode="icons"] .toolbarbutton-menubutton-button,
+toolbar[iconsize="small"] .toolbarbutton-1,
+toolbar[iconsize="small"] .toolbarbutton-menubutton-button {
+  min-width: 0px;
+}
+
+toolbar[mode="icons"] .toolbarbutton-text,
+toolbar[mode="text"] .toolbarbutton-icon {
+  display: none;
+}
+
+toolbar[mode="text"] .toolbarbutton-1,
+toolbar[mode="text"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
+ -moz-box-orient: horizontal;
+}
+
+toolbar[labelalign="end"] .toolbarbutton-1,
+toolbar[labelalign="end"] .toolbarbutton-1 > .toolbarbutton-menubutton-button,
+toolbar[labelalign="end"] .toolbarbutton-1 > hbox > vbox {
+  -moz-box-orient: horizontal;
+}
+
+/* ::::: standard toolbar buttons ::::: */
+
+.button-toolbar {
+  -moz-user-focus: ignore;
+  border: 2px solid;
+  border-radius: 0;
+  min-width: 0;
+  background-color: transparent;
+}  
+  
+.button-toolbar > .button-box  {
+  margin: 0;
+  padding: 1px 2px;
+}
+
+.button-toolbar:hover:active > .button-box  {
+  padding-top: 2px;
+  padding-bottom: 0px;
+  padding-inline-start: 3px;
+  padding-inline-end: 1px;
+}
+
+.button-toolbar > .button-box > .button-icon[src],
+.button-toolbar > .button-box > .button-text {
+  margin-inline-end: 2px;
+}  
+
+.button-toolbar, 
+.button-toolbar[disabled="true"]:hover,
+.button-toolbar[disabled="true"]:hover:active {
+  padding: 1px;
+  border-top-color: ThreeDHighlight;
+  border-right-color: ThreeDShadow;
+  border-bottom-color: ThreeDShadow;
+  border-left-color: ThreeDHighlight;
+}
+  
+.button-toolbar:hover {
+  border-top-color: ThreeDDarkShadow;
+  border-right-color: ThreeDDarkShadow;
+  border-bottom-color: ThreeDDarkShadow;
+  border-left-color: ThreeDDarkShadow;
+}
+
+.button-toolbar:hover:active {
+  border-top-color: ThreeDDarkShadow;
+  border-right-color: ThreeDDarkShadow;
+  border-bottom-color: ThreeDDarkShadow;
+  border-left-color: ThreeDDarkShadow;
+}
+
+/* ::::: taskbuttons ::::: */
+
+.taskbutton {
+  padding: 1px;
+}
+
+.taskbutton:hover:active {
+  padding-top: 2px;
+  padding-bottom: 0px;
+  padding-inline-start: 2px;
+  padding-inline-end: 0px;
+}
+
+/* override windows */
+
+.toolbarbutton-icon[label]:not([label=""]),
+.toolbarbutton-icon[type="menu"] {
+  margin-inline-end: 2px;
+}
+
+/**
+ * Fix the missing dropmarker bevel in Classic (bug 216266)
+ * Not used in Firefox but used elsewhere,
+ **/
+
+@media (-moz-windows-classic) {
+
+  .toolbarbutton-menubutton-dropmarker {
+    border: 1px solid;
+    padding: 2px;
+    border-top-color: transparent;
+    border-right-color: transparent;
+    border-bottom-color: transparent;
+    border-left-color: transparent;
+  }
+
+  toolbarbutton[type="menu-button"]:hover > .toolbarbutton-menubutton-dropmarker:not([disabled="true"]) {
+    border-top-color: ThreeDHighlight;
+    border-right-color: ThreeDShadow;
+    border-bottom-color: ThreeDShadow;
+    border-left-color: ThreeDHighlight;
+  }
+
+  toolbarbutton[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker:not([disabled="true"]),
+  toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker:not([disabled="true"]) {
+    border-top-color: ThreeDShadow;
+    border-right-color: ThreeDHighlight;
+    border-bottom-color: ThreeDHighlight;
+    border-left-color: ThreeDShadow;
+    padding-top: 3px;
+    padding-bottom: 1px;
+    padding-inline-start: 3px;
+    padding-inline-end: 1px;
+  }
+}
diff --git a/comm/suite/themes/classic/communicator/certError.css b/comm/suite/themes/classic/communicator/certError.css
new file mode 100644
index 0000000000..85505bc9ef
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/certError.css
@@ -0,0 +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/. */
+
+
+html {
+  background: -moz-Dialog;
+}
+
+body {
+  margin: 0;
+  padding: 0 1em;
+  color: -moz-FieldText;
+  font: message-box;
+}
+
+h1 {
+  margin: 0 0 .6em 0;
+  border-bottom: 1px solid ThreeDLightShadow;
+  font-size: 160%;
+}
+
+h2 {
+  font-size: 130%;
+}
+
+span.hostname {
+  font-weight: bolder;
+}
+
+#errorPageContainer {
+  position: relative;
+  min-width: 13em;
+  max-width: 52em;
+  margin: 4em auto;
+  border: 1px solid #FFBD09;
+  border-radius: 10px;
+  padding: 3em;
+  padding-inline-start: 30px;
+  background: url("chrome://global/skin/icons/sslWarning.png") left 0 no-repeat -moz-Field;
+  background-origin: content-box;
+}
+
+body[dir="rtl"] #errorPageContainer {
+  background-position: right 0;
+}
+
+#errorTitle {
+  margin-inline-start: 80px;
+}
+
+#errorLongContent {
+  margin-inline-start: 80px;
+}
+
+#errorShortDescText.wrap {
+  white-space: pre-wrap;
+}
+
+#technicalContent > h2, #expertContent > h2 {
+  cursor: pointer;
+  padding-inline-start: 20px;
+  position: relative;
+  left: -20px;
+  background: url("chrome://messenger/skin/icons/twisty-open.png") left center no-repeat;
+}
+
+#technicalContent[collapsed] > h2,
+#expertContent[collapsed] > h2 {
+  background-image: url("chrome://messenger/skin/icons/twisty-clsd.png");
+}
+
+#technicalContent[collapsed] > p,
+#expertContent[collapsed] > div {
+  display: none;
+}
+
+#technicalContentText {
+  overflow: auto;
+  white-space: pre-wrap;
+}
diff --git a/comm/suite/themes/classic/communicator/common.css b/comm/suite/themes/classic/communicator/common.css
new file mode 100644
index 0000000000..05acba2aa4
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/common.css
@@ -0,0 +1,66 @@
+/* - 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("resource://gre-resources/forms.css");
+@import url("resource://gre-resources/html.css");
+@import url("chrome://communicator/skin/communicator.css");
+
+@namespace html "http://www.w3.org/1999/xhtml";
+@namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+
+*|*:root {
+  --in-content-page-color: -moz-DialogText;
+  --in-content-page-background: -moz-Field;
+  --in-content-text-color: -moz-DialogText;
+  --in-content-selected-text: HighlightText;
+  --in-content-header-border-color: #c8c8c8;
+  --in-content-box-background: #fff;
+  --in-content-box-background-odd: #f3f6fa;
+  --in-content-box-background-hover: #ebebeb;
+  --in-content-box-background-active: #dadada;
+  --in-content-box-border-color: #c1c1c1;
+  --in-content-button-background-hover: -moz-buttonhoverface;
+  --in-content-button-color-hover: -moz-buttonhovertext;
+  --in-content-button-background-hover-active: ButtonFace;
+  --in-content-button-color-hover-active: ButtonText;
+  --in-content-item-hover: rgba(0,149,221,0.25);
+  --in-content-item-selected: #0095dd;
+  --in-content-border-highlight: #ff9500;
+  --in-content-border-focus: #0095dd;
+  --in-content-border-color: ThreeDShadow;
+  --in-content-border-dotted-color: 1px dotted ThreeDShadow;
+  --in-content-category-text: #c1c1c1;
+  --in-content-category-border-focus: 1px dotted #fff;
+  --in-content-category-text-selected: #f2f2f2;
+  --in-content-category-background: #424f5a;
+  --in-content-category-background-hover: #5e6972;
+  --in-content-category-background-active: #343f48;
+  --in-content-tab-color: -moz-DialogText;
+  --in-content-link-color: #0095dd;
+  --in-content-link-color-hover: #178ce5;
+  --in-content-link-color-active: #ff9500;
+  --in-content-link-color-visited: #551a8b;
+  --in-content-primary-button-background: #0095dd;
+  --in-content-primary-button-background-hover: #008acb;
+  --in-content-primary-button-background-active: #006b9d;
+  --in-content-table-background: -moz-Dialog;
+  --in-content-table-border-dark-color: #d1d1d1;
+  --in-content-table-header-background: Highlight;
+}
+
+html|html,
+xul|page,
+xul|window {
+  font: message-box;
+  background-color: var(--in-content-page-background);
+  color: var(--in-content-page-color);
+}
+
+html|body {
+  font-size: inherit;
+}
+
+*|button {
+  min-height: 0px;
+}
diff --git a/comm/suite/themes/classic/communicator/communicator.css b/comm/suite/themes/classic/communicator/communicator.css
new file mode 100644
index 0000000000..0380a50393
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/communicator.css
@@ -0,0 +1,321 @@
+/* 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/. */
+
+/* ==== communicator.css ====================================================
+   == Styles shared everywhere throughout the Communicator suite.
+   ========================================================================== */
+
+@import url("chrome://global/skin/global.css");
+@import url("chrome://communicator/content/communicator.css");
+@import url("chrome://communicator/skin/brand.css");
+@import url("chrome://communicator/skin/button.css");
+@import url("chrome://communicator/skin/toolbar.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+.wizard-box {
+  padding: 20px 44px 10px;
+}
+
+/* ::::: toolbar-primary ::::: */
+
+.toolbar-primary {
+  -moz-binding: url("chrome://communicator/content/bindings/toolbar-xpfe.xml#grippytoolbar-primary");
+}
+
+/* .padded is used by autocomplete widgets that don't have an icon. Gross. -dwh */
+textbox:not(.padded) {
+  cursor: default;
+  padding: 0;
+}
+
+/* ::::: autocomplete ::::: */
+
+.autocomplete-history-popup {
+  max-height: 25em;
+}
+
+textbox[autocompletesearch="history file"] .autocomplete-treebody::-moz-tree-image(treecolAutoCompleteValue) {
+  width: 16px;
+  height: 16px;
+  margin-left: 1px;
+}
+
+textbox[autocompletesearch="history file"] .autocomplete-treebody::-moz-tree-image(treecolAutoCompleteValue, directory) {
+  list-style-image: url("chrome://communicator/skin/places/bookmark-folder-closed.png");
+}
+
+textbox[autocompletesearch="history file"] .autocomplete-treebody::-moz-tree-image(treecolAutoCompleteValue, file) {
+  list-style-image: url("chrome://communicator/skin/places/bookmark-item.svg");
+}
+
+/* ::::: online/offline icons ::::: */
+
+#offline-status[offline="true"] {
+  list-style-image: url("chrome://communicator/skin/icons/offline.png");
+}
+
+#offline-status {
+  list-style-image: url("chrome://communicator/skin/icons/online.png");
+}
+
+/* ::::: security button icons ::::: */
+
+#security-button {
+  list-style-image: url("chrome://communicator/skin/icons/lock-insecure.png");
+}
+
+#security-button[level="high"] {
+  list-style-image: url("chrome://communicator/skin/icons/lock-secure.png");
+}
+
+#security-button[level="broken"] {
+  list-style-image: url("chrome://communicator/skin/icons/lock-broken.png");
+}
+
+/* ::::: spell checker ::::: */
+
+.spell-suggestion {
+  font-weight: bold;
+}
+
+/* ::::: error messages ::::: */
+
+description.error {
+  color: #FF0000;
+}
+
+/* ::::: directional button icons ::::: */
+
+.up {
+  min-width: 0px;
+  list-style-image: url("chrome://global/skin/arrow/arrow-up.gif");
+}
+
+.up[disabled="true"] {
+  list-style-image: url("chrome://global/skin/arrow/arrow-up-dis.gif");
+}
+
+.down {
+  min-width: 0px;
+  list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
+}
+
+.down[disabled="true"] {
+  list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif");
+}
+
+.sidebarTree {
+  border: none;
+  margin: 0px !important;
+}
+
+/* ::::: iconic menus and menuitems ::::: */
+
+menu.menu-iconic > .menu-iconic-left,
+menuitem.menuitem-iconic > .menu-iconic-left {
+  display: -moz-box;
+}
+
+/* ::::: toolbar print button ::::: */
+#print-button {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
+  -moz-image-region: rect(0 29px 29px 0);
+}
+
+#print-button:hover {
+  -moz-image-region: rect(0 59px 29px 30px);
+}
+
+#print-button:hover:active {
+  -moz-image-region: rect(0 89px 29px 60px);
+}
+
+#print-button[disabled="true"] {
+  -moz-image-region: rect(0 119px 29px 90px) !important;
+}
+
+toolbar[iconsize="small"] > toolbarpaletteitem > #print-button,
+toolbar[iconsize="small"] > #print-button {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+  -moz-image-region: rect(0 19px 19px 0);
+}
+
+toolbar[iconsize="small"] > #print-button:hover {
+  -moz-image-region: rect(0 39px 19px 20px);
+}
+
+toolbar[iconsize="small"] > #print-button:hover:active {
+  -moz-image-region: rect(0 59px 19px 40px);
+}
+
+toolbar[iconsize="small"] > #print-button[disabled="true"] {
+  -moz-image-region: rect(0 79px 19px 60px) !important;
+}
+
+/* ::::: lightweight themes ::::: */
+
+toolbar button:-moz-lwtheme,
+toolbar menulist:-moz-lwtheme:not([open="true"]),
+toolbar textbox:-moz-lwtheme:not([focused="true"]) {
+  opacity: .8;
+}
+
+treecols:-moz-lwtheme {
+  text-shadow: none;
+  color: -moz-dialogtext;
+  background-color: -moz-dialog;
+}
+
+/* ::::: notification bars ::::: */
+
+.messageImage[value="refresh-blocked"] {
+  list-style-image: url("chrome://communicator/skin/icons/application.png");
+}
+
+.messageImage[value="plugin-crashed"] {
+  list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric-16.png");
+}
+
+.messageImage[value="geolocation"] {
+  list-style-image: url("chrome://communicator/skin/icons/geo.png");
+}
+
+.messageImage[value="persistent-storage"] {
+  list-style-image: url("chrome://communicator/skin/icons/notification-icons.svg#persistent-storage");
+  width: 16px;
+  height: 16px;
+}
+
+.messageImage[value="webNotifications"] {
+  list-style-image: url("chrome://communicator/skin/icons/notification-16.png");
+}
+
+.messageImage[value="indexedDB-permissions-prompt"],
+.messageImage[value="indexedDB-quota-prompt"] {
+  list-style-image: url("chrome://global/skin/icons/question-16.png");
+}
+
+.messageImage[value="addon-install-blocked"],
+.messageImage[value="addon-install-cancelled"],
+.messageImage[value="addon-install-complete"],
+.messageImage[value="addon-install-disabled"],
+.messageImage[value="addon-install-failed"],
+.messageImage[value="addon-install-started"],
+.messageImage[value="lwtheme-install-request"],
+.messageImage[value="lwtheme-install-notification"] {
+  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.png");
+}
+
+.messageImage[value="popup-blocked"] {
+  list-style-image: url("chrome://navigator/skin/icons/popup-blocked.png");
+}
+
+.messageImage[value="blocked-badware-page"] {
+  list-style-image: url("chrome://global/skin/icons/blacklist_favicon.png");
+}
+
+.messageImage[value="EnterInsecureMessage"] {
+  list-style-image: url("chrome://communicator/skin/icons/lock-insecure-16.png");
+}
+
+.messageImage[value="EnterSecureMessage"],
+.messageImage[value="BlockedActiveContentMessage"],
+.messageImage[value="BlockedDisplayContentMessage"] {
+  list-style-image: url("chrome://communicator/skin/icons/lock-secure-16.png");
+}
+
+.messageImage[value="MixedContentMessage"],
+.messageImage[value="MixedActiveContentMessage"],
+.messageImage[value="MixedDisplayContentMessage"] {
+  list-style-image: url("chrome://communicator/skin/icons/lock-broken-16.png");
+}
+
+/* ::::: tree rows ::::: */
+
+@media (-moz-windows-default-theme) {
+  treechildren:not(.autocomplete-treebody)::-moz-tree-row {
+    height: 1.3em !important;
+    border-width: 1px !important;
+  }
+}
+
+/* ::::: dialog header ::::: */
+
+dialogheader {
+  margin: 0px 5px 5px 5px;
+  border: 1px solid;
+  border-top-color: ThreeDDarkShadow;
+  border-right-color: ThreeDDarkShadow;
+  border-bottom-color: ThreeDDarkShadow;
+  border-left-color: ThreeDDarkShadow;
+  padding: 5px 8px;
+  background-color: Highlight;
+  color: HighlightText;
+}
+
+.dialogheader-title {
+  margin: 0px !important;
+  font-size: larger;
+  font-weight: bold;
+}
+
+/* ::::: statusbar ::::: */
+
+statusbar {
+  -moz-appearance: statusbar;
+  border-top: 1px solid ThreeDLightShadow;
+  border-left: 1px solid ThreeDShadow;
+  border-right: 1px solid ThreeDHighlight;
+  border-bottom: 1px solid ThreeDHighlight;
+  background-color: -moz-Dialog;
+  min-height: 22px;
+}
+
+statusbar:-moz-lwtheme {
+  -moz-appearance: none;
+  background: none;
+  border-style: none;
+}
+
+statusbarpanel {
+  -moz-appearance: statusbarpanel;
+  -moz-box-align: center;
+  -moz-box-pack: center;
+  border-left: 1px solid ThreeDHighlight;
+  border-top: 1px solid ThreeDHighlight;
+  border-right: 1px solid ThreeDShadow;
+  border-bottom: 1px solid ThreeDShadow;
+  padding: 0 4px;
+}
+
+statusbarpanel:not(.statusbar-resizerpanel):-moz-lwtheme {
+  -moz-appearance: none;
+  border-top-style: none;
+  border-bottom-style: none;
+  border-inline-start-style: none;
+}
+
+.statusbar-resizerpanel {
+  -moz-box-align: end;
+  -moz-box-pack: end;
+  -moz-appearance: resizerpanel;
+  padding: 0;
+  border: none;
+}
+
+.statusbarpanel-iconic,
+.statusbarpanel-iconic-text {
+  padding: 0 1px;
+}
+
+.statusbarpanel-backgroundbox {
+  -moz-box-align: stretch;
+  padding: 0px;
+}
+
+.statusbarpanel-backgroundbox > .statusbarpanel-contentbox {
+  padding: 0px 1px;
+  -moz-box-align: center;
+}
diff --git a/comm/suite/themes/classic/communicator/communicatorBindings.xml b/comm/suite/themes/classic/communicator/communicatorBindings.xml
new file mode 100644
index 0000000000..afd798a3a6
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/communicatorBindings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.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/. -->
+
+
+<bindings id="communicatorBindings"
+          xmlns="http://www.mozilla.org/xbl"
+          xmlns:html="http://www.w3.org/1999/xhtml"
+          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+          xmlns:xbl="http://www.mozilla.org/xbl">
+
+  <binding id="row-iconic" extends="xul:row">
+    <content>
+      <xul:hbox align="center">
+        <xul:image class="row-iconic-icon"/>
+        <children/>
+      </xul:hbox>
+    </content>
+  </binding>
+
+</bindings>
diff --git a/comm/suite/themes/classic/communicator/config.css b/comm/suite/themes/classic/communicator/config.css
new file mode 100644
index 0000000000..92c1ee9ca7
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/config.css
@@ -0,0 +1,66 @@
+/* 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://global/skin/global.css");
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#warningScreen {
+  background-color: -moz-Dialog;
+}
+
+#warningBox {
+  background-image: url("chrome://global/skin/icons/warning-large.png");
+  background-repeat: no-repeat;
+  background-position: 30px 3em;
+  max-width: 55em;
+  background-color: -moz-Field;
+  color: -moz-FieldText;
+  border: 1px solid ThreeDShadow;
+  border-radius: 10px;
+  padding: 3em;
+  padding-inline-start: 64px;
+  margin-inline-start: 1em;
+  margin-inline-end: 1em;
+}
+
+.title, .description {
+  max-width: 50em;
+  padding-inline-start: 3em;
+}
+
+#warningTitle {
+  margin: 0 0 .6em 0;
+  font-size: 160%;
+  border-bottom: 1px solid ThreeDLightShadow;
+}
+
+#warningText {
+  font-size: 110%;
+  margin-inline-start: 0;
+}
+
+#warningButton {
+  margin-top: 0.6em;
+}
+
+#showWarningNextTime {
+  margin-top: 0.6em;
+}
+
+#configTreeBody::-moz-tree-cell-text(user) {
+  font-weight: bold;
+}
+
+#configTreeBody::-moz-tree-cell-text(locked) {
+  font-style: italic;
+}
+
+#configTree {
+  margin-top: 5px;
+  margin-bottom: 5px;
+}
+
+#filterRow {
+  margin-top: 5px;
+}
diff --git a/comm/suite/themes/classic/communicator/console/console-error-caret.png b/comm/suite/themes/classic/communicator/console/console-error-caret.png
new file mode 100644
index 0000000000..44b78aa29c
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/console/console-error-caret.png
diff --git a/comm/suite/themes/classic/communicator/console/console-error-dash.png b/comm/suite/themes/classic/communicator/console/console-error-dash.png
new file mode 100644
index 0000000000..ab07898eff
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/console/console-error-dash.png
diff --git a/comm/suite/themes/classic/communicator/console/console-toolbar.png b/comm/suite/themes/classic/communicator/console/console-toolbar.png
new file mode 100644
index 0000000000..fc681f9268
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/console/console-toolbar.png
diff --git a/comm/suite/themes/classic/communicator/console/console.css b/comm/suite/themes/classic/communicator/console/console.css
new file mode 100644
index 0000000000..e4e4afdabc
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/console/console.css
@@ -0,0 +1,208 @@
+/* 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/. */
+
+/* ===== console.css ====================================================
+   == Styles used by the Error Console window.
+   ====================================================================== */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+.console-box {
+  background-color: -moz-Field;
+  color: -moz-FieldText;
+}
+
+/* ::::: console rows ::::: */
+
+.console-row {
+  border-bottom: 1px solid ThreeDLightShadow;
+  padding: 4px 0px;
+}
+
+.console-row-icon {
+  padding: 4px;
+  padding-inline-start: 5px;
+  -moz-box-align: start !important;
+}
+
+.console-row-msg > label:first-child,
+.console-row-file > label:first-child {
+  display: none;
+}
+
+.console-time {
+  font-weight: normal !important;
+}
+
+.console-icon {
+  list-style-image: inherit;
+}
+
+.console-error-msg {
+  margin-bottom: 2px;
+}
+
+/* ..... error rows ..... */
+
+.console-row-code {
+  padding-top: 3px;
+  padding-bottom: 3px;
+  padding-inline-start: 3px;
+  padding-inline-end: 0px;
+  color: #0000BB;
+  font-size: larger;
+}
+
+.console-dots,
+.console-caret {
+  height: 9px;
+}
+
+.console-dots {
+  background: url("chrome://communicator/skin/console/console-error-dash.png") repeat-x top;
+}
+
+.console-caret {
+  width: 7px;
+  background: url("chrome://communicator/skin/console/console-error-caret.png") no-repeat top;
+}
+
+/* ..... message rows ..... */
+
+.console-row[type="message"] {
+  font-family: monospace;
+}
+
+/* ..... selected state ..... */
+
+.console-row[selected="true"] {
+    background-image: url("chrome://communicator/skin/console/itemSelected.png");
+}
+
+.console-row-code[selected="true"],
+.console-row-content[selected="true"] > .console-row-file > .console-error-source > .text-link {
+  color: inherit !important;
+}
+
+/* ::::: icons ::::: */
+
+.console-row[type="error"],
+.console-row[type="exception"] {
+  list-style-image: url("chrome://global/skin/icons/error-16.png");
+}
+
+.console-row[type="error"] .console-row-msg,
+.console-row[type="exception"] .console-row-msg {
+  font-weight: bold;
+}
+
+.console-row[type="warning"] {
+  list-style-image: url("chrome://global/skin/icons/warning-16.png");
+}
+
+.console-row[type="message"] {
+  list-style-image: url("chrome://global/skin/icons/information-16.png");
+}
+
+/* ::::: toolbars ::::: */
+
+#TextboxEval {
+  margin: 2px !important;
+}
+
+#ButtonEval {
+  margin-top: 2px !important;
+  margin-bottom: 2px !important;
+  margin-inline-start: 0px !important;
+  margin-inline-end: 2px !important;
+}
+
+toolbarseparator {
+  min-height: 1em;
+}
+
+/* Toolbar icons */
+
+#ToolbarMode toolbarbutton {
+  min-width: 57px;
+  padding: 4px !important;
+}
+
+toolbar#ToolbarMode toolbarbutton:active,
+toolbar#ToolbarMode toolbarbutton[checked="true"] {
+  padding-inline-start: 5px !important;
+  padding-inline-end: 3px !important;
+}
+
+
+toolbar#ToolbarMode toolbarbutton {
+  list-style-image: url("chrome://communicator/skin/console/console-toolbar.png");
+  -moz-box-orient: horizontal;
+  padding: 4px !important;
+}
+
+#Console\:modeAll {
+  -moz-image-region: rect(0px 24px 24px 0px);
+}
+
+#Console\:modeAll {
+  -moz-image-region: rect(0px 24px 24px 0px);
+}
+
+#Console\:modeAll:hover,
+#Console\:modeAll[checked="true"] {
+  -moz-image-region: rect(24px 24px 48px 0px);
+}
+
+#Console\:modeErrors {
+  -moz-image-region: rect(0px 96px 24px 72px);
+}
+
+#Console\:modeErrors:hover,
+#Console\:modeErrors[checked="true"] {
+  -moz-image-region: rect(24px 96px 48px 72px);
+}
+
+#Console\:modeWarnings {
+  -moz-image-region: rect(0px 72px 24px 48px);
+}
+
+#Console\:modeWarnings:hover,
+#Console\:modeWarnings[checked="true"] {
+  -moz-image-region: rect(24px 72px 48px 48px);
+}
+
+#Console\:modeMessages {
+  -moz-image-region: rect(0px 48px 24px 24px);
+}
+
+#Console\:modeMessages:hover,
+#Console\:modeMessages[checked="true"] {
+  -moz-image-region: rect(24px 48px 48px 24px);
+}
+
+#Console\:clear {
+  -moz-image-region: rect(0px 120px 24px 96px);
+}
+
+#Console\:clear:hover,
+#Console\:clear[checked="true"] {
+  -moz-image-region: rect(24px 120px 48px 96px);
+}
+
+toolbar#ToolbarMode .toolbarbutton-icon {
+  padding: 2px 0 !important;
+}
+
+toolbar#ToolbarMode .toolbarbutton-text {
+  padding-inline-end: 4px;
+}
+
+
+/* ::::: Fix Error Console toolbar button text spacing ::::: */
+
+.toolbarbutton-text {
+  padding-inline-start: 0px;
+  padding-inline-end: 5px;
+}
diff --git a/comm/suite/themes/classic/communicator/console/itemSelected.png b/comm/suite/themes/classic/communicator/console/itemSelected.png
new file mode 100644
index 0000000000..964cd6acc6
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/console/itemSelected.png
diff --git a/comm/suite/themes/classic/communicator/customizeToolbar.css b/comm/suite/themes/classic/communicator/customizeToolbar.css
new file mode 100644
index 0000000000..3c11b9cbe0
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/customizeToolbar.css
@@ -0,0 +1,23 @@
+/* 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/. */
+
+window,
+dialog {
+  padding: 6px;
+}
+
+#instructions {
+  font-weight: bold;
+  font-size: larger;
+}
+
+#palette-box {
+  -moz-appearance: listbox;
+  margin: 0 0 10px;
+}
+
+#palette-box > toolbarpaletteitem {
+  padding: 8px 2px;
+  margin: 0 8px;
+}
diff --git a/comm/suite/themes/classic/communicator/dataman/dataman.css b/comm/suite/themes/classic/communicator/dataman/dataman.css
new file mode 100644
index 0000000000..d13e307fc6
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/dataman/dataman.css
@@ -0,0 +1,31 @@
+/* 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/. */
+
+#permList {
+  margin-top: .5em;
+  overflow: auto;
+}
+
+#permList[disabled="true"] {
+  opacity: .5;
+}
+
+.permission {
+  padding-top: 6px;
+  padding-bottom: 6px;
+  padding-inline-start: 7px;
+  padding-inline-end: 7px;
+  min-height: 25px;
+  border-bottom: 1px dotted ThreeDFace;
+}
+
+.hostLabel {
+  font-weight: bold;
+  font-style: italic;
+  margin-inline-end: 1em;
+}
+
+.permissionLabel {
+  font-weight: bold;
+}
diff --git a/comm/suite/themes/classic/communicator/dataman/datamanIcon-16.png b/comm/suite/themes/classic/communicator/dataman/datamanIcon-16.png
new file mode 100644
index 0000000000..9f1ba6b43e
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/dataman/datamanIcon-16.png
diff --git a/comm/suite/themes/classic/communicator/datetimepicker.css b/comm/suite/themes/classic/communicator/datetimepicker.css
new file mode 100644
index 0000000000..006a63a4c0
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/datetimepicker.css
@@ -0,0 +1,97 @@
+/* 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/. */
+
+/* ===== datetimepicker.css =============================================
+  == Styles used by the XUL datepicker and timepicker elements.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace html url("http://www.w3.org/1999/xhtml");
+
+datepicker {
+  margin: 2px 4px;
+  padding: 0;
+  border: none;
+  background: none;
+  cursor: default;
+}
+
+.datetimepicker-input-box {
+  -moz-appearance: textfield;
+  cursor: text;
+  margin-inline-end: 2px;
+  padding: 2px 0 3px;
+  padding-inline-start: 4px;
+  padding-inline-end: 2px;
+  color: -moz-FieldText;
+}
+
+.datetimepicker-input-subbox {
+  width: 1.6em;
+}
+
+html|*.datetimepicker-input {
+  text-align: end;
+}
+
+.datetimepicker-separator {
+  margin: 0 !important;
+}
+
+.datetimepicker-year {
+  width: 3.2em;
+}
+
+datepicker[readonly="true"] {
+  background-color: -moz-Dialog;
+  color: -moz-DialogText;
+}
+
+datepicker[disabled="true"] {
+  cursor: default;
+  background-color: -moz-Dialog;
+  color: GrayText;
+}
+
+.datepicker-mainbox {
+  margin: 2px 4px;
+  border: 1px ThreeDShadow;
+  background-color: -moz-Field;
+  color: -moz-FieldText;
+}
+
+.datepicker-popupgrid > .datepicker-mainbox {
+  margin: 0;
+  border: none;
+}
+
+.datepicker-gridlabel, .datepicker-weeklabel {
+  text-align: center;
+}
+
+.datepicker-gridlabel[today="true"] {
+  background-color: darkgrey;
+  color: white;
+}
+
+.datepicker-gridlabel[selected="true"] {
+  background-color: Highlight;
+  color: HighlightText;
+}
+
+.datepicker-button {
+  -moz-appearance: none;
+  min-width: 8px;
+  padding: 0;
+}
+
+.datepicker-previous,
+.datepicker-next:-moz-locale-dir(rtl) {
+  list-style-image: url("chrome://messenger/skin/icons/arrow/arrow-left.png");
+}
+
+.datepicker-next,
+.datepicker-previous:-moz-locale-dir(rtl) {
+  list-style-image: url("chrome://messenger/skin/icons/arrow/arrow-right.png");
+}
diff --git a/comm/suite/themes/classic/communicator/dialogs.css b/comm/suite/themes/classic/communicator/dialogs.css
new file mode 100644
index 0000000000..58b813f719
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/dialogs.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/. */
+
+/* ==== dialogs.css ==================================================
+   == Styles used by certain dialogs in the Communicator suite.
+   ====================================================================== */
+
+@import url("chrome://communicator/skin/");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
diff --git a/comm/suite/themes/classic/communicator/downloads/dl-remove.png b/comm/suite/themes/classic/communicator/downloads/dl-remove.png
new file mode 100644
index 0000000000..167ecbb08c
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/downloads/dl-remove.png
diff --git a/comm/suite/themes/classic/communicator/downloads/downloadButtons.png b/comm/suite/themes/classic/communicator/downloads/downloadButtons.png
new file mode 100644
index 0000000000..4fe7963abb
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/downloads/downloadButtons.png
diff --git a/comm/suite/themes/classic/communicator/downloads/downloadmanager.css b/comm/suite/themes/classic/communicator/downloads/downloadmanager.css
new file mode 100644
index 0000000000..db3e1e2a82
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/downloads/downloadmanager.css
@@ -0,0 +1,95 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* Note to themers:
+   On rows and all cells, those properties for download states are available:
+   active, inactive, resumable, paused, downloading, finished, failed, canceled, blocked
+*/
+
+treechildren::-moz-tree-image(Name) {
+  margin-inline-end: 2px;
+}
+
+#pauseButton,
+treechildren::-moz-tree-image(ActionPlay, downloading, resumable) {
+  /* pause */
+  list-style-image: url("chrome://communicator/skin/downloads/downloadButtons.png");
+  -moz-image-region: rect(0px, 48px, 16px, 32px);
+}
+
+#ActionPlay,
+#resumeButton,
+treechildren::-moz-tree-image(ActionPlay, paused, resumable) {
+  /* resume */
+  list-style-image: url("chrome://communicator/skin/downloads/downloadButtons.png");
+  -moz-image-region: rect(0px, 16px, 16px, 0px);
+}
+
+#retryButton,
+treechildren::-moz-tree-image(ActionPlay, failed),
+treechildren::-moz-tree-image(ActionPlay, canceled) {
+  /* retry */
+  list-style-image: url("chrome://communicator/skin/downloads/downloadButtons.png");
+  -moz-image-region: rect(0px, 64px, 16px, 48px);
+}
+
+#ActionStop,
+#cancelButton,
+treechildren::-moz-tree-image(ActionStop, active) {
+  /* cancel */
+  list-style-image: url("chrome://communicator/skin/downloads/downloadButtons.png");
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+
+treechildren::-moz-tree-image(ActionStop, inactive) {
+  /* remove */
+  list-style-image: url("chrome://communicator/skin/downloads/dl-remove.png");
+  -moz-image-region: auto;
+}
+
+/* progress dialogs */
+#dlProgressWindow {
+  /* match dialog.css */
+  padding-top: 8px;
+  padding-bottom: 10px;
+  padding-inline-start: 8px;
+  padding-inline-end: 10px;
+}
+
+/* label with dropdown, actually done as a button type=menu */
+#fileName, #fileSource {
+  -moz-appearance: none;
+  background-color: transparent;
+  margin: 0px 5px;
+  border: 0px;
+  min-width: 0px;
+  min-height: 0px;
+}
+
+#fileName > .button-box,
+#fileSource > .button-box {
+  -moz-appearance: none;
+  padding: 0px;
+}
+
+#fileName {
+  font-weight: bold;
+}
+
+.mini-button {
+  -moz-appearance: none;
+  background-color: transparent;
+  border: none;
+  padding: 0;
+  margin: 0;
+  min-width: 0;
+  min-height: 0;
+}
+
+.mini-button > .button-box {
+  -moz-appearance: none;
+  padding: 0 !important;
+}
diff --git a/comm/suite/themes/classic/communicator/feed-subscribe-ui.css b/comm/suite/themes/classic/communicator/feed-subscribe-ui.css
new file mode 100644
index 0000000000..b5b1fe18df
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/feed-subscribe-ui.css
@@ -0,0 +1,20 @@
+/* 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/. */
+
+#feedSubscribeLine {
+  font: message-box;
+}
+
+.menuitem-iconic {
+  padding-inline-start: 2px;
+}
+
+.menu-iconic-left {
+  display: -moz-box;
+  padding-inline-end: 2px;
+}
+
+menupopup:-moz-locale-dir(rtl) {
+  direction: rtl;
+}
diff --git a/comm/suite/themes/classic/communicator/feed-subscribe.css b/comm/suite/themes/classic/communicator/feed-subscribe.css
new file mode 100644
index 0000000000..b709d9c056
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/feed-subscribe.css
@@ -0,0 +1,148 @@
+/* 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/. */
+
+html {
+  background: -moz-Dialog;
+  font: message-box;
+}
+
+#feedBody {
+  border: 1px solid ThreeDShadow;
+  padding: 3em;
+  padding-inline-start: 30px;
+  margin: 2em auto;
+  background: -moz-Field;
+}
+
+#feedHeaderContainer {
+  border: 1px solid ThreeDShadow;
+  border-radius: 10px;
+  margin: -4em auto 0 auto;
+  background-color: InfoBackground;
+}
+
+#feedHeader {
+  margin-top: 4.9em;
+  margin-bottom: 1em;
+  margin-inline-start: 1.4em;
+  margin-inline-end: 1em;
+  padding-inline-start: 2.9em;
+  font-size: 110%;
+  color: InfoText;
+}
+
+.feedBackground {
+  background: url("chrome://communicator/skin/icons/feedIcon.png") 0% 10% no-repeat InfoBackground;
+}
+
+.videoPodcastBackground {
+  background: url("chrome://communicator/skin/icons/videoFeedIcon.png") 0% 10% no-repeat InfoBackground;
+}
+
+.audioPodcastBackground {
+  background: url("chrome://communicator/skin/icons/audioFeedIcon.png") 0% 10% no-repeat InfoBackground;
+}
+
+#feedHeader[dir="rtl"] {
+  background-position: 100% 10%;
+}
+
+#feedIntroText {
+  display: none;
+}
+
+#feedHeader[firstrun="true"] #feedIntroText {
+  padding-top: 0.1em;
+  padding-inline-start: 0.6em;
+  display: block;
+}
+
+#feedHeader[firstrun="true"] > #feedSubscribeLine {
+  padding-inline-start: 1.8em;
+}
+
+#feedSubscribeLine {
+  padding-top: 0.2em;
+}
+
+/* Don't print subscription UI */
+@media print {
+  #feedHeaderContainer {
+    display: none;
+  }
+}
+
+body {
+  margin: 0;
+  padding: 0 3em;
+  color: -moz-fieldText;
+  font: message-box;
+}
+
+h1 {
+  font-size: 160%;
+  border-bottom: 2px solid ThreeDLightShadow;
+  margin: 0 0 .2em 0;
+}
+
+h2 {
+  font-size: 110%;
+  font-weight: normal;
+  margin: 0 0 .6em 0;
+}
+
+#feedTitleLink {
+  float: right;
+  margin-inline-start: .6em;
+  margin-inline-end: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+a[href] img {
+  border: none;
+}
+
+#feedTitleContainer {
+  margin-inline-start: 0;
+  margin-inline-end: .6em;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+#feedTitleImage {
+  margin-inline-start: .6em;
+  margin-inline-end: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+  max-width: 300px;
+  max-height: 150px;
+}
+
+.feedEntryContent {
+  font-size: 110%;
+}
+
+.lastUpdated {
+  font-size: 85%;
+  font-weight: normal;
+}
+
+.type-icon {
+  vertical-align: bottom;
+  height: 16px;
+  width: 16px;
+}
+
+.enclosures {
+  border: 1px solid ThreeDShadow;
+  padding: 1em;
+  margin: 1em auto;
+  background: -moz-Dialog;
+}
+
+.enclosure {
+  vertical-align: middle;
+  margin-left: 2px;
+}
diff --git a/comm/suite/themes/classic/communicator/fullscreen-video.css b/comm/suite/themes/classic/communicator/fullscreen-video.css
new file mode 100644
index 0000000000..88d9c7b734
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/fullscreen-video.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/. */
+
+html,
+body,
+video {
+  height: 100%;
+}
+
+html {
+  background-color: black;
+}
+
+body {
+  margin: 0px;
+  overflow: -moz-hidden-unscrollable;
+  visibility: hidden;
+}
+
+video {
+  width: 100%;
+  max-height: 100%;
+}
+
+div {
+  position: absolute;
+  top: 0px;
+  right: 0px;
+  width: 32px;
+  height: 32px;
+  background: url("chrome://communicator/skin/icons/closeFullScreenVideo.png") center center no-repeat;
+}
diff --git a/comm/suite/themes/classic/communicator/helpviewer/Toolbar-rtl.png b/comm/suite/themes/classic/communicator/helpviewer/Toolbar-rtl.png
new file mode 100644
index 0000000000..eaa8088ec2
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/helpviewer/Toolbar-rtl.png
diff --git a/comm/suite/themes/classic/communicator/helpviewer/help.css b/comm/suite/themes/classic/communicator/helpviewer/help.css
new file mode 100644
index 0000000000..4b4036aaca
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/helpviewer/help.css
@@ -0,0 +1,136 @@
+/* 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://communicator/skin/");
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#HelpToolbar toolbarbutton {
+  -moz-box-orient: horizontal !important;
+  min-width: 0px;
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
+  margin: 0 !important;
+  padding: 4px 5px;
+}
+
+#HelpToolbar:-moz-locale-dir(rtl) toolbarbutton {
+  list-style-image: url("chrome://communicator/skin/helpviewer/Toolbar-rtl.png");
+}
+
+/* Hide labels for the toolbar because we really don't need them what with the
+   tooltips */
+#HelpToolbar .toolbarbutton-text {
+  display: none;
+}
+
+/* With no labels, we don't need the margin on the icon that separates it
+   from the label */
+#HelpToolbar .toolbarbutton-icon {
+  margin-inline-end: 0;
+}
+
+/* Set the minimum sidebar width so the help contents aren't squeezed together.*/
+#help-sidebar { min-width: 15em; width: 20em; max-width: 25em; }
+
+#help-back-button toolbarbutton,
+#help-forward-button toolbarbutton {
+  list-style-image: inherit;
+  -moz-image-region: inherit;
+}
+
+/* ----- BACK BUTTON ----- */
+
+#help-back-button {
+  -moz-image-region: rect(60px 29px 89px 0);
+}
+
+#help-back-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(60px 59px 89px 30px);
+}
+
+#help-back-button:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(60px 89px 89px 60px);
+}
+
+#help-back-button[disabled="true"] {
+  -moz-image-region: rect(60px 119px 89px 90px);
+}
+
+#help-back-button .toolbarbutton-menubutton-button {
+  -moz-box-align: end !important;
+}
+
+/* ----- FORWARD BUTTON ----- */
+
+#help-forward-button {
+  -moz-image-region: rect(90px 29px 119px 0);
+}
+
+#help-forward-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(90px 59px 119px 30px);
+}
+
+#help-forward-button:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(90px 89px 119px 60px);
+}
+
+#help-forward-button[disabled="true"] {
+  -moz-image-region: rect(90px 119px 119px 90px);
+}
+
+/* ----- HOME BUTTON ----- */
+
+#help-home-button {
+  -moz-image-region: rect(120px 29px 149px 0);
+}
+
+#help-home-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(120px 59px 149px 30px);
+}
+
+#help-home-button:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(120px 89px 149px 60px);
+}
+
+#help-home-button[disabled="true"] {
+  -moz-image-region: rect(120px 119px 149px 90px);
+}
+
+/* ----- PRINT BUTTON ----- */
+
+#help-print-button {
+  -moz-image-region: rect(0 29px 29px 0);
+}
+
+#help-print-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(0 59px 29px 30px);
+}
+
+#help-print-button:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(0 89px 29px 60px);
+}
+
+#help-print-button[disabled="true"] {
+  -moz-image-region: rect(0 119px 29px 90px);
+}
+
+/* ----- OTHER ----- */
+
+#context-copy[disabled="true"] {
+  display: none;
+}
+
+/* make findbar appear above content */
+#appcontent {
+  -moz-box-direction: reverse;
+}
+
+/* style findbar for being on top */
+#FindToolbar {
+  border-top-color: ThreeDHighlight;
+  border-top-width: 1px;
+  border-bottom: 1px solid;
+  border-bottom-color: ThreeDShadow;
+  padding-top: 1px;
+  padding-bottom: 0px;
+}
diff --git a/comm/suite/themes/classic/communicator/icons/alwaysAsk.png b/comm/suite/themes/classic/communicator/icons/alwaysAsk.png
new file mode 100644
index 0000000000..ddd4cb2130
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/alwaysAsk.png
diff --git a/comm/suite/themes/classic/communicator/icons/application.png b/comm/suite/themes/classic/communicator/icons/application.png
new file mode 100644
index 0000000000..e878926105
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/application.png
diff --git a/comm/suite/themes/classic/communicator/icons/close-button.png b/comm/suite/themes/classic/communicator/icons/close-button.png
new file mode 100644
index 0000000000..e9e00449c2
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/close-button.png
diff --git a/comm/suite/themes/classic/communicator/icons/closeFullScreenVideo.png b/comm/suite/themes/classic/communicator/icons/closeFullScreenVideo.png
new file mode 100644
index 0000000000..6090eab39f
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/closeFullScreenVideo.png
diff --git a/comm/suite/themes/classic/communicator/icons/communicatoricons-small.png b/comm/suite/themes/classic/communicator/icons/communicatoricons-small.png
new file mode 100644
index 0000000000..0e48c39fcb
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/communicatoricons-small.png
diff --git a/comm/suite/themes/classic/communicator/icons/communicatoricons.png b/comm/suite/themes/classic/communicator/icons/communicatoricons.png
new file mode 100644
index 0000000000..28abfa3ff8
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/communicatoricons.png
diff --git a/comm/suite/themes/classic/communicator/icons/feedIcon.png b/comm/suite/themes/classic/communicator/icons/feedIcon.png
new file mode 100644
index 0000000000..848a3bac91
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/feedIcon.png
diff --git a/comm/suite/themes/classic/communicator/icons/feedIcon16.png b/comm/suite/themes/classic/communicator/icons/feedIcon16.png
new file mode 100644
index 0000000000..0286dffab9
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/feedIcon16.png
diff --git a/comm/suite/themes/classic/communicator/icons/geo.png b/comm/suite/themes/classic/communicator/icons/geo.png
new file mode 100644
index 0000000000..2c1b2ecfba
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/geo.png
diff --git a/comm/suite/themes/classic/communicator/icons/geolocation-16.png b/comm/suite/themes/classic/communicator/icons/geolocation-16.png
new file mode 100644
index 0000000000..d710e7336d
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/geolocation-16.png
diff --git a/comm/suite/themes/classic/communicator/icons/geolocation-64.png b/comm/suite/themes/classic/communicator/icons/geolocation-64.png
new file mode 100644
index 0000000000..1bd46ba5e1
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/geolocation-64.png
diff --git a/comm/suite/themes/classic/communicator/icons/identity.png b/comm/suite/themes/classic/communicator/icons/identity.png
new file mode 100644
index 0000000000..dc35c2c6fe
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/identity.png
diff --git a/comm/suite/themes/classic/communicator/icons/information-48.png b/comm/suite/themes/classic/communicator/icons/information-48.png
new file mode 100644
index 0000000000..59893b29b4
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/information-48.png
diff --git a/comm/suite/themes/classic/communicator/icons/key-16.png b/comm/suite/themes/classic/communicator/icons/key-16.png
new file mode 100644
index 0000000000..ac135b847e
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/key-16.png
diff --git a/comm/suite/themes/classic/communicator/icons/key-64.png b/comm/suite/themes/classic/communicator/icons/key-64.png
new file mode 100644
index 0000000000..148f4ebb81
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/key-64.png
diff --git a/comm/suite/themes/classic/communicator/icons/loading.png b/comm/suite/themes/classic/communicator/icons/loading.png
new file mode 100644
index 0000000000..5d7858dffd
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/loading.png
diff --git a/comm/suite/themes/classic/communicator/icons/lock-broken-16.png b/comm/suite/themes/classic/communicator/icons/lock-broken-16.png
new file mode 100644
index 0000000000..102c96c7d1
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/lock-broken-16.png
diff --git a/comm/suite/themes/classic/communicator/icons/lock-broken.png b/comm/suite/themes/classic/communicator/icons/lock-broken.png
new file mode 100644
index 0000000000..71c3aa8191
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/lock-broken.png
diff --git a/comm/suite/themes/classic/communicator/icons/lock-insecure-16.png b/comm/suite/themes/classic/communicator/icons/lock-insecure-16.png
new file mode 100644
index 0000000000..6e6c7ab16b
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/lock-insecure-16.png
diff --git a/comm/suite/themes/classic/communicator/icons/lock-insecure.png b/comm/suite/themes/classic/communicator/icons/lock-insecure.png
new file mode 100644
index 0000000000..a6b0842e57
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/lock-insecure.png
diff --git a/comm/suite/themes/classic/communicator/icons/lock-secure-16.png b/comm/suite/themes/classic/communicator/icons/lock-secure-16.png
new file mode 100644
index 0000000000..1d9bd471ea
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/lock-secure-16.png
diff --git a/comm/suite/themes/classic/communicator/icons/lock-secure.png b/comm/suite/themes/classic/communicator/icons/lock-secure.png
new file mode 100644
index 0000000000..178499e002
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/lock-secure.png
diff --git a/comm/suite/themes/classic/communicator/icons/notification-16.png b/comm/suite/themes/classic/communicator/icons/notification-16.png
new file mode 100644
index 0000000000..9e61a63973
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/notification-16.png
diff --git a/comm/suite/themes/classic/communicator/icons/notification-64.png b/comm/suite/themes/classic/communicator/icons/notification-64.png
new file mode 100644
index 0000000000..a01d0ab776
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/notification-64.png
diff --git a/comm/suite/themes/classic/communicator/icons/notification-icons.svg b/comm/suite/themes/classic/communicator/icons/notification-icons.svg
new file mode 100644
index 0000000000..cc5d4f7ba1
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/notification-icons.svg
@@ -0,0 +1,104 @@
+<!-- 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/. -->
+<svg fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg"
+     width="32" height="32" viewBox="0 0 32 32">
+  <style>
+    :root > use:not(:target),
+    :root > g:not(:target),
+    :root > circle:not(:target),
+    #strikeout {
+      display: none;
+    }
+    .blocked:target ~ #strikeout {
+      display: block;
+    }
+    .blocked {
+      clip-path: url(#blocked-clipPath);
+    }
+
+    #badge {
+      fill: #3088d4;
+    }
+
+    #update-icon {
+      stroke: #fff;
+      stroke-width: 3px;
+      stroke-linecap: round;
+    }
+  </style>
+
+  <defs>
+    <path id="camera-icon" d="m 2,23 a 3,3 0 0 0 3,3 l 14,0 a 3,3 0 0 0 3,-3 l 0,-4 6,5.5 c 0.5,0.5 1,0.7 2,0.5 l 0,-18 c -1,-0.2 -1.5,0 -2,0.5 l -6,5.5 0,-4 a 3,3 0 0 0 -3,-3 l -14,0 a 3,3 0 0 0 -3,3 z" />
+    <path id="desktop-notification-icon" d="m 2,20 a 4,4 0 0 0 4,4 l 13,0 7,7 0,-7 a 4,4 0 0 0 4,-4 l 0,-12 a 4,4 0 0 0 -4,-4 l -20,0 a 4,4 0 0 0 -4,4 z m 5,-2 a 1,1 0 1 1 0,-2 l 10,0 a 1,1 0 1 1 0,2 z m 0,-4 a 1,1 0 1 1 0,-2 l 14,0 a 1,1 0 1 1 0,2 z m 0,-4 a 1,1 0 1 1 0,-2 l 18,0 a 1,1 0 1 1 0,2 z" />
+    <path id="focus-tab-by-prompt-icon" d="M29.43,25,18.57,3.8A2.92,2.92,0,0,0,16,2a2.92,2.92,0,0,0-2.57,1.8L2.57,25a3.47,3.47,0,0,0,0,3.4A3.15,3.15,0,0,0,5.33,30H26.66a3.15,3.15,0,0,0,2.77-1.6A3.47,3.47,0,0,0,29.43,25ZM16,7.2a2.3,2.3,0,0,1,2.37,2.4L18,18a1.88,1.88,0,0,1-2,2,1.88,1.88,0,0,1-2-2l-.4-8.4A2.3,2.3,0,0,1,16,7.2ZM16,28a3,3,0,0,1,0-6,3,3,0,0,1,0,6Z"/>
+    <path id="geo-linux-icon" d="m 2,15.9 a 14,14 0 1 1 0,0.2 z m 4,2.1 a 10,10 0 0 0 8,8 l 0,-4 4,0 0,4 a 10,10 0 0 0 8,-8 l -4,0 0,-4 4,0 a 10,10 0 0 0 -8,-8 l 0,4 -4,0 0,-4 a 10,10 0 0 0 -8,8 l 4,0 0,4 z" />
+    <path id="geo-linux-detailed-icon" d="m 2,15.9 a 14,14 0 1 1 0,0.2 z m 3,2.1 a 11,11 0 0 0 9,9 l 1,-5 2,0 1,5 a 11,11 0 0 0 9,-9 l -5,-1 0,-2 5,-1 a 11,11 0 0 0 -9,-9 l -1,5 -2,0 -1,-5 a 11,11 0 0 0 -9,9 l 5,1 0,2 z" />
+    <path id="geo-osx-icon" d="m 0,16 16,0 0,16 12,-28 z" />
+    <path id="geo-windows-icon" d="m 2,14 0,4 2,0 a 12,12 0 0 0 10,10 l 0,2 4,0 0,-2 a 12,12 0 0 0 10,-10 l 2,0 0,-4 -2,0 a 12,12 0 0 0 -10,-10 l 0,-2 -4,0 0,2 a 12,12 0 0 0 -10,10 z m 4,1.9 a 10,10 0 1 1 0,0.2 z m 4,0 a 6,6 0 1 1 0,0.2 z" />
+    <path id="geo-windows-detailed-icon" d="m 2,14.5 0,3 2,0.5 a 12,12 0 0 0 10,10 l 0.5,2 3,0 0.5,-2 a 12,12 0 0 0 10,-10 l 2,-0.5 0,-3 -2,-0.5 a 12,12 0 0 0 -10,-10 l -0.5,-2 -3,0 -0.5,2 a 12,12 0 0 0 -10,10 z m 4,1.4 a 10,10 0 1 1 0,0.2 z m 3,0 a 7,7 0 1 1 0,0.2 z" />
+    <path id="indexedDB-icon" d="m 2,24 a 4,4 0 0 0 4,4 l 2,0 0,-4 -2,0 0,-16 20,0 0,16 -2,0 0,4 2,0 a 4,4 0 0 0 4,-4 l 0,-16 a 4,4 0 0 0 -4,-4 l -20,0 a 4,4 0 0 0 -4,4 z m 8,-2 6,7 6,-7 -4,0 0,-8 -4,0 0,8 z" />
+    <path id="login-icon" d="m 2,26 0,4 6,0 0,-2 2,0 0,-2 1,0 0,-1 2,0 0,-3 2,0 2.5,-2.5 1.5,1.5 3,-3 a 8,8 0 1 0 -8,-8 l -3,3 2,2 z m 20,-18.1 a 2,2 0 1 1 0,0.2 z" />
+    <path id="login-detailed-icon" d="m 1,27 0,3.5 a 0.5,0.5 0 0 0 0.5,0.5 l 5,0 a 0.5,0.5 0 0 0 0.5,-0.5 l 0,-1.5 1.5,0 a 0.5,0.5 0 0 0 0.5,-0.5 l 0,-1.5 1,0 a 0.5,0.5 0 0 0 0.5,-0.5 l 0,-1 1,0 a 0.5,0.5 0 0 0 0.5,-0.5 l 0,-2 2,0 2.5,-2.5 q 0.5,-0.5 1,0 l 1,1 c 0.5,0.5 1,0.5 1.5,-0.5 l 1,-2 a 9,9 0 1 0 -8,-8 l -2,1 c -1,0.5 -1,1 -0.5,1.5 l 1.5,1.5 q 0.5,0.5 0,1 z m 21,-19.1 a 2,2 0 1 1 0,0.2 z" />
+    <path id="microphone-icon" d="m 8,14 0,4 a 8,8 0 0 0 6,7.7 l 0,2.3 -2,0 a 2,2 0 0 0 -2,2 l 12,0 a 2,2 0 0 0 -2,-2 l -2,0 0,-2.3 a 8,8 0 0 0 6,-7.7 l 0,-4 -2,0 0,4 a 6,6 0 0 1 -12,0 l 0,-4 z m 4,4 a 4,4 0 0 0 8,0 l 0,-12 a 4,4 0 0 0 -8,0 z" />
+    <path id="microphone-detailed-icon" d="m 8,18 a 8,8 0 0 0 6,7.7 l 0,2.3 -1,0 a 3,2 0 0 0 -3,2 l 12,0 a 3,2 0 0 0 -3,-2 l -1,0 0,-2.3 a 8,8 0 0 0 6,-7.7 l 0,-4 a 1,1 0 0 0 -2,0 l 0,4 a 6,6 0 0 1 -12,0 l 0,-4 a 1,1 0 0 0 -2,0 z m 4,0 a 4,4 0 0 0 8,0 l 0,-12 a 4,4 0 0 0 -8,0 z" />
+    <path id="persistent-storage-icon" d="M26 21.1H6c-1.1 0-2 .9-2 2V27c0 1.1.9 2 2 2h20c1.1 0 2-.9 2-2v-3.9c0-1.1-.9-2-2-2zM24.1 27c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zM25 3H7C5.3 3 4 4.4 4 6.2v13.3c.6-.3 1.3-.5 2-.5h20c.7 0 1.4.2 2 .5V6.2C28 4.4 26.7 3 25 3z"/>
+    <path id="plugin-icon" d="m 2,26 a 2,2 0 0 0 2,2 l 24,0 a 2,2 0 0 0 2,-2 l 0,-16 a 2,2 0 0 0 -2,-2 l -24,0 a 2,2 0 0 0 -2,2 z m 2,-20 10,0 0,-2 a 2,2 0 0 0 -2,-2 l -6,0 a 2,2 0 0 0 -2,2 z m 14,0 10,0 0,-2 a 2,2 0 0 0 -2,-2 l -6,0 a 2,2 0 0 0 -2,2 z" />
+    <path id="popup-icon" d="m 2,24 a 4,4 0 0 0 4,4 l 8,0 a 10,10 0 0 1 -2,-4 l -4,0 a 2,2 0 0 1 -2,-2 l 0,-12 18,0 0,2 a 10,10 0 0 1 4,2 l 0,-8 a 4,4 0 0 0 -4,-4 l -18,0 a 4,4 0 0 0 -4,4 z m 12,-2.1 a 8,8 0 1 1 0,0.2 m 10.7,-4.3 a 5,5 0 0 0 -6.9,6.9 z m -5.4,8.4 a 5,5 0 0 0 6.9,-6.9 z" />
+    <path id="screen-icon" d="m 2,18 a 2,2 0 0 0 2,2 l 2,0 0,-6 a 4,4 0 0 1 4,-4 l 14,0 0,-6 a 2,2 0 0 0 -2,-2 l -18,0 a 2,2 0 0 0 -2,2 z m 6,10 a 2,2 0 0 0 2,2 l 18,0 a 2,2 0 0 0 2,-2 l 0,-14 a 2,2 0 0 0 -2,-2 l -18,0 a 2,2 0 0 0 -2,2 z" />
+    <path id="update-icon" d="M 16,9 L 16,24 M 16,9 L 11,14 M 16,9 L 21,14" />
+
+    <clipPath id="blocked-clipPath">
+      <path d="m 0,0 0,31 31,-31 z m 6,32 26,0 0,-26 z"/>
+    </clipPath>
+
+    <mask id="i-mask" style="fill-opacity: 1;">
+      <rect fill="white" width="32" height="32"/>
+      <circle fill="black" cx="16" cy="9" r="2.5"/>
+      <rect fill="black" x="14" y="14" width="4" height="10" rx="2" ry="2"/>
+    </mask>
+  </defs>
+
+  <g id="default-info">
+    <circle cx="16" cy="16" r="14" mask="url(#i-mask)"/>
+  </g>
+
+  <use id="camera" href="#camera-icon" />
+  <use id="camera-sharing" href="#camera-icon"/>
+  <use id="camera-indicator" href="#camera-icon" />
+  <use id="camera-blocked" class="blocked" href="#camera-icon" />
+  <use id="desktop-notification" href="#desktop-notification-icon" />
+  <use id="desktop-notification-blocked" class="blocked" href="#desktop-notification-icon" />
+  <use id="focus-tab-by-prompt" href="#focus-tab-by-prompt-icon" />
+  <use id="geo-osx" href="#geo-osx-icon" />
+  <use id="geo-osx-blocked" class="blocked" href="#geo-osx-icon" />
+  <use id="geo-linux" href="#geo-linux-icon" />
+  <use id="geo-linux-blocked" class="blocked" href="#geo-linux-icon" />
+  <use id="geo-linux-detailed" href="#geo-linux-detailed-icon" />
+  <use id="geo-windows" href="#geo-windows-icon" />
+  <use id="geo-windows-blocked" class="blocked" href="#geo-windows-icon" />
+  <use id="geo-windows-detailed" href="#geo-windows-detailed-icon" />
+  <use id="indexedDB" href="#indexedDB-icon" />
+  <use id="indexedDB-blocked" class="blocked" href="#indexedDB-icon" />
+  <use id="login" href="#login-icon" />
+  <use id="login-detailed" href="#login-detailed-icon" />
+  <use id="microphone" href="#microphone-icon" />
+  <use id="microphone-sharing" href="#microphone-icon"/>
+  <use id="microphone-indicator" href="#microphone-icon"/>
+  <use id="microphone-blocked" class="blocked" href="#microphone-icon" />
+  <use id="microphone-detailed" href="#microphone-detailed-icon" />
+  <use id="persistent-storage" href="#persistent-storage-icon" />
+  <use id="persistent-storage-blocked" class="blocked" href="#persistent-storage-icon" />
+  <use id="plugin" href="#plugin-icon" />
+  <use id="plugin-blocked" class="blocked" href="#plugin-icon" />
+  <use id="plugin-badge" href="#badge" />
+  <use id="popup" href="#popup-icon" />
+  <use id="screen" href="#screen-icon" />
+  <use id="screen-sharing" href="#screen-icon"/>
+  <use id="screen-indicator" href="#screen-icon"/>
+  <use id="screen-blocked" class="blocked" href="#screen-icon" />
+  <use id="update" href="#update-icon" />
+
+  <path id="strikeout" d="m 2,28 2,2 26,-26 -2,-2 z"/>
+  <circle id="badge" cx="27" cy="5" r="5"/>
+</svg>
diff --git a/comm/suite/themes/classic/communicator/icons/offline.png b/comm/suite/themes/classic/communicator/icons/offline.png
new file mode 100644
index 0000000000..c23b98e7de
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/offline.png
diff --git a/comm/suite/themes/classic/communicator/icons/online.png b/comm/suite/themes/classic/communicator/icons/online.png
new file mode 100644
index 0000000000..2e9fb8c3b1
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/online.png
diff --git a/comm/suite/themes/classic/communicator/icons/question-48.png b/comm/suite/themes/classic/communicator/icons/question-48.png
new file mode 100644
index 0000000000..b818636200
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/question-48.png
diff --git a/comm/suite/themes/classic/communicator/icons/save.png b/comm/suite/themes/classic/communicator/icons/save.png
new file mode 100644
index 0000000000..46bb519033
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/save.png
diff --git a/comm/suite/themes/classic/communicator/icons/search.png b/comm/suite/themes/classic/communicator/icons/search.png
new file mode 100644
index 0000000000..b889c6d98b
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/search.png
diff --git a/comm/suite/themes/classic/communicator/icons/smileys/smiley-cool.png b/comm/suite/themes/classic/communicator/icons/smileys/smiley-cool.png
new file mode 100644
index 0000000000..1eee4586e5
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/smileys/smiley-cool.png
diff --git a/comm/suite/themes/classic/communicator/icons/smileys/smiley-cry.png b/comm/suite/themes/classic/communicator/icons/smileys/smiley-cry.png
new file mode 100644
index 0000000000..3c25cb658d
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/smileys/smiley-cry.png
diff --git a/comm/suite/themes/classic/communicator/icons/smileys/smiley-embarrassed.png b/comm/suite/themes/classic/communicator/icons/smileys/smiley-embarrassed.png
new file mode 100644
index 0000000000..5088e28e07
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/smileys/smiley-embarrassed.png
diff --git a/comm/suite/themes/classic/communicator/icons/smileys/smiley-foot.png b/comm/suite/themes/classic/communicator/icons/smileys/smiley-foot.png
new file mode 100644
index 0000000000..d1589f3696
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/smileys/smiley-foot.png
diff --git a/comm/suite/themes/classic/communicator/icons/smileys/smiley-frown.png b/comm/suite/themes/classic/communicator/icons/smileys/smiley-frown.png
new file mode 100644
index 0000000000..159c04b0c6
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/smileys/smiley-frown.png
diff --git a/comm/suite/themes/classic/communicator/icons/smileys/smiley-innocent.png b/comm/suite/themes/classic/communicator/icons/smileys/smiley-innocent.png
new file mode 100644
index 0000000000..85cbcf67ed
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/smileys/smiley-innocent.png
diff --git a/comm/suite/themes/classic/communicator/icons/smileys/smiley-kiss.png b/comm/suite/themes/classic/communicator/icons/smileys/smiley-kiss.png
new file mode 100644
index 0000000000..36fbf51dde
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/smileys/smiley-kiss.png
diff --git a/comm/suite/themes/classic/communicator/icons/smileys/smiley-laughing.png b/comm/suite/themes/classic/communicator/icons/smileys/smiley-laughing.png
new file mode 100644
index 0000000000..0d013d5012
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/smileys/smiley-laughing.png
diff --git a/comm/suite/themes/classic/communicator/icons/smileys/smiley-money.png b/comm/suite/themes/classic/communicator/icons/smileys/smiley-money.png
new file mode 100644
index 0000000000..59f089944f
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/smileys/smiley-money.png
diff --git a/comm/suite/themes/classic/communicator/icons/smileys/smiley-sealed.png b/comm/suite/themes/classic/communicator/icons/smileys/smiley-sealed.png
new file mode 100644
index 0000000000..c4f3042810
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/smileys/smiley-sealed.png
diff --git a/comm/suite/themes/classic/communicator/icons/smileys/smiley-smile.png b/comm/suite/themes/classic/communicator/icons/smileys/smiley-smile.png
new file mode 100644
index 0000000000..de862b15db
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/smileys/smiley-smile.png
diff --git a/comm/suite/themes/classic/communicator/icons/smileys/smiley-surprise.png b/comm/suite/themes/classic/communicator/icons/smileys/smiley-surprise.png
new file mode 100644
index 0000000000..4b4d423a55
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/smileys/smiley-surprise.png
diff --git a/comm/suite/themes/classic/communicator/icons/smileys/smiley-tongue.png b/comm/suite/themes/classic/communicator/icons/smileys/smiley-tongue.png
new file mode 100644
index 0000000000..9f53727055
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/smileys/smiley-tongue.png
diff --git a/comm/suite/themes/classic/communicator/icons/smileys/smiley-undecided.png b/comm/suite/themes/classic/communicator/icons/smileys/smiley-undecided.png
new file mode 100644
index 0000000000..8311076c53
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/smileys/smiley-undecided.png
diff --git a/comm/suite/themes/classic/communicator/icons/smileys/smiley-wink.png b/comm/suite/themes/classic/communicator/icons/smileys/smiley-wink.png
new file mode 100644
index 0000000000..e2db57ec39
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/smileys/smiley-wink.png
diff --git a/comm/suite/themes/classic/communicator/icons/smileys/smiley-yell.png b/comm/suite/themes/classic/communicator/icons/smileys/smiley-yell.png
new file mode 100644
index 0000000000..2ae846d201
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/smileys/smiley-yell.png
diff --git a/comm/suite/themes/classic/communicator/icons/warning-24.png b/comm/suite/themes/classic/communicator/icons/warning-24.png
new file mode 100644
index 0000000000..42f20a7a49
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/icons/warning-24.png
diff --git a/comm/suite/themes/classic/communicator/numberbox.css b/comm/suite/themes/classic/communicator/numberbox.css
new file mode 100644
index 0000000000..ea9189b30c
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/numberbox.css
@@ -0,0 +1,23 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace html url("http://www.w3.org/1999/xhtml");
+
+textbox[type="number"] {
+  padding: 0 !important;
+  cursor: default;
+}
+
+html|*.numberbox-input {
+  text-align: right;
+}
+
+.numberbox-input-box {
+  -moz-box-align: center;
+}
+
+textbox[hidespinbuttons="true"] > .numberbox-input-box {
+  -moz-appearance: textfield;
+}
diff --git a/comm/suite/themes/classic/communicator/places/allBookmarks.png b/comm/suite/themes/classic/communicator/places/allBookmarks.png
new file mode 100644
index 0000000000..9bf003529f
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/places/allBookmarks.png
diff --git a/comm/suite/themes/classic/communicator/places/bookmark-folder-closed.png b/comm/suite/themes/classic/communicator/places/bookmark-folder-closed.png
new file mode 100644
index 0000000000..514ab6f137
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/places/bookmark-folder-closed.png
diff --git a/comm/suite/themes/classic/communicator/places/bookmark-folder-dis.png b/comm/suite/themes/classic/communicator/places/bookmark-folder-dis.png
new file mode 100644
index 0000000000..3ecfd95aa0
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/places/bookmark-folder-dis.png
diff --git a/comm/suite/themes/classic/communicator/places/bookmark-folder-open.png b/comm/suite/themes/classic/communicator/places/bookmark-folder-open.png
new file mode 100644
index 0000000000..ec21a423a0
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/places/bookmark-folder-open.png
diff --git a/comm/suite/themes/classic/communicator/places/bookmark-item-dis.png b/comm/suite/themes/classic/communicator/places/bookmark-item-dis.png
new file mode 100644
index 0000000000..cd169981d1
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/places/bookmark-item-dis.png
diff --git a/comm/suite/themes/classic/communicator/places/bookmark-item-updated.png b/comm/suite/themes/classic/communicator/places/bookmark-item-updated.png
new file mode 100644
index 0000000000..2d12e93098
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/places/bookmark-item-updated.png
diff --git a/comm/suite/themes/classic/communicator/places/bookmark-item.svg b/comm/suite/themes/classic/communicator/places/bookmark-item.svg
new file mode 100644
index 0000000000..9953214605
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/places/bookmark-item.svg
@@ -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/. -->
+<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<image xlink:href="data:image/png;base64,
+iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAP1BMVEVhAAAJJg4VPhghUyEr
+YyktaS04dzhetGNsu3FtvnJ0v319wYJ/w4OKxpKPyJmYyaGcy6inzLCrzbC3zbECGg8L8SJ4
+AAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxMAAAsTAQCanBgAAAAHdElN
+RQfXAwQNJhdD+P4AAAAAgHRFWHRDb21tZW50AChDKSAyMDA2IE1vemlsbGEub3JnCkF1dGhv
+cjogTWFybG9uIEJpc2hvcApJY29uIERlc2lnbjogSWNvbmZhY3RvcnkKQ29udHJpYnV0b3Jz
+OgogIE1hbnVlbCBSZWltZXIgKE1hbnVlbC5SZWltZXJAZ214LmRlKVc/DKgAAABISURBVBjT
+jc67AoAgDEPR+ohRoaK0//+tzmHibjlTzGYCoDsioJAugt5bVeHnReTg67fIzlYvkY1POUVW
+OvTPwhz+5giWNtcPheMCpetMnNIAAAAASUVORK5CYII=" width="16" height="16"/></svg>
diff --git a/comm/suite/themes/classic/communicator/places/bookmark.png b/comm/suite/themes/classic/communicator/places/bookmark.png
new file mode 100644
index 0000000000..bee337e107
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/places/bookmark.png
diff --git a/comm/suite/themes/classic/communicator/places/bookmarks.css b/comm/suite/themes/classic/communicator/places/bookmarks.css
new file mode 100644
index 0000000000..37069ae749
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/places/bookmarks.css
@@ -0,0 +1,131 @@
+/* -*- Mode: C; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: Trees ::::: */
+
+treechildren::-moz-tree-row {
+  min-height: 18px;
+}
+
+treechildren::-moz-tree-twisty {
+  padding-bottom: 1px;
+}
+
+/**
+ * Style rules for generic bookmarks items.
+ */
+
+treechildren::-moz-tree-image(title) {
+  margin-inline-end: 2px;
+  width: 16px;
+  height: 16px;
+}
+
+.bookmark-item,
+treechildren::-moz-tree-image(title) {
+  list-style-image: url("chrome://communicator/skin/places/bookmark-item.svg");
+}
+
+.bookmark-item[container="true"],
+treechildren::-moz-tree-image(title, container) {
+  list-style-image: url("chrome://communicator/skin/places/bookmark-folder-closed.png");
+}
+
+.bookmark-item[open="true"],
+treechildren::-moz-tree-image(title, open) {
+  list-style-image: url("chrome://communicator/skin/places/bookmark-folder-open.png");
+}
+
+.bookmark-item[container="true"][open="true"][loading="true"] {
+  list-style-image: url("chrome://communicator/skin/icons/loading.png") !important;
+}
+
+.bookmark-item > .toolbarbutton-box > .toolbarbutton-icon {
+  list-style-image: inherit;
+  width: 16px;
+  height: 16px;
+}
+
+.bookmark-item[container][livemark],
+treechildren::-moz-tree-image(title, container, livemark) {
+  list-style-image: url("chrome://communicator/skin/places/livemark-folder.png");
+  -moz-image-region: auto;
+}
+
+.bookmark-item[container][livemark] .bookmark-item,
+treechildren::-moz-tree-image(title, livemarkItem) {
+  list-style-image: url("chrome://communicator/skin/places/bookmark-item-updated.png");
+}
+
+.bookmark-item[container][livemark] .bookmark-item[visited],
+treechildren::-moz-tree-image(title, livemarkItem, visited) {
+  list-style-image: url("chrome://communicator/skin/places/bookmark-item.svg");
+}
+
+#bookmarksToolbarFolderMenu,
+#BMB_bookmarksToolbarFolderMenu,
+treechildren::-moz-tree-image(container, queryFolder_toolbar_____) {
+  list-style-image: url("chrome://communicator/skin/places/bookmarksToolbar.png");
+  -moz-image-region: auto;
+}
+
+treechildren::-moz-tree-image(container, queryFolder_menu________) {
+  list-style-image: url("chrome://communicator/skin/places/bookmarksMenu.png");
+  -moz-image-region: auto;
+}
+
+#unsortedBookmarksFolderMenu,
+#BMB_unsortedBookmarksFolderMenu,
+treechildren::-moz-tree-image(container, queryFolder_unfiled_____) {
+  list-style-image: url("chrome://communicator/skin/places/unsortedBookmarks.png");
+  -moz-image-region: auto;
+}
+
+/* query-nodes should be styled even if they're not expandable */
+.bookmark-item[container][query],
+treechildren::-moz-tree-image(query) {
+  list-style-image: url("chrome://communicator/skin/places/query.png");
+  -moz-image-region: auto;
+}
+
+treechildren::-moz-tree-image(query, OrganizerQuery_AllBookmarks) {
+  list-style-image: url("chrome://communicator/skin/places/allBookmarks.png");
+  -moz-image-region: auto;
+}
+
+.bookmark-item[query][tagContainer],
+treechildren::-moz-tree-image(title, query, tagContainer),
+treechildren::-moz-tree-image(query, OrganizerQuery_Tags) {
+  list-style-image: url("chrome://communicator/skin/places/tag.png");
+  -moz-image-region: auto;
+}
+
+/* calendar icon for history grouping items by day */
+treechildren::-moz-tree-image(title, query, dayContainer) {
+  list-style-image: url("chrome://communicator/skin/places/calendar.png");
+  -moz-image-region: auto;
+}
+
+treechildren::-moz-tree-image(query, OrganizerQuery_History) {
+  list-style-image: url("chrome://communicator/skin/places/history.png");
+  -moz-image-region: auto;
+}
+
+treechildren::-moz-tree-image(title, separator) {
+  list-style-image: none;
+  width: 0px;
+  height: 0px;
+}
+
+treechildren::-moz-tree-cell-text(title, separator) {
+  color: ThreeDShadow;
+  margin: 0px 5px;
+}
+
+treechildren::-moz-tree-cell-text(title, separator, selected, focus) {
+  color: HighlightText;
+}
diff --git a/comm/suite/themes/classic/communicator/places/bookmarksMenu.png b/comm/suite/themes/classic/communicator/places/bookmarksMenu.png
new file mode 100644
index 0000000000..b76d849b91
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/places/bookmarksMenu.png
diff --git a/comm/suite/themes/classic/communicator/places/bookmarksToolbar.css b/comm/suite/themes/classic/communicator/places/bookmarksToolbar.css
new file mode 100644
index 0000000000..68c270b31b
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/places/bookmarksToolbar.css
@@ -0,0 +1,107 @@
+/* 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/. */
+
+/* ===== bookmarksToolbar.css ===========================================
+  == Styles specific to bookmark items in a toolbar.
+  ======================================================================= */
+
+@import url("chrome://communicator/skin/places/bookmarks.css");
+
+/* ::::: bookmark toolbar buttons ::::: */
+
+/* ..... bookmark items ..... */
+
+toolbarbutton.bookmark-item {
+  min-width: 0px;
+  max-width: 13em;
+}
+
+toolbarbutton.bookmark-item:not([container="true"]) {
+  -moz-appearance: none;
+}
+
+toolbarbutton.bookmark-item:not([container="true"]):not([disabled="true"]) {
+  cursor: pointer;
+}
+
+toolbarbutton.bookmark-item:not([container="true"]):not([disabled="true"]):hover {
+  text-decoration: underline;
+  color: #0000FF;
+}
+
+toolbarbutton.bookmark-item[disabled="true"],
+toolbarbutton.bookmark-item:not([container="true"]):hover,
+toolbarbutton.bookmark-item:not([container="true"]):hover:active {
+  border-top-color: transparent !important;
+  border-right-color: transparent !important;
+  border-bottom-color: transparent !important;
+  border-left-color: transparent !important;
+  background: transparent !important;
+}
+
+toolbarbutton.bookmark-item[disabled="true"] {
+  list-style-image: url("chrome://communicator/skin/places/bookmark-item-dis.png") !important;
+}
+
+toolbarbutton.bookmark-item[disabled="true"][container="true"] {
+  list-style-image: url("chrome://communicator/skin/places/bookmark-folder-dis.png") !important;
+}
+
+.bookmark-item > .toolbarbutton-icon {
+  width: 16px;
+  height: 16px;
+}
+
+.bookmark-item > .toolbarbutton-menu-dropmarker {
+  display: none;
+}
+
+/* ..... drag and drop styles ..... */
+
+#PlacesToolbarDropIndicator {
+  list-style-image: url("chrome://communicator/skin/places/toolbarDropMarker.png");
+}
+
+toolbarbutton.bookmark-item[dragover="true"][open="true"] {
+  background: Highlight !important;
+  color: HighlightText !important;
+}
+
+/* ::::: bookmark menus ::::: */
+
+menu.bookmark-item,
+menuitem.bookmark-item {
+  border-top: 1px solid transparent !important;
+  border-bottom: 1px solid transparent !important;
+}
+
+.bookmark-item > .menu-iconic-left > .menu-iconic-icon {
+  width: 16px;
+  height: 16px;
+}
+
+.menuitem-iconic.bookmark-item[disabled="true"] {
+  list-style-image: url("chrome://communicator/skin/places/bookmark-item-dis.png");
+}
+
+.menu-iconic.bookmark-item[disabled="true"][container="true"] {
+  list-style-image: url("chrome://communicator/skin/places/bookmark-folder-dis.png");
+}
+
+/* ..... drag and drop styles ..... */
+
+/* rules for menupopup drop indicators */
+.menupopup-drop-indicator-bar {
+  position: relative;
+  /* these two margins must together compensate the indicator's height */
+  margin-top: -1px;
+  margin-bottom: -1px;
+}
+
+.menupopup-drop-indicator {
+  list-style-image: none;
+  height: 2px;
+  margin-inline-end: -4em;
+  background-color: Highlight;
+}
diff --git a/comm/suite/themes/classic/communicator/places/bookmarksToolbar.png b/comm/suite/themes/classic/communicator/places/bookmarksToolbar.png
new file mode 100644
index 0000000000..1e36e1177e
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/places/bookmarksToolbar.png
diff --git a/comm/suite/themes/classic/communicator/places/calendar.png b/comm/suite/themes/classic/communicator/places/calendar.png
new file mode 100644
index 0000000000..666f6295f1
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/places/calendar.png
diff --git a/comm/suite/themes/classic/communicator/places/editBookmarkOverlay.css b/comm/suite/themes/classic/communicator/places/editBookmarkOverlay.css
new file mode 100644
index 0000000000..93bb5176c7
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/places/editBookmarkOverlay.css
@@ -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/. */
+
+/**** folder menulist ****/
+.folder-icon > .menulist-label-box > .menulist-icon {
+  width: 16px;
+  height: 16px;
+}
+
+.folder-icon > .menu-iconic-left {
+  display: -moz-box;
+}
+
+.folder-icon {
+  list-style-image: url("chrome://global/skin/icons/folder-item.png") !important;
+  -moz-image-region: rect(0px, 32px, 16px, 16px) !important;
+}
+
+
+/**** expanders ****/
+
+.expander-up,
+.expander-down {
+  min-width: 0;
+  padding: 2px 0;
+  padding-inline-start: 2px;
+}
+
+.expander-up {
+  list-style-image: url("chrome://global/skin/arrow/arrow-up.gif");
+}
+
+.expander-down {
+  list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
+}
+
+.expander-down:hover:active {
+  list-style-image: url("chrome://global/skin/arrow/arrow-dn-hov.gif");
+}
+
+.expander-up:hover:active {
+  list-style-image: url("chrome://global/skin/arrow/arrow-up-hov.gif");
+}
+
+#editBookmarkPanelContent {
+  min-width: 23em;
+  width: 32em;
+}
+
+#editBMPanel_folderTree {
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+/* Hide the value column of the tag autocomplete popup
+ * leaving only the comment column visible. This is
+ * so that only the tag being edited is shown in the
+ * popup.
+ */
+#editBMPanel_tagsField #treecolAutoCompleteValue {
+  visibility: collapse;
+}
+
+
+/* ::::: bookmark panel dropdown icons ::::: */
+
+#editBMPanel_folderMenuList[selectedIndex="0"],
+#editBMPanel_toolbarFolderItem {
+  list-style-image: url("chrome://communicator/skin/places/bookmarksToolbar.png") !important;
+  -moz-image-region: auto !important;
+}
+
+#editBMPanel_folderMenuList[selectedIndex="1"],
+#editBMPanel_bmRootItem {
+  list-style-image: url("chrome://communicator/skin/places/bookmarksMenu.png") !important;
+  -moz-image-region: auto !important;
+}
+
+#editBMPanel_folderMenuList[selectedIndex="2"],
+#editBMPanel_unfiledRootItem {
+  list-style-image: url("chrome://communicator/skin/places/unsortedBookmarks.png") !important;
+  -moz-image-region: auto !important;
+}
diff --git a/comm/suite/themes/classic/communicator/places/history.png b/comm/suite/themes/classic/communicator/places/history.png
new file mode 100644
index 0000000000..fcc89bbbf0
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/places/history.png
diff --git a/comm/suite/themes/classic/communicator/places/livemark-folder.png b/comm/suite/themes/classic/communicator/places/livemark-folder.png
new file mode 100644
index 0000000000..3da846aff9
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/places/livemark-folder.png
diff --git a/comm/suite/themes/classic/communicator/places/organizer.css b/comm/suite/themes/classic/communicator/places/organizer.css
new file mode 100644
index 0000000000..2636ff5bdf
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/places/organizer.css
@@ -0,0 +1,17 @@
+/* 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/. */
+
+/* Info box */
+#detailsDeck {
+  margin: 5px;
+}
+
+#infoBoxExpanderLabel {
+  padding-inline-start: 2px;
+}
+
+#organizerScopeBar {
+  padding: 2px 0;
+  padding-inline-end: 3px;
+}
diff --git a/comm/suite/themes/classic/communicator/places/query.png b/comm/suite/themes/classic/communicator/places/query.png
new file mode 100644
index 0000000000..75a84a0b33
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/places/query.png
diff --git a/comm/suite/themes/classic/communicator/places/tag.png b/comm/suite/themes/classic/communicator/places/tag.png
new file mode 100644
index 0000000000..4c876b92b0
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/places/tag.png
diff --git a/comm/suite/themes/classic/communicator/places/toolbarDropMarker.png b/comm/suite/themes/classic/communicator/places/toolbarDropMarker.png
new file mode 100644
index 0000000000..a57b575bb2
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/places/toolbarDropMarker.png
diff --git a/comm/suite/themes/classic/communicator/places/unsortedBookmarks.png b/comm/suite/themes/classic/communicator/places/unsortedBookmarks.png
new file mode 100644
index 0000000000..3a87625eb7
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/places/unsortedBookmarks.png
diff --git a/comm/suite/themes/classic/communicator/preferences.css b/comm/suite/themes/classic/communicator/preferences.css
new file mode 100644
index 0000000000..58d940e270
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/preferences.css
@@ -0,0 +1,80 @@
+/* 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/. */
+
+/* Styles used by all preference windows and panes of SeaMonkey */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: Main Window ::::: */
+
+prefwindow {
+  -moz-appearance: window;
+  background-color: -moz-Dialog;
+  color: -moz-DialogText;
+  font: message-box;
+  padding-top: 8px;
+  padding-bottom: 0px;
+  padding-inline-start: 8px;
+  padding-inline-end: 10px;
+}
+
+prefpane {
+  padding-top: 8px;
+  padding-bottom: 10px;
+  padding-inline-start: 8px;
+  padding-inline-end: 10px;
+}
+
+prefwindow[type="child"] {
+  padding-top: 8px;
+  padding-bottom: 10px;
+  padding-inline-start: 8px;
+  padding-inline-end: 10px;
+}
+
+prefwindow[type="child"] > prefpane {
+  padding: 0px;
+}
+
+.prefWindow-dlgbuttons {
+  padding-bottom: 10px;
+  padding-inline-start: 8px;
+  padding-inline-end: 10px;
+}
+
+prefwindow[type="child"] .prefWindow-dlgbuttons {
+  padding: 0px;
+}
+
+radio[pane] {
+  -moz-appearance: none;
+  margin: 0px 1px 0px 1px;
+  padding: 1px 3px 1px 3px;
+  min-width: 4.5em;
+}
+
+.paneSelector {
+  border-bottom: 2px groove ThreeDFace;
+  margin: 0px;
+  padding-inline-start: 10px;
+  background-color: -moz-Field;
+  color: -moz-FieldText;
+}
+
+.paneButtonIcon {
+  width: 32px;
+  height: 32px;
+}
+
+radio[pane]:hover {
+  background-color: #E0E8F6;
+  color: black;
+  -moz-appearance: none;
+}
+
+radio[pane][selected="true"] {
+  background-color: #C1D2EE;
+  color: black; 
+  -moz-appearance: none;
+}
diff --git a/comm/suite/themes/classic/communicator/prefpanels.css b/comm/suite/themes/classic/communicator/prefpanels.css
new file mode 100644
index 0000000000..06b97ebd56
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/prefpanels.css
@@ -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/. */
+
+/* ==== prefpanels.css ==================================================
+   == Styles used by all preference panels in the Communicator suite.
+   ====================================================================== */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: Fonts ::::: */
+
+#sizeVar,
+#sizeMono {
+  width: 4em;
+}
+
+.prefpanel-font-list {
+  -moz-box-flex: 1;
+}
+
+/* checkbox which is disabled for changes but non-gray text (i.e., in effect) */
+
+checkbox.nogray-disabled[disabled="true"][nogray="true"] {
+  color: inherit;
+  text-shadow: inherit;
+}
+
+/* ::::: Applications ::::: */
+.handler-action > .menu-iconic-left {
+  /**
+    * Make the icons appear.
+    * Note: we display the icon box for every item whether or not it has an icon
+    * so the labels of all the items align vertically.
+    */
+  display: -moz-box;
+  min-width: 16px;
+}
+
+/* Set icons on app pane elements */
+.handler-action .listcell-icon,
+.handler-type .listcell-icon {
+  height: 16px;
+  width: 16px;
+}
+
+.handler-action[appHandlerIcon="app"] {
+  list-style-image: url("chrome://communicator/skin/icons/application.png");
+}
+
+.handler-action[appHandlerIcon="ask"] {
+  list-style-image: url("chrome://communicator/skin/icons/alwaysAsk.png");
+}
+
+.handler-action[appHandlerIcon="save"] {
+  list-style-image: url("chrome://communicator/skin/icons/save.png");
+}
+
+.handler-action[appHandlerIcon="feed"] {
+  list-style-image: url("chrome://communicator/skin/icons/feedIcon16.png");
+}
+
+.handler-type[typeClass="unknown"] {
+  list-style-image: url("moz-icon://goat?size=16");
+}
+
+.handler-type[typeClass="webFeed"],
+.handler-type[typeClass="videoPodcastFeed"],
+.handler-type[typeClass="audioPodcastFeed"] {
+  list-style-image: url("chrome://communicator/skin/icons/feedIcon16.png");
+}
+
+/* ::::: Search ::::: */
+
+#engineList > .menulist-label-box > .menulist-icon {
+  height: 16px;
+  width: 16px;
+}
+
+/* ::::: Sync ::::: */
+
+#syncDesc {
+  padding: 0 12em;
+}
diff --git a/comm/suite/themes/classic/communicator/profile/migrate.png b/comm/suite/themes/classic/communicator/profile/migrate.png
new file mode 100644
index 0000000000..dc1405dc47
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/profile/migrate.png
diff --git a/comm/suite/themes/classic/communicator/profile/profile.css b/comm/suite/themes/classic/communicator/profile/profile.css
new file mode 100644
index 0000000000..df6c1e06bb
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/profile/profile.css
@@ -0,0 +1,65 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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://global/skin/global.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+treechildren::-moz-tree-row {
+  min-height: 18px;
+}
+
+treechildren::-moz-tree-image {
+  margin-inline-end: 2px;
+  list-style-image: url("chrome://communicator/skin/profile/profileicon-large.png");
+}
+
+treechildren::-moz-tree-image(rowMigrate-no) {
+  list-style-image: url("chrome://communicator/skin/profile/migrate.png");
+}
+
+/* profile selection dialog */
+
+/* Override global.css */
+hbox.wizard-box {
+  padding: 10px 10px 10px 10px;
+}
+
+#header {
+  -moz-box-orient: vertical;
+  margin-top: -8px;
+  margin-bottom: 0;
+  margin-inline-start: -8px;
+  margin-inline-end: -10px;
+  border-left: none;
+  border-right: none;
+  border-top: none;
+  border-bottom-color: ThreeDShadow;
+  padding-top: 12px;
+  padding-bottom: 12px;
+  padding-inline-start: 25px;
+  padding-inline-end: 5px;
+  background-color: Window;
+  color: WindowText;
+}
+
+#header > .dialogheader-title {
+  font: inherit;
+  font-weight: bold;
+}
+
+#header > .dialogheader-description {
+  margin-inline-start: 12px !important;
+}
+
+#intro,
+#label {
+  width: 17em;
+}
+
+#managebuttons > button {
+  min-width: 8em;
+}
diff --git a/comm/suite/themes/classic/communicator/profile/profileManager.css b/comm/suite/themes/classic/communicator/profile/profileManager.css
new file mode 100644
index 0000000000..4fd88568a3
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/profile/profileManager.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/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#dialoginfo {
+  width: 36em;
+}
+
+#table-housing {
+  background-color: white;
+  height: 100%;
+}
+
+#buttons-box {
+  margin-inline-start: 1em;
+}
diff --git a/comm/suite/themes/classic/communicator/profile/profileicon-large.png b/comm/suite/themes/classic/communicator/profile/profileicon-large.png
new file mode 100644
index 0000000000..e11eabd3ef
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/profile/profileicon-large.png
diff --git a/comm/suite/themes/classic/communicator/search/engineManager.css b/comm/suite/themes/classic/communicator/search/engineManager.css
new file mode 100644
index 0000000000..53cf96f9d1
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/search/engineManager.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/. */
+
+#engineChildren::-moz-tree-image(engineName) {
+  margin-inline-end: 4px;
+  margin-inline-start: 1px;
+  width: 16px;
+  height: 16px;
+}
+
+#engineChildren::-moz-tree-row {
+  height: 20px;
+}
diff --git a/comm/suite/themes/classic/communicator/search/mainwindow-dropdown-arrow.png b/comm/suite/themes/classic/communicator/search/mainwindow-dropdown-arrow.png
new file mode 100644
index 0000000000..c3c82fda0e
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/search/mainwindow-dropdown-arrow.png
diff --git a/comm/suite/themes/classic/communicator/search/search-glass.png b/comm/suite/themes/classic/communicator/search/search-glass.png
new file mode 100644
index 0000000000..16a75cf297
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/search/search-glass.png
diff --git a/comm/suite/themes/classic/communicator/search/search.css b/comm/suite/themes/classic/communicator/search/search.css
new file mode 100644
index 0000000000..93e0d6592d
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/search/search.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/. */
+
+/* ===== search.css =====================================================
+   == Styles specific to the Search sidebar panel.
+   ====================================================================== */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+.autocomplete-treebody::-moz-tree-cell(datalist-first) {
+  border-top: 1px solid GrayText;
+}
+
+#sidebar-search-engines > .menulist-label-box > .menulist-icon {
+  height: 16px;
+  width: 16px;
+}
diff --git a/comm/suite/themes/classic/communicator/search/searchbar.css b/comm/suite/themes/classic/communicator/search/searchbar.css
new file mode 100644
index 0000000000..8f30bd4cd0
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/search/searchbar.css
@@ -0,0 +1,74 @@
+/* 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/. */
+
+.searchbar-textbox {
+  width: 6em;
+  min-width: 6em;
+}
+
+/* ::::: search bar ::::: */
+
+.autocomplete-treebody::-moz-tree-cell-text(datalist-first, treecolAutoCompleteComment) {
+  color: GrayText;
+  font-size: smaller;
+}
+
+.autocomplete-treebody::-moz-tree-cell(datalist-first) {
+  border-top: 1px solid GrayText;
+}
+
+/* ::::: searchbar-engine-button ::::: */
+
+.toolbarbutton-icon {
+  margin: 3px;
+  height: 16px;
+  width: 16px;
+  list-style-image: url("chrome://global/skin/icons/folder-item.png");
+  -moz-image-region: rect(0px, 16px, 16px, 0px);
+}
+
+.toolbarbutton-menu-dropmarker {
+  -moz-appearance: none !important;
+  list-style-image: url("chrome://communicator/skin/search/mainwindow-dropdown-arrow.png");
+  -moz-image-region: rect(0, 13px, 11px, 0);
+}
+
+.searchbar-engine-button[open="true"] > .toolbarbutton-menu-dropmarker {
+  -moz-image-region: rect(0, 26px, 11px, 13px);
+}
+
+
+/* ::::: search-go-button ::::: */
+
+.search-go-container {
+  -moz-box-align: center;
+}
+
+.search-go-button {
+  padding: 3px;
+  list-style-image: url("chrome://communicator/skin/search/search-glass.png");
+  -moz-image-region: rect(0px 16px 16px 0px);
+}
+
+@media (-moz-touch-enabled) {
+  .search-go-button {
+    padding: 3px 5px;
+  }
+}
+
+.search-go-button:-moz-locale-dir(rtl) {
+  transform: scaleX(-1);
+}
+
+.search-go-button:hover {
+  -moz-image-region: rect(0px 32px 16px 16px);
+}
+
+.search-go-button:hover:active {
+  -moz-image-region: rect(0px, 48px, 16px, 32px);
+}
+
+.searchbar-engine-menuitem[selected="true"] > .menu-iconic-text {
+  font-weight: bold;
+}
diff --git a/comm/suite/themes/classic/communicator/sidebar/customize.css b/comm/suite/themes/classic/communicator/sidebar/customize.css
new file mode 100644
index 0000000000..732909bd56
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/sidebar/customize.css
@@ -0,0 +1,39 @@
+/* -*- Mode: C; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+.treecell-panel
+{
+ list-style-image: url("chrome://communicator/skin/places/bookmark-item.svg");
+}
+
+.treecell-panel[haslink="true"],
+treeitem[container="true"] > treerow > .treecell-panel
+{
+ list-style-image: url("chrome://communicator/skin/places/bookmark-folder-closed.png");
+}
+treeitem[selected="true"] > treerow > .treecell-panel[haslink="true"],
+treeitem[selected="true"][container="true"] > treerow > .treecell-panel
+{
+ list-style-image: url("chrome://communicator/skin/places/bookmark-folder-closed-sel.png");
+}
+
+treeitem[container="true"][open="true"] > treerow > .treecell-panel
+{
+ list-style-image: url("chrome://communicator/skin/places/bookmark-folder-open.png");
+}
+treeitem[selected="true"][container="true"][open="true"] > treerow > .treecell-panel
+{
+ list-style-image: url("chrome://communicator/skin/places/bookmark-folder-open-sel.png");
+}
+
+#header {
+  list-style-image: url("chrome://communicator/skin/sidebar/sidebar-icon.png");
+}
+
+box#reorder {
+  -moz-box-pack: center;
+}
diff --git a/comm/suite/themes/classic/communicator/sidebar/preview.css b/comm/suite/themes/classic/communicator/sidebar/preview.css
new file mode 100644
index 0000000000..48de5ea54e
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/sidebar/preview.css
@@ -0,0 +1,21 @@
+/* -*- Mode: C; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/*
+   Style rules specific to the Preview dialog.
+*/
+
+#previewframe {
+ min-width: 10px;
+ min-height: 10px;
+ width: 162px;
+ height: 300px;
+ border: none;
+ margin: 0px;
+}
+
+
diff --git a/comm/suite/themes/classic/communicator/sidebar/sbtab-twisty-open.png b/comm/suite/themes/classic/communicator/sidebar/sbtab-twisty-open.png
new file mode 100644
index 0000000000..649f538405
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/sidebar/sbtab-twisty-open.png
diff --git a/comm/suite/themes/classic/communicator/sidebar/sbtab-twisty.png b/comm/suite/themes/classic/communicator/sidebar/sbtab-twisty.png
new file mode 100644
index 0000000000..53d40ae69c
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/sidebar/sbtab-twisty.png
diff --git a/comm/suite/themes/classic/communicator/sidebar/sidebar.css b/comm/suite/themes/classic/communicator/sidebar/sidebar.css
new file mode 100644
index 0000000000..bf35d16013
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/sidebar/sidebar.css
@@ -0,0 +1,173 @@
+/* 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/. */
+
+/* ===== sidebar.css ====================================================
+  == Styles used by the Sidebar panel and Sidebar tabs.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+  
+#sidebar-box {
+  border-left: 1px solid ThreeDShadow;
+  border-right: 1px solid ThreeDHighlight;
+  background-color: AppWorkspace;
+}
+
+#sidebar-box:-moz-lwtheme {
+  background-color: transparent;
+}
+
+/* ::::: sidebar header ::::: */
+
+.sidebarheader-main {
+  -moz-appearance: toolbar;
+  border: 1px outset InactiveCaption;
+  background-color: InactiveCaption;
+  color: CaptionText;
+  padding-top: 1px;
+  padding-bottom: 1px;
+  padding-inline-start: 6px;
+  padding-inline-end: 2px;
+  height: auto;
+  overflow-x: hidden;
+}
+
+.sidebarheader-main:-moz-lwtheme {
+  -moz-appearance: none;
+  background-color: transparent;
+  color: inherit;
+}
+
+#sidebar-panel-picker:not(:-moz-lwtheme) {
+  /* would override hover/active styles, so let lwtheme do it in its own way */
+  color: inherit;
+}
+
+#sidebar-panel-picker > .toolbarbutton-dropmarker {
+  padding: 0 2px;
+  list-style-image: url("chrome://global/skin/arrow/arrow-dn.png");
+}
+
+.sidebar-header-text {
+  font-weight: bold;
+}
+
+/* ..... close button ..... */
+
+#sidebar-close-button {
+  padding-top: 1px;
+  padding-bottom: 1px;
+  padding-inline-start: 4px;
+  padding-inline-end: 3px;
+  list-style-image: url("chrome://communicator/skin/icons/close-button.png");
+}
+
+/* ::::: sidebar panel ::::: */
+
+.sidebar-iframe-no-panels,
+.loadarea {
+  background-color: -moz-Field;
+  color: -moz-FieldText;
+}
+
+.iframe-panel, .browser-sidebar {
+  border-left: 1px solid ThreeDHighlight;
+  border-bottom: 1px solid ThreeDShadow;
+  border-right: 1px solid ThreeDShadow;
+}  
+
+/* ::::: loading info ::::: */
+
+.text-panel-loading {
+  margin: 5px 0px;
+}
+
+.text-panel-loading[loading="false"] {
+  margin-inline-start: 11px;
+}
+
+.image-panel-loading {
+  margin: 5px;
+  list-style-image: url("chrome://communicator/skin/icons/loading.png");
+}
+
+/* ::::: sidebar tabs ::::: */
+
+.box-texttab {
+  -moz-binding: url("chrome://communicator/skin/sidebar/sidebarBindings.xml#sbtab");
+  -moz-box-align: center;
+  cursor: pointer;
+  background-color: -moz-Dialog;
+  color: -moz-DialogText;
+}
+
+.box-texttab:-moz-lwtheme {
+  text-shadow: none;
+}
+
+.box-texttab,
+.box-texttab[selected="true"],
+.box-texttab[selected="true"]:hover,
+.box-texttab[selected="true"]:hover:active {
+  border: 1px solid;
+  border-top-color: ThreeDLightShadow;
+  border-right-color: ThreeDShadow;
+  border-bottom-color: ThreeDShadow;
+  border-left-color: ThreeDLightShadow;
+  padding-top: 2px;
+  padding-bottom: 2px;
+  padding-inline-start: 0px;
+  padding-inline-end: 1px;
+}
+
+.box-texttab:hover {
+  border-right-color: ThreeDDarkShadow;
+  border-bottom-color: ThreeDDarkShadow;
+}
+
+.box-texttab:hover:active {
+  border-top-color: ThreeDShadow;
+  border-right-color: ThreeDShadow;
+  border-bottom-color: ThreeDShadow;
+  border-left-color: ThreeDShadow;
+}
+
+.sbtab-label {
+  margin: 0px !important;
+}
+
+.sbtab-twisty {
+  margin: 0px 7px;
+  list-style-image: url("chrome://communicator/skin/sidebar/sbtab-twisty.png");
+}
+
+.sbtab-texture {
+  margin: 2px 0px;
+  background: url("chrome://communicator/skin/toolbar/tbgrip-texture.png") repeat-y;
+  width: 12px;
+  height: 12px;
+}
+
+.box-texttab[selected="true"] {
+  font-weight: bold;
+  cursor: default;
+}
+
+.sbtab-twisty[selected="true"] {
+  list-style-image: url("chrome://communicator/skin/sidebar/sbtab-twisty-open.png");
+}
+
+/* ::::: sidebar navigation buttons ::::: */
+
+.sidebar-nav-button {
+  padding: 5px 0px;
+}
+
+.tab-fwd {
+  list-style-image: url("chrome://global/skin/arrow/arrow-up.png");
+}
+
+.tab-back {
+  list-style-image: url("chrome://global/skin/arrow/arrow-dn.png");
+}
diff --git a/comm/suite/themes/classic/communicator/sidebar/sidebarBindings.xml b/comm/suite/themes/classic/communicator/sidebar/sidebarBindings.xml
new file mode 100644
index 0000000000..ec291c9944
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/sidebar/sidebarBindings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.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/. -->
+
+
+<bindings id="sidebarBindings"
+          xmlns="http://www.mozilla.org/xbl"
+          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+          xmlns:xbl="http://www.mozilla.org/xbl">
+
+  <binding id="sbtab" extends="xul:button">
+    <content>
+      <xul:image class="sbtab-twisty" xbl:inherits="selected"/>
+      <xul:label class="sbtab-label" xbl:inherits="value=label,accesskey" crop="right"/>
+      <xul:spacer flex="1"/>
+      <xul:image class="sbtab-texture"/>
+    </content>
+  </binding>
+
+</bindings>
diff --git a/comm/suite/themes/classic/communicator/sidebar/sidebarListView.css b/comm/suite/themes/classic/communicator/sidebar/sidebarListView.css
new file mode 100644
index 0000000000..39f974cbe2
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/sidebar/sidebarListView.css
@@ -0,0 +1,17 @@
+/* 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/. */
+
+treechildren::-moz-tree-image(leaf),
+treechildren::-moz-tree-cell(leaf) {
+  cursor: pointer;
+}
+
+treechildren::-moz-tree-cell-text(leaf, hover) {
+  cursor: pointer;
+  text-decoration: underline;
+}
+
+treechildren::-moz-tree-cell(separator) {
+  cursor: default;
+}
diff --git a/comm/suite/themes/classic/communicator/smileys.css b/comm/suite/themes/classic/communicator/smileys.css
new file mode 100644
index 0000000000..1516b7b9de
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/smileys.css
@@ -0,0 +1,132 @@
+/* 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/. */
+
+/* ==== smileys.css ====================================================
+   == Style rules to bind smiley image types generated by editor and the mozTxtToHTMLConv
+   == into skinnable images.
+   ========================================================================== */
+
+@namespace url("http://www.w3.org/1999/xhtml");
+
+/* ::::: we also represent smilies inside of spans ::::: */
+
+.moz-smiley-s1,
+.moz-smiley-s2,
+.moz-smiley-s3,
+.moz-smiley-s4,
+.moz-smiley-s5,
+.moz-smiley-s6,
+.moz-smiley-s7,
+.moz-smiley-s8,
+.moz-smiley-s9,
+.moz-smiley-s10,
+.moz-smiley-s11,
+.moz-smiley-s12,
+.moz-smiley-s13,
+.moz-smiley-s14,
+.moz-smiley-s15,
+.moz-smiley-s16 {
+  display: inline-block;
+  vertical-align: middle;
+  -moz-user-select: all;
+}
+
+.moz-smiley-s1 > span,
+.moz-smiley-s2 > span,
+.moz-smiley-s3 > span,
+.moz-smiley-s4 > span,
+.moz-smiley-s5 > span,
+.moz-smiley-s6 > span,
+.moz-smiley-s7 > span,
+.moz-smiley-s8 > span,
+.moz-smiley-s9 > span,
+.moz-smiley-s10 > span,
+.moz-smiley-s11 > span,
+.moz-smiley-s12 > span,
+.moz-smiley-s13 > span,
+.moz-smiley-s14 > span,
+.moz-smiley-s15 > span,
+.moz-smiley-s16 > span {
+  display: none;
+}
+
+/* smile */
+.moz-smiley-s1:before {
+  content: url("chrome://communicator/skin/icons/smileys/smiley-smile.png");
+}
+
+/* frown */
+.moz-smiley-s2:before {
+  content: url("chrome://communicator/skin/icons/smileys/smiley-frown.png");
+}
+
+/* wink */
+.moz-smiley-s3:before {
+  content: url("chrome://communicator/skin/icons/smileys/smiley-wink.png");
+}
+
+/* tongue */
+.moz-smiley-s4:before {
+  content: url("chrome://communicator/skin/icons/smileys/smiley-tongue.png");
+}
+
+/* laughing */
+.moz-smiley-s5:before {
+  content: url("chrome://communicator/skin/icons/smileys/smiley-laughing.png");
+}
+
+/* embarrassed */
+.moz-smiley-s6:before {
+  content: url("chrome://communicator/skin/icons/smileys/smiley-embarrassed.png");
+}
+
+/* undecided */
+.moz-smiley-s7:before {
+  content: url("chrome://communicator/skin/icons/smileys/smiley-undecided.png");
+}
+
+/* surprise */
+.moz-smiley-s8:before {
+  content: url("chrome://communicator/skin/icons/smileys/smiley-surprise.png");
+}
+
+/* kiss */
+.moz-smiley-s9:before {
+  content: url("chrome://communicator/skin/icons/smileys/smiley-kiss.png");
+}
+
+/* yell */
+.moz-smiley-s10:before {
+  content: url("chrome://communicator/skin/icons/smileys/smiley-yell.png");
+}
+
+/* cool */
+.moz-smiley-s11:before {
+  content: url("chrome://communicator/skin/icons/smileys/smiley-cool.png");
+}
+
+/* money */
+.moz-smiley-s12:before {
+  content: url("chrome://communicator/skin/icons/smileys/smiley-money.png");
+}
+
+/* foot */
+.moz-smiley-s13:before {
+  content: url("chrome://communicator/skin/icons/smileys/smiley-foot.png");
+}
+
+/* innocent */
+.moz-smiley-s14:before {
+  content: url("chrome://communicator/skin/icons/smileys/smiley-innocent.png");
+}
+
+/* cry */
+.moz-smiley-s15:before {
+  content: url("chrome://communicator/skin/icons/smileys/smiley-cry.png");
+}
+
+/* sealed */
+.moz-smiley-s16:before {
+  content: url("chrome://communicator/skin/icons/smileys/smiley-sealed.png");
+}
diff --git a/comm/suite/themes/classic/communicator/spinbuttons.css b/comm/suite/themes/classic/communicator/spinbuttons.css
new file mode 100644
index 0000000000..3e333bb474
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/spinbuttons.css
@@ -0,0 +1,24 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+spinbuttons {
+  -moz-appearance: spinner;
+  cursor: default;
+}
+
+.spinbuttons-button {
+  min-width: 13px;
+  min-height: 11px;
+  margin: 0 !important;
+}
+
+.spinbuttons-up {
+  -moz-appearance: spinner-upbutton;
+}
+
+.spinbuttons-down {
+  -moz-appearance: spinner-downbutton;
+}
diff --git a/comm/suite/themes/classic/communicator/sync/sync-16-throbber.png b/comm/suite/themes/classic/communicator/sync/sync-16-throbber.png
new file mode 100644
index 0000000000..d604a32d75
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/sync/sync-16-throbber.png
diff --git a/comm/suite/themes/classic/communicator/sync/sync-16.png b/comm/suite/themes/classic/communicator/sync/sync-16.png
new file mode 100644
index 0000000000..c7839c33e9
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/sync/sync-16.png
diff --git a/comm/suite/themes/classic/communicator/sync/sync-32-throbber.png b/comm/suite/themes/classic/communicator/sync/sync-32-throbber.png
new file mode 100644
index 0000000000..4c8d903544
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/sync/sync-32-throbber.png
diff --git a/comm/suite/themes/classic/communicator/sync/sync-32.png b/comm/suite/themes/classic/communicator/sync/sync-32.png
new file mode 100644
index 0000000000..d0d3b19050
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/sync/sync-32.png
diff --git a/comm/suite/themes/classic/communicator/sync/sync-bg.png b/comm/suite/themes/classic/communicator/sync/sync-bg.png
new file mode 100644
index 0000000000..893a27d76e
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/sync/sync-bg.png
diff --git a/comm/suite/themes/classic/communicator/sync/sync-desktopIcon.png b/comm/suite/themes/classic/communicator/sync/sync-desktopIcon.png
new file mode 100644
index 0000000000..a98f21b30f
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/sync/sync-desktopIcon.png
diff --git a/comm/suite/themes/classic/communicator/sync/sync-mobileIcon.png b/comm/suite/themes/classic/communicator/sync/sync-mobileIcon.png
new file mode 100644
index 0000000000..57fbe054c8
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/sync/sync-mobileIcon.png
diff --git a/comm/suite/themes/classic/communicator/sync/syncCommon.css b/comm/suite/themes/classic/communicator/sync/syncCommon.css
new file mode 100644
index 0000000000..a5383bc330
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/sync/syncCommon.css
@@ -0,0 +1,45 @@
+/* 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/. */
+
+/* The following are used by both syncSetup.xul and syncGenericChange.xul */
+.status {
+  color: -moz-dialogtext;
+}
+
+.statusIcon {
+  margin-inline-start: 4px;
+  max-height: 16px;
+  max-width: 16px;
+}
+
+.statusIcon[status="active"] {
+  list-style-image: url("chrome://global/skin/icons/loading.png");
+}
+
+.statusIcon[status="error"] {
+  list-style-image: url("chrome://global/skin/icons/error-16.png");
+}
+
+.statusIcon[status="success"] {
+  list-style-image: url("chrome://global/skin/icons/information-16.png");
+}
+
+/* .data is only used by syncGenericChange.xul, but it seems unnecessary to have
+   a separate stylesheet for it. */
+.data {
+  font-size: 90%;
+  font-weight: bold;
+}
+
+#change-dialog {
+  width: 40em;
+}
+
+#introText {
+  margin-top: 2px;
+}
+
+#feedback {
+  height: 2em;
+}
diff --git a/comm/suite/themes/classic/communicator/sync/syncQuota.css b/comm/suite/themes/classic/communicator/sync/syncQuota.css
new file mode 100644
index 0000000000..1577de8a3b
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/sync/syncQuota.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/. */
+
+#quotaDialog {
+  width: 33em;
+  height: 25em;
+}
+
+treechildren::-moz-tree-checkbox {
+  list-style-image: none;
+}
+treechildren::-moz-tree-checkbox(checked) {
+  list-style-image: url("chrome://global/skin/checkbox/cbox-check.gif");
+}
+treechildren::-moz-tree-checkbox(disabled) {
+  list-style-image: url("chrome://global/skin/checkbox/cbox-check-dis.gif");
+}
+
+#treeCaption {
+  height: 4em;
+}
+
+.captionWarning {
+  font-weight: bold;
+}
diff --git a/comm/suite/themes/classic/communicator/sync/syncSetup.css b/comm/suite/themes/classic/communicator/sync/syncSetup.css
new file mode 100644
index 0000000000..0112c94893
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/sync/syncSetup.css
@@ -0,0 +1,129 @@
+/* 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/. */
+
+wizard {
+  -moz-appearance: none;
+  width: 55em;
+  height: 42em;
+  padding: 0;
+  background-color: Window;
+}
+
+.wizard-page-box {
+  -moz-appearance: none;
+  padding-left: 0;
+  padding-right: 0;
+  margin: 0;
+}
+
+wizardpage {
+  -moz-box-pack: center;
+  -moz-box-align: center;
+  margin: 0;
+  padding: 0 8em;
+  background-color: Window;
+}
+
+.wizard-header {
+  -moz-appearance: none;
+  border: none;
+  padding: 2em 0 1em 0;
+  text-align: center;
+}
+.wizard-header-label {
+  font-size: 24pt;
+  font-weight: normal;
+}
+
+.wizard-buttons {
+  border-top: 2px solid #ccd9ea;
+  background-color: #f1f5fb;
+  padding: 1em;
+}
+
+.wizard-buttons-separator {
+  visibility: collapse;
+}
+
+.wizard-header-icon {
+  visibility: collapse;
+}
+
+.accountChoiceButton {
+  font: menu;
+}
+
+.confirm {
+  border: 1px solid black;
+  padding: 1em;
+  border-radius: 5px;
+}
+
+/* Override the text-link style from global.css */
+description > .text-link,
+description > .text-link:focus {
+  margin: 0px;
+  padding: 0px;
+}
+
+.success,
+.error {
+  padding: 2px;
+  border-radius: 2px;
+}
+
+.error {
+  background-color: #FF0000 !important;
+  color: #FFFFFF !important;
+}
+
+.success {
+  background-color: #00FF00 !important;
+}
+
+.warning {
+  font-weight: bold;
+  font-size: 100%;
+  color: red;
+}
+
+.mainDesc {
+  font-weight: bold;
+  font-size: 100%;
+}
+
+.normal {
+  font-size: 100%;
+}
+
+.inputColumn {
+  margin-inline-end: 2px;
+}
+
+.recommended {
+  font-weight: bold;
+}
+
+.pin {
+  font-size: 18pt;
+  text-align: center;
+}
+
+#passphraseHelpSpacer {
+  width: 0.5em;
+}
+
+#add-device-throbber,
+#login-throbber {
+  list-style-image: url("chrome://global/skin/icons/loading.png");
+}
+
+#successPageIcon {
+  /* TODO replace this with a 128px version (bug 591122) */
+  list-style-image: url("chrome://communicator/skin/sync/sync-32.png");
+}
+
+#pickSetupDesc {
+  padding: 0 7em;
+}
diff --git a/comm/suite/themes/classic/communicator/taskbar/taskbar.png b/comm/suite/themes/classic/communicator/taskbar/taskbar.png
new file mode 100755
index 0000000000..5d54e0c3d4
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/taskbar/taskbar.png
diff --git a/comm/suite/themes/classic/communicator/taskbar/taskmenu-abook.png b/comm/suite/themes/classic/communicator/taskbar/taskmenu-abook.png
new file mode 100644
index 0000000000..2e7d096cc6
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/taskbar/taskmenu-abook.png
diff --git a/comm/suite/themes/classic/communicator/taskbar/taskmenu-browser.png b/comm/suite/themes/classic/communicator/taskbar/taskmenu-browser.png
new file mode 100644
index 0000000000..14b1f3a70b
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/taskbar/taskmenu-browser.png
diff --git a/comm/suite/themes/classic/communicator/taskbar/taskmenu-composer.png b/comm/suite/themes/classic/communicator/taskbar/taskmenu-composer.png
new file mode 100644
index 0000000000..d3e98a3c96
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/taskbar/taskmenu-composer.png
diff --git a/comm/suite/themes/classic/communicator/taskbar/taskmenu-mailnews.png b/comm/suite/themes/classic/communicator/taskbar/taskmenu-mailnews.png
new file mode 100644
index 0000000000..9347ca2551
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/taskbar/taskmenu-mailnews.png
diff --git a/comm/suite/themes/classic/communicator/tasksOverlay.css b/comm/suite/themes/classic/communicator/tasksOverlay.css
new file mode 100644
index 0000000000..1500b1029f
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/tasksOverlay.css
@@ -0,0 +1,98 @@
+/* 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/. */
+
+/* ==== tasksOverlay.css ================================================
+   == Styles used by the the overlay which contains tasks related
+   == content, such as the taskbar and product launcher icons.
+   ====================================================================== */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: communicator product icons ::::: */
+
+#mini-nav {
+  list-style-image: url("chrome://communicator/skin/taskbar/taskbar.png");
+  -moz-image-region: rect(0 17px 13px 0);
+}
+
+#mini-nav:hover {
+  -moz-image-region: rect(13px 17px 26px 0);
+}
+
+#mini-nav:hover:active {
+  -moz-image-region: rect(26px 17px 39px 0);
+}
+
+.icon-navigator16 {
+  list-style-image: url("chrome://communicator/skin/taskbar/taskmenu-browser.png");
+}
+
+#mini-mail {
+  list-style-image: url("chrome://communicator/skin/taskbar/taskbar.png");
+  -moz-image-region: rect(0 40px 13px 17px);
+}
+
+#mini-mail:hover {
+  -moz-image-region: rect(13px 40px 26px 17px);
+}
+
+#mini-mail:hover:active {
+  -moz-image-region: rect(26px 40px 39px 17px);
+}
+
+#mini-mail[BiffState="NewMail"] {
+  -moz-image-region: rect(0 63px 13px 40px);
+}
+
+#mini-mail[BiffState="NewMail"]:hover {
+  -moz-image-region: rect(13px 63px 26px 40px);
+}
+
+#mini-mail[BiffState="NewMail"]:hover:active {
+  -moz-image-region: rect(26px 63px 39px 40px);
+}
+
+.icon-mail16 {
+  list-style-image: url("chrome://communicator/skin/taskbar/taskmenu-mailnews.png");
+}
+
+#mini-addr {
+  list-style-image: url("chrome://communicator/skin/taskbar/taskbar.png");
+  -moz-image-region: rect(0 100px 13px 81px);
+}
+
+#mini-addr:hover {
+  -moz-image-region: rect(13px 100px 26px 81px);
+}
+
+#mini-addr:hover:active {
+  -moz-image-region: rect(26px 100px 39px 81px);
+}
+
+.icon-addressbook16 {
+  list-style-image: url("chrome://communicator/skin/taskbar/taskmenu-abook.png");
+}
+
+#mini-comp {
+  list-style-image: url("chrome://communicator/skin/taskbar/taskbar.png");
+  -moz-image-region: rect(0 81px 13px 63px);
+}
+
+#mini-comp:hover {
+  -moz-image-region: rect(13px 81px 26px 63px);
+}
+
+#mini-comp:hover:active {
+  -moz-image-region: rect(26px 81px 39px 63px);
+}
+
+.icon-composer16 {
+  list-style-image: url("chrome://communicator/skin/taskbar/taskmenu-composer.png");
+}
+
+/* ::::: component bar ::::: */
+
+#component-bar {
+  -moz-box-align: stretch;
+}
diff --git a/comm/suite/themes/classic/communicator/toolbar.css b/comm/suite/themes/classic/communicator/toolbar.css
new file mode 100644
index 0000000000..5d13481165
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/toolbar.css
@@ -0,0 +1,118 @@
+/* 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 grippytoolbar in addition to general toolbar styles.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* Restore Windows Classic fallbacks removed by bug 1343196 */
+
+@media (-moz-windows-classic) {
+
+  /* ::::: toolbox ::::: */
+
+  toolbox {
+    background-color: -moz-Dialog;
+    border-top: 1px solid;
+    border-top-color: ThreeDShadow;
+  }
+
+  /* ::::: toolbar & menubar ::::: */
+
+  toolbar {
+    border-top: 1px solid ThreeDHighlight;
+    border-bottom: 1px solid ThreeDShadow;
+  }
+
+  toolbar:first-child, menubar {
+    border-bottom: 1px solid ThreeDShadow;
+    border-top: 0px !important;
+  }
+
+/* ::::: lightweight theme ::::: */
+ 
+  menubar:-moz-lwtheme,
+  toolbox:-moz-lwtheme,
+  toolbar:-moz-lwtheme {
+    background: none;
+    border-color: transparent;
+  }
+
+  /* ::::: toolbar decorations ::::: */
+
+  toolbarseparator {
+    padding: 2px;
+    border-left: 1px solid;
+    border-right: 1px solid;
+    border-left-color  : ThreeDShadow;
+    border-right-color : ThreeDHighlight;
+  }
+}
+
+/* End restore Windows Classic fallbacks removed by bug 1343196 */
+
+@media (-moz-menubar-drag) {
+  toolbar[type="menubar"]:not([autohide="true"]):not([xpfe="false"]):not(:-moz-lwtheme) {
+    -moz-binding: url("chrome://communicator/content/bindings/toolbar-xpfe.xml#grippytoolbar-drag");
+  }
+}
+
+/* ::::: toolbar & menubar ::::: */
+
+.toolbar-holder {
+  border-left: 1px solid ThreeDHighlight;
+}
+
+toolbaritem > menubar,
+toolbar > menubar {
+  border-bottom: 0px none;
+}
+
+/* ::::: toolbargrippy ::::: */
+
+toolbargrippy {
+  -moz-box-orient: vertical;
+  -moz-box-align: center;
+  border-right: 1px solid ThreeDShadow;
+  width: 10px;
+  padding: 2px 1px;
+  list-style-image: url("chrome://communicator/skin/toolbar/tbgrip-arrow.png");
+}
+
+toolbargrippy:hover {
+  background-color: ThreeDHighlight;
+}
+
+.toolbargrippy-texture {
+  margin-top: 2px;
+  width: 6px;
+  background: url("chrome://communicator/skin/toolbar/tbgrip-texture.png");
+}
+
+/* ::::: collapsed tray and grippies ::::: */
+
+toolbargrippy[tbgrippy-collapsed="true"] {
+  -moz-box-orient: horizontal;
+  border-left: 1px solid ThreeDHighlight;
+  border-top: 1px solid ThreeDHighlight;
+  border-right: 1px solid ThreeDShadow;
+  border-bottom: 1px solid ThreeDShadow;
+  width: 40px;
+  height: 10px;
+  padding: 1px 2px;
+  list-style-image: url("chrome://communicator/skin/toolbar/tbgrip-arrow-clps.png");
+}
+
+toolbargrippy[tbgrippy-collapsed="true"] > .toolbargrippy-texture {
+  margin-top: 0;
+  margin-inline-start: 2px;
+  width: 0px;
+  height: 6px;
+}
+
+.collapsed-tray-spacer {
+  border-bottom: 1px solid ThreeDShadow;
+}
diff --git a/comm/suite/themes/classic/communicator/toolbar/tbgrip-arrow-clps.png b/comm/suite/themes/classic/communicator/toolbar/tbgrip-arrow-clps.png
new file mode 100644
index 0000000000..6342970127
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/toolbar/tbgrip-arrow-clps.png
diff --git a/comm/suite/themes/classic/communicator/toolbar/tbgrip-arrow.png b/comm/suite/themes/classic/communicator/toolbar/tbgrip-arrow.png
new file mode 100644
index 0000000000..c97fd08365
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/toolbar/tbgrip-arrow.png
diff --git a/comm/suite/themes/classic/communicator/toolbar/tbgrip-texture.png b/comm/suite/themes/classic/communicator/toolbar/tbgrip-texture.png
new file mode 100644
index 0000000000..34d15fba48
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/toolbar/tbgrip-texture.png
diff --git a/comm/suite/themes/classic/communicator/viewSourceOverlay.css b/comm/suite/themes/classic/communicator/viewSourceOverlay.css
new file mode 100644
index 0000000000..a21699672c
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/viewSourceOverlay.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/. */
+
+/* make findbar appear above content */
+#appcontent {
+  -moz-box-direction: reverse;
+}
+
+/* style findbar for being on top */
+#FindToolbar {
+  border-top-color: ThreeDHighlight;
+  border-top-width: 1px;
+  border-bottom: 1px solid;
+  border-bottom-color: ThreeDShadow;
+  padding-top: 1px;
+  padding-bottom: 0px;
+}
diff --git a/comm/suite/themes/classic/communicator/xpinstall/xpinstall.css b/comm/suite/themes/classic/communicator/xpinstall/xpinstall.css
new file mode 100644
index 0000000000..863a6a68b7
--- /dev/null
+++ b/comm/suite/themes/classic/communicator/xpinstall/xpinstall.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://communicator/skin");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#confirmBox {
+  margin: 1ex;
+}
+
+#urlColumn {
+  margin-inline-start: 1ex;
+}
+
+.confirmSeparator {
+  height: 1em;
+}
+
+.confirmName {
+  font-weight               : bold;
+}
+
+.packageName {
+  font-weight               : bold;
+}
+
+#alert-image {
+  margin: 1em;
+}
diff --git a/comm/suite/themes/classic/editor/EditorDialog.css b/comm/suite/themes/classic/editor/EditorDialog.css
new file mode 100644
index 0000000000..3b7d7f04af
--- /dev/null
+++ b/comm/suite/themes/classic/editor/EditorDialog.css
@@ -0,0 +1,267 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+.MinWidth5em {
+  min-width: 5em;
+}
+
+.MinWidth10em {
+  min-width: 10em;
+}
+
+.MinWidth20em {
+  min-width: 20em;
+}
+
+.bold {
+  font-weight: bold;
+}
+
+.italic {
+  font-style: italic;
+}
+
+.larger {
+  font-size: 120%;
+}
+
+.narrow {
+  width: 3em;
+}
+
+.wrap {
+ width: 1em;
+}
+
+.menuitem-highlight-1 {
+  font-weight : bold;
+}
+
+.color-well {
+  width: 20px;
+  height: 12px; 
+  border: 1px inset #CCCCCC;
+}
+
+.color-well[default="true"] {
+  border: 1px solid transparent !important;
+  background-color: inherit !important;
+}
+
+.color-button {
+  /* override large default min-width */
+  min-width : 0px;
+  margin: 2px;
+}
+
+#ColorPicker {
+  -moz-user-focus: normal;
+}
+
+#ColorPickerSwatch {
+  border : 2px outset #CCCCCC;
+  width: 25px;
+  height: 20px;
+  margin-top: 0px;
+  margin-bottom: 0px;
+  margin-inline-start: 0px;
+  margin-inline-end: 3px;
+}
+
+#ColorPickerSwatch[default="true"] {
+  border : 2px solid transparent;
+  background-color: inherit;
+}
+
+#LastPickedColor {
+  width: 17px;
+  height: 13px; 
+  border: 1px inset #CCCCCC;
+  margin-top: 1px;
+  margin-bottom: 2px;
+  margin-inline-start: 4px;
+  margin-inline-end: 2px;
+}
+
+#ColorPreview {
+  border: 1px inset #CCCCCC;
+  margin-inline-start:    10px;
+  padding: 0 5px;
+  min-width:     100px;
+  min-height:     50px;
+}
+
+/* ::::: table properties dialog ::::: */
+
+#MoreFewerButton[more="0"] {
+  list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
+  min-width: 12em;
+}
+
+#MoreFewerButton[more="1"] {
+  list-style-image: url("chrome://global/skin/arrow/arrow-up.gif");
+  min-width: 12em;
+}
+
+#PreviousButton {
+  list-style-image: url("chrome://global/skin/arrow/arrow-lft.gif");
+}
+
+#NextButton {
+  list-style-image: url("chrome://global/skin/arrow/arrow-rit.gif");
+}
+
+#PreviousButton[type="row"] {
+  list-style-image: url("chrome://global/skin/arrow/arrow-up.gif");
+}
+
+#NextButton[type="row"] {
+  list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
+}
+
+/* ::::: spelling dialog ::::: */
+
+#ReplaceWordInput {
+  min-width: 16em;
+  width: 16em;
+}
+
+.spell-check {
+  min-width: 8em;
+}
+
+/* ::::: color picker ::::: */
+
+/* use outset shape for a button look */
+.colorpicker {
+  border: 1px outset #CCCCCC;
+  /* This should be the same as for textbox */
+  margin-inline-start: 4px;
+  /* For a little extra space between buttons */
+  margin-bottom: 2px;
+}
+
+
+.colorpicker:active {
+  border: 1px inset #CCCCCC;
+}
+
+.smallspacer {
+  width:  3px;
+  height: 3px;
+  min-width:  3px;
+  min-height: 3px;
+}
+
+.spacer {
+  width:  5px;
+  height: 5px;
+  min-width:  5px;
+  min-height: 5px;
+}
+
+.bigspacer {
+  width:  10px;
+  height: 10px;
+  min-width:  10px;
+  min-height: 10px;
+}
+
+/* These should be the width of the checkbox and radio button images + margin + padding
+   Used to indent below those to the level of the text label next to image 
+*/
+.checkbox-spacer {
+  width: 2em;
+  min-width: 2em;
+}
+
+.radio-spacer {
+  width: 2em;
+  min-width: 2em;
+}
+
+.align-menu > .menu-iconic-left > .menu-iconic-icon {
+  height: auto;
+  width: auto;
+}
+
+.align-menu[value="top"] {
+  list-style-image:url("chrome://editor/skin/icons/img-align-top.png") !important;
+}
+
+.align-menu[value="middle"] {
+  list-style-image:url("chrome://editor/skin/icons/img-align-middle.png") !important;
+}
+
+.align-menu[value="bottom"] {
+  list-style-image:url("chrome://editor/skin/icons/img-align-bottom.png") !important;
+}
+
+.align-menu[value="right"] {
+  list-style-image:url("chrome://editor/skin/icons/img-align-right.png") !important;
+}
+
+.align-menu[value="left"] {
+  list-style-image:url("chrome://editor/skin/icons/img-align-left.png") !important;
+}
+
+/* Don't change width/height of these without changing values in 
+  GetOriginalWidth(), EdImageProps.js
+*/    
+#preview-image-box {
+  border: 1px inset #CCCCCC;
+  width      : 82px;
+  max-width  : 82px;
+  min-width  : 82px;
+  height     : 52px;
+  max-height : 52px;
+  min-height : 52px;
+  margin     : 6px 5px;
+  overflow   : -moz-hidden-unscrollable;
+}
+
+#preview-image-holder {
+  padding : 0px;
+  margin  : 0px;
+}
+
+/* Rest are from Ben Goodger for Advanced Edit dialog 
+   These need reviewing and eliminate all but essential attributes */
+/* Have made some mods and eliminated some unnecessary portions. 
+   hope to merge most of the treecell formatting into global as some of 
+   this "property list" style treecell formatting is used by cookie/signon 
+   viewers. */
+
+
+#tagLabel {
+  font-weight: bold;
+}
+
+/* styles for an attribute tree-table */
+.AttributesTree {
+  min-width : 200px;
+  min-height: 200px;
+}
+
+/* ::::: select edit dialog ::::: */
+
+#SelectTreeChildren::-moz-tree-cell(SelectSelCol, checked-true) {
+  background: url("chrome://global/skin/checkbox/cbox-check.gif") 50% 50% no-repeat;
+}
+
+/* ::::: Publishing Progress ::::: */
+
+.progressitem[progress="busy"] {
+	list-style-image: url("chrome://editor/skin/icons/progress-busy.png");
+}
+
+.progressitem[progress="done"] {
+	list-style-image: url("chrome://editor/skin/icons/progress-done.png");
+}
+
+.progressitem[progress="failed"] {
+	list-style-image: url("chrome://editor/skin/icons/progress-failed.png");
+}
diff --git a/comm/suite/themes/classic/editor/editor.css b/comm/suite/themes/classic/editor/editor.css
new file mode 100644
index 0000000000..bee714c526
--- /dev/null
+++ b/comm/suite/themes/classic/editor/editor.css
@@ -0,0 +1,85 @@
+/* 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/. */
+
+/* ==== editor.css ==========================================================
+   == Styles shared throughout the Editor application.
+   ========================================================================== */
+
+@import url("chrome://communicator/skin/");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#content-frame { 
+  min-width: 10px; 
+  min-height: 10px;
+  height: 400px;
+} 
+
+.source-editor,
+.source-editor:focus {
+  margin-top: 0px;
+  margin-bottom: 5px;
+  margin-inline-start: 0px;
+  margin-inline-end: 5px;
+  border: 0px;
+  /* Scroll bars are in content, 
+     so we can't use right and bottom padding! */
+  padding-top: 5px;
+  padding-bottom: 0px;
+  padding-inline-start: 5px;
+  padding-inline-end: 0px;
+}
+
+/* Multiline textarea for HTML source editing */
+#content-source,
+#doctype-text {
+  font-family: -moz-fixed;
+  font-size: initial;
+}
+
+#appcontent {
+  border-left: 1px solid ThreeDShadow;
+  border-top: 1px solid ThreeDDarkShadow;
+  border-right: 1px solid ThreeDHighlight;
+}
+
+#ContentWindowDeck {
+  border-left: 1px solid ThreeDDarkShadow;
+  border-right: 1px solid ThreeDLightShadow;
+}
+
+/* ::::: struct toolbar ::::: */
+
+#structToolbar {
+  min-width: 1px;
+  overflow: -moz-hidden-unscrollable;
+}
+
+#structSpacer {
+  margin: 2px 0px;
+}
+
+.struct-button {
+  padding: 2px;
+}
+
+.struct-button[checked="true"] {
+  font-weight: bold;
+}
+
+.struct-textbox {
+  -moz-appearance: none !important;
+  padding: 0px !important;
+  margin: 0px !important;
+  border: none !important;
+}
+
+/* ::::: lightweight themes ::::: */
+
+#EditModeToolbar:-moz-lwtheme {
+  text-shadow: none;
+  color: -moz-dialogtext;
+  background-color: -moz-dialog;
+}
+
diff --git a/comm/suite/themes/classic/editor/editorFormatToolbar.css b/comm/suite/themes/classic/editor/editorFormatToolbar.css
new file mode 100644
index 0000000000..4445ab0fab
--- /dev/null
+++ b/comm/suite/themes/classic/editor/editorFormatToolbar.css
@@ -0,0 +1,574 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: formatting buttons ::::: */
+
+#FormatToolbar > toolbarbutton > .toolbarbutton-text {
+  display: none;
+}
+
+toolbarbutton.formatting-button {
+  list-style-image: url("chrome://editor/skin/icons/btn2.png");
+  min-width: 32px;
+}
+
+#DecreaseFontSizeButton {
+  -moz-image-region: rect(64px 14px 80px 0px);
+}
+
+#DecreaseFontSizeButton:hover {
+  -moz-image-region: rect(64px 28px 80px 14px);
+}
+
+#DecreaseFontSizeButton:hover:active {
+  -moz-image-region: rect(64px 42px 80px 28px);
+}
+
+#DecreaseFontSizeButton[disabled="true"] {
+  -moz-image-region: rect(64px 56px 80px 42px) !important;
+}
+
+#IncreaseFontSizeButton {
+  -moz-image-region: rect(81px 18px 98px 0px);
+}
+
+#IncreaseFontSizeButton:hover {
+  -moz-image-region: rect(81px 36px 98px 18px);
+}
+
+#IncreaseFontSizeButton:hover:active {
+  -moz-image-region: rect(81px 54px 98px 36px);
+}
+
+#IncreaseFontSizeButton[disabled="true"] {
+  -moz-image-region: rect(81px 72px 98px 54px) !important;
+}
+
+#boldButton {
+  -moz-image-region: rect(16px 16px 32px 0px);
+}
+
+#boldButton:hover {
+  -moz-image-region: rect(16px 32px 32px 16px);
+}
+
+#boldButton:hover:active {
+  -moz-image-region: rect(16px 48px 32px 32px);
+}
+
+#boldButton[checked="true"] {
+  -moz-image-region: rect(16px 16px 32px 0px);
+}
+
+#boldButton[disabled="true"] {
+  -moz-image-region: rect(16px 64px 32px 48px) !important;
+}
+
+#italicButton {
+  -moz-image-region: rect(98px 16px 114px 0px);
+}
+
+#italicButton:hover {
+  -moz-image-region: rect(98px 32px 114px 16px);
+}
+
+#italicButton:hover:active {
+  -moz-image-region: rect(98px 48px 114px 32px);
+}
+
+#italicButton[checked="true"] {
+  -moz-image-region: rect(98px 16px 114px 0px);
+}
+
+#italicButton[disabled="true"] {
+  -moz-image-region: rect(98px 64px 114px 48px) !important;
+}
+
+#underlineButton {
+  -moz-image-region: rect(114px 16px 130px 0px);
+}
+
+#underlineButton:hover {
+  -moz-image-region: rect(114px 32px 130px 16px);
+}
+
+#underlineButton:hover:active {
+  -moz-image-region: rect(114px 48px 130px 32px);
+}
+
+#underlineButton[checked="true"] {
+  -moz-image-region: rect(114px 16px 130px 0px);
+}
+
+#underlineButton[disabled="true"] {
+  -moz-image-region: rect(114px 64px 130px 48px) !important;
+}
+
+#ulButton {
+  -moz-image-region: rect(32px 16px 48px 0px);
+}
+
+#ulButton:hover {
+  -moz-image-region: rect(32px 32px 48px 16px);
+}
+
+#ulButton:hover:active {
+  -moz-image-region: rect(32px 48px 48px 32px);
+}
+
+#ulButton[checked="true"] {
+  -moz-image-region: rect(32px 16px 48px 0px);
+}
+
+#ulButton[disabled="true"] {
+  -moz-image-region: rect(32px 64px 48px 48px) !important;
+}
+
+#olButton {
+  -moz-image-region: rect(194px 16px 210px 0px);
+}
+
+#olButton:hover {
+  -moz-image-region: rect(194px 32px 210px 16px);
+}
+
+#olButton:hover:active {
+  -moz-image-region: rect(194px 48px 210px 32px);
+}
+
+#olButton[checked="true"] {
+  -moz-image-region: rect(194px 16px 210px 0px);
+}
+
+#olButton[disabled="true"] {
+  -moz-image-region: rect(194px 64px 210px 48px) !important;
+}
+
+#outdentButton {
+  -moz-image-region: rect(210px 16px 226px 0px);
+}
+
+#outdentButton:hover {
+  -moz-image-region: rect(210px 32px 226px 16px);
+}
+
+#outdentButton:hover:active {
+  -moz-image-region: rect(210px 48px 226px 32px);
+}
+
+#outdentButton[disabled="true"] {
+  -moz-image-region: rect(210px 64px 226px 48px) !important;
+}
+
+#indentButton {
+  -moz-image-region: rect(178px 16px 194px 0px);
+}
+
+#indentButton:hover {
+  -moz-image-region: rect(178px 32px 194px 16px);
+}
+
+#indentButton:hover:active {
+  -moz-image-region: rect(178px 48px 194px 32px);
+}
+
+#indentButton[disabled="true"] {
+  -moz-image-region: rect(178px 64px 194px 48px) !important;
+}
+
+#align-left-button {
+  -moz-image-region: rect(146px 16px 162px 0px);
+}
+
+#align-left-button:hover {
+  -moz-image-region: rect(146px 32px 162px 16px);
+}
+
+#align-left-button:hover:active {
+  -moz-image-region: rect(146px 48px 162px 32px);
+}
+
+#align-left-button[checked="true"] {
+  -moz-image-region: rect(146px 16px 162px 0px);
+}
+
+#align-left-button[disabled="true"] {
+  -moz-image-region: rect(146px 64px 162px 48px) !important;
+}
+
+#align-center-button {
+  -moz-image-region: rect(48px 16px 64px 0px);
+}
+
+#align-center-button:hover {
+  -moz-image-region: rect(48px 32px 64px 16px);
+}
+
+#align-center-button:hover:active {
+  -moz-image-region: rect(48px 48px 64px 32px);
+}
+
+#align-center-button[checked="true"] {
+  -moz-image-region: rect(48px 16px 64px 0px);
+}
+
+#align-center-button[disabled="true"] {
+  -moz-image-region: rect(48px 64px 64px 48px) !important;
+}
+
+#align-right-button {
+  -moz-image-region: rect(162px 16px 178px 0px);
+}
+
+#align-right-button:hover {
+  -moz-image-region: rect(162px 32px 178px 16px);
+}
+
+#align-right-button:hover:active {
+  -moz-image-region: rect(162px 48px 178px 32px);
+}
+
+#align-right-button[checked="true"] {
+  -moz-image-region: rect(162px 16px 178px 0px);
+}
+
+#align-right-button[disabled="true"] {
+  -moz-image-region: rect(162px 64px 178px 48px) !important;
+}
+
+#align-justify-button {
+  -moz-image-region: rect(130px 16px 146px 0px);
+}
+
+#align-justify-button:hover {
+  -moz-image-region: rect(130px 32px 146px 16px);
+}
+
+#align-justify-button:hover:active {
+  -moz-image-region: rect(130px 48px 146px 32px);
+}
+
+#align-justify-button[checked="true"] {
+  -moz-image-region: rect(130px 16px 146px 0px);
+}
+
+#align-justify-button[disabled="true"] {
+  -moz-image-region: rect(130px 64px 146px 48px) !important;
+}
+
+#AlignPopupButton {
+  -moz-image-region: rect(0px 16px 16px 0px);
+}
+
+#AlignPopupButton:hover {
+  -moz-image-region: rect(0px 32px 16px 16px);
+}
+
+#AlignPopupButton[open="true"] {
+  -moz-image-region: rect(0px 48px 16px 32px) !important;
+}
+
+#AlignPopupButton[disabled="true"] {
+  -moz-image-region: rect(0px 64px 16px 48px) !important;
+}
+
+#InsertPopupButton {
+  -moz-image-region: rect(244px 16px 260px 0px);
+}
+
+#InsertPopupButton:hover {
+  -moz-image-region: rect(244px 32px 260px 16px);
+}
+
+#InsertPopupButton[open="true"] {
+  -moz-image-region: rect(244px 48px 260px 32px) !important;
+}
+
+#InsertPopupButton[disabled="true"] {
+  -moz-image-region: rect(244px 64px 260px 48px) !important;
+}
+
+#smileButtonMenu {
+  -moz-image-region: rect(227px 17px 244px 0px);
+}
+
+#smileButtonMenu:hover {
+  -moz-image-region: rect(227px 34px 244px 17px);
+}
+
+#smileButtonMenu[open="true"] {
+  -moz-image-region: rect(227px 51px 244px 34px) !important;
+}
+
+#smileButtonMenu[disabled="true"] {
+  -moz-image-region: rect(227px 68px 244px 51px) !important;
+}
+
+/* ::::: menuitem icons ::::: */
+
+/* ..... align menu ..... */
+
+#AlignPopup > menuitem {
+  list-style-image: url("chrome://editor/skin/icons/btn2.png");
+}
+
+#AlignLeftItem {
+  -moz-image-region: rect(146px 16px 162px 0px);
+}
+
+#AlignLeftItem:hover {
+  -moz-image-region: rect(146px 32px 162px 16px);
+}
+
+#AlignCenterItem {
+  -moz-image-region: rect(48px 16px 64px 0px);
+}
+
+#AlignCenterItem:hover {
+  -moz-image-region: rect(48px 32px 64px 16px);
+}
+
+#AlignRightItem {
+  -moz-image-region: rect(162px 16px 178px 0px);
+}
+
+#AlignRightItem:hover {
+  -moz-image-region: rect(162px 32px 178px 16px);
+}
+
+#AlignJustifyItem {
+  -moz-image-region: rect(130px 16px 146px 0px);
+}
+
+#AlignJustifyItem:hover {
+  -moz-image-region: rect(130px 32px 146px 16px);
+}
+
+/* ..... insert menu ..... */
+
+#InsertPopup > menuitem {
+  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
+}
+
+#InsertLinkItem {
+  -moz-image-region: rect(60px 19px 79px 0);
+}
+
+#InsertLinkItem:hover {
+  -moz-image-region: rect(60px 39px 79px 20px);
+}
+
+#InsertAnchorItem {
+  -moz-image-region: rect(0 19px 19px 0);
+}
+
+#InsertAnchorItem:hover {
+  -moz-image-region: rect(0 39px 19px 20px);
+}
+
+#InsertImageItem {
+  -moz-image-region: rect(40px 19px 59px 0);
+}
+
+#InsertImageItem:hover {
+  -moz-image-region: rect(40px 39px 59px 20px);
+}
+
+#InsertHRuleItem {
+  -moz-image-region: rect(20px 19px 39px 0);
+}
+
+#InsertHRuleItem:hover {
+  -moz-image-region: rect(20px 39px 39px 20px);
+}
+
+#InsertTableItem {
+  -moz-image-region: rect(180px 19px 199px 0);
+}
+
+#InsertTableItem:hover {
+  -moz-image-region: rect(180px 39px 199px 20px);
+}
+
+/* ..... smiley menu ..... */
+
+.insert-smile {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-smile.png");
+}
+
+.insert-frown {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-frown.png"); 
+}
+
+.insert-wink {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-wink.png");
+}
+
+.insert-tongue {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-tongue.png");
+}
+
+.insert-laughing {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-laughing.png"); 
+}
+
+.insert-embarrassed {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-embarrassed.png");
+}
+
+.insert-undecided {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-undecided.png"); 
+}
+
+.insert-surprise {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-surprise.png"); 
+}
+
+.insert-kiss {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-kiss.png"); 
+}
+
+.insert-yell {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-yell.png"); 
+}
+
+.insert-cool {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-cool.png"); 
+}
+
+.insert-money {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-money.png"); 
+}
+
+.insert-foot {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-foot.png"); 
+}
+
+.insert-innocent {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-innocent.png"); 
+}
+
+.insert-cry {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-cry.png"); 
+}
+
+.insert-sealed {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-sealed.png"); 
+}
+
+/* ::::: fg/bg color picker ::::: */
+
+.ColorPickerLabel {
+  border: 1px inset ThreeDFace;
+  margin: 0px;
+  padding: 2px;
+}
+
+.color-button {
+  border: 1px inset ThreeDFace;
+  padding: 0px;
+  width: 14px;
+  height: 12px;
+  margin: 2px;
+}
+
+.color-button:hover {
+  border: 1px solid ThreeDDarkShadow;
+}
+
+#TextColorButton {
+  margin-top: 2px;
+  margin-bottom: 9px;
+  margin-inline-start: 2px;
+  margin-inline-end: 9px;
+}
+
+#TextColorButton[color="mixed"] {
+  background-image: url("chrome://editor/skin/icons/multicolor.png");
+  background-size: cover;
+}
+
+#BackgroundColorButton {
+  margin-top: 9px;
+  margin-bottom: 2px;
+  margin-inline-start: 9px;
+  margin-inline-end: 2px;
+}
+
+#HighlightColorButton {
+  -moz-image-region: rect(260px 16px 272px 0px);
+  background-color: transparent;
+}
+
+#HighlightColorButton:hover {
+  -moz-image-region: rect(260px 32px 272px 16px);
+}
+
+#HighlightColorButton:hover:active {
+  -moz-image-region: rect(260px 48px 272px 32px);
+}
+
+#HighlightColorButton[disabled="true"],
+#HighlightColorButton[disabled="true"]:hover,
+#HighlightColorButton[disabled="true"]:hover:active {
+  -moz-image-region: rect(260px 64px 272px 48px);
+}
+
+
+#absolutePositionButton {
+  -moz-image-region: rect(273px 16px 289px 0px);
+}
+
+#absolutePositionButton:hover {
+  -moz-image-region: rect(273px 32px 289px 16px);
+}
+
+#absolutePositionButton:hover:active {
+  -moz-image-region: rect(273px 48px 289px 32px);
+}
+
+#absolutePositionButton[disabled="true"] {
+  -moz-image-region: rect(273px 64px 289px 48px) ! important;
+}
+
+#absolutePositionButton[checked="true"]{
+  -moz-image-region: rect(289px 16px 305px 0px);
+}
+
+#absolutePositionButton[checked="true"]:hover {
+  -moz-image-region: rect(289px 32px 305px 16px);
+}
+
+#absolutePositionButton[checked="true"]:hover:active {
+  -moz-image-region: rect(289px 48px 305px 32px);
+}
+
+#increaseZIndexButton {
+  list-style-image: url("chrome://editor/content/images/bringtofront.png");
+}
+
+#increaseZIndexButton[disabled="true"] {
+  list-style-image: url("chrome://editor/content/images/bringtofront-disabled.png");
+}
+
+#decreaseZIndexButton {
+  list-style-image: url("chrome://editor/content/images/sendtoback.png");
+}
+
+#decreaseZIndexButton[disabled="true"] {
+  list-style-image: url("chrome://editor/content/images/sendtoback-disabled.png");
+}
+
+/* Force the folder location and mail view items to fit in the available width
+   in the Customize Toolbar dialog. */
+#palette-box #paragraph-select-container,
+#palette-box #ParagraphSelect,
+#palette-box #font-face-select-container,
+#palette-box #FontFaceSelect,
+#palette-box #font-size-select-container,
+#palette-box #FontSizeSelect {
+  -moz-box-flex: 1;
+}
diff --git a/comm/suite/themes/classic/editor/editorModeToolbar.css b/comm/suite/themes/classic/editor/editorModeToolbar.css
new file mode 100644
index 0000000000..8284e0f254
--- /dev/null
+++ b/comm/suite/themes/classic/editor/editorModeToolbar.css
@@ -0,0 +1,39 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: edit mode toolbar ::::: */
+
+#EditModeToolbar {
+  -moz-box-align: start;
+  border-left: 1px solid ThreeDDarkShadow;
+  border-right: 1px solid ThreeDLightShadow;
+  padding: 0px 2px 2px;
+  min-width: 1px;
+}
+
+.tab-bottom[selected="true"] {
+  color: -moz-FieldText;
+  border-top-color: -moz-Field;
+  border-bottom-color: ThreeDShadow;
+  border-left-color: ThreeDHighlight;
+}
+
+#NormalModeButton {
+  list-style-image: url("chrome://editor/skin/icons/editmode-normal.png");
+}
+
+#TagModeButton {
+  list-style-image: url("chrome://editor/skin/icons/editmode-tags.png");
+}
+
+#SourceModeButton {
+  list-style-image: url("chrome://editor/skin/icons/editmode-html.png");
+}
+
+#PreviewModeButton {
+  list-style-image: url("chrome://editor/skin/icons/editmode-preview.png"); 
+}
+
diff --git a/comm/suite/themes/classic/editor/editorPrimaryToolbar.css b/comm/suite/themes/classic/editor/editorPrimaryToolbar.css
new file mode 100644
index 0000000000..392661d819
--- /dev/null
+++ b/comm/suite/themes/classic/editor/editorPrimaryToolbar.css
@@ -0,0 +1,569 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: primary toolbar buttons ::::: */
+
+#newButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(120px 29px 149px 0);
+}
+
+#newButton:hover {
+  -moz-image-region: rect(120px 59px 149px 30px);
+}
+
+#newButton:hover:active {
+  -moz-image-region: rect(120px 89px 149px 60px);
+}
+
+#newButton[disabled="true"] {
+  -moz-image-region: rect(120px 119px 149px 90px) !important;
+}
+
+#openButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(150px 29px 179px 0);
+}
+
+#openButton:hover {
+  -moz-image-region: rect(150px 59px 179px 30px);
+}
+
+#openButton:hover:active {
+  -moz-image-region: rect(150px 89px 179px 60px);
+}
+
+#openButton[disabled="true"] {
+  -moz-image-region: rect(150px 119px 179px 90px) !important;
+}
+
+#saveButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(210px 29px 239px 0);
+}
+
+#saveButton:hover {
+  -moz-image-region: rect(210px 59px 239px 30px);
+}
+
+#saveButton:hover:active {
+  -moz-image-region: rect(210px 89px 239px 60px);
+}
+
+#saveButton[disabled="true"] {
+  -moz-image-region: rect(210px 119px 239px 90px) !important;
+}
+
+#publishButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(300px 29px 329px 0);
+}
+
+#publishButton:hover {
+  -moz-image-region: rect(300px 59px 329px 30px);
+}
+
+#publishButton:hover:active {
+  -moz-image-region: rect(300px 89px 329px 60px);
+}
+
+#publishButton[disabled="true"] {
+  -moz-image-region: rect(300px 119px 329px 90px) !important;
+}
+
+#previewButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(180px 29px 209px 0);
+}
+
+#previewButton:hover {
+  -moz-image-region: rect(180px 59px 209px 30px);
+}
+
+#previewButton:hover:active {
+  -moz-image-region: rect(180px 89px 209px 60px);
+}
+
+#previewButton[disabled="true"] {
+  -moz-image-region: rect(180px 119px 209px 90px) !important;
+}
+
+#linkButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(90px 29px 119px 0);
+}
+
+#linkButton:hover {
+  -moz-image-region: rect(90px 59px 119px 30px);
+}
+
+#linkButton:hover:active {
+  -moz-image-region: rect(90px 89px 119px 60px);
+}
+
+#linkButton[disabled="true"] {
+  -moz-image-region: rect(90px 119px 119px 90px) !important;
+}
+
+#imageButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(60px 29px 89px 0);
+}
+
+#imageButton:hover {
+  -moz-image-region: rect(60px 59px 89px 30px);
+}
+
+#imageButton:hover:active {
+  -moz-image-region: rect(60px 89px 89px 60px);
+}
+
+#imageButton[disabled="true"] {
+  -moz-image-region: rect(60px 119px 89px 90px) !important;
+}
+
+#formButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(450px 29px 479px 0);
+}
+
+#formButton:hover {
+  -moz-image-region: rect(450px 59px 479px 30px);
+}
+
+#formButton:hover:active {
+  -moz-image-region: rect(450px 89px 479px 60px);
+}
+
+#formButton[disabled="true"] {
+  -moz-image-region: rect(450px 119px 479px 90px) !important;
+}
+
+#namedAnchorButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(0 29px 29px 0);
+}
+
+#namedAnchorButton:hover {
+  -moz-image-region: rect(0 59px 29px 30px);
+}
+
+#namedAnchorButton:hover:active {
+  -moz-image-region: rect(0 89px 29px 60px);
+}
+
+#namedAnchorButton[disabled="true"] {
+  -moz-image-region: rect(0 119px 29px 90px) !important;
+}
+
+#hlineButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(30px 29px 59px 0);
+}
+
+#hlineButton:hover {
+  -moz-image-region: rect(30px 59px 59px 30px);
+}
+
+#hlineButton:hover:active {
+  -moz-image-region: rect(30px 89px 59px 60px);
+}
+
+#hlineButton[disabled="true"] {
+  -moz-image-region: rect(30px 119px 59px 90px) !important;
+}
+
+#tableButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(270px 29px 299px 0);
+}
+
+#tableButton:hover {
+  -moz-image-region: rect(270px 59px 299px 30px);
+}
+
+#tableButton:hover:active {
+  -moz-image-region: rect(270px 89px 299px 60px);
+}
+
+#tableButton[disabled="true"] {
+  -moz-image-region: rect(270px 119px 299px 90px) !important;
+}
+
+#spellingButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(240px 29px 269px 0);
+}
+
+#spellingButton:hover {
+  -moz-image-region: rect(240px 59px 269px 30px);
+}
+
+#spellingButton:hover:active {
+  -moz-image-region: rect(240px 89px 269px 60px);
+}
+
+#spellingButton[disabled="true"] {
+  -moz-image-region: rect(240px 119px 269px 90px) !important;
+}
+
+#cutButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(330px 29px 359px 0);
+}
+
+#cutButton:hover {
+  -moz-image-region: rect(330px 59px 359px 30px);
+}
+
+#cutButton:hover:active {
+  -moz-image-region: rect(330px 89px 359px 60px);
+}
+
+#cutButton[disabled="true"] {
+  -moz-image-region: rect(330px 119px 359px 90px) !important;
+}
+
+#copyButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(360px 29px 389px 0);
+}
+
+#copyButton:hover {
+  -moz-image-region: rect(360px 59px 389px 30px);
+}
+
+#copyButton:hover:active {
+  -moz-image-region: rect(360px 89px 389px 60px);
+}
+
+#copyButton[disabled="true"] {
+  -moz-image-region: rect(360px 119px 389px 90px) !important;
+}
+
+#pasteButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(390px 29px 419px 0);
+}
+
+#pasteButton:hover {
+  -moz-image-region: rect(390px 59px 419px 30px);
+}
+
+#pasteButton:hover:active {
+  -moz-image-region: rect(390px 89px 419px 60px);
+}
+
+#pasteButton[disabled="true"] {
+  -moz-image-region: rect(390px 119px 419px 90px) !important;
+}
+
+#findButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(420px 29px 449px 0);
+}
+
+#findButton:hover {
+  -moz-image-region: rect(420px 59px 449px 30px);
+}
+
+#findButton:hover:active {
+  -moz-image-region: rect(420px 89px 449px 60px);
+}
+
+#findButton[disabled="true"] {
+  -moz-image-region: rect(420px 119px 449px 90px) !important;
+}
+
+/* ::::: small primary toolbar buttons ::::: */
+
+toolbar[iconsize="small"] > #newButton,
+toolbar[iconsize="small"] > toolbarpaletteitem > #newButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
+  -moz-image-region: rect(80px 19px 99px 0);
+}
+
+toolbar[iconsize="small"] > #newButton:hover {
+  -moz-image-region: rect(80px 39px 99px 20px);
+}
+
+toolbar[iconsize="small"] > #newButton:hover:active {
+  -moz-image-region: rect(80px 59px 99px 40px);
+}
+
+toolbar[iconsize="small"] > #newButton[disabled="true"] {
+  -moz-image-region: rect(80px 79px 99px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #openButton,
+toolbar[iconsize="small"] > toolbarpaletteitem > #openButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
+  -moz-image-region: rect(100px 19px 119px 0);
+}
+
+toolbar[iconsize="small"] > #openButton:hover {
+  -moz-image-region: rect(100px 39px 119px 20px);
+}
+
+toolbar[iconsize="small"] > #openButton:hover:active {
+  -moz-image-region: rect(100px 59px 119px 40px);
+}
+
+toolbar[iconsize="small"] > #openButton[disabled="true"] {
+  -moz-image-region: rect(100px 79px 119px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #saveButton,
+toolbar[iconsize="small"] > toolbarpaletteitem > #saveButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
+  -moz-image-region: rect(140px 19px 159px 0);
+}
+
+toolbar[iconsize="small"] > #saveButton:hover {
+  -moz-image-region: rect(140px 39px 159px 20px);
+}
+
+toolbar[iconsize="small"] > #saveButton:hover:active {
+  -moz-image-region: rect(140px 59px 159px 40px);
+}
+
+toolbar[iconsize="small"] > #saveButton[disabled="true"] {
+  -moz-image-region: rect(140px 79px 159px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #publishButton,
+toolbar[iconsize="small"] > toolbarpaletteitem > #publishButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
+  -moz-image-region: rect(200px 19px 219px 0);
+}
+
+toolbar[iconsize="small"] > #publishButton:hover {
+  -moz-image-region: rect(200px 39px 219px 20px);
+}
+
+toolbar[iconsize="small"] > #publishButton:hover:active {
+  -moz-image-region: rect(200px 59px 219px 40px);
+}
+
+toolbar[iconsize="small"] > #publishButton[disabled="true"] {
+  -moz-image-region: rect(200px 79px 219px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #previewButton,
+toolbar[iconsize="small"] > toolbarpaletteitem > #previewButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
+  -moz-image-region: rect(120px 19px 139px 0);
+}
+
+toolbar[iconsize="small"] > #previewButton:hover {
+  -moz-image-region: rect(120px 39px 139px 20px);
+}
+
+toolbar[iconsize="small"] > #previewButton:hover:active {
+  -moz-image-region: rect(120px 59px 139px 40px);
+}
+
+toolbar[iconsize="small"] > #previewButton[disabled="true"] {
+  -moz-image-region: rect(120px 79px 139px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #linkButton,
+toolbar[iconsize="small"] > toolbarpaletteitem > #linkButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
+  -moz-image-region: rect(60px 19px 79px 0);
+}
+
+toolbar[iconsize="small"] > #linkButton:hover {
+  -moz-image-region: rect(60px 39px 79px 20px);
+}
+
+toolbar[iconsize="small"] > #linkButton:hover:active {
+  -moz-image-region: rect(60px 59px 79px 40px);
+}
+
+toolbar[iconsize="small"] > #linkButton[disabled="true"] {
+  -moz-image-region: rect(60px 79px 79px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #imageButton,
+toolbar[iconsize="small"] > toolbarpaletteitem > #imageButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
+  -moz-image-region: rect(40px 19px 59px 0);
+}
+
+toolbar[iconsize="small"] > #imageButton:hover {
+  -moz-image-region: rect(40px 39px 59px 20px);
+}
+
+toolbar[iconsize="small"] > #imageButton:hover:active {
+  -moz-image-region: rect(40px 59px 59px 40px);
+}
+
+toolbar[iconsize="small"] > #imageButton[disabled="true"] {
+  -moz-image-region: rect(40px 79px 59px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #formButton,
+toolbar[iconsize="small"] > toolbarpaletteitem > #formButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
+  -moz-image-region: rect(300px 19px 319px 0);
+}
+
+toolbar[iconsize="small"] > #formButton:hover {
+  -moz-image-region: rect(300px 39px 319px 20px);
+}
+
+toolbar[iconsize="small"] > #formButton:hover:active {
+  -moz-image-region: rect(300px 59px 319px 40px);
+}
+
+toolbar[iconsize="small"] > #formButton[disabled="true"] {
+  -moz-image-region: rect(300px 79px 319px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #namedAnchorButton,
+toolbar[iconsize="small"] > toolbarpaletteitem > #namedAnchorButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
+  -moz-image-region: rect(0 19px 19px 0);
+}
+
+toolbar[iconsize="small"] > #namedAnchorButton:hover {
+  -moz-image-region: rect(0 39px 19px 20px);
+}
+
+toolbar[iconsize="small"] > #namedAnchorButton:hover:active {
+  -moz-image-region: rect(0 59px 19px 40px);
+}
+
+toolbar[iconsize="small"] > #namedAnchorButton[disabled="true"] {
+  -moz-image-region: rect(0 79px 19px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #hlineButton,
+toolbar[iconsize="small"] > toolbarpaletteitem > #hlineButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
+  -moz-image-region: rect(20px 19px 39px 0);
+}
+
+toolbar[iconsize="small"] > #hlineButton:hover {
+  -moz-image-region: rect(20px 39px 39px 20px);
+}
+
+toolbar[iconsize="small"] > #hlineButton:hover:active {
+  -moz-image-region: rect(20px 59px 39px 40px);
+}
+
+toolbar[iconsize="small"] > #hlineButton[disabled="true"] {
+  -moz-image-region: rect(20px 79px 39px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #tableButton,
+toolbar[iconsize="small"] > toolbarpaletteitem > #tableButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
+  -moz-image-region: rect(180px 19px 199px 0);
+}
+
+toolbar[iconsize="small"] > #tableButton:hover {
+  -moz-image-region: rect(180px 39px 199px 20px);
+}
+
+toolbar[iconsize="small"] > #tableButton:hover:active {
+  -moz-image-region: rect(180px 59px 199px 40px);
+}
+
+toolbar[iconsize="small"] > #tableButton[disabled="true"] {
+  -moz-image-region: rect(180px 79px 199px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #spellingButton,
+toolbar[iconsize="small"] > toolbarpaletteitem > #spellingButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
+  -moz-image-region: rect(160px 19px 179px 0);
+}
+
+toolbar[iconsize="small"] > #spellingButton:hover {
+  -moz-image-region: rect(160px 39px 179px 20px);
+}
+
+toolbar[iconsize="small"] > #spellingButton:hover:active {
+  -moz-image-region: rect(160px 59px 179px 40px);
+}
+
+toolbar[iconsize="small"] > #spellingButton[disabled="true"] {
+  -moz-image-region: rect(160px 79px 179px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #cutButton,
+toolbar[iconsize="small"] > toolbarpaletteitem > #cutButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
+  -moz-image-region: rect(220px 19px 239px 0);
+}
+
+toolbar[iconsize="small"] > #cutButton:hover {
+  -moz-image-region: rect(220px 39px 239px 20px);
+}
+
+toolbar[iconsize="small"] > #cutButton:hover:active {
+  -moz-image-region: rect(220px 59px 239px 40px);
+}
+
+toolbar[iconsize="small"] > #cutButton[disabled="true"] {
+  -moz-image-region: rect(220px 79px 239px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #copyButton,
+toolbar[iconsize="small"] > toolbarpaletteitem > #copyButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
+  -moz-image-region: rect(240px 19px 259px 0);
+}
+
+toolbar[iconsize="small"] > #copyButton:hover {
+  -moz-image-region: rect(240px 39px 259px 20px);
+}
+
+toolbar[iconsize="small"] > #copyButton:hover:active {
+  -moz-image-region: rect(240px 59px 259px 40px);
+}
+
+toolbar[iconsize="small"] > #copyButton[disabled="true"] {
+  -moz-image-region: rect(240px 79px 259px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #pasteButton,
+toolbar[iconsize="small"] > toolbarpaletteitem > #pasteButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
+  -moz-image-region: rect(260px 19px 279px 0);
+}
+
+toolbar[iconsize="small"] > #pasteButton:hover {
+  -moz-image-region: rect(260px 39px 279px 20px);
+}
+
+toolbar[iconsize="small"] > #pasteButton:hover:active {
+  -moz-image-region: rect(260px 59px 279px 40px);
+}
+
+toolbar[iconsize="small"] > #pasteButton[disabled="true"] {
+  -moz-image-region: rect(260px 79px 279px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #findButton,
+toolbar[iconsize="small"] > toolbarpaletteitem > #findButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
+  -moz-image-region: rect(280px 19px 299px 0);
+}
+
+toolbar[iconsize="small"] > #findButton:hover {
+  -moz-image-region: rect(280px 39px 299px 20px);
+}
+
+toolbar[iconsize="small"] > #findButton:hover:active {
+  -moz-image-region: rect(280px 59px 299px 40px);
+}
+
+toolbar[iconsize="small"] > #findButton[disabled="true"] {
+  -moz-image-region: rect(280px 79px 299px 60px) !important;
+}
diff --git a/comm/suite/themes/classic/editor/icons/btn2.png b/comm/suite/themes/classic/editor/icons/btn2.png
new file mode 100644
index 0000000000..5558ecac1c
--- /dev/null
+++ b/comm/suite/themes/classic/editor/icons/btn2.png
diff --git a/comm/suite/themes/classic/editor/icons/editmode-html.png b/comm/suite/themes/classic/editor/icons/editmode-html.png
new file mode 100644
index 0000000000..4040b13078
--- /dev/null
+++ b/comm/suite/themes/classic/editor/icons/editmode-html.png
diff --git a/comm/suite/themes/classic/editor/icons/editmode-normal.png b/comm/suite/themes/classic/editor/icons/editmode-normal.png
new file mode 100644
index 0000000000..5195b5da2c
--- /dev/null
+++ b/comm/suite/themes/classic/editor/icons/editmode-normal.png
diff --git a/comm/suite/themes/classic/editor/icons/editmode-preview.png b/comm/suite/themes/classic/editor/icons/editmode-preview.png
new file mode 100644
index 0000000000..c54a61fa91
--- /dev/null
+++ b/comm/suite/themes/classic/editor/icons/editmode-preview.png
diff --git a/comm/suite/themes/classic/editor/icons/editmode-tags.png b/comm/suite/themes/classic/editor/icons/editmode-tags.png
new file mode 100644
index 0000000000..a1784dada6
--- /dev/null
+++ b/comm/suite/themes/classic/editor/icons/editmode-tags.png
diff --git a/comm/suite/themes/classic/editor/icons/editoricons-small.png b/comm/suite/themes/classic/editor/icons/editoricons-small.png
new file mode 100644
index 0000000000..dbbb99e77f
--- /dev/null
+++ b/comm/suite/themes/classic/editor/icons/editoricons-small.png
diff --git a/comm/suite/themes/classic/editor/icons/editoricons.png b/comm/suite/themes/classic/editor/icons/editoricons.png
new file mode 100644
index 0000000000..b68444f66b
--- /dev/null
+++ b/comm/suite/themes/classic/editor/icons/editoricons.png
diff --git a/comm/suite/themes/classic/editor/icons/img-align-bottom.png b/comm/suite/themes/classic/editor/icons/img-align-bottom.png
new file mode 100644
index 0000000000..aed8e15b69
--- /dev/null
+++ b/comm/suite/themes/classic/editor/icons/img-align-bottom.png
diff --git a/comm/suite/themes/classic/editor/icons/img-align-left.png b/comm/suite/themes/classic/editor/icons/img-align-left.png
new file mode 100644
index 0000000000..425cd7a238
--- /dev/null
+++ b/comm/suite/themes/classic/editor/icons/img-align-left.png
diff --git a/comm/suite/themes/classic/editor/icons/img-align-middle.png b/comm/suite/themes/classic/editor/icons/img-align-middle.png
new file mode 100644
index 0000000000..439573c44b
--- /dev/null
+++ b/comm/suite/themes/classic/editor/icons/img-align-middle.png
diff --git a/comm/suite/themes/classic/editor/icons/img-align-right.png b/comm/suite/themes/classic/editor/icons/img-align-right.png
new file mode 100644
index 0000000000..3e41c9a1da
--- /dev/null
+++ b/comm/suite/themes/classic/editor/icons/img-align-right.png
diff --git a/comm/suite/themes/classic/editor/icons/img-align-top.png b/comm/suite/themes/classic/editor/icons/img-align-top.png
new file mode 100644
index 0000000000..1a248a99d1
--- /dev/null
+++ b/comm/suite/themes/classic/editor/icons/img-align-top.png
diff --git a/comm/suite/themes/classic/editor/icons/multicolor.png b/comm/suite/themes/classic/editor/icons/multicolor.png
new file mode 100644
index 0000000000..ea20f50c5a
--- /dev/null
+++ b/comm/suite/themes/classic/editor/icons/multicolor.png
diff --git a/comm/suite/themes/classic/editor/icons/progress-busy.png b/comm/suite/themes/classic/editor/icons/progress-busy.png
new file mode 100644
index 0000000000..260775bdda
--- /dev/null
+++ b/comm/suite/themes/classic/editor/icons/progress-busy.png
diff --git a/comm/suite/themes/classic/editor/icons/progress-done.png b/comm/suite/themes/classic/editor/icons/progress-done.png
new file mode 100644
index 0000000000..ae07a3cb99
--- /dev/null
+++ b/comm/suite/themes/classic/editor/icons/progress-done.png
diff --git a/comm/suite/themes/classic/editor/icons/progress-failed.png b/comm/suite/themes/classic/editor/icons/progress-failed.png
new file mode 100644
index 0000000000..e6c54b08d0
--- /dev/null
+++ b/comm/suite/themes/classic/editor/icons/progress-failed.png
diff --git a/comm/suite/themes/classic/icon.png b/comm/suite/themes/classic/icon.png
new file mode 100644
index 0000000000..ac0a948e62
--- /dev/null
+++ b/comm/suite/themes/classic/icon.png
diff --git a/comm/suite/themes/classic/install.rdf b/comm/suite/themes/classic/install.rdf
new file mode 100644
index 0000000000..58d0ecca1e
--- /dev/null
+++ b/comm/suite/themes/classic/install.rdf
@@ -0,0 +1,48 @@
+<?xml version="1.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/. -->
+
+
+#filter substitution
+
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+
+  <Description about="urn:mozilla:install-manifest">
+    <em:id>{972ce4c6-7e08-4474-a285-3208198ce6fd}</em:id>
+    <em:version>@SEAMONKEY_VERSION@</em:version>
+    <em:type>4</em:type>
+
+    <!-- Target Application this theme can install into,
+        with minimum and maximum supported versions. -->
+    <em:targetApplication>
+      <Description>
+        <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
+        <em:minVersion>@SEAMONKEY_VERSION@</em:minVersion>
+        <em:maxVersion>@SEAMONKEY_VERSION@</em:maxVersion>
+      </Description>
+    </em:targetApplication>
+
+    <!-- Front End MetaData -->
+    <em:name>SeaMonkey Default Theme</em:name>
+    <em:description>This theme uses styles and colors from the system to fit in with other applications.</em:description>
+
+    <!-- EXTENSION AUTHORS!
+         DO NOT COPY THIS PROPERTY INTO YOUR INSTALL RDF FILES
+         It will cause users not to be informed of incompatibilities
+         with your extension when they are updated with Software Update
+         and your extension will become unavailable to them!
+         -->
+    <em:appManaged>true</em:appManaged>
+
+    <em:locked>true</em:locked>
+
+    <!-- Front End Integration Hooks (used by Theme Manager)-->
+    <em:creator>Mozilla Contributors</em:creator>
+    <em:contributor>Mozilla Contributors</em:contributor>
+
+    <em:internalName>classic/1.0</em:internalName>
+  </Description>
+
+</RDF>
diff --git a/comm/suite/themes/classic/jar.mn b/comm/suite/themes/classic/jar.mn
new file mode 100644
index 0000000000..f9c3902ec3
--- /dev/null
+++ b/comm/suite/themes/classic/jar.mn
@@ -0,0 +1,520 @@
+# 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 communicator classic/1.0 %skin/classic/communicator/
+% skin editor classic/1.0 %skin/classic/editor/
+% skin messenger classic/1.0 %skin/classic/messenger/
+% skin navigator classic/1.0 %skin/classic/navigator/
+% skin messenger-newsblog classic/1.0 %skin/classic/messenger-newsblog/
+% style chrome://communicator/content/customizeToolbar.xul chrome://navigator/skin/navigator.css
+% style chrome://communicator/content/customizeToolbar.xul chrome://messenger/skin/primaryToolbar.css
+% style chrome://communicator/content/customizeToolbar.xul chrome://messenger/skin/messengercompose/messengercompose.css
+% style chrome://communicator/content/customizeToolbar.xul chrome://messenger/skin/smime/msgCompSMIMEOverlay.css
+% style chrome://communicator/content/customizeToolbar.xul chrome://messenger/skin/addressbook/addressbook.css
+% style chrome://communicator/content/customizeToolbar.xul chrome://editor/skin/editorPrimaryToolbar.css
+% style chrome://communicator/content/customizeToolbar.xul chrome://editor/skin/editorFormatToolbar.css
+#ifdef XP_MACOSX
+  skin/classic/communicator/aboutPrivateBrowsing.css                    (mac/communicator/aboutPrivateBrowsing.css)
+  skin/classic/communicator/aboutSessionRestore.css                     (mac/communicator/aboutSessionRestore.css)
+  skin/classic/communicator/button.css                                  (mac/communicator/button.css)
+  skin/classic/communicator/communicator.css                            (mac/communicator/communicator.css)
+  skin/classic/communicator/customizeToolbar.css                        (mac/communicator/customizeToolbar.css)
+  skin/classic/communicator/config.css                                  (mac/communicator/config.css)
+  skin/classic/communicator/datetimepicker.css                          (mac/communicator/datetimepicker.css)
+  skin/classic/communicator/numberbox.css                               (mac/communicator/numberbox.css)
+  skin/classic/communicator/preferences.css                             (mac/communicator/preferences.css)
+  skin/classic/communicator/spinbuttons.css                             (mac/communicator/spinbuttons.css)
+  skin/classic/communicator/toolbar.css                                 (mac/communicator/toolbar.css)
+  skin/classic/communicator/viewSourceOverlay.css                       (mac/communicator/viewSourceOverlay.css)
+  skin/classic/communicator/console/console-error-caret.png             (mac/communicator/console/console-error-caret.png)
+  skin/classic/communicator/console/console-error-dash.png              (mac/communicator/console/console-error-dash.png)
+  skin/classic/communicator/console/console.css                         (mac/communicator/console/console.css)
+  skin/classic/communicator/downloads/downloadButtons.png               (mac/communicator/downloads/downloadButtons.png)
+  skin/classic/communicator/downloads/progressBg.png                    (mac/communicator/downloads/progressBg.png)
+  skin/classic/communicator/downloads/downloadmanager.css               (mac/communicator/downloads/downloadmanager.css)
+  skin/classic/communicator/helpviewer/dropmark-nav.png                 (mac/communicator/helpviewer/dropmark-nav.png)
+  skin/classic/communicator/helpviewer/help.css                         (mac/communicator/helpviewer/help.css)
+  skin/classic/communicator/places/bookmarks.css                        (mac/communicator/places/bookmarks.css)
+  skin/classic/communicator/places/bookmarksMenu.png                    (mac/communicator/places/bookmarksMenu.png)
+  skin/classic/communicator/places/bookmarksToolbar.css                 (mac/communicator/places/bookmarksToolbar.css)
+  skin/classic/communicator/places/bookmarksToolbar.png                 (mac/communicator/places/bookmarksToolbar.png)
+  skin/classic/communicator/places/editBookmarkOverlay.css              (mac/communicator/places/editBookmarkOverlay.css)
+  skin/classic/communicator/places/filters.svg                          (mac/communicator/places/filters.svg)
+  skin/classic/communicator/places/livemark-folder.png                  (mac/communicator/places/livemark-folder.png)
+  skin/classic/communicator/places/organizer.css                        (mac/communicator/places/organizer.css)
+  skin/classic/communicator/places/query.png                            (mac/communicator/places/query.png)
+  skin/classic/communicator/places/tag.png                              (mac/communicator/places/tag.png)
+  skin/classic/communicator/places/toolbarDropMarker.png                (mac/communicator/places/toolbarDropMarker.png)
+  skin/classic/communicator/profile/profile.css                         (mac/communicator/profile/profile.css)
+  skin/classic/communicator/sanitizeDialog.css                          (mac/communicator/sanitizeDialog.css)
+  skin/classic/communicator/search/searchbar.css                        (mac/communicator/search/searchbar.css)
+  skin/classic/communicator/search/searchbar-dropmarker.png             (mac/communicator/search/searchbar-dropmarker.png)
+  skin/classic/communicator/search/searchbar-search.png                 (mac/communicator/search/searchbar-search.png)
+  skin/classic/communicator/sidebar/sidebar.css                         (mac/communicator/sidebar/sidebar.css)
+  skin/classic/communicator/icons/autocomplete-dropmarker.png           (mac/communicator/icons/autocomplete-dropmarker.png)
+  skin/classic/communicator/icons/communicatoricons.png                 (mac/communicator/icons/communicatoricons.png)
+  skin/classic/communicator/icons/communicatoricons-small.png           (mac/communicator/icons/communicatoricons-small.png)
+  skin/classic/communicator/icons/feedIcon16-disabled.png               (mac/communicator/icons/feedIcon16-disabled.png)
+  skin/classic/communicator/icons/geolocation-16.png                    (mac/communicator/icons/geolocation-16.png)
+  skin/classic/communicator/icons/geolocation-64.png                    (mac/communicator/icons/geolocation-64.png)
+  skin/classic/communicator/icons/item.png                              (mac/communicator/icons/item.png)
+  skin/classic/communicator/icons/key-16.png                            (mac/communicator/icons/key-16.png)
+  skin/classic/communicator/icons/key-64.png                            (mac/communicator/icons/key-64.png)
+  skin/classic/communicator/icons/loading.png                           (mac/communicator/icons/loading.png)
+  skin/classic/communicator/icons/panebutton-active.png                 (mac/communicator/icons/panebutton-active.png)
+  skin/classic/communicator/icons/panebutton-inactive.png               (mac/communicator/icons/panebutton-inactive.png)
+  skin/classic/communicator/icons/warning-24.png                        (mac/communicator/icons/warning-24.png)
+  skin/classic/communicator/toolbar/toolbar-gradient22.png              (mac/communicator/toolbar/toolbar-gradient22.png)
+  skin/classic/communicator/toolbar/toolbar-gradient34.png              (mac/communicator/toolbar/toolbar-gradient34.png)
+#else
+  skin/classic/communicator/aboutPrivateBrowsing.css                    (communicator/aboutPrivateBrowsing.css)
+  skin/classic/communicator/aboutSessionRestore.css                     (communicator/aboutSessionRestore.css)
+  skin/classic/communicator/button.css                                  (communicator/button.css)
+  skin/classic/communicator/config.css                                  (communicator/config.css)
+  skin/classic/communicator/customizeToolbar.css                        (communicator/customizeToolbar.css)
+  skin/classic/communicator/datetimepicker.css                          (communicator/datetimepicker.css)
+#ifdef MOZ_WIDGET_GTK
+  skin/classic/communicator/communicator.css                            (linux/communicator/communicator.css)
+  skin/classic/communicator/numberbox.css                               (linux/communicator/numberbox.css)
+  skin/classic/communicator/preferences.css                             (linux/communicator/preferences.css)
+  skin/classic/communicator/spinbuttons.css                             (linux/communicator/spinbuttons.css)
+#else
+  skin/classic/communicator/communicator.css                            (communicator/communicator.css)
+  skin/classic/communicator/numberbox.css                               (communicator/numberbox.css)
+  skin/classic/communicator/preferences.css                             (communicator/preferences.css)
+  skin/classic/communicator/spinbuttons.css                             (communicator/spinbuttons.css)
+#endif
+  skin/classic/communicator/toolbar.css                                 (communicator/toolbar.css)
+  skin/classic/communicator/viewSourceOverlay.css                       (communicator/viewSourceOverlay.css)
+  skin/classic/communicator/console/console.css                         (communicator/console/console.css)
+  skin/classic/communicator/console/console-error-caret.png             (communicator/console/console-error-caret.png)
+  skin/classic/communicator/console/console-error-dash.png              (communicator/console/console-error-dash.png)
+  skin/classic/communicator/console/console-toolbar.png                 (communicator/console/console-toolbar.png)
+  skin/classic/communicator/console/itemSelected.png                    (communicator/console/itemSelected.png)
+  skin/classic/communicator/downloads/downloadButtons.png               (communicator/downloads/downloadButtons.png)
+  skin/classic/communicator/downloads/downloadmanager.css               (communicator/downloads/downloadmanager.css)
+  skin/classic/communicator/helpviewer/Toolbar-rtl.png                  (communicator/helpviewer/Toolbar-rtl.png)
+  skin/classic/communicator/helpviewer/help.css                         (communicator/helpviewer/help.css)
+  skin/classic/communicator/places/bookmark-folder-closed.png           (communicator/places/bookmark-folder-closed.png)
+  skin/classic/communicator/places/bookmark-folder-dis.png              (communicator/places/bookmark-folder-dis.png)
+  skin/classic/communicator/places/bookmark-folder-open.png             (communicator/places/bookmark-folder-open.png)
+  skin/classic/communicator/places/bookmarks.css                        (communicator/places/bookmarks.css)
+  skin/classic/communicator/places/bookmarksMenu.png                    (communicator/places/bookmarksMenu.png)
+  skin/classic/communicator/places/bookmarksToolbar.css                 (communicator/places/bookmarksToolbar.css)
+  skin/classic/communicator/places/bookmarksToolbar.png                 (communicator/places/bookmarksToolbar.png)
+  skin/classic/communicator/places/editBookmarkOverlay.css              (communicator/places/editBookmarkOverlay.css)
+  skin/classic/communicator/places/livemark-folder.png                  (communicator/places/livemark-folder.png)
+  skin/classic/communicator/places/organizer.css                        (communicator/places/organizer.css)
+  skin/classic/communicator/places/query.png                            (communicator/places/query.png)
+  skin/classic/communicator/places/tag.png                              (communicator/places/tag.png)
+  skin/classic/communicator/places/toolbarDropMarker.png                (communicator/places/toolbarDropMarker.png)
+  skin/classic/communicator/profile/profile.css                         (communicator/profile/profile.css)
+#ifdef MOZ_WIDGET_GTK
+  skin/classic/communicator/sanitizeDialog.css                          (linux/communicator/sanitizeDialog.css)
+#else
+  skin/classic/communicator/sanitizeDialog.css                          (windows/communicator/sanitizeDialog.css)
+#endif
+  skin/classic/communicator/search/mainwindow-dropdown-arrow.png        (communicator/search/mainwindow-dropdown-arrow.png)
+  skin/classic/communicator/search/search-glass.png                     (communicator/search/search-glass.png)
+  skin/classic/communicator/search/searchbar.css                        (communicator/search/searchbar.css)
+  skin/classic/communicator/sidebar/sidebar.css                         (communicator/sidebar/sidebar.css)
+  skin/classic/communicator/icons/communicatoricons.png                 (communicator/icons/communicatoricons.png)
+  skin/classic/communicator/icons/communicatoricons-small.png           (communicator/icons/communicatoricons-small.png)
+  skin/classic/communicator/icons/geolocation-16.png                    (communicator/icons/geolocation-16.png)
+  skin/classic/communicator/icons/geolocation-64.png                    (communicator/icons/geolocation-64.png)
+  skin/classic/communicator/icons/information-48.png                    (communicator/icons/information-48.png)
+  skin/classic/communicator/icons/key-16.png                            (communicator/icons/key-16.png)
+  skin/classic/communicator/icons/key-64.png                            (communicator/icons/key-64.png)
+  skin/classic/communicator/icons/loading.png                           (communicator/icons/loading.png)
+  skin/classic/communicator/icons/question-48.png                       (communicator/icons/question-48.png)
+  skin/classic/communicator/icons/warning-24.png                        (communicator/icons/warning-24.png)
+#endif
+  skin/classic/communicator/icons/notification-icons.svg                (communicator/icons/notification-icons.svg)
+  skin/classic/communicator/about.css                                   (communicator/about.css)
+  skin/classic/communicator/aboutSupport.css                            (communicator/aboutSupport.css)
+  skin/classic/communicator/brand.css                                   (communicator/brand.css)
+  skin/classic/communicator/blockedSite.css                             (communicator/blockedSite.css)
+  skin/classic/communicator/certError.css                               (communicator/certError.css)
+  skin/classic/communicator/common.css                                  (communicator/common.css)
+  skin/classic/communicator/dialogs.css                                 (communicator/dialogs.css)
+  skin/classic/communicator/communicatorBindings.xml                    (communicator/communicatorBindings.xml)
+  skin/classic/communicator/prefpanels.css                              (communicator/prefpanels.css)
+  skin/classic/communicator/smileys.css                                 (communicator/smileys.css)
+  skin/classic/communicator/tasksOverlay.css                            (communicator/tasksOverlay.css)
+  skin/classic/communicator/brand/throbber-anim.png                     (communicator/brand/throbber-anim.png)
+  skin/classic/communicator/brand/throbber-single.png                   (communicator/brand/throbber-single.png)
+  skin/classic/communicator/brand/throbber16-anim.png                   (communicator/brand/throbber16-anim.png)
+  skin/classic/communicator/brand/throbber16-single.png                 (communicator/brand/throbber16-single.png)
+  skin/classic/communicator/dataman/dataman.css                         (communicator/dataman/dataman.css)
+  skin/classic/communicator/dataman/datamanIcon-16.png                  (communicator/dataman/datamanIcon-16.png)
+#ifdef MOZ_WIDGET_GTK
+  skin/classic/communicator/feed-subscribe.css                          (linux/communicator/feed-subscribe.css)
+#else
+  skin/classic/communicator/feed-subscribe.css                          (communicator/feed-subscribe.css)
+#endif
+  skin/classic/communicator/feed-subscribe-ui.css                       (communicator/feed-subscribe-ui.css)
+  skin/classic/communicator/fullscreen-video.css                        (communicator/fullscreen-video.css)
+  skin/classic/communicator/downloads/dl-remove.png                     (communicator/downloads/dl-remove.png)
+  skin/classic/communicator/places/allBookmarks.png                     (communicator/places/allBookmarks.png)
+  skin/classic/communicator/places/bookmark.png                         (communicator/places/bookmark.png)
+  skin/classic/communicator/places/bookmark-item-dis.png                (communicator/places/bookmark-item-dis.png)
+  skin/classic/communicator/places/bookmark-item-updated.png            (communicator/places/bookmark-item-updated.png)
+  skin/classic/communicator/places/bookmark-item.svg                    (communicator/places/bookmark-item.svg)
+  skin/classic/communicator/places/calendar.png                         (communicator/places/calendar.png)
+  skin/classic/communicator/places/history.png                          (communicator/places/history.png)
+  skin/classic/communicator/places/unsortedBookmarks.png                (communicator/places/unsortedBookmarks.png)
+  skin/classic/communicator/profile/migrate.png                         (communicator/profile/migrate.png)
+  skin/classic/communicator/profile/profileManager.css                  (communicator/profile/profileManager.css)
+  skin/classic/communicator/profile/profileicon-large.png               (communicator/profile/profileicon-large.png)
+  skin/classic/communicator/search/engineManager.css                    (communicator/search/engineManager.css)
+  skin/classic/communicator/search/search.css                           (communicator/search/search.css)
+  skin/classic/communicator/sidebar/sbtab-twisty.png                    (communicator/sidebar/sbtab-twisty.png)
+  skin/classic/communicator/sidebar/sbtab-twisty-open.png               (communicator/sidebar/sbtab-twisty-open.png)
+  skin/classic/communicator/sidebar/customize.css                       (communicator/sidebar/customize.css)
+  skin/classic/communicator/sidebar/preview.css                         (communicator/sidebar/preview.css)
+  skin/classic/communicator/sidebar/sidebarBindings.xml                 (communicator/sidebar/sidebarBindings.xml)
+  skin/classic/communicator/sidebar/sidebarListView.css                 (communicator/sidebar/sidebarListView.css)
+  skin/classic/communicator/xpinstall/xpinstall.css                     (communicator/xpinstall/xpinstall.css)
+  skin/classic/communicator/icons/audioFeedIcon.png                     (communicator/icons/feedIcon.png)
+  skin/classic/communicator/icons/closeFullScreenVideo.png              (communicator/icons/closeFullScreenVideo.png)
+  skin/classic/communicator/icons/close-button.png                      (communicator/icons/close-button.png)
+  skin/classic/communicator/icons/offline.png                           (communicator/icons/offline.png)
+  skin/classic/communicator/icons/online.png                            (communicator/icons/online.png)
+  skin/classic/communicator/icons/search.png                            (communicator/icons/search.png)
+  skin/classic/communicator/icons/identity.png                          (communicator/icons/identity.png)
+  skin/classic/communicator/icons/lock-broken.png                       (communicator/icons/lock-broken.png)
+  skin/classic/communicator/icons/lock-broken-16.png                    (communicator/icons/lock-broken-16.png)
+  skin/classic/communicator/icons/lock-insecure.png                     (communicator/icons/lock-insecure.png)
+  skin/classic/communicator/icons/lock-insecure-16.png                  (communicator/icons/lock-insecure-16.png)
+  skin/classic/communicator/icons/lock-secure.png                       (communicator/icons/lock-secure.png)
+  skin/classic/communicator/icons/lock-secure-16.png                    (communicator/icons/lock-secure-16.png)
+  skin/classic/communicator/icons/alwaysAsk.png                         (communicator/icons/alwaysAsk.png)
+  skin/classic/communicator/icons/application.png                       (communicator/icons/application.png)
+  skin/classic/communicator/icons/feedIcon.png                          (communicator/icons/feedIcon.png)
+  skin/classic/communicator/icons/feedIcon16.png                        (communicator/icons/feedIcon16.png)
+  skin/classic/communicator/icons/notification-16.png                   (communicator/icons/notification-16.png)
+  skin/classic/communicator/icons/notification-64.png                   (communicator/icons/notification-64.png)
+  skin/classic/communicator/icons/geo.png                               (communicator/icons/geo.png)
+  skin/classic/communicator/icons/save.png                              (communicator/icons/save.png)
+  skin/classic/communicator/icons/smileys/smiley-smile.png              (communicator/icons/smileys/smiley-smile.png)
+  skin/classic/communicator/icons/smileys/smiley-frown.png              (communicator/icons/smileys/smiley-frown.png)
+  skin/classic/communicator/icons/smileys/smiley-wink.png               (communicator/icons/smileys/smiley-wink.png)
+  skin/classic/communicator/icons/smileys/smiley-tongue.png             (communicator/icons/smileys/smiley-tongue.png)
+  skin/classic/communicator/icons/smileys/smiley-laughing.png           (communicator/icons/smileys/smiley-laughing.png)
+  skin/classic/communicator/icons/smileys/smiley-embarrassed.png        (communicator/icons/smileys/smiley-embarrassed.png)
+  skin/classic/communicator/icons/smileys/smiley-undecided.png          (communicator/icons/smileys/smiley-undecided.png)
+  skin/classic/communicator/icons/smileys/smiley-surprise.png           (communicator/icons/smileys/smiley-surprise.png)
+  skin/classic/communicator/icons/smileys/smiley-kiss.png               (communicator/icons/smileys/smiley-kiss.png)
+  skin/classic/communicator/icons/smileys/smiley-yell.png               (communicator/icons/smileys/smiley-yell.png)
+  skin/classic/communicator/icons/smileys/smiley-cool.png               (communicator/icons/smileys/smiley-cool.png)
+  skin/classic/communicator/icons/smileys/smiley-money.png              (communicator/icons/smileys/smiley-money.png)
+  skin/classic/communicator/icons/smileys/smiley-foot.png               (communicator/icons/smileys/smiley-foot.png)
+  skin/classic/communicator/icons/smileys/smiley-innocent.png           (communicator/icons/smileys/smiley-innocent.png)
+  skin/classic/communicator/icons/smileys/smiley-cry.png                (communicator/icons/smileys/smiley-cry.png)
+  skin/classic/communicator/icons/smileys/smiley-sealed.png             (communicator/icons/smileys/smiley-sealed.png)
+  skin/classic/communicator/icons/videoFeedIcon.png                     (communicator/icons/feedIcon.png)
+  skin/classic/communicator/taskbar/taskbar.png                         (communicator/taskbar/taskbar.png)
+  skin/classic/communicator/taskbar/taskmenu-browser.png                (communicator/taskbar/taskmenu-browser.png)
+  skin/classic/communicator/taskbar/taskmenu-composer.png               (communicator/taskbar/taskmenu-composer.png)
+  skin/classic/communicator/taskbar/taskmenu-mailnews.png               (communicator/taskbar/taskmenu-mailnews.png)
+  skin/classic/communicator/taskbar/taskmenu-abook.png                  (communicator/taskbar/taskmenu-abook.png)
+  skin/classic/communicator/toolbar/tbgrip-arrow.png                    (communicator/toolbar/tbgrip-arrow.png)
+  skin/classic/communicator/toolbar/tbgrip-arrow-clps.png               (communicator/toolbar/tbgrip-arrow-clps.png)
+  skin/classic/communicator/toolbar/tbgrip-texture.png                  (communicator/toolbar/tbgrip-texture.png)
+#ifdef XP_MACOSX
+  skin/classic/editor/editor.css                                        (mac/editor/editor.css)
+  skin/classic/editor/editorModeToolbar.css                             (mac/editor/editorModeToolbar.css)
+  skin/classic/editor/editorPrimaryToolbar.css                          (mac/editor/editorPrimaryToolbar.css)
+  skin/classic/editor/editorFormatToolbar.css                           (mac/editor/editorFormatToolbar.css)
+  skin/classic/editor/icons/editoricons.png                             (mac/editor/icons/editoricons.png)
+  skin/classic/editor/icons/editoricons-small.png                       (mac/editor/icons/editoricons-small.png)
+#else
+  skin/classic/editor/editor.css                                        (editor/editor.css)
+  skin/classic/editor/editorModeToolbar.css                             (editor/editorModeToolbar.css)
+  skin/classic/editor/editorPrimaryToolbar.css                          (editor/editorPrimaryToolbar.css)
+  skin/classic/editor/editorFormatToolbar.css                           (editor/editorFormatToolbar.css)
+  skin/classic/editor/icons/editoricons.png                             (editor/icons/editoricons.png)
+  skin/classic/editor/icons/editoricons-small.png                       (editor/icons/editoricons-small.png)
+#endif
+  skin/classic/editor/EditorDialog.css                                  (editor/EditorDialog.css)
+  skin/classic/editor/icons/editmode-html.png                           (editor/icons/editmode-html.png)
+  skin/classic/editor/icons/editmode-normal.png                         (editor/icons/editmode-normal.png)
+  skin/classic/editor/icons/editmode-preview.png                        (editor/icons/editmode-preview.png)
+  skin/classic/editor/icons/editmode-tags.png                           (editor/icons/editmode-tags.png)
+  skin/classic/editor/icons/img-align-bottom.png                        (editor/icons/img-align-bottom.png)
+  skin/classic/editor/icons/img-align-left.png                          (editor/icons/img-align-left.png)
+  skin/classic/editor/icons/img-align-middle.png                        (editor/icons/img-align-middle.png)
+  skin/classic/editor/icons/img-align-right.png                         (editor/icons/img-align-right.png)
+  skin/classic/editor/icons/img-align-top.png                           (editor/icons/img-align-top.png)
+  skin/classic/editor/icons/btn2.png                                    (editor/icons/btn2.png)
+  skin/classic/editor/icons/multicolor.png                              (editor/icons/multicolor.png)
+  skin/classic/editor/icons/progress-busy.png                           (editor/icons/progress-busy.png)
+  skin/classic/editor/icons/progress-done.png                           (editor/icons/progress-done.png)
+  skin/classic/editor/icons/progress-failed.png                         (editor/icons/progress-failed.png)
+#ifdef XP_MACOSX
+  skin/classic/messenger/accountManage.css                              (mac/messenger/accountManage.css)
+  skin/classic/messenger/browserRequest.css                             (mac/messenger/browserRequest.css)
+  skin/classic/messenger/filterDialog.css                               (mac/messenger/filterDialog.css)
+  skin/classic/messenger/mailWindow1.css                                (mac/messenger/mailWindow1.css)
+  skin/classic/messenger/messageHeader.css                              (mac/messenger/messageHeader.css)
+  skin/classic/messenger/messageQuotes.css                              (mac/messenger/messageQuotes.css)
+  skin/classic/messenger/primaryToolbar.css                             (mac/messenger/primaryToolbar.css)
+  skin/classic/messenger/searchDialog.css                               (mac/messenger/searchDialog.css)
+  skin/classic/messenger/icons/messengericons.png                       (mac/messenger/icons/messengericons.png)
+  skin/classic/messenger/icons/messengericons-small.png                 (mac/messenger/icons/messengericons-small.png)
+  skin/classic/messenger/icons/spin-buttons.png                         (mac/messenger/icons/spin-buttons.png)
+  skin/classic/messenger/icons/spin-buttons-active.png                  (mac/messenger/icons/spin-buttons-active.png)
+  skin/classic/messenger/icons/tab-arrow-left.png                       (mac/messenger/icons/tab-arrow-left.png)
+  skin/classic/messenger/icons/tab-arrow-right.png                      (mac/messenger/icons/tab-arrow-right.png)
+  skin/classic/messenger/icons/twisty-clsd.png                          (mac/messenger/icons/twisty-clsd.png)
+  skin/classic/messenger/icons/twisty-open.png                          (mac/messenger/icons/twisty-open.png)
+  skin/classic/messenger/addressbook/addressbook.css                    (mac/messenger/addressbook/addressbook.css)
+  skin/classic/messenger/addressbook/icons/addressbookicons.png         (mac/messenger/addressbook/icons/addressbookicons.png)
+  skin/classic/messenger/addressbook/icons/addressbookicons-small.png   (mac/messenger/addressbook/icons/addressbookicons-small.png)
+  skin/classic/messenger/messengercompose/messengercompose.css          (mac/messenger/messengercompose/messengercompose.css)
+  skin/classic/messenger/smime/msgCompSMIMEOverlay.css                  (mac/messenger/smime/msgCompSMIMEOverlay.css)
+  skin/classic/messenger/smime/icons/smimeicons.png                     (mac/messenger/smime/icons/smimeicons.png)
+  skin/classic/messenger/smime/icons/smimeicons-small.png               (mac/messenger/smime/icons/smimeicons-small.png)
+#else
+  skin/classic/messenger/accountManage.css                              (messenger/accountManage.css)
+  skin/classic/messenger/browserRequest.css                             (messenger/browserRequest.css)
+  skin/classic/messenger/filterDialog.css                               (messenger/filterDialog.css)
+  skin/classic/messenger/mailWindow1.css                                (messenger/mailWindow1.css)
+  skin/classic/messenger/messageHeader.css                              (messenger/messageHeader.css)
+  skin/classic/messenger/messageQuotes.css                              (messenger/messageQuotes.css)
+  skin/classic/messenger/primaryToolbar.css                             (messenger/primaryToolbar.css)
+  skin/classic/messenger/searchDialog.css                               (messenger/searchDialog.css)
+  skin/classic/messenger/icons/messengericons.png                       (messenger/icons/messengericons.png)
+  skin/classic/messenger/icons/messengericons-small.png                 (messenger/icons/messengericons-small.png)
+  skin/classic/messenger/icons/twisty-clsd.png                          (messenger/icons/twisty-clsd.png)
+  skin/classic/messenger/icons/twisty-open.png                          (messenger/icons/twisty-open.png)
+  skin/classic/messenger/addressbook/addressbook.css                    (messenger/addressbook/addressbook.css)
+  skin/classic/messenger/addressbook/icons/addressbookicons.png         (messenger/addressbook/icons/addressbookicons.png)
+  skin/classic/messenger/addressbook/icons/addressbookicons-small.png   (messenger/addressbook/icons/addressbookicons-small.png)
+  skin/classic/messenger/messengercompose/messengercompose.css          (messenger/messengercompose/messengercompose.css)
+  skin/classic/messenger/smime/msgCompSMIMEOverlay.css                  (messenger/smime/msgCompSMIMEOverlay.css)
+  skin/classic/messenger/smime/icons/smimeicons.png                     (messenger/smime/icons/smimeicons.png)
+  skin/classic/messenger/smime/icons/smimeicons-small.png               (messenger/smime/icons/smimeicons-small.png)
+#endif
+  skin/classic/messenger/dialogs.css                                    (messenger/dialogs.css)
+  skin/classic/messenger/accountWizard.css                              (messenger/accountWizard.css)
+  skin/classic/messenger/folderMenus.css                                (messenger/folderMenus.css)
+  skin/classic/messenger/folderPane.css                                 (messenger/folderPane.css)
+  skin/classic/messenger/accountCentral.css                             (messenger/accountCentral.css)
+  skin/classic/messenger/addressingWidget.css                           (messenger/addressingWidget.css)
+  skin/classic/messenger/messageWindow.css                              (messenger/messageWindow.css)
+  skin/classic/messenger/messenger.css                                  (messenger/messenger.css)
+  skin/classic/messenger/newmailalert.css                               (messenger/newmailalert.css)
+  skin/classic/messenger/prefPanels.css                                 (messenger/prefPanels.css)
+  skin/classic/messenger/subscribe.css                                  (messenger/subscribe.css)
+  skin/classic/messenger/threadPane.css                                 (messenger/threadPane.css)
+  skin/classic/messenger/threadPaneLabels.css                           (messenger/threadPaneLabels.css)
+  skin/classic/messenger/messageBody.css                                (messenger/messageBody.css)
+  skin/classic/messenger/start.css                                      (messenger/start.css)
+  skin/classic/messenger/msgSelectOffline.css                           (messenger/msgSelectOffline.css)
+  skin/classic/messenger/icons/acct-compose.png                         (messenger/icons/acct-compose.png)
+  skin/classic/messenger/icons/acct-filters.png                         (messenger/icons/acct-filters.png)
+  skin/classic/messenger/icons/acct-newaccount.png                      (messenger/icons/acct-newaccount.png)
+  skin/classic/messenger/icons/acct-prefs.png                           (messenger/icons/acct-prefs.png)
+  skin/classic/messenger/icons/acct-read.png                            (messenger/icons/acct-read.png)
+  skin/classic/messenger/icons/acct-search.png                          (messenger/icons/acct-search.png)
+  skin/classic/messenger/icons/acct-subscribe.png                       (messenger/icons/acct-subscribe.png)
+  skin/classic/messenger/icons/attachment-col.png                       (messenger/icons/attachment-col.png)
+  skin/classic/messenger/icons/attachment.png                           (messenger/icons/attachment.png)
+  skin/classic/messenger/icons/attachment-selected.png                  (messenger/icons/attachment-selected.png)
+  skin/classic/messenger/icons/attach.png                               (messenger/icons/attach.png)
+  skin/classic/messenger/icons/check.png                                (messenger/icons/check.png)
+  skin/classic/messenger/icons/dot.png                                  (messenger/icons/dot.png)
+  skin/classic/messenger/icons/flagcol.png                              (messenger/icons/flagcol.png)
+  skin/classic/messenger/icons/folder-closed.png                        (messenger/icons/folder-closed.png)
+  skin/classic/messenger/icons/folder-draft-open.png                    (messenger/icons/folder-draft-open.png)
+  skin/classic/messenger/icons/folder-draft.png                         (messenger/icons/folder-draft.png)
+  skin/classic/messenger/icons/folder-draft-share-open.png              (messenger/icons/folder-draft-share-open.png)
+  skin/classic/messenger/icons/folder-draft-share.png                   (messenger/icons/folder-draft-share.png)
+  skin/classic/messenger/icons/folder-inbox-new.png                     (messenger/icons/folder-inbox-new.png)
+  skin/classic/messenger/icons/folder-inbox-open.png                    (messenger/icons/folder-inbox-open.png)
+  skin/classic/messenger/icons/folder-inbox.png                         (messenger/icons/folder-inbox.png)
+  skin/classic/messenger/icons/folder-inbox-share-open.png              (messenger/icons/folder-inbox-share-open.png)
+  skin/classic/messenger/icons/folder-inbox-share.png                   (messenger/icons/folder-inbox-share.png)
+  skin/classic/messenger/icons/folder-junk-open.png                     (messenger/icons/folder-junk-open.png)
+  skin/classic/messenger/icons/folder-junk.png                          (messenger/icons/folder-junk.png)
+  skin/classic/messenger/icons/folder-new-open.png                      (messenger/icons/folder-new-open.png)
+  skin/classic/messenger/icons/folder-new.png                           (messenger/icons/folder-new.png)
+  skin/classic/messenger/icons/folder-newsgroup-new.png                 (messenger/icons/folder-newsgroup-new.png)
+  skin/classic/messenger/icons/folder-newsgroup.png                     (messenger/icons/folder-newsgroup.png)
+  skin/classic/messenger/icons/folder-open.png                          (messenger/icons/folder-open.png)
+  skin/classic/messenger/icons/folder-outbox-open.png                   (messenger/icons/folder-outbox-open.png)
+  skin/classic/messenger/icons/folder-outbox.png                        (messenger/icons/folder-outbox.png)
+  skin/classic/messenger/icons/folder-search.png                        (messenger/icons/folder-search.png)
+  skin/classic/messenger/icons/folder-sent-open.png                     (messenger/icons/folder-sent-open.png)
+  skin/classic/messenger/icons/folder-sent.png                          (messenger/icons/folder-sent.png)
+  skin/classic/messenger/icons/folder-sent-share-open.png               (messenger/icons/folder-sent-share-open.png)
+  skin/classic/messenger/icons/folder-sent-share.png                    (messenger/icons/folder-sent-share.png)
+  skin/classic/messenger/icons/folder-share-open.png                    (messenger/icons/folder-share-open.png)
+  skin/classic/messenger/icons/folder-share.png                         (messenger/icons/folder-share.png)
+  skin/classic/messenger/icons/folder-template-open.png                 (messenger/icons/folder-template-open.png)
+  skin/classic/messenger/icons/folder-template.png                      (messenger/icons/folder-template.png)
+  skin/classic/messenger/icons/folder-template-share-open.png           (messenger/icons/folder-template-share-open.png)
+  skin/classic/messenger/icons/folder-template-share.png                (messenger/icons/folder-template-share.png)
+  skin/classic/messenger/icons/folder-trash-open.png                    (messenger/icons/folder-trash-open.png)
+  skin/classic/messenger/icons/folder-trash.png                         (messenger/icons/folder-trash.png)
+  skin/classic/messenger/icons/folder-trash-share-open.png              (messenger/icons/folder-trash-share-open.png)
+  skin/classic/messenger/icons/folder-trash-share.png                   (messenger/icons/folder-trash-share.png)
+  skin/classic/messenger/icons/info.png                                 (messenger/icons/info.png)
+  skin/classic/messenger/icons/insecure.png                             (messenger/icons/insecure.png)
+  skin/classic/messenger/icons/junk.png                                 (messenger/icons/junk.png)
+  skin/classic/messenger/icons/junkcol.png                              (messenger/icons/junkcol.png)
+  skin/classic/messenger/icons/loading.png                              (messenger/icons/loading.png)
+  skin/classic/messenger/icons/local-mailhost.png                       (messenger/icons/local-mailhost.png)
+  skin/classic/messenger/icons/message-mail-attach-del.png              (messenger/icons/message-mail-attach-del.png)
+  skin/classic/messenger/icons/message-mail-attach-fwd-offl-reply.png   (messenger/icons/message-mail-attach-fwd-offl-reply.png)
+  skin/classic/messenger/icons/message-mail-attach-fwd-offl.png         (messenger/icons/message-mail-attach-fwd-offl.png)
+  skin/classic/messenger/icons/message-mail-attach-fwd-reply.png        (messenger/icons/message-mail-attach-fwd-reply.png)
+  skin/classic/messenger/icons/message-mail-attach-fwd.png              (messenger/icons/message-mail-attach-fwd.png)
+  skin/classic/messenger/icons/message-mail-attach-offl-reply.png       (messenger/icons/message-mail-attach-offl-reply.png)
+  skin/classic/messenger/icons/message-mail-attach-offl.png             (messenger/icons/message-mail-attach-offl.png)
+  skin/classic/messenger/icons/message-mail-attach-reply.png            (messenger/icons/message-mail-attach-reply.png)
+  skin/classic/messenger/icons/message-mail-attach.png                  (messenger/icons/message-mail-attach.png)
+  skin/classic/messenger/icons/message-mail-delete-offl.png             (messenger/icons/message-mail-delete-offl.png)
+  skin/classic/messenger/icons/message-mail-fwd-offl-reply.png          (messenger/icons/message-mail-fwd-offl-reply.png)
+  skin/classic/messenger/icons/message-mail-fwd-offl.png                (messenger/icons/message-mail-fwd-offl.png)
+  skin/classic/messenger/icons/message-mail-fwd-reply.png               (messenger/icons/message-mail-fwd-reply.png)
+  skin/classic/messenger/icons/message-mail-fwd.png                     (messenger/icons/message-mail-fwd.png)
+  skin/classic/messenger/icons/message-mail-imapdelete.png              (messenger/icons/message-mail-imapdelete.png)
+  skin/classic/messenger/icons/message-mail-new-offl.png                (messenger/icons/message-mail-new-offl.png)
+  skin/classic/messenger/icons/message-mail-new.png                     (messenger/icons/message-mail-new.png)
+  skin/classic/messenger/icons/message-mail-offl-reply.png              (messenger/icons/message-mail-offl-reply.png)
+  skin/classic/messenger/icons/message-mail-offl.png                    (messenger/icons/message-mail-offl.png)
+  skin/classic/messenger/icons/message-mail-reply.png                   (messenger/icons/message-mail-reply.png)
+  skin/classic/messenger/icons/message-mail.png                         (messenger/icons/message-mail.png)
+  skin/classic/messenger/icons/message-news-attach-kill-offl.png        (messenger/icons/message-news-attach-kill-offl.png)
+  skin/classic/messenger/icons/message-news-attach-kill.png             (messenger/icons/message-news-attach-kill.png)
+  skin/classic/messenger/icons/message-news-attach-offl.png             (messenger/icons/message-news-attach-offl.png)
+  skin/classic/messenger/icons/message-news-attach.png                  (messenger/icons/message-news-attach.png)
+  skin/classic/messenger/icons/message-news-kill-offl.png               (messenger/icons/message-news-kill-offl.png)
+  skin/classic/messenger/icons/message-news-kill.png                    (messenger/icons/message-news-kill.png)
+  skin/classic/messenger/icons/message-news-new-attach-off.png          (messenger/icons/message-news-new-attach-off.png)
+  skin/classic/messenger/icons/message-news-new-attach.png              (messenger/icons/message-news-new-attach.png)
+  skin/classic/messenger/icons/message-news-new-offl.png                (messenger/icons/message-news-new-offl.png)
+  skin/classic/messenger/icons/message-news-new.png                     (messenger/icons/message-news-new.png)
+  skin/classic/messenger/icons/message-news-offl.png                    (messenger/icons/message-news-offl.png)
+  skin/classic/messenger/icons/message-news.png                         (messenger/icons/message-news.png)
+  skin/classic/messenger/icons/phishing.png                             (messenger/icons/phishing.png)
+  skin/classic/messenger/icons/readcol.png                              (messenger/icons/readcol.png)
+  skin/classic/messenger/icons/remote-blocked.png                       (messenger/icons/remote-blocked.png)
+  skin/classic/messenger/icons/secure.png                               (messenger/icons/secure.png)
+  skin/classic/messenger/icons/server-local-new.png                     (messenger/icons/server-local-new.png)
+  skin/classic/messenger/icons/server-local.png                         (messenger/icons/server-local.png)
+  skin/classic/messenger/icons/server-mail-new.png                      (messenger/icons/server-mail-new.png)
+  skin/classic/messenger/icons/server-mail.png                          (messenger/icons/server-mail.png)
+  skin/classic/messenger/icons/server-news-lock.png                     (messenger/icons/server-news-lock.png)
+  skin/classic/messenger/icons/server-news-new.png                      (messenger/icons/server-news-new.png)
+  skin/classic/messenger/icons/server-news.png                          (messenger/icons/server-news.png)
+  skin/classic/messenger/icons/server-remote-lock-new.png               (messenger/icons/server-remote-lock-new.png)
+  skin/classic/messenger/icons/server-remote-lock.png                   (messenger/icons/server-remote-lock.png)
+  skin/classic/messenger/icons/thread-closed-eye.png                    (messenger/icons/thread-closed-eye.png)
+  skin/classic/messenger/icons/thread-closed-kill.png                   (messenger/icons/thread-closed-kill.png)
+  skin/classic/messenger/icons/thread-closed-offl-eye.png               (messenger/icons/thread-closed-offl-eye.png)
+  skin/classic/messenger/icons/thread-closed-offl-kill.png              (messenger/icons/thread-closed-offl-kill.png)
+  skin/classic/messenger/icons/thread-closed.png                        (messenger/icons/thread-closed.png)
+  skin/classic/messenger/icons/threadcol-threaded.png                   (messenger/icons/threadcol-threaded.png)
+  skin/classic/messenger/icons/threadcol-unthreaded.png                 (messenger/icons/threadcol-unthreaded.png)
+  skin/classic/messenger/icons/thread-new-closed-eye.png                (messenger/icons/thread-new-closed-eye.png)
+  skin/classic/messenger/icons/thread-new-closed-kill.png               (messenger/icons/thread-new-closed-kill.png)
+  skin/classic/messenger/icons/thread-new-closed-offl-eye.png           (messenger/icons/thread-new-closed-offl-eye.png)
+  skin/classic/messenger/icons/thread-new-closed-offl-kill.png          (messenger/icons/thread-new-closed-offl-kill.png)
+  skin/classic/messenger/icons/thread-new-closed.png                    (messenger/icons/thread-new-closed.png)
+  skin/classic/messenger/folderPaneExtras.css                           (messenger/folderPaneExtras.css)
+  skin/classic/messenger/threadPaneExtras.css                           (messenger/threadPaneExtras.css)
+  skin/classic/messenger/messageKeywords.css                            (messenger/messageKeywords.css)
+  skin/classic/messenger/icons/new-mail-alert.png                       (messenger/icons/new-mail-alert.png)
+  skin/classic/messenger/addressbook/abResultsPane.css                  (messenger/addressbook/abResultsPane.css)
+  skin/classic/messenger/addressbook/addressPanes.css                   (messenger/addressbook/addressPanes.css)
+  skin/classic/messenger/addressbook/cardDialog.css                     (messenger/addressbook/cardDialog.css)
+  skin/classic/messenger/addressbook/selectAddressesDialog.css          (messenger/addressbook/selectAddressesDialog.css)
+  skin/classic/messenger/addressbook/sidebarPanel.css                   (messenger/addressbook/sidebarPanel.css)
+  skin/classic/messenger/addressbook/icons/addrbook.png                 (messenger/addressbook/icons/addrbook.png)
+  skin/classic/messenger/addressbook/icons/ablist.png                   (messenger/addressbook/icons/ablist.png)
+  skin/classic/messenger/addressbook/icons/remote-addrbook.png          (messenger/addressbook/icons/remote-addrbook.png)
+  skin/classic/messenger/addressbook/icons/secure-remote-addrbook.png   (messenger/addressbook/icons/secure-remote-addrbook.png)
+  skin/classic/messenger/addressbook/icons/remote-addrbook-error.png    (messenger/addressbook/icons/remote-addrbook-error.png)
+  skin/classic/messenger/addressbook/icons/abcard.png                   (messenger/addressbook/icons/abcard.png)
+  skin/classic/messenger/addressbook/icons/contact-generic.png          (messenger/addressbook/icons/contact-generic.png)
+  skin/classic/messenger/addressbook/icons/contact-generic-tiny.png     (messenger/addressbook/icons/contact-generic-tiny.png)
+  skin/classic/messenger/smime/msgReadSecurityInfo.css                  (messenger/smime/msgReadSecurityInfo.css)
+  skin/classic/messenger/smime/msgCompSecurityInfo.css                  (messenger/smime/msgCompSecurityInfo.css)
+  skin/classic/messenger/smime/msgReadSMIMEOverlay.css                  (messenger/smime/msgReadSMIMEOverlay.css)
+  skin/classic/messenger/smime/certFetchingStatus.css                   (messenger/smime/certFetchingStatus.css)
+  skin/classic/messenger/smime/msgHdrViewSMIMEOverlay.css               (messenger/smime/msgHdrViewSMIMEOverlay.css)
+  skin/classic/messenger/smime/icons/sbSignOk.png                       (messenger/smime/icons/sbSignOk.png)
+  skin/classic/messenger/smime/icons/sbSignUnknown.png                  (messenger/smime/icons/sbSignUnknown.png)
+  skin/classic/messenger/smime/icons/sbSignNotOk.png                    (messenger/smime/icons/sbSignNotOk.png)
+  skin/classic/messenger/smime/icons/sbCryptoOk.png                     (messenger/smime/icons/sbCryptoOk.png)
+  skin/classic/messenger/smime/icons/sbCryptoNotOk.png                  (messenger/smime/icons/sbCryptoNotOk.png)
+  skin/classic/messenger/smime/icons/hdrSignOk.png                      (messenger/smime/icons/hdrSignOk.png)
+  skin/classic/messenger/smime/icons/hdrSignUnknown.png                 (messenger/smime/icons/hdrSignUnknown.png)
+  skin/classic/messenger/smime/icons/hdrSignNotOk.png                   (messenger/smime/icons/hdrSignNotOk.png)
+  skin/classic/messenger/smime/icons/hdrCryptoOk.png                    (messenger/smime/icons/hdrCryptoOk.png)
+  skin/classic/messenger/smime/icons/hdrCryptoNotOk.png                 (messenger/smime/icons/hdrCryptoNotOk.png)
+  skin/classic/messenger-newsblog/feed-subscriptions.css                (messenger/newsblog/feed-subscriptions.css)
+  skin/classic/messenger-newsblog/icons/rss-feed.png                    (messenger/newsblog/rss-feed.png)
+#ifdef XP_MACOSX
+  skin/classic/navigator/navigator.css                                  (mac/navigator/navigator.css)
+  skin/classic/navigator/linkToolbar.css                                (mac/navigator/linkToolbar.css)
+  skin/classic/navigator/pageInfo.css                                   (mac/navigator/pageInfo.css)
+  skin/classic/navigator/tabbrowser.css                                 (mac/navigator/tabbrowser.css)
+  skin/classic/navigator/webDeveloper.css                               (mac/navigator/webDeveloper.css)
+  skin/classic/navigator/icons/close.png                                (mac/navigator/icons/close.png)
+  skin/classic/navigator/icons/identity.png                             (mac/navigator/icons/identity.png)
+  skin/classic/navigator/icons/navigatoricons.png                       (mac/navigator/icons/navigatoricons.png)
+  skin/classic/navigator/icons/navigatoricons-small.png                 (mac/navigator/icons/navigatoricons-small.png)
+  skin/classic/navigator/icons/panel-expander-closed.png                (mac/navigator/icons/panel-expander-closed.png)
+  skin/classic/navigator/icons/panel-expander-open.png                  (mac/navigator/icons/panel-expander-open.png)
+  skin/classic/navigator/icons/panel-plus-sign.png                      (mac/navigator/icons/panel-plus-sign.png)
+  skin/classic/navigator/icons/restore.png                              (mac/navigator/icons/restore.png)
+#else
+  skin/classic/navigator/navigator.css                                  (navigator/navigator.css)
+  skin/classic/navigator/linkToolbar.css                                (navigator/linkToolbar.css)
+  skin/classic/navigator/pageInfo.css                                   (navigator/pageInfo.css)
+  skin/classic/navigator/tabbrowser.css                                 (navigator/tabbrowser.css)
+  skin/classic/navigator/webDeveloper.css                               (navigator/webDeveloper.css)
+  skin/classic/navigator/btn1/first-disabled.png                        (navigator/btn1/first-disabled.png)
+  skin/classic/navigator/btn1/first-hover.png                           (navigator/btn1/first-hover.png)
+  skin/classic/navigator/btn1/last-disabled.png                         (navigator/btn1/last-disabled.png)
+  skin/classic/navigator/btn1/last-hover.png                            (navigator/btn1/last-hover.png)
+  skin/classic/navigator/btn1/next-disabled.png                         (navigator/btn1/next-disabled.png)
+  skin/classic/navigator/btn1/next-hover.png                            (navigator/btn1/next-hover.png)
+  skin/classic/navigator/btn1/previous-disabled.png                     (navigator/btn1/previous-disabled.png)
+  skin/classic/navigator/btn1/previous-hover.png                        (navigator/btn1/previous-hover.png)
+  skin/classic/navigator/btn1/top-disabled.png                          (navigator/btn1/top-disabled.png)
+  skin/classic/navigator/btn1/top-hover.png                             (navigator/btn1/top-hover.png)
+  skin/classic/navigator/btn1/up-disabled.png                           (navigator/btn1/up-disabled.png)
+  skin/classic/navigator/btn1/up-hover.png                              (navigator/btn1/up-hover.png)
+  skin/classic/navigator/icons/close.png                                (navigator/icons/close.png)
+  skin/classic/navigator/icons/identity.png                             (navigator/icons/identity.png)
+  skin/classic/navigator/icons/minimize.png                             (navigator/icons/minimize.png)
+  skin/classic/navigator/icons/navigatoricons.png                       (navigator/icons/navigatoricons.png)
+  skin/classic/navigator/icons/navigatoricons-small.png                 (navigator/icons/navigatoricons-small.png)
+  skin/classic/navigator/icons/restore.png                              (navigator/icons/restore.png)
+  skin/classic/navigator/icons/tab-arrow-left.png                       (navigator/icons/tab-arrow-left.png)
+  skin/classic/navigator/icons/tab-arrow-right.png                      (navigator/icons/tab-arrow-right.png)
+#endif
+  skin/classic/navigator/btn1/feeds.png                                 (navigator/btn1/feeds.png)
+  skin/classic/navigator/btn1/first.png                                 (navigator/btn1/first.png)
+  skin/classic/navigator/btn1/last.png                                  (navigator/btn1/last.png)
+  skin/classic/navigator/btn1/next.png                                  (navigator/btn1/next.png)
+  skin/classic/navigator/btn1/previous.png                              (navigator/btn1/previous.png)
+  skin/classic/navigator/btn1/top.png                                   (navigator/btn1/top.png)
+  skin/classic/navigator/btn1/up.png                                    (navigator/btn1/up.png)
+  skin/classic/navigator/icons/chevron.png                              (navigator/icons/chevron.png)
+  skin/classic/navigator/icons/popup-blocked.png                        (navigator/icons/popup-blocked.png)
+  skin/classic/navigator/icons/tab-drag-indicator.png                   (navigator/icons/tab-drag-indicator.png)
+  skin/classic/navigator/icons/tab-new.png                              (navigator/icons/tab-new.png)
+[extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
+% override chrome://global/skin/about.css                         chrome://communicator/skin/about.css
+% override chrome://global/skin/aboutSupport.css                  chrome://communicator/skin/aboutSupport.css
+% override chrome://global/skin/config.css                        chrome://communicator/skin/config.css
+% override chrome://global/skin/in-content/info-pages.css         chrome://communicator/skin/communicator.css
+% override chrome://mozapps/skin/places/defaultFavicon.svg        chrome://communicator/skin/places/bookmark-item.svg
diff --git a/comm/suite/themes/classic/linux/communicator/communicator.css b/comm/suite/themes/classic/linux/communicator/communicator.css
new file mode 100644
index 0000000000..2f68d4fbba
--- /dev/null
+++ b/comm/suite/themes/classic/linux/communicator/communicator.css
@@ -0,0 +1,331 @@
+/* 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/. */
+
+/* ==== communicator.css ====================================================
+   == Styles shared everywhere throughout the Communicator suite.
+   ========================================================================== */
+
+@import url("chrome://global/skin/global.css");
+@import url("chrome://communicator/content/communicator.css");
+@import url("chrome://communicator/skin/brand.css");
+@import url("chrome://communicator/skin/button.css");
+@import url("chrome://communicator/skin/toolbar.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+.wizard-box {
+  padding: 20px 44px 10px;
+}
+
+/* ::::: toolbar-primary ::::: */
+
+.toolbar-primary {
+  -moz-binding: url("chrome://communicator/content/bindings/toolbar-xpfe.xml#grippytoolbar-primary");
+}
+
+/* .padded is used by autocomplete widgets that don't have an icon. Gross. -dwh */
+textbox:not(.padded) {
+  cursor: default;
+  padding: 0;
+}
+
+textbox[enablehistory="true"] {
+  -moz-appearance: none;
+  border: 0;
+  background-color: transparent;
+}
+
+textbox[enablehistory="true"] > .autocomplete-textbox-container {
+  -moz-appearance: menulist-textfield;
+}
+/* ::::: autocomplete ::::: */
+
+.autocomplete-history-popup {
+  max-height: 25em;
+}
+
+textbox[autocompletesearch="history file"] .autocomplete-treebody::-moz-tree-image(treecolAutoCompleteValue) {
+  width: 16px;
+  height: 16px;
+  margin-left: 1px;
+}
+
+textbox[autocompletesearch="history file"] .autocomplete-treebody::-moz-tree-image(treecolAutoCompleteValue, directory) {
+  list-style-image: url("chrome://communicator/skin/places/bookmark-folder-closed.png");
+}
+
+textbox[autocompletesearch="history file"] .autocomplete-treebody::-moz-tree-image(treecolAutoCompleteValue, file) {
+  list-style-image: url("chrome://communicator/skin/places/bookmark-item.svg");
+}
+
+/* ::::: online/offline icons ::::: */
+
+#offline-status[offline="true"] {
+  list-style-image: url("chrome://communicator/skin/icons/offline.png");
+}
+
+#offline-status {
+  list-style-image: url("chrome://communicator/skin/icons/online.png");
+}
+
+/* ::::: spell checker ::::: */
+
+.spell-suggestion {
+  font-weight: bold;
+}
+
+/* ::::: error messages ::::: */
+
+description.error {
+  color: #FF0000;
+}
+
+/* ::::: directional button icons ::::: */
+
+.up {
+  min-width: 0px;
+  list-style-image: url("chrome://global/skin/arrow/arrow-up.gif");
+}
+
+.up[disabled="true"] {
+  list-style-image: url("chrome://global/skin/arrow/arrow-up-dis.gif");
+}
+
+.down {
+  min-width: 0px;
+  list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
+}
+
+.down[disabled="true"] {
+  list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif");
+}
+
+.sidebarTree {
+  border: none;
+  margin: 0px !important;
+}
+
+/* ::::: iconic menus and menuitems ::::: */
+
+menu.menu-iconic > .menu-iconic-left,
+menuitem.menuitem-iconic > .menu-iconic-left {
+  display: -moz-box;
+}
+
+/* Fix to show the menulist-dropmarker under newer GTK3 versions */
+menulist[editable="true"] > .menulist-dropmarker {
+  min-width: 2em;
+}
+
+/* ::::: toolbar print button ::::: */
+#print-button {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
+  -moz-image-region: rect(0 29px 29px 0);
+}
+
+#print-button:hover {
+  -moz-image-region: rect(0 59px 29px 30px);
+}
+
+#print-button:hover:active {
+  -moz-image-region: rect(0 89px 29px 60px);
+}
+
+#print-button[disabled="true"] {
+  -moz-image-region: rect(0 119px 29px 90px) !important;
+}
+
+toolbar[iconsize="small"] > toolbarpaletteitem > #print-button,
+toolbar[iconsize="small"] > #print-button {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+  -moz-image-region: rect(0 19px 19px 0);
+}
+
+toolbar[iconsize="small"] > #print-button:hover {
+  -moz-image-region: rect(0 39px 19px 20px);
+}
+
+toolbar[iconsize="small"] > #print-button:hover:active {
+  -moz-image-region: rect(0 59px 19px 40px);
+}
+
+toolbar[iconsize="small"] > #print-button[disabled="true"] {
+  -moz-image-region: rect(0 79px 19px 60px) !important;
+}
+
+/* ::::: lightweight themes ::::: */
+
+toolbar button:-moz-lwtheme,
+toolbar menulist:-moz-lwtheme:not([open="true"]),
+toolbar textbox:-moz-lwtheme:not([focused="true"]) {
+  opacity: .8;
+}
+
+treecols:-moz-lwtheme {
+  text-shadow: none;
+  color: -moz-dialogtext;
+  background-color: -moz-dialog;
+}
+
+/* ::::: notification bars ::::: */
+
+.messageImage[value="refresh-blocked"] {
+  list-style-image: url("chrome://communicator/skin/icons/application.png");
+}
+
+.messageImage[value="blocked-plugins"],
+.messageImage[value="disabled-plugins"],
+.messageImage[value="missing-plugins"],
+.messageImage[value="outdated-plugins"],
+.messageImage[value="click-to-play-plugins"],
+.messageImage[value="plugin-crashed"] {
+  list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric-16.png");
+}
+
+.messageImage[value="geolocation"] {
+  list-style-image: url("chrome://communicator/skin/icons/geo.png");
+}
+
+.messageImage[value="webNotifications"] {
+  list-style-image: url("chrome://communicator/skin/icons/notification-16.png");
+}
+
+.messageImage[value="indexedDB-permissions-prompt"],
+.messageImage[value="indexedDB-quota-prompt"] {
+  list-style-image: url("chrome://global/skin/icons/question-16.png");
+}
+
+.messageImage[value="addon-install-blocked"],
+.messageImage[value="addon-install-cancelled"],
+.messageImage[value="addon-install-complete"],
+.messageImage[value="addon-install-disabled"],
+.messageImage[value="addon-install-failed"],
+.messageImage[value="addon-install-started"],
+.messageImage[value="lwtheme-install-request"],
+.messageImage[value="lwtheme-install-notification"] {
+  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.png");
+}
+
+.messageImage[value="popup-blocked"] {
+  list-style-image: url("chrome://navigator/skin/icons/popup-blocked.png");
+}
+
+.messageImage[value="blocked-badware-page"] {
+  list-style-image: url("chrome://global/skin/icons/blacklist_favicon.png");
+}
+
+.messageImage[value="EnterInsecureMessage"] {
+  list-style-image: url("chrome://communicator/skin/icons/lock-insecure-16.png");
+}
+
+.messageImage[value="EnterSecureMessage"],
+.messageImage[value="BlockedActiveContentMessage"],
+.messageImage[value="BlockedDisplayContentMessage"] {
+  list-style-image: url("chrome://communicator/skin/icons/lock-secure-16.png");
+}
+
+.messageImage[value="MixedContentMessage"],
+.messageImage[value="MixedActiveContentMessage"],
+.messageImage[value="MixedDisplayContentMessage"] {
+  list-style-image: url("chrome://communicator/skin/icons/lock-broken-16.png");
+}
+
+/* ::::: tree rows ::::: */
+
+/* ::::: dialog header ::::: */
+
+dialogheader {
+  margin: 0px 5px 5px 5px;
+  border: 1px solid;
+  border-top-color: ThreeDDarkShadow;
+  border-right-color: ThreeDDarkShadow;
+  border-bottom-color: ThreeDDarkShadow;
+  border-left-color: ThreeDDarkShadow;
+  padding: 5px 8px;
+  background-color: Highlight;
+  color: HighlightText;
+}
+
+.dialogheader-title {
+  margin: 0px !important;
+  font-size: larger;
+  font-weight: bold;
+}
+
+/* ::::: statusbar ::::: */
+
+statusbar {
+  -moz-appearance: statusbar;
+  border-top: 1px solid ThreeDLightShadow;
+  border-left: 1px solid ThreeDShadow;
+  border-right: 1px solid ThreeDHighlight;
+  border-bottom: 1px solid ThreeDHighlight;
+  background-color: -moz-Dialog;
+  min-height: 22px;
+}
+
+statusbar:-moz-lwtheme {
+  -moz-appearance: none;
+  background: none;
+  border-style: none;
+}
+
+statusbarpanel {
+  -moz-appearance: statusbarpanel;
+  -moz-box-align: center;
+  -moz-box-pack: center;
+  border-left: 1px solid ThreeDHighlight;
+  border-top: 1px solid ThreeDHighlight;
+  border-right: 1px solid ThreeDShadow;
+  border-bottom: 1px solid ThreeDShadow;
+  padding: 0 4px;
+}
+
+statusbarpanel:not(.statusbar-resizerpanel):-moz-lwtheme {
+  -moz-appearance: none;
+  border-top-style: none;
+  border-bottom-style: none;
+  border-inline-start-style: none;
+}
+
+.statusbar-resizerpanel {
+  -moz-box-align: end;
+  -moz-box-pack: end;
+  -moz-appearance: resizerpanel;
+  padding: 0;
+  border: none;
+}
+
+.statusbarpanel-iconic,
+.statusbarpanel-iconic-text {
+  padding: 0 1px;
+}
+
+.statusbarpanel-backgroundbox {
+  -moz-box-align: stretch;
+  padding: 0px;
+}
+
+.statusbarpanel-backgroundbox > .statusbarpanel-contentbox {
+  padding: 0px 1px;
+  -moz-box-align: center;
+}
+
+/* colorpicker button */
+
+colorpicker[type="button"] {
+  -moz-appearance: button;
+  width: 56px;
+  height: 24px;
+}
+
+/* filefield */
+
+.fileFieldContentBox {
+  padding-inline-start: 3px;
+  margin-inline-start: -4px;
+  margin-inline-end: -4px;
+  margin-top: 4px;
+  margin-bottom: 4px;
+}
diff --git a/comm/suite/themes/classic/linux/communicator/feed-subscribe.css b/comm/suite/themes/classic/linux/communicator/feed-subscribe.css
new file mode 100644
index 0000000000..55dfc55e26
--- /dev/null
+++ b/comm/suite/themes/classic/linux/communicator/feed-subscribe.css
@@ -0,0 +1,149 @@
+/* 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/. */
+
+html {
+  background: -moz-Dialog;
+  font: message-box;
+}
+
+#feedBody {
+  border: 1px solid ThreeDShadow;
+  padding: 3em;
+  padding-inline-start: 30px;
+  margin: 2em auto;
+  background: -moz-Field;
+}
+
+#feedHeaderContainer {
+  border: 1px solid ThreeDShadow;
+  border-radius: 10px;
+  margin: -4em auto 0 auto;
+  background-color: InfoBackground;
+  -moz-appearance: -moz-gtk-info-bar;
+}
+
+#feedHeader {
+  margin-top: 4.9em;
+  margin-bottom: 1em;
+  margin-inline-start: 1.4em;
+  margin-inline-end: 1em;
+  padding-inline-start: 2.9em;
+  font-size: 110%;
+  color: -moz-gtk-info-bar-text;
+}
+
+.feedBackground {
+  background: url("chrome://communicator/skin/icons/feedIcon.png") 0% 10% no-repeat;
+}
+
+.videoPodcastBackground {
+  background: url("chrome://communicator/skin/icons/videoFeedIcon.png") 0% 10% no-repeat;
+}
+
+.audioPodcastBackground {
+  background: url("chrome://communicator/skin/icons/audioFeedIcon.png") 0% 10% no-repeat;
+}
+
+#feedHeader[dir="rtl"] {
+  background-position: 100% 10%;
+}
+
+#feedIntroText {
+  display: none;
+}
+
+#feedHeader[firstrun="true"] #feedIntroText {
+  padding-top: 0.1em;
+  padding-inline-start: 0.6em;
+  display: block;
+}
+
+#feedHeader[firstrun="true"] > #feedSubscribeLine {
+  padding-inline-start: 1.8em;
+}
+
+#feedSubscribeLine {
+  padding-top: 0.2em;
+}
+
+/* Don't print subscription UI */
+@media print {
+  #feedHeaderContainer {
+    display: none;
+  }
+}
+
+body {
+  margin: 0;
+  padding: 0 3em;
+  color: -moz-fieldText;
+  font: message-box;
+}
+
+h1 {
+  font-size: 160%;
+  border-bottom: 2px solid ThreeDLightShadow;
+  margin: 0 0 .2em 0;
+}
+
+h2 {
+  font-size: 110%;
+  font-weight: normal;
+  margin: 0 0 .6em 0;
+}
+
+#feedTitleLink {
+  float: right;
+  margin-inline-start: .6em;
+  margin-inline-end: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+a[href] img {
+  border: none;
+}
+
+#feedTitleContainer {
+  margin-inline-start: 0;
+  margin-inline-end: .6em;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+#feedTitleImage {
+  margin-inline-start: .6em;
+  margin-inline-end: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+  max-width: 300px;
+  max-height: 150px;
+}
+
+.feedEntryContent {
+  font-size: 110%;
+}
+
+.lastUpdated {
+  font-size: 85%;
+  font-weight: normal;
+}
+
+.type-icon {
+  vertical-align: bottom;
+  height: 16px;
+  width: 16px;
+}
+
+.enclosures {
+  border: 1px solid ThreeDShadow;
+  padding: 1em;
+  margin: 1em auto;
+  background: -moz-Dialog;
+}
+
+.enclosure {
+  vertical-align: middle;
+  margin-left: 2px;
+}
diff --git a/comm/suite/themes/classic/linux/communicator/numberbox.css b/comm/suite/themes/classic/linux/communicator/numberbox.css
new file mode 100644
index 0000000000..ba38649a2b
--- /dev/null
+++ b/comm/suite/themes/classic/linux/communicator/numberbox.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/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace html url("http://www.w3.org/1999/xhtml");
+
+textbox[type="number"] {
+  -moz-appearance: none;
+  padding: 0 !important;
+  border: none;
+  cursor: default;
+  background-color: transparent;
+}
+
+html|*.numberbox-input {
+  text-align: right;
+}
+
+.numberbox-input-box {
+  -moz-box-align: center;
+  -moz-appearance: spinner-textfield;
+  margin-right: -1px;
+  padding: 3px;
+}
+
+textbox[hidespinbuttons="true"] > .numberbox-input-box {
+  -moz-appearance: textfield;
+}
diff --git a/comm/suite/themes/classic/linux/communicator/preferences.css b/comm/suite/themes/classic/linux/communicator/preferences.css
new file mode 100644
index 0000000000..8b7cf445d3
--- /dev/null
+++ b/comm/suite/themes/classic/linux/communicator/preferences.css
@@ -0,0 +1,66 @@
+/* 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/. */
+
+/* Styles used by all preference windows and panes of SeaMonkey */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: Main Window ::::: */
+
+prefwindow {
+  -moz-appearance: window;
+  background-color: -moz-Dialog;
+  color: -moz-DialogText;
+  font: message-box;
+  padding-top: 8px;
+  padding-bottom: 0px;
+  padding-inline-start: 8px;
+  padding-inline-end: 10px;
+}
+
+prefpane {
+  padding: 8px;
+}
+
+prefwindow[type="child"] {
+  padding: 8px;
+}
+
+prefwindow[type="child"] > prefpane {
+  padding: 0px;
+}
+
+.prefWindow-dlgbuttons {
+  padding-bottom: 8px;
+  padding-inline-start: 8px;
+  padding-inline-end: 8px;
+}
+
+prefwindow[type="child"] .prefWindow-dlgbuttons {
+  padding: 0px;
+}
+
+radio[pane] {
+  -moz-appearance: none;
+  min-width: 4.5em;
+  margin: 0;
+  padding: 3px;
+  color: -moz-FieldText;
+}
+
+.paneSelector {
+  -moz-appearance: listbox;
+  margin: 8px 8px 0 8px;
+  padding: 0;
+}
+
+.paneButtonIcon {
+  width: 32px;
+  height: 32px;
+}
+
+radio[pane][selected="true"] {
+  background-color: Highlight;
+  color: HighlightText;
+}
diff --git a/comm/suite/themes/classic/linux/communicator/sanitizeDialog.css b/comm/suite/themes/classic/linux/communicator/sanitizeDialog.css
new file mode 100644
index 0000000000..9d119134fd
--- /dev/null
+++ b/comm/suite/themes/classic/linux/communicator/sanitizeDialog.css
@@ -0,0 +1,49 @@
+/* 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/. */
+
+#sanitizeDurationChoice {
+  margin-inline-end: 0;
+}
+
+/* Align the duration label with the warning box and item list */
+#sanitizeDurationLabel {
+  margin-inline-start: 3px;
+}
+
+
+/* Hide the duration dropdown suffix label if it's empty.  Otherwise it
+   takes up a little space, causing the end of the dropdown to not be aligned
+   with the warning box. */
+#sanitizeDurationSuffixLabel[value=""] {
+  display: none;
+}
+
+
+/* Sanitize everything warning box */
+#sanitizeWarningBox {
+  background-color: Window;
+  border: 1px solid ThreeDDarkShadow;
+  border-radius: 5px;
+  padding: 16px;
+}
+
+#sanitizeWarningIcon {
+  list-style-image: url("moz-icon://stock/gtk-dialog-warning?size=dialog");
+  padding: 0;
+  margin: 0;
+}
+
+#sanitizeWarningDescBox {
+  padding: 0 16px;
+  margin: 0;
+}
+
+
+/* Align the last dialog button with the end of the warning box */
+.dialog-button-box {
+  margin-inline-end: 0;
+}
+.dialog-button[dlgtype="accept"] {
+  margin-inline-end: 0;
+}
diff --git a/comm/suite/themes/classic/linux/communicator/spinbuttons.css b/comm/suite/themes/classic/linux/communicator/spinbuttons.css
new file mode 100644
index 0000000000..3e333bb474
--- /dev/null
+++ b/comm/suite/themes/classic/linux/communicator/spinbuttons.css
@@ -0,0 +1,24 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+spinbuttons {
+  -moz-appearance: spinner;
+  cursor: default;
+}
+
+.spinbuttons-button {
+  min-width: 13px;
+  min-height: 11px;
+  margin: 0 !important;
+}
+
+.spinbuttons-up {
+  -moz-appearance: spinner-upbutton;
+}
+
+.spinbuttons-down {
+  -moz-appearance: spinner-downbutton;
+}
diff --git a/comm/suite/themes/classic/mac/communicator/aboutPrivateBrowsing.css b/comm/suite/themes/classic/mac/communicator/aboutPrivateBrowsing.css
new file mode 100644
index 0000000000..94cb3b83c8
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/aboutPrivateBrowsing.css
@@ -0,0 +1,85 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#warningScreen {
+  background-color: -moz-Dialog;
+}
+
+#warningBox {
+  background-color: -moz-Field;
+  color: -moz-FieldText;
+  border: 1px solid ThreeDShadow;
+  border-radius: 10px;
+  padding: 3em;
+  padding-inline-start: 30px;
+  margin-left: 1em;
+  margin-right: 1em;
+}
+
+#warningInnerBox {
+ max-width: 50em;
+}
+
+#warningTitle {
+  margin: 0 0 .6em 0;
+  font-size: 160%;
+  border-bottom: 1px solid ThreeDLightShadow
+}
+
+#warningText {
+  font-size: 110%;
+  margin-left: 0;
+}
+
+/* Pick the desired icons depending on the window's context */
+
+#warningBox.private > #warningBoxIcon {
+  list-style-image: url("chrome://global/skin/icons/information-large.png");
+  width: 48px;
+  height: 48px;
+  margin-inline-end: 1.5em;
+}
+
+#warningBox.normal > #warningBoxIcon {
+  list-style-image: url("chrome://global/skin/icons/question-large.png");
+  width: 48px;
+  height: 48px;
+  margin-inline-end: 1.5em;
+}
+
+#trackWarnBox {
+  margin-top: 0.6em;
+  margin-inline-end: 4em;
+  -moz-box-align: start;
+}
+
+#trackWarnIcon {
+  list-style-image: url("chrome://communicator/skin/icons/warning-24.png");
+  width: 24px;
+  height: 24px;
+  margin-inline-end: 1em;
+}
+
+/* Define additional styles to look similar to the netError/certError pages */
+
+#warningTitle {
+  font-weight: bold;
+}
+#warningStatus {
+  margin: 0.4em 0 1.2em 0;
+  padding-bottom: 1.2em;
+  border-bottom: 1px solid ThreeDLightShadow;
+  font-size: 135%;
+}
+
+#warningInnerBox > button {
+  margin: 0.8em 0 1em 0;
+}
+
+#warningOuterBox > vbox > label,
+#warningInnerBox > description {
+  margin-inline-start: 0;
+}
diff --git a/comm/suite/themes/classic/mac/communicator/aboutSessionRestore.css b/comm/suite/themes/classic/mac/communicator/aboutSessionRestore.css
new file mode 100644
index 0000000000..d949105f50
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/aboutSessionRestore.css
@@ -0,0 +1,40 @@
+/* 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/. */
+
+#tabList {
+  width: 100%;
+  height: 12em;
+}
+
+treechildren::-moz-tree-image(icon),
+treechildren::-moz-tree-image(noicon) {
+  padding-right: 2px;
+  margin: 0px 2px;
+  width: 16px;
+  height: 16px;
+}
+
+treechildren::-moz-tree-image(noicon) {
+  list-style-image: url("chrome://communicator/skin/places/bookmark-item.svg");
+}
+
+treechildren::-moz-tree-image(container, noicon) {
+  list-style-image: url("chrome://global/skin/tree/folder.png");
+}
+
+treechildren::-moz-tree-checkbox(checked) {
+  list-style-image: url("chrome://global/skin/checkbox/cbox-check.gif");
+}
+
+treechildren::-moz-tree-checkbox(partial) {
+  list-style-image: url("chrome://global/skin/checkbox/cbox-check-dis.gif");
+}
+
+#buttons {
+  margin-inline-start: 80px;
+}
+#buttons > button {
+  margin-top: 2em;
+  margin-inline-start: 5px;
+}
diff --git a/comm/suite/themes/classic/mac/communicator/button.css b/comm/suite/themes/classic/mac/communicator/button.css
new file mode 100644
index 0000000000..73b87ae2a9
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/button.css
@@ -0,0 +1,65 @@
+/* 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/. */
+
+/* ==== button.css ==========================================================
+   == Styles for special buttons in the Communicator suite.
+   ========================================================================== */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: large toolbar buttons ::::: */
+
+.toolbarbutton-1,
+.toolbarbutton-1 > .toolbarbutton-menubutton-button {
+  -moz-box-orient: vertical;
+}
+
+.toolbarbutton-1[open],
+.toolbarbutton-1[open] > .toolbarbutton-menubutton-button {
+  text-shadow: none;
+}
+
+.toolbarbutton-1[type="menu-button"] {
+  -moz-box-orient: horizontal;
+  padding: 0;
+}
+
+.toolbarbutton-1[type="menu"] {
+  -moz-binding: url("chrome://communicator/content/bindings/generalBindings.xml#menu-vertical");
+}
+
+/* Override global/toolbarbutton.css */
+.toolbarbutton-1 > .toolbarbutton-text,
+.toolbarbutton-menubutton-button > .toolbarbutton-text {
+  margin: 2px 6px !important;
+}
+
+toolbar[mode="icons"] .toolbarbutton-1,
+toolbar[mode="icons"] .toolbarbutton-menubutton-button,
+toolbar[iconsize="small"] .toolbarbutton-1,
+toolbar[iconsize="small"] .toolbarbutton-menubutton-button {
+  min-width: 0px;
+}
+
+toolbar[mode="icons"] .toolbarbutton-text,
+toolbar[mode="text"] .toolbarbutton-icon {
+  display: none;
+}
+
+toolbar[mode="text"] .toolbarbutton-1,
+toolbar[mode="text"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
+ -moz-box-orient: horizontal;
+}
+
+toolbar[labelalign="end"] .toolbarbutton-1,
+toolbar[labelalign="end"] .toolbarbutton-1 > .toolbarbutton-menubutton-button,
+toolbar[labelalign="end"] .toolbarbutton-1 > hbox > vbox {
+  -moz-box-orient: horizontal;
+}
+
+/* ::::: taskbuttons ::::: */
+
+.taskbutton {
+  padding: 1px;
+}
diff --git a/comm/suite/themes/classic/mac/communicator/communicator.css b/comm/suite/themes/classic/mac/communicator/communicator.css
new file mode 100644
index 0000000000..ae70b24ee7
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/communicator.css
@@ -0,0 +1,285 @@
+/* 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/. */
+
+/* ==== communicator.css ====================================================
+   == Styles shared everywhere throughout the Communicator suite.
+   ========================================================================== */
+
+@import url("chrome://global/skin/global.css");
+@import url("chrome://communicator/content/communicator.css");
+@import url("chrome://communicator/skin/brand.css");
+@import url("chrome://communicator/skin/button.css");
+@import url("chrome://communicator/skin/toolbar.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+.wizard-box {
+  padding: 20px 44px 10px;
+}
+
+#titlebar:not(:-moz-lwtheme) {
+  display: none;
+}
+
+#titlebar {
+  height: 22px;
+  -moz-window-dragging: drag;
+}
+
+#titlebar-spacer {
+  pointer-events: none;
+}
+
+/* On OS X, window controls are always at the left side of the window */
+#titlebar-buttonbox-container:-moz-locale-dir(ltr) {
+  -moz-box-ordinal-group: 0;
+  -moz-box-align: start;
+}
+
+#titlebar-buttonbox-container:-moz-lwtheme {
+  margin-top: 3px;
+}
+
+#titlebar-buttonbox {
+  -moz-appearance: -moz-window-button-box;
+  margin-left: 7px;
+}
+
+/* ::::: toolbar-primary ::::: */
+
+.toolbar-primary {
+  -moz-binding: url("chrome://communicator/content/bindings/toolbar-xpfe.xml#grippytoolbar-primary");
+}
+
+#throbber-box {
+  -moz-window-dragging: drag;
+}
+
+/* ::::: grippies ::::: */
+
+grippy {
+  display: none;
+}
+
+/* ::::: autocomplete ::::: */
+
+.autocomplete-history-popup {
+  max-height: 285px; /* 15 rows */
+}
+
+.autocomplete-history-dropmarker {
+  -moz-appearance: none;
+  border: none;
+  background-color: transparent;
+  margin: 0px;
+  padding: 0px;
+  list-style-image: url("chrome://communicator/skin/icons/autocomplete-dropmarker.png");
+}
+
+/* ::::: online/offline icons ::::: */
+
+#offline-status[offline="true"] {
+  list-style-image: url("chrome://communicator/skin/icons/offline.png");
+}
+
+#offline-status {
+  list-style-image: url("chrome://communicator/skin/icons/online.png");
+}
+
+/* ::::: security button icons ::::: */
+
+#security-button {
+  list-style-image: url("chrome://communicator/skin/icons/lock-insecure.png");
+}
+
+#security-button[level="high"] {
+  list-style-image: url("chrome://communicator/skin/icons/lock-secure.png");
+}
+
+#security-button[level="broken"] {
+  list-style-image: url("chrome://communicator/skin/icons/lock-broken.png");
+}
+
+/* ::::: spell checker ::::: */
+
+.spell-suggestion {
+  font-weight: bold;
+}
+
+/* ::::: error messages ::::: */
+
+description.error {
+  color: #FF0000;
+}
+
+/* ::::: directional button icons ::::: */
+
+.up {
+  min-width: 0px;
+  list-style-image: url("chrome://global/skin/arrow/arrow-up.gif");
+}
+
+.up[disabled="true"] {
+  list-style-image: url("chrome://global/skin/arrow/arrow-up-dis.gif");
+}
+
+.down {
+  min-width: 0px;
+  list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
+}
+
+.down[disabled="true"] {
+  list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif");
+}
+
+.sidebarTree {
+  border: none;
+  margin: 0px !important;
+}
+
+/* ::::: toolbar print button ::::: */
+#print-button {
+ list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
+  -moz-image-region: rect(0 29px 29px 0);
+}
+
+#print-button:hover:active,
+#print-button[open] {
+  -moz-image-region: rect(0 59px 29px 30px);
+}
+
+#print-button[disabled="true"] {
+  -moz-image-region: rect(0 89px 29px 60px) !important;
+}
+
+toolbar[iconsize="small"] > toolbarpaletteitem > #print-button,
+toolbar[iconsize="small"] > #print-button {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+  -moz-image-region: rect(0 19px 19px 0);
+}
+
+toolbar[iconsize="small"] > #print-button:hover:active,
+toolbar[iconsize="small"] > #print-button[open] {
+  -moz-image-region: rect(0 39px 19px 20px);
+}
+
+toolbar[iconsize="small"] > #print-button[disabled="true"] {
+  -moz-image-region: rect(0 59px 19px 40px) !important;
+}
+
+/* ::::: lightweight themes ::::: */
+
+toolbar textbox:-moz-lwtheme:not([focused="true"]) {
+  opacity: 0.9;
+}
+
+treecols:-moz-lwtheme {
+  text-shadow: none;
+}
+
+/* ::::: notification bars ::::: */
+
+.messageImage[value="refresh-blocked"] {
+  list-style-image: url("chrome://communicator/skin/icons/application.png");
+}
+
+.messageImage[value="plugin-crashed"] {
+  list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric-16.png");
+}
+
+.messageImage[value="geolocation"] {
+  list-style-image: url("chrome://communicator/skin/icons/geo.png");
+}
+
+.messageImage[value="persistent-storage"] {
+  list-style-image: url("chrome://communicator/skin/icons/notification-icons.svg#persistent-storage");
+  width: 16px;
+  height: 16px;
+}
+
+.messageImage[value="webNotifications"] {
+  list-style-image: url("chrome://communicator/skin/icons/notification-16.png");
+}
+
+.messageImage[value="indexedDB-permissions-prompt"],
+.messageImage[value="indexedDB-quota-prompt"] {
+  list-style-image: url("chrome://global/skin/icons/question-16.png");
+}
+
+.messageImage[value="addon-install-blocked"],
+.messageImage[value="addon-install-cancelled"],
+.messageImage[value="addon-install-complete"],
+.messageImage[value="addon-install-disabled"],
+.messageImage[value="addon-install-failed"],
+.messageImage[value="addon-install-started"],
+.messageImage[value="lwtheme-install-request"],
+.messageImage[value="lwtheme-install-notification"] {
+  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.png");
+}
+
+.messageImage[value="popup-blocked"] {
+  list-style-image: url("chrome://navigator/skin/icons/popup-blocked.png");
+}
+
+.messageImage[value="blocked-badware-page"] {
+  list-style-image: url("chrome://global/skin/icons/blacklist_favicon.png");
+}
+
+/* ::::: dialog header ::::: */
+
+dialogheader {
+  margin: 0 5px 5px;
+  padding: 5px 8px;
+}
+
+.dialogheader-title {
+  margin: 0 !important;
+  font-size: larger;
+  font-weight: bold;
+  display: none;
+}
+
+.dialogheader-description {
+  font-weight: bold !important;
+}
+
+/* ::::: statusbar ::::: */
+
+statusbar {
+  min-width: 1px; /* DON'T DELETE!
+  Prevents hiding of scrollbars in browser when window is made smaller.*/
+  min-height: 15px !important;
+  margin: 0px !important;
+  /* need to use padding-inline-end when/if bug 631729 gets fixed: */
+  padding: 0px 16px 1px 1px;
+  -moz-appearance: statusbar;
+  text-shadow: rgba(255, 255, 255, 0.4) 0 1px;
+}
+
+statusbar:-moz-lwtheme {
+  -moz-appearance: none;
+  background: none;
+  border-style: none;
+  text-shadow: inherit;
+}
+
+statusbarpanel {
+  -moz-box-align: center;
+  -moz-box-pack: center;
+  padding: 0 4px;
+}
+
+.statusbarpanel-iconic {
+  padding: 0px;
+}
+
+.statusbarpanel-backgroundbox {
+  -moz-box-align: stretch;
+  padding: 0px;
+}
+
+.statusbarpanel-backgroundbox > .statusbarpanel-contentbox {
+  padding: 0px 1px;
+  -moz-box-align: center;
+}
diff --git a/comm/suite/themes/classic/mac/communicator/config.css b/comm/suite/themes/classic/mac/communicator/config.css
new file mode 100644
index 0000000000..b83b219d28
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/config.css
@@ -0,0 +1,79 @@
+/* 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://global/skin/global.css");
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#warningScreen {
+  background-color: -moz-Dialog;
+}
+
+#warningBox {
+  background-image: url("chrome://global/skin/icons/warning-large.png");
+  background-repeat: no-repeat;
+  background-position: 30px 3em;
+  max-width: 55em;
+  background-color: -moz-Field;
+  color: -moz-FieldText;
+  border: 1px solid ThreeDShadow;
+  border-radius: 10px;
+  padding: 3em;
+  padding-inline-start: 64px;
+  margin-inline-start: 1em;
+  margin-inline-end: 1em;
+}
+
+.title, .description {
+  max-width: 50em;
+  padding-inline-start: 3em;
+}
+
+#warningTitle {
+  margin: 0 0 .6em 0;
+  font-size: 160%;
+  border-bottom: 1px solid ThreeDLightShadow;
+}
+
+#warningText {
+  font-size: 110%;
+  margin-inline-start: 0;
+}
+
+#warningButton {
+  margin-top: 0.6em;
+}
+
+#showWarningNextTime {
+  margin-top: 0.6em;
+}
+
+#configTreeBody::-moz-tree-cell-text(user) {
+  font-weight: bold;
+}
+
+#configTreeBody::-moz-tree-cell-text(locked) {
+  font-style: italic;
+}
+
+#configTree {
+  margin: 0;
+  -moz-appearance: none;
+}
+
+#filterRow {
+  background: linear-gradient(#E8E8E8, #D0D0D0) repeat-x;
+  border-bottom: 1px solid #888;
+  padding: 1px 2px 0;
+}
+
+#filterRow > label {
+  margin: 0 4px;
+  color:  #6D6D6D;
+  text-shadow:  0 1px rgba(255, 255, 255, .4);
+  font-weight: bold;
+}
+
+#textbox {
+  max-width: 35em;
+}
diff --git a/comm/suite/themes/classic/mac/communicator/console/console-error-caret.png b/comm/suite/themes/classic/mac/communicator/console/console-error-caret.png
new file mode 100644
index 0000000000..44b78aa29c
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/console/console-error-caret.png
diff --git a/comm/suite/themes/classic/mac/communicator/console/console-error-dash.png b/comm/suite/themes/classic/mac/communicator/console/console-error-dash.png
new file mode 100644
index 0000000000..ab07898eff
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/console/console-error-dash.png
diff --git a/comm/suite/themes/classic/mac/communicator/console/console.css b/comm/suite/themes/classic/mac/communicator/console/console.css
new file mode 100644
index 0000000000..0bca72cb8d
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/console/console.css
@@ -0,0 +1,164 @@
+/* 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/. */
+
+/* ===== console.css ====================================================
+  == Styles used by the Error Console window.
+  ======================================================================= */
+
+/* View buttons */
+@import "chrome://global/skin/viewbuttons.css";
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+.console-box {
+  background-color: -moz-Field;
+  color: -moz-FieldText;
+  overflow: auto;
+}
+
+/* ::::: console rows ::::: */
+
+.console-row {
+  border-bottom: 1px solid #A3A3A3;
+  padding: 4px;
+}
+
+.console-row-file {
+  color: #505050;
+}
+
+.console-row-msg > label:first-child {
+  font-weight: bold;
+}
+
+.console-row-msg > label, .comsole-row-msg > description, .console-error-msg, .console-row-file, .console-row-code {
+  margin: 2px;
+}
+
+.console-row-file > label {
+  margin: 0;
+}
+
+.console-msg-text {
+  white-space: pre-wrap !important;
+}
+.console-icon {
+  list-style-image: inherit;
+  padding-right: 6px;
+  padding-left: 6px;
+}
+
+/* ..... error rows ..... */
+
+.console-row-code {
+  color: #0000BB;
+  font-size: larger;
+}
+
+.console-dots,
+.console-caret {
+  height: 9px;
+}
+
+.console-dots {
+  background: url("chrome://communicator/skin/console/console-error-dash.png") repeat-x top;
+}
+
+.console-caret {
+  width: 7px;
+  background: url("chrome://communicator/skin/console/console-error-caret.png") no-repeat top;
+}
+
+/* ..... message rows ..... */
+
+.console-row[type="message"] {
+  font-family: monospace;
+}
+
+/* ..... selected state ..... */
+
+.console-row[selected="true"] {
+  background-color: #3D80DF !important;
+  color: #FFF;
+}
+
+.console-row-code[selected="true"],
+.console-row-content[selected="true"] > .console-row-file,
+.console-row-content[selected="true"] > .console-row-file > .console-error-source > .text-link {
+  color: #FFF !important;
+}
+
+/* ::::: row colors ::::: */
+
+.console-row[type="error"],
+.console-row[type="exception"] {
+  background-color: #FFD0DC;
+}
+
+.console-row[type="warning"] {
+  background-color: #F8F3CC;
+}
+
+.console-row[type="message"] {
+  background-color: #D3EDFF;
+}
+
+/* ::::: toolbars ::::: */
+
+#ToolbarEval {
+  -moz-appearance: none;
+  background: linear-gradient(#E8E8E8, #D0D0D0) repeat-x; /* @scopeBarBackground@ */
+  border-bottom: 1px solid #888; /* @scopeBarSeparatorBorder@ */
+  padding: 2px;
+}
+
+#ToolbarEval > label {
+  font-weight: bold;
+  color: #6D6D6D; /* @scopeBarTitleColor@ */
+}
+
+#TextfieldEval {
+  margin: 2px !important;
+}
+
+#ButtonEval {
+  margin: 0 4px;
+  padding: 1px 10px;
+  -moz-appearance: none;
+  border-radius: 10000px;
+  border: 1px solid rgba(0, 0, 0, 0.35); /* @roundButtonBorder@ */
+  background: linear-gradient(#F6F6F6, #E9E9E9); /* @roundButtonBackground@ */
+  box-shadow: 0 1px rgba(255, 255, 255, 0.5), inset 0 1px 1px rgba(255, 255, 255, 0.5); /* @roundButtonShadow@ */
+}
+
+#ButtonEval:hover:active {
+  text-shadow: 0 1px rgba(255, 255, 255, 0.4); /* @loweredShadow@ */
+  background: #DADADA; /* @roundButtonPressedBackground@ */
+  box-shadow: 0 1px rgba(255, 255, 255, 0.4), inset 0 1px 3px rgba(0, 0, 0, 0.2); /* @roundButtonPressedShadow@ */
+}
+
+toolbarseparator {
+  min-height: 1em;
+  background-image: none;
+}
+
+/* Toolbar icons */
+
+#ToolbarMode {
+  -moz-box-pack: center;
+}
+
+#ToolbarMode toolbarbutton > .toolbarbutton-icon {
+  display: none;
+}
+
+#Console\:clear {
+  -moz-box-orient: vertical;
+  -moz-box-align: center;
+  -moz-appearance: toolbarbutton;
+  font: menu;
+  text-shadow: 0 1px rgba(255, 255, 255, 0.4); /* @loweredShadow@ */
+  margin: 4px 0 9px;
+  padding: 0 1px;
+}
diff --git a/comm/suite/themes/classic/mac/communicator/customizeToolbar.css b/comm/suite/themes/classic/mac/communicator/customizeToolbar.css
new file mode 100644
index 0000000000..bcedb2b99a
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/customizeToolbar.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/. */
+
+#palette-box {
+  margin-top: 2px;
+  -moz-appearance: listbox;
+  margin: 0 0 10px;
+}
+
+#palette-box > toolbarpaletteitem {
+  padding: 8px 2px;
+  margin: 0 8px;
+}
+
+#main-box {
+  padding: 12px;
+}
+
+#main-box > separator {
+  -moz-appearance: none;
+  border-bottom: none;
+} 
+
+#instructions {
+  font: menu;
+  font-weight: bold;
+  line-height: 16pt;
+}
+
+hbox button {
+  font: menu;
+}
+
+#main-box > box > button {
+  min-height: 19px; /* aqua size for small buttons */
+  font: message-box;
+}
diff --git a/comm/suite/themes/classic/mac/communicator/datetimepicker.css b/comm/suite/themes/classic/mac/communicator/datetimepicker.css
new file mode 100644
index 0000000000..24e54aae34
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/datetimepicker.css
@@ -0,0 +1,94 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace html url("http://www.w3.org/1999/xhtml");
+
+datepicker {
+  padding: 0 0 1px;
+  margin: 4px;
+  border: none;
+}
+
+.datetimepicker-input-box {
+  -moz-appearance: textfield;
+  cursor: text;
+  margin-right: 4px;
+  margin-bottom: 2px;
+  padding: 0;
+  background-color: -moz-Field;
+  color: -moz-FieldText;
+}
+
+.datetimepicker-input-subbox {
+  width: 1.6em;
+}
+
+html|*.datetimepicker-input {
+  text-align: end;
+}
+
+.datetimepicker-separator {
+  margin: 0 !important;
+}
+
+.datetimepicker-year {
+  width: 3.2em;
+}
+
+.datepicker-dropmarker {
+  margin-bottom: 2px;
+}
+
+datepicker[readonly="true"] {
+  background-color: -moz-Dialog;
+  color: -moz-DialogText;
+}
+
+datepicker[disabled="true"] {
+  cursor: default;
+  background-color: -moz-Dialog;
+  color: GrayText;
+}
+
+.datepicker-mainbox {
+  margin: 2px 4px;
+  border: 1px solid ThreeDShadow;
+  background-color: #EEEEEE;
+  color: -moz-DialogText;
+}
+
+.datepicker-popupgrid > .datepicker-mainbox {
+  margin: 0;
+  border: none;
+}
+
+.datepicker-gridlabel, .datepicker-weeklabel {
+  text-align: center;
+}
+
+.datepicker-gridlabel[today="true"] {
+  background-color: darkgrey;
+  color: white;
+}
+
+.datepicker-gridlabel[selected="true"] {
+  background-color: Highlight;
+  color: HighlightText;
+}
+
+.datepicker-button {
+  -moz-appearance: none;
+  min-width: 8px;
+  padding: 0;
+}
+
+.datepicker-previous {
+  list-style-image: url("chrome://global/skin/arrow/arrow-rit.gif");
+  transform: scaleX(-1);
+}
+
+.datepicker-next {
+  list-style-image: url("chrome://global/skin/arrow/arrow-rit.gif");
+}
diff --git a/comm/suite/themes/classic/mac/communicator/downloads/downloadButtons.png b/comm/suite/themes/classic/mac/communicator/downloads/downloadButtons.png
new file mode 100644
index 0000000000..6f3c7c9855
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/downloads/downloadButtons.png
diff --git a/comm/suite/themes/classic/mac/communicator/downloads/downloadmanager.css b/comm/suite/themes/classic/mac/communicator/downloads/downloadmanager.css
new file mode 100644
index 0000000000..8f84152c48
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/downloads/downloadmanager.css
@@ -0,0 +1,142 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* Note to themers:
+   On rows and all cells, those properties for download states are available:
+   active, inactive, resumable, paused, downloading, finished, failed, canceled, blocked
+*/
+
+#clearListButton {
+  -moz-appearance: toolbarbutton;
+  text-shadow: 0 1px rgba(255, 255, 255, 0.4);
+  margin: 0 6px;
+  min-height: 18px;
+  min-width: 0;
+}
+
+#clearListButton:-moz-lwtheme:not([disabled="true"]) {
+  color: inherit;
+  text-shadow: inherit;
+}
+
+treechildren::-moz-tree-image {
+  margin-inline-start: -1px;
+}
+
+treechildren::-moz-tree-image(Name) {
+  margin-inline-end: 2px;
+}
+
+#ActionPlay {
+  list-style-image: url("chrome://communicator/skin/downloads/downloadButtons.png");
+  -moz-image-region: rect(0px, 16px, 16px, 0px);
+}
+
+treechildren::-moz-tree-image(ActionPlay, downloading, resumable),
+#pauseButton {
+  /* pause */
+  list-style-image: url("chrome://communicator/skin/downloads/downloadButtons.png");
+  -moz-image-region: rect(0px, 48px, 16px, 32px);
+}
+
+treechildren::-moz-tree-image(ActionPlay, paused, resumable),
+#resumeButton {
+  /* resume */
+  list-style-image: url("chrome://communicator/skin/downloads/downloadButtons.png");
+  -moz-image-region: rect(0px, 16px, 16px, 0px);
+}
+
+treechildren::-moz-tree-image(ActionPlay, failed),
+treechildren::-moz-tree-image(ActionPlay, canceled),
+#retryButton {
+  /* retry */
+  list-style-image: url("chrome://communicator/skin/downloads/downloadButtons.png");
+  -moz-image-region: rect(0px, 64px, 16px, 48px);
+}
+
+#ActionStop {
+  list-style-image: url("chrome://communicator/skin/downloads/downloadButtons.png");
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+
+treechildren::-moz-tree-image(ActionStop, active),
+#cancelButton {
+  /* cancel */
+  list-style-image: url("chrome://communicator/skin/downloads/downloadButtons.png");
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+
+treechildren::-moz-tree-image(ActionStop, inactive) {
+  /* remove */
+  list-style-image: url("chrome://communicator/skin/downloads/dl-remove.png");
+  -moz-image-region: auto;
+}
+
+/* There's no way this will look like a native progressbar, but we can at least
+   try to mimic the aqua, graphite and non-active colors. */
+treechildren::-moz-tree-progressmeter {
+  background: url("chrome://communicator/skin/downloads/progressBg.png") repeat-x;
+  color: rgba(0, 115, 255, 0.5);
+  border: none;
+  padding-bottom: 1px;
+  margin-top: 3px;
+}
+
+@media (-moz-mac-graphite-theme) {
+  treechildren::-moz-tree-progressmeter {
+    color: rgba(43, 71, 106, 0.5);
+  }
+}
+
+treechildren:-moz-window-inactive::-moz-tree-progressmeter {
+  color: rgba(0, 0, 0, 0.1);
+}
+
+/* progress dialogs */
+
+#dlProgressWindow {
+  padding: 14px;
+}
+
+/* focusable label, focus ring like .link-text but not a link */
+#fileName, #fileSource {
+  border: 1px solid transparent;
+  /* 1px is used for border, make margins smaller by that */
+  margin-top: 0px;
+  margin-bottom: 1px;
+  margin-inline-start: 5px;
+  margin-inline-end: 4px;
+}
+
+#fileName:focus,
+#fileSource:focus {
+  border: 1px dotted -moz-DialogText;
+}
+
+#fileName {
+  font-weight: bold;
+  margin-bottom: 6px;
+}
+
+.mini-button {
+  -moz-appearance: none;
+  background-color: transparent;
+  border: none;
+  padding: 0;
+  margin: 0;
+  min-width: 0;
+  min-height: 0;
+}
+
+.mini-button > .button-box {
+  -moz-appearance: none;
+  padding: 0 !important;
+}
+
+#progressBox {
+  margin-top: 6px;
+  margin-bottom: 6px;
+}
diff --git a/comm/suite/themes/classic/mac/communicator/downloads/progressBg.png b/comm/suite/themes/classic/mac/communicator/downloads/progressBg.png
new file mode 100644
index 0000000000..c3261526f7
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/downloads/progressBg.png
diff --git a/comm/suite/themes/classic/mac/communicator/helpviewer/dropmark-nav.png b/comm/suite/themes/classic/mac/communicator/helpviewer/dropmark-nav.png
new file mode 100644
index 0000000000..e841574c39
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/helpviewer/dropmark-nav.png
diff --git a/comm/suite/themes/classic/mac/communicator/helpviewer/help.css b/comm/suite/themes/classic/mac/communicator/helpviewer/help.css
new file mode 100644
index 0000000000..1b0947d488
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/helpviewer/help.css
@@ -0,0 +1,136 @@
+/* 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://communicator/skin/");
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#HelpToolbar {
+  padding-inline-start: 5px;
+}
+
+#HelpToolbar toolbarbutton {
+  min-width: 0px;
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
+  -moz-box-orient: horizontal !important;
+}
+
+#HelpToolbar toolbarbutton[type="menu-button"] {
+  margin: 0 2px 0 2px;
+  padding: 3px 1px 3px 1px;
+
+}
+
+/* this element contains the icon and the label */
+#HelpToolbar .toolbarbutton-menubutton-button {
+  margin: 0px !important;
+  padding: 0px !important;
+  border: 0px !important;
+}
+
+/* Hide labels for the toolbar because we really don't need them what with the
+   tooltips */
+#HelpToolbar .toolbarbutton-text {
+  display: none;
+}
+
+/* Set the minimum sidebar width so the help contents aren't squeezed together.*/
+#help-sidebar { min-width: 30px; width: 20em; max-width: 25em; }
+
+#help-back-button toolbarbutton,
+#help-forward-button toolbarbutton {
+  list-style-image: inherit;
+  -moz-image-region: inherit;
+}
+
+#help-back-button,
+#help-back-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(60px 29px 89px 0);
+}
+
+#help-back-button:not([disabled="true"]):hover:active,
+#help-back-button[open]:not([disabled="true"]) {
+  -moz-image-region: rect(60px 59px 89px 30px);
+}
+
+#help-back-button[disabled="true"] {
+  -moz-image-region: rect(60px 89px 89px 60px);
+}
+
+#help-forward-button,
+#help-forward-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(90px 29px 119px 0);
+}
+
+#help-forward-button:not([disabled="true"]):hover:active,
+#help-forward-button[open]:not([disabled="true"]) {
+  -moz-image-region: rect(90px 59px 119px 30px);
+}
+
+#help-forward-button[disabled="true"] {
+  -moz-image-region: rect(90px 89px 119px 60px);
+}
+
+#help-home-button,
+#help-home-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(120px 29px 149px 0);
+}
+
+#help-home-button:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(120px 59px 149px 30px);
+}
+
+#help-home-button[disabled="true"] {
+  -moz-image-region: rect(120px 89px 149px 60px);
+}
+
+#help-print-button,
+#help-print-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(0 29px 29px 0);
+}
+
+#help-print-button:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(0 59px 29px 30px);
+}
+
+#help-print-button[disabled="true"] {
+  -moz-image-region: rect(0 89px 29px 60px);
+}
+
+/* Style the back/forward dropmarks to connect them to the buttons */
+
+#help-back-button > .toolbarbutton-menubutton-dropmarker,
+#help-forward-button > .toolbarbutton-menubutton-dropmarker {
+  margin-top: 3px;
+}
+
+#help-back-button > .toolbarbutton-menubutton-dropmarker,
+#help-back-button:hover > .toolbarbutton-menubutton-dropmarker,
+#help-back-button:hover:active > .toolbarbutton-menubutton-dropmarker,
+#help-forward-button > .toolbarbutton-menubutton-dropmarker,
+#help-forward-button:hover > .toolbarbutton-menubutton-dropmarker,
+#help-forward-button:hover:active > .toolbarbutton-menubutton-dropmarker {
+  list-style-image: url("chrome://global/skin/arrow/arrow-dn.png");
+  -moz-image-region: auto;
+}
+
+#help-back-button[disabled="true"] > .toolbarbutton-menubutton-dropmarker,
+#help-forward-button[disabled="true"] > .toolbarbutton-menubutton-dropmarker {
+  list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.png") !important;
+  -moz-image-region: auto !important;
+}
+
+#help-sidebar-splitter {
+  border-inline-end: 1px solid #BEBEBE;
+}
+
+/* make findbar appear above content */
+#appcontent {
+  -moz-box-direction: reverse;
+}
+
+/* style findbar for being on top */
+#FindToolbar {
+  border-top: none;
+  border-bottom: 1px solid #888888;
+}
diff --git a/comm/suite/themes/classic/mac/communicator/icons/autocomplete-dropmarker.png b/comm/suite/themes/classic/mac/communicator/icons/autocomplete-dropmarker.png
new file mode 100644
index 0000000000..e48d044526
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/icons/autocomplete-dropmarker.png
diff --git a/comm/suite/themes/classic/mac/communicator/icons/communicatoricons-small.png b/comm/suite/themes/classic/mac/communicator/icons/communicatoricons-small.png
new file mode 100644
index 0000000000..4e94de98ba
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/icons/communicatoricons-small.png
diff --git a/comm/suite/themes/classic/mac/communicator/icons/communicatoricons.png b/comm/suite/themes/classic/mac/communicator/icons/communicatoricons.png
new file mode 100644
index 0000000000..85e5511582
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/icons/communicatoricons.png
diff --git a/comm/suite/themes/classic/mac/communicator/icons/feedIcon16-disabled.png b/comm/suite/themes/classic/mac/communicator/icons/feedIcon16-disabled.png
new file mode 100644
index 0000000000..77efbb49b1
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/icons/feedIcon16-disabled.png
diff --git a/comm/suite/themes/classic/mac/communicator/icons/geolocation-16.png b/comm/suite/themes/classic/mac/communicator/icons/geolocation-16.png
new file mode 100644
index 0000000000..a40cc1bb9a
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/icons/geolocation-16.png
diff --git a/comm/suite/themes/classic/mac/communicator/icons/geolocation-64.png b/comm/suite/themes/classic/mac/communicator/icons/geolocation-64.png
new file mode 100644
index 0000000000..099b9c76f3
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/icons/geolocation-64.png
diff --git a/comm/suite/themes/classic/mac/communicator/icons/item.png b/comm/suite/themes/classic/mac/communicator/icons/item.png
new file mode 100644
index 0000000000..d706dfeeb3
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/icons/item.png
diff --git a/comm/suite/themes/classic/mac/communicator/icons/key-16.png b/comm/suite/themes/classic/mac/communicator/icons/key-16.png
new file mode 100644
index 0000000000..420ff450fa
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/icons/key-16.png
diff --git a/comm/suite/themes/classic/mac/communicator/icons/key-16@2x.png b/comm/suite/themes/classic/mac/communicator/icons/key-16@2x.png
new file mode 100644
index 0000000000..7ec431b0ad
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/icons/key-16@2x.png
diff --git a/comm/suite/themes/classic/mac/communicator/icons/key-64.png b/comm/suite/themes/classic/mac/communicator/icons/key-64.png
new file mode 100644
index 0000000000..49819350d7
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/icons/key-64.png
diff --git a/comm/suite/themes/classic/mac/communicator/icons/key.png b/comm/suite/themes/classic/mac/communicator/icons/key.png
new file mode 100644
index 0000000000..e51cf29881
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/icons/key.png
diff --git a/comm/suite/themes/classic/mac/communicator/icons/loading.png b/comm/suite/themes/classic/mac/communicator/icons/loading.png
new file mode 100644
index 0000000000..290d0523be
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/icons/loading.png
diff --git a/comm/suite/themes/classic/mac/communicator/icons/panebutton-active.png b/comm/suite/themes/classic/mac/communicator/icons/panebutton-active.png
new file mode 100644
index 0000000000..43a95235e0
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/icons/panebutton-active.png
diff --git a/comm/suite/themes/classic/mac/communicator/icons/panebutton-inactive.png b/comm/suite/themes/classic/mac/communicator/icons/panebutton-inactive.png
new file mode 100644
index 0000000000..e424dc9ced
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/icons/panebutton-inactive.png
diff --git a/comm/suite/themes/classic/mac/communicator/icons/warning-24.png b/comm/suite/themes/classic/mac/communicator/icons/warning-24.png
new file mode 100644
index 0000000000..a599a7e19a
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/icons/warning-24.png
diff --git a/comm/suite/themes/classic/mac/communicator/numberbox.css b/comm/suite/themes/classic/mac/communicator/numberbox.css
new file mode 100644
index 0000000000..73db124959
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/numberbox.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/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace html url("http://www.w3.org/1999/xhtml");
+
+textbox[type="number"] {
+  -moz-appearance: none;
+  -moz-box-align: center;
+  padding: 0 !important;
+  border: none;
+  background-color: transparent;
+  cursor: default;
+}
+
+html|*.numberbox-input {
+  text-align: right;
+  padding: 0 1px !important;
+}
+
+.numberbox-input-box {
+  -moz-appearance: textfield;
+  margin-right: 4px;
+}
diff --git a/comm/suite/themes/classic/mac/communicator/places/bookmarks.css b/comm/suite/themes/classic/mac/communicator/places/bookmarks.css
new file mode 100644
index 0000000000..684fd8b9e2
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/places/bookmarks.css
@@ -0,0 +1,108 @@
+/* -*- Mode: C; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/**
+ * Style rules for generic bookmarks items.
+ */
+
+treechildren::-moz-tree-image(title) {
+  margin-inline-end: 2px;
+  width: 16px;
+  height: 16px;
+}
+
+.bookmark-item,
+treechildren::-moz-tree-image(title) {
+  list-style-image: url("chrome://communicator/skin/places/bookmark-item.svg");
+}
+
+.bookmark-item[container="true"],
+treechildren::-moz-tree-image(title, container) {
+  list-style-image: url("chrome://global/skin/tree/folder.png");
+}
+
+.bookmark-item[container="true"][open="true"][loading="true"] {
+  list-style-image: url("chrome://communicator/skin/icons/loading.png") !important;
+}
+
+.bookmark-item > .toolbarbutton-box > .toolbarbutton-icon {
+  list-style-image: inherit;
+  width: 16px;
+  height: 16px;
+}
+
+.bookmark-item[container][livemark],
+treechildren::-moz-tree-image(title, container, livemark) {
+  list-style-image: url("chrome://communicator/skin/places/livemark-folder.png");
+}
+
+.bookmark-item[container][livemark] .bookmark-item,
+treechildren::-moz-tree-image(title, livemarkItem) {
+  list-style-image: url("chrome://communicator/skin/places/bookmark-item-updated.png");
+}
+
+.bookmark-item[container][livemark] .bookmark-item[visited],
+treechildren::-moz-tree-image(title, livemarkItem, visited) {
+  list-style-image: url("chrome://communicator/skin/places/bookmark-item.svg");
+}
+
+#bookmarksToolbarFolderMenu,
+#BMB_bookmarksToolbarFolderMenu,
+treechildren::-moz-tree-image(container, queryFolder_toolbar_____) {
+  list-style-image: url("chrome://communicator/skin/places/bookmarksToolbar.png");
+}
+
+treechildren::-moz-tree-image(container, queryFolder_menu________) {
+  list-style-image: url("chrome://communicator/skin/places/bookmarksMenu.png");
+}
+
+#unsortedBookmarksFolderMenu,
+#BMB_unsortedBookmarksFolderMenu,
+treechildren::-moz-tree-image(container, queryFolder_unfiled_____) {
+  list-style-image: url("chrome://communicator/skin/places/unsortedBookmarks.png");
+}
+
+/* query-nodes should be styled even if they're not expandable */
+.bookmark-item[query],
+treechildren::-moz-tree-image(query) {
+  list-style-image: url("chrome://communicator/skin/places/query.png");
+}
+
+treechildren::-moz-tree-image(query, OrganizerQuery_AllBookmarks) {
+  list-style-image: url("chrome://communicator/skin/places/allBookmarks.png");
+}
+
+
+.bookmark-item[query][tagContainer],
+treechildren::-moz-tree-image(title, query, tagContainer),
+treechildren::-moz-tree-image(query, OrganizerQuery_Tags) {
+  list-style-image: url("chrome://communicator/skin/places/tag.png");
+}
+
+/* calendar icon for history grouping items by day */
+treechildren::-moz-tree-image(title, query, dayContainer) {
+  list-style-image: url("chrome://communicator/skin/places/calendar.png");
+}
+
+treechildren::-moz-tree-image(query, OrganizerQuery_History) {
+  list-style-image: url("chrome://communicator/skin/places/history.png");
+}
+
+treechildren::-moz-tree-image(title, separator) {
+  list-style-image: none;
+  width: 0px;
+  height: 0px;
+}
+
+treechildren::-moz-tree-cell-text(title, separator) {
+  color: ThreeDShadow;
+  margin: 0px 5px;
+}
+
+treechildren::-moz-tree-cell-text(title, separator, selected, focus) {
+  color: HighlightText;
+}
diff --git a/comm/suite/themes/classic/mac/communicator/places/bookmarksMenu.png b/comm/suite/themes/classic/mac/communicator/places/bookmarksMenu.png
new file mode 100644
index 0000000000..cb2351d963
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/places/bookmarksMenu.png
diff --git a/comm/suite/themes/classic/mac/communicator/places/bookmarksToolbar.css b/comm/suite/themes/classic/mac/communicator/places/bookmarksToolbar.css
new file mode 100644
index 0000000000..fb4875387b
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/places/bookmarksToolbar.css
@@ -0,0 +1,77 @@
+/* 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/. */
+
+/* ===== bookmarksToolbar.css ===========================================
+  == Styles specific to bookmark items in a toolbar.
+  ======================================================================= */
+
+@import url("chrome://communicator/skin/places/bookmarks.css");
+
+/* ::::: bookmark toolbar buttons ::::: */
+
+/* ..... bookmark items ..... */
+
+toolbarbutton.bookmark-item {
+  min-width: 0px;
+  max-width: 13em;
+}
+
+.bookmark-item > .toolbarbutton-icon {
+  background-image: url("chrome://communicator/skin/places/filters.svg"); /* Preload filter */
+  width: 16px;
+  height: 16px;
+}
+
+.bookmark-item:not([disabled="true"]):hover:active > .toolbarbutton-icon,
+.bookmark-item[open] > .toolbarbutton-icon {
+  filter: url("chrome://communicator/skin/places/filters.svg#iconPressed");
+}
+
+toolbarbutton.bookmark-item[disabled="true"] > .toolbarbutton-icon {
+  opacity: 0.5 !important;
+}
+
+.bookmark-item > .toolbarbutton-menu-dropmarker {
+  display: none;
+}
+
+/* ::::: bookmark menus ::::: */
+
+.bookmark-group {
+  list-style-image: url(chrome://communicator/skin/places/bookmark-group.png) !important;
+}
+
+.menuitem-iconic.bookmark-item[disabled="true"] {
+  list-style-image: url("chrome://communicator/skin/places/bookmark-item-dis.png");
+}
+
+.menu-iconic.bookmark-item[disabled="true"][container="true"] {
+  opacity: 0.5;
+}
+
+/* ..... drag and drop styles ..... */
+
+#PlacesToolbarDropIndicator {
+  list-style-image: url("chrome://communicator/skin/places/toolbarDropMarker.png");
+}
+
+.bookmark-item[dragover-into="true"] {
+  background: Highlight !important;
+  color: HighlightText !important;
+}
+
+/* rules for menupopup drop indicators */
+.menupopup-drop-indicator-bar {
+  position: relative;
+  /* these two margins must together compensate the indicator's height */
+  margin-top: -1px;
+  margin-bottom: -1px;
+}
+
+.menupopup-drop-indicator {
+  list-style-image: none;
+  height: 2px;
+  margin-inline-end: -4em;
+  background-color: Highlight;
+}
diff --git a/comm/suite/themes/classic/mac/communicator/places/bookmarksToolbar.png b/comm/suite/themes/classic/mac/communicator/places/bookmarksToolbar.png
new file mode 100644
index 0000000000..075708d02e
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/places/bookmarksToolbar.png
diff --git a/comm/suite/themes/classic/mac/communicator/places/editBookmarkOverlay.css b/comm/suite/themes/classic/mac/communicator/places/editBookmarkOverlay.css
new file mode 100644
index 0000000000..8b8f90c82a
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/places/editBookmarkOverlay.css
@@ -0,0 +1,75 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace html url("http://www.w3.org/1999/xhtml");
+
+/**** folder menulist ****/
+.folder-icon > .menulist-label-box > .menulist-icon {
+  width: 16px;
+  height: 16px;
+}
+
+.folder-icon > .menu-iconic-left {
+  display: -moz-box;
+}
+
+.folder-icon {
+  list-style-image: url("chrome://global/skin/tree/folder.png");
+}
+
+.menulist-icon {
+  margin: 0 !important;
+}
+
+/**** expanders ****/
+
+.expander-up,
+.expander-down {
+  margin: 0 4px 1px 8px;
+  padding: 0;
+}
+
+.expander-up {
+  -moz-appearance: -moz-mac-disclosure-button-open;
+}
+
+.expander-down {
+  -moz-appearance: -moz-mac-disclosure-button-closed;
+}
+
+#editBookmarkPanelContent {
+  min-width: 23em;
+}
+
+#editBMPanel_folderTree {
+  margin: 6px 4px 0 4px;
+}
+
+/* Hide the value column of the tag autocomplete popup
+ * leaving only the comment column visible. This is
+ * so that only the tag being edited is shown in the
+ * popup.
+ */
+#editBMPanel_tagsField #treecolAutoCompleteValue {
+  visibility: collapse;
+}
+
+
+/* ::::: bookmark panel dropdown icons ::::: */
+
+#editBMPanel_folderMenuList[selectedIndex="0"],
+#editBMPanel_toolbarFolderItem {
+  list-style-image: url("chrome://communicator/skin/places/bookmarksToolbar.png");
+}
+
+#editBMPanel_folderMenuList[selectedIndex="1"],
+#editBMPanel_bmRootItem {
+  list-style-image: url("chrome://communicator/skin/places/bookmarksMenu.png");
+}
+
+#editBMPanel_folderMenuList[selectedIndex="2"],
+#editBMPanel_unfiledRootItem {
+  list-style-image: url("chrome://communicator/skin/places/unsortedBookmarks.png");
+}
diff --git a/comm/suite/themes/classic/mac/communicator/places/filters.svg b/comm/suite/themes/classic/mac/communicator/places/filters.svg
new file mode 100644
index 0000000000..d3ad6a76b8
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/places/filters.svg
@@ -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/. -->
+
+<svg xmlns="http://www.w3.org/2000/svg">
+  <filter id="iconPressed" color-interpolation-filters="sRGB">
+    <!-- Multiply all components with 0.55. -->
+    <feComponentTransfer>
+      <feFuncR type="linear" slope=".55"/>
+      <feFuncG type="linear" slope=".55"/>
+      <feFuncB type="linear" slope=".55"/>
+    </feComponentTransfer>
+  </filter>
+</svg>
diff --git a/comm/suite/themes/classic/mac/communicator/places/livemark-folder.png b/comm/suite/themes/classic/mac/communicator/places/livemark-folder.png
new file mode 100644
index 0000000000..62414dbeda
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/places/livemark-folder.png
diff --git a/comm/suite/themes/classic/mac/communicator/places/organizer.css b/comm/suite/themes/classic/mac/communicator/places/organizer.css
new file mode 100644
index 0000000000..327e4a513d
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/places/organizer.css
@@ -0,0 +1,185 @@
+/* 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/. */
+
+#placesList {
+  padding: 0;
+  -moz-appearance: -moz-mac-source-list;
+  -moz-font-smoothing-background-color: -moz-mac-source-list;
+}
+
+#placesList > treechildren::-moz-tree-row {
+  min-height: 18px;
+}
+
+#placesList > treechildren::-moz-tree-row(selected) {
+  -moz-appearance: -moz-mac-source-list-selection;
+  -moz-font-smoothing-background-color: -moz-mac-source-list-selection;
+}
+
+#placesList > treechildren::-moz-tree-row(selected, focus) {
+  -moz-appearance: -moz-mac-active-source-list-selection;
+  -moz-font-smoothing-background-color: -moz-mac-active-source-list-selection;
+}
+
+#placesList > treechildren::-moz-tree-twisty(selected),
+#placesList > treechildren::-moz-tree-cell-text(selected) {
+  color: #FFFFFF;
+  fill-opacity: 1;
+}
+
+#placesList > treechildren::-moz-tree-twisty {
+  width: 16px;
+  padding-bottom: 1px;
+}
+
+@media (-moz-mac-yosemite-theme) {
+  #placesList > treechildren::-moz-tree-twisty(selected),
+  #placesList > treechildren::-moz-tree-cell-text(selected) {
+    color: -moz-dialogtext;
+    fill-opacity: 0.6;
+  }
+
+  #placesList > treechildren::-moz-tree-twisty(selected, focus),
+  #placesList > treechildren::-moz-tree-cell-text(selected, focus) {
+    color: #FFFFFF;
+    fill-opacity: 1;
+  }
+}
+
+#placeContent {
+  border: 0;
+}
+
+#placeContent > treechildren::-moz-tree-row {
+  min-height: 18px;
+  border-top: none !important;
+}
+
+#placeContent > treechildren::-moz-tree-cell,
+#placeContent > treechildren::-moz-tree-column {
+  border-right: 1px solid #D7DAD7;
+}
+
+#placeContent > treechildren::-moz-tree-cell(separator) {
+  border-color: transparent;
+}
+
+#placesList-splitter {
+  border: solid #B3B3B3;
+  border-width: 0 1px 0 0;
+  background-image: none;
+  min-width: 1px;
+}
+
+/* This splitter is always disabled and contains a grippy... see bug 591779 */
+#detailsDeck-splitter {
+  display: none;
+}
+
+#detailsDeck {
+  border-top: 1px solid #919191;
+  background-color: #F0F0F0;
+  padding: 10px;
+}
+
+#infoBoxExpander {
+  margin: 0;
+}
+
+#infoBoxExpanderLabel {
+  display: none;
+}
+
+#advancedSearch > hbox,
+#advancedSearchRows > row {
+  background-color: #E8E8E8;
+  border-top: 1px solid #F8F8F8;
+  border-bottom: 1px solid #BABABA;
+}
+
+#advancedSearchRows > row,
+#searchActions {
+  padding-inline-start: 2px;
+  padding-inline-end: 8px;
+}
+
+#organizerScopeBar {
+  padding: 3px;
+  -moz-appearance: none;
+  background: linear-gradient(#E8E8E8, #D0D0D0) repeat-x;
+  border-bottom: 1px solid #888888;
+}
+
+#scopeBarTitle {
+  font: icon;
+  color: #6D6D6D;
+  font-weight: bold;
+  text-shadow: 0 1px rgba(255, 255, 255, .4);
+  margin: 0 6px 1px;
+}
+
+button[group="scopeBar"] {
+  -moz-appearance: none;
+  -moz-box-pack: center;
+  border: 0;
+  font: icon;
+  font-weight: bold;
+  min-width: 0;
+  color: #2D2D2D;
+  border-radius: 10000px;
+  padding: 0 10px 1px;
+  margin: 1px;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.4);
+}
+
+button[group="scopeBar"]:hover,
+button[group="scopeBar"][checked="true"] {
+  color: #FFFFFF;
+  text-shadow: 0 1px rgba(0, 0, 0, .4);
+  background-color: rgba(0, 0, 0, .32);
+}
+
+button[group="scopeBar"]:active:hover,
+button[group="scopeBar"][checked="true"] {
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.4), 0 1px rgba(255, 255, 255, 0.4);
+}
+
+button[group="scopeBar"]:active:hover {
+  background-color: rgba(0, 0, 0, .5);
+}
+
+.button-text {
+  margin: 0 !important;
+}
+
+#organizerScopeBarExpander {
+  margin: 0;
+  padding: 0;
+  padding-inline-end: 2px;
+}
+
+#saveSearch {
+  margin: 0 4px;
+  padding: 0 10px;
+  min-width: 0;
+  -moz-appearance: none;
+  border-radius: 10000px;
+  border: 1px solid rgba(0, 0, 0, .4);
+  text-shadow: 0 1px rgba(255, 255, 255, .4);
+  background: linear-gradient(#FFF, #CACACA) repeat-x;
+  box-shadow: 0 1px rgba(255, 255, 255, .4);
+}
+
+#saveSearch:active:hover {
+  background: #CCCCCC;
+  box-shadow: inset 0 1px 3px rgba(0, 0, 0, .2), 0 1px rgba(255, 255, 255, .4);
+}
+
+#saveSearch:focus {
+  box-shadow: 0 0 1px -moz-mac-focusring inset, 0 0 3px 1px -moz-mac-focusring, 0 0 1.5px 1px -moz-mac-focusring, 0 1px rgba(255, 255, 255, .4);
+}
+
+#saveSearch:active:hover:focus {
+  box-shadow: 0 0 1px -moz-mac-focusring inset, 0 0 3px 1px -moz-mac-focusring, 0 0 1.5px 1px -moz-mac-focusring, inset 0 1px 3px rgba(0, 0, 0, .2), 0 1px rgba(255, 255, 255, .4);
+}
diff --git a/comm/suite/themes/classic/mac/communicator/places/query.png b/comm/suite/themes/classic/mac/communicator/places/query.png
new file mode 100644
index 0000000000..4b87272ed4
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/places/query.png
diff --git a/comm/suite/themes/classic/mac/communicator/places/tag.png b/comm/suite/themes/classic/mac/communicator/places/tag.png
new file mode 100644
index 0000000000..a4038bb4fa
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/places/tag.png
diff --git a/comm/suite/themes/classic/mac/communicator/places/toolbarDropMarker.png b/comm/suite/themes/classic/mac/communicator/places/toolbarDropMarker.png
new file mode 100644
index 0000000000..026c1b82db
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/places/toolbarDropMarker.png
diff --git a/comm/suite/themes/classic/mac/communicator/preferences.css b/comm/suite/themes/classic/mac/communicator/preferences.css
new file mode 100644
index 0000000000..883f09c2b4
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/preferences.css
@@ -0,0 +1,77 @@
+/* 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/. */
+
+/* Styles used by all preference windows and panes of SeaMonkey */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: Main Window ::::: */
+
+prefwindow {
+  -moz-appearance: dialog;
+  background-color: #FFFFFF;
+  color: -moz-DialogText;
+  font: message-box;
+  padding-top: 8px;
+  padding-bottom: 0px;
+  padding-inline-start: 8px;
+  padding-inline-end: 10px;
+  font: -moz-dialog;
+}
+
+prefwindow[type="child"] {
+  padding-top: 18px;
+  padding-bottom: 15px;
+  padding-inline-start: 18px;
+  padding-inline-end: 20px;
+}
+
+prefpane {
+  padding: 12px 12px 0 12px;
+}
+
+prefwindow[type="child"] > prefpane {
+  padding: 0;
+}
+
+.prefWindow-dlgbuttons {
+  margin: 0 12px 12px;
+  padding-top: 0 !important;
+}
+
+.paneSelector {
+  font: message-box;
+  padding: 1px 4px;
+  -moz-appearance: toolbar;
+  margin: 0;
+}
+
+radio[pane] {
+  border: solid transparent;
+  border-width: 0 2px;
+  padding: 5px 4px 3px;
+  margin: 0;
+  -moz-appearance: none;
+  text-shadow: rgba(255, 255, 255, 0.4) 0 1px;
+}
+
+radio[pane]:active:hover {
+  text-shadow: none;
+}
+
+radio[pane]:active:hover > .paneButtonIcon {
+  filter: brightness(0.55);
+}
+
+radio[pane][selected="true"] {
+  border-image: url("chrome://communicator/skin/icons/panebutton-active.png") 0 2 fill repeat stretch;
+}
+
+radio[pane][selected="true"]:-moz-window-inactive {
+  border-image: url("chrome://communicator/skin/icons/panebutton-inactive.png") 0 2 fill repeat stretch;
+}
+
+.paneButtonLabel {
+  margin: 0 !important;
+}
diff --git a/comm/suite/themes/classic/mac/communicator/profile/profile.css b/comm/suite/themes/classic/mac/communicator/profile/profile.css
new file mode 100644
index 0000000000..0c28c6b019
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/profile/profile.css
@@ -0,0 +1,51 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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://global/skin/global.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+treechildren::-moz-tree-image {
+  margin-inline-end: 2px;
+  list-style-image: url("chrome://communicator/skin/profile/profileicon-large.gif");
+}
+
+treechildren::-moz-tree-image(rowMigrate-no) {
+  list-style-image: url("chrome://communicator/skin/profile/migrate.gif");
+}
+
+/* profile selection dialog */
+
+/* Override global.css */
+hbox.wizard-box {
+  padding: 10px 10px 10px 10px;
+}
+
+#header {
+  -moz-box-orient: vertical;
+  margin: -14px -14px 0;
+  padding: 12px;
+  padding-inline-end: 5px;
+  padding-inline-start: 25px;
+}
+
+#header > .dialogheader-title {
+  font: inherit;
+  font-weight: bold;
+}
+
+#header > .dialogheader-description {
+  margin-inline-start: 12px !important;
+}
+
+#intro,
+#label {
+  width: 17em;
+}
+
+#managebuttons > button {
+  min-width: 8em;
+}
diff --git a/comm/suite/themes/classic/mac/communicator/sanitizeDialog.css b/comm/suite/themes/classic/mac/communicator/sanitizeDialog.css
new file mode 100644
index 0000000000..f01eb2c0b1
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/sanitizeDialog.css
@@ -0,0 +1,45 @@
+/* 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/. */
+
+/* Align the duration label with the warning box and item list */
+#sanitizeDurationLabel {
+  margin-inline-start: 1px;
+}
+
+
+/* Hide the duration dropdown suffix label if it's empty.  Otherwise it
+   takes up a little space, causing the end of the dropdown to not be aligned
+   with the warning box. */
+#sanitizeDurationSuffixLabel[value=""] {
+  display: none;
+}
+
+
+/* Sanitize everything warning box */
+#sanitizeWarningBox {
+  background-color: Window;
+  border: 1px solid ThreeDDarkShadow;
+  border-radius: 5px;
+  padding: 16px;
+}
+
+#sanitizeWarningIcon {
+  list-style-image: url("chrome://global/skin/icons/warning-large.png");
+  padding: 0;
+  margin: 0;
+}
+
+#sanitizeWarningDescBox {
+  padding: 0 16px;
+  margin: 0;
+}
+
+
+/* Align the last dialog button with the end of the warning box */
+.dialog-button-box {
+  margin-inline-end: 0;
+}
+.dialog-button[dlgtype="accept"] {
+  margin-inline-end: 0;
+}
diff --git a/comm/suite/themes/classic/mac/communicator/search/searchbar-dropmarker.png b/comm/suite/themes/classic/mac/communicator/search/searchbar-dropmarker.png
new file mode 100644
index 0000000000..3177b09a5f
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/search/searchbar-dropmarker.png
diff --git a/comm/suite/themes/classic/mac/communicator/search/searchbar-search.png b/comm/suite/themes/classic/mac/communicator/search/searchbar-search.png
new file mode 100644
index 0000000000..ca2dbfcd16
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/search/searchbar-search.png
diff --git a/comm/suite/themes/classic/mac/communicator/search/searchbar.css b/comm/suite/themes/classic/mac/communicator/search/searchbar.css
new file mode 100644
index 0000000000..9b1280e749
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/search/searchbar.css
@@ -0,0 +1,69 @@
+/* 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/. */
+
+.searchbar-textbox {
+  width: 6em;
+  min-width: 6em;
+  -moz-appearance: none;
+  border-radius: 10000px;
+  background-clip: padding-box;
+  padding: 0;
+  margin: 0 4px;
+  border: 1px solid;
+  border-color: rgb(132, 132, 132) rgba(132, 132, 132, 0.6) rgba(132, 132, 132, 0.2);
+  box-shadow: 0 1px rgb(212, 212, 212) inset,
+              0 -1px rgb(253, 253, 253) inset,
+              1px 0 rgb(247, 247, 247) inset,
+              -1px 0 rgb(247, 247, 247) inset;
+}
+
+.searchbar-textbox[focused="true"] {
+  box-shadow: 0 0 1px -moz-mac-focusring inset,
+              0 0 4px 1px -moz-mac-focusring,
+              0 0 1.5px 1px -moz-mac-focusring;
+}
+
+.textbox-input-box {
+  margin: 0;
+  padding: 3px 0 2px;
+  height: 20px;
+}
+
+/* ::::: searchbar-engine-button ::::: */
+
+.toolbarbutton-icon {
+  height: 16px;
+  width: 16px;
+  list-style-image: url("chrome://communicator/skin/icons//item.png");
+}
+
+.searchbar-engine-button {
+  padding-inline-start: 6px !important; /* Need !important because of class="plain". */
+  min-width: 0;
+}
+
+.toolbarbutton-text {
+  display: none;
+}
+
+.toolbarbutton-menu-dropmarker {
+  list-style-image: url("chrome://communicator/skin/search/searchbar-dropmarker.png");
+  margin-inline-end: 4px;
+}
+
+.searchbar-popup {
+  margin-top: 4px;
+  margin-inline-start: 3px;
+}
+
+/* ::::: search-go-button ::::: */
+
+.search-go-container {
+  -moz-box-align: center;
+  padding-inline-end: 6px;
+}
+
+.search-go-button {
+  list-style-image: url("chrome://communicator/skin/search/searchbar-search.png");
+}
diff --git a/comm/suite/themes/classic/mac/communicator/sidebar/sidebar.css b/comm/suite/themes/classic/mac/communicator/sidebar/sidebar.css
new file mode 100644
index 0000000000..7e7d05785c
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/sidebar/sidebar.css
@@ -0,0 +1,164 @@
+/* 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/. */
+
+/* ===== sidebar.css ====================================================
+  == Styles used by the Sidebar panel and Sidebar tabs.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+  
+#sidebar-box {
+  border-left: 1px solid ThreeDShadow;
+  border-right: 1px solid ThreeDHighlight;
+  background-color: AppWorkspace;
+}
+
+#sidebar-box:-moz-lwtheme {
+  background-color: transparent;
+}
+
+/* ::::: sidebar header ::::: */
+
+.sidebarheader-main {
+  -moz-appearance: toolbar;
+  background-color: InactiveCaption;
+  color: CaptionText;
+  padding-top: 1px;
+  padding-bottom: 1px;
+  padding-inline-start: 6px;
+  padding-inline-end: 2px;
+  overflow-x: hidden;
+}
+
+.sidebarheader-main:-moz-lwtheme {
+  -moz-appearance: none;
+  background-color: transparent;
+  color: inherit;
+}
+
+#sidebar-panel-picker:not(:-moz-lwtheme) {
+  /* would override hover/active styles, so let lwtheme do it in its own way */
+  color: inherit;
+}
+
+#sidebar-panel-picker > .toolbarbutton-dropmarker {
+  padding: 0 2px;
+  list-style-image: url("chrome://global/skin/arrow/arrow-dn.png");
+}
+
+.sidebar-header-text {
+  font-weight: bold;
+}
+
+/* ..... close button ..... */
+
+#sidebar-close-button {
+  padding-top: 1px;
+  padding-bottom: 1px;
+  padding-inline-start: 4px;
+  padding-inline-end: 3px;
+  list-style-image: url("chrome://communicator/skin/icons/close-button.png");
+}
+
+/* ::::: sidebar panel ::::: */
+
+.sidebar-iframe-no-panels,
+.loadarea {
+  background-color: -moz-Field;
+  color: -moz-FieldText;
+}
+
+.iframe-panel, .browser-sidebar {
+  border-left: 1px solid ThreeDHighlight;
+  border-bottom: 1px solid ThreeDShadow;
+  border-right: 1px solid ThreeDShadow;
+}  
+
+/* ::::: loading info ::::: */
+
+.text-panel-loading {
+  margin: 5px 0px;
+}
+
+.text-panel-loading[loading="false"] {
+  margin-inline-start: 11px;
+}
+
+.image-panel-loading {
+  margin: 5px;
+  list-style-image: url("chrome://communicator/skin/icons/loading.png");
+}
+
+/* ::::: sidebar tabs ::::: */
+
+.box-texttab {
+  -moz-binding: url("chrome://communicator/skin/sidebar/sidebarBindings.xml#sbtab");
+  -moz-box-align: center;
+  cursor: pointer;
+  background-color: -moz-Dialog;
+  color: -moz-DialogText;
+}
+
+.box-texttab:-moz-lwtheme {
+  text-shadow: none;
+}
+
+.box-texttab,
+.box-texttab[selected="true"],
+.box-texttab[selected="true"]:hover,
+.box-texttab[selected="true"]:hover:active {
+  border: 1px solid;
+  border-color: ThreeDHighlight ThreeDShadow ThreeDShadow ThreeDHighlight;
+  padding-top: 2px;
+  padding-bottom: 2px;
+  padding-inline-start: 0px;
+  padding-inline-end: 1px;
+}
+
+.box-texttab:hover {
+  border-right-color: ThreeDDarkShadow;
+  border-bottom-color: ThreeDDarkShadow;
+}
+
+.box-texttab:hover:active {
+  border-color: ThreeDShadow;
+}
+
+.sbtab-label {
+  margin: 0px !important;
+}
+
+.sbtab-twisty {
+  margin: 0px 7px;
+  list-style-image: url("chrome://communicator/skin/sidebar/sbtab-twisty.png");
+}
+
+.sbtab-texture {
+  margin: 2px 0px;
+  width: 12px;
+  height: 12px;
+}
+
+.box-texttab[selected="true"] {
+  font-weight: bold;
+  cursor: default;
+}
+
+.sbtab-twisty[selected="true"] {
+  list-style-image: url("chrome://communicator/skin/sidebar/sbtab-twisty-open.png");
+}
+
+/* ::::: sidebar navigation buttons ::::: */
+
+.sidebar-nav-button {
+  padding: 5px 0px;
+}
+
+.tab-fwd {
+  list-style-image: url("chrome://global/skin/arrow/arrow-up.png");
+}
+
+.tab-back {
+  list-style-image: url("chrome://global/skin/arrow/arrow-dn.png");
+}
diff --git a/comm/suite/themes/classic/mac/communicator/spinbuttons.css b/comm/suite/themes/classic/mac/communicator/spinbuttons.css
new file mode 100644
index 0000000000..bf89520f68
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/spinbuttons.css
@@ -0,0 +1,31 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+spinbuttons {
+  height: 24px;
+  min-height: 24px;
+  -moz-appearance: spinner;
+  cursor: default;
+}
+
+.spinbuttons-up {
+  -moz-appearance: none;
+  -moz-box-flex: 1;
+  min-width: 1px;
+  min-height: 1px;
+  margin: 0;
+  padding: 0;
+}
+
+.spinbuttons-down {
+  -moz-appearance: none;
+  -moz-box-flex: 1;
+  min-width: 1px;
+  min-height: 1px;
+  margin: 0;
+  padding: 0;
+}
+
diff --git a/comm/suite/themes/classic/mac/communicator/sync/syncSetup.css b/comm/suite/themes/classic/mac/communicator/sync/syncSetup.css
new file mode 100644
index 0000000000..3edbd1fe95
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/sync/syncSetup.css
@@ -0,0 +1,127 @@
+/* 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/. */
+
+wizard {
+  -moz-appearance: none;
+  width: 55em;
+  height: 45em;
+  padding: 0;
+  background-color: Window;
+}
+
+.wizard-page-box {
+  -moz-appearance: none;
+  padding-left: 0;
+  padding-right: 0;
+  margin: 0;
+}
+
+wizardpage {
+  -moz-box-pack: center;
+  -moz-box-align: center;
+  margin: 0;
+  padding: 0 6em;
+  background-color: Window;
+}
+
+.wizard-header {
+  -moz-appearance: none;
+  border: none;
+  padding: 2em 0 1em 0;
+  text-align: center;
+}
+.wizard-header-label {
+  font-size: 24pt;
+  font-weight: normal;
+}
+
+.wizard-buttons {
+  background-color: rgba(0,0,0,0.1);
+  padding: 1em;
+}
+
+.wizard-buttons-separator {
+  visibility: collapse;
+}
+
+.wizard-header-icon {
+  visibility: collapse;
+}
+
+.accountChoiceButton {
+  font: menu;
+}
+
+.confirm {
+  border: 1px solid black;
+  padding: 1em;
+  border-radius: 5px;
+}
+
+/* Override the label margin from global.css */
+description > .text-link {
+  margin: 0px;
+}
+
+.success,
+.error {
+  padding: 2px;
+  border-radius: 2px;
+}
+
+.error {
+  background-color: #FF0000 !important;
+  color: #FFFFFF !important;
+}
+
+.success {
+  background-color: #00FF00 !important;
+}
+
+.warning {
+  font-weight: bold;
+  font-size: 100%;
+  color: red;
+}
+
+.mainDesc {
+  font-weight: bold;
+  font-size: 100%;
+}
+
+.normal {
+  font-size: 100%;
+}
+
+.inputColumn {
+  margin-inline-end: 2px;
+}
+
+.recommended {
+  font-weight: bold;
+}
+
+.pin {
+  font-size: 18pt;
+  width: 4em;
+  text-align: center;
+}
+
+#passphraseHelpSpacer {
+  width: 0.5em;
+}
+
+#add-device-throbber,
+#login-throbber {
+  list-style-image: url("chrome://communicator/skin/icons/loading.png");
+}
+
+#successPageIcon {
+  /* TODO replace this with a 128px version (bug 591122) */
+  list-style-image: url("chrome://communicator/skin/sync/sync-32.png");
+}
+
+#pickSetupDesc {
+  padding: 0 7em;
+}
diff --git a/comm/suite/themes/classic/mac/communicator/toolbar.css b/comm/suite/themes/classic/mac/communicator/toolbar.css
new file mode 100644
index 0000000000..34ce372a93
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/toolbar.css
@@ -0,0 +1,57 @@
+/* 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 grippytoolbar in addition to general toolbar styles.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+.toolbar-primary {
+  min-height: 24px;
+}
+
+toolbargrippy {
+  display: none;
+  -moz-box-orient: vertical;
+  -moz-box-align: center;
+  width: 10px;
+  padding: 2px 1px;
+  list-style-image: url("chrome://communicator/skin/toolbar/tbgrip-arrow.png");
+}
+
+toolbargrippy:hover {
+  background-color: ThreeDHighlight;
+}
+
+.toolbargrippy-texture {
+  margin-top: 2px;
+  width: 6px;
+  background: url("chrome://communicator/skin/toolbar/tbgrip-texture.png");
+}
+
+/* ::::: collapsed tray and grippies ::::: */
+
+toolbargrippy[tbgrippy-collapsed="true"] {
+  -moz-box-orient: horizontal;
+  border-left: 1px solid ThreeDHighlight;
+  border-top: 1px solid ThreeDHighlight;
+  border-right: 1px solid ThreeDShadow;
+  border-bottom: 1px solid ThreeDShadow;
+  width: 40px;
+  height: 10px;
+  padding: 1px 2px;
+  list-style-image: url("chrome://communicator/skin/toolbar/tbgrip-arrow-clps.png");
+}
+
+toolbargrippy[tbgrippy-collapsed="true"] > .toolbargrippy-texture {
+  margin-top: 0;
+  margin-inline-start: 2px;
+  width: 0px;
+  height: 6px;
+}
+
+.collapsed-tray-spacer {
+  border-bottom: 1px solid ThreeDShadow;
+}
diff --git a/comm/suite/themes/classic/mac/communicator/toolbar/toolbar-gradient22.png b/comm/suite/themes/classic/mac/communicator/toolbar/toolbar-gradient22.png
new file mode 100644
index 0000000000..4ab1228bbc
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/toolbar/toolbar-gradient22.png
diff --git a/comm/suite/themes/classic/mac/communicator/toolbar/toolbar-gradient34.png b/comm/suite/themes/classic/mac/communicator/toolbar/toolbar-gradient34.png
new file mode 100644
index 0000000000..79a8835dad
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/toolbar/toolbar-gradient34.png
diff --git a/comm/suite/themes/classic/mac/communicator/viewSourceOverlay.css b/comm/suite/themes/classic/mac/communicator/viewSourceOverlay.css
new file mode 100644
index 0000000000..ef28c640e2
--- /dev/null
+++ b/comm/suite/themes/classic/mac/communicator/viewSourceOverlay.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/. */
+
+/* make findbar appear above content */
+#appcontent {
+  -moz-box-direction: reverse;
+}
+
+/* style findbar for being on top */
+#FindToolbar {
+  border-top: none;
+  border-bottom: 1px solid #888888;
+}
diff --git a/comm/suite/themes/classic/mac/editor/editor.css b/comm/suite/themes/classic/mac/editor/editor.css
new file mode 100644
index 0000000000..1c180f2f42
--- /dev/null
+++ b/comm/suite/themes/classic/mac/editor/editor.css
@@ -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/. */
+
+/* ==== editor.css ==========================================================
+   == Styles shared throughout the Editor application.
+   ========================================================================== */
+
+@import url("chrome://communicator/skin/");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#editorWindow {
+  -moz-appearance: none;
+  background-color: #EEEEEE;
+}
+
+#content-frame { 
+  min-width: 10px; 
+  min-height: 10px;
+  height: 400px;
+} 
+
+.source-editor,
+.source-editor:focus {
+  margin-top: 0px;
+  margin-bottom: 5px;
+  margin-inline-start: 0px;
+  margin-inline-end: 5px;
+  border: 0px;
+  /* Scroll bars are in content, 
+     so we can't use right and bottom padding! */
+  padding-top: 5px;
+  padding-bottom: 0px;
+  padding-inline-start: 5px;
+  padding-inline-end: 0px;
+}
+
+/* Multiline textarea for HTML source editing */
+#content-source,
+#doctype-text {
+  font-family: -moz-fixed;
+  font-size: initial;
+}
+
+#ContentWindowDeck {
+  border-left: 1px solid ThreeDDarkShadow;
+  border-right: 1px solid ThreeDLightShadow;
+}
+
+/* ::::: struct toolbar ::::: */
+
+#structToolbar {
+  min-width: 1px;
+  overflow: -moz-hidden-unscrollable;
+}
+
+#structSpacer {
+  margin: 2px 0px;
+}
+
+.struct-button {
+  padding: 2px;
+}
+
+.struct-button[checked="true"] {
+  font-weight: bold;
+}
+
+.struct-textbox {
+  -moz-appearance: none !important;
+  padding: 0px !important;
+  margin: 0px !important;
+  border: none !important;
+}
+
+/* ::::: lightweight themes ::::: */
+
+#EditModeToolbar:-moz-lwtheme {
+  text-shadow: none;
+  color: -moz-dialogtext;
+  background-color: -moz-dialog;
+}
+
diff --git a/comm/suite/themes/classic/mac/editor/editorFormatToolbar.css b/comm/suite/themes/classic/mac/editor/editorFormatToolbar.css
new file mode 100644
index 0000000000..d3f6ff36d8
--- /dev/null
+++ b/comm/suite/themes/classic/mac/editor/editorFormatToolbar.css
@@ -0,0 +1,538 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: formatting toolbar and buttons ::::: */
+
+#FormatToolbar {
+  -moz-appearance: none;
+  border-bottom: 1px solid rgba(0,0,0,0.35);
+}
+
+#FormatToolbar > toolbarbutton > .toolbarbutton-text {
+  display: none;
+}
+
+toolbarbutton.formatting-button {
+  list-style-image: url("chrome://editor/skin/icons/btn2.png");
+  min-width: 32px;
+}
+
+#DecreaseFontSizeButton {
+  -moz-image-region: rect(64px 14px 80px 0px);
+}
+
+#DecreaseFontSizeButton:hover {
+  -moz-image-region: rect(64px 28px 80px 14px);
+}
+
+#DecreaseFontSizeButton:hover:active {
+  -moz-image-region: rect(64px 42px 80px 28px);
+}
+
+#DecreaseFontSizeButton[disabled="true"] {
+  -moz-image-region: rect(64px 56px 80px 42px) !important;
+}
+
+#IncreaseFontSizeButton {
+  -moz-image-region: rect(81px 18px 98px 0px);
+}
+
+#IncreaseFontSizeButton:hover {
+  -moz-image-region: rect(81px 36px 98px 18px);
+}
+
+#IncreaseFontSizeButton:hover:active {
+  -moz-image-region: rect(81px 54px 98px 36px);
+}
+
+#IncreaseFontSizeButton[disabled="true"] {
+  -moz-image-region: rect(81px 72px 98px 54px) !important;
+}
+
+#boldButton {
+  -moz-image-region: rect(16px 16px 32px 0px);
+}
+
+#boldButton:hover {
+  -moz-image-region: rect(16px 32px 32px 16px);
+}
+
+#boldButton:hover:active {
+  -moz-image-region: rect(16px 48px 32px 32px);
+}
+
+#boldButton[checked="true"] {
+  -moz-image-region: rect(16px 16px 32px 0px);
+}
+
+#boldButton[disabled="true"] {
+  -moz-image-region: rect(16px 64px 32px 48px) !important;
+}
+
+#italicButton {
+  -moz-image-region: rect(98px 16px 114px 0px);
+}
+
+#italicButton:hover {
+  -moz-image-region: rect(98px 32px 114px 16px);
+}
+
+#italicButton:hover:active {
+  -moz-image-region: rect(98px 48px 114px 32px);
+}
+
+#italicButton[checked="true"] {
+  -moz-image-region: rect(98px 16px 114px 0px);
+}
+
+#italicButton[disabled="true"] {
+  -moz-image-region: rect(98px 64px 114px 48px) !important;
+}
+
+#underlineButton {
+  -moz-image-region: rect(114px 16px 130px 0px);
+}
+
+#underlineButton:hover {
+  -moz-image-region: rect(114px 32px 130px 16px);
+}
+
+#underlineButton:hover:active {
+  -moz-image-region: rect(114px 48px 130px 32px);
+}
+
+#underlineButton[checked="true"] {
+  -moz-image-region: rect(114px 16px 130px 0px);
+}
+
+#underlineButton[disabled="true"] {
+  -moz-image-region: rect(114px 64px 130px 48px) !important;
+}
+
+#ulButton {
+  -moz-image-region: rect(32px 16px 48px 0px);
+}
+
+#ulButton:hover {
+  -moz-image-region: rect(32px 32px 48px 16px);
+}
+
+#ulButton:hover:active {
+  -moz-image-region: rect(32px 48px 48px 32px);
+}
+
+#ulButton[checked="true"] {
+  -moz-image-region: rect(32px 16px 48px 0px);
+}
+
+#ulButton[disabled="true"] {
+  -moz-image-region: rect(32px 64px 48px 48px) !important;
+}
+
+#olButton {
+  -moz-image-region: rect(194px 16px 210px 0px);
+}
+
+#olButton:hover {
+  -moz-image-region: rect(194px 32px 210px 16px);
+}
+
+#olButton:hover:active {
+  -moz-image-region: rect(194px 48px 210px 32px);
+}
+
+#olButton[checked="true"] {
+  -moz-image-region: rect(194px 16px 210px 0px);
+}
+
+#olButton[disabled="true"] {
+  -moz-image-region: rect(194px 64px 210px 48px) !important;
+}
+
+#outdentButton {
+  -moz-image-region: rect(210px 16px 226px 0px);
+}
+
+#outdentButton:hover {
+  -moz-image-region: rect(210px 32px 226px 16px);
+}
+
+#outdentButton:hover:active {
+  -moz-image-region: rect(210px 48px 226px 32px);
+}
+
+#outdentButton[disabled="true"] {
+  -moz-image-region: rect(210px 64px 226px 48px) !important;
+}
+
+#indentButton {
+  -moz-image-region: rect(178px 16px 194px 0px);
+}
+
+#indentButton:hover {
+  -moz-image-region: rect(178px 32px 194px 16px);
+}
+
+#indentButton:hover:active {
+  -moz-image-region: rect(178px 48px 194px 32px);
+}
+
+#indentButton[disabled="true"] {
+  -moz-image-region: rect(178px 64px 194px 48px) !important;
+}
+
+#align-left-button {
+  -moz-image-region: rect(146px 16px 162px 0px);
+}
+
+#align-left-button:hover {
+  -moz-image-region: rect(146px 32px 162px 16px);
+}
+
+#align-left-button:hover:active {
+  -moz-image-region: rect(146px 48px 162px 32px);
+}
+
+#align-left-button[checked="true"] {
+  -moz-image-region: rect(146px 16px 162px 0px);
+}
+
+#align-left-button[disabled="true"] {
+  -moz-image-region: rect(146px 64px 162px 48px) !important;
+}
+
+#align-center-button {
+  -moz-image-region: rect(48px 16px 64px 0px);
+}
+
+#align-center-button:hover {
+  -moz-image-region: rect(48px 32px 64px 16px);
+}
+
+#align-center-button:hover:active {
+  -moz-image-region: rect(48px 48px 64px 32px);
+}
+
+#align-center-button[checked="true"] {
+  -moz-image-region: rect(48px 16px 64px 0px);
+}
+
+#align-center-button[disabled="true"] {
+  -moz-image-region: rect(48px 64px 64px 48px) !important;
+}
+
+#align-right-button {
+  -moz-image-region: rect(162px 16px 178px 0px);
+}
+
+#align-right-button:hover {
+  -moz-image-region: rect(162px 32px 178px 16px);
+}
+
+#align-right-button:hover:active {
+  -moz-image-region: rect(162px 48px 178px 32px);
+}
+
+#align-right-button[checked="true"] {
+  -moz-image-region: rect(162px 16px 178px 0px);
+}
+
+#align-right-button[disabled="true"] {
+  -moz-image-region: rect(162px 64px 178px 48px) !important;
+}
+
+#align-justify-button {
+  -moz-image-region: rect(130px 16px 146px 0px);
+}
+
+#align-justify-button:hover {
+  -moz-image-region: rect(130px 32px 146px 16px);
+}
+
+#align-justify-button:hover:active {
+  -moz-image-region: rect(130px 48px 146px 32px);
+}
+
+#align-justify-button[checked="true"] {
+  -moz-image-region: rect(130px 16px 146px 0px);
+}
+
+#align-justify-button[disabled="true"] {
+  -moz-image-region: rect(130px 64px 146px 48px) !important;
+}
+
+#AlignPopupButton {
+  -moz-image-region: rect(0px 16px 16px 0px);
+}
+
+#AlignPopupButton:hover {
+  -moz-image-region: rect(0px 32px 16px 16px);
+}
+
+#AlignPopupButton[open="true"] {
+  -moz-image-region: rect(0px 48px 16px 32px) !important;
+}
+
+#AlignPopupButton[disabled="true"] {
+  -moz-image-region: rect(0px 64px 16px 48px) !important;
+}
+
+#InsertPopupButton {
+  -moz-image-region: rect(244px 16px 260px 0px);
+}
+
+#InsertPopupButton:hover {
+  -moz-image-region: rect(244px 32px 260px 16px);
+}
+
+#InsertPopupButton[open="true"] {
+  -moz-image-region: rect(244px 48px 260px 32px) !important;
+}
+
+#InsertPopupButton[disabled="true"] {
+  -moz-image-region: rect(244px 64px 260px 48px) !important;
+}
+
+#smileButtonMenu {
+  -moz-image-region: rect(227px 17px 244px 0px);
+}
+
+#smileButtonMenu:hover {
+  -moz-image-region: rect(227px 34px 244px 17px);
+}
+
+#smileButtonMenu[open="true"] {
+  -moz-image-region: rect(227px 51px 244px 34px) !important;
+}
+
+#smileButtonMenu[disabled="true"] {
+  -moz-image-region: rect(227px 68px 244px 51px) !important;
+}
+
+/* ::::: menuitem icons ::::: */
+
+/* ..... align menu ..... */
+
+#AlignPopup > menuitem {
+  list-style-image: url("chrome://editor/skin/icons/btn2.png");
+}
+
+#AlignLeftItem {
+  -moz-image-region: rect(146px 16px 162px 0px);
+}
+
+#AlignCenterItem {
+  -moz-image-region: rect(48px 16px 64px 0px);
+}
+
+#AlignRightItem {
+  -moz-image-region: rect(162px 16px 178px 0px);
+}
+
+#AlignJustifyItem {
+  -moz-image-region: rect(130px 16px 146px 0px);
+}
+
+/* ..... insert menu ..... */
+
+#InsertPopup > menuitem {
+  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
+}
+
+#InsertLinkItem {
+  -moz-image-region: rect(60px 19px 79px 0);
+}
+
+#InsertAnchorItem {
+  -moz-image-region: rect(0 19px 19px 0);
+}
+
+#InsertImageItem {
+  -moz-image-region: rect(40px 19px 59px 0);
+}
+
+#InsertHRuleItem {
+  -moz-image-region: rect(20px 19px 39px 0);
+}
+
+#InsertTableItem {
+  -moz-image-region: rect(180px 19px 199px 0);
+}
+
+/* ..... smiley menu ..... */
+
+.insert-smile {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-smile.png");
+}
+
+.insert-frown {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-frown.png"); 
+}
+
+.insert-wink {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-wink.png");
+}
+
+.insert-tongue {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-tongue.png");
+}
+
+.insert-laughing {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-laughing.png"); 
+}
+
+.insert-embarrassed {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-embarrassed.png");
+}
+
+.insert-undecided {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-undecided.png"); 
+}
+
+.insert-surprise {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-surprise.png"); 
+}
+
+.insert-kiss {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-kiss.png"); 
+}
+
+.insert-yell {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-yell.png"); 
+}
+
+.insert-cool {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-cool.png"); 
+}
+
+.insert-money {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-money.png"); 
+}
+
+.insert-foot {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-foot.png"); 
+}
+
+.insert-innocent {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-innocent.png"); 
+}
+
+.insert-cry {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-cry.png"); 
+}
+
+.insert-sealed {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-sealed.png"); 
+}
+
+/* ::::: fg/bg color picker ::::: */
+
+.ColorPickerLabel {
+  border: 1px inset ThreeDFace;
+  margin: 0px;
+  padding: 2px;
+}
+
+.color-button {
+  border: 1px inset ThreeDFace;
+  padding: 0px;
+  width: 14px;
+  height: 12px;
+  margin: 2px;
+}
+
+.color-button:hover {
+  border: 1px solid ThreeDDarkShadow;
+}
+
+#TextColorButton {
+  margin-top: 2px;
+  margin-bottom: 9px;
+  margin-inline-start: 2px;
+  margin-inline-end: 9px;
+}
+
+#BackgroundColorButton {
+  margin-top: 9px;
+  margin-bottom: 2px;
+  margin-inline-start: 9px;
+  margin-inline-end: 2px;
+}
+
+#HighlightColorButton {
+  -moz-image-region: rect(260px 16px 272px 0px);
+  background-color: transparent;
+}
+
+#HighlightColorButton:hover {
+  -moz-image-region: rect(260px 32px 272px 16px);
+}
+
+#HighlightColorButton:hover:active {
+  -moz-image-region: rect(260px 48px 272px 32px);
+}
+
+#HighlightColorButton[disabled="true"],
+#HighlightColorButton[disabled="true"]:hover,
+#HighlightColorButton[disabled="true"]:hover:active {
+  -moz-image-region: rect(260px 64px 272px 48px);
+}
+
+
+#absolutePositionButton {
+  -moz-image-region: rect(273px 16px 289px 0px);
+}
+
+#absolutePositionButton:hover {
+  -moz-image-region: rect(273px 32px 289px 16px);
+}
+
+#absolutePositionButton:hover:active {
+  -moz-image-region: rect(273px 48px 289px 32px);
+}
+
+#absolutePositionButton[disabled="true"] {
+  -moz-image-region: rect(273px 64px 289px 48px) ! important;
+}
+
+#absolutePositionButton[checked="true"]{
+  -moz-image-region: rect(289px 16px 305px 0px);
+}
+
+#absolutePositionButton[checked="true"]:hover {
+  -moz-image-region: rect(289px 32px 305px 16px);
+}
+
+#absolutePositionButton[checked="true"]:hover:active {
+  -moz-image-region: rect(289px 48px 305px 32px);
+}
+
+#increaseZIndexButton {
+  list-style-image: url("chrome://editor/content/images/bringtofront.png");
+}
+
+#increaseZIndexButton[disabled="true"] {
+  list-style-image: url("chrome://editor/content/images/bringtofront-disabled.png");
+}
+
+#decreaseZIndexButton {
+  list-style-image: url("chrome://editor/content/images/sendtoback.png");
+}
+
+#decreaseZIndexButton[disabled="true"] {
+  list-style-image: url("chrome://editor/content/images/sendtoback-disabled.png");
+}
+
+/* Force the folder location and mail view items to fit in the available width
+   in the Customize Toolbar dialog. */
+#palette-box #paragraph-select-container,
+#palette-box #ParagraphSelect,
+#palette-box #font-face-select-container,
+#palette-box #FontFaceSelect,
+#palette-box #font-size-select-container,
+#palette-box #FontSizeSelect {
+  -moz-box-flex: 1;
+}
diff --git a/comm/suite/themes/classic/mac/editor/editorModeToolbar.css b/comm/suite/themes/classic/mac/editor/editorModeToolbar.css
new file mode 100644
index 0000000000..79762cc446
--- /dev/null
+++ b/comm/suite/themes/classic/mac/editor/editorModeToolbar.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/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: edit mode toolbar ::::: */
+
+#EditModeToolbar {
+  -moz-box-align: start;
+  min-width: 1px;
+}
+
+#NormalModeButton {
+  list-style-image: url("chrome://editor/skin/icons/editmode-normal.png");
+}
+
+#TagModeButton {
+  list-style-image: url("chrome://editor/skin/icons/editmode-tags.png");
+}
+
+#SourceModeButton {
+  list-style-image: url("chrome://editor/skin/icons/editmode-html.png");
+}
+
+#PreviewModeButton {
+  list-style-image: url("chrome://editor/skin/icons/editmode-preview.png"); 
+}
+
+#EditModeTabs {
+  background-color: rgba(0, 0, 0, 0.1);
+  padding: 0;
+  margin: 0;
+  border-top: 1px solid #888;
+  -moz-box-align: start;
+  font: message-box;
+}
+#EditModeTabs > .tabs-left {
+  -moz-box-flex: 0;
+}
+
+.tab-bottom {
+  -moz-appearance: none;
+  margin: -1px 0 0;
+  padding: 0 0 2px 0;
+  position: relative;
+  border-inline-end: 1px solid rgba(0, 0, 0, 0.19);
+}
+
+.tab-bottom:first-of-type {
+  border-inline-start: 1px solid rgba(0, 0, 0, 0.19);
+}
+
+.tab-bottom > .tab-middle {
+  padding: 1px 2px 0 2px;
+}
+
+.tab-bottom:not([visuallyselected=true]):hover {
+  background-color: rgba(0, 0, 0, 0.1);
+  border-inline-end-color: rgba(0, 0, 0, 0.1);
+}
+
+.tab-bottom[visuallyselected=true] {
+  color: #000;
+  text-shadow: none;
+  border: solid #888;
+  border-width: 0 1px 1px;
+  border-radius: 2px;
+  margin-inline-end: -1px;
+  margin-bottom: 1px;
+  padding: 0;
+}
+
+.tab-bottom[visuallyselected=true] > .tab-middle {
+  -moz-appearance: dialog;
+}
diff --git a/comm/suite/themes/classic/mac/editor/editorPrimaryToolbar.css b/comm/suite/themes/classic/mac/editor/editorPrimaryToolbar.css
new file mode 100644
index 0000000000..bf2ec77e82
--- /dev/null
+++ b/comm/suite/themes/classic/mac/editor/editorPrimaryToolbar.css
@@ -0,0 +1,441 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: primary toolbar buttons ::::: */
+
+#newButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(120px 29px 149px 0);
+}
+
+#newButton:hover:active {
+  -moz-image-region: rect(120px 59px 149px 30px);
+}
+
+#newButton[disabled="true"] {
+  -moz-image-region: rect(120px 89px 149px 60px) !important;
+}
+
+#openButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(150px 29px 179px 0);
+}
+
+#openButton:hover:active {
+  -moz-image-region: rect(150px 59px 179px 30px);
+}
+
+#openButton[disabled="true"] {
+  -moz-image-region: rect(150px 89px 179px 60px) !important;
+}
+
+#saveButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(210px 29px 239px 0);
+}
+
+#saveButton:hover:active {
+  -moz-image-region: rect(210px 59px 239px 30px);
+}
+
+#saveButton[disabled="true"] {
+  -moz-image-region: rect(210px 89px 239px 60px) !important;
+}
+
+#publishButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(300px 29px 329px 0);
+}
+
+#publishButton:hover:active {
+  -moz-image-region: rect(300px 59px 329px 30px);
+}
+
+#publishButton[disabled="true"] {
+  -moz-image-region: rect(300px 89px 329px 60px) !important;
+}
+
+#previewButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(180px 29px 209px 0);
+}
+
+#previewButton:hover:active {
+  -moz-image-region: rect(180px 59px 209px 30px);
+}
+
+#previewButton[disabled="true"] {
+  -moz-image-region: rect(180px 89px 209px 60px) !important;
+}
+
+#linkButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(90px 29px 119px 0);
+}
+
+#linkButton:hover:active {
+  -moz-image-region: rect(90px 59px 119px 30px);
+}
+
+#linkButton[disabled="true"] {
+  -moz-image-region: rect(90px 89px 119px 60px) !important;
+}
+
+#imageButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(60px 29px 89px 0);
+}
+
+#imageButton:hover:active {
+  -moz-image-region: rect(60px 59px 89px 30px);
+}
+
+#imageButton[disabled="true"] {
+  -moz-image-region: rect(60px 89px 89px 60px) !important;
+}
+
+#formButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(450px 29px 479px 0);
+}
+
+#formButton:hover:active {
+  -moz-image-region: rect(450px 59px 479px 30px);
+}
+
+#formButton[disabled="true"] {
+  -moz-image-region: rect(450px 89px 479px 60px) !important;
+}
+
+#namedAnchorButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(0 29px 29px 0);
+}
+
+#namedAnchorButton:hover:active {
+  -moz-image-region: rect(0 59px 29px 30px);
+}
+
+#namedAnchorButton[disabled="true"] {
+  -moz-image-region: rect(0 89px 29px 60px) !important;
+}
+
+#hlineButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(30px 29px 59px 0);
+}
+
+#hlineButton:hover:active {
+  -moz-image-region: rect(30px 59px 59px 30px);
+}
+
+#hlineButton[disabled="true"] {
+  -moz-image-region: rect(30px 89px 59px 60px) !important;
+}
+
+#tableButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(270px 29px 299px 0);
+}
+
+#tableButton:hover:active {
+  -moz-image-region: rect(270px 59px 299px 30px);
+}
+
+#tableButton[disabled="true"] {
+  -moz-image-region: rect(270px 89px 299px 60px) !important;
+}
+
+#spellingButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(240px 29px 269px 0);
+}
+
+#spellingButton:hover:active {
+  -moz-image-region: rect(240px 59px 269px 30px);
+}
+
+#spellingButton[disabled="true"] {
+  -moz-image-region: rect(240px 89px 269px 60px) !important;
+}
+
+#cutButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(330px 29px 359px 0);
+}
+
+#cutButton:hover:active {
+  -moz-image-region: rect(330px 59px 359px 30px);
+}
+
+#cutButton[disabled="true"] {
+  -moz-image-region: rect(330px 89px 359px 60px) !important;
+}
+
+#copyButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(360px 29px 389px 0);
+}
+
+#copyButton:hover:active {
+  -moz-image-region: rect(360px 59px 389px 30px);
+}
+
+#copyButton[disabled="true"] {
+  -moz-image-region: rect(360px 89px 389px 60px) !important;
+}
+
+#pasteButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(390px 29px 419px 0);
+}
+
+#pasteButton:hover:active {
+  -moz-image-region: rect(390px 59px 419px 30px);
+}
+
+#pasteButton[disabled="true"] {
+  -moz-image-region: rect(390px 89px 419px 60px) !important;
+}
+
+#findButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(420px 29px 449px 0);
+}
+
+#findButton:hover:active {
+  -moz-image-region: rect(420px 59px 449px 30px);
+}
+
+#findButton[disabled="true"] {
+  -moz-image-region: rect(420px 89px 449px 60px) !important;
+}
+
+/* ::::: small primary toolbar buttons ::::: */
+
+toolbar[iconsize="small"] > #newButton,
+toolbar[iconsize="small"] > toolbarpaletteitem > #newButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
+  -moz-image-region: rect(80px 19px 99px 0);
+}
+
+toolbar[iconsize="small"] > #newButton:hover:active {
+  -moz-image-region: rect(80px 39px 99px 20px);
+}
+
+toolbar[iconsize="small"] > #newButton[disabled="true"] {
+  -moz-image-region: rect(80px 59px 99px 40px) !important;
+}
+
+toolbar[iconsize="small"] > #openButton,
+toolbar[iconsize="small"] > toolbarpaletteitem > #openButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
+  -moz-image-region: rect(100px 19px 119px 0);
+}
+
+toolbar[iconsize="small"] > #openButton:hover:active {
+  -moz-image-region: rect(100px 39px 119px 20px);
+}
+
+toolbar[iconsize="small"] > #openButton[disabled="true"] {
+  -moz-image-region: rect(100px 59px 119px 40px) !important;
+}
+
+toolbar[iconsize="small"] > #saveButton,
+toolbar[iconsize="small"] > toolbarpaletteitem > #saveButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
+  -moz-image-region: rect(140px 19px 159px 0);
+}
+
+toolbar[iconsize="small"] > #saveButton:hover:active {
+  -moz-image-region: rect(140px 39px 159px 20px);
+}
+
+toolbar[iconsize="small"] > #saveButton[disabled="true"] {
+  -moz-image-region: rect(140px 59px 159px 40px) !important;
+}
+
+toolbar[iconsize="small"] > #publishButton,
+toolbar[iconsize="small"] > toolbarpaletteitem > #publishButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
+  -moz-image-region: rect(200px 19px 219px 0);
+}
+
+toolbar[iconsize="small"] > #publishButton:hover:active {
+  -moz-image-region: rect(200px 39px 219px 20px);
+}
+
+toolbar[iconsize="small"] > #publishButton[disabled="true"] {
+  -moz-image-region: rect(200px 59px 219px 40px) !important;
+}
+
+toolbar[iconsize="small"] > #previewButton,
+toolbar[iconsize="small"] > toolbarpaletteitem > #previewButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
+  -moz-image-region: rect(120px 19px 139px 0);
+}
+
+toolbar[iconsize="small"] > #previewButton:hover:active {
+  -moz-image-region: rect(120px 39px 139px 20px);
+}
+
+toolbar[iconsize="small"] > #previewButton[disabled="true"] {
+  -moz-image-region: rect(120px 59px 139px 40px) !important;
+}
+
+toolbar[iconsize="small"] > #linkButton,
+toolbar[iconsize="small"] > toolbarpaletteitem > #linkButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
+  -moz-image-region: rect(60px 19px 79px 0);
+}
+
+toolbar[iconsize="small"] > #linkButton:hover:active {
+  -moz-image-region: rect(60px 39px 79px 20px);
+}
+
+toolbar[iconsize="small"] > #linkButton[disabled="true"] {
+  -moz-image-region: rect(60px 59px 79px 40px) !important;
+}
+
+toolbar[iconsize="small"] > #imageButton,
+toolbar[iconsize="small"] > toolbarpaletteitem > #imageButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
+  -moz-image-region: rect(40px 19px 59px 0);
+}
+
+toolbar[iconsize="small"] > #imageButton:hover:active {
+  -moz-image-region: rect(40px 39px 59px 20px);
+}
+
+toolbar[iconsize="small"] > #imageButton[disabled="true"] {
+  -moz-image-region: rect(40px 59px 59px 40px) !important;
+}
+
+toolbar[iconsize="small"] > #formButton,
+toolbar[iconsize="small"] > toolbarpaletteitem > #formButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
+  -moz-image-region: rect(300px 19px 319px 0);
+}
+
+toolbar[iconsize="small"] > #formButton:hover:active {
+  -moz-image-region: rect(300px 39px 319px 20px);
+}
+
+toolbar[iconsize="small"] > #formButton[disabled="true"] {
+  -moz-image-region: rect(300px 59px 319px 40px) !important;
+}
+
+toolbar[iconsize="small"] > #namedAnchorButton,
+toolbar[iconsize="small"] > toolbarpaletteitem > #namedAnchorButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
+  -moz-image-region: rect(0 19px 19px 0);
+}
+
+toolbar[iconsize="small"] > #namedAnchorButton:hover:active {
+  -moz-image-region: rect(0 39px 19px 20px);
+}
+
+toolbar[iconsize="small"] > #namedAnchorButton[disabled="true"] {
+  -moz-image-region: rect(0 59px 19px 40px) !important;
+}
+
+toolbar[iconsize="small"] > #hlineButton,
+toolbar[iconsize="small"] > toolbarpaletteitem > #hlineButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
+  -moz-image-region: rect(20px 19px 39px 0);
+}
+
+toolbar[iconsize="small"] > #hlineButton:hover:active {
+  -moz-image-region: rect(20px 39px 39px 20px);
+}
+
+toolbar[iconsize="small"] > #hlineButton[disabled="true"] {
+  -moz-image-region: rect(20px 59px 39px 40px) !important;
+}
+
+toolbar[iconsize="small"] > #tableButton,
+toolbar[iconsize="small"] > toolbarpaletteitem > #tableButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
+  -moz-image-region: rect(180px 19px 199px 0);
+}
+
+toolbar[iconsize="small"] > #tableButton:hover:active {
+  -moz-image-region: rect(180px 39px 199px 20px);
+}
+
+toolbar[iconsize="small"] > #tableButton[disabled="true"] {
+  -moz-image-region: rect(180px 59px 199px 40px) !important;
+}
+
+toolbar[iconsize="small"] > #spellingButton,
+toolbar[iconsize="small"] > toolbarpaletteitem > #spellingButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
+  -moz-image-region: rect(160px 19px 179px 0);
+}
+
+toolbar[iconsize="small"] > #spellingButton:hover:active {
+  -moz-image-region: rect(160px 39px 179px 20px);
+}
+
+toolbar[iconsize="small"] > #spellingButton[disabled="true"] {
+  -moz-image-region: rect(160px 59px 179px 40px) !important;
+}
+
+toolbar[iconsize="small"] > #cutButton,
+toolbar[iconsize="small"] > toolbarpaletteitem > #cutButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
+  -moz-image-region: rect(220px 19px 239px 0);
+}
+
+toolbar[iconsize="small"] > #cutButton:hover:active {
+  -moz-image-region: rect(220px 39px 239px 20px);
+}
+
+toolbar[iconsize="small"] > #cutButton[disabled="true"] {
+  -moz-image-region: rect(220px 59px 239px 40px) !important;
+}
+
+toolbar[iconsize="small"] > #copyButton,
+toolbar[iconsize="small"] > toolbarpaletteitem > #copyButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
+  -moz-image-region: rect(240px 19px 259px 0);
+}
+
+toolbar[iconsize="small"] > #copyButton:hover:active {
+  -moz-image-region: rect(240px 39px 259px 20px);
+}
+
+toolbar[iconsize="small"] > #copyButton[disabled="true"] {
+  -moz-image-region: rect(240px 59px 259px 40px) !important;
+}
+
+toolbar[iconsize="small"] > #pasteButton,
+toolbar[iconsize="small"] > toolbarpaletteitem > #pasteButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
+  -moz-image-region: rect(260px 19px 279px 0);
+}
+
+toolbar[iconsize="small"] > #pasteButton:hover:active {
+  -moz-image-region: rect(260px 39px 279px 20px);
+}
+
+toolbar[iconsize="small"] > #pasteButton[disabled="true"] {
+  -moz-image-region: rect(260px 59px 279px 40px) !important;
+}
+
+toolbar[iconsize="small"] > #findButton,
+toolbar[iconsize="small"] > toolbarpaletteitem > #findButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
+  -moz-image-region: rect(280px 19px 299px 0);
+}
+
+toolbar[iconsize="small"] > #findButton:hover:active {
+  -moz-image-region: rect(280px 39px 299px 20px);
+}
+
+toolbar[iconsize="small"] > #findButton[disabled="true"] {
+  -moz-image-region: rect(280px 59px 299px 40px) !important;
+}
diff --git a/comm/suite/themes/classic/mac/editor/icons/editoricons-small.png b/comm/suite/themes/classic/mac/editor/icons/editoricons-small.png
new file mode 100644
index 0000000000..c42e638f92
--- /dev/null
+++ b/comm/suite/themes/classic/mac/editor/icons/editoricons-small.png
diff --git a/comm/suite/themes/classic/mac/editor/icons/editoricons.png b/comm/suite/themes/classic/mac/editor/icons/editoricons.png
new file mode 100644
index 0000000000..6be73b1a31
--- /dev/null
+++ b/comm/suite/themes/classic/mac/editor/icons/editoricons.png
diff --git a/comm/suite/themes/classic/mac/messenger/accountManage.css b/comm/suite/themes/classic/mac/messenger/accountManage.css
new file mode 100644
index 0000000000..45fecb5922
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/accountManage.css
@@ -0,0 +1,57 @@
+/* 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/. */
+
+/* ===== accountManage.css ==============================================
+  == Styles for the Mail Account Manager.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: account manager :::::: */
+
+.specialFolderPickerGrid {
+  margin-inline-start: 20px;
+}
+
+.fccReplyFollowsParent {
+  margin-inline-start: 20px;
+}
+
+.signatureBox {
+  font-family: -moz-fixed;
+}
+
+#identitiesList > listitem:first-child,
+treechildren::-moz-tree-cell-text(isDefaultServer-true) {
+  font-weight: bold;
+}
+
+dialogheader {
+  display: none;
+}
+
+button:not(.spinbuttons-button):not(.dialog-button) {
+  min-height: 19px;
+}
+
+page > description,
+#smimeEditing > description {
+  margin: 1px 5px 2px 6px;
+}
+
+/* ::::: SMTP Server Panel :::::: */
+
+.smtpServerListItem {
+  padding-inline-start: 3px;
+}
+
+#backgroundBox {
+  background-color: ThreeDLightShadow;
+}
+
+#smtpServerInfoBox textbox {
+  background-color: transparent;
+}
diff --git a/comm/suite/themes/classic/mac/messenger/addressbook/addressbook.css b/comm/suite/themes/classic/mac/messenger/addressbook/addressbook.css
new file mode 100644
index 0000000000..6d6a209451
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/addressbook/addressbook.css
@@ -0,0 +1,334 @@
+/* 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/. */
+
+/* ===== addressbook.css ================================================
+  == Styles for the main Address Book window.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace html url("http://www.w3.org/1999/xhtml");
+
+#addressbookWindow {
+  -moz-appearance: none;
+  background-color: #EEEEEE;
+}
+
+/* ::::: primary toolbar buttons ::::: */
+
+#button-newcard {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbookicons.png");
+  -moz-image-region: rect(60px 29px 89px 0);
+}
+
+#button-newcard:hover:active  {
+  -moz-image-region: rect(60px 59px 89px 30px);
+} 
+
+#button-newcard[disabled]{
+  -moz-image-region: rect(60px 89px 89px 60px) !important;
+}
+
+#button-newlist {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbookicons.png");
+  -moz-image-region: rect(90px 29px 119px 0);
+}
+
+#button-newlist:hover:active {
+  -moz-image-region: rect(90px 59px 119px 30px);
+} 
+
+#button-newlist[disabled] {
+  -moz-image-region: rect(90px 89px 119px 60px) !important;
+}
+
+#button-editcard {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbookicons.png");
+  -moz-image-region: rect(30px 29px 59px 0);
+}
+
+#button-editcard:hover:active {
+  -moz-image-region: rect(30px 59px 59px 30px);
+} 
+
+#button-editcard[disabled] {
+  -moz-image-region: rect(30px 89px 59px 60px) !important;
+}
+
+#button-newmessage {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(150px 29px 179px 0);
+}
+
+#button-newmessage:hover:active {
+  -moz-image-region: rect(150px 59px 179px 30px);
+} 
+
+#button-newmessage[disabled]{
+  -moz-image-region: rect(150px 89px 179px 60px) !important;
+} 
+
+#button-abdelete {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbookicons.png");
+  -moz-image-region: rect(0 29px 29px 0);
+}
+
+#button-abdelete:hover:active  {
+  -moz-image-region: rect(0 59px 29px 30px);
+} 
+
+#button-abdelete[disabled] {
+  -moz-image-region: rect(0 89px 29px 60px) !important;
+}
+
+/* ::::: small primary toolbar buttons ::::: */
+
+toolbar[iconsize="small"] > #button-newcard,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-newcard {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbookicons-small.png");
+  -moz-image-region: rect(40px 19px 59px 0);
+}
+
+toolbar[iconsize="small"] > #button-newcard:hover:active {
+  -moz-image-region: rect(40px 39px 59px 20px);
+}
+
+toolbar[iconsize="small"] > #button-newcard[disabled] {
+  -moz-image-region: rect(40px 59px 59px 40px) !important;
+}
+
+toolbar[iconsize="small"] > #button-newlist,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-newlist {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbookicons-small.png");
+  -moz-image-region: rect(60px 19px 79px 0);
+}
+
+toolbar[iconsize="small"] > #button-newlist:hover:active {
+  -moz-image-region: rect(60px 39px 79px 20px);
+}
+
+toolbar[iconsize="small"] > #button-newlist[disabled] {
+  -moz-image-region: rect(60px 59px 79px 40px) !important;
+}
+
+toolbar[iconsize="small"] > #button-editcard,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-editcard {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbookicons-small.png");
+  -moz-image-region: rect(20px 19px 39px 0);
+}
+
+toolbar[iconsize="small"] > #button-editcard:hover:active {
+  -moz-image-region: rect(20px 39px 39px 20px);
+}
+
+toolbar[iconsize="small"] > #button-editcard[disabled] {
+  -moz-image-region: rect(20px 59px 39px 40px) !important;
+}
+
+toolbar[iconsize="small"] > #button-newmessage,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-newmessage {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(100px 19px 119px 0);
+}
+
+toolbar[iconsize="small"] > #button-newmessage:hover:active {
+  -moz-image-region: rect(100px 39px 119px 20px);
+}
+
+toolbar[iconsize="small"] > #button-newmessage[disabled] {
+  -moz-image-region: rect(100px 59px 119px 40px) !important;
+}
+
+toolbar[iconsize="small"] > #button-abdelete,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-abdelete {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbookicons-small.png");
+  -moz-image-region: rect(0 19px 19px 0);
+}
+
+toolbar[iconsize="small"] > #button-abdelete:hover:active {
+  -moz-image-region: rect(0 39px 19px 20px);
+}
+
+toolbar[iconsize="small"] > #button-abdelete[disabled] {
+  -moz-image-region: rect(0 59px 19px 40px) !important;
+}
+
+#results-splitter {
+  background-color: -moz-dialog;
+  border-top: 1px solid #A5A5A5;
+  border-bottom: 1px solid #A5A5A5;
+}
+
+#dirTree-splitter {
+  border: solid #B3B3B3;
+  border-width: 0 1px 0 0;
+  background-image: none;
+  min-width: 1px;
+}
+
+/* Make sure users find the splitter when it's collapsed... */
+
+#dirTree-splitter[state="collapsed"] {
+  min-width: 5px;
+  background-color: #D6DDE5;
+}
+
+#dirTree {
+  -moz-appearance: -moz-mac-source-list;
+  -moz-font-smoothing-background-color: -moz-mac-source-list;
+}
+
+.tree-stack > .tree-rows > .tree-bodybox {
+  border: none;
+}
+
+#dirTree > treechildren::-moz-tree-row {
+  min-height: 18px;
+}
+
+#dirTree > treechildren::-moz-tree-row(selected) {
+  -moz-appearance: -moz-mac-source-list-selection;
+  -moz-font-smoothing-background-color: -moz-mac-source-list-selection;
+}
+
+#dirTree > treechildren::-moz-tree-row(selected, focus) {
+  -moz-appearance: -moz-mac-active-source-list-selection;
+  -moz-font-smoothing-background-color: -moz-mac-active-source-list-selection;
+}
+
+#dirTree > treechildren::-moz-tree-twisty(selected),
+#dirTree > treechildren::-moz-tree-cell-text(selected) {
+  color: #FFFFFF;
+  fill-opacity: 1;
+}
+
+#dirTree > treechildren::-moz-tree-twisty {
+  width: 16px;
+  padding-bottom: 1px;
+}
+
+@media (-moz-mac-yosemite-theme) {
+  #dirTree > treechildren::-moz-tree-twisty(selected),
+  #dirTree > treechildren::-moz-tree-cell-text(selected) {
+    color: -moz-dialogtext;
+    fill-opacity: 0.6;
+  }
+
+  #dirTree > treechildren::-moz-tree-twisty(selected, focus),
+  #dirTree > treechildren::-moz-tree-cell-text(selected, focus) {
+    color: #FFFFFF;
+    fill-opacity: 1;
+  }
+}
+
+#DirCol {
+  -moz-appearance: none;
+  border: none;
+  background-color: transparent;
+}
+
+#DirCol > .treecol-text {
+  padding: 6px 0 6px 8px;
+  font-weight: bold;
+  color: #738193;
+}
+
+#blankResultsPaneMessage {
+  font-style: italic;
+}
+
+#localResultsOnlyMessage {
+  font-style: italic;
+  text-align: center;
+}
+
+/* CardView styles - used in the Card View Pane */
+ 
+#CardViewBox {
+  -moz-user-focus: ignore;
+  overflow: auto;
+  min-width: 150px;
+  background-color: #FFFFFF;
+}
+
+#CardViewInnerBox {
+  margin-top: 2px;
+  margin-bottom: 2px;
+  padding: 0 8px;
+}
+
+#CardTitle {
+  font-size: 150%;
+  font-weight: bold;
+  border-bottom: 2px solid black;
+  min-width: 120px;
+  margin: 0px;
+}
+ 
+.cardViewColumn {
+  margin-inline-end: 10px;
+}
+
+.cardViewGroup {
+  margin-top: 8px;
+  padding-bottom: 5px;
+  min-width: 50px;
+}
+
+.CardViewHeading {
+  padding: 1px;
+  padding-inline-start: 5px;
+  margin: 0px 0px 1px;
+  background-color: -moz-dialog;
+  color: black;
+  font-weight: bold;
+  min-width: 30px;
+}
+
+#cvPhoto {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/contact-generic.png");
+}
+
+#cvBuddyIcon {
+  padding-inline-start: 20px;
+  padding-top: 2px;
+}
+
+.CardViewText,
+.CardViewLink {
+  padding-inline-start: 20px;
+  padding-inline-end: 2px;
+  min-width: 30px;
+  margin: 0px;
+}
+
+.CardViewLink {
+  color: blue;
+  text-decoration: underline;
+  cursor: pointer;
+}
+
+
+#cvHomeMapIt, #cvWorkMapIt {
+  margin-bottom: 0px;
+}
+
+html|a {
+  padding-inline-start: 0px;
+  padding-inline-end: 2px;
+  border: none !important;
+}
+
+html|p {
+  border: none !important;
+}
+
+/* ::::: lightweight themes ::::: */
+
+#CardViewOuterBox:-moz-lwtheme {
+  background-color: -moz-dialog;
+  color: -moz-dialogtext;
+  text-shadow: none
+}
diff --git a/comm/suite/themes/classic/mac/messenger/addressbook/icons/addressbookicons-small.png b/comm/suite/themes/classic/mac/messenger/addressbook/icons/addressbookicons-small.png
new file mode 100644
index 0000000000..8024eb395f
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/addressbook/icons/addressbookicons-small.png
diff --git a/comm/suite/themes/classic/mac/messenger/addressbook/icons/addressbookicons.png b/comm/suite/themes/classic/mac/messenger/addressbook/icons/addressbookicons.png
new file mode 100644
index 0000000000..f9ca42c789
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/addressbook/icons/addressbookicons.png
diff --git a/comm/suite/themes/classic/mac/messenger/browserRequest.css b/comm/suite/themes/classic/mac/messenger/browserRequest.css
new file mode 100644
index 0000000000..7ce21092c5
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/browserRequest.css
@@ -0,0 +1,59 @@
+/* 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/. */
+
+#security-button {
+  width: 20px;
+  margin-top: -1px;
+  margin-right: 5px;
+  background-repeat: no-repeat;
+}
+
+#security-button[level="high"] {
+  background-image: url("chrome://messenger/skin/icons/secure.png");
+}
+
+#security-button[level="broken"] {
+  background-image: url("chrome://messenger/skin/icons/insecure.png");
+}
+
+#security-button[loading="true"] {
+  background-image: url("chrome://messenger/skin/icons/loading.png");
+  background-position: 4px 3px;
+}
+
+@media (min-resolution: 2ddpx) {
+  #security-button[loading="true"] {
+    background-image: url("chrome://messenger/skin/icons/loading@2x.png");
+  }
+}
+
+/*
+#header {
+  overflow: hidden;
+  padding: 5px;
+  border-bottom: 1px solid black;
+  font-weight: bold;
+  font-size: 1.2em;
+}
+*/
+
+
+#header {
+    border-bottom: 1px solid rgb(105, 105, 105);
+    overflow: hidden;
+}
+
+#addressbox {
+    font-weight: bold;
+    font-size: normal;
+    -moz-appearance: textfield;
+    overflow: hidden;
+    margin: 5px 5px;
+    font-weight: normal;
+}
+
+#headerMessage {
+  margin-top: 3px;
+  margin-bottom: 3px;
+}
diff --git a/comm/suite/themes/classic/mac/messenger/filterDialog.css b/comm/suite/themes/classic/mac/messenger/filterDialog.css
new file mode 100644
index 0000000000..3709323b36
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/filterDialog.css
@@ -0,0 +1,108 @@
+/* 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/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: columns :::::: */
+
+listcell.listcell-iconic > .listcell-label {
+  display: none;
+}
+
+listcell[enabled="false"] {
+  list-style-image: url("chrome://messenger/skin/icons/dot.png");
+}
+
+listcell[enabled="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/check.png");
+}
+
+.small-button {
+  -moz-appearance: none;
+  font: icon;
+  text-shadow: 0 1px #F2F2F2;
+  border: 1px solid #A8A8A8; 
+  background: linear-gradient(to top, #ECECEC, #ECECEC 50%, #F9F9F9 0%, #F9F9F9);
+  min-width: 22px;
+  height: 20px;
+  padding: 0 1px 1px 0;
+  margin: 0;
+}
+
+.small-button:first-child {
+  margin-left: 1px;
+}
+
+.small-button:not([disabled="true"]):hover:active {
+  background: linear-gradient(to top, #B0B0B0, #B4B4B4 50%, #BFBFBF 0%, #BABABA);
+  border: 1px solid #9C9C9C;
+}
+
+.small-button[disabled="true"] {
+  opacity: 0.6;
+}
+
+.small-button + .small-button,
+.small-button + .small-button:hover:active {
+  border-left-width: 0;
+  min-width: 21px;
+}
+
+
+.small-button:focus {
+  box-shadow:  inset 0 0 1px -moz-mac-focusring,
+               1px 0 2px 1px -moz-mac-focusring,
+               -1px 0 2px 1px -moz-mac-focusring;
+}
+
+.small-button:focus + .small-button {
+  box-shadow: inset 1px 0 -moz-mac-focusring;
+}
+
+listcell > hbox {
+  -moz-box-pack: end;
+}
+
+/* No '.filler' here, so add margin to make more room. */
+hbox > .small-button + .small-button {
+  margin-inline-end: 9px;
+}
+
+.search-menulist, .search-value-menulist {
+  width: 12em;
+}
+
+.search-menulist[unavailable="true"] {
+  color: GrayText;
+}
+
+#searchTermList > listitem[selected="true"] {
+  background-color: inherit;
+}
+
+#filterListDialog {
+  padding: 0px;
+}
+
+.filler {
+  padding-inline-end: 22px;
+}
+
+.ruleaction {
+  border: 1px solid transparent;
+}
+
+.ruleactionitem {
+  min-width: 20em;
+}
+
+.ruleaction-type {
+  min-width: 15em;
+}
diff --git a/comm/suite/themes/classic/mac/messenger/icons/junk.png b/comm/suite/themes/classic/mac/messenger/icons/junk.png
new file mode 100644
index 0000000000..0ae15cd390
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/icons/junk.png
diff --git a/comm/suite/themes/classic/mac/messenger/icons/messengericons-small.png b/comm/suite/themes/classic/mac/messenger/icons/messengericons-small.png
new file mode 100644
index 0000000000..b51ef83d27
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/icons/messengericons-small.png
diff --git a/comm/suite/themes/classic/mac/messenger/icons/messengericons.png b/comm/suite/themes/classic/mac/messenger/icons/messengericons.png
new file mode 100644
index 0000000000..e450734a1b
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/icons/messengericons.png
diff --git a/comm/suite/themes/classic/mac/messenger/icons/phishing.png b/comm/suite/themes/classic/mac/messenger/icons/phishing.png
new file mode 100644
index 0000000000..d99a9ea6d4
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/icons/phishing.png
diff --git a/comm/suite/themes/classic/mac/messenger/icons/spin-buttons-active.png b/comm/suite/themes/classic/mac/messenger/icons/spin-buttons-active.png
new file mode 100644
index 0000000000..5ff980eb98
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/icons/spin-buttons-active.png
diff --git a/comm/suite/themes/classic/mac/messenger/icons/spin-buttons.png b/comm/suite/themes/classic/mac/messenger/icons/spin-buttons.png
new file mode 100644
index 0000000000..010b170e8e
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/icons/spin-buttons.png
diff --git a/comm/suite/themes/classic/mac/messenger/icons/tab-arrow-left.png b/comm/suite/themes/classic/mac/messenger/icons/tab-arrow-left.png
new file mode 100644
index 0000000000..ca55639992
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/icons/tab-arrow-left.png
diff --git a/comm/suite/themes/classic/mac/messenger/icons/tab-arrow-right.png b/comm/suite/themes/classic/mac/messenger/icons/tab-arrow-right.png
new file mode 100644
index 0000000000..3374e2305c
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/icons/tab-arrow-right.png
diff --git a/comm/suite/themes/classic/mac/messenger/icons/twisty-clsd.png b/comm/suite/themes/classic/mac/messenger/icons/twisty-clsd.png
new file mode 100644
index 0000000000..ed46b222be
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/icons/twisty-clsd.png
diff --git a/comm/suite/themes/classic/mac/messenger/icons/twisty-open.png b/comm/suite/themes/classic/mac/messenger/icons/twisty-open.png
new file mode 100644
index 0000000000..2aa35f80b1
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/icons/twisty-open.png
diff --git a/comm/suite/themes/classic/mac/messenger/mailWindow1.css b/comm/suite/themes/classic/mac/messenger/mailWindow1.css
new file mode 100644
index 0000000000..6e40fff2f6
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/mailWindow1.css
@@ -0,0 +1,266 @@
+/* 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/folderMenus.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#messengerWindow {
+  -moz-appearance: none;
+  background-color: #EEEEEE;
+}
+
+#messengerBox {
+  border-top: 1px solid #A1A1A1;
+}
+
+/* :::::
+   :: Make sure the min height is small so we can
+   :: resize the pane vertically -EDV
+   ::::: */
+
+#messagepanebox {
+  min-height: 10px;
+  height: 0px;
+}
+
+#messagepanebox:-moz-lwtheme {
+  background-color: -moz-dialog;
+}
+
+#searchToolbar {
+  -moz-appearance: none;
+  background-color: #CDCDCD;
+  background-image: url("chrome://communicator/skin/toolbar/toolbar-gradient34.png");
+  background-repeat: repeat-x;
+  border-bottom: 1px solid #9F9F9F;
+}
+
+#searchToolbar:-moz-lwtheme {
+  background-image: none;
+  background-color: transparent;
+}
+
+/* Leopard-styled "zero-width" vertical splitter */
+
+#folderpane-splitter {
+  border: solid #B3B3B3;
+  border-width: 0 1px 0 0;
+  min-width: 1px;
+  background-image: none;
+}
+
+/* Make sure users find the splitter when it's collapsed... */
+
+#folderpane-splitter[state="collapsed"] {
+  min-width: 5px;
+  background-color: #D6DDE5;
+}
+
+/* Thick horisontal splitter */
+
+#threadpane-splitter {
+  background-color: -moz-dialog;
+  border: solid #B3B3B3;
+  border-width: 0 0 0 1px;
+}
+
+/* Thick vertical splitter */
+
+#threadpane-splitter[orient="vertical"] {
+  border: solid #A5A5A5;
+  border-width: 1px 0;
+}
+
+/* ..... tree adjustments ..... */
+
+#folderTree {
+  min-width: 1px;
+  -moz-appearance: -moz-mac-source-list;
+  -moz-font-smoothing-background-color: -moz-mac-source-list;
+}
+
+.tree-stack > .tree-rows > .tree-bodybox {
+  border: none;
+}
+
+#folderTree > treechildren::-moz-tree-row {
+  min-height: 18px;
+}
+
+#folderTree > treechildren::-moz-tree-row(selected) {
+  -moz-appearance: -moz-mac-source-list-selection;
+  -moz-font-smoothing-background-color: -moz-mac-source-list-selection;
+}
+
+#folderTree > treechildren::-moz-tree-row(selected, focus) {
+  -moz-appearance: -moz-mac-active-source-list-selection;
+  -moz-font-smoothing-background-color: -moz-mac-active-source-list-selection;
+}
+
+#folderTree > treechildren::-moz-tree-twisty(selected),
+#folderTree > treechildren::-moz-tree-cell-text(selected) {
+  color: #FFFFFF;
+  fill-opacity: 1;
+}
+
+#folderTree > treechildren::-moz-tree-twisty {
+  width: 16px;
+  padding-bottom: 1px;
+}
+
+@media (-moz-mac-yosemite-theme) {
+  #folderTree > treechildren::-moz-tree-twisty(selected),
+  #folderTree > treechildren::-moz-tree-cell-text(selected) {
+    color: -moz-dialogtext;
+    fill-opacity: 0.6;
+  }
+
+  #folderTree > treechildren::-moz-tree-twisty(selected, focus),
+  #folderTree > treechildren::-moz-tree-cell-text(selected, focus) {
+    color: #FFFFFF;
+    fill-opacity: 1;
+  }
+}
+
+#threadTree {
+  min-width: 1px;
+}
+
+#locationIcon {
+  list-style-image: none;
+}
+
+/* ..... message pane adjustments ..... */
+
+#msgHeaderView {
+  border-left: none !important;
+}
+
+#messagepane {
+  border: 1px solid transparent;
+  border-right: none;
+}
+
+#messagepanebox[focusring="true"] > #messagepanewrapper > #messagepane {
+  border-color: -moz-mac-focusring;
+}
+
+/* ..... folder pane adjustments ..... */
+
+.folderview-cycler,
+.folderview-cycler > .toolbarbutton-icon {
+  padding: 0 !important;
+  margin: 0 !important;
+  border: none !important;
+}
+
+.folderview-cycler > .toolbarbutton-text {
+  display: none;
+}
+
+.folderview-cycler[dir="prev"],
+.folderview-cycler[dir="next"]:-moz-locale-dir(rtl) {
+  list-style-image: url("chrome://messenger/skin/icons/spin-buttons.png");
+  -moz-image-region: rect(0 15px 16px 0);
+}
+
+.folderview-cycler[dir="next"],
+.folderview-cycler[dir="prev"]:-moz-locale-dir(rtl) {
+  list-style-image: url("chrome://messenger/skin/icons/spin-buttons.png");
+  -moz-image-region: rect(0 31px 16px 15px);
+}
+
+.folderview-cycler:active {
+  list-style-image: url("chrome://messenger/skin/icons/spin-buttons-active.png") !important;
+}
+
+/* ..... tabmail ..... */
+
+.tabmail-strip {
+  padding-bottom: 3px;
+  background-color: #E8E8E8;
+}
+
+.tabmail-strip:-moz-lwtheme {
+  background-color: transparent;
+}
+
+.tab-close-button {
+  margin: 0;
+}
+
+.tab-scrollbutton-up,
+.tab-scrollbutton-down {
+  border: 0;
+  padding: 0 4px;
+  margin: 0;
+}
+
+.tab-scrollbutton-up:-moz-locale-dir(ltr),
+.tab-scrollbutton-down:-moz-locale-dir(rtl) {
+  border-right: 1px solid rgba(0, 0, 0, 0.19);
+  list-style-image: url("chrome://messenger/skin/icons/tab-arrow-left.png");
+  -moz-image-region: rect(0, 7px, 11px, 0);
+}
+
+.tab-scrollbutton-up[disabled="true"]:-moz-locale-dir(ltr),
+.tab-scrollbutton-down[disabled="true"]:-moz-locale-dir(rtl) {
+  -moz-image-region: rect(0, 14px, 11px, 7px);
+  border-right-color: transparent;
+}
+
+.tab-scrollbutton-down:-moz-locale-dir(ltr),
+.tab-scrollbutton-up:-moz-locale-dir(rtl) {
+  border-left: 1px solid rgba(0, 0, 0, 0.19);
+  list-style-image: url("chrome://messenger/skin/icons/tab-arrow-right.png");
+  -moz-image-region: rect(0, 7px, 11px, 0);
+}
+
+.tab-scrollbutton-down[disabled="true"]:-moz-locale-dir(ltr),
+.tab-scrollbutton-up[disabled="true"]:-moz-locale-dir(rtl) {
+  -moz-image-region: rect(0, 14px, 11px, 7px);
+  border-left-color: transparent;
+}
+
+.tab-scrollbutton-up:hover:not([disabled="true"]),
+.tab-scrollbutton-down:hover:not([disabled="true"]) {
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+.tab-scrollbutton-up:hover:active:not([disabled="true"]),
+.tab-scrollbutton-down:hover:active:not([disabled="true"]) {
+  background-color: rgba(0, 0, 0 , 0.2);
+}
+
+.tabmail-tab[type="message"] .tab-icon {
+  margin-top: -2px;
+}
+
+.tabmail-tab[type="folder"][NewMessages="true"],
+.tabmail-tab[type="folder"][IsServer="true"] {
+  font-weight: bold;
+}
+
+.alltabs-item[tabIsScrolled] {
+  font-style: italic;
+}
+
+#tabbar-toolbar {
+  -moz-appearance: none;
+  min-height: 0;
+}
+
+#tabbar-toolbar > .toolbarbutton-1 {
+  margin-top: 1px;
+  margin-bottom: 1px;
+  padding-top: 0;
+  padding-bottom: 0;
+}
diff --git a/comm/suite/themes/classic/mac/messenger/messageHeader.css b/comm/suite/themes/classic/mac/messenger/messageHeader.css
new file mode 100644
index 0000000000..7a823a9860
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/messageHeader.css
@@ -0,0 +1,178 @@
+/* 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.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: msg header buttons ::::: */
+
+#expandedAttachmentBox {
+  width: 20em;
+  height: 0;
+  list-style-image: url("chrome://messenger/skin/icons/attach.png");
+}
+
+#attachmentText {
+  font-weight: bold;
+}
+
+#attachmentList {
+  min-height: 58px;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+/* ::::: msg header captions ::::: */
+
+#msgHeaderView {
+  border-right: 1px solid ThreeDShadow;
+  border-left: 1px solid ThreeDShadow;
+}
+
+#collapsedHeaderView,
+#expandedHeaderView {
+  margin: 2px 4px 4px 4px;
+  border-bottom: 1px solid ThreeDDarkShadow;
+  min-width: 1px;
+}
+
+.headerNameBox {
+  width: 7.7em;
+}
+
+.headerName {
+  margin-top: 0px;
+  margin-bottom: 5px;
+  margin-inline-start: 0px;
+  margin-inline-end: .5em;
+  font-weight: bold;
+  text-align: right;
+}
+
+.headerValue {
+  margin: 0;
+  min-width: 50px;
+  white-space: normal;
+}
+
+.headerValueBox {
+  margin: 0 0 5px;
+}
+
+.headerValueBox[singleline="true"] {
+  overflow: hidden;
+}
+
+.subjectvalue {
+  font-weight: bold;
+}
+
+.tagvalue {
+  margin-top: 0;
+  margin-inline-start: 0;
+}
+
+/* ::::: msg header message ids ::::: */
+
+.messageIdDisplayButton {
+  cursor: pointer;
+  color: #0000FF;
+  text-decoration: underline;
+  margin: 0;
+}
+
+.messageIdDisplayButton:hover {
+  color: #FF0000;
+}
+
+.messageIdDisplayImage {
+  padding-inline-start: 2px;
+  -moz-box-pack: end;
+}
+
+/* ::::: msg header email addresses ::::: */
+
+.emailDisplayButton {
+  cursor: pointer;
+  color: #0000FF;
+  text-decoration: underline;
+  margin: 0;
+}
+
+.emailDisplayButton:hover {
+  color: #FF0000;
+}
+
+.emailDisplayImage {
+  padding-inline-start: 2px;
+  -moz-box-pack: end;
+}
+
+/* ::::: email address twisty ::::: */
+
+.addresstwisty {
+  margin: 2px;
+  list-style-image: url("chrome://messenger/skin/icons/twisty-clsd.png");
+}
+
+.addresstwisty[open] {
+  list-style-image: url("chrome://messenger/skin/icons/twisty-open.png");
+}
+
+/* ::::: view expand and collapse twisties  ::::: */
+
+.expandHeaderViewButton {
+  list-style-image: url("chrome://messenger/skin/icons/twisty-open.png");
+}
+
+.collapsedHeaderViewButton  {
+  margin: 2px;
+  list-style-image: url("chrome://messenger/skin/icons/twisty-clsd.png");
+}
+
+/* ::::: collapsed view styles ::::: */
+
+.collapsedHeaderDisplayName {
+  margin: 0 0.5em 0 0;
+  min-height: 16px;
+  font-weight: bold;
+}
+
+#expandedsubjectBox {
+  margin-top: 5px;
+}
+
+
+#collapsedAttachmentBox {
+  -moz-box-pack: center;
+}
+
+#collapseddateValue {
+  margin: 0 .5em;
+  text-align: right;
+}
+
+#collapseddateValue > .textbox-input-box menupopup {
+  text-align: left;
+}
+
+#collapsedfromBox {
+  width: 18em;
+}
+
+#collapseddateBox {
+  width: 12em;
+}
+
+.collapsedHeaderValue {
+  margin: 0;
+}
+
+.collapsedAttachmentButton {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-attach.png");
+  margin-inline-end: .5em;
+}
diff --git a/comm/suite/themes/classic/mac/messenger/messageQuotes.css b/comm/suite/themes/classic/mac/messenger/messageQuotes.css
new file mode 100644
index 0000000000..62cb67d990
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/messageQuotes.css
@@ -0,0 +1,43 @@
+/* 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/. */
+
+/* Because this sheet is loaded synchronously while the user is waiting for the
+   compose window to appear, it must not @import a ton of other things, and
+   especially must not trigger network access. */
+
+/* ===== messageQuotes.css =================================================
+  == Shared styles such as block quote colors and signature style
+  == between the message body during
+  == message display and the mail editor instance for mail compose.
+  ======================================================================= */
+
+/* workaround for MS Outlook mails where the line-height is set to 0 */
+body {
+  line-height: initial !important;
+}
+
+/* ::::: signature ::::: */
+
+@media not print {
+  div.moz-text-flowed > div.moz-txt-sig,
+  div.moz-text-plain > pre > div.moz-txt-sig,
+  pre.moz-signature {
+    opacity: 0.6;
+  }
+}
+
+blockquote[type=cite] {
+  color: blue;
+  border-color: blue;
+}
+
+blockquote[type=cite] blockquote[type=cite] {
+  color: green;
+  border-color: green;
+}
+
+blockquote[type=cite] blockquote[type=cite] blockquote[type=cite] {
+  color: maroon;
+  border-color: maroon;
+}
diff --git a/comm/suite/themes/classic/mac/messenger/messengercompose/messengercompose.css b/comm/suite/themes/classic/mac/messenger/messengercompose/messengercompose.css
new file mode 100644
index 0000000000..e0e4578dfc
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/messengercompose/messengercompose.css
@@ -0,0 +1,249 @@
+/* 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");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: primary toolbar buttons ::::: */
+
+#button-send {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(330px 29px 359px 0);
+}
+
+#button-send:hover:active {
+  -moz-image-region: rect(330px 59px 359px 30px);
+}
+
+#button-send[disabled="true"] {
+  -moz-image-region: rect(330px 89px 359px 60px) !important;
+}
+
+#button-address {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(270px 29px 299px 0);
+}
+
+#button-address:hover:active {
+  -moz-image-region: rect(270px 59px 299px 30px);
+}
+
+#button-address[disabled="true"] {
+  -moz-image-region: rect(270px 89px 299px 60px) !important;
+}
+
+#button-attach {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(300px 29px 329px 0);
+}
+
+#button-attach:hover:active,
+#button-attach[open] {
+  -moz-image-region: rect(300px 59px 329px 30px);
+}
+
+#button-attach[disabled="true"] {
+  -moz-image-region: rect(300px 89px 329px 60px) !important;
+}
+
+#spellingButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(240px 29px 269px 0);
+}
+
+#spellingButton:hover:active,
+#spellingButton[open] {
+  -moz-image-region: rect(240px 59px 269px 30px);
+}
+
+#spellingButton[disabled="true"] {
+  -moz-image-region: rect(240px 89px 269px 60px) !important;
+}
+
+#button-save {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(210px 29px 239px 0);
+}
+
+#button-save:hover:active,
+#button-save[open] {
+  -moz-image-region: rect(210px 59px 239px 30px);
+}
+
+#button-save[disabled="true"] {
+  -moz-image-region: rect(210px 89px 239px 60px) !important;
+}
+
+/* ::::: small primary toolbar buttons ::::: */
+
+toolbar[iconsize="small"] > #button-send,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-send {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(220px 19px 239px 0);
+}
+
+toolbar[iconsize="small"] > #button-send:hover:active {
+  -moz-image-region: rect(220px 39px 239px 20px);
+}
+
+toolbar[iconsize="small"] > #button-send[disabled="true"] {
+  -moz-image-region: rect(220px 59px 239px 40px) !important;
+}
+
+toolbar[iconsize="small"] > #button-address,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-address {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(180px 19px 199px 0);
+}
+
+toolbar[iconsize="small"] > #button-address:hover:active {
+  -moz-image-region: rect(180px 39px 199px 20px);
+}
+
+toolbar[iconsize="small"] > #button-address[disabled="true"] {
+  -moz-image-region: rect(180px 59px 199px 40px) !important;
+}
+
+toolbar[iconsize="small"] > #button-attach,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-attach {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(200px 19px 219px 0);
+}
+
+toolbar[iconsize="small"] > #button-attach:hover:active,
+toolbar[iconsize="small"] > #button-attach[open] {
+  -moz-image-region: rect(200px 39px 219px 20px);
+}
+
+toolbar[iconsize="small"] > #button-attach[disabled="true"] {
+  -moz-image-region: rect(200px 59px 219px 40px) !important;
+}
+
+toolbar[iconsize="small"] > #spellingButton,
+toolbar[iconsize="small"] > toolbarpaletteitem > #spellingButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
+  -moz-image-region: rect(160px 19px 179px 0);
+}
+
+toolbar[iconsize="small"] > #spellingButton:hover:active,
+toolbar[iconsize="small"] > #spellingButton[open] {
+  -moz-image-region: rect(160px 39px 179px 20px);
+}
+
+toolbar[iconsize="small"] > #spellingButton[disabled="true"] {
+  -moz-image-region: rect(160px 59px 179px 40px) !important;
+}
+
+toolbar[iconsize="small"] > #button-save,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-save {
+  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
+  -moz-image-region: rect(140px 19px 159px 0);
+}
+
+toolbar[iconsize="small"] > #button-save:hover:active,
+toolbar[iconsize="small"] > #button-save[open] {
+  -moz-image-region: rect(140px 39px 159px 20px);
+}
+
+toolbar[iconsize="small"] > #button-save[disabled="true"] {
+  -moz-image-region: rect(140px 59px 159px 40px) !important;
+}
+
+#attachmentbucket-sizer {
+  border-top: none;
+  border-bottom: none;
+}
+
+#compose-toolbar-sizer {
+  height: 10px;
+  background-color: -moz-dialog;
+  border-top: 1px solid #A5A5A5;
+  border-bottom: 1px solid #A5A5A5;
+}
+
+#msgSubject {
+  margin-top: 0px;
+  margin-bottom: 4px;
+}
+
+#MsgHeadersToolbar {
+  min-height: 0px; /* this undoes the min-height in toolbar.css */
+  -moz-appearance: none;
+}
+
+#FormatToolbar {
+  border-bottom: none !important;
+}
+
+/* ::::: autocomplete icons ::::: */
+
+treechildren::-moz-tree-cell-text(default-match) {
+  margin-top: 2px;
+  margin-bottom: 2px;
+  margin-inline-start: 15px;
+  margin-inline-end: -3px;
+  border: none;
+}
+
+treechildren::-moz-tree-image(local-abook) {
+  margin-top: 2px;
+  margin-bottom: 2px;
+  margin-inline-start: 4px;
+  margin-inline-end: -1px;
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addrbook.png");
+}
+
+treechildren::-moz-tree-image(remote-abook) {
+  margin-top: 2px;
+  margin-bottom: 2px;
+  margin-inline-start: 2px;
+  margin-inline-end: -3px;
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/remote-addrbook.png");
+}
+
+treechildren::-moz-tree-image(remote-err) {
+  margin-top: 2px;
+  margin-bottom: 2px;
+  margin-inline-start: 2px;
+  margin-inline-end: -3px;
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/remote-addrbook-error.png");
+}
+
+treechildren::-moz-tree-image(subscribed-news) {
+  margin-inline-start: 2px;
+  margin-inline-end: -3px;
+  list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup.png");
+}
+
+/* ::::: compact menulists ::::: */
+
+.menulist-compact {
+  -moz-binding: url("chrome://messenger/content/messengercompose/menulistCompactBindings.xml#menulist-compact");
+  -moz-box-align: center;
+  -moz-box-pack: center;
+  margin: 0;
+}
+
+.menulist-compact  > .menulist-label-box > .menulist-label {
+  text-align: end;
+}
+
+/* ::::: lightweight themes ::::: */
+
+#MsgHeadersToolbar:-moz-lwtheme,
+#FormatToolbar:-moz-lwtheme,
+#compose-toolbar-sizer:-moz-lwtheme {
+  text-shadow: none;
+  color: -moz-dialogtext;
+  background-color: -moz-dialog;
+}
+
+#MsgHeadersToolbar textbox:-moz-lwtheme {
+  opacity: 1;
+}
diff --git a/comm/suite/themes/classic/mac/messenger/primaryToolbar.css b/comm/suite/themes/classic/mac/messenger/primaryToolbar.css
new file mode 100644
index 0000000000..372c6472d9
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/primaryToolbar.css
@@ -0,0 +1,490 @@
+/* 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/. */
+
+/* ===== primaryToolbar.css =============================================
+  == Images for the Mail primary toolbar.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+.mail-toolbox {
+  border-bottom: 1px solid #A1A1A1;
+  background-color: #E8E8E8;
+}
+
+/* ::::: primary toolbar buttons ::::: */
+
+#button-getmsg {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(90px 29px 119px 0);
+}
+
+#button-getmsg:hover:active,
+#button-getmsg[open] {
+  -moz-image-region: rect(90px 59px 119px 30px);
+}
+
+#button-getmsg[disabled="true"] {
+  -moz-image-region: rect(90px 89px 119px 60px) !important;
+}
+
+#button-newmsg {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(150px 29px 179px 0);
+}
+
+#button-newmsg:hover:active,
+#button-newmsg[open] {
+  -moz-image-region: rect(150px 59px 179px 30px);
+}
+
+#button-newmsg[disabled="true"] {
+  -moz-image-region: rect(150px 89px 179px 60px) !important;
+}
+
+#button-reply {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(210px 29px 239px 0);
+}
+
+#button-reply:hover:active,
+#button-reply[open] {
+  -moz-image-region: rect(210px 59px 239px 30px);
+}
+
+#button-reply[disabled="true"] {
+  -moz-image-region: rect(210px 89px 239px 60px) !important;
+}
+
+#button-replyall {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(240px 29px 269px 0);
+}
+
+#button-replyall:hover:active,
+#button-replyall[open] {
+  -moz-image-region: rect(240px 59px 269px 30px);
+}
+
+#button-replyall[disabled="true"] {
+  -moz-image-region: rect(240px 89px 269px 60px) !important;
+}
+
+#button-forward {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(60px 29px 89px 0);
+}
+
+#button-forward:hover:active,
+#button-forward[open] {
+  -moz-image-region: rect(60px 59px 89px 30px);
+}
+
+#button-forward[disabled="true"] {
+  -moz-image-region: rect(60px 89px 89px 60px) !important;
+}
+
+#button-file {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(30px 29px 59px 0);
+}
+
+#button-file:hover:active,
+#button-file[open] {
+  -moz-image-region: rect(30px 59px 59px 30px);
+}
+
+#button-file[disabled="true"] {
+  -moz-image-region: rect(30px 89px 59px 60px) !important;
+}
+
+#button-goback {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
+  -moz-image-region: rect(60px 29px 89px 0);
+}
+
+#button-goback:hover:active,
+#button-goback[open] {
+  -moz-image-region: rect(60px 59px 89px 30px);
+}
+
+#button-goback[disabled="true"] {
+  -moz-image-region: rect(60px 89px 89px 60px) !important;
+}
+
+#button-goforward {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
+  -moz-image-region: rect(90px 29px 119px 0);
+}
+
+#button-goforward:hover:active,
+#button-goforward[open] {
+  -moz-image-region: rect(90px 59px 119px 30px);
+}
+
+#button-goforward[disabled="true"] {
+  -moz-image-region: rect(90px 89px 119px 60px) !important;
+}
+
+#button-next {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(180px 29px 209px 0);
+}
+
+#button-next:hover:active,
+#button-next[open] {
+  -moz-image-region: rect(180px 59px 209px 30px);
+}
+
+#button-next[disabled="true"] {
+  -moz-image-region: rect(180px 89px 209px 60px) !important;
+}
+
+#button-delete {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(0 29px 29px 0);
+}
+
+#button-delete:hover:active {
+  -moz-image-region: rect(0 59px 29px 30px);
+}
+
+#button-delete[disabled] {
+  -moz-image-region: rect(0 89px 29px 60px) !important;
+}
+
+toolbarpaletteitem > #button-delete {
+  display: -moz-box;
+}
+
+#button-mark {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(120px 29px 149px 0);
+}
+
+#button-mark:hover:active,
+#button-mark[open] {
+  -moz-image-region: rect(120px 59px 149px 30px);
+}
+
+#button-mark[disabled="true"] {
+  -moz-image-region: rect(120px 89px 149px 60px) !important;
+}
+
+#button-junk {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(360px 29px 389px 0);
+}
+
+#button-junk:hover:active {
+  -moz-image-region: rect(360px 59px 389px 30px);
+}
+
+#button-junk[disabled="true"] {
+  -moz-image-region: rect(360px 89px 389px 60px) !important;
+}
+
+#button-stop {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
+  -moz-image-region: rect(30px 29px 59px 0);
+}
+
+#button-stop:hover:active {
+  -moz-image-region: rect(30px 59px 59px 30px);
+}
+
+#button-stop[disabled="true"] {
+  -moz-image-region: rect(30px 89px 59px 60px) !important;
+}
+
+#sync-button {
+  list-style-image: url("chrome://communicator/skin/sync/sync-32.png");
+}
+
+#sync-button[status=active] {
+  list-style-image: url("chrome://communicator/skin/sync/sync-32-throbber.png");
+}
+
+#locationFolders {
+  width: 22em;
+}
+
+/* Force the folder location and mail view items to fit in the available width
+   in the Customize Toolbar dialog. */
+#palette-box #locationFolders,
+#palette-box #folder-location-container,
+#palette-box #searchInput,
+#palette-box #button-search-container,
+#palette-box #button-search,
+#palette-box #mailviews-container,
+#palette-box #viewPicker {
+  -moz-box-flex: 1;
+}
+
+/* ::::: small primary toolbar buttons ::::: */
+
+toolbar[iconsize="small"] > #button-getmsg,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-getmsg {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(60px 19px 79px 0);
+}
+
+toolbar[iconsize="small"] > #button-getmsg:hover:active,
+toolbar[iconsize="small"] > #button-getmsg[open] {
+  -moz-image-region: rect(60px 39px 79px 20px);
+}
+
+toolbar[iconsize="small"] > #button-getmsg[disabled="true"] {
+  -moz-image-region: rect(60px 59px 79px 40px) !important;
+}
+
+toolbar[iconsize="small"] > #button-newmsg,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-newmsg {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(100px 19px 119px 0);
+}
+
+toolbar[iconsize="small"] > #button-newmsg:hover:active,
+toolbar[iconsize="small"] > #button-newmsg[open] {
+  -moz-image-region: rect(100px 39px 119px 20px);
+}
+
+toolbar[iconsize="small"] > #button-newmsg[disabled="true"] {
+  -moz-image-region: rect(100px 59px 119px 40px) !important;
+}
+
+toolbar[iconsize="small"] > #button-reply,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-reply {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(140px 19px 159px 0);
+}
+
+toolbar[iconsize="small"] > #button-reply:hover:active {
+  -moz-image-region: rect(140px 39px 159px 20px);
+}
+
+toolbar[iconsize="small"] > #button-reply[disabled="true"] {
+  -moz-image-region: rect(140px 59px 159px 40px) !important;
+}
+
+toolbar[iconsize="small"] > #button-replyall,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-replyall {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(160px 19px 179px 0);
+}
+
+toolbar[iconsize="small"] > #button-replyall:hover:active {
+  -moz-image-region: rect(160px 39px 179px 20px);
+}
+
+toolbar[iconsize="small"] > #button-replyall[disabled="true"] {
+  -moz-image-region: rect(160px 59px 179px 40px) !important;
+}
+
+toolbar[iconsize="small"] > #button-forward,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-forward {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(40px 19px 59px 0);
+}
+
+toolbar[iconsize="small"] > #button-forward:hover:active,
+toolbar[iconsize="small"] > #button-forward[open] {
+  -moz-image-region: rect(40px 39px 59px 20px);
+}
+
+toolbar[iconsize="small"] > #button-forward[disabled="true"] {
+  -moz-image-region: rect(40px 59px 59px 40px) !important;
+}
+
+toolbar[iconsize="small"] > #button-file,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-file {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(20px 19px 39px 0);
+}
+
+toolbar[iconsize="small"] > #button-file:hover:active,
+toolbar[iconsize="small"] > #button-file[open] {
+  -moz-image-region: rect(20px 39px 39px 20px);
+}
+
+toolbar[iconsize="small"] > #button-file[disabled="true"] {
+  -moz-image-region: rect(20px 59px 39px 40px) !important;
+}
+
+toolbar[iconsize="small"] > #button-goback,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-goback {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+  -moz-image-region: rect(40px 19px 59px 0);
+}
+
+toolbar[iconsize="small"] > #button-goback:hover:active,
+toolbar[iconsize="small"] > #button-goback[open] {
+  -moz-image-region: rect(40px 39px 59px 20px);
+}
+
+toolbar[iconsize="small"] > #button-goback[disabled="true"] {
+  -moz-image-region: rect(40px 59px 59px 40px) !important;
+}
+
+toolbar[iconsize="small"] > #button-goforward,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-goforward {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+  -moz-image-region: rect(60px 19px 79px 0);
+}
+
+toolbar[iconsize="small"] > #button-goforward:hover:active,
+toolbar[iconsize="small"] > #button-goforward[open] {
+  -moz-image-region: rect(60px 39px 79px 20px);
+}
+
+toolbar[iconsize="small"] > #button-goforward[disabled="true"] {
+  -moz-image-region: rect(60px 59px 79px 40px) !important;
+}
+
+toolbar[iconsize="small"] > #button-next,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-next {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(120px 19px 139px 0);
+}
+
+toolbar[iconsize="small"] > #button-next:hover:active,
+toolbar[iconsize="small"] > #button-next[open] {
+  -moz-image-region: rect(120px 39px 139px 20px);
+}
+
+toolbar[iconsize="small"] > #button-next[disabled="true"] {
+  -moz-image-region: rect(120px 59px 139px 40px) !important;
+}
+
+toolbar[iconsize="small"] > #button-delete,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-delete {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(0 19px 19px 0);
+}
+
+toolbar[iconsize="small"] > #button-delete:hover:active {
+  -moz-image-region: rect(0 39px 19px 20px);
+}
+
+toolbar[iconsize="small"] > #button-delete[disabled],
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-delete[disabled] {
+  -moz-image-region: rect(0 59px 19px 40px) !important;
+}
+
+toolbar[iconsize="small"] > #button-mark,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-mark {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(80px 19px 99px 0);
+}
+
+toolbar[iconsize="small"] > #button-mark:hover:active,
+toolbar[iconsize="small"] > #button-mark[open] {
+  -moz-image-region: rect(80px 39px 99px 20px);
+}
+
+toolbar[iconsize="small"] > #button-mark[disabled="true"] {
+  -moz-image-region: rect(80px 59px 99px 40px) !important;
+}
+
+toolbar[iconsize="small"] > #button-junk,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-junk {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(240px 19px 259px 0);
+}
+
+toolbar[iconsize="small"] > #button-junk:hover:active {
+  -moz-image-region: rect(240px 39px 259px 20px);
+}
+
+toolbar[iconsize="small"] > #button-junk[disabled],
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-junk[disabled] {
+  -moz-image-region: rect(240px 59px 259px 40px) !important;
+}
+
+toolbar[iconsize="small"] > #button-stop,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-stop {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+  -moz-image-region: rect(20px 19px 39px 0);
+}
+
+toolbar[iconsize="small"] > #button-stop:hover:active {
+  -moz-image-region: rect(20px 39px 39px 20px);
+}
+
+toolbar[iconsize="small"] > #button-stop[disabled="true"] {
+  -moz-image-region: rect(20px 59px 39px 40px) !important;
+}
+
+toolbar[iconsize="small"] > toolbarpaletteitem > #sync-button,
+toolbar[iconsize="small"] > #sync-button {
+  list-style-image: url("chrome://communicator/skin/sync/sync-16.png");
+}
+
+toolbar[iconsize="small"] > toolbarpaletteitem > #sync-button[status=active],
+toolbar[iconsize="small"] > #sync-button[status=active] {
+  list-style-image: url("chrome://communicator/skin/sync/sync-16-throbber.png");
+}
+
+/* ::::: Lightning icon sizes ::::: */
+
+#lightning-button-calendar > .toolbarbutton-icon,
+#lightning-button-tasks > .toolbarbutton-icon,
+#extractEventButton > .toolbarbutton-icon,
+#extractTaskButton > .toolbarbutton-icon,
+#extractEventButton > .box-inherit > .toolbarbutton-icon,
+#extractTaskButton > .box-inherit > .toolbarbutton-icon {
+  width: 29px;
+  height: 29px;
+}
+
+toolbar[iconsize="small"] > #lightning-button-calendar > .toolbarbutton-icon,
+toolbar[iconsize="small"] > #lightning-button-tasks > .toolbarbutton-icon,
+toolbar[iconsize="small"] > #extractEventButton > .box-inherit > .toolbarbutton-icon,
+toolbar[iconsize="small"] > #extractTaskButton > .box-inherit > .toolbarbutton-icon {
+  width: 19px;
+  height: 19px;
+}
+
+#lightning-button-calendar[disabled="true"] > .toolbarbutton-icon,
+#lightning-button-tasks[disabled="true"] > .toolbarbutton-icon,
+#extractEventButton[disabled="true"] > .box-inherit > .toolbarbutton-icon,
+#extractTaskButton[disabled="true"] > .box-inherit > .toolbarbutton-icon {
+  opacity: 0.3;
+}
+
+/* ::::: message notification bar style rules ::::: */
+
+.msgNotificationBar {
+  border-bottom: 1px solid #A5A5A5;
+  background-color: #C7BC8F;
+  color: black;
+}
+
+.msgNotificationBar:-moz-lwtheme {
+  text-shadow: none;
+}
+
+.msgNotificationBarText {
+  font-weight: bold;
+}
+
+.messageImage[value="remoteContent"] {
+  list-style-image: url("chrome://messenger/skin/icons/remote-blocked.png");
+}
+
+.messageImage[value="junkContent"] {
+  list-style-image: url("chrome://messenger/skin/icons/junk.png");
+}
+
+.messageImage[value="phishingContent"] {
+  list-style-image: url("chrome://messenger/skin/icons/phishing.png");
+}
+
+.messageImage[value="mdnContent"] {
+  list-style-image: url("chrome://messenger/skin/icons/info.png");
+}
+
+.inline-toolbar {
+  -moz-appearance: none;
+}
diff --git a/comm/suite/themes/classic/mac/messenger/searchDialog.css b/comm/suite/themes/classic/mac/messenger/searchDialog.css
new file mode 100644
index 0000000000..347375beaa
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/searchDialog.css
@@ -0,0 +1,90 @@
+/* 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/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: box sizes ::::: */
+
+#searchTermTree {
+  min-height: 50px;
+}
+
+#searchTermListBox {
+  height: 100px;
+}
+
+#searchTermList > listitem[selected="true"] {
+  background-color: inherit;
+}
+
+listcell > hbox {
+  -moz-box-pack: end;
+}
+
+#searchResultListBox {
+  -moz-appearance: listbox;
+  margin-inline-start: 4px;
+  margin-inline-end: 4px;
+  height: 100px;
+}
+
+#searchAddressBookWindow,
+#searchMailWindow {
+  padding: 0px;
+}
+
+menulist:not(#menuSearchLocalSystem) {
+  width: 18em;
+}
+
+.search-menulist {
+  width: 12em;
+}
+
+.search-menulist[unavailable="true"] {
+  color: GrayText;
+}
+
+.small-button {
+  -moz-appearance: none;
+  font: icon;
+  text-shadow: 0 1px #F2F2F2;
+  border: 1px solid #A8A8A8;
+  background: linear-gradient(to top, #ECECEC, #ECECEC 50%, #F9F9F9 0%, #F9F9F9);
+  min-width: 22px;
+  height: 20px;
+  padding: 0 1px 1px 0;
+  margin: 0;
+}
+
+.small-button:not([disabled="true"]):hover:active {
+  background: linear-gradient(to top, #B0B0B0, #B4B4B4 50%, #BFBFBF 0%, #BABABA);
+  border: 1px solid #9C9C9C;
+}
+
+.small-button[disabled="true"] {
+  opacity: 0.6;
+}
+
+.small-button + .small-button,
+.small-button + .small-button:hover:active {
+  border-left-width: 0;
+  min-width: 21px;
+}
+
+.small-button:focus {
+  box-shadow:  inset 0 0 1px -moz-mac-focusring,
+               1px 0 2px 1px -moz-mac-focusring,
+               -1px 0 2px 1px -moz-mac-focusring;
+}
+
+.small-button:focus + .small-button {
+  box-shadow: inset 1px 0 -moz-mac-focusring;
+}
diff --git a/comm/suite/themes/classic/mac/messenger/smime/icons/smimeicons-small.png b/comm/suite/themes/classic/mac/messenger/smime/icons/smimeicons-small.png
new file mode 100644
index 0000000000..4c6d42fff2
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/smime/icons/smimeicons-small.png
diff --git a/comm/suite/themes/classic/mac/messenger/smime/icons/smimeicons.png b/comm/suite/themes/classic/mac/messenger/smime/icons/smimeicons.png
new file mode 100644
index 0000000000..1434fa34ca
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/smime/icons/smimeicons.png
diff --git a/comm/suite/themes/classic/mac/messenger/smime/msgCompSMIMEOverlay.css b/comm/suite/themes/classic/mac/messenger/smime/msgCompSMIMEOverlay.css
new file mode 100644
index 0000000000..3c68553bbd
--- /dev/null
+++ b/comm/suite/themes/classic/mac/messenger/smime/msgCompSMIMEOverlay.css
@@ -0,0 +1,68 @@
+/* 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/. */
+
+/* ===== msgCompSMIMEOverlay.css ========================================
+  == Styles for the S/Mime in composer window.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#button-security {
+  list-style-image: url("chrome://messenger/skin/smime/icons/smimeicons.png");
+  -moz-image-region: rect(0 29px 29px 0px);
+}
+
+#button-security:hover:active,
+#button-security[open] {
+  -moz-image-region: rect(0 59px 29px 30px);
+}
+
+#button-security[disabled] {
+  -moz-image-region: rect(0 89px 29px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #button-security,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-security {
+  list-style-image: url("chrome://messenger/skin/smime/icons/smimeicons-small.png");
+  -moz-image-region: rect(0 19px 19px 0px);
+}
+
+toolbar[iconsize="small"] > #button-security:hover:active,
+toolbar[iconsize="small"] > #button-security[open] {
+  -moz-image-region: rect(0 39px 19px 20px);
+}
+
+toolbar[iconsize="small"] > #button-security[disabled] {
+  -moz-image-region: rect(0 59px 19px 40px) !important;
+}
+
+#msgcomposeWindow #signing-status {
+  list-style-image: none;
+  visibility: collapse;
+}
+
+#msgcomposeWindow[signing="ok"] #signing-status {
+  list-style-image: url("chrome://messenger/skin/smime/icons/sbSignOk.png");
+  visibility: visible;
+}
+
+#msgcomposeWindow[signing="notok"] #signing-status {
+  list-style-image: url("chrome://messenger/skin/smime/icons/sbSignNotOk.png");
+  visibility: visible;
+}
+
+#msgcomposeWindow #encryption-status {
+  list-style-image: none;
+  visibility: collapse;
+}
+
+#msgcomposeWindow[crypto="ok"] #encryption-status {
+  list-style-image: url("chrome://messenger/skin/smime/icons/sbCryptoOk.png");
+  visibility: visible;
+}
+
+#msgcomposeWindow[crypto="notok"] #encryption-status {
+  list-style-image: url("chrome://messenger/skin/smime/icons/sbCryptoNotOk.png");
+  visibility: visible;
+}
diff --git a/comm/suite/themes/classic/mac/navigator/icons/close.png b/comm/suite/themes/classic/mac/navigator/icons/close.png
new file mode 100644
index 0000000000..9bba044ce5
--- /dev/null
+++ b/comm/suite/themes/classic/mac/navigator/icons/close.png
diff --git a/comm/suite/themes/classic/mac/navigator/icons/identity.png b/comm/suite/themes/classic/mac/navigator/icons/identity.png
new file mode 100644
index 0000000000..44153b016b
--- /dev/null
+++ b/comm/suite/themes/classic/mac/navigator/icons/identity.png
diff --git a/comm/suite/themes/classic/mac/navigator/icons/navigatoricons-small.png b/comm/suite/themes/classic/mac/navigator/icons/navigatoricons-small.png
new file mode 100644
index 0000000000..6f7bda51da
--- /dev/null
+++ b/comm/suite/themes/classic/mac/navigator/icons/navigatoricons-small.png
diff --git a/comm/suite/themes/classic/mac/navigator/icons/navigatoricons.png b/comm/suite/themes/classic/mac/navigator/icons/navigatoricons.png
new file mode 100644
index 0000000000..cfca28c59f
--- /dev/null
+++ b/comm/suite/themes/classic/mac/navigator/icons/navigatoricons.png
diff --git a/comm/suite/themes/classic/mac/navigator/icons/panel-expander-closed.png b/comm/suite/themes/classic/mac/navigator/icons/panel-expander-closed.png
new file mode 100644
index 0000000000..f0e97b22e1
--- /dev/null
+++ b/comm/suite/themes/classic/mac/navigator/icons/panel-expander-closed.png
diff --git a/comm/suite/themes/classic/mac/navigator/icons/panel-expander-open.png b/comm/suite/themes/classic/mac/navigator/icons/panel-expander-open.png
new file mode 100644
index 0000000000..e3febf4ffb
--- /dev/null
+++ b/comm/suite/themes/classic/mac/navigator/icons/panel-expander-open.png
diff --git a/comm/suite/themes/classic/mac/navigator/icons/panel-plus-sign.png b/comm/suite/themes/classic/mac/navigator/icons/panel-plus-sign.png
new file mode 100644
index 0000000000..b12ecd514b
--- /dev/null
+++ b/comm/suite/themes/classic/mac/navigator/icons/panel-plus-sign.png
diff --git a/comm/suite/themes/classic/mac/navigator/icons/restore.png b/comm/suite/themes/classic/mac/navigator/icons/restore.png
new file mode 100644
index 0000000000..becb5420df
--- /dev/null
+++ b/comm/suite/themes/classic/mac/navigator/icons/restore.png
diff --git a/comm/suite/themes/classic/mac/navigator/linkToolbar.css b/comm/suite/themes/classic/mac/navigator/linkToolbar.css
new file mode 100644
index 0000000000..b51da8f788
--- /dev/null
+++ b/comm/suite/themes/classic/mac/navigator/linkToolbar.css
@@ -0,0 +1,59 @@
+/* -*- Mode: C; c-basic-offset: 2 -*- */
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#linktoolbar {
+  -moz-appearance: none;
+  background-color: #d5d5d5;
+  background-image: url("chrome://communicator/skin/toolbar/toolbar-gradient22.png");
+  background-repeat: repeat-x;
+  border-bottom: 1px solid rgb(159, 159, 159);
+}
+
+#linktoolbar:-moz-lwtheme {
+  background-color: transparent;
+  background-image: none;
+}
+
+#linktoolbar > .bookmark-item {
+  text-shadow: none;
+}
+
+#linktoolbar > .bookmark-item:not([disabled="true"]):hover:active,
+#linktoolbar > .bookmark-item[open] {
+  text-shadow: 0 1px 1px rgba(0, 0, 0, 0.7);
+}
+
+#link-top {
+  list-style-image: url("chrome://navigator/skin/btn1/top.png");
+}
+
+#link-up {
+  list-style-image: url("chrome://navigator/skin/btn1/up.png");
+}
+
+#link-first {
+  list-style-image: url("chrome://navigator/skin/btn1/first.png");
+}
+
+#link-prev {
+  list-style-image: url("chrome://navigator/skin/btn1/previous.png");
+}
+
+#link-next {
+  list-style-image: url("chrome://navigator/skin/btn1/next.png");
+}
+
+#link-last {
+  list-style-image: url("chrome://navigator/skin/btn1/last.png");
+}
+
+#link-feed {
+  list-style-image: url("chrome://navigator/skin/btn1/feeds.png") !important;
+  -moz-image-region: rect(0px 32px 16px 16px);
+}
diff --git a/comm/suite/themes/classic/mac/navigator/navigator.css b/comm/suite/themes/classic/mac/navigator/navigator.css
new file mode 100644
index 0000000000..73b305eeb8
--- /dev/null
+++ b/comm/suite/themes/classic/mac/navigator/navigator.css
@@ -0,0 +1,956 @@
+/* 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://navigator/content/navigator.css");
+@import url("chrome://communicator/skin/");
+@import url("chrome://communicator/skin/places/bookmarksToolbar.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace html url("http://www.w3.org/1999/xhtml");
+
+#main-window {
+  -moz-appearance: none;
+  background-color: #EEEEEE;
+}
+
+/* ::::: primary toolbar buttons ::::: */
+
+#back-button {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
+  -moz-image-region: rect(60px 29px 89px 0);
+}
+
+#back-button:hover:active,
+#back-button[open] {
+  -moz-image-region: rect(60px 59px 89px 30px);
+}
+
+#back-button[disabled="true"] {
+  -moz-image-region: rect(60px 89px 89px 60px) !important;
+}
+
+#forward-button {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
+  -moz-image-region: rect(90px 29px 119px 0);
+}
+
+#forward-button:hover:active,
+#forward-button[open] {
+  -moz-image-region: rect(90px 59px 119px 30px);
+}
+
+#forward-button[disabled="true"] {
+  -moz-image-region: rect(90px 89px 119px 60px) !important;
+}
+
+#reload-button {
+  list-style-image: url("chrome://navigator/skin/icons/navigatoricons.png");
+  -moz-image-region: rect(0 29px 29px 0);
+}
+
+#reload-button:hover:active {
+  -moz-image-region: rect(0 59px 29px 30px);
+}
+
+#reload-button[disabled="true"] {
+  -moz-image-region: rect(0 89px 29px 60px) !important;
+}
+
+#stop-button {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
+  -moz-image-region: rect(30px 29px 59px 0);
+}
+
+#stop-button:hover:active {
+  -moz-image-region: rect(30px 59px 59px 30px);
+}
+
+#stop-button[disabled="true"] {
+  -moz-image-region: rect(30px 89px 59px 60px) !important;
+}
+
+#home-button {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
+  -moz-image-region: rect(120px 29px 149px 0);
+}
+
+#home-button:hover:active {
+  -moz-image-region: rect(120px 59px 149px 30px);
+}
+
+#home-button[disabled="true"] {
+  -moz-image-region: rect(120px 89px 149px 60px) !important;
+}
+
+#sync-button {
+  list-style-image: url("chrome://communicator/skin/sync/sync-32.png");
+}
+
+#sync-button[status=active] {
+  list-style-image: url("chrome://communicator/skin/sync/sync-32-throbber.png");
+}
+
+/* ::::: small primary toolbar buttons ::::: */
+
+toolbar[iconsize="small"] > toolbarpaletteitem > #back-button,
+toolbar[iconsize="small"] > #back-button {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+  -moz-image-region: rect(40px 19px 59px 0);
+}
+
+toolbar[iconsize="small"] > #back-button:hover:active,
+toolbar[iconsize="small"] > #back-button[open] {
+  -moz-image-region: rect(40px 39px 59px 20px);
+}
+
+toolbar[iconsize="small"] > #back-button[disabled="true"] {
+  -moz-image-region: rect(40px 59px 59px 40px) !important;
+}
+
+toolbar[iconsize="small"] > toolbarpaletteitem > #forward-button,
+toolbar[iconsize="small"] > #forward-button {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+  -moz-image-region: rect(60px 19px 79px 0);
+}
+
+toolbar[iconsize="small"] > #forward-button:hover:active,
+toolbar[iconsize="small"] > #forward-button[open] {
+  -moz-image-region: rect(60px 39px 79px 20px);
+}
+
+toolbar[iconsize="small"] > #forward-button[disabled="true"] {
+  -moz-image-region: rect(60px 59px 79px 40px) !important;
+}
+
+toolbar[iconsize="small"] > toolbarpaletteitem > #reload-button,
+toolbar[iconsize="small"] > #reload-button {
+  list-style-image: url("chrome://navigator/skin/icons/navigatoricons-small.png");
+  -moz-image-region: rect(0 19px 19px 0);
+}
+
+toolbar[iconsize="small"] > #reload-button:hover:active {
+  -moz-image-region: rect(0 39px 19px 20px);
+}
+
+toolbar[iconsize="small"] > #reload-button[disabled="true"] {
+  -moz-image-region: rect(0 59px 19px 40px) !important;
+}
+
+toolbar[iconsize="small"] > toolbarpaletteitem > #stop-button,
+toolbar[iconsize="small"] > #stop-button {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+  -moz-image-region: rect(20px 19px 39px 0);
+}
+
+toolbar[iconsize="small"] > #stop-button:hover:active {
+  -moz-image-region: rect(20px 39px 39px 20px);
+}
+
+toolbar[iconsize="small"] > #stop-button[disabled="true"] {
+  -moz-image-region: rect(20px 59px 39px 40px) !important;
+}
+
+toolbar[iconsize="small"] > toolbarpaletteitem > #home-button,
+toolbar[iconsize="small"] > #home-button {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+  -moz-image-region: rect(80px 19px 99px 0);
+}
+
+toolbar[iconsize="small"] > #home-button:hover:active {
+  -moz-image-region: rect(80px 39px 99px 20px);
+}
+
+toolbar[iconsize="small"] > #home-button[disabled="true"] {
+  -moz-image-region: rect(80px 59px 99px 40px) !important;
+}
+
+toolbar[iconsize="small"] > toolbarpaletteitem > #sync-button,
+toolbar[iconsize="small"] > #sync-button {
+  list-style-image: url("chrome://communicator/skin/sync/sync-16.png");
+}
+
+toolbar[iconsize="small"] > toolbarpaletteitem > #sync-button[status=active],
+toolbar[iconsize="small"] > #sync-button[status=active] {
+  list-style-image: url("chrome://communicator/skin/sync/sync-16-throbber.png");
+}
+
+#FindToolbar {
+  border-top: none;
+  border-bottom: 1px solid #888888;
+}
+
+/* ::::: fullscreen window controls ::::: */
+
+#window-controls {
+  -moz-box-align: center;
+  padding-top: 0px;
+  padding-bottom: 0px;
+  padding-inline-start: 4px;
+  padding-inline-end: 2px;
+}
+
+toolbar[mode="text"] > #window-controls > toolbarbutton > .toolbarbutton-icon {
+  display: -moz-box;
+}
+
+#restore-button {
+  list-style-image: url("chrome://navigator/skin/icons/restore.png");
+}
+  
+/* ::::: nav-bar-inner ::::: */
+
+.nav-bar-class {
+  -moz-box-align: center;
+  min-width: 0px;
+  -moz-window-dragging: drag;
+}
+
+#urlbar > .autocomplete-textbox-container {
+  font: -moz-info;
+}
+
+/* nsNativeThemeCocoa adds top/bottom padding to textfields... */
+#urlbar > .autocomplete-textbox-container,
+#urlbar > .autocomplete-history-dropmarker {
+  margin-top: -1px;
+  margin-bottom: -2px;
+  padding-top: 1px;
+  padding-bottom: 1px;
+}
+
+#urlbar[level="high"] > .autocomplete-textbox-container {
+  -moz-appearance: none;
+  background-color: #FFFFC7;
+  color: #000000;
+}
+
+#urlbar[level="high"] > .autocomplete-history-dropmarker {
+  background-color: #FFFFC7 !important;
+}
+
+#wrapper-nav-bar-inner[place="palette"] > #nav-bar-inner > .button-toolbar,
+#wrapper-nav-bar-inner[place="palette"] > #nav-bar-inner > #urlbar > .urlbar-icons {
+  display: none;
+}
+
+#urlbar-search-splitter {
+  min-width: 8px;
+  margin: 0 -4px;
+  background-image: none;
+  position: relative;
+  height: 22px;
+}
+
+/* ::::: notification popups ::::: */
+
+.popup-notification-icon {
+  width: 64px;
+  height: 64px;
+  margin-inline-end: 10px;
+}
+
+.popup-notification-icon[popupid="geolocation"] {
+  list-style-image: url("chrome://communicator/skin/icons/geolocation-64.png");
+}
+
+.popup-notification-icon[popupid="persistent-storage"] {
+  list-style-image: url("chrome://communicator/skin/icons/notification-icons.svg#persistent-storage");
+}
+
+.popup-notification-icon[popupid="web-notifications"] {
+  list-style-image: url("chrome://communicator/skin/icons/notification-64.png");
+}
+
+.popup-notification-icon[popupid="addon-install-disabled"],
+.popup-notification-icon[popupid="addon-install-blocked"],
+.popup-notification-icon[popupid="addon-install-started"],
+.popup-notification-icon[popupid="addon-install-cancelled"],
+.popup-notification-icon[popupid="addon-install-failed"],
+.popup-notification-icon[popupid="addon-install-complete"],
+.popup-notification-icon[popupid="lwtheme-install-request"],
+.popup-notification-icon[popupid="lwtheme-install-notification"] {
+  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
+  width: 32px;
+  height: 32px;
+}
+
+.popup-notification-icon[popupid="indexedDB-permissions-prompt"],
+.popup-notification-icon[popupid="indexedDB-quota-prompt"] {
+  list-style-image: url("chrome://global/skin/icons/question-64.png");
+}
+
+.popup-notification-icon[popupid="password"] {
+  list-style-image: url("chrome://communicator/skin/icons/key-64.png");
+}
+
+.addon-progress-description {
+  width: 350px;
+  max-width: 350px;
+}
+
+/* Notification icon box */
+#notification-popup-box {
+  margin: 0 3px;
+}
+
+.notification-anchor-icon:-moz-focusring {
+  box-shadow: 0 0 2px 1px -moz-mac-focusring inset,
+              0 0 2px 2px -moz-mac-focusring;
+}
+
+#default-notification-icon {
+  list-style-image: url("chrome://global/skin/icons/information-16.png");
+  width: 16px;
+  height: 16px;
+}
+
+#geo-notification-icon {
+  list-style-image: url("chrome://communicator/skin/icons/geolocation-16.png");
+  width: 16px;
+  height: 16px;
+}
+
+#web-notifications-notification-icon {
+  list-style-image: url("chrome://communicator/skin/icons/notification-16.png");
+  width: 16px;
+  height: 16px;
+}
+
+#addons-notification-icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.png");
+  width: 16px;
+  height: 16px;
+}
+
+#indexedDB-notification-icon {
+  list-style-image: url("chrome://global/skin/icons/question-16.png");
+  width: 16px;
+  height: 16px;
+}
+
+#password-notification-icon {
+  list-style-image: url("chrome://communicator/skin/icons/key-16.png");
+  width: 16px;
+  height: 16px;
+}
+
+.center-item-box {
+  border-inline-start: 1px solid rgba(255, 255, 255, 0.2);
+  padding-top: 7px;
+  padding-inline-end: 11px;
+  padding-inline-start: 16px;
+  margin-bottom: -3px;
+}
+
+.center-item-box[padbottom="true"] {
+  padding-bottom: 12px;
+}
+
+.center-item-icon {
+  background-image: url("chrome://mozapps/skin/plugins/pluginGeneric-16.png");
+  background-repeat: no-repeat;
+  height: 16px;
+  width: 16px;
+  margin-bottom: 4px;
+  margin-inline-end: 6px;
+}
+
+.center-item-box[padbottom="true"][warn="true"] {
+  padding-bottom: 7px;
+}
+
+.center-item-box[showseparator="true"] {
+  border-top: 1px solid rgba(3, 14, 27, 0.1);
+}
+
+.center-item-box[warn="false"] > .center-item-warning {
+  display: none;
+}
+
+.center-item-warning > .text-link {
+  color: #3d8cd7;
+}
+
+.center-item-warning > .text-link[href=""] {
+  display: none;
+}
+
+.center-item-warning-icon {
+  background-image: url("chrome://mozapps/skin/extensions/alerticon-info-negative.png");
+  background-repeat: no-repeat;
+  width: 16px;
+  height: 15px;
+  margin-bottom: 4px;
+}
+
+.center-item-warning-description {
+  color: #828282;
+}
+
+.center-item-button {
+  min-width: 0;
+}
+
+/* ::::: page proxy icon ::::: */
+
+#page-proxy-deck,
+#page-proxy-favicon,
+#page-proxy-button {
+  width: 16px;
+  height: 16px;
+}
+
+#page-proxy-deck {
+  cursor: grab;
+  margin: 0 3px 1px 3px;
+}
+
+#page-proxy-button {
+  list-style-image: url("chrome://communicator/skin/places/bookmark-item.svg"); 
+}
+
+#page-proxy-favicon {
+  list-style-image: none;
+}
+
+#page-proxy-button[pageproxystate="invalid"] {
+  cursor: default;
+  list-style-image: url("chrome://communicator/skin/places/bookmark-item-dis.png");
+}
+
+/* ::::: autocomplete ::::: */
+
+#PopupAutoComplete > richlistbox > richlistitem {
+  height: 20px;
+  min-height: 20px;
+  border: 0;
+  border-radius: 0;
+  padding: 0px 1px 0px 1px;
+}
+
+#PopupAutoComplete > richlistbox > richlistitem > .ac-title {
+  font: icon;
+  margin-inline-start: 6px;
+}
+
+#PopupAutoComplete > richlistbox {
+  padding: 0;
+}
+
+.autocomplete-textbox-container {
+  -moz-box-align: center;
+}
+
+.autocomplete-treebody::-moz-tree-cell-text(value) {
+  padding-inline-start: 15px;
+}
+
+.autocomplete-treebody::-moz-tree-cell-text(comment) {
+ color: GrayText;
+}
+
+.autocomplete-history-popup > .popup-internal-box {
+  padding: 0 !important;
+}
+
+.autocomplete-history-popup > menuitem {
+  -moz-appearance: none !important;
+  max-width: none !important;
+  font: inherit;
+  padding: 2px;
+  margin: 0;
+}
+
+.autocomplete-history-popup > menuitem[_moz-menuactive="true"],
+.autocomplete-search-engine[menuactive="true"] {
+  background-color: Highlight !important;
+  color: HighlightText !important;
+}
+
+.autocomplete-search-engine {
+  border-top: 1px solid #D9D9D9; /* Same color as menuseparator is probably sane here */
+  padding: 2px;
+}
+
+.autocomplete-search-engine-img {
+  margin-inline-end: 4px;
+  width: 16px;
+  height: 16px;
+}
+
+.autocomplete-treebody::-moz-tree-cell-text(treecolAutoCompleteComment) {
+  color: GrayText;
+}
+
+/* ::::: searchbutton ::::: */
+
+#search-button {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  list-style-image: url("chrome://global/skin/icons/search-textbox.png");
+}
+
+toolbar[mode="text"] #search-button > .button-box > .button-icon,
+toolbar[mode="icons"] #search-button > .button-box > .button-text {
+  display: none;
+}
+
+/* ::::: search bar ::::: */
+
+.autocomplete-treebody::-moz-tree-cell-text(suggesthint, treecolAutoCompleteComment),
+.autocomplete-treebody::-moz-tree-cell-text(suggestfirst, treecolAutoCompleteComment) {
+  color: GrayText;
+  font-size: smaller;
+}
+
+.autocomplete-treebody::-moz-tree-cell(suggesthint) {
+  border-top: 1px solid GrayText;
+}
+
+/* ::::: sidebar splitter ::::: */
+
+#sidebar-splitter {
+  border-left: none;
+  border-right: none;
+  min-width: 5px;
+}
+
+/* ::::: content area ::::: */
+
+#security-button[level="high"] > .statusbarpanel-contentbox {
+  background-color: #B4CD32;
+}
+
+#security-button[level="broken"] > .statusbarpanel-contentbox {
+  background-color: #E83404;
+}
+
+#security-button[label] > .statusbarpanel-contentbox {
+  background-color: #62C441;
+}
+
+#security-button > .statusbarpanel-contentbox > .statusbarpanel-text {
+  margin: 0px;
+  color: #FFFFFF;
+  text-shadow: none;
+}
+
+/* make same background-color translucent on lwthemes */
+#security-button[level="high"] > .statusbarpanel-contentbox:-moz-lwtheme {
+  background-color: rgba(232, 219, 153, .8);
+}
+
+#security-button[level="broken"] > .statusbarpanel-contentbox:-moz-lwtheme {
+  background-color: rgba(232, 52, 4, .8);
+}
+
+#security-button[label] > .statusbarpanel-contentbox:-moz-lwtheme {
+  background-color: rgba(98, 196, 65, .8);
+}
+
+#ev-button {
+  list-style-image: url("chrome://communicator/skin/icons/identity.png");
+}
+
+#popupIcon {
+  list-style-image: url("chrome://navigator/skin/icons/popup-blocked.png");
+}
+
+#invalid-form-popup {
+  -moz-appearance: tooltip;
+  padding: 2px 3px 0px 3px;
+  max-width: 40em;
+  color: InfoText;
+  font-weight: bold;
+}
+
+/* Set default text-shadow that we will override if this is in the PT. */
+#personal-bookmarks {
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.4);
+}
+
+/* ::::: personal toolbar ::::: */
+
+#PersonalToolbar {
+  -moz-appearance: none;
+  background-color: #d5d5d5;
+  background-image: url("chrome://communicator/skin/toolbar/toolbar-gradient22.png");
+  background-repeat: repeat-x;
+  border-bottom: 1px solid rgb(159, 159, 159);
+}
+
+#PersonalToolbar:-moz-lwtheme {
+  background-color: transparent;
+  background-image: none;
+}
+
+/* No text-shadow when we're in the PT. */
+#PersonalToolbar > toolbarbutton,
+#PersonalToolbar > #personal-bookmarks {
+  text-shadow: none;
+}
+
+/* text-shadow styling depends on where the items are, so use inheritance. */
+#PlacesToolbar > .bookmark-item,
+#PlacesToolbarItems > .bookmark-item {
+  text-shadow: inherit;
+}
+
+#PersonalToolbar > toolbarbutton:hover:active,
+#PersonalToolbar > toolbarbutton[open],
+#PlacesToolbarItems > .bookmark-item:hover:active,
+#PlacesToolbarItems > .bookmark-item[open] {
+  text-shadow: 0 1px 1px rgba(0, 0, 0, 0.7) !important;
+}
+
+#PersonalToolbar > toolbarbutton > .toolbarbutton-text,
+.bookmark-item > .toolbarbutton-text {
+  margin: 0 3px 0 2px !important;
+}
+
+#PersonalToolbar > toolbarbutton > .toolbarbutton-icon,
+.bookmark-item > .toolbarbutton-icon {
+  padding: 0;
+}
+
+#bookmarks-button {
+  list-style-image: url("chrome://global/skin/tree/folder.png");
+  padding: 0;
+}
+
+toolbarbutton.chevron {
+  list-style-image: url("chrome://navigator/skin/icons/chevron.png");
+  height: 16px;
+  width: 16px;
+}
+
+toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
+  display: none;
+}
+
+toolbarbutton.chevron > .toolbarbutton-text {
+  display: none; /* hide chevron label which has a width even if blank */
+}
+
+toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon {
+  display: -moz-box; /* display chevron icon in text mode */
+}
+
+/* Prevent [mode="icons"|"text"] from hiding the label and icon */
+#PlacesToolbarItems .bookmark-item > .toolbarbutton-text,
+#PlacesToolbarItems .bookmark-item > .toolbarbutton-icon {
+  display: -moz-box !important;
+}
+
+#PersonalToolbar[iconsize="small"] > toolbarpaletteitem > #home-button > .toolbarbutton-icon,
+#PersonalToolbar[iconsize="small"] > #home-button > .toolbarbutton-icon {
+  width: 16px;
+  height: 16px;
+}
+
+/*
+  In customize mode we hide the normal bookmark items and show a placeholder
+  for the drag/drop UI.
+*/
+.bookmarks-toolbar-customize {
+  list-style-image: url("chrome://communicator/skin/places/bookmarksToolbar.png");
+  display: none;
+  max-width: 15em !important;
+}
+
+#wrapper-personal-bookmarks[place="palette"] > .toolbarpaletteitem-box {
+  width: 16px;
+  height: 16px;
+  background: url("chrome://communicator/skin/places/bookmarksToolbar.png") no-repeat;
+}
+
+/* ::::: star button ::::: */
+
+#star-button {
+  list-style-image: url("chrome://communicator/skin/places/bookmark.png");
+  -moz-image-region: rect(16px 16px 32px 0px);
+}
+
+#star-button:hover {
+  -moz-image-region: rect(16px 32px 32px 16px);
+}
+
+#star-button:hover:active {
+  -moz-image-region: rect(16px 48px 32px 32px);
+}
+
+#star-button[starred="true"] {
+  -moz-image-region: rect(0px 16px 16px 0px);
+}
+
+#star-button[starred="true"]:hover {
+  -moz-image-region: rect(0px 32px 16px 16px);
+}
+
+#star-button[starred="true"]:hover:active {
+  -moz-image-region: rect(0px 48px 16px 32px);
+}
+
+#editBookmarkPanelStarIcon {
+  list-style-image: url("chrome://communicator/skin/places/bookmark.png");
+  -moz-image-region: rect(0px 16px 16px 0px);
+}
+
+#editBookmarkPanelTitle {
+  font-size: 130%;
+  font-weight: bold;
+}
+
+/* ::::: Edit bookmark panel ::::: */
+
+#editBMPanel_rows > row {
+  margin-bottom: 8px;
+}
+
+#editBMPanel_rows > row:last-of-type {
+  margin-bottom: 0;
+}
+
+#editBMPanel_rows > row > textbox,
+#editBMPanel_rows > row > hbox > textbox {
+  -moz-appearance: none;
+  background: linear-gradient(#FAFAFA, #FFFFFF);
+  background-clip: padding-box;
+  border-radius: 3px;
+  border: 1px solid rgba(0, 0, 0, 0.3);
+  box-shadow: inset 0 1px 1px 1px rgba(0, 0, 0, 0.05),
+              0 1px rgba(255, 255, 255, 0.3);
+  margin: 0;
+  padding: 3px 6px;
+}
+
+#editBMPanel_rows > row > textbox[focused="true"],
+#editBMPanel_rows > row > hbox > textbox[focused="true"] {
+  border-color: -moz-mac-focusring !important;
+  box-shadow: 0 0 1px -moz-mac-focusring inset,
+              0 0 4px 1px -moz-mac-focusring,
+              0 0 1.5px 1px -moz-mac-focusring;
+}
+
+.editBookmarkPanelHeaderButton,
+.editBookmarkPanelBottomButton {
+  -moz-appearance: none;
+  color: #434343;
+  border-radius: 4px;
+  border: 1px solid #B5B5B5;
+  background: linear-gradient(#FFFFFF, #F2F2F2);
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.8),
+              inset 0 0 1px rgba(255, 255, 255, 0.25),
+              0 1px rgba(255, 255, 255, 0.3);
+  background-clip: padding-box;
+  background-origin: padding-box;
+  margin: 0;
+  padding: 2px 6px;
+}
+
+.editBookmarkPanelHeaderButton:hover:active,
+.editBookmarkPanelBottomButton:hover:active {
+  box-shadow: inset 0 1px 4px -3px #000, 0 1px rgba(255, 255, 255, 0.3);
+}
+
+.editBookmarkPanelHeaderButton:-moz-focusring,
+.editBookmarkPanelBottomButton:-moz-focusring {
+  box-shadow: inset 0 0 1px -moz-mac-focusring,
+              0 0 4px 1px -moz-mac-focusring,
+              0 0 2px 1px -moz-mac-focusring;
+}
+
+.editBookmarkPanelBottomButton {
+  margin-inline-start: 8px;
+}
+
+.editBookmarkPanelBottomButton[default="true"] {
+  background-color: #666666;
+}
+
+#editBookmarkPanelHeader {
+  margin-bottom: 6px;
+}
+
+#editBMPanel_editColumn {
+  color: #FFFFFF;
+}
+
+/* The following elements come from editBookmarkOverlay.xul, but the styling is
+   specific to the HUD-styled editBookmarkPanel. Styling shared by all
+   editBookmarkOverlay.xul consumers should be in editBookmarkOverlay.css. */
+
+#editBMPanel_newFolderBox {
+  background: linear-gradient(#FFFFFF, #F2F2F2);
+  background-origin: padding-box;
+  background-clip: padding-box;
+  border-radius: 0 0 3px 3px;
+  border: 1px solid #A5A5A5;
+  box-shadow: inset 0 1px rgba(255,255, 255, 0.8),
+              inset 0 0 1px rgba(255, 255, 255, 0.25),
+              0 1px rgba(255, 255, 255, 0.3);
+  padding: 0;
+  margin: 0;
+  height:  20px;
+}
+
+#editBMPanel_newFolderButton {
+  -moz-appearance: none;
+  border: 0 solid #A5A5A5;
+  border-inline-end-width: 1px;
+
+  padding: 0 9px;
+  margin: 0;
+  min-width: 21px;
+  min-height: 20px;
+  height: 20px;
+  color: #FFFFFF;
+  list-style-image: url("chrome://navigator/skin/icons/panel-plus-sign.png");
+  position: relative;
+}
+
+#editBMPanel_newFolderButton .button-text {
+  display: none;
+}
+
+#editBMPanel_folderMenuList,
+#editBMPanel_tagsSelectorExpander,
+#editBMPanel_foldersExpander {
+  color: #434343;
+  border-radius: 4px;
+  border: 1px solid #B5B5B5;
+  background: linear-gradient(#FFFFFF, #F2F2F2);
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.8),
+              inset 0 0 1px rgba(255, 255, 255, 0.25),
+              0 1px rgba(255, 255, 255, 0.3);
+  background-clip: padding-box;
+  background-origin: padding-box;
+  margin: 0;
+}
+
+#editBMPanel_folderMenuList {
+  -moz-appearance: none;
+  min-height: 22px;
+  padding-top: 2px;
+  padding-bottom: 1px;
+  padding-inline-start: 8px;
+  padding-inline-end: 4px;
+}
+
+#editBMPanel_tagsSelectorExpander,
+#editBMPanel_foldersExpander {
+  margin-inline-start: 4px;
+  padding-top: 2px;
+  padding-inline-start: 6px;
+  padding-inline-end: 2px;
+  min-width: 27px;
+  min-height: 22px;
+}
+
+#editBMPanel_folderMenuList > .menulist-dropmarker {
+  -moz-appearance: none;
+  display: -moz-box;
+  background-color: transparent;
+  border: 0;
+  margin: 0;
+  padding: 0;
+  padding-inline-end: 4px;
+  width: 7px;
+}
+
+#editBMPanel_folderMenuList > .menulist-dropmarker > .dropmarker-icon {
+  list-style-image: url("chrome://global/skin/icons/panel-dropmarker.png");
+}
+
+/**** folder tree and tag selector ****/
+#editBMPanel_folderTree,
+#editBMPanel_tagsSelector {
+  -moz-appearance: none;
+  background: linear-gradient(#FAFAFA, #FFFFFF);
+  background-clip: padding-box;
+  border-radius: 3px;
+  border: 1px solid rgba(0, 0, 0, 0.3);
+  box-shadow: inset 0 1px 1px 1px rgba(0, 0, 0, 0.05),
+              0 1px rgba(255, 255, 255, 0.3);
+  margin: 0;
+}
+
+#editBMPanel_folderTree {
+  border-bottom: none;
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0;
+  /* Implements editBookmarkPanel resizing on folderTree un-collapse. */
+  margin: 0 !important;
+  min-width: 27em;
+  position: relative;
+}
+  
+
+#editBMPanel_folderTree:-moz-focusring,
+#editBMPanel_tagsSelector:-moz-focusring {
+  border-color: -moz-mac-focusring;
+  box-shadow: 0 0 4px 1px -moz-mac-focusring,
+              0 0 2px 1px -moz-mac-focusring;
+}
+
+/* hover:active */
+#editBMPanel_newFolderButton:hover:active,
+#editBMPanel_folderMenuList[open="true"],
+#editBMPanel_folderMenuList:hover:active,
+#editBMPanel_tagsSelectorExpander:hover:active,
+#editBMPanel_foldersExpander:hover:active {
+  box-shadow: inset 0 1px 4px -3px #000000, 0 1px rgba(255, 255, 255, 0.3);
+}
+
+/* focus ring */
+#editBMPanel_newFolderButton:-moz-focusring,
+#editBMPanel_folderMenuList:-moz-focusring,
+#editBMPanel_tagsSelectorExpander:-moz-focusring,
+#editBMPanel_foldersExpander:-moz-focusring,
+#editBMPanel_namePicker[droppable="false"][focused="true"] > .menulist-editable-box {
+  box-shadow: inset 0 0 1px -moz-mac-focusring,
+              0 0 4px 1px -moz-mac-focusring,
+              0 0 2px 1px -moz-mac-focusring;
+}
+
+/* expander icons */
+#editBMPanel_rows > row > hbox > .expander-up {
+  list-style-image: url("chrome://navigator/skin/icons/panel-expander-open.png");
+}
+
+#editBMPanel_rows > row > hbox > .expander-down {
+  list-style-image: url("chrome://navigator/skin/icons/panel-expander-closed.png");
+}
+
+.editBMPanel_rowLabel {
+  text-align: end;
+}
+
+/* ::::: feeds ::::: */
+
+.feedsMenu {
+  list-style-image: url("chrome://communicator/skin/icons/feedIcon16.png");
+}
+
+#BMB_feedsMenu[disabled="true"] {
+  list-style-image: url("chrome://communicator/skin/icons/feedIcon16-disabled.png");
+}
+
+#feedsButton {
+  list-style-image: url("chrome://navigator/skin/btn1/feeds.png");
+  -moz-image-region: rect(0px 32px 16px 16px);
+}
+
+#feedsButton[open="true"] {
+  -moz-image-region: rect(48px 32px 64px 16px) !important;
+}
+
+/* Need to set fixed width to stop the zoom display from changing size and moving around the zoom buttons */
+#zoomLevel-display {
+  width: 60px;
+  max-width: 60px;
+  margin-left: 0px;
+  margin-right: 0px;
+}
diff --git a/comm/suite/themes/classic/mac/navigator/pageInfo.css b/comm/suite/themes/classic/mac/navigator/pageInfo.css
new file mode 100644
index 0000000000..3e912719da
--- /dev/null
+++ b/comm/suite/themes/classic/mac/navigator/pageInfo.css
@@ -0,0 +1,183 @@
+/* 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 "chrome://global/skin/global.css";
+
+#main-window {
+  width: 600px !important;
+  height: 530px !important;
+}
+
+#dragbox {
+  -moz-window-dragging: drag;
+  min-height: 20px;
+  -moz-appearance: toolbar;
+  -moz-box-align: center;
+}
+
+#tabbox {
+  margin: 0;
+  -moz-appearance: none;
+  padding: 0;
+}
+
+#tabs {
+  padding: 1px;
+  margin: 3px 0 8px;
+}
+
+tab {
+  -moz-appearance: toolbarbutton;
+  -moz-box-orient: vertical;
+  text-shadow: 0 1px rgba(255, 255, 255, 0.4);
+  margin: 0;
+}
+
+tab[selected=true] {
+  color: #FFFFFF;
+  text-shadow: 0 1px rgba(0, 0, 0, 0.4);
+}
+
+.tab-middle {
+  padding: 0;
+}
+
+.tab-icon {
+  display: none;
+}
+
+#mainDeck {
+  -moz-appearance: none;
+}
+
+/* Misc */
+tree {
+  margin: .5em;
+}
+
+.gridSeparator {
+  width: .5em;
+}
+
+textbox {
+  background: transparent !important;
+  border: none;
+  padding: 0px;
+  margin-top: 1px;
+  -moz-appearance: none;
+  -moz-user-focus: none;
+}
+
+textbox.header {
+  margin-inline-start: 0;
+}
+
+.iframe {
+  margin: .5em;
+  background: white;
+  overflow: auto;
+}
+
+.fixedsize {
+  height: 8.5em;
+}
+
+textbox[disabled] {
+  font-style: italic;
+}
+
+/* General Tab */
+#metatree {
+  margin: 0;
+}
+
+#metaTags > .groupbox-body {
+  padding: 0;
+}
+
+#general-security-identity {
+  white-space: pre-wrap;
+  line-height: 2em;
+}
+
+/* Media Tab */
+#imagetree {
+  min-height: 10em;
+}
+
+#mediaGrid {
+  min-height: 9em;
+}
+
+#mediaLabelColumn {
+  min-width: 10em;
+}
+
+#thepreviewimage {
+  margin: 1em;
+}
+
+treechildren::-moz-tree-cell-text(broken) {
+  font-style: italic;
+  color: graytext;
+}
+
+/* Feeds Tab */
+#feedListbox > richlistitem {
+  padding-top: 6px;
+  padding-bottom: 6px;
+  padding-inline-start: 7px;
+  padding-inline-end: 7px;
+  min-height: 25px;
+  border-bottom: 1px dotted #C0C0C0;
+}
+
+.feedTitle { 
+  font-weight: bold;
+}
+
+/* Permissions Tab */
+#permList {
+  margin-top: .5em;
+  overflow: auto;
+}
+
+#permList > richlistitem {
+  padding-top: 6px;
+  padding-bottom: 6px;
+  padding-inline-start: 7px;
+  padding-inline-end: 7px;
+  min-height: 25px;
+  border-bottom: 1px dotted #C0C0C0;
+}
+
+#permList > richlistitem > label {
+  font-weight: bold;
+}
+
+/* Security Tab */
+#security-technical-longform1,
+#security-technical-longform2 {
+  margin-inline-start: 6px;
+}
+
+.fieldValue {
+  font-weight: bold;
+}
+
+#identity-icon {
+  width: 64px;
+  height: 64px;
+  max-height: 64px;
+  list-style-image: url("chrome://navigator/skin/icons/identity.png");
+  -moz-image-region: rect(0px, 64px, 64px, 0px);
+}
+
+#identity-icon.verifiedDomain {
+  -moz-image-region: rect(64px, 64px, 128px, 0px);
+}
+
+#identity-icon.verifiedIdentity {
+  -moz-image-region: rect(128px, 64px, 192px, 0px);
+}
diff --git a/comm/suite/themes/classic/mac/navigator/tabbrowser.css b/comm/suite/themes/classic/mac/navigator/tabbrowser.css
new file mode 100644
index 0000000000..1017f4293e
--- /dev/null
+++ b/comm/suite/themes/classic/mac/navigator/tabbrowser.css
@@ -0,0 +1,238 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+tabbrowser {
+  border: 0 !important;
+}
+
+tabbox {
+  margin: 0;
+}
+
+tabpanels {
+  -moz-appearance: none;
+}
+
+.tabs-bottom {
+  border-bottom: 1px solid rgba(0, 0, 0, 0.08);
+}
+
+.tabbrowser-tabs {
+  font: icon;
+  background-color: rgba(0, 0, 0, 0.1);
+  border-top: 1px solid rgba(0, 0, 0, 0.08);
+  padding: 0;
+  margin: 0;
+  margin-bottom: 2px;
+  -moz-box-align: end;
+}
+
+.tabs-stack {
+  margin-top: -1px;
+}
+
+.tab-icon {
+  margin-inline-end: 3px;
+  width: 16px;
+  height: 16px;
+}
+
+.tabbrowser-tab {
+  margin: 0;
+  padding: 0;
+  list-style-image: url("chrome://communicator/skin/places/bookmark-item.svg");
+  border: solid transparent;
+  border-width: 0 1px;
+  -moz-appearance: none;
+}
+
+.tabbrowser-tab:not([selected="true"]):-moz-locale-dir(ltr),
+.tabbrowser-tab:not([selected="true"]):-moz-locale-dir(rtl):first-child {
+  border-right-color: rgba(0, 0, 0, 0.19);
+}
+
+.tabbrowser-tab:not([selected="true"]):-moz-locale-dir(ltr):first-child,
+.tabbrowser-tab:not([selected="true"]):-moz-locale-dir(rtl) {
+  border-left-color: rgba(0, 0, 0, 0.19);
+}
+
+.tabbrowser-tab:not(:first-child) {
+  margin-inline-start: -1px;
+}
+
+.tab-middle {
+  padding: 4px 7px;
+}
+
+.tab-middle:-moz-lwtheme {
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+.tab-middle:-moz-lwtheme:not([selected="true"]) > .tab-text {
+  opacity: 0.8;
+}
+
+.tab-middle[selected="true"] {
+  padding: 1px 7px 4px;
+  background-color: #E8E8E8;
+}
+
+.tab-middle[selected="true"]:-moz-lwtheme {
+  background-color: transparent;
+}
+
+.tabbrowser-tab:hover > .tab-middle:not([selected="true"]) {
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+.tabbrowser-tab:-moz-lwtheme:hover > .tab-middle:not([selected="true"]) {
+  background-color: rgba(0, 0, 0, 0.20);
+}
+
+.tabbrowser-tab[busy] {
+  list-style-image: url("chrome://communicator/skin/icons/loading.png");
+}
+
+.tabbrowser-tab[selected="true"] {
+  color: #000000;
+  text-shadow: none;
+  border-radius: 2px;
+  border-top-width: 1px;
+  border-top-color: rgba(0, 0, 0, 0.1);
+  border-left-color: rgba(0, 0, 0, 0.08);
+  border-right-color: rgba(0, 0, 0, 0.08);
+  margin-top: 2px;
+}
+
+.tabbrowser-tab:focus {
+  outline: 2px solid -moz-mac-focusring;
+  outline-offset: -2px;
+  -moz-outline-radius: 5px;
+}
+
+.tabbrowser-tab[beforeselected="true"]:-moz-locale-dir(ltr) {
+  border-right-color: transparent;
+}
+
+.tabbrowser-tab[beforeselected="true"]:-moz-locale-dir(rtl) {
+  border-left-color: transparent;
+}
+
+.tabs-newbutton > .toolbarbutton-text,
+.tabs-alltabs-button > .toolbarbutton-text,
+.tabs-closebutton > .toolbarbutton-text {
+  display: none;
+}
+
+/* ::::: Tab scrollbox arrow ::::: */
+
+.scrollbutton-up,
+.scrollbutton-down {
+  border: 0;
+  padding: 0 4px;
+  margin: 0;
+}
+
+.scrollbutton-up:-moz-locale-dir(ltr),
+.scrollbutton-down:-moz-locale-dir(rtl) {
+  border-right: 1px solid;
+  border-right-color: rgba(0, 0, 0, 0.19);
+  list-style-image: url("chrome://messenger/skin/icons/tab-arrow-left.png");
+  -moz-image-region: rect(0, 7px, 11px, 0);
+}
+
+.scrollbutton-up[disabled="true"]:-moz-locale-dir(ltr),
+.scrollbutton-down[disabled="true"]:-moz-locale-dir(rtl) {
+  -moz-image-region: rect(0, 14px, 11px, 7px);
+  border-right-color: transparent;
+}
+
+.scrollbutton-down:-moz-locale-dir(ltr),
+.scrollbutton-up:-moz-locale-dir(rtl) {
+  border-left: 1px solid;
+  border-left-color: rgba(0, 0, 0, 0.19);
+  list-style-image: url("chrome://messenger/skin/icons/tab-arrow-right.png");
+  -moz-image-region: rect(0, 7px, 11px, 0);
+  box-shadow: 0 0 0 9px transparent inset;
+  transition: box-shadow 1s ease-out;
+}
+
+.scrollbutton-down[notifybgtab="true"] {
+  box-shadow: 0 0 0 9px rgba(0, 0, 0, 0.2) inset;
+  transition: none;
+}
+
+.scrollbutton-down[disabled="true"]:-moz-locale-dir(ltr),
+.scrollbutton-up[disabled="true"]:-moz-locale-dir(rtl) {
+  -moz-image-region: rect(0, 14px, 11px, 7px);
+  border-left-color: transparent;
+}
+
+.scrollbutton-up:hover:not([disabled="true"]),
+.scrollbutton-down:hover:not([disabled="true"]) {
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+.scrollbutton-up:hover:active:not([disabled="true"]),
+.scrollbutton-down:hover:active:not([disabled="true"]) {
+  background-color: rgba(0, 0, 0, 0.2);
+}
+
+/* All Tabs Menupopup */
+.alltabs-item {
+  list-style-image: url("chrome://communicator/skin/places/bookmark-item.svg");
+}
+
+.alltabs-item[busy] {
+  list-style-image: url("chrome://communicator/skin/icons/loading.png") !important;
+}
+
+.alltabs-item[tabIsScrolled] {
+  font-style: italic;
+}
+
+/* ::::: close button ::::: */
+
+.tabs-closebutton {
+  margin: 3px;
+  padding: 1px;
+  list-style-image: url("chrome://navigator/skin/icons/close.png");
+  -moz-image-region: rect(0, 16px, 16px, 0);
+}
+
+.tabs-closebutton:hover {
+  -moz-image-region: rect(0, 32px, 16px, 16px);
+}
+
+.tabs-closebutton:active:hover {
+  -moz-image-region: rect(0, 48px, 16px, 32px);
+}
+
+.tabs-newbutton {
+  margin: 0;
+  padding: 1px;
+  list-style-image: url("chrome://navigator/skin/icons/tab-new.png");
+}
+
+.tab-drop-indicator-bar {
+  height: 11px;
+  margin-top: -11px;
+  margin-inline-start: -6px;
+  position: relative;
+}
+
+.tab-drop-indicator {
+  height: 11px;
+  width: 11px;
+  margin-bottom: -5px;
+  position: relative;
+  list-style-image: url('chrome://navigator/skin/icons/tab-drag-indicator.png');
+}
+
+tooltip[tabpreview="true"] {
+  max-width: none;
+}
diff --git a/comm/suite/themes/classic/mac/navigator/webDeveloper.css b/comm/suite/themes/classic/mac/navigator/webDeveloper.css
new file mode 100644
index 0000000000..682c48c544
--- /dev/null
+++ b/comm/suite/themes/classic/mac/navigator/webDeveloper.css
@@ -0,0 +1,197 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace html url("http://www.w3.org/1999/xhtml");
+
+/* Mostly copied from mozilla/devtools/client/themes/commandline.inc.css  */
+/* Developer Tools */
+
+/* Developer toolbar */
+
+/* NOTE: THESE NEED TO STAY IN SYNC WITH LIGHT-THEME.CSS AND DARK-THEME.CSS.
+   We are copy/pasting variables from light-theme and dark-theme,
+   since they aren't loaded in this context (within browser.css). */
+#developer-toolbar[devtoolstheme="light"] {
+  --gcli-background-color: #ebeced; /* --theme-tab-toolbar-background */
+  --gcli-input-background: #f0f1f2; /* --theme-toolbar-background */
+  --gcli-input-focused-background: #f7f7f7; /* --theme-sidebar-background */
+  --gcli-input-color: #18191a; /* --theme-body-color */
+  --gcli-border-color: #aaaaaa; /* --theme-splitter-color */
+  --selection-background: #4c9ed9; /* --theme-selection-background */
+  --selection-color: #f5f7fa; /* --theme-selection-color */
+}
+
+#developer-toolbar[devtoolstheme="dark"] {
+  --gcli-background-color: #343c45; /* --theme-toolbar-background */
+  --gcli-input-background: rgba(37, 44, 51, .6); /* --theme-tab-toolbar-background */
+  --gcli-input-focused-background: #252c33; /* --theme-tab-toolbar-background */
+  --gcli-input-color: #b6babf; /* --theme-body-color-alt */
+  --gcli-border-color: #000000; /* --theme-splitter-color */
+  --selection-background: #1d4f73; /* --theme-selection-background */
+  --selection-color: #f5f7fa; /* --theme-selection-color */
+}
+
+#developer-toolbar {
+  padding: 0;
+  background-color: var(--gcli-background-color);
+  border-top: 1px solid var(--gcli-border-color);
+}
+
+#developer-toolbar[devtoolstheme="light"] .gclitoolbar-input-node:not([focused=true])::before  {
+  filter: invert(1);
+}
+
+#developer-toolbar-toolbox-button {
+  list-style-image: url("chrome://devtools/skin/images/toggle-tools.png");
+  -moz-image-region: rect(0px, 64px, 16px, 48px);
+}
+
+#developer-toolbar-toolbox-button:hover > .toolbarbutton-icon {
+  filter: brightness(120%);
+}
+
+#developer-toolbar-toolbox-button:hover:active > .toolbarbutton-icon {
+  filter: saturate(150%);
+}
+
+#developer-toolbar-toolbox-button[checked=true] > .toolbarbutton-icon {
+  filter: hue-rotate(180deg);
+}
+
+@media (min-resolution: 1.1dppx) {
+  #developer-toolbar-toolbox-button {
+    list-style-image: url("chrome://devtools/skin/images/toggle-tools@2x.png");
+    -moz-image-region: rect(0px, 128px, 32px, 96px);
+  }
+}
+
+/* Error counter */
+
+#developer-toolbar-toolbox-button[error-count]:before {
+  color: white;
+  min-width: 16px;
+  text-shadow: none;
+  background-color: firebrick;
+  border-radius: 2px;
+  margin-inline-end: 2px;
+/*
+  Firefox browser/themes/osx/browser.css
+  color: #FDF3DE;
+  min-width: 16px;
+  text-shadow: none;
+  background-image: linear-gradient(#B4211B, #8A1915);
+  border-radius: 1px;
+*/
+}
+
+/* GCLI */
+
+html|*#gcli-tooltip-frame,
+html|*#gcli-output-frame {
+  padding: 0;
+  border-width: 0;
+  background-color: transparent;
+}
+
+#gcli-output,
+#gcli-tooltip {
+  border-width: 0;
+  background-color: transparent;
+  -moz-appearance: none;
+}
+
+.gclitoolbar-input-node,
+.gclitoolbar-complete-node {
+  -moz-box-align: center;
+  padding-top: 0;
+  padding-bottom: 0;
+  padding-right: 8px;
+  text-shadow: none;
+  box-shadow: none;
+  background-color: transparent;
+}
+
+.gclitoolbar-input-node {
+  -moz-appearance: none;
+  color: var(--gcli-input-color);
+  background-color: var(--gcli-input-background);
+  background-repeat: no-repeat;
+  background-position: 4px center;
+  box-shadow: 1px 0 0 var(--gcli-border-color) inset,
+              -1px 0 0 var(--gcli-border-color) inset;
+  outline-style: none;
+  padding: 0;
+}
+
+.gclitoolbar-input-node[focused="true"] {
+  background-color: var(--gcli-input-focused-background);
+}
+
+.gclitoolbar-input-node::before {
+  content: "";
+  display: inline-block;
+  -moz-box-ordinal-group: 0;
+  width: 16px;
+  height: 16px;
+  margin: 0 2px;
+  background-image: url("chrome://devtools/skin/images/commandline-icon.png");
+  background-position: 0 center;
+  background-size: 32px 16px;
+}
+
+.gclitoolbar-input-node[focused="true"]::before {
+  background-position: -16px center;
+}
+
+@media (min-resolution: 1.1dppx) {
+  .gclitoolbar-input-node::before {
+    background-image: url("chrome://devtools/skin/images/commandline-icon@2x.png");
+  }
+}
+
+.gclitoolbar-input-node > .textbox-input-box > html|*.textbox-input::-moz-selection {
+  background-color: var(--selection-background);
+  color: var(--selection-color);
+  text-shadow: none;
+}
+
+.gclitoolbar-complete-node {
+  padding-left: 21px;
+  background-color: transparent;
+  color: transparent;
+  z-index: 100;
+  pointer-events: none;
+}
+
+.gcli-in-incomplete,
+.gcli-in-error,
+.gcli-in-ontab,
+.gcli-in-todo,
+.gcli-in-closebrace,
+.gcli-in-param,
+.gcli-in-valid {
+  margin: 0;
+  padding: 0;
+}
+
+.gcli-in-incomplete {
+  border-bottom: 2px dotted #999;
+}
+
+.gcli-in-error {
+  border-bottom: 2px dotted #F00;
+}
+
+.gcli-in-ontab {
+  color: hsl(210,0%,35%);
+}
+
+.gcli-in-todo {
+  color: hsl(210,50%,35%);
+}
+
+.gcli-in-closebrace {
+  color: hsl(0,0%,80%);
+}
diff --git a/comm/suite/themes/classic/messenger/accountCentral.css b/comm/suite/themes/classic/messenger/accountCentral.css
new file mode 100644
index 0000000000..fdde99c557
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/accountCentral.css
@@ -0,0 +1,120 @@
+/* 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/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#acctCentralGrid {
+  background-color: #FFFFFF;
+}
+
+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: #000000;
+}
+
+.acctCentralRow {
+  -moz-binding: url("chrome://communicator/skin/communicatorBindings.xml#row-iconic");
+  margin-inline-start: 10px;
+  font-size: 125%;
+  color: #000000;
+}
+
+.row-iconic-icon {
+  list-style-image: inherit;
+  margin-inline-end: 10px;
+}
+
+.acctCentralRowTitleBox {
+  background-color: -moz-dialog;
+  font-size: 150%;
+  font-weight: bold;
+  color: -moz-fieldtext;
+}
+
+/* ::::: links ::::: */
+
+.acctCentralLinkText {
+  cursor: pointer;
+  color: #212731;
+  text-decoration: underline;
+}
+
+.acctCentralLinkText:hover {
+  color: #39598E;
+}
+
+.acctCentralLinkText:hover:active {
+  color: #000000;
+}
+
+/* ::::: row icons ::::: */
+
+#ReadMessages {
+  list-style-image: url("chrome://messenger/skin/icons/acct-read.png");
+}
+
+#ComposeMessage {
+  list-style-image: url("chrome://messenger/skin/icons/acct-compose.png");
+}
+
+#SubscribeNewsgroups {
+  list-style-image: url("chrome://messenger/skin/icons/acct-subscribe.png");
+}
+
+#SubscribeImapFolders {
+  list-style-image: url("chrome://messenger/skin/icons/acct-subscribe.png");
+}
+
+#SubscribeRSS {
+  list-style-image: url("chrome://messenger/skin/icons/acct-subscribe.png");
+}
+
+#SearchMessages {
+  list-style-image: url("chrome://messenger/skin/icons/acct-search.png");
+}
+
+#AccountSettings {
+  list-style-image: url("chrome://messenger/skin/icons/acct-prefs.png");
+}
+
+#CreateAccount {
+  list-style-image: url("chrome://messenger/skin/icons/acct-newaccount.png");
+}
+
+#CreateFilters {
+  list-style-image: url("chrome://messenger/skin/icons/acct-filters.png");
+}
+
+#OfflineSettings {
+  list-style-image: url("chrome://messenger/skin/icons/acct-prefs.png");
+}
+
+#JunkSettingsMail {
+  list-style-image: url("chrome://messenger/skin/icons/acct-filters.png");
+}
+
+#JunkSettingsNews {
+  list-style-image: url("chrome://messenger/skin/icons/acct-filters.png");
+}
diff --git a/comm/suite/themes/classic/messenger/accountManage.css b/comm/suite/themes/classic/messenger/accountManage.css
new file mode 100644
index 0000000000..4fce958ede
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/accountManage.css
@@ -0,0 +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/. */
+
+/* ===== accountManage.css ==============================================
+  == Styles for the Mail Account Manager.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: account manager :::::: */
+
+.specialFolderPickerGrid {
+  margin-inline-start: 20px;
+}
+
+.fccReplyFollowsParent {
+  margin-inline-start: 20px;
+}
+
+.selectForOfflineUseButton {
+  list-style-image: url("chrome://communicator/skin/icons/offline.png");
+}
+
+.selectForOfflineUseButton > .button-box > .button-icon {
+  margin-inline-start: 4px;
+  margin-inline-end: 4px;
+}
+
+.signatureBox {
+  font-family: -moz-fixed;
+}
+
+listitem[default="true"],
+#identitiesList > listitem:first-child {
+  font-weight: bold;
+}
+
+treechildren::-moz-tree-cell-text(isDefaultServer-true) {
+  text-decoration: underline;
+}
+
+#accounttree treechildren::-moz-tree-indentation {
+  width: 1ch;
+}
+
+/* ::::: SMTP Server Panel :::::: */
+
+.smtpServerListItem {
+  padding-inline-start: 3px;
+}
+
+#backgroundBox {
+  background-color: ThreeDLightShadow;
+}
+
+#smtpServerInfoBox textbox {
+  background-color: transparent;
+}
diff --git a/comm/suite/themes/classic/messenger/accountWizard.css b/comm/suite/themes/classic/messenger/accountWizard.css
new file mode 100644
index 0000000000..265f83b5c0
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/accountWizard.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/. */
+
+/* ===== accountWizard.css ==============================================
+  == Styles for the Mail Account Wizard.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: account wizard :::::: */
+
+.awIdentityLabel {
+  width: 8em; 
+  margin-inline-start: 5px;
+}
+
+.serverLabel {
+  width: 8em;
+}
+
+.serverDataBox {
+  margin-inline-start: 15px;
+}
diff --git a/comm/suite/themes/classic/messenger/addressbook/abResultsPane.css b/comm/suite/themes/classic/messenger/addressbook/abResultsPane.css
new file mode 100644
index 0000000000..a5cc6b2e7e
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/addressbook/abResultsPane.css
@@ -0,0 +1,16 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+treechildren::-moz-tree-image(GeneratedName) {
+  margin-inline-end: 2px;
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/abcard.png");
+}
+
+treechildren::-moz-tree-image(GeneratedName, MailList) {
+  margin-inline-end: 2px;
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/ablist.png");
+}
+
diff --git a/comm/suite/themes/classic/messenger/addressbook/addressPanes.css b/comm/suite/themes/classic/messenger/addressbook/addressPanes.css
new file mode 100644
index 0000000000..4a854b9cca
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/addressbook/addressPanes.css
@@ -0,0 +1,36 @@
+/* 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/. */
+
+/* ===== addressPanes.css ================================================
+  == Styles for directory pane.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: directory pane icons ::::: */
+
+treechildren::-moz-tree-image(DirCol) {
+  margin-inline-end: 2px;
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addrbook.png");
+}
+
+treechildren::-moz-tree-image(DirCol, IsMailList-true) {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/ablist.png");
+}
+
+treechildren::-moz-tree-image(DirCol, IsRemote-true) {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/remote-addrbook.png");
+}
+
+treechildren::-moz-tree-image(DirCol, IsRemote-true, IsSecure-true) {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/secure-remote-addrbook.png");
+}
+
+#dirTree [sortDirection="ascending"] {
+  list-style-image: none;
+}
+
+#dirTree [sortDirection="descending"] {
+  list-style-image: none;
+}
diff --git a/comm/suite/themes/classic/messenger/addressbook/addressbook.css b/comm/suite/themes/classic/messenger/addressbook/addressbook.css
new file mode 100644
index 0000000000..f645a367c3
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/addressbook/addressbook.css
@@ -0,0 +1,317 @@
+/* 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/. */
+
+/* ===== addressbook.css ================================================
+  == Styles for the main Address Book window.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace html url("http://www.w3.org/1999/xhtml");
+
+/* ::::: Trees ::::: */
+
+treechildren::-moz-tree-row {
+  min-height: 18px;
+}
+
+treechildren::-moz-tree-twisty {
+  padding-bottom: 1px;
+}
+
+/* ::::: primary toolbar buttons ::::: */
+
+#button-newcard {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbookicons.png");
+  -moz-image-region: rect(60px 29px 89px 0);
+}
+
+#button-newcard:hover {
+  -moz-image-region: rect(60px 59px 89px 30px);
+} 
+
+#button-newcard:hover:active {
+  -moz-image-region: rect(60px 89px 89px 60px);
+}
+
+#button-newcard[disabled] {
+  -moz-image-region: rect(60px 119px 89px 90px) !important;
+} 
+
+#button-newlist {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbookicons.png");
+  -moz-image-region: rect(90px 29px 119px 0);
+}
+
+#button-newlist:hover {
+  -moz-image-region: rect(90px 59px 119px 30px);
+} 
+
+#button-newlist:hover:active {
+  -moz-image-region: rect(90px 89px 119px 60px);
+}
+
+#button-newlist[disabled] {
+  -moz-image-region: rect(90px 119px 119px 90px) !important;
+} 
+
+#button-editcard {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbookicons.png");
+  -moz-image-region: rect(30px 29px 59px 0);
+}
+
+#button-editcard:hover {
+  -moz-image-region: rect(30px 59px 59px 30px);
+} 
+
+#button-editcard:hover:active {
+  -moz-image-region: rect(30px 89px 59px 60px);
+}
+
+#button-editcard[disabled] {
+  -moz-image-region: rect(30px 119px 59px 90px) !important;
+} 
+
+#button-newmessage {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(150px 29px 179px 0);
+}
+
+#button-newmessage:hover {
+  -moz-image-region: rect(150px 59px 179px 30px);
+} 
+
+#button-newmessage:hover:active {
+  -moz-image-region: rect(150px 89px 179px 60px);
+} 
+
+#button-newmessage[disabled] {
+  -moz-image-region: rect(150px 119px 179px 90px) !important;
+}
+
+#button-abdelete {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbookicons.png");
+  -moz-image-region: rect(0 29px 29px 0);
+}
+
+#button-abdelete:hover {
+  -moz-image-region: rect(0 59px 29px 30px);
+} 
+
+#button-abdelete:hover:active {
+  -moz-image-region: rect(0 89px 29px 60px);
+}
+
+#button-abdelete[disabled] {
+  -moz-image-region: rect(0 119px 29px 90px) !important;
+}
+
+/* ::::: small primary toolbar buttons ::::: */
+
+toolbar[iconsize="small"] > #button-newcard,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-newcard {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbookicons-small.png");
+  -moz-image-region: rect(40px 19px 59px 0);
+}
+
+toolbar[iconsize="small"] > #button-newcard:hover {
+  -moz-image-region: rect(40px 39px 59px 20px);
+}
+
+toolbar[iconsize="small"] > #button-newcard:hover:active {
+  -moz-image-region: rect(40px 59px 59px 40px);
+}
+
+toolbar[iconsize="small"] > #button-newcard[disabled] {
+  -moz-image-region: rect(40px 79px 59px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #button-newlist,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-newlist {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbookicons-small.png");
+  -moz-image-region: rect(60px 19px 79px 0);
+}
+
+toolbar[iconsize="small"] > #button-newlist:hover {
+  -moz-image-region: rect(60px 39px 79px 20px);
+}
+
+toolbar[iconsize="small"] > #button-newlist:hover:active {
+  -moz-image-region: rect(60px 59px 79px 40px);
+}
+
+toolbar[iconsize="small"] > #button-newlist[disabled] {
+  -moz-image-region: rect(60px 79px 79px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #button-editcard,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-editcard {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbookicons-small.png");
+  -moz-image-region: rect(20px 19px 39px 0);
+}
+
+toolbar[iconsize="small"] > #button-editcard:hover {
+  -moz-image-region: rect(20px 39px 39px 20px);
+}
+
+toolbar[iconsize="small"] > #button-editcard:hover:active {
+  -moz-image-region: rect(20px 59px 39px 40px);
+}
+
+toolbar[iconsize="small"] > #button-editcard[disabled] {
+  -moz-image-region: rect(20px 79px 39px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #button-newmessage,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-newmessage {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(100px 19px 119px 0);
+}
+
+toolbar[iconsize="small"] > #button-newmessage:hover {
+  -moz-image-region: rect(100px 39px 119px 20px);
+}
+
+toolbar[iconsize="small"] > #button-newmessage:hover:active {
+  -moz-image-region: rect(100px 59px 119px 40px);
+}
+
+toolbar[iconsize="small"] > #button-newmessage[disabled] {
+  -moz-image-region: rect(100px 79px 119px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #button-abdelete,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-abdelete {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbookicons-small.png");
+  -moz-image-region: rect(0 19px 19px 0);
+}
+
+toolbar[iconsize="small"] > #button-abdelete:hover {
+  -moz-image-region: rect(0 39px 19px 20px);
+}
+
+toolbar[iconsize="small"] > #button-abdelete:hover:active {
+  -moz-image-region: rect(0 59px 19px 40px);
+}
+
+toolbar[iconsize="small"] > #button-abdelete[disabled] {
+  -moz-image-region: rect(0 79px 19px 60px) !important;
+}
+
+#blankResultsPaneMessage {
+  font-style: italic;
+}
+
+#localResultsOnlyMessage {
+  font-style: italic;
+  text-align: center;
+}
+
+/* CardView styles - used in the Card View Pane */
+
+#CardViewOuterBox {
+  border-left: 1px solid ThreeDShadow;
+  border-top: 1px solid ThreeDShadow;
+  border-right: 1px solid ThreeDHighlight;
+}
+
+#CardViewBox {
+  -moz-user-focus: ignore;
+  overflow: auto;
+  min-width: 150px;
+  border-left: 1px solid ThreeDDarkShadow;
+  border-top: 1px solid ThreeDDarkShadow;
+  border-bottom: 1px solid ThreeDLightShadow;
+  border-right: 1px solid ThreeDLightShadow;
+  background-color: -moz-Field;
+  color: -moz-FieldText;
+}
+
+#CardViewInnerBox {
+  margin-top: 2px;
+  margin-bottom: 2px;
+  padding: 0 8px;
+}
+
+#CardTitle {
+  font-size: 150%;
+  font-weight: bold;
+  border-bottom: 2px solid -moz-FieldText;
+  min-width: 120px;
+  margin: 0px;
+}
+
+.cardViewColumn {
+  margin-inline-end: 10px;
+}
+ 
+.cardViewGroup {
+  margin-top: 8px;
+  padding-bottom: 5px;
+  min-width: 50px;
+}
+
+.CardViewHeading {
+  padding: 1px;
+  padding-inline-start: 5px;
+  margin: 0px 0px 1px;
+  background-color: #CCCCFF;
+  color: black;
+  font-weight: bold;
+  min-width: 30px;
+}
+
+#cvPhoto {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/contact-generic.png");
+}
+
+#cvBuddyIcon {
+  padding-inline-start: 20px;
+  padding-top: 2px;
+}
+
+.CardViewText,
+.CardViewLink {
+  padding-inline-start: 20px;
+  padding-inline-end: 2px;
+  min-width: 30px;
+  margin: 0px;
+}
+
+.CardViewLink {
+  text-decoration: underline;
+  color: -moz-nativehyperlinktext;
+  cursor: pointer;
+}
+
+
+#cvHomeMapIt, #cvWorkMapIt {
+  margin-bottom: 0px;
+}
+
+html|a {
+  padding-inline-start: 0px;
+  padding-inline-end: 2px;
+  border: none !important;
+}
+
+html|p {
+  border: none !important;
+}
+
+/* ::::: border adjustments ::::: */
+
+#abResultsTree {
+  border-left: 1px solid ThreeDShadow;
+}
+
+/* ::::: lightweight themes ::::: */
+
+#CardViewOuterBox:-moz-lwtheme,
+treecols:-moz-lwtheme {
+  text-shadow: none;
+  color: -moz-dialogtext;
+  background-color: -moz-dialog;
+}
diff --git a/comm/suite/themes/classic/messenger/addressbook/cardDialog.css b/comm/suite/themes/classic/messenger/addressbook/cardDialog.css
new file mode 100644
index 0000000000..9d4d091024
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/addressbook/cardDialog.css
@@ -0,0 +1,72 @@
+/* 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/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: Card Edit dialog ::::: */
+
+.CardEditWidth {
+  width: 42ch;
+}
+
+.CardEditLabel {
+  text-align: end;
+}
+
+.PhoneEditWidth {
+  width: 24ch;
+}
+
+.AddressCardEditWidth {
+  width: 72ch;
+}
+
+.YearWidth {
+  width: 8ch;
+}
+
+.stateZipSpacer {
+  width: 6ch;
+}
+
+.ZipWidth {
+  width: 14ch;
+}
+
+#photo {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/contact-generic.png");
+}
+
+#GenericPhotoList[value="default"] {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/contact-generic-tiny.png");
+}
+
+#PhotoContainer {
+  margin: 5px;
+}
+
+#PhotoDropTarget {
+  margin-top: 5px;
+}
+
+#PhotoDropTarget:hover {
+  border: 1px dashed #CACAFF;
+}
+
+#ProgressContainer {
+  max-height: 0;
+  transition: all .5s ease-out;
+  overflow: hidden;
+}
+
+#ProgressContainer.expanded {
+  margin-top: 10px;
+  max-height: 40px; /* something higher than the actual height, but not too large */
+}
diff --git a/comm/suite/themes/classic/messenger/addressbook/icons/abcard.png b/comm/suite/themes/classic/messenger/addressbook/icons/abcard.png
new file mode 100644
index 0000000000..7937bda57e
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/addressbook/icons/abcard.png
diff --git a/comm/suite/themes/classic/messenger/addressbook/icons/ablist.png b/comm/suite/themes/classic/messenger/addressbook/icons/ablist.png
new file mode 100644
index 0000000000..a892125591
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/addressbook/icons/ablist.png
diff --git a/comm/suite/themes/classic/messenger/addressbook/icons/addrbook.png b/comm/suite/themes/classic/messenger/addressbook/icons/addrbook.png
new file mode 100644
index 0000000000..3eafea43c4
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/addressbook/icons/addrbook.png
diff --git a/comm/suite/themes/classic/messenger/addressbook/icons/addressbookicons-small.png b/comm/suite/themes/classic/messenger/addressbook/icons/addressbookicons-small.png
new file mode 100644
index 0000000000..9c6f2519e1
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/addressbook/icons/addressbookicons-small.png
diff --git a/comm/suite/themes/classic/messenger/addressbook/icons/addressbookicons.png b/comm/suite/themes/classic/messenger/addressbook/icons/addressbookicons.png
new file mode 100644
index 0000000000..782397570e
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/addressbook/icons/addressbookicons.png
diff --git a/comm/suite/themes/classic/messenger/addressbook/icons/contact-generic-tiny.png b/comm/suite/themes/classic/messenger/addressbook/icons/contact-generic-tiny.png
new file mode 100644
index 0000000000..300c09e914
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/addressbook/icons/contact-generic-tiny.png
diff --git a/comm/suite/themes/classic/messenger/addressbook/icons/contact-generic.png b/comm/suite/themes/classic/messenger/addressbook/icons/contact-generic.png
new file mode 100644
index 0000000000..452f1cf655
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/addressbook/icons/contact-generic.png
diff --git a/comm/suite/themes/classic/messenger/addressbook/icons/remote-addrbook-error.png b/comm/suite/themes/classic/messenger/addressbook/icons/remote-addrbook-error.png
new file mode 100644
index 0000000000..ba79dbc4ca
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/addressbook/icons/remote-addrbook-error.png
diff --git a/comm/suite/themes/classic/messenger/addressbook/icons/remote-addrbook.png b/comm/suite/themes/classic/messenger/addressbook/icons/remote-addrbook.png
new file mode 100644
index 0000000000..ea661f4a26
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/addressbook/icons/remote-addrbook.png
diff --git a/comm/suite/themes/classic/messenger/addressbook/icons/secure-remote-addrbook.png b/comm/suite/themes/classic/messenger/addressbook/icons/secure-remote-addrbook.png
new file mode 100644
index 0000000000..a7612cf489
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/addressbook/icons/secure-remote-addrbook.png
diff --git a/comm/suite/themes/classic/messenger/addressbook/selectAddressesDialog.css b/comm/suite/themes/classic/messenger/addressbook/selectAddressesDialog.css
new file mode 100644
index 0000000000..062cf13c44
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/addressbook/selectAddressesDialog.css
@@ -0,0 +1,48 @@
+/* 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/. */
+
+/* ===== selectAddressesDialog.css ======================================
+  == Styles for the Select Addresses Dialog.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: Select Addresses dialog ::::: */
+#topBox {
+  padding: 0.5em 0 1.0em;
+}
+
+#abResultsTree {
+  min-width: 10px;
+}
+
+#resultsBox {
+  border: 1px solid #000000;
+}
+
+#addToBucketButtonBox {
+  min-width: 10px;
+  padding: 0.3em; 
+}
+
+#addressBucket {
+  min-width: 10px;
+}
+
+#newEditButtonBox {
+  padding-top: 0.5em; 
+  padding-inline-end: 0px;
+  margin-inline-start: 0px;
+}
+
+.middle-button-spacer {
+  width: 10px;
+}
+
+.above-remove-spacer {
+  width: 10px;
+  height: 15px;
+}
diff --git a/comm/suite/themes/classic/messenger/addressbook/sidebarPanel.css b/comm/suite/themes/classic/messenger/addressbook/sidebarPanel.css
new file mode 100644
index 0000000000..842fc33d26
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/addressbook/sidebarPanel.css
@@ -0,0 +1,12 @@
+/* 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/addressbook/addressbook.css");
+  
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
diff --git a/comm/suite/themes/classic/messenger/addressingWidget.css b/comm/suite/themes/classic/messenger/addressingWidget.css
new file mode 100644
index 0000000000..f0e58cceba
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/addressingWidget.css
@@ -0,0 +1,41 @@
+/* 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/. */
+
+/* ::::: addressing widget ::::: */
+  
+#addressingWidget {
+  -moz-user-focus: none;
+  width: 0;
+}  
+
+#typecol-addressingWidget {
+  min-width: 9em;
+  border-right: 1px solid #CACAFF;
+}
+
+.addressingWidgetItem,
+.dummy-row {
+  border: none !important;
+  background-color: inherit !important;
+  color: inherit !important;
+}
+
+.addressingWidgetCell {
+  border-bottom: 1px solid #CACAFF;
+  padding: 0px;
+}
+
+.addressingWidgetCell:first-child {
+  border-top: none;
+}
+
+.dummy-row-cell:first-child {
+  border-top: none;
+  border-bottom: 1px solid #CACAFF;
+}
+
+.person-icon {
+  margin: 0 3px;
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/abcard.png");
+}
diff --git a/comm/suite/themes/classic/messenger/browserRequest.css b/comm/suite/themes/classic/messenger/browserRequest.css
new file mode 100644
index 0000000000..0924641265
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/browserRequest.css
@@ -0,0 +1,40 @@
+/* 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/. */
+
+#security-button {
+  width: 20px;
+  padding-right: 5px;
+  background-repeat: no-repeat;
+}
+
+#security-button[level="high"] {
+  background-image: url("chrome://messenger/skin/icons/secure.png");
+}
+
+#security-button[level="broken"] {
+  background-image: url("chrome://messenger/skin/icons/insecure.png");
+}
+
+#security-button[loading="true"] {
+  background-image: url("chrome://messenger/skin/icons/loading.png");
+  background-position: 4px 2px;
+}
+
+#header {
+  overflow: hidden;
+  border-bottom: 1px solid black;
+}
+
+#addressbox {
+  font-weight: bold;
+  font-size: normal;
+  -moz-appearance: textfield;
+  overflow: hidden;
+  margin: 0px 5px;
+  font-weight: normal;
+}
+
+#headerMessage {
+  margin-top: 4px;
+}
diff --git a/comm/suite/themes/classic/messenger/dialogs.css b/comm/suite/themes/classic/messenger/dialogs.css
new file mode 100644
index 0000000000..83710494dd
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/dialogs.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/. */
+
+/* ===== dialogs.css ====================================================
+  == Styles used by the general dialogs in Messenger.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: styles for messenger dialogs ::::: */
+
diff --git a/comm/suite/themes/classic/messenger/filterDialog.css b/comm/suite/themes/classic/messenger/filterDialog.css
new file mode 100644
index 0000000000..87ae896f14
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/filterDialog.css
@@ -0,0 +1,67 @@
+/* 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/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: columns :::::: */
+
+listcell.listcell-iconic > .listcell-label {
+  display: none;
+}
+
+listcell[enabled="false"] {
+  list-style-image: url("chrome://messenger/skin/icons/dot.png");
+}
+
+listcell[enabled="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/check.png");
+}
+
+.small-button {
+  min-width: 3em;
+  padding: 0px;
+  margin: 0px 1px;
+}
+
+.search-menulist, .search-value-menulist {
+  width: 12em;
+}
+
+.search-menulist[unavailable="true"] {
+  color: GrayText;
+}
+
+textbox {
+  margin: 1px 4px;
+}
+
+#FilterEditor {
+  padding: 0px;
+}
+
+#filterListDialog {
+  padding: 0px;
+}
+
+.filler {
+  padding-inline-end: 22px;
+}
+
+.ruleaction {
+  border: 1px solid transparent;
+}
+
+.ruleactionitem {
+  min-width: 20em;
+}
+
+.ruleaction-type {
+  min-width: 15em;
+}
diff --git a/comm/suite/themes/classic/messenger/folderMenus.css b/comm/suite/themes/classic/messenger/folderMenus.css
new file mode 100644
index 0000000000..c14ec4d25a
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/folderMenus.css
@@ -0,0 +1,124 @@
+/* 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.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: folder icons for menus ::::: */
+
+.folderMenuItem {
+  list-style-image: url("chrome://messenger/skin/icons/folder-closed.png");
+}
+
+.folderMenuItem[open="true"] {
+list-style-image: url("chrome://messenger/skin/icons/folder-open.png");
+}
+
+.folderMenuItem[ServerType="nntp"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup.png");
+}
+
+.folderMenuItem[ServerType="rss"] {
+  list-style-image: url("chrome://messenger-newsblog/skin/icons/rss-feed.png");
+  -moz-image-region: rect(0 16px 16px 0);
+}
+
+/* ..... special folders ..... */
+
+.folderMenuItem[SpecialFolder="Inbox"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-inbox.png");
+}
+
+.folderMenuItem[SpecialFolder="Inbox"][open="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-inbox-open.png");
+}
+
+.folderMenuItem[SpecialFolder="Sent"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-sent.png");
+}
+
+.folderMenuItem[SpecialFolder="Sent"][open="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-sent-open.png");
+}
+
+.folderMenuItem[SpecialFolder="Outbox"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-outbox.png");
+}
+
+.folderMenuItem[SpecialFolder="Outbox"][open="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-outbox-open.png");
+}
+
+.folderMenuItem[SpecialFolder="Drafts"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-draft.png");
+}
+
+.folderMenuItem[SpecialFolder="Drafts"][open="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-draft-open.png");
+}
+
+.folderMenuItem[SpecialFolder="Templates"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-template.png");
+}
+
+.folderMenuItem[SpecialFolder="Templates"][open="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-template-open.png");
+}
+
+.folderMenuItem[SpecialFolder="Junk"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-junk.png");
+}
+
+.folderMenuItem[SpecialFolder="Junk"][open="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-junk-open.png");
+}
+
+.folderMenuItem[SpecialFolder="Trash"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-trash.png");
+}
+
+.folderMenuItem[SpecialFolder="Trash"][open="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-trash-open.png");
+}
+
+.folderMenuItem[SpecialFolder="Virtual"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-search.png");
+}
+
+/* ..... servers ..... */
+
+.folderMenuItem[IsServer="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/server-mail.png");
+}
+
+.folderMenuItem[IsServer="true"][open="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/server-mail.png");
+}
+
+.folderMenuItem[IsServer="true"][ServerType="imap"][IsSecure="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.png");
+}
+
+.folderMenuItem[IsServer="true"][ServerType="pop3"][IsSecure="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.png");
+}
+
+.folderMenuItem[IsServer="true"][ServerType="none"] {
+  list-style-image: url("chrome://messenger/skin/icons/server-local.png");
+}
+
+.folderMenuItem[IsServer="true"][ServerType="nntp"] {
+  list-style-image: url("chrome://messenger/skin/icons/server-news.png");
+}
+
+.folderMenuItem[IsServer="true"][ServerType="nntp"][IsSecure="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/server-news-lock.png");
+}
+
+.folderMenuItem[IsServer="true"][ServerType="rss"] {
+  list-style-image: url("chrome://communicator/skin/icons/feedIcon16.png");
+}
diff --git a/comm/suite/themes/classic/messenger/folderPane.css b/comm/suite/themes/classic/messenger/folderPane.css
new file mode 100644
index 0000000000..c4f0b7d736
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/folderPane.css
@@ -0,0 +1,251 @@
+/* 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/. */
+
+/* ===== folderPane.css =================================================
+  == Styles for the Folder pane in the Messenger 3-pane window.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: Trees ::::: */
+
+treechildren::-moz-tree-row {
+  min-height: 18px;
+}
+
+treechildren::-moz-tree-twisty {
+  padding-bottom: 1px;
+}
+
+/* ::::: mail folder ::::: */
+
+treechildren::-moz-tree-image(folderNameCol) {
+  margin-inline-end: 2px;
+}
+
+.icon-holder[type="folder"],
+treechildren::-moz-tree-image(folderNameCol) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-closed.png");
+}
+
+/* ..... IMAP shared ..... */
+
+.icon-holder[type="folder"][ImapShared="true"],
+treechildren::-moz-tree-image(folderNameCol, imapShared-true) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-share.png");
+}
+
+/* ..... mail folder with new messages ..... */
+
+treechildren::-moz-tree-image(folderNameCol, newMessages-true) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-new.png");
+}
+
+/* ..... News ..... */
+
+.icon-holder[type="folder"][ServerType="nntp"],
+treechildren::-moz-tree-image(folderNameCol, serverType-nntp) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup.png");
+}
+
+.icon-holder[type="folder"][ServerType="nntp"][NewMessages="true"],
+treechildren::-moz-tree-image(folderNameCol, serverType-nntp, newMessages-true) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup-new.png");
+}
+
+/* ..... Feeds ..... */
+
+.icon-holder[type="folder"][ServerType="rss"],
+treechildren::-moz-tree-image(folderNameCol, serverType-rss) {
+  list-style-image: url("chrome://messenger-newsblog/skin/icons/rss-feed.png");
+  -moz-image-region: rect(0 16px 16px 0);
+}
+
+.icon-holder[type="folder"][ServerType="rss"][NewMessages="true"],
+treechildren::-moz-tree-image(folderNameCol, serverType-rss, newMessages-true) {
+  -moz-image-region: rect(16px 16px 32px 0);
+}
+
+/* ..... Inbox ..... */
+
+.icon-holder[type="folder"][SpecialFolder="Inbox"],
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Inbox) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-inbox.png");
+}
+
+.icon-holder[type="folder"][SpecialFolder="Inbox"][NewMessages="true"],
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Inbox, newMessages-true) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-inbox-new.png");
+}
+
+/* ..... Sent ..... */
+
+.icon-holder[type="folder"][SpecialFolder="Sent"],
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Sent) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-sent.png");
+}
+
+/* ..... Outbox ..... */
+
+.icon-holder[type="folder"][SpecialFolder="Outbox"],
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Outbox) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-outbox.png");
+}
+
+/* ..... Drafts ..... */
+
+.icon-holder[type="folder"][SpecialFolder="Drafts"],
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Drafts) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-draft.png");
+}
+
+/* ..... Templates ..... */
+
+.icon-holder[type="folder"][SpecialFolder="Templates"],
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Templates) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-template.png");
+}
+
+/* ..... Junk ..... */
+
+.icon-holder[type="folder"][SpecialFolder="Junk"],
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Junk) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-junk.png");
+}
+
+/* ..... Trash ..... */
+
+.icon-holder[type="folder"][SpecialFolder="Trash"],
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Trash) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-trash.png");
+}
+
+/* ..... Saved Searches ..... */
+
+.icon-holder[type="folder"][SpecialFolder="Virtual"],
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Virtual) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-search.png");
+}
+
+treechildren::-moz-tree-cell-text(folderNameCol, newMessages-true) {
+  font-weight: bold;
+}
+
+/* ..... Server Folders ..... */
+
+.icon-holder[type="folder"][IsServer="true"],
+treechildren::-moz-tree-image(folderNameCol, isServer-true) {
+  list-style-image: url("chrome://messenger/skin/icons/server-mail.png");
+}
+
+.icon-holder[type="folder"][BiffState="NewMail"][IsServer="true"],
+treechildren::-moz-tree-image(folderNameCol, biffState-NewMail, isServer-true) {
+  list-style-image: url("chrome://messenger/skin/icons/server-mail-new.png");
+}
+
+.icon-holder[type="folder"][IsServer="true"][ServerType="pop3"][IsSecure="true"],
+treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-pop3, isSecure-true) {
+  list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.png");
+}
+
+.icon-holder[type="folder"][IsServer="true"][ServerType="imap"][IsSecure="true"],
+treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-imap, isSecure-true) {
+  list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.png");
+}
+
+.icon-holder[type="folder"][BiffState="NewMail"][IsServer="true"][ServerType="imap"][IsSecure="true"],
+treechildren::-moz-tree-image(folderNameCol, biffState-NewMail, isServer-true, isSecure-true) {
+  list-style-image: url("chrome://messenger/skin/icons/server-remote-lock-new.png");
+}
+
+.icon-holder[type="folder"][IsServer="true"][ServerType="none"],
+treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-none) {
+  list-style-image: url("chrome://messenger/skin/icons/local-mailhost.png");
+}
+
+.icon-holder[type="folder"][IsServer="true"][ServerType="nntp"],
+treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp) {
+  list-style-image: url("chrome://messenger/skin/icons/server-news.png");
+}
+
+.icon-holder[type="folder"][IsServer="true"][ServerType="nntp"][IsSecure="true"],
+treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp, isSecure-true) {
+  list-style-image: url("chrome://messenger/skin/icons/server-news-lock.png");
+}
+
+.icon-holder[type="folder"][IsServer="true"][ServerType="rss"],
+treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-rss) {
+  list-style-image: url("chrome://communicator/skin/icons/feedIcon16.png");
+}
+
+/* ::::: All Servers ::::: */
+
+treechildren::-moz-tree-cell-text(closed, subfoldersHaveUnreadMessages-true),
+treechildren::-moz-tree-cell-text(folderNameCol, isServer-true),
+treechildren::-moz-tree-cell-text(hasUnreadMessages-true) {
+  font-weight: bold;
+}
+
+treechildren::-moz-tree-cell-text(folderNameCol, noSelect-true) {
+  color: gray;
+  font-style: italic;
+}
+
+.tree-folder-checkbox {
+  list-style-image: none;
+}
+
+treechildren::-moz-tree-image(syncCol) {
+  list-style-image: url("chrome://messenger/skin/icons/dot.png");
+}
+
+treechildren::-moz-tree-image(syncCol, synchronize-true) {
+  list-style-image: url("chrome://messenger/skin/icons/check.png");
+}
+
+treechildren::-moz-tree-image(syncCol, isServer-true) {
+  list-style-image: none;
+}
+
+#folderUnreadCol,
+#folderTotalCol,
+#folderSizeCol {
+  text-align: right;
+}
+
+#folderNameCol [sortDirection="ascending"] {
+  list-style-image: none;
+}
+
+#folderNameCol [sortDirection="descending"] {
+  list-style-image: none;
+}
+
+/* ::::: Folder Summary Popup ::::: */
+
+.folderSummary-message-row {
+  /* This max width ends up dictating the overall width of the popup
+     because it controls how large the preview, subject and sender text can be
+     before cropping kicks in */
+  max-width: 450px;
+}
+
+.folderSummary-subject {
+  font-weight: bold; 
+}
+
+.folderSummary-previewText {
+  color: GrayText;
+}
+
+/* Virtual Folder List Dialog */
+
+treechildren::-moz-tree-image(selectedColumn) {
+  margin-inline-end: 2px;
+  list-style-image: url("chrome://messenger/skin/icons/dot.png");
+}
+
+treechildren::-moz-tree-image(selectedColumn, selected-true) {
+  list-style-image: url("chrome://messenger/skin/icons/check.png");
+}
diff --git a/comm/suite/themes/classic/messenger/folderPaneExtras.css b/comm/suite/themes/classic/messenger/folderPaneExtras.css
new file mode 100644
index 0000000000..f315e6e12c
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/folderPaneExtras.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/. */
+
+/* distributors / ISPs can override folder pane icons
+ * see http://www.mozilla.org/mailnews/arch/folderpaneextras.html
+ */
diff --git a/comm/suite/themes/classic/messenger/icons/acct-compose.png b/comm/suite/themes/classic/messenger/icons/acct-compose.png
new file mode 100644
index 0000000000..e6789dfab8
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/acct-compose.png
diff --git a/comm/suite/themes/classic/messenger/icons/acct-filters.png b/comm/suite/themes/classic/messenger/icons/acct-filters.png
new file mode 100644
index 0000000000..24815bbd79
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/acct-filters.png
diff --git a/comm/suite/themes/classic/messenger/icons/acct-newaccount.png b/comm/suite/themes/classic/messenger/icons/acct-newaccount.png
new file mode 100644
index 0000000000..963a061440
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/acct-newaccount.png
diff --git a/comm/suite/themes/classic/messenger/icons/acct-prefs.png b/comm/suite/themes/classic/messenger/icons/acct-prefs.png
new file mode 100644
index 0000000000..3ebb66c8ec
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/acct-prefs.png
diff --git a/comm/suite/themes/classic/messenger/icons/acct-read.png b/comm/suite/themes/classic/messenger/icons/acct-read.png
new file mode 100644
index 0000000000..771f9ea98c
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/acct-read.png
diff --git a/comm/suite/themes/classic/messenger/icons/acct-search.png b/comm/suite/themes/classic/messenger/icons/acct-search.png
new file mode 100644
index 0000000000..20fcb23fd9
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/acct-search.png
diff --git a/comm/suite/themes/classic/messenger/icons/acct-subscribe.png b/comm/suite/themes/classic/messenger/icons/acct-subscribe.png
new file mode 100644
index 0000000000..b36aaf00eb
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/acct-subscribe.png
diff --git a/comm/suite/themes/classic/messenger/icons/attach.png b/comm/suite/themes/classic/messenger/icons/attach.png
new file mode 100644
index 0000000000..dbdd623cd9
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/attach.png
diff --git a/comm/suite/themes/classic/messenger/icons/attachment-col.png b/comm/suite/themes/classic/messenger/icons/attachment-col.png
new file mode 100644
index 0000000000..3830005149
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/attachment-col.png
diff --git a/comm/suite/themes/classic/messenger/icons/attachment-selected.png b/comm/suite/themes/classic/messenger/icons/attachment-selected.png
new file mode 100644
index 0000000000..15c0faf3ce
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/attachment-selected.png
diff --git a/comm/suite/themes/classic/messenger/icons/attachment.png b/comm/suite/themes/classic/messenger/icons/attachment.png
new file mode 100644
index 0000000000..be96529197
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/attachment.png
diff --git a/comm/suite/themes/classic/messenger/icons/check.png b/comm/suite/themes/classic/messenger/icons/check.png
new file mode 100644
index 0000000000..2f00ab3f9b
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/check.png
diff --git a/comm/suite/themes/classic/messenger/icons/dot.png b/comm/suite/themes/classic/messenger/icons/dot.png
new file mode 100644
index 0000000000..519b937ae9
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/dot.png
diff --git a/comm/suite/themes/classic/messenger/icons/flagcol.png b/comm/suite/themes/classic/messenger/icons/flagcol.png
new file mode 100644
index 0000000000..837eb51f06
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/flagcol.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-closed.png b/comm/suite/themes/classic/messenger/icons/folder-closed.png
new file mode 100644
index 0000000000..2add76b7ce
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-closed.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-draft-open.png b/comm/suite/themes/classic/messenger/icons/folder-draft-open.png
new file mode 100644
index 0000000000..8db1357802
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-draft-open.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-draft-share-open.png b/comm/suite/themes/classic/messenger/icons/folder-draft-share-open.png
new file mode 100644
index 0000000000..c0fdb86954
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-draft-share-open.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-draft-share.png b/comm/suite/themes/classic/messenger/icons/folder-draft-share.png
new file mode 100644
index 0000000000..9862b25a19
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-draft-share.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-draft.png b/comm/suite/themes/classic/messenger/icons/folder-draft.png
new file mode 100644
index 0000000000..fdaf8b60bd
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-draft.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-inbox-new.png b/comm/suite/themes/classic/messenger/icons/folder-inbox-new.png
new file mode 100644
index 0000000000..ee76303adb
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-inbox-new.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-inbox-open.png b/comm/suite/themes/classic/messenger/icons/folder-inbox-open.png
new file mode 100644
index 0000000000..f22eca5273
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-inbox-open.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-inbox-share-open.png b/comm/suite/themes/classic/messenger/icons/folder-inbox-share-open.png
new file mode 100644
index 0000000000..0d085d39ee
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-inbox-share-open.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-inbox-share.png b/comm/suite/themes/classic/messenger/icons/folder-inbox-share.png
new file mode 100644
index 0000000000..225d230552
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-inbox-share.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-inbox.png b/comm/suite/themes/classic/messenger/icons/folder-inbox.png
new file mode 100644
index 0000000000..65f85a88dd
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-inbox.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-junk-open.png b/comm/suite/themes/classic/messenger/icons/folder-junk-open.png
new file mode 100644
index 0000000000..9adb3245b9
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-junk-open.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-junk.png b/comm/suite/themes/classic/messenger/icons/folder-junk.png
new file mode 100644
index 0000000000..da74962834
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-junk.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-new-open.png b/comm/suite/themes/classic/messenger/icons/folder-new-open.png
new file mode 100644
index 0000000000..e2ea13cdcf
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-new-open.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-new.png b/comm/suite/themes/classic/messenger/icons/folder-new.png
new file mode 100644
index 0000000000..5ae36cae47
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-new.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-newsgroup-new.png b/comm/suite/themes/classic/messenger/icons/folder-newsgroup-new.png
new file mode 100644
index 0000000000..367431db38
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-newsgroup-new.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-newsgroup.png b/comm/suite/themes/classic/messenger/icons/folder-newsgroup.png
new file mode 100644
index 0000000000..6e72ede3ee
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-newsgroup.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-open.png b/comm/suite/themes/classic/messenger/icons/folder-open.png
new file mode 100644
index 0000000000..b1da23a5a5
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-open.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-outbox-open.png b/comm/suite/themes/classic/messenger/icons/folder-outbox-open.png
new file mode 100644
index 0000000000..c7f5f10f22
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-outbox-open.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-outbox.png b/comm/suite/themes/classic/messenger/icons/folder-outbox.png
new file mode 100644
index 0000000000..6e2963f028
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-outbox.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-search.png b/comm/suite/themes/classic/messenger/icons/folder-search.png
new file mode 100644
index 0000000000..ff887dc2a9
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-search.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-sent-open.png b/comm/suite/themes/classic/messenger/icons/folder-sent-open.png
new file mode 100644
index 0000000000..398d836048
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-sent-open.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-sent-share-open.png b/comm/suite/themes/classic/messenger/icons/folder-sent-share-open.png
new file mode 100644
index 0000000000..50b0f1bd87
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-sent-share-open.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-sent-share.png b/comm/suite/themes/classic/messenger/icons/folder-sent-share.png
new file mode 100644
index 0000000000..123cb06821
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-sent-share.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-sent.png b/comm/suite/themes/classic/messenger/icons/folder-sent.png
new file mode 100644
index 0000000000..d082a0fd4c
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-sent.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-share-open.png b/comm/suite/themes/classic/messenger/icons/folder-share-open.png
new file mode 100644
index 0000000000..173b94c2d2
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-share-open.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-share.png b/comm/suite/themes/classic/messenger/icons/folder-share.png
new file mode 100644
index 0000000000..76a646b8da
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-share.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-template-open.png b/comm/suite/themes/classic/messenger/icons/folder-template-open.png
new file mode 100644
index 0000000000..4c7d854ba4
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-template-open.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-template-share-open.png b/comm/suite/themes/classic/messenger/icons/folder-template-share-open.png
new file mode 100644
index 0000000000..d5a107e64a
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-template-share-open.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-template-share.png b/comm/suite/themes/classic/messenger/icons/folder-template-share.png
new file mode 100644
index 0000000000..da18662eef
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-template-share.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-template.png b/comm/suite/themes/classic/messenger/icons/folder-template.png
new file mode 100644
index 0000000000..341773ff90
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-template.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-trash-open.png b/comm/suite/themes/classic/messenger/icons/folder-trash-open.png
new file mode 100644
index 0000000000..ca3a814029
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-trash-open.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-trash-share-open.png b/comm/suite/themes/classic/messenger/icons/folder-trash-share-open.png
new file mode 100644
index 0000000000..dbf554e13c
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-trash-share-open.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-trash-share.png b/comm/suite/themes/classic/messenger/icons/folder-trash-share.png
new file mode 100644
index 0000000000..cc9f9e1390
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-trash-share.png
diff --git a/comm/suite/themes/classic/messenger/icons/folder-trash.png b/comm/suite/themes/classic/messenger/icons/folder-trash.png
new file mode 100644
index 0000000000..167ecbb08c
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/folder-trash.png
diff --git a/comm/suite/themes/classic/messenger/icons/info.png b/comm/suite/themes/classic/messenger/icons/info.png
new file mode 100644
index 0000000000..3ce14ddc1a
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/info.png
diff --git a/comm/suite/themes/classic/messenger/icons/insecure.png b/comm/suite/themes/classic/messenger/icons/insecure.png
new file mode 100644
index 0000000000..efda0de255
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/insecure.png
diff --git a/comm/suite/themes/classic/messenger/icons/junk.png b/comm/suite/themes/classic/messenger/icons/junk.png
new file mode 100644
index 0000000000..0ae15cd390
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/junk.png
diff --git a/comm/suite/themes/classic/messenger/icons/junkBar.png b/comm/suite/themes/classic/messenger/icons/junkBar.png
new file mode 100644
index 0000000000..e57cedf0b1
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/junkBar.png
diff --git a/comm/suite/themes/classic/messenger/icons/junkcol.png b/comm/suite/themes/classic/messenger/icons/junkcol.png
new file mode 100644
index 0000000000..cac03787a8
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/junkcol.png
diff --git a/comm/suite/themes/classic/messenger/icons/loading.png b/comm/suite/themes/classic/messenger/icons/loading.png
new file mode 100644
index 0000000000..201d014c1f
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/loading.png
diff --git a/comm/suite/themes/classic/messenger/icons/local-mailhost.png b/comm/suite/themes/classic/messenger/icons/local-mailhost.png
new file mode 100644
index 0000000000..c00da149cb
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/local-mailhost.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-mail-attach-del.png b/comm/suite/themes/classic/messenger/icons/message-mail-attach-del.png
new file mode 100644
index 0000000000..00c82a34c2
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-mail-attach-del.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-mail-attach-fwd-offl-reply.png b/comm/suite/themes/classic/messenger/icons/message-mail-attach-fwd-offl-reply.png
new file mode 100644
index 0000000000..8e5d289d2e
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-mail-attach-fwd-offl-reply.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-mail-attach-fwd-offl.png b/comm/suite/themes/classic/messenger/icons/message-mail-attach-fwd-offl.png
new file mode 100644
index 0000000000..a3cd9604c6
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-mail-attach-fwd-offl.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-mail-attach-fwd-reply.png b/comm/suite/themes/classic/messenger/icons/message-mail-attach-fwd-reply.png
new file mode 100644
index 0000000000..c1d6e8f874
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-mail-attach-fwd-reply.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-mail-attach-fwd.png b/comm/suite/themes/classic/messenger/icons/message-mail-attach-fwd.png
new file mode 100644
index 0000000000..16b52dc18a
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-mail-attach-fwd.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-mail-attach-offl-reply.png b/comm/suite/themes/classic/messenger/icons/message-mail-attach-offl-reply.png
new file mode 100644
index 0000000000..8b855e20b2
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-mail-attach-offl-reply.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-mail-attach-offl.png b/comm/suite/themes/classic/messenger/icons/message-mail-attach-offl.png
new file mode 100644
index 0000000000..74aeadaced
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-mail-attach-offl.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-mail-attach-reply.png b/comm/suite/themes/classic/messenger/icons/message-mail-attach-reply.png
new file mode 100644
index 0000000000..daa3d091f7
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-mail-attach-reply.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-mail-attach.png b/comm/suite/themes/classic/messenger/icons/message-mail-attach.png
new file mode 100644
index 0000000000..282da48f9d
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-mail-attach.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-mail-delete-offl.png b/comm/suite/themes/classic/messenger/icons/message-mail-delete-offl.png
new file mode 100644
index 0000000000..3c9b999148
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-mail-delete-offl.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-mail-fwd-offl-reply.png b/comm/suite/themes/classic/messenger/icons/message-mail-fwd-offl-reply.png
new file mode 100644
index 0000000000..2f21f3d151
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-mail-fwd-offl-reply.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-mail-fwd-offl.png b/comm/suite/themes/classic/messenger/icons/message-mail-fwd-offl.png
new file mode 100644
index 0000000000..44b4f81987
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-mail-fwd-offl.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-mail-fwd-reply.png b/comm/suite/themes/classic/messenger/icons/message-mail-fwd-reply.png
new file mode 100644
index 0000000000..b1d8963076
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-mail-fwd-reply.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-mail-fwd.png b/comm/suite/themes/classic/messenger/icons/message-mail-fwd.png
new file mode 100644
index 0000000000..9cbeabb42e
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-mail-fwd.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-mail-imapdelete.png b/comm/suite/themes/classic/messenger/icons/message-mail-imapdelete.png
new file mode 100644
index 0000000000..78307c838a
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-mail-imapdelete.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-mail-new-offl.png b/comm/suite/themes/classic/messenger/icons/message-mail-new-offl.png
new file mode 100644
index 0000000000..822a8a262d
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-mail-new-offl.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-mail-new.png b/comm/suite/themes/classic/messenger/icons/message-mail-new.png
new file mode 100644
index 0000000000..9407265785
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-mail-new.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-mail-offl-reply.png b/comm/suite/themes/classic/messenger/icons/message-mail-offl-reply.png
new file mode 100644
index 0000000000..a0ebeb9ea8
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-mail-offl-reply.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-mail-offl.png b/comm/suite/themes/classic/messenger/icons/message-mail-offl.png
new file mode 100644
index 0000000000..bf62b12ce2
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-mail-offl.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-mail-reply.png b/comm/suite/themes/classic/messenger/icons/message-mail-reply.png
new file mode 100644
index 0000000000..44c5f29dee
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-mail-reply.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-mail.png b/comm/suite/themes/classic/messenger/icons/message-mail.png
new file mode 100644
index 0000000000..e74d08a096
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-mail.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-news-attach-kill-offl.png b/comm/suite/themes/classic/messenger/icons/message-news-attach-kill-offl.png
new file mode 100644
index 0000000000..8e36e243e5
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-news-attach-kill-offl.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-news-attach-kill.png b/comm/suite/themes/classic/messenger/icons/message-news-attach-kill.png
new file mode 100644
index 0000000000..110e943507
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-news-attach-kill.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-news-attach-offl.png b/comm/suite/themes/classic/messenger/icons/message-news-attach-offl.png
new file mode 100644
index 0000000000..d387f75cec
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-news-attach-offl.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-news-attach.png b/comm/suite/themes/classic/messenger/icons/message-news-attach.png
new file mode 100644
index 0000000000..f5d9d34327
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-news-attach.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-news-kill-offl.png b/comm/suite/themes/classic/messenger/icons/message-news-kill-offl.png
new file mode 100644
index 0000000000..0caac52c20
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-news-kill-offl.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-news-kill.png b/comm/suite/themes/classic/messenger/icons/message-news-kill.png
new file mode 100644
index 0000000000..509b52ce86
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-news-kill.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-news-new-attach-off.png b/comm/suite/themes/classic/messenger/icons/message-news-new-attach-off.png
new file mode 100644
index 0000000000..9c8a63c70d
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-news-new-attach-off.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-news-new-attach.png b/comm/suite/themes/classic/messenger/icons/message-news-new-attach.png
new file mode 100644
index 0000000000..80d814cbbd
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-news-new-attach.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-news-new-offl.png b/comm/suite/themes/classic/messenger/icons/message-news-new-offl.png
new file mode 100644
index 0000000000..0112ed9ce6
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-news-new-offl.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-news-new.png b/comm/suite/themes/classic/messenger/icons/message-news-new.png
new file mode 100644
index 0000000000..af2b900a9b
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-news-new.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-news-offl.png b/comm/suite/themes/classic/messenger/icons/message-news-offl.png
new file mode 100644
index 0000000000..49021f9d1b
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-news-offl.png
diff --git a/comm/suite/themes/classic/messenger/icons/message-news.png b/comm/suite/themes/classic/messenger/icons/message-news.png
new file mode 100644
index 0000000000..b612266e75
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/message-news.png
diff --git a/comm/suite/themes/classic/messenger/icons/messengericons-small.png b/comm/suite/themes/classic/messenger/icons/messengericons-small.png
new file mode 100644
index 0000000000..21fc19fed6
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/messengericons-small.png
diff --git a/comm/suite/themes/classic/messenger/icons/messengericons.png b/comm/suite/themes/classic/messenger/icons/messengericons.png
new file mode 100644
index 0000000000..bbb957baab
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/messengericons.png
diff --git a/comm/suite/themes/classic/messenger/icons/new-mail-alert.png b/comm/suite/themes/classic/messenger/icons/new-mail-alert.png
new file mode 100644
index 0000000000..7d3364336c
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/new-mail-alert.png
diff --git a/comm/suite/themes/classic/messenger/icons/phishing.png b/comm/suite/themes/classic/messenger/icons/phishing.png
new file mode 100644
index 0000000000..d99a9ea6d4
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/phishing.png
diff --git a/comm/suite/themes/classic/messenger/icons/readcol.png b/comm/suite/themes/classic/messenger/icons/readcol.png
new file mode 100644
index 0000000000..d8dd852326
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/readcol.png
diff --git a/comm/suite/themes/classic/messenger/icons/remote-blocked.png b/comm/suite/themes/classic/messenger/icons/remote-blocked.png
new file mode 100755
index 0000000000..552c93f7a2
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/remote-blocked.png
diff --git a/comm/suite/themes/classic/messenger/icons/secure.png b/comm/suite/themes/classic/messenger/icons/secure.png
new file mode 100644
index 0000000000..bcca43a917
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/secure.png
diff --git a/comm/suite/themes/classic/messenger/icons/server-local-new.png b/comm/suite/themes/classic/messenger/icons/server-local-new.png
new file mode 100644
index 0000000000..51e5fd3078
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/server-local-new.png
diff --git a/comm/suite/themes/classic/messenger/icons/server-local.png b/comm/suite/themes/classic/messenger/icons/server-local.png
new file mode 100644
index 0000000000..fd8d90dc4b
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/server-local.png
diff --git a/comm/suite/themes/classic/messenger/icons/server-mail-new.png b/comm/suite/themes/classic/messenger/icons/server-mail-new.png
new file mode 100644
index 0000000000..caf9b7896b
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/server-mail-new.png
diff --git a/comm/suite/themes/classic/messenger/icons/server-mail.png b/comm/suite/themes/classic/messenger/icons/server-mail.png
new file mode 100644
index 0000000000..13e3558d1f
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/server-mail.png
diff --git a/comm/suite/themes/classic/messenger/icons/server-news-lock.png b/comm/suite/themes/classic/messenger/icons/server-news-lock.png
new file mode 100644
index 0000000000..3822ad4144
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/server-news-lock.png
diff --git a/comm/suite/themes/classic/messenger/icons/server-news-new.png b/comm/suite/themes/classic/messenger/icons/server-news-new.png
new file mode 100644
index 0000000000..000d538624
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/server-news-new.png
diff --git a/comm/suite/themes/classic/messenger/icons/server-news.png b/comm/suite/themes/classic/messenger/icons/server-news.png
new file mode 100644
index 0000000000..ee0a6ddae9
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/server-news.png
diff --git a/comm/suite/themes/classic/messenger/icons/server-remote-lock-new.png b/comm/suite/themes/classic/messenger/icons/server-remote-lock-new.png
new file mode 100644
index 0000000000..0e53edfbf6
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/server-remote-lock-new.png
diff --git a/comm/suite/themes/classic/messenger/icons/server-remote-lock.png b/comm/suite/themes/classic/messenger/icons/server-remote-lock.png
new file mode 100644
index 0000000000..c7f33db676
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/server-remote-lock.png
diff --git a/comm/suite/themes/classic/messenger/icons/thread-closed-eye.png b/comm/suite/themes/classic/messenger/icons/thread-closed-eye.png
new file mode 100644
index 0000000000..dbe9dd7efc
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/thread-closed-eye.png
diff --git a/comm/suite/themes/classic/messenger/icons/thread-closed-kill.png b/comm/suite/themes/classic/messenger/icons/thread-closed-kill.png
new file mode 100644
index 0000000000..57c530751e
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/thread-closed-kill.png
diff --git a/comm/suite/themes/classic/messenger/icons/thread-closed-offl-eye.png b/comm/suite/themes/classic/messenger/icons/thread-closed-offl-eye.png
new file mode 100644
index 0000000000..51a3774223
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/thread-closed-offl-eye.png
diff --git a/comm/suite/themes/classic/messenger/icons/thread-closed-offl-kill.png b/comm/suite/themes/classic/messenger/icons/thread-closed-offl-kill.png
new file mode 100644
index 0000000000..8ab8acaef1
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/thread-closed-offl-kill.png
diff --git a/comm/suite/themes/classic/messenger/icons/thread-closed.png b/comm/suite/themes/classic/messenger/icons/thread-closed.png
new file mode 100644
index 0000000000..bd4cdc117c
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/thread-closed.png
diff --git a/comm/suite/themes/classic/messenger/icons/thread-new-closed-eye.png b/comm/suite/themes/classic/messenger/icons/thread-new-closed-eye.png
new file mode 100644
index 0000000000..75630b9545
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/thread-new-closed-eye.png
diff --git a/comm/suite/themes/classic/messenger/icons/thread-new-closed-kill.png b/comm/suite/themes/classic/messenger/icons/thread-new-closed-kill.png
new file mode 100644
index 0000000000..0e2ae7047a
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/thread-new-closed-kill.png
diff --git a/comm/suite/themes/classic/messenger/icons/thread-new-closed-offl-eye.png b/comm/suite/themes/classic/messenger/icons/thread-new-closed-offl-eye.png
new file mode 100644
index 0000000000..980b55ef67
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/thread-new-closed-offl-eye.png
diff --git a/comm/suite/themes/classic/messenger/icons/thread-new-closed-offl-kill.png b/comm/suite/themes/classic/messenger/icons/thread-new-closed-offl-kill.png
new file mode 100644
index 0000000000..c74c2d2ea7
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/thread-new-closed-offl-kill.png
diff --git a/comm/suite/themes/classic/messenger/icons/thread-new-closed.png b/comm/suite/themes/classic/messenger/icons/thread-new-closed.png
new file mode 100644
index 0000000000..cf992f5aa1
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/thread-new-closed.png
diff --git a/comm/suite/themes/classic/messenger/icons/threadcol-threaded.png b/comm/suite/themes/classic/messenger/icons/threadcol-threaded.png
new file mode 100644
index 0000000000..5d3ce7898f
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/threadcol-threaded.png
diff --git a/comm/suite/themes/classic/messenger/icons/threadcol-unthreaded.png b/comm/suite/themes/classic/messenger/icons/threadcol-unthreaded.png
new file mode 100644
index 0000000000..3d1cac5edd
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/threadcol-unthreaded.png
diff --git a/comm/suite/themes/classic/messenger/icons/twisty-clsd.png b/comm/suite/themes/classic/messenger/icons/twisty-clsd.png
new file mode 100644
index 0000000000..7d178c3df8
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/twisty-clsd.png
diff --git a/comm/suite/themes/classic/messenger/icons/twisty-open.png b/comm/suite/themes/classic/messenger/icons/twisty-open.png
new file mode 100644
index 0000000000..3cfe9ae414
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/icons/twisty-open.png
diff --git a/comm/suite/themes/classic/messenger/mailWindow1.css b/comm/suite/themes/classic/messenger/mailWindow1.css
new file mode 100644
index 0000000000..99b97a8053
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/mailWindow1.css
@@ -0,0 +1,156 @@
+/* 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/folderMenus.css");
+@import url("chrome://messenger/skin/folderPane.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* :::::
+   :: Make sure the min height is small so we can
+   :: resize the pane vertically -EDV
+   ::::: */
+
+#messagepanebox {
+  min-height: 10px;
+  height: 0px;
+}
+
+/* ..... folder pane adjustments ..... */
+
+.folderview-cycler > .toolbarbutton-text {
+  display: none;
+}
+
+.folderview-cycler > .toolbarbutton-icon {
+  margin: 0px;
+}
+
+.folderview-cycler[dir="prev"],
+.folderview-cycler[dir="next"]:-moz-locale-dir(rtl) {
+  list-style-image: url("chrome://global/skin/arrow/arrow-lft.gif");
+}
+
+.folderview-cycler[dir="next"],
+.folderview-cycler[dir="prev"]:-moz-locale-dir(rtl) {
+  list-style-image: url("chrome://global/skin/arrow/arrow-rit.gif");
+}
+
+/* ::::: border adjustments for focus ring and joined splitters ::::: */
+
+/* ..... splitter adjustments ..... */
+
+#folderpane-splitter {
+  border-right: none;
+  border-bottom: none;
+  border-left: none;
+  min-width: 5px;
+}
+
+#threadpane-splitter {
+  border: none;
+  min-height: 5px;
+}
+
+#threadpane-splitter[state="collapsed"] {
+  border-bottom: 2px solid;
+}
+
+/* ..... tree adjustments ..... */
+
+#folderTree {
+  border-right: 1px solid;
+  border-right-color: ThreeDShadow;
+  min-width: 1px;
+}
+
+#threadTree {
+  border-bottom: 1px solid;
+  border-bottom-color: ThreeDLightShadow;
+  min-width: 1px;
+}
+
+#threadTree,
+#accountCentralBox {
+  border-left: 1px solid;
+  border-left-color: ThreeDDarkShadow;
+}
+
+#locationIcon {
+  list-style-image: none;
+}
+
+/* ::::: tree focusring ::::: */
+
+.focusring:focus > .tree-stack > .tree-rows > .tree-bodybox {
+  border: 1px dotted ThreeDDarkShadow;
+}
+
+/* ..... message pane adjustments ..... */
+
+#messagepanebox {
+ border-top: 1px solid;
+ border-left: 1px solid;
+ border-top-color: ThreeDDarkShadow;
+ border-left-color: ThreeDDarkShadow;
+}
+
+#msgHeaderView {
+  border-left: none !important;
+}
+
+#messagepane {
+  border: 1px solid -moz-Field;
+  border-right: none;
+}
+
+#messagepanebox[focusring="true"] > #messagepanewrapper > #messagepane {
+  border-color: #000000;
+}
+
+/* ..... tabmail ..... */
+
+tabpanels {
+  /* don't draw tabpanel borders; see also tabbrowser.css */
+  -moz-appearance: none;
+}
+
+.tab-close-button {
+  margin: 0;
+}
+
+.tabmail-tab[type="message"] .tab-icon {
+  margin-top: -2px;
+}
+
+.tabmail-tab[type="folder"][NewMessages="true"],
+.tabmail-tab[type="folder"][IsServer="true"],
+.alltabs-item[selected="true"] {
+  font-weight: bold;
+}
+
+.tabmail-tab:-moz-lwtheme:not([selected="true"]) {
+  opacity: .8;
+}
+
+.tabmail-tab:-moz-lwtheme {
+  text-shadow: none;
+}
+
+.alltabs-item[tabIsScrolled] {
+  font-style: italic;
+}
+
+#tabbar-toolbar {
+  -moz-appearance: none;
+  border-top-style: none;
+  border-bottom-style: none;
+  min-height: 0;
+}
diff --git a/comm/suite/themes/classic/messenger/messageBody.css b/comm/suite/themes/classic/messenger/messageBody.css
new file mode 100644
index 0000000000..1e3f73d836
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/messageBody.css
@@ -0,0 +1,186 @@
+/* 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/. */
+
+/* ===== messageBody.css =================================================
+  == Styles for the body of a mail message.
+  ======================================================================= */
+
+@import url(chrome://communicator/skin/smileys.css);
+@import url(chrome://messenger/skin/messageQuotes.css);
+
+@namespace url("http://www.w3.org/1999/xhtml");
+
+/* :::: message header ::::: */
+
+.header-part1 {
+  background-color: #EFEFEF;
+}
+
+.header-part2,
+.header-part3 {
+  background-color: #DEDEDE;
+}
+
+.headerdisplayname {
+  display: inline;
+  font-weight: bold;
+  white-space: pre;
+}
+
+/* ::::: message text, incl. quotes ::::: */
+
+.moz-text-flowed blockquote,
+.moz-text-plain blockquote {
+  margin: 0;
+}
+
+.moz-text-plain pre {
+  margin: 0;
+  font-family: inherit;
+}
+
+.moz-text-plain[wrap="true"] {
+  white-space: pre-wrap;
+}
+
+.moz-text-plain[wrap="false"] {
+  white-space: pre;
+}
+
+.moz-text-plain[wrap="flow"] .moz-txt-sig {
+  white-space: pre-wrap;
+}
+
+.moz-text-plain[graphical-quote="false"] blockquote {
+  border-style: none;
+  padding: 0;
+}
+
+.moz-text-plain[graphical-quote="true"] .moz-txt-citetags {
+  display: none;
+}
+
+.moz-txt-underscore {
+  text-decoration: underline;
+}
+
+.moz-txt-formfeed {
+  display: block;
+  height: 100%;
+}
+
+/* ::::: signature ::::: */
+
+@media not print {
+  .moz-txt-sig,
+  .moz-signature {
+    opacity: 0.5;
+  }
+
+  .moz-txt-sig .moz-txt-sig,
+  .moz-signature .moz-signature {
+    opacity: 1.0;
+  }
+}
+
+/* ::::: vcard ::::: */
+
+.moz-vcard-table {
+  border-radius: 8px;
+  border: thin solid gray;
+  margin-top: 10px;
+}
+
+.moz-vcard-property {
+  font-size: 80%;
+  color: gray;
+}
+
+.moz-vcard-title-property {
+}
+
+.moz-vcard-badge {
+  height: 30px;
+  width: 30px;
+  display: block;
+  background-image: url("chrome://messenger/skin/icons/messengericons.png");
+  background-position: 0px -270px;
+}
+
+.moz-vcard-badge:hover {
+  background-position: -30px -270px;
+  outline: 1px dotted;
+}
+
+.moz-vcard-badge:hover:active {
+  background-position: -60px -270px;
+}
+
+/* ::::: attached images ::::: */
+.moz-attached-image-container {
+  text-align: center;
+}
+
+.moz-attached-image {
+  image-orientation: from-image;
+}
+
+.moz-attached-image[overflowing="true"] {
+  cursor: zoom-out;
+}
+
+.moz-attached-image[isshrunk="true"] {
+  cursor: zoom-in;
+  max-width: 100%;
+}
+
+/* Old style feeds. */
+#_mailrssiframe {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  border: none;
+}
+
+/* Attachment display styling (for inline attachments and printing) */
+.mimeAttachmentHeader {
+  border-style: none;
+  border-top: 1px solid gray;
+}
+
+.mimeAttachmentHeaderName {
+  color: gray;
+  font-size: 80%;
+}
+
+.mimeAttachmentWrap {
+  padding: 0 1em;
+}
+
+.mimeAttachmentTable {
+  width: 100%;
+  border-collapse: collapse;
+  table-layout: fixed;
+}
+
+.mimeAttachmentTable tr + tr > td {
+  border-top: 1px solid gray;
+}
+
+.mimeAttachmentFile {
+  word-wrap: break-word;
+}
+
+.mimeAttachmentSize {
+  vertical-align: top;
+  width: 10ch;
+  text-align: right;
+}
+
+.mimeAttachmentFile,
+.mimeAttachmentSize {
+  padding: 0.25em 0;
+}
diff --git a/comm/suite/themes/classic/messenger/messageHeader.css b/comm/suite/themes/classic/messenger/messageHeader.css
new file mode 100644
index 0000000000..1d8bcd854d
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/messageHeader.css
@@ -0,0 +1,185 @@
+/* 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.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: msg header toolbars ::::: */
+
+#collapsedHeaderView,
+#expandedHeaderView {
+  min-width: 1px;
+}
+
+/* ::::: msg header buttons ::::: */
+
+#expandedAttachmentBox {
+  width: 20em;
+  height: 0;
+  list-style-image: url("chrome://messenger/skin/icons/attach.png");
+}
+
+#attachmentText {
+  font-weight: bold;
+}
+
+/* ::::: msg header captions ::::: */
+
+#msgHeaderView {
+  border-right: 1px solid ThreeDShadow;
+  border-left: 1px solid ThreeDShadow;
+}
+
+#collapsedHeaderView,
+#expandedHeaderView {
+  border-bottom: 1px solid ThreeDDarkShadow;
+  min-width: 1px;
+}
+
+.headerNameBox {
+  width: 7.7em;
+}
+
+.headerName {
+  margin-top: 0px;
+  margin-bottom: 5px;
+  margin-inline-start: 0px;
+  margin-inline-end: .5em;
+  font-weight: bold;
+  text-align: right;
+}
+
+.headerValue {
+  margin: 0;
+  min-width: 50px;
+  white-space: normal;
+}
+
+.headerValueBox {
+  margin: 0 0 5px;
+}
+
+.headerValueBox[singleline="true"] {
+  overflow: hidden;
+}
+
+.subjectvalue {
+  font-weight: bold;
+}
+
+.tagvalue {
+  margin-top: 0;
+  margin-inline-start: 0;
+}
+
+/* ::::: msg header message ids ::::: */
+
+.messageIdDisplayButton {
+  cursor: pointer;
+  color: #0000FF;
+  text-decoration: underline;
+  margin: 0;
+}
+
+.messageIdDisplayButton:hover {
+  color: #FF0000;
+}
+
+.messageIdDisplayImage {
+  padding-inline-start: 2px;
+  -moz-box-pack: end;
+}
+
+/* ::::: msg header email addresses ::::: */
+
+.emailDisplayButton {
+  cursor: pointer;
+  color: #0000FF;
+  text-decoration: underline;
+  margin: 0;
+}
+
+.emailDisplayButton:hover {
+  color: #FF0000;
+}
+
+.emailDisplayImage {
+  padding-inline-start: 2px;
+  -moz-box-pack: end;
+}
+
+mail-emailaddress:-moz-focusring {
+  outline: 1px dotted;
+  outline-offset: -1px;
+}
+
+/* ::::: email address twisty ::::: */
+
+.addresstwisty {
+  margin: 2px;
+  list-style-image: url("chrome://messenger/skin/icons/twisty-clsd.png");
+}
+
+.addresstwisty[open] {
+  list-style-image: url("chrome://messenger/skin/icons/twisty-open.png");
+}
+
+/* ::::: view expand and collapse twisties  ::::: */
+
+.expandHeaderViewButton,
+.collapsedHeaderViewButton  {
+  margin: 2px .5em 0;
+}
+
+.expandHeaderViewButton {
+  list-style-image: url("chrome://messenger/skin/icons/twisty-open.png");
+}
+
+.collapsedHeaderViewButton  {
+  list-style-image: url("chrome://messenger/skin/icons/twisty-clsd.png");
+}
+
+/* ::::: collapsed view styles ::::: */
+
+#collapsedAttachmentBox {
+  -moz-box-pack: center;
+}
+
+#collapseddateValue {
+  margin: 0 .5em;
+  text-align: right;
+}
+
+#collapseddateValue > .textbox-input-box menupopup {
+  text-align: left;
+}
+
+#collapsedfromBox {
+  width: 18em;
+}
+
+#collapseddateBox {
+  width: 12em;
+}
+
+.collapsedHeaderDisplayName {
+  margin-top: 0px;
+  margin-bottom: 0px;
+  margin-inline-start: .55em;
+  margin-inline-end: .5em;
+  min-height: 16px;
+  font-weight: bold;
+}
+
+.collapsedHeaderValue {
+  margin: 0;
+}
+
+.collapsedAttachmentButton {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-attach.png");
+  margin-inline-end: .5em;
+}
diff --git a/comm/suite/themes/classic/messenger/messageKeywords.css b/comm/suite/themes/classic/messenger/messageKeywords.css
new file mode 100644
index 0000000000..751eb1eb83
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/messageKeywords.css
@@ -0,0 +1,8 @@
+/* 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/. */
+
+/* distributors / ISPs can use this
+ * to add or override icons and colors to the message pane.
+ * see http://www.mozilla.org/mailnews/arch/messagekeywords.html
+ */
diff --git a/comm/suite/themes/classic/messenger/messageQuotes.css b/comm/suite/themes/classic/messenger/messageQuotes.css
new file mode 100644
index 0000000000..2cbf8f5ba7
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/messageQuotes.css
@@ -0,0 +1,59 @@
+/* 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/. */
+
+/* Because this sheet is loaded synchronously while the user is waiting for the
+   compose window to appear, it must not @import a ton of other things, and
+   especially must not trigger network access. */
+
+/* ===== messageQuotes.css =================================================
+  == Shared styles such as block quote colors and signature style
+  == between the message body during
+  == message display and the mail editor instance for mail compose.
+  ======================================================================= */
+
+/* workaround for MS Outlook mails where the line-height is set to 0 */
+body {
+  line-height: initial !important;
+}
+
+/* ::::: signature ::::: */
+
+@media not print {
+  div.moz-text-flowed > div.moz-txt-sig,
+  div.moz-text-plain > pre > div.moz-txt-sig,
+  pre.moz-signature {
+    opacity: 0.6;
+  }
+}
+
+/* ::::: Turn on borders and padding for quotes. ::::: */
+blockquote[type=cite] {
+  padding: 0.4ex 1ex;
+  margin: 1ex;
+  border-width: 0px 0px 0px 2px;
+  border-style: none none none solid;
+  border-radius: 2px;
+}
+
+/* ::::: Colorize block quote borders. We only go 5 levels deep. ::::: */
+blockquote[type=cite] {
+  border-color: rgb(114,159,207); /* Sky Blue 1 */
+}
+
+blockquote[type=cite] blockquote[type=cite] {
+  border-color: rgb(173,127,168); /* Plum 1 */
+}
+
+blockquote[type=cite] blockquote[type=cite] blockquote[type=cite] {
+  border-color: rgb(138,226,52); /* Chameleon 1 */
+}
+
+blockquote[type=cite] blockquote[type=cite] blockquote[type=cite] blockquote[type=cite] {
+  border-color: rgb(252,175,62); /* Orange 1 */
+}
+
+blockquote[type=cite] blockquote[type=cite] blockquote[type=cite] blockquote[type=cite] blockquote[type=cite] {
+  border-color: rgb(233,185,110); /* Chocolate 1 */
+}
+
diff --git a/comm/suite/themes/classic/messenger/messageWindow.css b/comm/suite/themes/classic/messenger/messageWindow.css
new file mode 100644
index 0000000000..cddd5b4e2e
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/messageWindow.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/. */
+
+/* ===== messageWindow.css ==============================================
+  == Styles for the message window.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/messenger.css");
+@import url("chrome://messenger/skin/primaryToolbar.css");
+@import url("chrome://messenger/skin/threadPaneLabels.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: message header borders ::::: */
+
+#msgHeaderView {
+  border: 1px outset ThreeDFace !important;
+}
diff --git a/comm/suite/themes/classic/messenger/messenger.css b/comm/suite/themes/classic/messenger/messenger.css
new file mode 100644
index 0000000000..51b99bb76e
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/messenger.css
@@ -0,0 +1,20 @@
+/* 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://communicator/skin/");
+@import url("chrome://messenger/content/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: lightweight themes ::::: */
+
+#msgHeaderView:-moz-lwtheme {
+  text-shadow: none;
+  color: -moz-dialogtext;
+  background-color: -moz-dialog;
+}
diff --git a/comm/suite/themes/classic/messenger/messengercompose/messengercompose.css b/comm/suite/themes/classic/messenger/messengercompose/messengercompose.css
new file mode 100644
index 0000000000..762472e2b2
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/messengercompose/messengercompose.css
@@ -0,0 +1,333 @@
+/* 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");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: primary toolbar buttons ::::: */
+
+#button-send {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(330px 29px 359px 0);
+}
+
+#button-send:hover {
+  -moz-image-region: rect(330px 59px 359px 30px);
+}
+
+#button-send:hover:active {
+  -moz-image-region: rect(330px 89px 359px 60px);
+}
+
+#button-send[disabled="true"] {
+  -moz-image-region: rect(330px 119px 359px 90px) !important;
+}
+
+#button-address {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(270px 29px 299px 0);
+}
+
+#button-address:hover {
+  -moz-image-region: rect(270px 59px 299px 30px);
+}
+
+#button-address:hover:active {
+  -moz-image-region: rect(270px 89px 299px 60px);
+}
+
+#button-address[disabled="true"] {
+  -moz-image-region: rect(270px 119px 299px 90px) !important;
+}
+
+#button-attach {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(300px 29px 329px 0);
+}
+
+#button-attach:hover {
+  -moz-image-region: rect(300px 59px 329px 30px);
+}
+
+#button-attach:hover:active {
+  -moz-image-region: rect(300px 89px 329px 60px);
+}
+
+#button-attach[disabled="true"] {
+  -moz-image-region: rect(300px 119px 329px 90px) !important;
+}
+
+#spellingButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(240px 29px 269px 0);
+}
+
+#spellingButton:hover {
+  -moz-image-region: rect(240px 59px 269px 30px);
+}
+
+#spellingButton:hover:active {
+  -moz-image-region: rect(240px 89px 269px 60px);
+}
+
+#spellingButton[disabled="true"] {
+  -moz-image-region: rect(240px 119px 269px 90px) !important;
+}
+
+#button-save {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(210px 29px 239px 0);
+}
+
+#button-save:hover {
+  -moz-image-region: rect(210px 59px 239px 30px);
+}
+
+#button-save:hover:active {
+  -moz-image-region: rect(210px 89px 239px 60px);
+}
+
+#button-save[disabled="true"] {
+  -moz-image-region: rect(210px 119px 239px 90px) !important;
+}
+
+/* ::::: small primary toolbar buttons ::::: */
+
+toolbar[iconsize="small"] > #button-send,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-send {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(220px 19px 239px 0);
+}
+
+toolbar[iconsize="small"] > #button-send:hover {
+  -moz-image-region: rect(220px 39px 239px 20px);
+}
+
+toolbar[iconsize="small"] > #button-send:hover:active {
+  -moz-image-region: rect(220px 59px 239px 40px);
+}
+
+toolbar[iconsize="small"] > #button-send[disabled="true"] {
+  -moz-image-region: rect(220px 79px 239px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #button-address,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-address {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(180px 19px 199px 0);
+}
+
+toolbar[iconsize="small"] > #button-address:hover {
+  -moz-image-region: rect(180px 39px 199px 20px);
+}
+
+toolbar[iconsize="small"] > #button-address:hover:active {
+  -moz-image-region: rect(180px 59px 199px 40px);
+}
+
+toolbar[iconsize="small"] > #button-address[disabled="true"] {
+  -moz-image-region: rect(180px 79px 199px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #button-attach,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-attach {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(200px 19px 219px 0);
+}
+
+toolbar[iconsize="small"] > #button-attach:hover {
+  -moz-image-region: rect(200px 39px 219px 20px);
+}
+
+toolbar[iconsize="small"] > #button-attach:hover:active {
+  -moz-image-region: rect(200px 59px 219px 40px);
+}
+
+toolbar[iconsize="small"] > #button-attach[disabled="true"] {
+  -moz-image-region: rect(200px 79px 219px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #spellingButton,
+toolbar[iconsize="small"] > toolbarpaletteitem > #spellingButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
+  -moz-image-region: rect(160px 19px 179px 0);
+}
+
+toolbar[iconsize="small"] > #spellingButton:hover {
+  -moz-image-region: rect(160px 39px 179px 20px);
+}
+
+toolbar[iconsize="small"] > #spellingButton:hover:active {
+  -moz-image-region: rect(160px 59px 179px 40px);
+}
+
+toolbar[iconsize="small"] > #spellingButton[disabled="true"] {
+  -moz-image-region: rect(160px 79px 179px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #button-save,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-save {
+  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
+  -moz-image-region: rect(140px 19px 159px 0);
+}
+
+toolbar[iconsize="small"] > #button-save:hover {
+  -moz-image-region: rect(140px 39px 159px 20px);
+}
+
+toolbar[iconsize="small"] > #button-save:hover:active {
+  -moz-image-region: rect(140px 59px 159px 40px);
+}
+
+toolbar[iconsize="small"] > #button-save[disabled="true"] {
+  -moz-image-region: rect(140px 79px 159px 60px) !important;
+}
+
+/* ::::: special toolbar colors ::::: */
+
+#content-frame {
+  border-left: 1px solid ThreeDDarkShadow;
+  border-right: 1px solid ThreeDLightShadow;
+}
+
+#appcontent {
+  border-left: 1px solid ThreeDShadow;
+  border-right: 1px solid ThreeDHighlight;
+}
+
+#attachmentbucket-sizer {
+  border-top: none;
+  border-bottom: none;
+}
+
+#compose-toolbar-sizer {
+  border-top-width: 1px;
+  border-left: none;
+  border-right: none;
+  border-top-color: ThreeDHighlight;
+}
+
+#msgSubject {
+  margin-top: 0px;
+  margin-bottom: 4px;
+}
+
+#MsgHeadersToolbar {
+  min-height: 0px; /* this undoes the min-height in toolbar.css */
+}
+
+/* ::::: autocomplete icons ::::: */
+
+treechildren::-moz-tree-cell-text(default-match) {
+  margin-top: 2px;
+  margin-bottom: 2px;
+  margin-inline-start: 15px;
+  margin-inline-end: -3px;
+  border: none;
+}
+
+treechildren::-moz-tree-image(local-abook) {
+  margin-top: 2px;
+  margin-bottom: 2px;
+  margin-inline-start: 4px;
+  margin-inline-end: -1px;
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addrbook.png");
+}
+
+treechildren::-moz-tree-image(remote-abook) {
+  margin-top: 2px;
+  margin-bottom: 2px;
+  margin-inline-start: 2px;
+  margin-inline-end: -3px;
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/remote-addrbook.png");
+}
+
+treechildren::-moz-tree-image(remote-err) {
+  margin-top: 2px;
+  margin-bottom: 2px;
+  margin-inline-start: 2px;
+  margin-inline-end: -3px;
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/remote-addrbook-error.png");
+}
+
+treechildren::-moz-tree-image(subscribed-news) {
+  margin-inline-start: 2px;
+  margin-inline-end: -3px;
+  list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup.png");
+}
+
+/* ::::: compact menulists ::::: */
+
+.menulist-compact {
+  -moz-binding: url("chrome://messenger/content/messengercompose/menulistCompactBindings.xml#menulist-compact");
+  -moz-appearance: none;
+  -moz-box-align: center;
+  -moz-box-pack: center;
+  margin: 0;
+  border: 1px solid;
+  border-top-color: ThreeDLightShadow;
+  border-right-color: ThreeDDarkShadow;
+  border-bottom-color: ThreeDDarkShadow;
+  border-left-color: ThreeDLightShadow;
+  background-color: ThreeDFace;
+  color: ButtonText;
+  list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
+}
+
+.menulist-compact[open="true"] {
+  border-top-color: ThreeDDarkShadow;
+  border-right-color: ThreeDDarkShadow;
+  border-bottom-color: ThreeDDarkShadow;
+  border-left-color: ThreeDDarkShadow;
+}
+
+.menulist-compact[disabled="true"] {
+  list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif");
+}
+
+.menulist-compact > .menulist-label-box > .menulist-label {
+  margin: 0 3px !important;
+  text-align: end;
+}
+
+.menulist-compact > .menulist-label-box > .menulist-icon {
+  margin-inline-start: 2px;
+}
+
+.menulist-compact > .menulist-label-box,
+.menulist-compact[open="true"]:focus > .menulist-label-box {
+  -moz-appearance: none;
+  border: 1px solid transparent;
+  background: transparent;
+  color: inherit;
+}
+
+.menulist-compact:-moz-focusring > .menulist-label-box {
+  border: 1px dotted;
+}
+
+#FontFaceSelect {
+  max-width: 35ch;
+}
+
+/* ::::: lightweight themes ::::: */
+
+#MsgHeadersToolbar:-moz-lwtheme,
+#FormatToolbar:-moz-lwtheme,
+#compose-toolbar-sizer:-moz-lwtheme {
+  text-shadow: none;
+  color: -moz-dialogtext;
+  background-color: -moz-dialog;
+}
+
+#MsgHeadersToolbar textbox:-moz-lwtheme,
+#MsgHeadersToolbar menulist:-moz-lwtheme,
+.formatting-button > menulist:-moz-lwtheme {
+  opacity: 1;
+}
diff --git a/comm/suite/themes/classic/messenger/msgSelectOffline.css b/comm/suite/themes/classic/messenger/msgSelectOffline.css
new file mode 100644
index 0000000000..bc24e7b606
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/msgSelectOffline.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/. */
+
+/* ===== msgSelectOffline.css =================================================
+   == The dialog where you select which folders to enable for offline use.
+   ========================================================================== */
+
+@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/folderPane.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+treechildren::-moz-tree-image(syncCol) {
+  list-style-image: url("chrome://messenger/skin/icons/dot.png");
+}
+
+treechildren::-moz-tree-image(syncCol, synchronize-true) {
+  list-style-image: url("chrome://messenger/skin/icons/check.png");
+}
+
+treechildren::-moz-tree-image(syncCol, isServer-true) {
+  list-style-image: none;
+}
+
+#folderNameCol [sortDirection="ascending"] {
+  list-style-image: none;
+}
+
+#folderNameCol [sortDirection="descending"] {
+  list-style-image: none;
+}
diff --git a/comm/suite/themes/classic/messenger/newmailalert.css b/comm/suite/themes/classic/messenger/newmailalert.css
new file mode 100644
index 0000000000..e1d7a0fa26
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/newmailalert.css
@@ -0,0 +1,67 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * 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/. */
+
+/* ===== alert.css =====================================================
+  == Styles specific to the alerts dialog.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#newMailAlertNotification {
+  min-height: 60px;
+  border: ridge SteelBlue 4px;
+}
+
+#alertImage {
+  list-style-image: url("chrome://branding/content/icon64.png");
+}
+
+#alertImageBox {
+  padding: 4px;
+}
+
+#alertTitle {
+  font-weight: bold;
+}
+
+#alertTextBox {
+  padding: 4px;
+  padding-inline-end: 16px;
+}
+
+.folderSummary-message-row
+{
+  /* This max width ends up dictating the overall width of the alert window
+     because it controls how large the preview, subject and sender text can be
+     before cropping kicks in */
+  max-width: 450px;
+  padding: 0px 5px;
+}
+
+.folderSummary-subject {
+  font-weight: bold;
+}
+
+.folderSummary-sender, .folderSummary-subject {
+  cursor: inherit;
+}
+
+.folderSummary-previewText {
+  color: grey;
+}
+
+.folderSummaryMessage:hover > .folderSummary-message-row {
+  cursor: pointer;
+  color: blue;
+}
+
+#closeButton {
+  list-style-image: url("chrome://navigator/skin/icons/close.png");
+  -moz-appearance: none;
+  border: none !important;
+  padding: 2px 0px 0px;
+}
diff --git a/comm/suite/themes/classic/messenger/newsblog/feed-subscriptions.css b/comm/suite/themes/classic/messenger/newsblog/feed-subscriptions.css
new file mode 100644
index 0000000000..12d91ab08e
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/newsblog/feed-subscriptions.css
@@ -0,0 +1,30 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * 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 :::::: */
+
+#subscriptionsDialog {
+  width: 40em;
+  height: 30em;
+}
+
+#contentPane {
+  padding: 14px;
+}
+
+#rssFeedInfoBox {
+  border: 1px solid ThreeDShadow;
+  margin: 4px;
+  padding-top: 4px;
+  background-color: ThreeDLightShadow;
+}
+
+#statusContainerBox {
+  height: 24px;
+}
+
+#autotagPrefix {
+  width: 35ch;
+}
diff --git a/comm/suite/themes/classic/messenger/newsblog/rss-feed.png b/comm/suite/themes/classic/messenger/newsblog/rss-feed.png
new file mode 100644
index 0000000000..aef600bf35
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/newsblog/rss-feed.png
diff --git a/comm/suite/themes/classic/messenger/prefPanels.css b/comm/suite/themes/classic/messenger/prefPanels.css
new file mode 100644
index 0000000000..f01b406d98
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/prefPanels.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/. */
+
+/* ===== prefPanels.css =================================================
+  == Styles for the Messenger preference panels.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: Tags ::::: */
+
+#tagList > listhead {
+  text-align: center;
+}
+
+#tagList > listitem > listcell {
+  padding: 0 16px;
+}
diff --git a/comm/suite/themes/classic/messenger/primaryToolbar.css b/comm/suite/themes/classic/messenger/primaryToolbar.css
new file mode 100644
index 0000000000..baae8199db
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/primaryToolbar.css
@@ -0,0 +1,572 @@
+/* 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/. */
+
+/* ===== primaryToolbar.css =============================================
+  == Images for the Mail primary toolbar.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: primary toolbar buttons ::::: */
+
+#button-getmsg {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(90px 29px 119px 0);
+}
+
+#button-getmsg:hover {
+  -moz-image-region: rect(90px 59px 119px 30px);
+} 
+
+#button-getmsg:hover:active {
+  -moz-image-region: rect(90px 89px 119px 60px);
+} 
+
+#button-getmsg[disabled] {
+  -moz-image-region: rect(90px 119px 119px 90px) !important;
+} 
+
+#button-newmsg {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(150px 29px 179px 0);
+}
+
+#button-newmsg:hover {
+  -moz-image-region: rect(150px 59px 179px 30px);
+} 
+
+#button-newmsg:hover:active {
+  -moz-image-region: rect(150px 89px 179px 60px);
+} 
+
+#button-newmsg[disabled] {
+  -moz-image-region: rect(150px 119px 179px 90px) !important;
+} 
+
+#button-reply {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(210px 29px 239px 0);
+}
+
+#button-reply:hover {
+  -moz-image-region: rect(210px 59px 239px 30px);
+} 
+
+#button-reply:hover:active {
+  -moz-image-region: rect(210px 89px 239px 60px);
+} 
+
+#button-reply[disabled] {
+  -moz-image-region: rect(210px 119px 239px 90px) !important;
+} 
+
+#button-replyall {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(240px 29px 269px 0);
+}
+
+#button-replyall:hover {
+  -moz-image-region: rect(240px 59px 269px 30px);
+} 
+
+#button-replyall:hover:active {
+  -moz-image-region: rect(240px 89px 269px 60px);
+} 
+
+#button-replyall[disabled] {
+  -moz-image-region: rect(240px 119px 269px 90px) !important;
+} 
+
+#button-forward {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(60px 29px 89px 0);
+}
+
+#button-forward:hover {
+  -moz-image-region: rect(60px 59px 89px 30px);
+} 
+
+#button-forward:hover:active {
+  -moz-image-region: rect(60px 89px 89px 60px);
+} 
+
+#button-forward[disabled] {
+  -moz-image-region: rect(60px 119px 89px 90px) !important;
+} 
+
+#button-file {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(30px 29px 59px 0);
+}
+
+#button-file:hover {
+  -moz-image-region: rect(30px 59px 59px 30px);
+} 
+
+#button-file:hover:active,
+#button-file[open] {
+  -moz-image-region: rect(30px 89px 59px 60px);
+} 
+
+#button-file[disabled] {
+  -moz-image-region: rect(30px 119px 59px 90px) !important;
+} 
+
+#button-goback {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
+  -moz-image-region: rect(60px 29px 89px 0);
+}
+
+#button-goback:hover {
+  -moz-image-region: rect(60px 59px 89px 30px);
+}
+
+#button-goback:hover:active {
+  -moz-image-region: rect(60px 89px 89px 60px);
+}
+
+#button-goback[disabled="true"] {
+  -moz-image-region: rect(60px 119px 89px 90px) !important;
+}
+
+#button-goforward {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
+  -moz-image-region: rect(90px 29px 119px 0);
+}
+
+#button-goforward:hover {
+  -moz-image-region: rect(90px 59px 119px 30px);
+}
+
+#button-goforward:hover:active {
+  -moz-image-region: rect(90px 89px 119px 60px);
+}
+
+#button-goforward[disabled="true"] {
+  -moz-image-region: rect(90px 119px 119px 90px) !important;
+}
+
+#button-next {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(180px 29px 209px 0);
+}
+
+#button-next:hover {
+  -moz-image-region: rect(180px 59px 209px 30px);
+} 
+
+#button-next:hover:active {
+  -moz-image-region: rect(180px 89px 209px 60px);
+} 
+
+#button-next[disabled] {
+  -moz-image-region: rect(180px 119px 209px 90px) !important;
+} 
+
+#button-delete {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(0 29px 29px 0);
+}
+
+#button-delete:hover {
+  -moz-image-region: rect(0 59px 29px 30px);
+} 
+
+#button-delete:hover:active {
+  -moz-image-region: rect(0 89px 29px 60px);
+}
+
+#button-delete[disabled] {
+  -moz-image-region: rect(0 119px 29px 90px) !important;
+}
+
+toolbarpaletteitem > #button-delete {
+  display: -moz-box;
+}
+
+#button-mark {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(120px 29px 149px 0);
+}
+
+#button-mark:hover {
+  -moz-image-region: rect(120px 59px 149px 30px);
+} 
+
+#button-mark:hover:active {
+  -moz-image-region: rect(120px 89px 149px 60px);
+} 
+
+#button-mark[disabled] {
+  -moz-image-region: rect(120px 119px 149px 90px) !important;
+} 
+
+#button-junk {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(360px 29px 389px 0);
+}
+
+#button-junk:hover {
+  -moz-image-region: rect(360px 59px 389px 30px);
+}
+
+#button-junk:hover:active {
+  -moz-image-region: rect(360px 89px 389px 60px);
+}
+
+#button-junk[disabled="true"] {
+  -moz-image-region: rect(360px 119px 389px 90px) !important;
+}
+
+#button-stop {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
+  -moz-image-region: rect(30px 29px 59px 0);
+}
+
+#button-stop:hover {
+  -moz-image-region: rect(30px 59px 59px 30px);
+} 
+
+#button-stop:hover:active {
+  -moz-image-region: rect(30px 89px 59px 60px);
+}
+
+#button-stop[disabled="true"] {
+  -moz-image-region: rect(30px 119px 59px 90px) !important;
+}
+
+#sync-button {
+  list-style-image: url("chrome://communicator/skin/sync/sync-32.png");
+}
+
+#sync-button[status=active] {
+  list-style-image: url("chrome://communicator/skin/sync/sync-32-throbber.png");
+}
+
+#locationFolders {
+  width: 22em;
+}
+
+/* Force the folder location and mail view items to fit in the available width
+   in the Customize Toolbar dialog. */
+#palette-box #locationFolders,
+#palette-box #folder-location-container,
+#palette-box #searchInput,
+#palette-box #button-search-container,
+#palette-box #button-search,
+#palette-box #mailviews-container,
+#palette-box #viewPicker {
+  -moz-box-flex: 1;
+}
+
+#viewPickerPopup > menuitem > .menu-iconic-left,
+#viewPickerPopup > menu > menupopup > menuitem > .menu-iconic-left {
+  display: -moz-box !important;
+}
+
+/* ::::: small primary toolbar buttons ::::: */
+
+toolbar[iconsize="small"] > #button-getmsg,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-getmsg {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(60px 19px 79px 0);
+}
+
+toolbar[iconsize="small"] > #button-getmsg:hover {
+  -moz-image-region: rect(60px 39px 79px 20px);
+}
+
+toolbar[iconsize="small"] > #button-getmsg:hover:active {
+  -moz-image-region: rect(60px 59px 79px 40px);
+}
+
+toolbar[iconsize="small"] > #button-getmsg[disabled] {
+  -moz-image-region: rect(60px 79px 79px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #button-newmsg,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-newmsg {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(100px 19px 119px 0);
+}
+
+toolbar[iconsize="small"] > #button-newmsg:hover {
+  -moz-image-region: rect(100px 39px 119px 20px);
+}
+
+toolbar[iconsize="small"] > #button-newmsg:hover:active {
+  -moz-image-region: rect(100px 59px 119px 40px);
+}
+
+toolbar[iconsize="small"] > #button-newmsg[disabled] {
+  -moz-image-region: rect(100px 79px 119px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #button-reply,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-reply {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(140px 19px 159px 0);
+}
+
+toolbar[iconsize="small"] > #button-reply:hover {
+  -moz-image-region: rect(140px 39px 159px 20px);
+}
+
+toolbar[iconsize="small"] > #button-reply:hover:active {
+  -moz-image-region: rect(140px 59px 159px 40px);
+}
+
+toolbar[iconsize="small"] > #button-reply[disabled] {
+  -moz-image-region: rect(140px 79px 159px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #button-replyall,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-replyall {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(160px 19px 179px 0);
+}
+
+toolbar[iconsize="small"] > #button-replyall:hover {
+  -moz-image-region: rect(160px 39px 179px 20px);
+}
+
+toolbar[iconsize="small"] > #button-replyall:hover:active {
+  -moz-image-region: rect(160px 59px 179px 40px);
+}
+
+toolbar[iconsize="small"] > #button-replyall[disabled] {
+  -moz-image-region: rect(160px 79px 179px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #button-forward,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-forward {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(40px 19px 59px 0);
+}
+
+toolbar[iconsize="small"] > #button-forward:hover {
+  -moz-image-region: rect(40px 39px 59px 20px);
+}
+
+toolbar[iconsize="small"] > #button-forward:hover:active {
+  -moz-image-region: rect(40px 59px 59px 40px);
+}
+
+toolbar[iconsize="small"] > #button-forward[disabled] {
+  -moz-image-region: rect(40px 79px 59px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #button-file,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-file {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(20px 19px 39px 0);
+}
+
+toolbar[iconsize="small"] > #button-file:hover {
+  -moz-image-region: rect(20px 39px 39px 20px);
+}
+
+toolbar[iconsize="small"] > #button-file:hover:active,
+toolbar[iconsize="small"] > #button-file[open] {
+  -moz-image-region: rect(20px 59px 39px 40px);
+} 
+
+toolbar[iconsize="small"] > #button-file[disabled] {
+  -moz-image-region: rect(20px 79px 39px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #button-goback,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-goback {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+  -moz-image-region: rect(40px 19px 59px 0);
+}
+
+toolbar[iconsize="small"] > #button-goback:hover {
+  -moz-image-region: rect(40px 39px 59px 20px);
+}
+
+toolbar[iconsize="small"] > #button-goback:hover:active {
+  -moz-image-region: rect(40px 59px 59px 40px);
+}
+
+toolbar[iconsize="small"] > #button-goback[disabled="true"] {
+  -moz-image-region: rect(40px 79px 59px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #button-goforward,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-goforward {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+  -moz-image-region: rect(60px 19px 79px 0);
+}
+
+toolbar[iconsize="small"] > #button-goforward:hover {
+  -moz-image-region: rect(60px 39px 79px 20px);
+}
+
+toolbar[iconsize="small"] > #button-goforward:hover:active {
+  -moz-image-region: rect(60px 59px 79px 40px);
+}
+
+toolbar[iconsize="small"] > #button-goforward[disabled="true"] {
+  -moz-image-region: rect(60px 79px 79px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #button-next,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-next {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(120px 19px 139px 0);
+}
+
+toolbar[iconsize="small"] > #button-next:hover {
+  -moz-image-region: rect(120px 39px 139px 20px);
+}
+
+toolbar[iconsize="small"] > #button-next:hover:active {
+  -moz-image-region: rect(120px 59px 139px 40px);
+}
+
+toolbar[iconsize="small"] > #button-next[disabled] {
+  -moz-image-region: rect(120px 79px 139px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #button-delete,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-delete {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(0 19px 19px 0);
+}
+
+toolbar[iconsize="small"] > #button-delete:hover {
+  -moz-image-region: rect(0 39px 19px 20px);
+}
+
+toolbar[iconsize="small"] > #button-delete:hover:active {
+  -moz-image-region: rect(0 59px 19px 40px);
+}
+
+toolbar[iconsize="small"] > #button-delete[disabled],
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-delete[disabled] {
+  -moz-image-region: rect(0 79px 19px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #button-mark,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-mark {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(80px 19px 99px 0);
+}
+
+toolbar[iconsize="small"] > #button-mark:hover {
+  -moz-image-region: rect(80px 39px 99px 20px);
+}
+
+toolbar[iconsize="small"] > #button-mark:hover:active {
+  -moz-image-region: rect(80px 59px 99px 40px);
+}
+
+toolbar[iconsize="small"] > #button-mark[disabled] {
+  -moz-image-region: rect(80px 79px 99px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #button-junk,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-junk {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(240px 19px 259px 0);
+}
+
+toolbar[iconsize="small"] > #button-junk:hover {
+  -moz-image-region: rect(240px 39px 259px 20px);
+}
+
+toolbar[iconsize="small"] > #button-junk:hover:active {
+  -moz-image-region: rect(240px 59px 259px 40px);
+}
+
+toolbar[iconsize="small"] > #button-junk[disabled],
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-junk[disabled] {
+  -moz-image-region: rect(240px 79px 259px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #button-stop,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-stop {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+  -moz-image-region: rect(20px 19px 39px 0);
+}
+
+toolbar[iconsize="small"] > #button-stop:hover {
+  -moz-image-region: rect(20px 39px 39px 20px);
+}
+
+toolbar[iconsize="small"] > #button-stop:hover:active {
+  -moz-image-region: rect(20px 59px 39px 40px);
+}
+
+toolbar[iconsize="small"] > #button-stop[disabled="true"] {
+  -moz-image-region: rect(20px 79px 39px 60px) !important;
+}
+
+toolbar[iconsize="small"] > toolbarpaletteitem > #sync-button,
+toolbar[iconsize="small"] > #sync-button {
+  list-style-image: url("chrome://communicator/skin/sync/sync-16.png");
+}
+
+toolbar[iconsize="small"] > toolbarpaletteitem > #sync-button[status=active],
+toolbar[iconsize="small"] > #sync-button[status=active] {
+  list-style-image: url("chrome://communicator/skin/sync/sync-16-throbber.png");
+}
+
+/* ::::: Lightning icon sizes ::::: */
+
+#lightning-button-calendar > .toolbarbutton-icon,
+#lightning-button-tasks > .toolbarbutton-icon,
+#extractEventButton > .toolbarbutton-icon,
+#extractTaskButton > .toolbarbutton-icon,
+#extractEventButton > .box-inherit > .toolbarbutton-icon,
+#extractTaskButton > .box-inherit > .toolbarbutton-icon {
+  width: 29px;
+  height: 29px;
+}
+
+toolbar[iconsize="small"] > #lightning-button-calendar > .toolbarbutton-icon,
+toolbar[iconsize="small"] > #lightning-button-tasks > .toolbarbutton-icon,
+toolbar[iconsize="small"] > #extractEventButton > .box-inherit > .toolbarbutton-icon,
+toolbar[iconsize="small"] > #extractTaskButton > .box-inherit > .toolbarbutton-icon {
+  width: 19px;
+  height: 19px;
+}
+
+#lightning-button-calendar[disabled="true"] > .toolbarbutton-icon,
+#lightning-button-tasks[disabled="true"] > .toolbarbutton-icon,
+#extractEventButton[disabled="true"] > .box-inherit > .toolbarbutton-icon,
+#extractTaskButton[disabled="true"] > .box-inherit > .toolbarbutton-icon {
+  opacity: 0.3;
+}
+
+/* ::::: message notification bar style rules ::::: */
+
+.msgNotificationBar {
+  border-bottom: 1px solid;
+  border-bottom-color: #000000;
+  -moz-appearance: toolbox;
+  background-color: #C7BC8F;
+  color: black;
+}
+
+.msgNotificationBar:-moz-lwtheme {
+  text-shadow: none;
+}
+
+.messageImage[value="remoteContent"] {
+  list-style-image: url("chrome://messenger/skin/icons/remote-blocked.png");
+}
+
+.messageImage[value="junkContent"] {
+  list-style-image: url("chrome://messenger/skin/icons/junk.png");
+}
+
+.messageImage[value="phishingContent"] {
+  list-style-image: url("chrome://messenger/skin/icons/phishing.png");
+}
+
+.messageImage[value="mdnContent"] {
+  list-style-image: url("chrome://messenger/skin/icons/info.png");
+}
diff --git a/comm/suite/themes/classic/messenger/searchDialog.css b/comm/suite/themes/classic/messenger/searchDialog.css
new file mode 100644
index 0000000000..49774465b6
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/searchDialog.css
@@ -0,0 +1,57 @@
+/* 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/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: box sizes ::::: */
+
+#searchTermTree {
+  min-height: 50px;
+}
+
+#searchTermListBox {
+  height: 100px;
+}
+
+#searchResultListBox {
+  margin: 5px;
+  height: 100px;
+}
+
+#searchAddressBookWindow,
+#searchMailWindow {
+  padding: 0px;
+}
+
+.search-menulist[unavailable="true"] {
+  color: GrayText;
+}
+
+menulist:not(#menuSearchLocalSystem) {
+  width: 12em;
+}
+
+menulist:not(#menuSearchLocalSystem) > menupopup > menuitem {
+  padding-inline-end: 2px;
+}
+
+textbox {
+  margin: 1px 4px;
+}
+
+.filler {
+  padding-inline-end: 22px;
+}
+
+.small-button {
+  min-width: 3em;
+  padding: 0px;
+  margin: 0px 1px;
+}
diff --git a/comm/suite/themes/classic/messenger/smime/certFetchingStatus.css b/comm/suite/themes/classic/messenger/smime/certFetchingStatus.css
new file mode 100644
index 0000000000..9638e0879d
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/smime/certFetchingStatus.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/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
diff --git a/comm/suite/themes/classic/messenger/smime/icons/hdrCryptoNotOk.png b/comm/suite/themes/classic/messenger/smime/icons/hdrCryptoNotOk.png
new file mode 100644
index 0000000000..32e871e0f8
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/smime/icons/hdrCryptoNotOk.png
diff --git a/comm/suite/themes/classic/messenger/smime/icons/hdrCryptoOk.png b/comm/suite/themes/classic/messenger/smime/icons/hdrCryptoOk.png
new file mode 100644
index 0000000000..5fa57bdb10
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/smime/icons/hdrCryptoOk.png
diff --git a/comm/suite/themes/classic/messenger/smime/icons/hdrSignNotOk.png b/comm/suite/themes/classic/messenger/smime/icons/hdrSignNotOk.png
new file mode 100644
index 0000000000..8db53b65c2
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/smime/icons/hdrSignNotOk.png
diff --git a/comm/suite/themes/classic/messenger/smime/icons/hdrSignOk.png b/comm/suite/themes/classic/messenger/smime/icons/hdrSignOk.png
new file mode 100644
index 0000000000..232b7e6f34
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/smime/icons/hdrSignOk.png
diff --git a/comm/suite/themes/classic/messenger/smime/icons/hdrSignUnknown.png b/comm/suite/themes/classic/messenger/smime/icons/hdrSignUnknown.png
new file mode 100644
index 0000000000..d4befb2256
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/smime/icons/hdrSignUnknown.png
diff --git a/comm/suite/themes/classic/messenger/smime/icons/sbCryptoNotOk.png b/comm/suite/themes/classic/messenger/smime/icons/sbCryptoNotOk.png
new file mode 100644
index 0000000000..1a69247ad6
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/smime/icons/sbCryptoNotOk.png
diff --git a/comm/suite/themes/classic/messenger/smime/icons/sbCryptoOk.png b/comm/suite/themes/classic/messenger/smime/icons/sbCryptoOk.png
new file mode 100644
index 0000000000..1c80d511d3
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/smime/icons/sbCryptoOk.png
diff --git a/comm/suite/themes/classic/messenger/smime/icons/sbSignNotOk.png b/comm/suite/themes/classic/messenger/smime/icons/sbSignNotOk.png
new file mode 100644
index 0000000000..d34feafdb3
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/smime/icons/sbSignNotOk.png
diff --git a/comm/suite/themes/classic/messenger/smime/icons/sbSignOk.png b/comm/suite/themes/classic/messenger/smime/icons/sbSignOk.png
new file mode 100644
index 0000000000..addaf488e3
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/smime/icons/sbSignOk.png
diff --git a/comm/suite/themes/classic/messenger/smime/icons/sbSignUnknown.png b/comm/suite/themes/classic/messenger/smime/icons/sbSignUnknown.png
new file mode 100644
index 0000000000..0127c147ec
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/smime/icons/sbSignUnknown.png
diff --git a/comm/suite/themes/classic/messenger/smime/icons/smimeicons-small.png b/comm/suite/themes/classic/messenger/smime/icons/smimeicons-small.png
new file mode 100644
index 0000000000..a0b4e9841e
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/smime/icons/smimeicons-small.png
diff --git a/comm/suite/themes/classic/messenger/smime/icons/smimeicons.png b/comm/suite/themes/classic/messenger/smime/icons/smimeicons.png
new file mode 100644
index 0000000000..e850adc565
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/smime/icons/smimeicons.png
diff --git a/comm/suite/themes/classic/messenger/smime/msgCompSMIMEOverlay.css b/comm/suite/themes/classic/messenger/smime/msgCompSMIMEOverlay.css
new file mode 100644
index 0000000000..76569981b1
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/smime/msgCompSMIMEOverlay.css
@@ -0,0 +1,75 @@
+/* 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/. */
+
+/* ===== msgCompSMIMEOverlay.css ========================================
+  == Styles for the S/Mime in composer window.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#button-security {
+  list-style-image: url("chrome://messenger/skin/smime/icons/smimeicons.png");
+  -moz-image-region: rect(0 29px 29px 0px);
+}
+
+#button-security:hover {
+  -moz-image-region: rect(0 59px 29px 30px);
+} 
+
+#button-security:hover:active {
+  -moz-image-region: rect(0 89px 29px 60px);
+} 
+
+#button-security[disabled] {
+  -moz-image-region: rect(0 119px 29px 90px) !important;
+}
+
+toolbar[iconsize="small"] > #button-security,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-security {
+  list-style-image: url("chrome://messenger/skin/smime/icons/smimeicons-small.png");
+  -moz-image-region: rect(0 19px 19px 0px);
+}
+
+toolbar[iconsize="small"] > #button-security:hover {
+  -moz-image-region: rect(0 39px 19px 20px);
+}
+
+toolbar[iconsize="small"] > #button-security:hover:active {
+  -moz-image-region: rect(0 59px 19px 40px);
+}
+
+toolbar[iconsize="small"] > #button-security[disabled] {
+  -moz-image-region: rect(0 79px 19px 60px) !important;
+}
+
+#msgcomposeWindow #signing-status {
+  list-style-image: none;
+  visibility: collapse;
+}
+
+#msgcomposeWindow[signing="ok"] #signing-status {
+  list-style-image: url("chrome://messenger/skin/smime/icons/sbSignOk.png");
+  visibility: visible;
+}
+
+#msgcomposeWindow[signing="notok"] #signing-status {
+  list-style-image: url("chrome://messenger/skin/smime/icons/sbSignNotOk.png");
+  visibility: visible;
+}
+
+
+#msgcomposeWindow #encryption-status {
+  list-style-image: none;
+  visibility: collapse;
+}
+
+#msgcomposeWindow[crypto="ok"] #encryption-status {
+  list-style-image: url("chrome://messenger/skin/smime/icons/sbCryptoOk.png");
+  visibility: visible;
+}
+
+#msgcomposeWindow[crypto="notok"] #encryption-status {
+  list-style-image: url("chrome://messenger/skin/smime/icons/sbCryptoNotOk.png");
+  visibility: visible;
+}
diff --git a/comm/suite/themes/classic/messenger/smime/msgCompSecurityInfo.css b/comm/suite/themes/classic/messenger/smime/msgCompSecurityInfo.css
new file mode 100644
index 0000000000..170c162340
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/smime/msgCompSecurityInfo.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/. */
+
+/* ===== msgReadSecurityInfo.css ========================================
+  == Styles for the security info window when displaying received mail.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
diff --git a/comm/suite/themes/classic/messenger/smime/msgHdrViewSMIMEOverlay.css b/comm/suite/themes/classic/messenger/smime/msgHdrViewSMIMEOverlay.css
new file mode 100644
index 0000000000..9e4cdd72af
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/smime/msgHdrViewSMIMEOverlay.css
@@ -0,0 +1,45 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#signedHdrIcon {
+  list-style-image: none;
+  visibility: visible;
+}
+
+#signedHdrIcon[signed="ok"] {
+  list-style-image: url("chrome://messenger/skin/smime/icons/hdrSignOk.png");
+  visibility: visible;
+}
+
+#signedHdrIcon[signed="unknown"] {
+  list-style-image: url("chrome://messenger/skin/smime/icons/hdrSignUnknown.png");
+  visibility: visible;
+}
+
+#signedHdrIcon[signed="mismatch"] {
+  list-style-image: url("chrome://messenger/skin/smime/icons/hdrSignUnknown.png");
+  visibility: visible;
+}
+
+#signedHdrIcon[signed="notok"] {
+  list-style-image: url("chrome://messenger/skin/smime/icons/hdrSignNotOk.png");
+  visibility: visible;
+}
+
+#encryptedHdrIcon {
+  list-style-image: none;
+  visibility: visible;
+}
+
+#encryptedHdrIcon[encrypted="ok"] {
+  list-style-image: url("chrome://messenger/skin/smime/icons/hdrCryptoOk.png");
+  visibility: visible;
+}
+
+#encryptedHdrIcon[encrypted="notok"] {
+  list-style-image: url("chrome://messenger/skin/smime/icons/hdrCryptoNotOk.png");
+  visibility: visible;
+}
diff --git a/comm/suite/themes/classic/messenger/smime/msgReadSMIMEOverlay.css b/comm/suite/themes/classic/messenger/smime/msgReadSMIMEOverlay.css
new file mode 100644
index 0000000000..8633a4c09d
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/smime/msgReadSMIMEOverlay.css
@@ -0,0 +1,37 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#status-bar #signed-status {
+  list-style-image: none;
+}
+
+#status-bar[signed="ok"] #signed-status {
+  list-style-image: url("chrome://messenger/skin/smime/icons/sbSignOk.png");
+}
+
+#status-bar[signed="unknown"] #signed-status {
+  list-style-image: url("chrome://messenger/skin/smime/icons/sbSignUnknown.png");
+}
+
+#status-bar[signed="mismatch"] #signed-status {
+  list-style-image: url("chrome://messenger/skin/smime/icons/sbSignUnknown.png");
+}
+
+#status-bar[signed="notok"] #signed-status {
+  list-style-image: url("chrome://messenger/skin/smime/icons/sbSignNotOk.png");
+}
+
+#status-bar #encrypted-status {
+  list-style-image: none;
+}
+
+#status-bar[encrypted="ok"] #encrypted-status {
+  list-style-image: url("chrome://messenger/skin/smime/icons/sbCryptoOk.png");
+}
+
+#status-bar[encrypted="notok"] #encrypted-status {
+  list-style-image: url("chrome://messenger/skin/smime/icons/sbCryptoNotOk.png");
+}
diff --git a/comm/suite/themes/classic/messenger/smime/msgReadSecurityInfo.css b/comm/suite/themes/classic/messenger/smime/msgReadSecurityInfo.css
new file mode 100644
index 0000000000..7ca95f7b04
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/smime/msgReadSecurityInfo.css
@@ -0,0 +1,27 @@
+/* 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/. */
+
+/* ===== msgReadSecurityInfo.css ========================================
+  == Styles for the security info window when displaying received mail.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#signatureLabel {
+  font-weight: bold;
+}
+
+#signatureCert {
+  margin: 5px;
+}
+
+#encryptionLabel {
+  font-weight: bold;
+}
+
+#encryptionCert {
+  margin: 5px;
+}
diff --git a/comm/suite/themes/classic/messenger/start.css b/comm/suite/themes/classic/messenger/start.css
new file mode 100644
index 0000000000..059a488a2e
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/start.css
@@ -0,0 +1,40 @@
+/* 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/. */
+
+/* ===== start.css =====================================================
+   == Styles used by the mailnews start page.
+   ======================================================================= */
+
+body {
+  margin: 0;
+  padding: 0;
+  background: url("chrome://branding/content/messenger-start-bg.png") no-repeat fixed center 3em;
+  background-size: auto 85%;
+}
+
+h1 {
+  background: url("chrome://branding/content/messenger-start-hdr.png") repeat-x bottom;
+  border-bottom: 2px solid #26269A;
+  font-size: 1.5em;
+  padding: 0.25em 0.67em; /* 0.67*1.5=1, so fit with 1em below */
+  margin: 0;
+}
+
+#main {
+  margin: 0 1em;
+}
+
+p {
+  margin: 0.5em 0;
+}
+
+h2 {
+  font-size: 1.2em;
+  font-weight: bold;
+}
+
+ul {
+  margin: 0.5em 0;
+}
+
diff --git a/comm/suite/themes/classic/messenger/subscribe.css b/comm/suite/themes/classic/messenger/subscribe.css
new file mode 100644
index 0000000000..f7ff21f403
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/subscribe.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/. */
+
+/* ===== subscribe.css ==================================================
+  == Styles for the Subscribe dialog.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: subscribed icons  :::::: */
+
+treechildren::-moz-tree-image(subscribedColumn),
+treechildren::-moz-tree-image(subscribedColumn2) {
+  margin-inline-end: 2px;
+  list-style-image: url("chrome://messenger/skin/icons/dot.png");
+}
+
+treechildren::-moz-tree-image(subscribedColumn, subscribed-true),
+treechildren::-moz-tree-image(subscribedColumn2, subscribed-true) {
+  list-style-image: url("chrome://messenger/skin/icons/check.png");
+}
+
+treechildren::-moz-tree-image(subscribedColumn, subscribable-false) {
+  list-style-image: none;
+}
+
+treechildren::-moz-tree-cell-text(nameColumn, subscribable-false) {
+  color: gray;
+  font-style: italic;
+}
+
+/* ::::: folder icons :::::: */
+
+treechildren::-moz-tree-image(nameColumn) {
+  margin-inline-end: 2px;
+  list-style-image: url("chrome://messenger/skin/icons/folder-closed.png");
+}
+
+treechildren::-moz-tree-image(nameColumn, serverType-nntp),
+treechildren::-moz-tree-image(nameColumn2, serverType-nntp) {
+  margin-inline-end: 2px;
+  list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup.png");
+}
+
+/* ::::: server icons :::::: */
+
+.subscribeMenuItem {
+  list-style-image: url("chrome://messenger/skin/icons/server-mail.png");
+}
+
+.subscribeMenuItem[ServerType="imap"][IsSecure="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.png");
+}
+
+.subscribeMenuItem[ServerType="nntp"] {
+  list-style-image: url("chrome://messenger/skin/icons/server-news.png");
+}
+
+.subscribeMenuItem[ServerType="nntp"][IsSecure="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/server-news-lock.png");
+}
+
+/* ::::: statusbar adjustments :::::: */
+
+#statusContainerBox {
+  margin: 0px 4px;
+}
diff --git a/comm/suite/themes/classic/messenger/threadPane.css b/comm/suite/themes/classic/messenger/threadPane.css
new file mode 100644
index 0000000000..6eb11439cd
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/threadPane.css
@@ -0,0 +1,352 @@
+/* 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/. */
+
+/* ===== threadPane.css ==============================================
+  == Styles for the thread pane in the Messenger 3-pane window.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: thread decoration ::::: */
+
+treechildren::-moz-tree-cell-text(read) {
+  font-weight: normal;
+}
+
+treechildren::-moz-tree-cell-text(unread) {
+  font-weight: bold;
+}
+
+treechildren::-moz-tree-cell-text(imapdeleted) {
+  text-decoration: line-through;
+}
+
+/* on a collapsed thread, if the top level message is read, but the thread has
+ * unread children, underline the text.  4.x mac did this, very slick 
+ */
+treechildren::-moz-tree-cell-text(container, closed, hasUnread, read) {
+  text-decoration: underline;
+}
+
+/* ::::: priority colors ::::: */
+/****
+ ****  Priority colors currently not being used at the moment.  It has been
+ ****  disabled so as to not conflict with the labels color feature.
+ ****
+treechildren::-moz-tree-cell-text(priorityCol, priority-highest) {
+  color: red;
+}
+
+treechildren::-moz-tree-cell-text(priorityCol, priority-high) {
+  color: rgb(128, 0, 0);
+}
+
+treechildren::-moz-tree-cell-text(priorityCol, priority-lowest) {
+  color: rgb(170, 170, 170);
+}
+
+treechildren::-moz-tree-cell-text(priorityCol, priority-low) {
+  color: rgb(85, 85, 85);
+}
+
+treechildren::-moz-tree-cell-text(priorityCol, selected) {
+  color: -moz-DialogText;
+}
+
+treechildren::-moz-tree-cell-text(priorityCol, selected, focus) {
+  color: HighlightText;
+}
+ ****/
+
+/* ::::: message icons ::::: */
+
+/* ::::: message column icons ::::: */
+
+/* ..... thread column ..... */
+
+.threadColumnHeader {
+  list-style-image: url("chrome://messenger/skin/icons/threadcol-unthreaded.png");
+}
+
+.threadColumnHeader[sortDirection="ascending"]  {
+  list-style-image: url("chrome://messenger/skin/icons/threadcol-threaded.png");
+}
+
+.threadColumnHeader[sortDirection="descending"] {
+  list-style-image: url("chrome://messenger/skin/icons/threadcol-threaded.png");
+}
+
+treechildren::-moz-tree-image(threadCol, container) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-closed.png");
+}
+
+treechildren::-moz-tree-image(threadCol, container, hasUnread) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-new-closed.png");
+}
+
+/* ..... read column ..... */
+
+.readColumnHeader {
+  list-style-image: url("chrome://messenger/skin/icons/readcol.png");
+}
+
+treechildren::-moz-tree-image(unreadButtonColHeader) {
+  list-style-image: url("chrome://messenger/skin/icons/dot.png");
+}
+
+treechildren::-moz-tree-image(unreadButtonColHeader, unread) {
+  list-style-image: url("chrome://messenger/skin/icons/readcol.png");
+}
+
+/* ..... attachment column ..... */
+
+.attachmentColumnHeader {
+  list-style-image: url("chrome://messenger/skin/icons/attachment-col.png");
+}
+
+treechildren::-moz-tree-image(attachmentCol, attach) {
+  list-style-image: url("chrome://messenger/skin/icons/attachment.png");
+}
+
+treechildren::-moz-tree-image(attachmentCol, attach, focus, selected) {
+  list-style-image: url("chrome://messenger/skin/icons/attachment-selected.png");
+}
+
+/* ..... flag column ..... */
+
+.flagColumnHeader {
+  list-style-image: url("chrome://messenger/skin/icons/flagcol.png");
+}
+
+treechildren::-moz-tree-image(flaggedCol) {
+  list-style-image: url("chrome://messenger/skin/icons/dot.png");
+}
+
+treechildren::-moz-tree-image(flaggedCol, flagged) {
+  list-style-image: url("chrome://messenger/skin/icons/flagcol.png");
+}
+
+/* ..... junkStatus column ..... */
+
+.junkStatusHeader {
+  list-style-image: url("chrome://messenger/skin/icons/folder-junk.png");
+  padding-top: 0px;
+  padding-bottom: 0px;
+  padding-inline-start: 0px;
+  padding-inline-end: 4px;
+}
+
+/* "unknown" now looks like "not junk".  see bug #182386 */
+treechildren::-moz-tree-image(junkStatusCol) {
+  list-style-image: url("chrome://messenger/skin/icons/dot.png");
+  padding-inline-start: 0px;
+  padding-inline-end: 4px;
+}
+
+treechildren::-moz-tree-image(junkStatusCol, junk) {
+  list-style-image: url("chrome://messenger/skin/icons/junkcol.png");
+}
+
+treechildren::-moz-tree-image(junkStatusCol, notjunk) {
+  list-style-image: url("chrome://messenger/skin/icons/dot.png");
+  padding-inline-start: 0px;
+  padding-inline-end: 4px;
+}
+
+/* ..... subject column, tab and menuitem icons ..... */
+
+.icon-holder[type="message"],
+treechildren::-moz-tree-image(subjectCol) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail.png");
+}
+
+treechildren::-moz-tree-image(subjectCol) {
+  margin-inline-end: 2px;
+}
+
+treechildren::-moz-tree-image(subjectCol, new) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-new.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, forwarded) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-fwd.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, replied) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-reply.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, forwarded, replied) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-fwd-reply.png");
+}
+
+.icon-holder[type="message"][Attachment="true"],
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, attach) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-attach.png");
+}
+
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, attach, forwarded) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-attach-fwd.png");
+}
+
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, attach, replied) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-attach-reply.png");
+}
+
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, attach, forwarded, replied) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-attach-fwd-reply.png");
+}
+
+.icon-holder[type="message"][IMAPDeleted="true"],
+treechildren::-moz-tree-image(subjectCol, imapdeleted) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-imapdelete.png");
+}
+
+.icon-holder[type="message"][Offline="true"],
+treechildren::-moz-tree-image(subjectCol, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-offl.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, new, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-new-offl.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, forwarded, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-fwd-offl.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, offline, replied) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-offl-reply.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, forwarded, offline, replied) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-fwd-offl-reply.png");
+}
+
+.icon-holder[type="message"][Attachment="true"][Offline="true"],
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, attach, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-attach-offl.png");
+}
+
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, attach, forwarded, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-attach-fwd-offl.png");
+}
+
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, attach, offline, replied) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-attach-offl-reply.png");
+}
+
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, attach, forwarded, offline, replied) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-attach-fwd-offl-reply.png");
+}
+
+.icon-holder[type="message"][IMAPDeleted="true"][Offline="true"],
+treechildren::-moz-tree-image(subjectCol, imapdeleted, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-delete-offl.png");
+}
+
+.icon-holder[type="message"][MessageType="rss"],
+.icon-holder[type="message"][MessageType="nntp"],
+treechildren::-moz-tree-image(subjectCol, rss),
+treechildren::-moz-tree-image(subjectCol, news) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, rss, ignoreSubthread),
+treechildren::-moz-tree-image(subjectCol, news, ignoreSubthread) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-kill.png");
+}
+
+.icon-holder[type="message"][MessageType="rss"][Attachment="true"],
+.icon-holder[type="message"][MessageType="nntp"][Attachment="true"],
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, rss, attach),
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, attach) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-attach.png");
+}
+
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, rss, attach, ignoreSubthread),
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, attach, ignoreSubthread) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-attach-kill.png");
+}
+
+.icon-holder[type="message"][MessageType="rss"][Attachment="true"][Offline="true"],
+.icon-holder[type="message"][MessageType="nntp"][Attachment="true"][Offline="true"],
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, rss, attach, offline),
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, attach, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-attach-offl.png");
+}
+
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, rss, attach, offline, ignoreSubthread),
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, attach, offline, ignoreSubthread) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-attach-kill-offl.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, rss, new),
+treechildren::-moz-tree-image(subjectCol, news, new) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-new.png");
+}
+
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, new, attach) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-new-attach.png");
+}
+
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, new, attach, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-new-attach-off.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, news, new, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-new-offl.png");
+}
+
+.icon-holder[type="message"][MessageType="rss"][Offline="true"],
+.icon-holder[type="message"][MessageType="nntp"][Offline="true"],
+treechildren::-moz-tree-image(subjectCol, rss, offline),
+treechildren::-moz-tree-image(subjectCol, news, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-offl.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, rss, offline, ignoreSubthread),
+treechildren::-moz-tree-image(subjectCol, news, offline, ignoreSubthread) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-kill-offl.png");
+}
+
+/* ..... new thread icons for watch and ignore ..... */
+
+treechildren::-moz-tree-image(news, threadCol, watch) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-closed-eye.png");
+}
+
+treechildren::-moz-tree-image(news, threadCol, ignore) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-closed-kill.png");
+}
+
+treechildren::-moz-tree-image(news, threadCol, watch, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-closed-offl-eye.png");
+}
+
+treechildren::-moz-tree-image(news, threadCol, ignore, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-closed-offl-kill.png");
+}
+
+treechildren::-moz-tree-image(news, threadCol, container, hasUnread, watch) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-new-closed-eye.png");
+}
+
+treechildren::-moz-tree-image(news, threadCol, container, hasUnread, ignore) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-new-closed-kill.png");
+}
+
+treechildren::-moz-tree-image(news, threadCol, container, hasUnread, watch, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-new-closed-offl-eye.png");
+}
+
+treechildren::-moz-tree-image(news, threadCol, container, hasUnread, ignore, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-new-closed-offl-kill.png");
+}
+
+#sizeCol,
+#unreadCol,
+#totalCol {
+  text-align: right;
+}
diff --git a/comm/suite/themes/classic/messenger/threadPaneExtras.css b/comm/suite/themes/classic/messenger/threadPaneExtras.css
new file mode 100644
index 0000000000..7ac07445a1
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/threadPaneExtras.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/. */
+
+/* distributors / ISPs can override this to override thread pane icons.
+ * see http://www.mozilla.org/mailnews/arch/threadpaneextras.html
+ */
diff --git a/comm/suite/themes/classic/messenger/threadPaneLabels.css b/comm/suite/themes/classic/messenger/threadPaneLabels.css
new file mode 100644
index 0000000000..21060b4a2c
--- /dev/null
+++ b/comm/suite/themes/classic/messenger/threadPaneLabels.css
@@ -0,0 +1,527 @@
+/* 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/. */
+
+/* ===== threadPaneLabels.css ===========================================
+   == Styles for the thread pane in the Messenger 3-pane window.
+   ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: thread labels decoration ::::: */
+
+/* There are 10x7 color definitions (size of the color picker used)
+   times 2 (2 style definitions for each color) +  2 general black
+   and white color definitions.
+   The color definitions can be in the following formats:
+     color: red;
+     color: #FF0000;
+     color: rgb(128, 0, 0);
+*/
+treechildren::-moz-tree-cell-text(lc-FFFFFF), .lc-FFFFFF:not([_moz-menuactive]) {
+  color: #FFFFFF
+}
+treechildren::-moz-tree-row(lc-FFFFFF, selected, focus), .lc-FFFFFF[_moz-menuactive] {
+  background-color: #FFFFFF;
+}
+
+treechildren::-moz-tree-cell-text(lc-CCCCCC), .lc-CCCCCC:not([_moz-menuactive]) {
+  color: #CCCCCC
+}
+treechildren::-moz-tree-row(lc-CCCCCC, selected, focus), .lc-CCCCCC[_moz-menuactive] {
+  background-color: #CCCCCC;
+}
+
+treechildren::-moz-tree-cell-text(lc-C0C0C0), .lc-C0C0C0:not([_moz-menuactive]) {
+  color: #C0C0C0
+}
+treechildren::-moz-tree-row(lc-C0C0C0, selected, focus), .lc-C0C0C0[_moz-menuactive] {
+  background-color: #C0C0C0;
+}
+
+treechildren::-moz-tree-cell-text(lc-999999), .lc-999999:not([_moz-menuactive]) {
+  color: #999999
+}
+treechildren::-moz-tree-row(lc-999999, selected, focus), .lc-999999[_moz-menuactive] {
+  background-color: #999999;
+}
+
+treechildren::-moz-tree-cell-text(lc-666666), .lc-666666:not([_moz-menuactive]) {
+  color: #666666
+}
+treechildren::-moz-tree-row(lc-666666, selected, focus), .lc-666666[_moz-menuactive] {
+  background-color: #666666;
+}
+
+treechildren::-moz-tree-cell-text(lc-333333), .lc-333333:not([_moz-menuactive]) {
+  color: #333333
+}
+treechildren::-moz-tree-row(lc-333333, selected, focus), .lc-333333[_moz-menuactive] {
+  background-color: #333333;
+}
+
+treechildren::-moz-tree-cell-text(lc-000000), .lc-000000:not([_moz-menuactive]) {
+  color: #000000
+}
+treechildren::-moz-tree-row(lc-000000, selected, focus), .lc-000000[_moz-menuactive] {
+  background-color: #000000;
+}
+
+
+treechildren::-moz-tree-cell-text(lc-FFCCCC), .lc-FFCCCC:not([_moz-menuactive]) {
+  color: #FFCCCC
+}
+treechildren::-moz-tree-row(lc-FFCCCC, selected, focus), .lc-FFCCCC[_moz-menuactive] {
+  background-color: #FFCCCC;
+}
+
+treechildren::-moz-tree-cell-text(lc-FF6666), .lc-FF6666:not([_moz-menuactive]) {
+  color: #FF6666
+}
+treechildren::-moz-tree-row(lc-FF6666, selected, focus), .lc-FF6666[_moz-menuactive] {
+  background-color: #FF6666;
+}
+
+treechildren::-moz-tree-cell-text(lc-FF0000), .lc-FF0000:not([_moz-menuactive]) {
+  color: #FF0000
+}
+treechildren::-moz-tree-row(lc-FF0000, selected, focus), .lc-FF0000[_moz-menuactive] {
+  background-color: #FF0000;
+}
+
+treechildren::-moz-tree-cell-text(lc-CC0000), .lc-CC0000:not([_moz-menuactive]) {
+  color: #CC0000
+}
+treechildren::-moz-tree-row(lc-CC0000, selected, focus), .lc-CC0000[_moz-menuactive] {
+  background-color: #CC0000;
+}
+
+treechildren::-moz-tree-cell-text(lc-990000), .lc-990000:not([_moz-menuactive]) {
+  color: #990000
+}
+treechildren::-moz-tree-row(lc-990000, selected, focus), .lc-990000[_moz-menuactive] {
+  background-color: #990000;
+}
+
+treechildren::-moz-tree-cell-text(lc-660000), .lc-660000:not([_moz-menuactive]) {
+  color: #660000
+}
+treechildren::-moz-tree-row(lc-660000, selected, focus), .lc-660000[_moz-menuactive] {
+  background-color: #660000;
+}
+
+treechildren::-moz-tree-cell-text(lc-330000), .lc-330000:not([_moz-menuactive]) {
+  color: #330000
+}
+treechildren::-moz-tree-row(lc-330000, selected, focus), .lc-330000[_moz-menuactive] {
+  background-color: #330000;
+}
+
+
+treechildren::-moz-tree-cell-text(lc-FFCC99), .lc-FFCC99:not([_moz-menuactive]) {
+  color: #FFCC99
+}
+treechildren::-moz-tree-row(lc-FFCC99, selected, focus), .lc-FFCC99[_moz-menuactive] {
+  background-color: #FFCC99;
+}
+
+treechildren::-moz-tree-cell-text(lc-FF9966), .lc-FF9966:not([_moz-menuactive]) {
+  color: #FF9966
+}
+treechildren::-moz-tree-row(lc-FF9966, selected, focus), .lc-FF9966[_moz-menuactive] {
+  background-color: #FF9966;
+}
+
+treechildren::-moz-tree-cell-text(lc-FF9900), .lc-FF9900:not([_moz-menuactive]) {
+  color: #FF9900
+}
+treechildren::-moz-tree-row(lc-FF9900, selected, focus), .lc-FF9900[_moz-menuactive] {
+  background-color: #FF9900;
+}
+
+treechildren::-moz-tree-cell-text(lc-FF6600), .lc-FF6600:not([_moz-menuactive]) {
+  color: #FF6600
+}
+treechildren::-moz-tree-row(lc-FF6600, selected, focus), .lc-FF6600[_moz-menuactive] {
+  background-color: #FF6600;
+}
+
+treechildren::-moz-tree-cell-text(lc-CC6600), .lc-CC6600:not([_moz-menuactive]) {
+  color: #CC6600
+}
+treechildren::-moz-tree-row(lc-CC6600, selected, focus), .lc-CC6600[_moz-menuactive] {
+  background-color: #CC6600;
+}
+
+treechildren::-moz-tree-cell-text(lc-993300), .lc-993300:not([_moz-menuactive]) {
+  color: #993300
+}
+treechildren::-moz-tree-row(lc-993300, selected, focus), .lc-993300[_moz-menuactive] {
+  background-color: #993300;
+}
+
+treechildren::-moz-tree-cell-text(lc-663300), .lc-663300:not([_moz-menuactive]) {
+  color: #663300
+}
+treechildren::-moz-tree-row(lc-663300, selected, focus), .lc-663300[_moz-menuactive] {
+  background-color: #663300;
+}
+
+
+treechildren::-moz-tree-cell-text(lc-FFFF99), .lc-FFFF99:not([_moz-menuactive]) {
+  color: #FFFF99
+}
+treechildren::-moz-tree-row(lc-FFFF99, selected, focus), .lc-FFFF99[_moz-menuactive] {
+  background-color: #FFFF99;
+}
+
+treechildren::-moz-tree-cell-text(lc-FFFF66), .lc-FFFF66:not([_moz-menuactive]) {
+  color: #FFFF66
+}
+treechildren::-moz-tree-row(lc-FFFF66, selected, focus), .lc-FFFF66[_moz-menuactive] {
+  background-color: #FFFF66;
+}
+
+treechildren::-moz-tree-cell-text(lc-FFCC66), .lc-FFCC66:not([_moz-menuactive]) {
+  color: #FFCC66
+}
+treechildren::-moz-tree-row(lc-FFCC66, selected, focus), .lc-FFCC66[_moz-menuactive] {
+  background-color: #FFCC66;
+}
+
+treechildren::-moz-tree-cell-text(lc-FFCC33), .lc-FFCC33:not([_moz-menuactive]) {
+  color: #FFCC33
+}
+treechildren::-moz-tree-row(lc-FFCC33, selected, focus), .lc-FFCC33[_moz-menuactive] {
+  background-color: #FFCC33;
+}
+
+treechildren::-moz-tree-cell-text(lc-CC9933), .lc-CC9933:not([_moz-menuactive]) {
+  color: #CC9933
+}
+treechildren::-moz-tree-row(lc-CC9933, selected, focus), .lc-CC9933[_moz-menuactive] {
+  background-color: #CC9933;
+}
+
+treechildren::-moz-tree-cell-text(lc-996633), .lc-996633:not([_moz-menuactive]) {
+  color: #996633
+}
+treechildren::-moz-tree-row(lc-996633, selected, focus), .lc-996633[_moz-menuactive] {
+  background-color: #996633;
+}
+
+treechildren::-moz-tree-cell-text(lc-663333), .lc-663333:not([_moz-menuactive]) {
+  color: #663333
+}
+treechildren::-moz-tree-row(lc-663333, selected, focus), .lc-663333[_moz-menuactive] {
+  background-color: #663333;
+}
+
+
+treechildren::-moz-tree-cell-text(lc-FFFFCC), .lc-FFFFCC:not([_moz-menuactive]) {
+  color: #FFFFCC
+}
+treechildren::-moz-tree-row(lc-FFFFCC, selected, focus), .lc-FFFFCC[_moz-menuactive] {
+  background-color: #FFFFCC;
+}
+
+treechildren::-moz-tree-cell-text(lc-FFFF33), .lc-FFFF33:not([_moz-menuactive]) {
+  color: #FFFF33
+}
+treechildren::-moz-tree-row(lc-FFFF33, selected, focus), .lc-FFFF33[_moz-menuactive] {
+  background-color: #FFFF33;
+}
+
+treechildren::-moz-tree-cell-text(lc-FFFF00), .lc-FFFF00:not([_moz-menuactive]) {
+  color: #FFFF00
+}
+treechildren::-moz-tree-row(lc-FFFF00, selected, focus), .lc-FFFF00[_moz-menuactive] {
+  background-color: #FFFF00;
+}
+
+treechildren::-moz-tree-cell-text(lc-FFCC00), .lc-FFCC00:not([_moz-menuactive]) {
+  color: #FFCC00
+}
+treechildren::-moz-tree-row(lc-FFCC00, selected, focus), .lc-FFCC00[_moz-menuactive] {
+  background-color: #FFCC00;
+}
+
+treechildren::-moz-tree-cell-text(lc-999900), .lc-999900:not([_moz-menuactive]) {
+  color: #999900
+}
+treechildren::-moz-tree-row(lc-999900, selected, focus), .lc-999900[_moz-menuactive] {
+  background-color: #999900;
+}
+
+treechildren::-moz-tree-cell-text(lc-666600), .lc-666600:not([_moz-menuactive]) {
+  color: #666600
+}
+treechildren::-moz-tree-row(lc-666600, selected, focus), .lc-666600[_moz-menuactive] {
+  background-color: #666600;
+}
+
+treechildren::-moz-tree-cell-text(lc-333300), .lc-333300:not([_moz-menuactive]) {
+  color: #333300
+}
+treechildren::-moz-tree-row(lc-333300, selected, focus), .lc-333300[_moz-menuactive] {
+  background-color: #333300;
+}
+
+
+treechildren::-moz-tree-cell-text(lc-99FF99), .lc-99FF99:not([_moz-menuactive]) {
+  color: #99FF99
+}
+treechildren::-moz-tree-row(lc-99FF99, selected, focus), .lc-99FF99[_moz-menuactive] {
+  background-color: #99FF99;
+}
+
+treechildren::-moz-tree-cell-text(lc-66FF99), .lc-66FF99:not([_moz-menuactive]) {
+  color: #66FF99
+}
+treechildren::-moz-tree-row(lc-66FF99, selected, focus), .lc-66FF99[_moz-menuactive] {
+  background-color: #66FF99;
+}
+
+treechildren::-moz-tree-cell-text(lc-33FF33), .lc-33FF33:not([_moz-menuactive]) {
+  color: #33FF33
+}
+treechildren::-moz-tree-row(lc-33FF33, selected, focus), .lc-33FF33[_moz-menuactive] {
+  background-color: #33FF33;
+}
+
+treechildren::-moz-tree-cell-text(lc-33CC00), .lc-33CC00:not([_moz-menuactive]) {
+  color: #33CC00
+}
+treechildren::-moz-tree-row(lc-33CC00, selected, focus), .lc-33CC00[_moz-menuactive] {
+  background-color: #33CC00;
+}
+
+treechildren::-moz-tree-cell-text(lc-009900), .lc-009900:not([_moz-menuactive]) {
+  color: #009900
+}
+treechildren::-moz-tree-row(lc-009900, selected, focus), .lc-009900[_moz-menuactive] {
+  background-color: #009900;
+}
+
+treechildren::-moz-tree-cell-text(lc-006600), .lc-006600:not([_moz-menuactive]) {
+  color: #006600
+}
+treechildren::-moz-tree-row(lc-006600, selected, focus), .lc-006600[_moz-menuactive] {
+  background-color: #006600;
+}
+
+treechildren::-moz-tree-cell-text(lc-003300), .lc-003300:not([_moz-menuactive]) {
+  color: #003300
+}
+treechildren::-moz-tree-row(lc-003300, selected, focus), .lc-003300[_moz-menuactive] {
+  background-color: #003300;
+}
+
+
+treechildren::-moz-tree-cell-text(lc-99FFFF), .lc-99FFFF:not([_moz-menuactive]) {
+  color: #99FFFF
+}
+treechildren::-moz-tree-row(lc-99FFFF, selected, focus), .lc-99FFFF[_moz-menuactive] {
+  background-color: #99FFFF;
+}
+
+treechildren::-moz-tree-cell-text(lc-33FFFF), .lc-33FFFF:not([_moz-menuactive]) {
+  color: #33FFFF
+}
+treechildren::-moz-tree-row(lc-33FFFF, selected, focus), .lc-33FFFF[_moz-menuactive] {
+  background-color: #33FFFF;
+}
+
+treechildren::-moz-tree-cell-text(lc-66CCCC), .lc-66CCCC:not([_moz-menuactive]) {
+  color: #66CCCC
+}
+treechildren::-moz-tree-row(lc-66CCCC, selected, focus), .lc-66CCCC[_moz-menuactive] {
+  background-color: #66CCCC;
+}
+
+treechildren::-moz-tree-cell-text(lc-00CCCC), .lc-00CCCC:not([_moz-menuactive]) {
+  color: #00CCCC
+}
+treechildren::-moz-tree-row(lc-00CCCC, selected, focus), .lc-00CCCC[_moz-menuactive] {
+  background-color: #00CCCC;
+}
+
+treechildren::-moz-tree-cell-text(lc-339999), .lc-339999:not([_moz-menuactive]) {
+  color: #339999
+}
+treechildren::-moz-tree-row(lc-339999, selected, focus), .lc-339999[_moz-menuactive] {
+  background-color: #339999;
+}
+
+treechildren::-moz-tree-cell-text(lc-336666), .lc-336666:not([_moz-menuactive]) {
+  color: #336666
+}
+treechildren::-moz-tree-row(lc-336666, selected, focus), .lc-336666[_moz-menuactive] {
+  background-color: #336666;
+}
+
+treechildren::-moz-tree-cell-text(lc-003333), .lc-003333:not([_moz-menuactive]) {
+  color: #003333
+}
+treechildren::-moz-tree-row(lc-003333, selected, focus), .lc-003333[_moz-menuactive] {
+  background-color: #003333;
+}
+
+
+treechildren::-moz-tree-cell-text(lc-CCFFFF), .lc-CCFFFF:not([_moz-menuactive]) {
+  color: #CCFFFF
+}
+treechildren::-moz-tree-row(lc-CCFFFF, selected, focus), .lc-CCFFFF[_moz-menuactive] {
+  background-color: #CCFFFF;
+}
+
+treechildren::-moz-tree-cell-text(lc-66FFFF), .lc-66FFFF:not([_moz-menuactive]) {
+  color: #66FFFF
+}
+treechildren::-moz-tree-row(lc-66FFFF, selected, focus), .lc-66FFFF[_moz-menuactive] {
+  background-color: #66FFFF;
+}
+
+treechildren::-moz-tree-cell-text(lc-33CCFF), .lc-33CCFF:not([_moz-menuactive]) {
+  color: #33CCFF
+}
+treechildren::-moz-tree-row(lc-33CCFF, selected, focus), .lc-33CCFF[_moz-menuactive] {
+  background-color: #33CCFF;
+}
+
+treechildren::-moz-tree-cell-text(lc-3366FF), .lc-3366FF:not([_moz-menuactive]) {
+  color: #3366FF
+}
+treechildren::-moz-tree-row(lc-3366FF, selected, focus), .lc-3366FF[_moz-menuactive] {
+  background-color: #3366FF;
+}
+
+treechildren::-moz-tree-cell-text(lc-3333FF), .lc-3333FF:not([_moz-menuactive]) {
+  color: #3333FF
+}
+treechildren::-moz-tree-row(lc-3333FF, selected, focus), .lc-3333FF[_moz-menuactive] {
+  background-color: #3333FF;
+}
+
+treechildren::-moz-tree-cell-text(lc-000099), .lc-000099:not([_moz-menuactive]) {
+  color: #000099
+}
+treechildren::-moz-tree-row(lc-000099, selected, focus), .lc-000099[_moz-menuactive] {
+  background-color: #000099;
+}
+
+treechildren::-moz-tree-cell-text(lc-000066), .lc-000066:not([_moz-menuactive]) {
+  color: #000066
+}
+treechildren::-moz-tree-row(lc-000066, selected, focus), .lc-000066[_moz-menuactive] {
+  background-color: #000066;
+}
+
+
+treechildren::-moz-tree-cell-text(lc-CCCCFF), .lc-CCCCFF:not([_moz-menuactive]) {
+  color: #CCCCFF
+}
+treechildren::-moz-tree-row(lc-CCCCFF, selected, focus), .lc-CCCCFF[_moz-menuactive] {
+  background-color: #CCCCFF;
+}
+
+treechildren::-moz-tree-cell-text(lc-9999FF), .lc-9999FF:not([_moz-menuactive]) {
+  color: #9999FF
+}
+treechildren::-moz-tree-row(lc-9999FF, selected, focus), .lc-9999FF[_moz-menuactive] {
+  background-color: #9999FF;
+}
+
+treechildren::-moz-tree-cell-text(lc-6666CC), .lc-6666CC:not([_moz-menuactive]) {
+  color: #6666CC
+}
+treechildren::-moz-tree-row(lc-6666CC, selected, focus), .lc-6666CC[_moz-menuactive] {
+  background-color: #6666CC;
+}
+
+treechildren::-moz-tree-cell-text(lc-6633FF), .lc-6633FF:not([_moz-menuactive]) {
+  color: #6633FF
+}
+treechildren::-moz-tree-row(lc-6633FF, selected, focus), .lc-6633FF[_moz-menuactive] {
+  background-color: #6633FF;
+}
+
+treechildren::-moz-tree-cell-text(lc-6600CC), .lc-6600CC:not([_moz-menuactive]) {
+  color: #6600CC
+}
+treechildren::-moz-tree-row(lc-6600CC, selected, focus), .lc-6600CC[_moz-menuactive] {
+  background-color: #6600CC;
+}
+
+treechildren::-moz-tree-cell-text(lc-333399), .lc-333399:not([_moz-menuactive]) {
+  color: #333399
+}
+treechildren::-moz-tree-row(lc-333399, selected, focus), .lc-333399[_moz-menuactive] {
+  background-color: #333399;
+}
+
+treechildren::-moz-tree-cell-text(lc-330099), .lc-330099:not([_moz-menuactive]) {
+  color: #330099
+}
+treechildren::-moz-tree-row(lc-330099, selected, focus), .lc-330099[_moz-menuactive] {
+  background-color: #330099;
+}
+
+
+treechildren::-moz-tree-cell-text(lc-FFCCFF), .lc-FFCCFF:not([_moz-menuactive]) {
+  color: #FFCCFF
+}
+treechildren::-moz-tree-row(lc-FFCCFF, selected, focus), .lc-FFCCFF[_moz-menuactive] {
+  background-color: #FFCCFF;
+}
+
+treechildren::-moz-tree-cell-text(lc-FF99FF), .lc-FF99FF:not([_moz-menuactive]) {
+  color: #FF99FF
+}
+treechildren::-moz-tree-row(lc-FF99FF, selected, focus), .lc-FF99FF[_moz-menuactive] {
+  background-color: #FF99FF;
+}
+
+treechildren::-moz-tree-cell-text(lc-CC66CC), .lc-CC66CC:not([_moz-menuactive]) {
+  color: #CC66CC
+}
+treechildren::-moz-tree-row(lc-CC66CC, selected, focus), .lc-CC66CC[_moz-menuactive] {
+  background-color: #CC66CC;
+}
+
+treechildren::-moz-tree-cell-text(lc-CC33CC), .lc-CC33CC:not([_moz-menuactive]) {
+  color: #CC33CC
+}
+treechildren::-moz-tree-row(lc-CC33CC, selected, focus), .lc-CC33CC[_moz-menuactive] {
+  background-color: #CC33CC;
+}
+
+treechildren::-moz-tree-cell-text(lc-993399), .lc-993399:not([_moz-menuactive]) {
+  color: #993399
+}
+treechildren::-moz-tree-row(lc-993399, selected, focus), .lc-993399[_moz-menuactive] {
+  background-color: #993399;
+}
+
+treechildren::-moz-tree-cell-text(lc-663366), .lc-663366:not([_moz-menuactive]) {
+  color: #663366
+}
+treechildren::-moz-tree-row(lc-663366, selected, focus), .lc-663366[_moz-menuactive] {
+  background-color: #663366;
+}
+
+treechildren::-moz-tree-cell-text(lc-330033), .lc-330033:not([_moz-menuactive]) {
+  color: #330033
+}
+treechildren::-moz-tree-row(lc-330033, selected, focus), .lc-330033[_moz-menuactive] {
+  background-color: #330033;
+}
+
+
+treechildren::-moz-tree-cell-text(lc-white, selected, focus) {
+  color: #FFFFFF
+}
+treechildren::-moz-tree-cell-text(lc-black, selected, focus) {
+  color: #000000
+}
+
diff --git a/comm/suite/themes/classic/moz.build b/comm/suite/themes/classic/moz.build
new file mode 100644
index 0000000000..e496b75494
--- /dev/null
+++ b/comm/suite/themes/classic/moz.build
@@ -0,0 +1,15 @@
+# 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"]
+
+classic_extension_dir = "{972ce4c6-7e08-4474-a285-3208198ce6fd}"
+
+DEFINES["SEAMONKEY_VERSION"] = CONFIG["SEAMONKEY_VERSION"]
+
+FINAL_TARGET_FILES.extensions[classic_extension_dir] += [
+    "icon.png",
+    "preview.png",
+]
diff --git a/comm/suite/themes/classic/navigator/btn1/feeds.png b/comm/suite/themes/classic/navigator/btn1/feeds.png
new file mode 100644
index 0000000000..788b2e6b6b
--- /dev/null
+++ b/comm/suite/themes/classic/navigator/btn1/feeds.png
diff --git a/comm/suite/themes/classic/navigator/btn1/first-disabled.png b/comm/suite/themes/classic/navigator/btn1/first-disabled.png
new file mode 100644
index 0000000000..d716342733
--- /dev/null
+++ b/comm/suite/themes/classic/navigator/btn1/first-disabled.png
diff --git a/comm/suite/themes/classic/navigator/btn1/first-hover.png b/comm/suite/themes/classic/navigator/btn1/first-hover.png
new file mode 100644
index 0000000000..67fc2075df
--- /dev/null
+++ b/comm/suite/themes/classic/navigator/btn1/first-hover.png
diff --git a/comm/suite/themes/classic/navigator/btn1/first.png b/comm/suite/themes/classic/navigator/btn1/first.png
new file mode 100644
index 0000000000..1f2f416913
--- /dev/null
+++ b/comm/suite/themes/classic/navigator/btn1/first.png
diff --git a/comm/suite/themes/classic/navigator/btn1/last-disabled.png b/comm/suite/themes/classic/navigator/btn1/last-disabled.png
new file mode 100644
index 0000000000..90fdddf0a8
--- /dev/null
+++ b/comm/suite/themes/classic/navigator/btn1/last-disabled.png
diff --git a/comm/suite/themes/classic/navigator/btn1/last-hover.png b/comm/suite/themes/classic/navigator/btn1/last-hover.png
new file mode 100644
index 0000000000..a43aef7f91
--- /dev/null
+++ b/comm/suite/themes/classic/navigator/btn1/last-hover.png
diff --git a/comm/suite/themes/classic/navigator/btn1/last.png b/comm/suite/themes/classic/navigator/btn1/last.png
new file mode 100644
index 0000000000..14db75045b
--- /dev/null
+++ b/comm/suite/themes/classic/navigator/btn1/last.png
diff --git a/comm/suite/themes/classic/navigator/btn1/next-disabled.png b/comm/suite/themes/classic/navigator/btn1/next-disabled.png
new file mode 100644
index 0000000000..cb15799eff
--- /dev/null
+++ b/comm/suite/themes/classic/navigator/btn1/next-disabled.png
diff --git a/comm/suite/themes/classic/navigator/btn1/next-hover.png b/comm/suite/themes/classic/navigator/btn1/next-hover.png
new file mode 100644
index 0000000000..700ffdc5e9
--- /dev/null
+++ b/comm/suite/themes/classic/navigator/btn1/next-hover.png
diff --git a/comm/suite/themes/classic/navigator/btn1/next.png b/comm/suite/themes/classic/navigator/btn1/next.png
new file mode 100644
index 0000000000..f54b1245f2
--- /dev/null
+++ b/comm/suite/themes/classic/navigator/btn1/next.png
diff --git a/comm/suite/themes/classic/navigator/btn1/previous-disabled.png b/comm/suite/themes/classic/navigator/btn1/previous-disabled.png
new file mode 100644
index 0000000000..94b1850f72
--- /dev/null
+++ b/comm/suite/themes/classic/navigator/btn1/previous-disabled.png
diff --git a/comm/suite/themes/classic/navigator/btn1/previous-hover.png b/comm/suite/themes/classic/navigator/btn1/previous-hover.png
new file mode 100644
index 0000000000..cb62ab48fd
--- /dev/null
+++ b/comm/suite/themes/classic/navigator/btn1/previous-hover.png
diff --git a/comm/suite/themes/classic/navigator/btn1/previous.png b/comm/suite/themes/classic/navigator/btn1/previous.png
new file mode 100644
index 0000000000..3eef01aea5
--- /dev/null
+++ b/comm/suite/themes/classic/navigator/btn1/previous.png
diff --git a/comm/suite/themes/classic/navigator/btn1/top-disabled.png b/comm/suite/themes/classic/navigator/btn1/top-disabled.png
new file mode 100644
index 0000000000..e3811da465
--- /dev/null
+++ b/comm/suite/themes/classic/navigator/btn1/top-disabled.png
diff --git a/comm/suite/themes/classic/navigator/btn1/top-hover.png b/comm/suite/themes/classic/navigator/btn1/top-hover.png
new file mode 100644
index 0000000000..7146014aed
--- /dev/null
+++ b/comm/suite/themes/classic/navigator/btn1/top-hover.png
diff --git a/comm/suite/themes/classic/navigator/btn1/top.png b/comm/suite/themes/classic/navigator/btn1/top.png
new file mode 100644
index 0000000000..c95acea0eb
--- /dev/null
+++ b/comm/suite/themes/classic/navigator/btn1/top.png
diff --git a/comm/suite/themes/classic/navigator/btn1/up-disabled.png b/comm/suite/themes/classic/navigator/btn1/up-disabled.png
new file mode 100644
index 0000000000..5f19075989
--- /dev/null
+++ b/comm/suite/themes/classic/navigator/btn1/up-disabled.png
diff --git a/comm/suite/themes/classic/navigator/btn1/up-hover.png b/comm/suite/themes/classic/navigator/btn1/up-hover.png
new file mode 100644
index 0000000000..38c075faf9
--- /dev/null
+++ b/comm/suite/themes/classic/navigator/btn1/up-hover.png
diff --git a/comm/suite/themes/classic/navigator/btn1/up.png b/comm/suite/themes/classic/navigator/btn1/up.png
new file mode 100644
index 0000000000..9ec230b04e
--- /dev/null
+++ b/comm/suite/themes/classic/navigator/btn1/up.png
diff --git a/comm/suite/themes/classic/navigator/icons/chevron.png b/comm/suite/themes/classic/navigator/icons/chevron.png
new file mode 100644
index 0000000000..d556c62a53
--- /dev/null
+++ b/comm/suite/themes/classic/navigator/icons/chevron.png
diff --git a/comm/suite/themes/classic/navigator/icons/close.png b/comm/suite/themes/classic/navigator/icons/close.png
new file mode 100644
index 0000000000..e74c7bd42a
--- /dev/null
+++ b/comm/suite/themes/classic/navigator/icons/close.png
diff --git a/comm/suite/themes/classic/navigator/icons/identity.png b/comm/suite/themes/classic/navigator/icons/identity.png
new file mode 100644
index 0000000000..35b376f30d
--- /dev/null
+++ b/comm/suite/themes/classic/navigator/icons/identity.png
diff --git a/comm/suite/themes/classic/navigator/icons/minimize.png b/comm/suite/themes/classic/navigator/icons/minimize.png
new file mode 100644
index 0000000000..4eeeccf3bf
--- /dev/null
+++ b/comm/suite/themes/classic/navigator/icons/minimize.png
diff --git a/comm/suite/themes/classic/navigator/icons/navigatoricons-small.png b/comm/suite/themes/classic/navigator/icons/navigatoricons-small.png
new file mode 100644
index 0000000000..b1716e089c
--- /dev/null
+++ b/comm/suite/themes/classic/navigator/icons/navigatoricons-small.png
diff --git a/comm/suite/themes/classic/navigator/icons/navigatoricons.png b/comm/suite/themes/classic/navigator/icons/navigatoricons.png
new file mode 100644
index 0000000000..a05bb5ee9b
--- /dev/null
+++ b/comm/suite/themes/classic/navigator/icons/navigatoricons.png
diff --git a/comm/suite/themes/classic/navigator/icons/popup-blocked.png b/comm/suite/themes/classic/navigator/icons/popup-blocked.png
new file mode 100644
index 0000000000..3606ab49c8
--- /dev/null
+++ b/comm/suite/themes/classic/navigator/icons/popup-blocked.png
diff --git a/comm/suite/themes/classic/navigator/icons/restore.png b/comm/suite/themes/classic/navigator/icons/restore.png
new file mode 100644
index 0000000000..9064e3934d
--- /dev/null
+++ b/comm/suite/themes/classic/navigator/icons/restore.png
diff --git a/comm/suite/themes/classic/navigator/icons/tab-arrow-left.png b/comm/suite/themes/classic/navigator/icons/tab-arrow-left.png
new file mode 100644
index 0000000000..6769c66e7d
--- /dev/null
+++ b/comm/suite/themes/classic/navigator/icons/tab-arrow-left.png
diff --git a/comm/suite/themes/classic/navigator/icons/tab-arrow-right.png b/comm/suite/themes/classic/navigator/icons/tab-arrow-right.png
new file mode 100644
index 0000000000..a0c47f1a14
--- /dev/null
+++ b/comm/suite/themes/classic/navigator/icons/tab-arrow-right.png
diff --git a/comm/suite/themes/classic/navigator/icons/tab-drag-indicator.png b/comm/suite/themes/classic/navigator/icons/tab-drag-indicator.png
new file mode 100644
index 0000000000..60a3a21b2f
--- /dev/null
+++ b/comm/suite/themes/classic/navigator/icons/tab-drag-indicator.png
diff --git a/comm/suite/themes/classic/navigator/icons/tab-new.png b/comm/suite/themes/classic/navigator/icons/tab-new.png
new file mode 100644
index 0000000000..c87613aa3c
--- /dev/null
+++ b/comm/suite/themes/classic/navigator/icons/tab-new.png
diff --git a/comm/suite/themes/classic/navigator/linkToolbar.css b/comm/suite/themes/classic/navigator/linkToolbar.css
new file mode 100644
index 0000000000..6944743a34
--- /dev/null
+++ b/comm/suite/themes/classic/navigator/linkToolbar.css
@@ -0,0 +1,125 @@
+/* -*- Mode: C; c-basic-offset: 2 -*- */
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/**
+ * Link toolbar items
+ **/
+
+#link-top
+{
+  list-style-image    : url("chrome://navigator/skin/btn1/top.png");
+}
+
+#link-top[disabled="true"]
+{
+  list-style-image    : url("chrome://navigator/skin/btn1/top-disabled.png") !important;
+}
+
+#link-top:hover,
+#link-top:hover:active
+{
+  list-style-image    : url("chrome://navigator/skin/btn1/top-hover.png");
+}
+
+#link-up
+{
+  list-style-image    : url("chrome://navigator/skin/btn1/up.png");
+}
+
+#link-up[disabled="true"]
+{
+  list-style-image    : url("chrome://navigator/skin/btn1/up-disabled.png") !important;
+}
+
+#link-up:hover,
+#link-up:hover:active
+{
+  list-style-image    : url("chrome://navigator/skin/btn1/up-hover.png");
+}
+
+#link-first
+{
+  list-style-image    : url("chrome://navigator/skin/btn1/first.png");
+}
+
+#link-first[disabled="true"]
+{
+  list-style-image    : url("chrome://navigator/skin/btn1/first-disabled.png") !important;
+}
+
+#link-first:hover,
+#link-first:hover:active
+{
+  list-style-image    : url("chrome://navigator/skin/btn1/first-hover.png");
+}
+
+#link-prev
+{
+  list-style-image    : url("chrome://navigator/skin/btn1/previous.png");
+}
+
+#link-prev[disabled="true"]
+{
+  list-style-image    : url("chrome://navigator/skin/btn1/previous-disabled.png") !important;
+}
+
+#link-prev:hover,
+#link-prev:hover:active
+{
+  list-style-image    : url("chrome://navigator/skin/btn1/previous-hover.png");
+}
+
+#link-next
+{
+  list-style-image    : url("chrome://navigator/skin/btn1/next.png");
+}
+
+#link-next[disabled="true"]
+{
+  list-style-image    : url("chrome://navigator/skin/btn1/next-disabled.png") !important;
+}
+
+#link-next:hover,
+#link-next:hover:active
+{
+  list-style-image    : url("chrome://navigator/skin/btn1/next-hover.png");
+}
+
+#link-last
+{
+  list-style-image    : url("chrome://navigator/skin/btn1/last.png");
+}
+
+#link-last[disabled="true"]
+{
+  list-style-image    : url("chrome://navigator/skin/btn1/last-disabled.png") !important;
+}
+
+#link-last:hover,
+#link-last:hover:active
+{
+  list-style-image    : url("chrome://navigator/skin/btn1/last-hover.png");
+}
+
+#link-feed {
+  list-style-image: url("chrome://navigator/skin/btn1/feeds.png") !important;
+  -moz-image-region: rect(0px 32px 16px 16px);
+}
+
+#link-feed:hover {
+  -moz-image-region: rect(16px 32px 32px 16px);
+}
+
+#link-feed[disabled="true"] {
+  -moz-image-region: rect(32px 32px 48px 16px);
+}
+
+#link-feed[open="true"] {
+  -moz-image-region: rect(48px 32px 64px 16px);
+}
diff --git a/comm/suite/themes/classic/navigator/navigator.css b/comm/suite/themes/classic/navigator/navigator.css
new file mode 100644
index 0000000000..8828c73bd4
--- /dev/null
+++ b/comm/suite/themes/classic/navigator/navigator.css
@@ -0,0 +1,745 @@
+/* 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://navigator/content/navigator.css");
+@import url("chrome://communicator/skin/");
+@import url("chrome://communicator/skin/places/bookmarksToolbar.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: primary toolbar buttons ::::: */
+
+#back-button {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
+  -moz-image-region: rect(60px 29px 89px 0);
+}
+
+#back-button:hover {
+  -moz-image-region: rect(60px 59px 89px 30px);
+}
+
+#back-button:hover:active {
+  -moz-image-region: rect(60px 89px 89px 60px);
+}
+
+#back-button[disabled="true"] {
+  -moz-image-region: rect(60px 119px 89px 90px) !important;
+}
+
+#forward-button {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
+  -moz-image-region: rect(90px 29px 119px 0);
+}
+
+#forward-button:hover {
+  -moz-image-region: rect(90px 59px 119px 30px);
+}
+
+#forward-button:hover:active {
+  -moz-image-region: rect(90px 89px 119px 60px);
+}
+
+#forward-button[disabled="true"] {
+  -moz-image-region: rect(90px 119px 119px 90px) !important;
+}
+
+#reload-button {
+  list-style-image: url("chrome://navigator/skin/icons/navigatoricons.png");
+  -moz-image-region: rect(0 29px 29px 0);
+}
+
+#reload-button:hover {
+  -moz-image-region: rect(0 59px 29px 30px);
+}
+
+#reload-button:hover:active {
+  -moz-image-region: rect(0 89px 29px 60px);
+}
+
+#reload-button[disabled="true"] {
+  -moz-image-region: rect(0 119px 29px 90px) !important;
+}
+
+#stop-button {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
+  -moz-image-region: rect(30px 29px 59px 0);
+}
+
+#stop-button:hover {
+  -moz-image-region: rect(30px 59px 59px 30px);
+}
+
+#stop-button:hover:active {
+  -moz-image-region: rect(30px 89px 59px 60px);
+}
+
+#stop-button[disabled="true"] {
+  -moz-image-region: rect(30px 119px 59px 90px) !important;
+}
+
+#home-button {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
+  -moz-image-region: rect(120px 29px 149px 0);
+}
+
+#home-button:hover {
+  -moz-image-region: rect(120px 59px 149px 30px);
+} 
+
+#home-button:hover:active {
+  -moz-image-region: rect(120px 89px 149px 60px);
+}
+
+#home-button[disabled="true"] {
+  -moz-image-region: rect(120px 119px 149px 90px) !important;
+}
+
+#sync-button {
+  list-style-image: url("chrome://communicator/skin/sync/sync-32.png");
+}
+
+#sync-button[status=active] {
+  list-style-image: url("chrome://communicator/skin/sync/sync-32-throbber.png");
+}
+
+/* ::::: small primary toolbar buttons ::::: */
+
+toolbar[iconsize="small"] > toolbarpaletteitem > #back-button,
+toolbar[iconsize="small"] > #back-button {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+  -moz-image-region: rect(40px 19px 59px 0);
+}
+
+toolbar[iconsize="small"] > #back-button:hover {
+  -moz-image-region: rect(40px 39px 59px 20px);
+}
+
+toolbar[iconsize="small"] > #back-button:hover:active {
+  -moz-image-region: rect(40px 59px 59px 40px);
+}
+
+toolbar[iconsize="small"] > #back-button[disabled="true"] {
+  -moz-image-region: rect(40px 79px 59px 60px) !important;
+}
+
+toolbar[iconsize="small"] > toolbarpaletteitem > #forward-button,
+toolbar[iconsize="small"] > #forward-button {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+  -moz-image-region: rect(60px 19px 79px 0);
+}
+
+toolbar[iconsize="small"] > #forward-button:hover {
+  -moz-image-region: rect(60px 39px 79px 20px);
+}
+
+toolbar[iconsize="small"] > #forward-button:hover:active {
+  -moz-image-region: rect(60px 59px 79px 40px);
+}
+
+toolbar[iconsize="small"] > #forward-button[disabled="true"] {
+  -moz-image-region: rect(60px 79px 79px 60px) !important;
+}
+
+toolbar[iconsize="small"] > toolbarpaletteitem > #reload-button,
+toolbar[iconsize="small"] > #reload-button {
+  list-style-image: url("chrome://navigator/skin/icons/navigatoricons-small.png");
+  -moz-image-region: rect(0 19px 19px 0);
+}
+
+toolbar[iconsize="small"] > #reload-button:hover {
+  -moz-image-region: rect(0 39px 19px 20px);
+}
+
+toolbar[iconsize="small"] > #reload-button:hover:active {
+  -moz-image-region: rect(0 59px 19px 40px);
+}
+
+toolbar[iconsize="small"] > #reload-button[disabled="true"] {
+  -moz-image-region: rect(0 79px 19px 60px) !important;
+}
+
+toolbar[iconsize="small"] > toolbarpaletteitem > #stop-button,
+toolbar[iconsize="small"] > #stop-button {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+  -moz-image-region: rect(20px 19px 39px 0);
+}
+
+toolbar[iconsize="small"] > #stop-button:hover {
+  -moz-image-region: rect(20px 39px 39px 20px);
+}
+
+toolbar[iconsize="small"] > #stop-button:hover:active {
+  -moz-image-region: rect(20px 59px 39px 40px);
+}
+
+toolbar[iconsize="small"] > #stop-button[disabled="true"] {
+  -moz-image-region: rect(20px 79px 39px 60px) !important;
+}
+
+toolbar[iconsize="small"] > toolbarpaletteitem > #home-button,
+toolbar[iconsize="small"] > #home-button {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+  -moz-image-region: rect(80px 19px 99px 0);
+}
+
+toolbar[iconsize="small"] > #home-button:hover {
+  -moz-image-region: rect(80px 39px 99px 20px);
+}
+
+toolbar[iconsize="small"] > #home-button:hover:active {
+  -moz-image-region: rect(80px 59px 99px 40px);
+}
+
+toolbar[iconsize="small"] > #home-button[disabled="true"] {
+  -moz-image-region: rect(80px 79px 99px 60px) !important;
+}
+
+toolbar[iconsize="small"] > toolbarpaletteitem > #sync-button,
+toolbar[iconsize="small"] > #sync-button {
+  list-style-image: url("chrome://communicator/skin/sync/sync-16.png");
+}
+
+toolbar[iconsize="small"] > toolbarpaletteitem > #sync-button[status=active],
+toolbar[iconsize="small"] > #sync-button[status=active] {
+  list-style-image: url("chrome://communicator/skin/sync/sync-16-throbber.png");
+}
+
+#FindToolbar {
+  border-top-color: ThreeDHighlight;
+  border-top-width: 1px;
+  border-bottom: 1px solid;
+  border-bottom-color: ThreeDShadow;
+  padding-top: 1px;
+  padding-bottom: 0px;
+}
+
+#FindToolbar:-moz-lwtheme {
+  border-top-color: transparent;
+  border-bottom-color: transparent;
+}
+
+/* ::::: fullscreen window controls ::::: */
+
+#window-controls {
+  -moz-box-align: center;
+  padding-top: 0px;
+  padding-bottom: 0px;
+  padding-inline-start: 4px;
+  padding-inline-end: 2px;
+  border-left: 1px solid;
+  border-left-color: ThreeDShadow;
+  background-color: -moz-Dialog;
+}
+
+toolbar[mode="text"] > #window-controls > toolbarbutton > .toolbarbutton-icon {
+  display: -moz-box;
+}
+
+#minimize-button {
+  list-style-image: url("chrome://navigator/skin/icons/minimize.png");
+} 
+
+#restore-button {
+  list-style-image: url("chrome://navigator/skin/icons/restore.png");
+} 
+
+#close-button {
+  list-style-image: url("chrome://navigator/skin/icons/close.png");
+} 
+  
+/* ::::: nav-bar-inner ::::: */
+  
+.nav-bar-class {
+  -moz-box-align: center;
+  min-width: 0px;
+}
+
+.urlbar-security-level[level="high"] {
+  background-color: #FFFFC7;
+  color: #000000;
+}
+
+@media (-moz-windows-theme: aero) {
+  #urlbar {
+    padding: 1px;
+  }
+}
+
+#wrapper-nav-bar-inner[place="palette"] > #nav-bar-inner
+  > .button-toolbar,
+#wrapper-nav-bar-inner[place="palette"] > #nav-bar-inner
+  > #urlbar > .urlbar-icons {
+  display: none;
+}
+
+#urlbar-search-splitter {
+  -moz-appearance: none;
+  min-width: 6px;
+  margin: 0 -3px;
+  border: none;
+  background-color: transparent;
+}
+
+/* ::::: notification popups ::::: */
+
+.popup-notification-icon {
+  width: 64px;
+  height: 64px;
+  margin-inline-end: 10px;
+}
+
+.popup-notification-icon[popupid="geolocation"] {
+  list-style-image: url("chrome://communicator/skin/icons/geolocation-64.png");
+}
+
+.popup-notification-icon[popupid="web-notifications"] {
+  list-style-image: url("chrome://communicator/skin/icons/notification-64.png");
+}
+
+.popup-notification-icon[popupid="addon-install-disabled"],
+.popup-notification-icon[popupid="addon-install-blocked"],
+.popup-notification-icon[popupid="addon-install-started"],
+.popup-notification-icon[popupid="addon-install-cancelled"],
+.popup-notification-icon[popupid="addon-install-failed"],
+.popup-notification-icon[popupid="addon-install-complete"],
+.popup-notification-icon[popupid="lwtheme-install-request"],
+.popup-notification-icon[popupid="lwtheme-install-notification"] {
+  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
+  width: 32px;
+  height: 32px;
+}
+
+.popup-notification-icon[popupid="indexedDB-permissions-prompt"],
+.popup-notification-icon[popupid="indexedDB-quota-prompt"] {
+  list-style-image: url("chrome://global/skin/icons/question-64.png");
+}
+
+.popup-notification-icon[popupid="password"] {
+  list-style-image: url("chrome://communicator/skin/icons/key-64.png");
+}
+
+.addon-progress-description {
+  width: 350px;
+  max-width: 350px;
+}
+
+/* Notification icon box */
+#notification-popup-box {
+  margin: 0 3px;
+}
+
+.notification-anchor-icon:-moz-focusring {
+  outline: 1px dotted -moz-DialogText;
+}
+
+#default-notification-icon {
+  list-style-image: url("chrome://global/skin/icons/information-16.png");
+  width: 16px;
+  height: 16px;
+}
+
+#geo-notification-icon {
+  list-style-image: url("chrome://communicator/skin/icons/geolocation-16.png");
+  width: 16px;
+  height: 16px;
+}
+
+#web-notifications-notification-icon {
+  list-style-image: url("chrome://communicator/skin/icons/notification-16.png");
+  width: 16px;
+  height: 16px;
+}
+
+#addons-notification-icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.png");
+  width: 16px;
+  height: 16px;
+}
+
+#indexedDB-notification-icon {
+  list-style-image: url("chrome://global/skin/icons/question-16.png");
+  width: 16px;
+  height: 16px;
+}
+
+#password-notification-icon {
+  list-style-image: url("chrome://communicator/skin/icons/key-16.png");
+  width: 16px;
+  height: 16px;
+}
+
+.center-item-box {
+  padding: 12px 16px 0px 16px;
+}
+
+.center-item-box[padbottom="true"] {
+  padding-bottom: 12px;
+}
+
+.center-item-icon {
+  background-image: url("chrome://mozapps/skin/plugins/pluginGeneric-16.png");
+  background-repeat: no-repeat;
+  height: 16px;
+  width: 16px;
+  margin-bottom: 4px;
+}
+
+.center-item-box[padbottom="true"][warn="true"] {
+  padding-bottom: 4px;
+}
+
+.center-item-box[showseparator="true"] {
+  border-top: 1px solid rgba(3, 14, 27, .1);
+}
+
+.center-item-box[warn="false"] > .center-item-warning {
+  display: none;
+}
+
+.center-item-warning > .text-link[href=""] {
+  display: none;
+}
+
+.center-item-warning-icon {
+  background-image: url("chrome://mozapps/skin/extensions/alerticon-info-negative.png");
+  background-repeat: no-repeat;
+  width: 16px;
+  height: 15px;
+  margin-bottom: 4px;
+}
+
+.center-item-warning-description {
+  color: #828282;
+}
+
+.center-item-button {
+  min-width: 0px;
+}
+
+/* ::::: page proxy icon ::::: */
+
+#page-proxy-deck,
+#page-proxy-favicon,
+#page-proxy-button {
+  width: 16px;
+  height: 16px;
+}
+
+#page-proxy-deck {
+  cursor: grab;
+  margin: 3px;
+}
+
+#page-proxy-button {
+  list-style-image: url("chrome://communicator/skin/places/bookmark-item.svg"); 
+}
+
+#page-proxy-favicon {
+  list-style-image: none;
+}
+
+#page-proxy-button[pageproxystate="invalid"] {
+  cursor: default;
+  list-style-image: url("chrome://communicator/skin/places/bookmark-item-dis.png");
+}
+
+/* ::::: autocomplete ::::: */
+
+#PopupAutoComplete > richlistbox > richlistitem {
+  height: 20px;
+  min-height: 20px;
+  border: 0;
+  border-radius: 0;
+  padding: 0px 1px 0px 1px;
+}
+
+#PopupAutoComplete > richlistbox > richlistitem > .ac-title {
+  font: icon;
+  margin-inline-start: 6px;
+}
+
+#PopupAutoComplete > richlistbox {
+  padding: 0;
+}
+
+.autocomplete-history-dropmarker {
+  min-width: 2em; /* Fix to show the menulist-dropmarker under newer GTK3 versions */
+  border-right-width: 1px;
+  border-bottom-width: 1px;
+  border-right-color: ThreeDShadow;
+  border-bottom-color: ThreeDShadow;
+}
+
+.autocomplete-treebody::-moz-tree-cell-text(value) {
+  padding-inline-start: 15px;
+}
+
+.autocomplete-search-box {
+  border-top: 2px groove -moz-Dialog;
+  background-color: -moz-Dialog;
+  color: ButtonText;
+}
+
+panel[nomatch="true"] > .autocomplete-search-box {
+  border-top: 1px solid ThreeDHighlight;
+}
+
+.autocomplete-search-engine {
+  padding: 2px;
+}
+
+.autocomplete-search-engine[menuactive="true"] {
+  background-color: Highlight;
+  color: HighlightText;
+}
+
+.autocomplete-search-engine-img {
+  margin-inline-end: 4px;
+  width: 16px;
+  height: 16px;
+}
+
+.autocomplete-treebody::-moz-tree-cell-text(treecolAutoCompleteComment) {
+  color: GrayText;
+}
+
+/* ::::: go and searchbuttons ::::: */
+
+#search-button, 
+#go-button {
+  margin-top: 0px;
+  margin-bottom: 0px;
+  margin-inline-start: 0px;
+  margin-inline-end: 4px;
+  min-height: 25px;
+  font: message-box;
+  font-weight: bold;
+}
+
+#go-button {
+  padding-inline-start: 2px;
+  padding-inline-end: 2px;
+}
+
+#search-button {
+  list-style-image: url("chrome://communicator/skin/icons/search.png");
+  -moz-image-region: rect(0 17px 17px 0);
+}
+
+#search-button:hover {
+  -moz-image-region: rect(0 35px 17px 18px);
+}
+
+#search-button:hover:active {
+  -moz-image-region: rect(0 53px 17px 36px);
+}
+
+#search-button > .button-box > .button-icon {
+  display: -moz-box;
+}
+
+toolbar[mode="text"] #search-button > .button-box > .button-icon,
+toolbar[mode="icons"] #search-button > .button-box > .button-text {
+  display: none;
+}
+
+/* ::::: sidebar splitter ::::: */
+
+#sidebar-splitter {
+  border-left: none;
+  border-right: none;
+  min-width: 5px;
+}
+
+/* ::::: content area ::::: */
+
+#status-bar {
+  border-top: none;
+  min-width: 1px;
+}
+
+#security-button[level="high"] > .statusbarpanel-contentbox {
+  background-color: #B4CD32;
+}
+
+#security-button[level="broken"] > .statusbarpanel-contentbox {
+  background-color: #E83404;
+}
+
+#security-button[label] > .statusbarpanel-contentbox {
+  background-color: #62C441;
+}
+
+#security-button > .statusbarpanel-contentbox > .statusbarpanel-text {
+  margin: 0px;
+  color: #FFFFFF;
+  text-shadow: none;
+}
+
+/* make same background-color translucent on lwthemes */
+#security-button[level="high"] > .statusbarpanel-contentbox:-moz-lwtheme {
+  background-color: rgba(232, 219, 153, .8);
+}
+
+#security-button[level="broken"] > .statusbarpanel-contentbox:-moz-lwtheme {
+  background-color: rgba(232, 52, 4, .8);
+}
+
+#security-button[label] > .statusbarpanel-contentbox:-moz-lwtheme {
+  background-color: rgba(98, 196, 65, .8);
+}
+
+#ev-button {
+  list-style-image: url("chrome://communicator/skin/icons/identity.png");
+}
+
+#popupIcon {
+  list-style-image: url("chrome://navigator/skin/icons/popup-blocked.png");
+}
+
+#invalid-form-popup {
+  -moz-appearance: tooltip;
+  border: 1px solid InfoText;
+  padding: 2px 3px 0px 3px;
+  max-width: 40em;
+  background-color: InfoBackground;
+  color: InfoText;
+  font: message-box;
+  font-weight: bold;
+}
+
+/* ::::: personal toolbar ::::: */
+
+#bookmarks-button {
+  list-style-image: url("chrome://communicator/skin/places/bookmark-folder-closed.png");
+}
+
+#bookmarks-button[open="true"] {
+  list-style-image: url("chrome://communicator/skin/places/bookmark-folder-open.png");
+}
+
+toolbarbutton.chevron {
+  list-style-image: url("chrome://navigator/skin/icons/chevron.png") !important;
+}
+
+toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
+  display: none;
+}
+
+toolbarbutton.chevron > .toolbarbutton-text {
+  display: none; /* hide chevron label which has a width even if blank */
+}
+
+toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon {
+  display: -moz-box; /* display chevron icon in text mode */
+}
+
+/* Prevent [mode="icons"|"text"] from hiding the label and icon */
+#PlacesToolbarItems .bookmark-item > .toolbarbutton-text,
+#PlacesToolbarItems .bookmark-item > .toolbarbutton-icon {
+  display: -moz-box !important;
+}
+
+#PersonalToolbar[iconsize="small"] > toolbarpaletteitem > #home-button > .toolbarbutton-icon,
+#PersonalToolbar[iconsize="small"] > #home-button > .toolbarbutton-icon {
+  width: 16px;
+  height: 16px;
+}
+
+#PersonalToolbar > #home-button {
+  cursor: pointer;
+}
+
+#PersonalToolbar > #home-button:hover {
+  text-decoration: underline;
+}
+
+#PersonalToolbar > #home-button[disabled="true"] {
+  cursor: default !important;
+  text-decoration: none !important;
+}
+
+/*
+  In customize mode we hide the normal bookmark items and show a placeholder
+  for the drag/drop UI.
+*/
+.bookmarks-toolbar-customize {
+  list-style-image: url("chrome://communicator/skin/places/bookmarksToolbar.png");
+  display: none;
+  max-width: 15em !important;
+}
+
+#wrapper-personal-bookmarks[place="palette"] > .toolbarpaletteitem-box {
+  width: 16px;
+  height: 16px;
+  background: url("chrome://communicator/skin/places/bookmarksToolbar.png") no-repeat;
+}
+
+/* ::::: star button ::::: */
+
+#star-button {
+  list-style-image: url("chrome://communicator/skin/places/bookmark.png");
+  -moz-image-region: rect(16px 16px 32px 0px);
+}
+
+#star-button:hover {
+  -moz-image-region: rect(16px 32px 32px 16px);
+}
+
+#star-button:hover:active {
+  -moz-image-region: rect(16px 48px 32px 32px);
+}
+
+#star-button[starred="true"] {
+  -moz-image-region: rect(0px 16px 16px 0px);
+}
+
+#star-button[starred="true"]:hover {
+  -moz-image-region: rect(0px 32px 16px 16px);
+}
+
+#star-button[starred="true"]:hover:active {
+  -moz-image-region: rect(0px 48px 16px 32px);
+}
+
+#editBookmarkPanelStarIcon {
+  list-style-image: url("chrome://communicator/skin/places/bookmark.png");
+  -moz-image-region: rect(0px 16px 16px 0px);
+}
+
+/* ::::: feeds ::::: */
+
+.feedsMenu {
+  list-style-image: url("chrome://navigator/skin/btn1/feeds.png");
+  -moz-image-region: rect(0px 16px 16px 0px);
+}
+
+.feedsMenu[_moz-menuactive="true"] {
+  -moz-image-region: rect(16px 16px 32px 0px);
+}
+
+.feedsMenu[disabled="true"] {
+  -moz-image-region: rect(32px 16px 48px 0px);
+}
+
+.feedsMenu[open="true"] {
+  -moz-image-region: rect(48px 16px 64px 0px);
+}
+
+#feedsButton {
+  list-style-image: url("chrome://navigator/skin/btn1/feeds.png");
+  -moz-image-region: rect(0px 32px 16px 16px);
+}
+
+#feedsButton:hover {
+  -moz-image-region: rect(16px 32px 32px 16px);
+}
+
+/* Need to set fixed width to stop the zoom display from changing size and moving around the zoom buttons */
+#zoomLevel-display {
+  width: 60px;
+  max-width: 60px;
+  margin-left: 0px;
+  margin-right: 0px;
+}
diff --git a/comm/suite/themes/classic/navigator/pageInfo.css b/comm/suite/themes/classic/navigator/pageInfo.css
new file mode 100644
index 0000000000..42ddab213f
--- /dev/null
+++ b/comm/suite/themes/classic/navigator/pageInfo.css
@@ -0,0 +1,126 @@
+/* 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 "chrome://global/skin/global.css";
+
+/* Misc */
+tree {
+  margin: .5em;
+}
+
+.gridSeparator {
+  width: .5em;
+}
+
+textbox {
+  background: transparent !important;
+  border: none;
+  padding: 0px;
+  -moz-appearance: none;
+  -moz-user-focus: none;
+}
+
+textbox.header {
+  margin-inline-start: 0;
+}
+
+textbox.meta-properties {
+  margin-top: 1px;
+}
+
+.iframe {
+  margin: .5em;
+  background: white;
+  overflow: auto;
+}
+
+.fixedsize {
+  height: 8.5em;
+}
+
+textbox[disabled] {
+  font-style: italic;
+}
+
+/* General Tab */
+#general-security-identity {
+  white-space: pre-wrap;
+  line-height: 2em;
+}
+
+/* Media Tab */
+#imagetree {
+  min-height: 10em;
+}
+
+#mediaGrid {
+  min-height: 9em;
+}
+
+#mediaLabelColumn {
+  min-width: 10em;
+}
+
+#thepreviewimage {
+  margin: 1em;
+}
+
+treechildren::-moz-tree-cell-text(broken) {
+  font-style: italic;
+  color: graytext;
+}
+
+/* Feeds Tab */
+#feedListbox > richlistitem {
+  padding-top: 6px;
+  padding-bottom: 6px;
+  padding-inline-start: 7px;
+  padding-inline-end: 7px;
+  min-height: 25px;
+  border-bottom: 1px dotted #C0C0C0;
+}
+
+.feedTitle { 
+  font-weight: bold;
+}
+
+/* Permissions Tab */
+#permList {
+  margin-top: .5em;
+  overflow: auto;
+}
+
+.permission {
+  padding-top: 6px;
+  padding-bottom: 6px;
+  padding-inline-start: 7px;
+  padding-inline-end: 7px;
+  min-height: 25px;
+  border-bottom: 1px dotted #C0C0C0;
+}
+
+.permissionLabel {
+  font-weight: bold;
+}
+
+/* Security Tab */
+.fieldValue {
+  font-weight: bold;
+}
+
+#identity-icon {
+  width: 64px;
+  height: 64px;
+  max-height: 64px;
+  list-style-image: url("chrome://navigator/skin/icons/identity.png");
+  -moz-image-region: rect(0px, 64px, 64px, 0px);
+}
+
+#identity-icon.verifiedDomain {
+  -moz-image-region: rect(64px, 64px, 128px, 0px);
+}
+
+#identity-icon.verifiedIdentity {
+  -moz-image-region: rect(128px, 64px, 192px, 0px);
+}
diff --git a/comm/suite/themes/classic/navigator/tabbrowser.css b/comm/suite/themes/classic/navigator/tabbrowser.css
new file mode 100644
index 0000000000..d3b9fd7731
--- /dev/null
+++ b/comm/suite/themes/classic/navigator/tabbrowser.css
@@ -0,0 +1,198 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+.tabbrowser-strip {
+  min-height: 0px;
+  padding: 0px;
+  /* 1px ThreeDShadow bottom border that doesn't take up space and that
+     selected panel can just draw over */
+  box-shadow: 0px -1px ThreeDShadow inset;
+}
+
+tabpanels {
+  -moz-appearance: none;
+}
+
+.tabbrowser-tabs {
+  padding-top: 1px;
+}
+
+.tabs-left,
+.tabs-right {
+  width: 3px;
+  border-bottom: none;
+}
+
+.tab-icon {
+  margin-top: 1px;
+  margin-inline-start: 1px;
+  margin-inline-end: 4px;
+  width: 16px;
+  height: 16px;
+}
+
+.tabbrowser-tab {
+  list-style-image: url("chrome://communicator/skin/places/bookmark-item.svg");
+  padding: 0px 2px 2px;
+  margin-bottom: 1px;
+  border-bottom: none;
+}
+
+.tabbrowser-tab[busy] {
+  list-style-image: url("chrome://communicator/skin/icons/loading.png");
+}
+
+.tabbrowser-tab[selected="true"] {
+  margin-bottom: 0px;
+  padding-top: 2px; /* compensates the top margin of background tabs */
+  padding-bottom: 3px; /* compensates the bottom margin of background tabs */
+  background-color: -moz-dialog;
+  border-top-color: unset;
+  border-right-color: unset;
+  color: -moz-dialogtext;
+  border: 1px solid Gray;
+  border-top: 2px solid RoyalBlue;
+  border-bottom: 0px none;
+  -moz-appearance: none;
+}
+
+.tabbrowser-tab:-moz-lwtheme {
+  text-shadow: none;
+}
+
+.scrollbutton-up:-moz-lwtheme,
+.scrollbutton-down:-moz-lwtheme:not([selected="true"]),
+.tabbrowser-tab:-moz-lwtheme:not([selected="true"]) {
+  opacity: .8;
+}
+
+/* ::::: Tab scrollbox arrow, and all-tabs buttons ::::: */
+
+.scrollbutton-up,
+.scrollbutton-down {
+  -moz-appearance: tab;
+  margin: 2px 0px 1px;
+  padding: 0px;
+  border-top: 1px solid;
+  border-right: 1px solid;
+  border-left: 1px solid;
+  border-bottom: 1px solid ThreeDHighlight;
+  border-top-color: ThreeDLightShadow;
+  border-right-color: ThreeDDarkShadow;
+  border-left-color: ThreeDLightShadow;
+  border-radius: 2px 2px 0px 0px;
+}
+
+@media (-moz-windows-theme: aero) {
+  .scrollbutton-up,
+  .scrollbutton-down {
+    padding: 0px 2px;
+  }
+}
+
+.scrollbutton-up:-moz-locale-dir(rtl),
+.scrollbutton-down:-moz-locale-dir(ltr) {
+  border-right-color: ThreeDShadow;
+}
+
+.scrollbutton-up:-moz-locale-dir(ltr),
+.scrollbutton-down:-moz-locale-dir(rtl) {
+  border-left-color: ThreeDShadow;
+}
+
+.scrollbutton-up,
+.scrollbutton-down:-moz-locale-dir(rtl) {
+  list-style-image: url("chrome://navigator/skin/icons/tab-arrow-left.png");
+}
+
+.scrollbutton-down,
+.scrollbutton-up:-moz-locale-dir(rtl) {
+  list-style-image: url("chrome://navigator/skin/icons/tab-arrow-right.png");
+}
+
+.scrollbutton-up,
+.scrollbutton-down {
+  -moz-image-region: rect(0px, 8px, 12px, 0px);
+}
+
+.scrollbutton-up[disabled="true"],
+.scrollbutton-down[disabled="true"] {
+  -moz-image-region: rect(0px, 16px, 12px, 8px);
+}
+
+.scrollbutton-down {
+  box-shadow: 0px 0px 0px 9px transparent inset;
+  transition: box-shadow 1s ease-out;
+}
+
+.scrollbutton-down:hover,
+.scrollbutton-down[notifybgtab="true"],
+.scrollbutton-down[disabled="true"] {
+  transition: none;
+}
+
+.scrollbutton-up:not([disabled="true"]):hover:active,
+.scrollbutton-down:not([disabled="true"]):hover:active,
+.scrollbutton-down[notifybgtab="true"] {
+  box-shadow: 0px 0px 0px 9px ThreeDShadow inset;
+}
+
+.tabs-alltabs-button {
+  margin: 2px 0px 1px;
+}
+
+.tabs-alltabs-button > .toolbarbutton-icon {
+  margin: 0px !important;
+}
+
+/* All tabs menupopup */
+.alltabs-item {
+  list-style-image: url("chrome://communicator/skin/places/bookmark-item.svg");
+}
+
+.alltabs-item[selected="true"] {
+  font-weight: bold;
+}
+
+.alltabs-item[busy] {
+  list-style-image: url("chrome://communicator/skin/icons/loading.png");
+}
+
+.alltabs-item[tabIsScrolled] {
+  font-style: italic;
+}
+
+/* ::::: close button ::::: */
+
+.tabs-closebutton {
+  margin: 3px;
+  list-style-image: url("chrome://communicator/skin/icons/close-button.png");
+}
+
+.tabs-newbutton {
+  margin: 0px;
+  list-style-image: url("chrome://navigator/skin/icons/tab-new.png");
+}
+
+.tab-drop-indicator-bar {
+    height: 11px;
+    margin-top: -11px;
+    margin-inline-start: -6px;
+    position: relative;
+}
+
+.tab-drop-indicator {
+    height: 11px;
+    width: 11px;
+    margin-bottom: -5px;
+    position: relative;
+    list-style-image: url('chrome://navigator/skin/icons/tab-drag-indicator.png');
+}
+
+tooltip[tabpreview="true"] {
+  max-width: none;
+}
diff --git a/comm/suite/themes/classic/navigator/webDeveloper.css b/comm/suite/themes/classic/navigator/webDeveloper.css
new file mode 100644
index 0000000000..185f7b38ba
--- /dev/null
+++ b/comm/suite/themes/classic/navigator/webDeveloper.css
@@ -0,0 +1,205 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace html url("http://www.w3.org/1999/xhtml");
+
+/* Mostly copied from mozilla/devtools/client/themes/commandline.inc.css  */
+/* Developer Tools */
+
+/* Developer toolbar */
+
+/* NOTE: THESE NEED TO STAY IN SYNC WITH LIGHT-THEME.CSS AND DARK-THEME.CSS.
+   We are copy/pasting variables from light-theme and dark-theme,
+   since they aren't loaded in this context (within browser.css). */
+#developer-toolbar[devtoolstheme="light"] {
+  --gcli-background-color: #ebeced; /* --theme-tab-toolbar-background */
+  --gcli-input-background: #f0f1f2; /* --theme-toolbar-background */
+  --gcli-input-focused-background: #f7f7f7; /* --theme-sidebar-background */
+  --gcli-input-color: #18191a; /* --theme-body-color */
+  --gcli-border-color: #aaaaaa; /* --theme-splitter-color */
+  --selection-background: #4c9ed9; /* --theme-selection-background */
+  --selection-color: #f5f7fa; /* --theme-selection-color */
+}
+
+#developer-toolbar[devtoolstheme="dark"] {
+  --gcli-background-color: #343c45; /* --theme-toolbar-background */
+  --gcli-input-background: rgba(37, 44, 51, .6); /* --theme-tab-toolbar-background */
+  --gcli-input-focused-background: #252c33; /* --theme-tab-toolbar-background */
+  --gcli-input-color: #b6babf; /* --theme-body-color-alt */
+  --gcli-border-color: #000000; /* --theme-splitter-color */
+  --selection-background: #1d4f73; /* --theme-selection-background */
+  --selection-color: #f5f7fa; /* --theme-selection-color */
+}
+
+#developer-toolbar {
+  padding: 0;
+  background-color: var(--gcli-background-color);
+  border-top: 1px solid var(--gcli-border-color);
+}
+
+#developer-toolbar[devtoolstheme="light"] .gclitoolbar-input-node:not([focused=true])::before  {
+  filter: invert(1);
+}
+
+#developer-toolbar-toolbox-button {
+  list-style-image: url("chrome://devtools/skin/images/toggle-tools.png");
+  -moz-image-region: rect(0px, 64px, 16px, 48px);
+}
+
+#developer-toolbar-toolbox-button:hover > .toolbarbutton-icon {
+  filter: brightness(120%);
+}
+
+#developer-toolbar-toolbox-button:hover:active > .toolbarbutton-icon {
+  filter: saturate(150%);
+}
+
+#developer-toolbar-toolbox-button[checked=true] > .toolbarbutton-icon {
+  filter: hue-rotate(180deg);
+}
+
+@media (min-resolution: 1.1dppx) {
+  #developer-toolbar-toolbox-button {
+    list-style-image: url("chrome://devtools/skin/images/toggle-tools@2x.png");
+    -moz-image-region: rect(0px, 128px, 32px, 96px);
+  }
+}
+
+/* Error counter */
+
+#developer-toolbar-toolbox-button[error-count]:before {
+  color: white;
+  min-width: 16px;
+  text-shadow: none;
+  background-color: firebrick;
+  border-radius: 2px;
+  margin-inline-end: 2px;
+/*
+  Firefox browser/themes/windows/browser.css
+  color: #FDF3DE;
+  min-width: 16px;
+  text-shadow: none;
+  background-image: linear-gradient(#B4211B, #8A1915);
+  border-radius: 1px;
+  margin-inline-end: 5px;
+  Firefox browser/themes/linux/browser.css
+  color: #FDF3DE;
+  min-width: 16px;
+  text-shadow: none;
+  background-image: linear-gradient(#B4211B, #8A1915);
+  border-radius: 1px;
+  margin-inline-end: 2px;
+*/
+}
+
+/* GCLI */
+
+html|*#gcli-tooltip-frame,
+html|*#gcli-output-frame {
+  padding: 0;
+  border-width: 0;
+  background-color: transparent;
+}
+
+#gcli-output,
+#gcli-tooltip {
+  border-width: 0;
+  background-color: transparent;
+  -moz-appearance: none;
+}
+
+.gclitoolbar-input-node,
+.gclitoolbar-complete-node {
+  -moz-box-align: center;
+  padding-top: 0;
+  padding-bottom: 0;
+  padding-right: 8px;
+  text-shadow: none;
+  box-shadow: none;
+  background-color: transparent;
+}
+
+.gclitoolbar-input-node {
+  -moz-appearance: none;
+  color: var(--gcli-input-color);
+  background-color: var(--gcli-input-background);
+  background-repeat: no-repeat;
+  background-position: 4px center;
+  box-shadow: 1px 0 0 var(--gcli-border-color) inset,
+              -1px 0 0 var(--gcli-border-color) inset;
+  outline-style: none;
+  padding: 0;
+}
+
+.gclitoolbar-input-node[focused="true"] {
+  background-color: var(--gcli-input-focused-background);
+}
+
+.gclitoolbar-input-node::before {
+  content: "";
+  display: inline-block;
+  -moz-box-ordinal-group: 0;
+  width: 16px;
+  height: 16px;
+  margin: 0 2px;
+  background-image: url("chrome://devtools/skin/images/commandline-icon.png");
+  background-position: 0 center;
+  background-size: 32px 16px;
+}
+
+.gclitoolbar-input-node[focused="true"]::before {
+  background-position: -16px center;
+}
+
+@media (min-resolution: 1.1dppx) {
+  .gclitoolbar-input-node::before {
+    background-image: url("chrome://devtools/skin/images/commandline-icon@2x.png");
+  }
+}
+
+.gclitoolbar-input-node > .textbox-input-box > html|*.textbox-input::-moz-selection {
+  background-color: var(--selection-background);
+  color: var(--selection-color);
+  text-shadow: none;
+}
+
+.gclitoolbar-complete-node {
+  padding-left: 21px;
+  background-color: transparent;
+  color: transparent;
+  z-index: 100;
+  pointer-events: none;
+}
+
+.gcli-in-incomplete,
+.gcli-in-error,
+.gcli-in-ontab,
+.gcli-in-todo,
+.gcli-in-closebrace,
+.gcli-in-param,
+.gcli-in-valid {
+  margin: 0;
+  padding: 0;
+}
+
+.gcli-in-incomplete {
+  border-bottom: 2px dotted #999;
+}
+
+.gcli-in-error {
+  border-bottom: 2px dotted #F00;
+}
+
+.gcli-in-ontab {
+  color: hsl(210,0%,35%);
+}
+
+.gcli-in-todo {
+  color: hsl(210,50%,35%);
+}
+
+.gcli-in-closebrace {
+  color: hsl(0,0%,80%);
+}
diff --git a/comm/suite/themes/classic/preview.png b/comm/suite/themes/classic/preview.png
new file mode 100644
index 0000000000..d3ed55290d
--- /dev/null
+++ b/comm/suite/themes/classic/preview.png
diff --git a/comm/suite/themes/classic/windows/communicator/sanitizeDialog.css b/comm/suite/themes/classic/windows/communicator/sanitizeDialog.css
new file mode 100644
index 0000000000..097a483d88
--- /dev/null
+++ b/comm/suite/themes/classic/windows/communicator/sanitizeDialog.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/. */
+
+#sanitizeDurationChoice {
+  margin-inline-end: 0;
+}
+
+/* Align the duration label with the warning box and item list */
+#sanitizeDurationLabel {
+  margin-inline-start: 3px;
+}
+
+
+/* Hide the duration dropdown suffix label if it's empty.  Otherwise it
+   takes up a little space, causing the end of the dropdown to not be aligned
+   with the warning box. */
+#sanitizeDurationSuffixLabel[value=""] {
+  display: none;
+}
+
+
+/* Sanitize everything warning box */
+#sanitizeWarningBox {
+  background-color: Window;
+  border: 1px solid ThreeDDarkShadow;
+  border-radius: 5px;
+  padding: 16px;
+}
+
+#sanitizeWarningIcon {
+  list-style-image: url("chrome://global/skin/icons/warning-large.png");
+  padding: 0;
+  margin: 0;
+}
+
+#sanitizeWarningDescBox {
+  padding: 0 16px;
+  margin: 0;
+}
+
+
+/* Make the item list the same width as the warning box */
+#itemList {
+  margin-inline-start: 0;
+  margin-inline-end: 0;
+}
+
+
+/* Align the last dialog button with the end of the warning box */
+.dialog-button-box {
+  margin-inline-end: 0;
+}
+.dialog-button[dlgtype="cancel"] {
+  margin-inline-end: 0;
+}