diff --git a/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox b/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox
index 68737bd0c..253b09408 100644
--- a/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox
+++ b/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox
@@ -7,7 +7,7 @@
 
   <div layout="column" class="layout-fill sg-reversible">
     <md-card style="overflow: hidden">
-      <md-card-actions layout="row" layout-align="end center">
+      <md-card-actions flex="none" layout="row" layout-align="end center">
         <md-button class="md-icon-button"
                    label:aria-label="Cancel"
                    ng-click="editor.cancel()">
diff --git a/UI/Templates/ContactsUI/UIxContactViewTemplate.wox b/UI/Templates/ContactsUI/UIxContactViewTemplate.wox
index f5729b1f1..36ff7a71f 100644
--- a/UI/Templates/ContactsUI/UIxContactViewTemplate.wox
+++ b/UI/Templates/ContactsUI/UIxContactViewTemplate.wox
@@ -8,7 +8,7 @@
   <div class="sg-reversible" ng-class="{ 'sg-flip': editor.showRawSource }">
     <div layout="column" class="layout-fill sg-face">
       <md-card>
-        <md-card-actions layout="row" layout-align="end center">
+        <md-card-actions flex="none" layout="row" layout-align="end center">
           <md-button class="sg-icon-button hide show-xs"
                      label:aria-label="Close"
                      ng-click="editor.close()">
@@ -183,7 +183,7 @@
     </div>
     <div class="layout-fill sg-back" layout="column">
       <md-card>
-        <md-card-actions layout="row" layout-align="end center">
+        <md-card-actions flex="none" layout="row" layout-align="end center">
           <md-button class="md-icon-button"
                      label:aria-label="Close"
                      ng-click="editor.toggleRawSource()">
diff --git a/UI/Templates/MailerUI/UIxMailViewTemplate.wox b/UI/Templates/MailerUI/UIxMailViewTemplate.wox
index 769defd4b..ae9ed16ac 100644
--- a/UI/Templates/MailerUI/UIxMailViewTemplate.wox
+++ b/UI/Templates/MailerUI/UIxMailViewTemplate.wox
@@ -10,7 +10,7 @@
   <div class="sg-reversible" ng-class="{ 'sg-flip': viewer.showRawSource }">
     <div layout="column" class="layout-fill sg-face">
       <md-card>
-        <md-card-actions layout="row">
+        <md-card-actions flex="none" layout="row" layout-align="end center">
           <md-button class="md-icon-button"
                      ng-if="isPopup"
                      label:aria-label="Close"
@@ -21,7 +21,7 @@
                      ng-hide="isPopup"
                      label:aria-label="Close"
                      ng-click="viewer.close()">
-            <md-icon>arrow_back</md-icon>
+            <md-icon>close</md-icon>
           </md-button>
           <div class="md-flex"><!-- spacer --></div>
           <md-button class="sg-icon-button" label:aria-label="flagged" ng-click="viewer.message.toggleFlag()">
@@ -162,10 +162,10 @@
                   label:placeholder="Add a tag">
                 <md-item-template>
                   <div layout="row" layout-align="start center">
-                  <div class="sg-color-chip"
-                       ng-style="{'background-color': tag.color}"><!-- color --></div>
-                  <div md-highlight-text="viewer.tags.searchText"
-                       md-highlight-flags="^i">{{tag.description}}</div>
+                    <div class="sg-color-chip"
+                         ng-style="{'background-color': tag.color}"><!-- color --></div>
+                    <div md-highlight-text="viewer.tags.searchText"
+                         md-highlight-flags="^i">{{tag.description}}</div>
                   </div>
                 </md-item-template>
               </md-autocomplete>
@@ -237,7 +237,8 @@
     </div>
     <div class="layout-fill sg-back" layout="column">
       <md-card>
-        <md-card-actions layout="row" layout-align="end center">
+        <md-card-actions flex="none" layout="row" layout-align="end center">
+          <div class="md-flex"><!-- spacer --></div>
           <md-button class="md-icon-button"
                      label:aria-label="Close"
                      ng-click="viewer.toggleRawSource()">
diff --git a/UI/Templates/SchedulerUI/UIxCalDayTable.wox b/UI/Templates/SchedulerUI/UIxCalDayTable.wox
index 90ee643cb..555ce7467 100644
--- a/UI/Templates/SchedulerUI/UIxCalDayTable.wox
+++ b/UI/Templates/SchedulerUI/UIxCalDayTable.wox
@@ -40,7 +40,7 @@
 
     <var:if condition="isMultiColumnView">
       <!-- Calendars names in multicolumn day view -->
