diff --git a/application/palemoon/themes/windows/browser.css b/application/palemoon/themes/windows/browser.css
index c8dc9d192f..29602196b2 100644
--- a/application/palemoon/themes/windows/browser.css
+++ b/application/palemoon/themes/windows/browser.css
@@ -3106,36 +3106,38 @@ toolbar[brighttext] #addonbar-closebutton {
 }
 
 @media (-moz-windows-default-theme) {
-  #navigator-toolbox > toolbar:not(:-moz-lwtheme),
-  #browser-bottombox:not(:-moz-lwtheme) {
-    background-color: var(--toolbar-custom-color);
-  }
-
-  .tabbrowser-tab:not(:-moz-lwtheme),
-  .tabs-newtab-button:not(:-moz-lwtheme) {
-    background-image: @toolbarShadowOnTab@, var(--tab-background),
-                      linear-gradient(var(--toolbar-custom-color), var(--toolbar-custom-color));
-  }
-
-  .tabbrowser-tab:not(:-moz-lwtheme):hover,
-  .tabs-newtab-button:not(:-moz-lwtheme):hover {
-    background-image: @toolbarShadowOnTab@, var(--tab-background-hover),
-                      linear-gradient(var(--toolbar-custom-color), var(--toolbar-custom-color));
-  }
-
-  .tabbrowser-tab[selected="true"]:not(:-moz-lwtheme) {
-    background-image: linear-gradient(#fff, var(--toolbar-highlight-top) 50%),
-                      linear-gradient(var(--toolbar-custom-color), var(--toolbar-custom-color));
-  }
-
-  #main-window[tabsontop=false]:not([disablechrome]) .tabbrowser-tab[selected=true]:not(:-moz-lwtheme) {
-    background-image: @toolbarShadowOnTab@,
-                      linear-gradient(#fff, var(--toolbar-highlight-top) 50%),
-                      linear-gradient(var(--toolbar-custom-color), var(--toolbar-custom-color));
-  }
-  
   @media (-moz-os-version: windows-vista),
-         (-moz-os-version: windows-win7) {
+         (-moz-os-version: windows-win7),
+         (-moz-os-version: windows-win8),
+         (-moz-os-version: windows-win10) {
+    #navigator-toolbox > toolbar:not(:-moz-lwtheme),
+    #browser-bottombox:not(:-moz-lwtheme) {
+      background-color: var(--toolbar-custom-color);
+    }
+
+    .tabbrowser-tab:not(:-moz-lwtheme),
+    .tabs-newtab-button:not(:-moz-lwtheme) {
+      background-image: @toolbarShadowOnTab@, var(--tab-background),
+                        linear-gradient(var(--toolbar-custom-color), var(--toolbar-custom-color));
+    }
+
+    .tabbrowser-tab:not(:-moz-lwtheme):hover,
+    .tabs-newtab-button:not(:-moz-lwtheme):hover {
+      background-image: @toolbarShadowOnTab@, var(--tab-background-hover),
+                        linear-gradient(var(--toolbar-custom-color), var(--toolbar-custom-color));
+    }
+
+    .tabbrowser-tab[selected="true"]:not(:-moz-lwtheme) {
+      background-image: linear-gradient(#fff, var(--toolbar-highlight-top) 50%),
+                        linear-gradient(var(--toolbar-custom-color), var(--toolbar-custom-color));
+    }
+
+    #main-window[tabsontop=false]:not([disablechrome]) .tabbrowser-tab[selected=true]:not(:-moz-lwtheme) {
+      background-image: @toolbarShadowOnTab@,
+                        linear-gradient(#fff, var(--toolbar-highlight-top) 50%),
+                        linear-gradient(var(--toolbar-custom-color), var(--toolbar-custom-color));
+    }
+
     :root:not(:-moz-lwtheme) {
       --toolbox-after-color: #aabccf;
     }
@@ -3850,11 +3852,16 @@ toolbar[brighttext] #addonbar-closebutton {
 
 @media not all and (-moz-windows-compositor) {
   @media (-moz-windows-default-theme) {
-    #main-window {
-      background-color: rgb(185,209,234);
-    }
-    #main-window:-moz-window-inactive {
-      background-color: rgb(215,228,242);
+    @media (-moz-os-version: windows-vista),
+           (-moz-os-version: windows-win7),
+           (-moz-os-version: windows-win8),
+           (-moz-os-version: windows-win10) {
+      #main-window {
+        background-color: rgb(185,209,234);
+      }
+      #main-window:-moz-window-inactive {
+        background-color: rgb(215,228,242);
+      }
     }
 
     #toolbar-menubar:not([autohide=true]):not(:-moz-lwtheme),
diff --git a/toolkit/content/logopage.xhtml b/toolkit/content/logopage.xhtml
index 04c6a82f33..b0ecacaf90 100644
--- a/toolkit/content/logopage.xhtml
+++ b/toolkit/content/logopage.xhtml
@@ -13,8 +13,8 @@
   <title></title>
   <style type="text/css">
   body {
-    background: #eee;
-    color: black;
+    background: Menu;
+    color: MenuText;
   }
   
   img {
@@ -34,13 +34,6 @@
       color: #eee;
     }
   }
-
-  @media(-moz-windows-classic) {
-    body {
-      background: Menu;
-      color: MenuText;
-    }
-  }
   </style>
 </head>