diff --git a/UI/Templates/ContactsUI/UIxContactFoldersView.wox b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
index 36695f22d..51d28cf34 100644
--- a/UI/Templates/ContactsUI/UIxContactFoldersView.wox
+++ b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
@@ -177,7 +177,7 @@
 
   <script type="text/ng-template" id="addressbook">
     <md-toolbar layout="column" layout-align="space-between start" class="md-tall toolbar-main">
-      <div class="md-toolbar-tools md-toolbar-tools-top sg-padded" layout="row" layout-align="space-between start">
+      <div class="md-toolbar-tools md-toolbar-tools-top" layout="row" layout-align="space-between start">
         <var:component className="UIxTopnavToolbarTemplate" />
       </div>
       <div class="md-toolbar-tools" layout="row" layout-align="space-between center"
diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox
index 882bd71d9..b5331fc63 100644
--- a/UI/Templates/MailerUI/UIxMailMainFrame.wox
+++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox
@@ -347,7 +347,7 @@
 
   <script type="text/ng-template" id="UIxMailFolderTemplate">
     <md-toolbar layout="column" layout-align="space-between start" class="md-tall toolbar-main" >
-      <div class="md-toolbar-tools md-toolbar-tools-top sg-padded"
+      <div class="md-toolbar-tools md-toolbar-tools-top"
            layout="row" layout-align="space-between start">
         <var:component className="UIxTopnavToolbarTemplate" />
       </div>
diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index 2af5d7ed3..5a3823376 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -58,7 +58,7 @@
 
       <!-- TOP RIGHT TOOLBAR -->
       <md-toolbar layout="row" layout-align="space-between start" class="md-tall">
-        <div class="md-toolbar-tools md-toolbar-tools-top sg-padded" layout="row" layout-align="space-between start">
+        <div class="md-toolbar-tools md-toolbar-tools-top" layout="row" layout-align="space-between start">
           <var:component className="UIxTopnavToolbarTemplate" />
         </div>
         <md-button type="button" class="md-fab md-fab-bottom-right md-fab-overlap-bottom"
diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox
index 46ea56fa2..ef28b1ad1 100644
--- a/UI/Templates/SchedulerUI/UIxCalMainView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox
@@ -308,7 +308,7 @@
     <section layout="column" class="sg-app-content layout-fill"
              ng-controller="CalendarListController as list">
       <md-toolbar layout="column" layout-align="space-between start" class="md-tall toolbar-main">
-        <div class="md-toolbar-tools md-toolbar-tools-top sg-padded" layout="row" layout-align="space-between start">
+        <div class="md-toolbar-tools md-toolbar-tools-top" layout="row" layout-align="space-between start">
           <var:component className="UIxTopnavToolbarTemplate" />
           <!-- <div class="sg-toolbar-group-2">
             <md-button class="sg-icon-button" label:aria-label="Search">
@@ -516,7 +516,7 @@
             </md-input-container>
           </div>
           <!-- day/week/month views -->
-          <div class="sg-padded">
+          <div>
             <a class="sg-icon-button md-button"
                label:aria-label="Day"
                href="#/calendar/day"><md-icon>view_day</md-icon></a>
diff --git a/UI/Templates/UIxTopnavToolbarTemplate.wox b/UI/Templates/UIxTopnavToolbarTemplate.wox
index 94503efdd..39239095d 100644
--- a/UI/Templates/UIxTopnavToolbarTemplate.wox
+++ b/UI/Templates/UIxTopnavToolbarTemplate.wox
@@ -11,7 +11,7 @@
                label:aria-label="Toggle Menu">
       <md-icon>menu</md-icon>
     </md-button>
-    <div class="sg-date-group" layout="column" layout-align="space-between end">
+    <div class="sg-date-group sg-padded" layout="column" layout-align="space-between end">
       <p class="sg-day" ng-bind="currentDay.weekday"><!-- weekday --></p>
       <p class="sg-month" ng-bind="currentDay.month"><!-- month --></p>
       <p class="sg-year" ng-bind="currentDay.year"><!-- year --></p>
@@ -22,7 +22,7 @@
   <div class="sg-toolbar-group-last">
     <md-menu layout-fill="layout-fill">
       <md-button label:aria-label="Modules"
-                 class="md-icon-button" ng-click="$mdOpenMenu($event)">
+                 class="sg-icon-button" ng-click="$mdOpenMenu($event)">
         <md-icon>apps</md-icon>
       </md-button>
       <md-menu-content width="8">