diff --git a/src/less/components/app-bar.less b/src/less/components/app-bar.less
index 3f1887a7334edd..2f949724015b04 100644
--- a/src/less/components/app-bar.less
+++ b/src/less/components/app-bar.less
@@ -9,7 +9,7 @@
   }
 
   .mui-icon-button {
-    margin-top: 8px;
+    margin-top: ((@app-bar-height - @icon-button-size) / 2);
     color: @app-bar-text-color;
   }
 
@@ -23,10 +23,10 @@
 
   .mui-app-bar-navigation-icon-button {
     float: left;
-    
+
     margin-right: 8px;
-    
-    margin-left: -16px; 
+
+    margin-left: -16px;
   }
 
-}
\ No newline at end of file
+}
diff --git a/src/less/components/toolbar.less b/src/less/components/toolbar.less
index 2e6f51b4a7b949..1ad368472eced1 100644
--- a/src/less/components/toolbar.less
+++ b/src/less/components/toolbar.less
@@ -3,7 +3,7 @@
   height: @toolbar-height;
   width: 100%;
   padding: 0 @desktop-gutter;
-  
+
   .mui-toolbar-group {
     position: relative;
 
@@ -18,11 +18,12 @@
       height: @desktop-gutter-more;
       margin-left: @desktop-gutter;
       position: relative;
-      top: 12px;
+      top: ((@toolbar-height - @desktop-gutter-more) / 2);
       width: 1px;
     }
 
-    .mui-raised-button {
+    .mui-raised-button,
+    .mui-flat-button {
       margin: 0 @desktop-gutter;
       margin-top: ((@toolbar-height - @button-height) / 2);
       position: relative;