diff --git a/src/renderer/components/+apps-releases/release-details.scss b/src/renderer/components/+apps-releases/release-details.scss
index 99d46cb86a..a6fb0e1cf6 100644
--- a/src/renderer/components/+apps-releases/release-details.scss
+++ b/src/renderer/components/+apps-releases/release-details.scss
@@ -1,13 +1,6 @@
 @import "release.mixins";
 
 .ReleaseDetails {
-  &.light {
-    .AceEditor {
-      border: 1px solid gainsboro;
-      border-radius: $radius;
-    }
-  }
-
   .DrawerItem {
     align-items: center;
   }
diff --git a/src/renderer/components/+cluster-settings/cluster-settings.scss b/src/renderer/components/+cluster-settings/cluster-settings.scss
index f20699de35..4070c2eb7b 100644
--- a/src/renderer/components/+cluster-settings/cluster-settings.scss
+++ b/src/renderer/components/+cluster-settings/cluster-settings.scss
@@ -15,7 +15,7 @@
     .content-col {
       margin: 0;
       padding-top: $padding * 3;
-      background-color: transparent;
+      background-color: $clusterSettingsBackground;
 
       .SubTitle {
         text-transform: none;
diff --git a/src/renderer/components/+preferences/preferences.scss b/src/renderer/components/+preferences/preferences.scss
index 94c08e8f53..33072a4849 100644
--- a/src/renderer/components/+preferences/preferences.scss
+++ b/src/renderer/components/+preferences/preferences.scss
@@ -8,8 +8,8 @@
     padding: 0;
 
     .content-col {
-      background-color: transparent;
       padding: $padding * 8 0;
+      background-color: $clusterSettingsBackground;
 
       h2 {
         margin-bottom: $margin * 2;
@@ -40,6 +40,10 @@
     .WizardLayout .head-col {
       padding-top: 32px;
       overflow: hidden;
+
+      .Icon {
+        margin-top: -$margin * 2;
+      }
     }
   }
 
diff --git a/src/renderer/components/ace-editor/ace-editor.scss b/src/renderer/components/ace-editor/ace-editor.scss
index 8640130842..26b74d1b64 100644
--- a/src/renderer/components/ace-editor/ace-editor.scss
+++ b/src/renderer/components/ace-editor/ace-editor.scss
@@ -5,13 +5,12 @@
   flex: 1;
   z-index: 10;
 
-  &.hidden {
-    visibility: hidden;
-  }
+  .theme-light & {
+    border: 1px solid gainsboro;
+    border-radius: $radius;
 
-  &.light {
     .ace_scrollbar {
-      @include custom-scrollbar($theme: dark);
+      @include custom-scrollbar(dark);
     }
   }
 
diff --git a/src/renderer/components/ace-editor/ace-editor.tsx b/src/renderer/components/ace-editor/ace-editor.tsx
index d3edfaa098..10fecbce75 100644
--- a/src/renderer/components/ace-editor/ace-editor.tsx
+++ b/src/renderer/components/ace-editor/ace-editor.tsx
@@ -3,10 +3,11 @@
 import "./ace-editor.scss"
 
 import React from "react"
-import { observer } from "mobx-react";
+import { observer, disposeOnUnmount } from "mobx-react";
 import AceBuild, { Ace } from "ace-builds"
 import { autobind, cssNames } from "../../utils";
 import { themeStore } from "../../theme.store";
+import { reaction } from "mobx";
 
 interface Props extends Partial<Ace.EditorOptions> {
   className?: string;
@@ -46,6 +47,11 @@ export class AceEditor extends React.Component<Props, State> {
     require("ace-builds/src-noconflict/ext-searchbox")
   }
 
+  @disposeOnUnmount
+  themeSwitcher = reaction(() => themeStore.activeTheme, () => {
+    this.setTheme(this.theme);
+  });
+
   get theme() {
     switch (themeStore.activeTheme.type) {
     case "light":
@@ -148,9 +154,8 @@ export class AceEditor extends React.Component<Props, State> {
 
   render() {
     const { className, hidden } = this.props;
-    const themeType = themeStore.activeTheme.type;
     return (
-      <div className={cssNames("AceEditor", className, { hidden }, themeType)}>
+      <div className={cssNames("AceEditor", className, { hidden })}>
         <div className="editor" ref={e => this.elem = e}/>
       </div>
     )
diff --git a/src/renderer/components/app.scss b/src/renderer/components/app.scss
index 0b1cd82ca8..717c47bb1b 100755
--- a/src/renderer/components/app.scss
+++ b/src/renderer/components/app.scss
@@ -12,8 +12,6 @@
 
 :root {
   --mainBackground: #1e2124;
-  --textColorPrimary: #87909c;
-  --clusters-menu-bgc: #252729;
   --main-layout-header: 40px;
 }
 
@@ -31,6 +29,7 @@ html {
 
 html, body {
   height: 100%;
+  overflow: hidden;
 }
 
 #app {
@@ -79,7 +78,7 @@ hr {
 }
 
 h1 {
-  color: white;
+  color: $textColorPrimary;
   font-size: 28px;
   font-weight: normal;
   letter-spacing: -.010em;
@@ -142,10 +141,6 @@ a {
     text-decoration: underline;
   }
 
-  &:focus {
-    color: white;
-  }
-
   &:not([href]) {
     border-bottom: 1px dotted;
     text-decoration: none;
diff --git a/src/renderer/components/cluster-manager/clusters-menu.scss b/src/renderer/components/cluster-manager/clusters-menu.scss
index ce1dab92d5..0ee1f59d7e 100644
--- a/src/renderer/components/cluster-manager/clusters-menu.scss
+++ b/src/renderer/components/cluster-manager/clusters-menu.scss
@@ -5,7 +5,8 @@
   position: relative;
   text-align: center;
   padding: $spacing;
-  background: var(--clusters-menu-bgc);
+  background: $clusterMenuBackground;
+  border-right: 1px solid $clusterMenuBorderColor;
 
   .is-mac & {
     padding-top: $spacing * 2;
@@ -47,11 +48,9 @@
     .Icon {
       border-radius: $radius;
       padding: $padding / 3;
-      color: var(--clusters-menu-bgc) !important;
-      background: white !important;
-      font-weight: bold;
+      color: $addClusterIconColor;
+      background: #ffffff66;
       cursor: pointer;
-      opacity: 0.4;
 
       &.active {
         opacity: 1;
@@ -59,7 +58,7 @@
 
       &:hover {
         box-shadow: none;
-        opacity: .75;
+        background: #ffffff;
       }
     }
 
diff --git a/src/renderer/components/dialog/dialog.scss b/src/renderer/components/dialog/dialog.scss
index 9d480962aa..7b2887be18 100644
--- a/src/renderer/components/dialog/dialog.scss
+++ b/src/renderer/components/dialog/dialog.scss
@@ -15,4 +15,8 @@
   &.modal {
     background: transparentize(#222, .5);
   }
+
+  h5 {
+    color: white;
+  }
 }
\ No newline at end of file
diff --git a/src/renderer/components/dock/dock.scss b/src/renderer/components/dock/dock.scss
index 2a6fa326de..d422ec46d9 100644
--- a/src/renderer/components/dock/dock.scss
+++ b/src/renderer/components/dock/dock.scss
@@ -77,4 +77,8 @@
       pointer-events: none;
     }
   }
+
+  .AceEditor {
+    border: none;
+  }
 }
\ No newline at end of file
diff --git a/src/renderer/components/dock/terminal-window.scss b/src/renderer/components/dock/terminal-window.scss
index 17cabffdc1..b3a7f99bda 100644
--- a/src/renderer/components/dock/terminal-window.scss
+++ b/src/renderer/components/dock/terminal-window.scss
@@ -5,7 +5,7 @@
   margin-left: $padding * 2;
   margin-top: $padding * 2;
 
-  &.light {
+  .theme-light & {
     .xterm-viewport {
       @include custom-scrollbar(dark);
     }
diff --git a/src/renderer/components/drawer/drawer.scss b/src/renderer/components/drawer/drawer.scss
index f0449f5519..72a2f10eb1 100644
--- a/src/renderer/components/drawer/drawer.scss
+++ b/src/renderer/components/drawer/drawer.scss
@@ -9,7 +9,7 @@
   box-shadow: 0 0 $unit * 2 $boxShadow;
   z-index: $zIndex-drawer;
 
-  &.light {
+  .theme-light & {
     .drawer-content {
       @include custom-scrollbar(dark);
     }
diff --git a/src/renderer/components/drawer/drawer.tsx b/src/renderer/components/drawer/drawer.tsx
index ef14d5c75e..c4c1a3894a 100644
--- a/src/renderer/components/drawer/drawer.tsx
+++ b/src/renderer/components/drawer/drawer.tsx
@@ -6,7 +6,6 @@ import { cssNames, noop } from "../../utils";
 import { Icon } from "../icon";
 import { Animate, AnimateName } from "../animate";
 import { history } from "../../navigation";
-import { themeStore } from "../../theme.store";
 
 export interface DrawerProps {
   open: boolean;
@@ -101,7 +100,7 @@ export class Drawer extends React.Component<DrawerProps> {
   render() {
     const { open, position, title, animation, children, toolbar, size, usePortal } = this.props
     let { className, contentClass } = this.props;
-    className = cssNames("Drawer", className, position, themeStore.activeTheme.type);
+    className = cssNames("Drawer", className, position);
     contentClass = cssNames("drawer-content flex column box grow", contentClass);
     const style = size ? { "--size": size } as React.CSSProperties : undefined;
     const drawer = (
diff --git a/src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.scss b/src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.scss
index 24a32b6f74..7803026ae7 100644
--- a/src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.scss
+++ b/src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.scss
@@ -1,5 +1,5 @@
 .KubeConfigDialog {
-  &.light {
+  .theme-light & {
     .AceEditor {
       border: 1px solid gainsboro;
       border-radius: $radius;
diff --git a/src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx b/src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx
index 68f0a93129..d2f2f1a06f 100644
--- a/src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx
+++ b/src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx
@@ -13,7 +13,6 @@ import { Dialog, DialogProps } from "../dialog";
 import { Icon } from "../icon";
 import { Notifications } from "../notifications";
 import { Wizard, WizardStep } from "../wizard";
-import { themeStore } from "../../theme.store";
 import { apiBase } from "../../api";
 
 interface IKubeconfigDialogData {
@@ -92,7 +91,7 @@ export class KubeConfigDialog extends React.Component<Props> {
     return (
       <Dialog
         {...dialogProps}
-        className={cssNames("KubeConfigDialog", themeStore.activeTheme.type)}
+        className={cssNames("KubeConfigDialog")}
         isOpen={isOpen}
         onOpen={this.onOpen}
         close={this.close}
diff --git a/src/renderer/components/layout/main-layout.scss b/src/renderer/components/layout/main-layout.scss
index 9174852643..e9980bb3fb 100755
--- a/src/renderer/components/layout/main-layout.scss
+++ b/src/renderer/components/layout/main-layout.scss
@@ -8,13 +8,6 @@
   grid-template-columns: [sidebar] minmax(var(--main-layout-header), min-content) [main] 1fr;
   height: 100%;
 
-  &.light {
-    main {
-      @include custom-scrollbar(dark);
-      overflow-y: scroll;
-    }
-  }
-
   > .Tabs {
     grid-area: tabs;
     background: $layoutTabsBackground;
@@ -69,6 +62,10 @@
     @include custom-scrollbar;
     $spacing: $margin * 2;
 
+    .theme-light & {
+      @include custom-scrollbar(dark);
+    }
+
     grid-area: main;
     overflow-y: scroll; // always reserve space for scrollbar (17px)
     overflow-x: auto;
diff --git a/src/renderer/components/layout/main-layout.tsx b/src/renderer/components/layout/main-layout.tsx
index 678f4d8876..c81a42cb4a 100755
--- a/src/renderer/components/layout/main-layout.tsx
+++ b/src/renderer/components/layout/main-layout.tsx
@@ -11,7 +11,6 @@ import { ErrorBoundary } from "../error-boundary";
 import { Dock } from "../dock";
 import { navigate, navigation } from "../../navigation";
 import { getHostedCluster } from "../../../common/cluster-store";
-import { themeStore } from "../../theme.store";
 
 export interface TabRoute extends RouteProps {
   title: React.ReactNode;
@@ -50,7 +49,7 @@ export class MainLayout extends React.Component<Props> {
     const routePath = navigation.location.pathname;
     const cluster = getHostedCluster();
     return (
-      <div className={cssNames("MainLayout", className, themeStore.activeTheme.type)}>
+      <div className={cssNames("MainLayout", className)}>
         <header className={cssNames("flex gaps align-center", headerClass)}>
           <span className="cluster">
             {cluster.preferences?.clusterName || cluster.contextName}
diff --git a/src/renderer/components/layout/sidebar.scss b/src/renderer/components/layout/sidebar.scss
index 9e9ec63622..f863d374cd 100644
--- a/src/renderer/components/layout/sidebar.scss
+++ b/src/renderer/components/layout/sidebar.scss
@@ -20,6 +20,10 @@
   &.pinned {
     .sidebar-nav {
       @include custom-scrollbar;
+
+      .theme-light & {
+        @include custom-scrollbar(dark);
+      }
     }
   }
 
diff --git a/src/renderer/components/layout/wizard-layout.scss b/src/renderer/components/layout/wizard-layout.scss
index d52f6e59bf..ac7ab13393 100644
--- a/src/renderer/components/layout/wizard-layout.scss
+++ b/src/renderer/components/layout/wizard-layout.scss
@@ -2,7 +2,7 @@
   $spacing: $padding * 2;
 
   position: relative;
-  padding: $padding * 3;
+  padding: $padding * 2;
   height: 100%;
   display: grid;
   grid-template-columns: 1fr 40%;
@@ -11,17 +11,21 @@
     @include custom-scrollbar;
     --flex-gap: #{$spacing};
     padding: $spacing;
+
+    .theme-light & {
+      @include custom-scrollbar(dark);
+    }
   }
 
   > .head-col {
     position: sticky;
-    border-bottom: 1px solid $grey-800;
     justify-content: space-between;
+    background-color: $clusterMenuBackground;
   }
 
   > .content-col {
     margin-right: $spacing;
-    background-color: var(--clusters-menu-bgc);
+    background-color: $contentColor;
     border-radius: $radius;
 
     > div {
@@ -36,7 +40,7 @@
   }
 
   > .info-col {
-    border-left: 1px solid #353a3e;
+    background-color: $contentColor;
   }
 
   p {
diff --git a/src/renderer/components/mixins.scss b/src/renderer/components/mixins.scss
index 7de08a2625..0edc62eb3d 100755
--- a/src/renderer/components/mixins.scss
+++ b/src/renderer/components/mixins.scss
@@ -8,8 +8,8 @@
 
 @mixin custom-scrollbar($theme: light, $size: 7px, $borderSpacing: 5px) {
   $themes: (
-    light: rgba(255, 255, 255, .25),
-    dark: rgba(0, 0, 0, .25),
+    light: #5f6064,
+    dark: #bbb,
   );
 
   $scrollBarColor: if(map_has_key($themes, $theme), map_get($themes, $theme), none);
@@ -34,10 +34,6 @@
   &::-webkit-scrollbar-corner {
     background-color: transparent;
   }
-
-  // Firefox
-  scrollbar-color: $scrollBarColor transparent;
-  //scrollbar-width: thin;
 }
 
 // Hide scrollbar but keep the element scrollable
@@ -49,27 +45,6 @@
     height: 0;
     background: transparent;
   }
-  scrollbar-width: none; // Firefox 65+
-  -ms-overflow-style: none; // IE (10,11?), Edge(?)
-}
-
-// Cross-browser hacks
-@mixin safariOnly {
-  @media not all and (min-resolution: .001dpcm) {
-    @content;
-  }
-}
-
-@mixin firefoxOnly {
-  @-moz-document url-prefix() {
-    @content;
-  }
-}
-
-@mixin edgeOnly {
-  @supports (-ms-accelerator: true) {
-    @content;
-  }
 }
 
 @mixin stripeLinesAnimation($color1: #ccc, $color2: transparent, $spacing: 1rem) {
diff --git a/src/renderer/components/select/select.tsx b/src/renderer/components/select/select.tsx
index 63b2f4c85f..1f849570ee 100644
--- a/src/renderer/components/select/select.tsx
+++ b/src/renderer/components/select/select.tsx
@@ -38,7 +38,9 @@ export class Select extends React.Component<SelectProps> {
     menuPortalTarget: document.body,
   }
 
-  private theme = this.props.themeName || themeStore.activeTheme.type;
+  @computed get theme() {
+    return this.props.themeName || themeStore.activeTheme.type;
+  }
 
   private styles: Styles = {
     menuPortal: styles => ({
diff --git a/src/renderer/components/table/table.scss b/src/renderer/components/table/table.scss
index 0c024b38a3..1ff6343598 100644
--- a/src/renderer/components/table/table.scss
+++ b/src/renderer/components/table/table.scss
@@ -1,9 +1,9 @@
 .Table {
   &.scrollable {
-    &.light {
+    .theme-light & {
       @include custom-scrollbar(dark);
     }
-    
+
     @include custom-scrollbar();
     flex: 1 0 0; // hackfix: flex-basis must be "0" for proper work in firefox
   }
diff --git a/src/renderer/components/virtual-list/virtual-list.scss b/src/renderer/components/virtual-list/virtual-list.scss
index 2ab6490d7a..73d352cacf 100644
--- a/src/renderer/components/virtual-list/virtual-list.scss
+++ b/src/renderer/components/virtual-list/virtual-list.scss
@@ -1,14 +1,13 @@
 .VirtualList {
   overflow: hidden;
 
-  &.light {
-    .list {
-      @include custom-scrollbar(dark);
-    }
-  }
-
   > .list {
     @include custom-scrollbar;
+
+    .theme-light & {
+      @include custom-scrollbar(dark);
+    }
+
     overflow-y: overlay !important;
     overflow-x: hidden !important;
   }
diff --git a/src/renderer/theme.store.ts b/src/renderer/theme.store.ts
index 3cc7c352b6..5245d2a728 100644
--- a/src/renderer/theme.store.ts
+++ b/src/renderer/theme.store.ts
@@ -93,6 +93,9 @@ export class ThemeStore {
       return `--${cssName}: ${color} !important;`
     });
     this.styles.textContent = `:root {\n${cssVars.join("\n")}}`;
+    // Adding universal theme flag which can be used in component styles
+    const body = document.querySelector("body");
+    body.classList.toggle("theme-light", theme.type === ThemeType.LIGHT);
   }
 }
 
diff --git a/src/renderer/themes/kontena-dark.json b/src/renderer/themes/kontena-dark.json
index 02443e5088..a0d0eb9869 100644
--- a/src/renderer/themes/kontena-dark.json
+++ b/src/renderer/themes/kontena-dark.json
@@ -90,6 +90,10 @@
     "drawerSubtitleBackground": "#373a3e",
     "drawerItemNameColor": "#87909c",
     "drawerItemValueColor": "#a0a0a0",
+    "clusterMenuBackground": "#252729",
+    "clusterMenuBorderColor": "#252729",
+    "clusterSettingsBackground": "#1e2124",
+    "addClusterIconColor": "#252729",
     "boxShadow": "#0000003a",
     "iconActiveColor": "#ffffff",
     "iconActiveBackground": "#ffffff22",
diff --git a/src/renderer/themes/kontena-light.json b/src/renderer/themes/kontena-light.json
index da34c67995..f39fa53d00 100644
--- a/src/renderer/themes/kontena-light.json
+++ b/src/renderer/themes/kontena-light.json
@@ -26,7 +26,7 @@
     "sidebarBackground": "#e8e8e8",
     "buttonPrimaryBackground": "#3d90ce",
     "buttonDefaultBackground": "#414448",
-    "buttonAccentBackground": "#3b4148",
+    "buttonAccentBackground": "#e85555",
     "buttonDisabledBackground": "#808080",
     "tableBgcStripe": "#f8f8f8",
     "tableBgcSelected": "#f4f5f5",
@@ -91,6 +91,10 @@
     "drawerSubtitleBackground": "#f1f1f1",
     "drawerItemNameColor": "#727272",
     "drawerItemValueColor": "#555555",
+    "clusterMenuBackground": "#e8e8e8",
+    "clusterMenuBorderColor": "#c9cfd3",
+    "clusterSettingsBackground": "#ffffff",
+    "addClusterIconColor": "#8d8d8d",
     "boxShadow": "#0000003a",
     "iconActiveColor": "#ffffff",
     "iconActiveBackground": "#a6a6a694",
diff --git a/src/renderer/themes/theme-vars.scss b/src/renderer/themes/theme-vars.scss
index 5d9e0755fa..c6c3072b8f 100644
--- a/src/renderer/themes/theme-vars.scss
+++ b/src/renderer/themes/theme-vars.scss
@@ -110,6 +110,12 @@ $chartStripesColor: var(--chartStripesColor);
 $chartCapacityColor: var(--chartCapacityColor);
 $pieChartDefaultColor: var(--pieChartDefaultColor);
 
+// Cluster Menu
+$clusterMenuBackground: var(--clusterMenuBackground);
+$clusterMenuBorderColor: var(--clusterMenuBorderColor);
+$clusterSettingsBackground: var(--clusterSettingsBackground);
+$addClusterIconColor: var(--addClusterIconColor);
+
 // Misc
 $boxShadow: var(--boxShadow);
 $iconActiveColor: var(--iconActiveColor);