diff --git a/scss/_layout.scss b/scss/_layout.scss
index 09da687b..68f6fb7a 100644
--- a/scss/_layout.scss
+++ b/scss/_layout.scss
@@ -34,6 +34,7 @@
   flex-shrink: 0;
   justify-content: flex-start;
   transform: translateZ(0); // mobile webkit smooth scrolling
+  @include material-animation-default();
 }
 
 // Content layout, belongs in a mdb-layout-container
@@ -46,7 +47,7 @@
   overflow-y: auto; // mobile webkit smooth scrolling may need scroll, but auto seems to be working and omits the scroll border
   flex-grow: 1;
   -webkit-overflow-scrolling: touch; // mobile webkit smooth scrolling
-
+  @include material-animation-default();
 }
 
 // Pushes flex-based content to the other end (x or y)
diff --git a/scss/_variables.scss b/scss/_variables.scss
index d9be9d70..0b12f299 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -33,11 +33,6 @@ $mdb-brand-inverse: $indigo !default;
 // Typography elements FIXME: review to see if we actually need these
 $icon-color: rgba($black, 0.5) !default;
 
-// ANIMATION
-$mdb-animation-curve-fast-out-slow-in: cubic-bezier(0.4, 0, 0.2, 1) !default;
-$mdb-animation-curve-linear-out-slow-in: cubic-bezier(0, 0, 0.2, 1) !default;
-$mdb-animation-curve-fast-out-linear-in: cubic-bezier(0.4, 0, 1, 1) !default;
-$mdb-animation-curve-default: $mdb-animation-curve-fast-out-slow-in !default;
 
 //---
 // FIXME: Similar but not quite the same as Bootstrap variables
@@ -105,4 +100,3 @@ $mdb-animation-curve-fast-out-slow-in: cubic-bezier(0.4, 0, 0.2, 1) !default;
 $mdb-animation-curve-linear-out-slow-in: cubic-bezier(0, 0, 0.2, 1) !default;
 $mdb-animation-curve-fast-out-linear-in: cubic-bezier(0.4, 0, 1, 1) !default;
 $mdb-animation-curve-default: $mdb-animation-curve-fast-out-slow-in !default;
-
diff --git a/scss/mixins/_drawer.scss b/scss/mixins/_drawer.scss
index 2f057eda..69c4e100 100644
--- a/scss/mixins/_drawer.scss
+++ b/scss/mixins/_drawer.scss
@@ -45,6 +45,7 @@
         }
       }
 
+      > .mdb-layout-header,
       > .mdb-layout-content {
         margin-#{$side}: 0;
       }