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 c7bba25d80..77d7fa8cf9 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,44 +1,49 @@
-:host {
+@mixin adf-layout-container-theme($theme) {
+    $foreground: map-get($theme, foreground);
+
+  adf-layout-container {
+      display: block;
+      width: 100%;
+      height: 100%;
+      overflow: hidden;
+  }
+
+  ng-content {
     display: block;
     width: 100%;
     height: 100%;
     overflow: hidden;
-}
+  }
 
-ng-content {
-    display: block;
-    width: 100%;
-    height: 100%;
-    overflow: hidden;
-}
-
-.sidenav--hidden {
+  .sidenav--hidden {
     visibility: hidden !important;
     width: 0 !important;
     transform: unset !important;
     opacity: 0 !important;
-}
+  }
 
-.mat-sidenav-container {
+  .mat-sidenav-container {
     display: block;
     width: 100%;
     height: 100%;
     overflow: hidden;
-}
+  }
 
-.mat-sidenav {
+  .mat-sidenav {
     overflow: hidden;
-}
+    border-right: 1px solid mat-color($foreground, text, 0.07);
+  }
 
 
-:host ::ng-deep mat-sidenav-content{
+  mat-sidenav-content {
     margin-left:0px !important;
-}
+  }
 
-.mat-sidenav-content,
-.mat-drawer-transition .mat-drawer-content {
+  .mat-sidenav-content,
+  .mat-drawer-transition .mat-drawer-content {
     transform: unset !important;
     transition-property: unset !important;
     transition-duration: unset !important;
     transition-timing-function: unset !important;
+  }
 }
diff --git a/lib/core/styles/_index.scss b/lib/core/styles/_index.scss
index 3bcd5123da..3755c43023 100644
--- a/lib/core/styles/_index.scss
+++ b/lib/core/styles/_index.scss
@@ -25,6 +25,7 @@
 @import '../sidebar/sidebar-action-menu.component';
 @import '../comments/comment-list.component';
 @import '../comments/comments.component';
+@import '../sidenav-layout/components/layout-container/layout-container.component';
 
 @mixin adf-core-theme($theme) {
     @include adf-colors-theme($theme);
@@ -52,6 +53,7 @@
     @include adf-sidebar-action-menu-theme($theme);
     @include adf-task-list-comment-list-theme($theme);
     @include adf-task-list-comment-theme($theme);
+    @include adf-layout-container-theme($theme);
 }