diff --git a/src/app/components/layout/animations.ts b/src/app/components/layout/animations.ts
index 03e5adbfe..e4af8ad07 100644
--- a/src/app/components/layout/animations.ts
+++ b/src/app/components/layout/animations.ts
@@ -25,8 +25,14 @@
 
 import { trigger, transition, animate, style, state } from '@angular/animations';
 
-export const miniSidenavAnimation = trigger('miniSidenavAnimation', [
+export const sidenavAnimation = trigger('sidenavAnimation', [
     state('expanded', style({ width: '{{ width }}px' }), { params : { width: 0 } }),
     state('compact',  style({ width: '{{ width }}px' }), { params : { width: 0 } }),
     transition('compact <=> expanded', animate('0.4s cubic-bezier(0.25, 0.8, 0.25, 1)'))
 ]);
+
+export const contentAnimation = trigger('contentAnimation', [
+    state('expanded', style({ 'margin-left': '{{ marginLeft }}px' }), { params : { marginLeft: 0 } }),
+    state('compact',  style({'margin-left': '{{ marginLeft }}px' }), { params : { marginLeft: 0 } }),
+    transition('expanded <=> compact', animate('400ms cubic-bezier(0.25, 0.8, 0.25, 1)'))
+]);
diff --git a/src/app/components/layout/layout-container.component.html b/src/app/components/layout/layout-container.component.html
index 7b475c801..7eda7146f 100644
--- a/src/app/components/layout/layout-container.component.html
+++ b/src/app/components/layout/layout-container.component.html
@@ -1,13 +1,13 @@
 <mat-sidenav-container>
     <mat-sidenav
-        [ngClass]="{ 'sidenav--hide': hideSidenav }"
-        [@miniSidenavAnimation]="sidenavAnimationState"
+        [ngClass]="{ 'sidenav--hidden': hideSidenav }"
+        [@sidenavAnimation]="sidenavAnimationState"
         [opened]="!mobileQuery.matches"
         [mode]="mobileQuery.matches ? 'over' : 'side'">
         <ng-content sidenav select="[app-layout-navigation]"></ng-content>
     </mat-sidenav>
 
-    <mat-sidenav-content [style.marginLeft.px]="sidenavAnimationState.params.width">
+    <mat-sidenav-content [@contentAnimation]="contentAnimationState">
         <ng-content select="[app-layout-content]"></ng-content>
     </mat-sidenav-content>
 </mat-sidenav-container>
diff --git a/src/app/components/layout/layout-container.component.scss b/src/app/components/layout/layout-container.component.scss
index fe5137823..eca3fb0e3 100644
--- a/src/app/components/layout/layout-container.component.scss
+++ b/src/app/components/layout/layout-container.component.scss
@@ -1,9 +1,3 @@
-@mixin transition($property) {
-    transition-property: $property !important;
-    transition-duration: 0.4s !important;
-    transition-timing-function: cubic-bezier(0.25, 0.8, 0.25, 1) !important;
-}
-
 :host {
     display: block;
     width: 100%;
@@ -18,8 +12,11 @@ ng-content {
     overflow: hidden;
 }
 
-.sidenav--hide {
+.sidenav--hidden {
     visibility: hidden !important;
+    width: 0 !important;
+    transform: unset !important;
+    opacity: 0 !important;
 }
 
 .mat-sidenav-container {
@@ -33,10 +30,10 @@ ng-content {
     overflow: hidden;
 }
 
-.mat-sidenav-content {
-    @include transition('margin-left');
-}
-
+.mat-sidenav-content,
 .mat-drawer-transition .mat-drawer-content {
-    @include transition('margin-left');
+    transform: unset !important;
+    transition-property: unset !important;
+    transition-duration: unset !important;
+    transition-timing-function: unset !important;
 }
diff --git a/src/app/components/layout/layout-container.component.ts b/src/app/components/layout/layout-container.component.ts
index 0c154aeaa..4a696e940 100644
--- a/src/app/components/layout/layout-container.component.ts
+++ b/src/app/components/layout/layout-container.component.ts
@@ -26,14 +26,13 @@
 import { Component, Input, ViewChild, OnInit, OnDestroy } from '@angular/core';
 import { MatSidenav } from '@angular/material';
 import {MediaMatcher} from '@angular/cdk/layout';
-
-import { miniSidenavAnimation } from './animations';
+import { sidenavAnimation, contentAnimation } from './animations';
 
 @Component({
     selector: 'app-layout-container',
     templateUrl: './layout-container.component.html',
     styleUrls: ['./layout-container.component.scss'],
-    animations: [ miniSidenavAnimation ]
+    animations: [ sidenavAnimation, contentAnimation ]
 })
 export class LayoutContainerComponent implements OnInit, OnDestroy {
     static STEP_OVER = 600;
@@ -46,6 +45,7 @@ export class LayoutContainerComponent implements OnInit, OnDestroy {
     @ViewChild(MatSidenav) sidenav: MatSidenav;
 
     sidenavAnimationState: any;
+    contentAnimationState: any;
     isMenuMinimized = false;
     mobileQuery: MediaQueryList;
 
@@ -55,9 +55,11 @@ export class LayoutContainerComponent implements OnInit, OnDestroy {
 
     ngOnInit() {
         const stepOver = this.stepOver || LayoutContainerComponent.STEP_OVER;
+
         this.mobileQuery = this.mediaMatcher.matchMedia(`(max-width: ${stepOver}px)`);
         this.mobileQuery.addListener(this.mobileQueryListener);
         this.sidenavAnimationState = { value: 'expanded', params: { width: this.sidenavMax } };
+        this.contentAnimationState = { value: 'compact', params: {marginLeft: this.sidenavMax } };
     }
 
     ngOnDestroy(): void {
@@ -65,23 +67,39 @@ export class LayoutContainerComponent implements OnInit, OnDestroy {
     }
 
     toggleMenu(): void {
-
         if (!this.mobileQuery.matches) {
             this.isMenuMinimized = !this.isMenuMinimized;
-
-            this.sidenavAnimationState =
-                this.sidenavAnimationState.value === 'expanded'
-                    ? { value: 'compact', params: {width: this.sidenavMin } }
-                    : { value: 'expanded', params: { width: this.sidenavMax } };
-
+            this.sidenavAnimationState = this.sidenavAnimation();
+            this.contentAnimationState = this.contentAnimation();
         } else {
             this.isMenuMinimized = false;
             this.sidenav.toggle();
         }
     }
 
+    sidenavAnimation() {
+        return this.sidenavAnimationState.value === 'expanded'
+            ? { value: 'compact', params: {width: this.sidenavMin } }
+            : { value: 'expanded', params: { width: this.sidenavMax } };
+    }
+
+    contentAnimation() {
+        if (this.mobileQuery.matches) {
+            return { value: 'expanded', params: { marginLeft: 0 } };
+        }
+
+        if (this.sidenavAnimationState.value === 'expanded') {
+            return { value: 'compact', params: { marginLeft: this.sidenavMax } };
+        }
+
+        if (this.sidenavAnimationState.value === 'compact') {
+            return { value: 'expanded', params: { marginLeft: this.sidenavMin } };
+        }
+    }
+
     private mobileQueryListener() {
         this.isMenuMinimized = false;
         this.sidenavAnimationState = { value: 'expanded', params: { width: this.sidenavMax } };
+        this.contentAnimationState = this.contentAnimation();
     }
 }