diff --git a/lib/core/sidenav-layout/components/layout-container/layout-container.component.scss b/lib/core/sidenav-layout/components/layout-container/layout-container.component.scss
index 0a457287a4..178efc1e61 100644
--- a/lib/core/sidenav-layout/components/layout-container/layout-container.component.scss
+++ b/lib/core/sidenav-layout/components/layout-container/layout-container.component.scss
@@ -1,4 +1,5 @@
 @mixin adf-layout-container-theme($theme) {
+    $background: map-get($theme, background);
     $foreground: map-get($theme, foreground);
 
     adf-layout-container {
@@ -32,6 +33,7 @@
     .mat-sidenav {
         overflow: hidden;
         border-right: 1px solid mat-color($foreground, text, 0.07);
+        background-color: mat-color($background,background);
     }
 
     mat-sidenav-content {
diff --git a/lib/core/toolbar/toolbar.component.scss b/lib/core/toolbar/toolbar.component.scss
index 8d099bb38f..ad46e3ffbc 100644
--- a/lib/core/toolbar/toolbar.component.scss
+++ b/lib/core/toolbar/toolbar.component.scss
@@ -18,7 +18,7 @@
         .mat-toolbar {
             min-height: $adf-toolbar-height;
             border: 1px solid mat-color($foreground, text, .07);
-            background-color: mat-color($background, hover, .02);
+            background-color: mat-color($background, app-bar);
         }
 
         .mat-toolbar-row {