diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 6f6b8d91..c1d570fc 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -20,10 +20,6 @@ import { ComponentsModule } from './main/content/components/components.module';
 import { FuseSplashScreenService } from './core/services/splash-screen.service';
 import { FuseConfigService } from './core/services/config.service';
 
-const PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = {
-    suppressScrollX: true
-};
-
 const appRoutes: Routes = [
     {
         path        : 'apps/mail',
@@ -69,7 +65,7 @@ const appRoutes: Routes = [
 
         InMemoryWebApiModule.forRoot(FuseFakeDbService, {delay: 125}),
 
-        PerfectScrollbarModule.forRoot(PERFECT_SCROLLBAR_CONFIG),
+        PerfectScrollbarModule.forRoot(),
 
         FuseMainModule,
 
diff --git a/src/app/core/scss/partials/_colors.scss b/src/app/core/scss/partials/_colors.scss
index 7dfe583e..8c6cc5ad 100644
--- a/src/app/core/scss/partials/_colors.scss
+++ b/src/app/core/scss/partials/_colors.scss
@@ -106,6 +106,50 @@ $matColorHues: 50, 100, 200, 300, 400, 500, 600, 700, 800, 900, A100, A200, A400
     }
 }
 
+@mixin generateMaterialElementColors($contrastColor) {
+
+    // If the contrast color is white...
+    $foreground: $mat-dark-theme-foreground;
+
+    // If the contrast color is black...
+    @if (rgba(black, 1) == rgba($contrastColor, 1)) {
+        $foreground: $mat-light-theme-foreground;
+    }
+
+    // Input
+    .mat-input-placeholder {
+        color: mat-color($foreground, hint-text);
+    }
+
+    .mat-input-underline {
+        background-color: mat-color($foreground, divider);
+    }
+
+    // Select
+    .mat-select-trigger,
+    .mat-select-arrow {
+        color: mat-color($foreground, hint-text);
+    }
+
+    .mat-select-underline {
+        background-color: mat-color($foreground, divider);
+    }
+
+    .mat-select-disabled .mat-select-value,
+    .mat-select-arrow,
+    .mat-select-trigger {
+        color: mat-color($foreground, hint-text);
+    }
+
+    .mat-select-content, .mat-select-panel-done-animating {
+        background: mat-color($background, card);
+    }
+
+    .mat-select-value {
+        color: mat-color($foreground, text);
+    }
+}
+
 // Color classes generator mixin
 @mixin generateColorClasses($colorName, $color, $contrastColor, $hue) {
 
@@ -120,6 +164,10 @@ $matColorHues: 50, 100, 200, 300, 400, 500, 600, 700, 800, 900, A100, A200, A400
         // Generate text color levels
         // based on current contrast color
         @include generateTextColorLevels($contrastColor);
+
+        // Generate material element colors
+        // based on current contrast color
+        @include generateMaterialElementColors($contrastColor);
     }
 
     .#{$colorName}#{$hue}-fg {
@@ -128,6 +176,10 @@ $matColorHues: 50, 100, 200, 300, 400, 500, 600, 700, 800, 900, A100, A200, A400
         // Generate text color levels
         // based on current contrast color
         @include generateTextColorLevels($color);
+
+        // Generate material element colors
+        // based on current contrast color
+        @include generateMaterialElementColors($color);
     }
 
     .#{$colorName}#{$hue}-border {
diff --git a/src/app/core/scss/partials/_scrollbars.scss b/src/app/core/scss/partials/_scrollbars.scss
index fc29ef16..285b5df4 100644
--- a/src/app/core/scss/partials/_scrollbars.scss
+++ b/src/app/core/scss/partials/_scrollbars.scss
@@ -1,19 +1,20 @@
 ::-webkit-scrollbar {
-    width: 8px;
-    height: 8px;
+    width: 12px;
+    height: 12px;
     background-color: rgba(0, 0, 0, 0);
-    opacity: 0;
-    border-radius: 100px;
-    &:hover {
-        background-color: #EEE;
-        opacity: 0.9;
-    }
+}
+
+::-webkit-scrollbar:hover {
+    background-color: rgba(0, 0, 0, 0.12);
 }
 
 ::-webkit-scrollbar-thumb {
-    background-color: #AAA;
-    border-radius: 100px;
-    &:active {
-        background: #999;
-    }
+    border: 2px solid transparent;
+    box-shadow: inset 0 0 0 24px rgba(0, 0, 0, 0.37);
+    border-radius: 24px;
 }