-      <div class="days">
+      <div class="days dayLabels">
         <div class="day multicolumnDay"
              ng-repeat="view in calendar.views"
              ng-class="view.calendar.getClassName('bdr')">
diff --git a/UI/Templates/SchedulerUI/UIxCalDayView.wox b/UI/Templates/SchedulerUI/UIxCalDayView.wox
index e26d3bdf4..664367f74 100644
--- a/UI/Templates/SchedulerUI/UIxCalDayView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalDayView.wox
@@ -8,7 +8,7 @@
     xmlns:label="OGo:label">
 
   <md-card>
-    <md-card-actions layout="row" layout-align="start center">
+    <md-card-actions flex="none" layout="row" layout-align="start center">
       <md-button class="md-icon-button"
                  label:aria-label="Previous Day"
                  var:date="prevDayQueryParameters.day"
diff --git a/UI/Templates/SchedulerUI/UIxCalMonthView.wox b/UI/Templates/SchedulerUI/UIxCalMonthView.wox
index d9e02f07a..9489899aa 100644
--- a/UI/Templates/SchedulerUI/UIxCalMonthView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMonthView.wox
@@ -8,7 +8,7 @@
     xmlns:label="OGo:label">
 
   <md-card>
-    <md-card-actions layout="row" layout-align="start center">
+    <md-card-actions flex="none" layout="row" layout-align="start center">
       <md-button class="md-icon-button"
                  label:aria-label="Previous Month"
                  var:date="prevMonthQueryParameters.day"
diff --git a/UI/Templates/SchedulerUI/UIxCalMulticolumnDayView.wox b/UI/Templates/SchedulerUI/UIxCalMulticolumnDayView.wox
index 2a3deb458..c0f337c6a 100644
--- a/UI/Templates/SchedulerUI/UIxCalMulticolumnDayView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMulticolumnDayView.wox
@@ -8,7 +8,7 @@
     xmlns:label="OGo:label">
 
   <md-card>
-    <md-card-actions layout="row" layout-align="start center">
+    <md-card-actions flex="none" layout="row" layout-align="start center">
       <md-button class="md-icon-button"
                  label:aria-label="Previous Day"
                  var:date="prevDayQueryParameters.day"
diff --git a/UI/Templates/SchedulerUI/UIxCalWeekView.wox b/UI/Templates/SchedulerUI/UIxCalWeekView.wox
index f6a442727..eaba8db05 100644
--- a/UI/Templates/SchedulerUI/UIxCalWeekView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalWeekView.wox
@@ -8,7 +8,7 @@
     xmlns:label="OGo:label">
 
   <md-card>
-    <md-card-actions layout="row" layout-align="start center">
+    <md-card-actions flex="none" layout="row" layout-align="start center">
       <md-button class="md-icon-button"
                  label:aria-label="Previous Week"
                  var:date="prevWeekQueryParameters.day"
diff --git a/UI/WebServerResources/scss/views/SchedulerUI.scss b/UI/WebServerResources/scss/views/SchedulerUI.scss
index 87603a01d..baf4426ea 100644
--- a/UI/WebServerResources/scss/views/SchedulerUI.scss
+++ b/UI/WebServerResources/scss/views/SchedulerUI.scss
@@ -61,6 +61,7 @@ $quarter_height: 10px;
 
   // The days labels appear in the toolbar
   md-toolbar {
+    min-height: 0;
     &.daysView, &.monthView {
       background-color: #fff;
       z-index: $z-index-toolbar - 1;
@@ -70,6 +71,7 @@ $quarter_height: 10px;
           overflow-y: scroll;
         }
         &.dayLabels {
+          min-height: 0;
           .day {
             padding-left: 1%;
             div {
@@ -79,10 +81,6 @@ $quarter_height: 10px;
         }
       }
     }
-    &.daysView {
-      // Toolbar of day/week views
-      min-height: inherit;
-    }
     &[sg-view$=dayview] {
       // Toolbar of day view only
       .dayLabels {
@@ -104,6 +102,7 @@ $quarter_height: 10px;
   .allDaysView {
     border-bottom: 1px solid sg-color($sogoPaper, 300);
     max-height: $sg-font-size-4 * 6;
+    min-height: 0;
     overflow: hidden;
     overflow-y: scroll;
 
@@ -154,6 +153,9 @@ $quarter_height: 10px;
     right: 0;
     top: 0;
     bottom: 0;
+    md-card-actions {
+      min-height: 0;
+    }
   }
 
   md-content[sg-calendar-scroll-view] {