5 files changed, 14 insertions, 3 deletions
diff --git a/toolkit/themes/linux/global/global.css b/toolkit/themes/linux/global/global.css
index 9553725d6..9328f7a66 100644
--- a/toolkit/themes/linux/global/global.css
+++ b/toolkit/themes/linux/global/global.css
@@ -316,7 +316,7 @@ popupnotificationcontent {
 
 /* :::::: Close button icons ::::: */
 
-%ifdef MC_BASILISK
+%ifdef MOZ_AUSTRALIS
 .close-icon {
   -moz-appearance: none;
   height: 16px;
diff --git a/toolkit/themes/shared/aboutSupport.css b/toolkit/themes/shared/aboutSupport.css
index d26cd3cbd..69e6a95b4 100644
--- a/toolkit/themes/shared/aboutSupport.css
+++ b/toolkit/themes/shared/aboutSupport.css
@@ -99,6 +99,10 @@ td {
   width: 30%;
 }
 
+#contents {
+  clear: right;
+}
+
 #action-box,
 #reset-box,
 #safe-mode-box {
diff --git a/toolkit/themes/shared/jar.inc.mn b/toolkit/themes/shared/jar.inc.mn
index 675353409..e361e744f 100644
--- a/toolkit/themes/shared/jar.inc.mn
+++ b/toolkit/themes/shared/jar.inc.mn
@@ -59,7 +59,7 @@ toolkit.jar:
   skin/classic/global/reader/RM-Content-Width-Plus-44x16.svg             (../../shared/reader/RM-Content-Width-Plus-44x16.svg)
   skin/classic/global/reader/RM-Line-Height-Minus-38x14.svg            (../../shared/reader/RM-Line-Height-Minus-38x14.svg)
   skin/classic/global/reader/RM-Line-Height-Plus-38x24.svg             (../../shared/reader/RM-Line-Height-Plus-38x24.svg)
-  skin/classic/global/media/TopLevelImageDocument.css      (../../shared/media/TopLevelImageDocument.css)
+* skin/classic/global/media/TopLevelImageDocument.css      (../../shared/media/TopLevelImageDocument.css)
   skin/classic/global/media/TopLevelVideoDocument.css      (../../shared/media/TopLevelVideoDocument.css)
   skin/classic/global/media/imagedoc-lightnoise.png        (../../shared/media/imagedoc-lightnoise.png)
   skin/classic/global/media/imagedoc-darknoise.png         (../../shared/media/imagedoc-darknoise.png)
diff --git a/toolkit/themes/shared/media/TopLevelImageDocument.css b/toolkit/themes/shared/media/TopLevelImageDocument.css
index 524217516..de970512c 100644
--- a/toolkit/themes/shared/media/TopLevelImageDocument.css
+++ b/toolkit/themes/shared/media/TopLevelImageDocument.css
@@ -5,6 +5,12 @@
 @media not print {
   /* N.B.: Remember to update ImageDocument.css in the tree or reftests may fail! */
 
+%ifdef MC_PALEMOON
+  body {
+    color: #eee;
+    background: #2E3B41;
+  }
+%else
   body {
     color: #eee;
     background-image: url("chrome://global/skin/media/imagedoc-darknoise.png");
@@ -14,4 +20,5 @@
     background: hsl(0,0%,90%) url("chrome://global/skin/media/imagedoc-lightnoise.png");
     color: #222;
   }
+%endif
 }
diff --git a/toolkit/themes/windows/global/global.css b/toolkit/themes/windows/global/global.css
index 416321041..6b6a21ca3 100644
--- a/toolkit/themes/windows/global/global.css
+++ b/toolkit/themes/windows/global/global.css
@@ -331,7 +331,7 @@ popupnotificationcontent {
 
 /* :::::: Close button icons ::::: */
 
-%ifdef MC_BASILISK
+%ifdef MOZ_AUSTRALIS
 .close-icon {
   list-style-image: url("chrome://global/skin/icons/close.png");
   -moz-image-region: rect(0, 20px, 20px, 0);