+
+::-webkit-scrollbar-thumb:active {
+    box-shadow: inset 0 0 0 24px rgba(0, 0, 0, 0.54);
+    border-radius: 24px;
+}
\ No newline at end of file
diff --git a/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.html b/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.html
index d0e364e4..616f2fb3 100644
--- a/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.html
+++ b/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.html
@@ -1,7 +1,8 @@
 <!-- SIDENAV HEADER -->
-<div class="header white-fg p-24" fxLayout="column" fxLayoutAlign="space-between start">
+<div fxLayout="column" fxLayoutAlign="space-between start"
+     class="header p-24 md-accent-bg" class.gt-md="header p-24 white-fg">
     <div class="logo" fxFlex fxLayout="row" fxLayoutAlign="start center">
-        <md-icon class="logo-icon s-32 white-fg">mail</md-icon>
+        <md-icon class="logo-icon s-32">mail</md-icon>
         <span class="logo-text">Mailbox</span>
     </div>
 
diff --git a/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.scss b/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.scss
index 947e4fba..633e6083 100644
--- a/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.scss
+++ b/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.scss
@@ -14,6 +14,7 @@
 
             .logo-text {
                 font-size: 24px;
+                line-height: 24px;
             }
         }
 
diff --git a/src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.html b/src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.html
index 15d86cbe..849f77f0 100644
--- a/src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.html
+++ b/src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.html
@@ -1,7 +1,8 @@
 <!-- SIDENAV HEADER -->
-<div class="header white-fg p-24" fxLayout="column" fxLayoutAlign="space-between start">
+<div fxLayout="column" fxLayoutAlign="space-between start"
+     class="header p-24 md-accent-bg" class.gt-md="header p-24 white-fg">
     <div class="logo" fxFlex fxLayout="row" fxLayoutAlign="start center">
-        <md-icon class="logo-icon s-32 white-fg">check_box</md-icon>
+        <md-icon class="logo-icon s-32">check_box</md-icon>
         <span class="logo-text">To-do</span>
     </div>
 
diff --git a/src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.scss b/src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.scss
index fdb4d4d7..7b2e1ffb 100644
--- a/src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.scss
+++ b/src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.scss
@@ -14,6 +14,7 @@
 
             .logo-text {
                 font-size: 24px;
+                line-height: 24px;
             }
         }
 
diff --git a/src/app/main/main.component.scss b/src/app/main/main.component.scss
index 4ef20b24..5f286a8d 100644
--- a/src/app/main/main.component.scss
+++ b/src/app/main/main.component.scss
@@ -1,9 +1,24 @@
+@import "src/app/core/scss/fuse";
+
 fuse-main {
     display: flex;
     flex-direction: column;
     width: 100%;
     height: 100%;
 
+    &.disable-perfect-scrollbar {
+
+        .ps {
+            -webkit-overflow-scrolling: touch !important;
+            overflow: auto !important;
+        }
+
+        .ps__scrollbar-x-rail,
+        .ps__scrollbar-y-rail {
+            display: none !important;
+        }
+    }
+
     > .mat-sidenav-container {
         display: flex;
         flex: 1;
@@ -14,6 +29,10 @@ fuse-main {
             overflow: hidden;
             height: 100vh;
 
+            @include media-breakpoint-down('sm') {
+                height: auto !important;
+            }
+
             #fuse-main-content {
                 display: flex;
                 flex: 1;