diff --git a/UI/WebServerResources/js/Common/Alarm.service.js b/UI/WebServerResources/js/Common/Alarm.service.js
index f568e621d..cd23b2bde 100644
--- a/UI/WebServerResources/js/Common/Alarm.service.js
+++ b/UI/WebServerResources/js/Common/Alarm.service.js
@@ -64,38 +64,40 @@
         hideDelay: 0,
         template: [
           '<md-toast>',
-          ' <md-input-container>',
-          '   <label style="color: white;">' + data.summary + '</label>',
-          '   <md-select ng-model="reminder">',
-          '    <md-option value=5>',
-                 l('5 minutes'),
-          '    </md-option>',
-          '    <md-option value=10>',
-                 l('10 minutes'),
-          '    </md-option>',
-          '    <md-option value=15>',
-                 l('15 minutes'),
-          '    </md-option>',
-          '    <md-option value=30>',
-                 l('30 minutes'),
-          '    </md-option>',
-          '    <md-option value=45>',
-                 l('45 minutes'),
-          '    </md-option>',
-          '    <md-option value=60>',
-                 l('1 hour'),
-          '    </md-option>',
-          '    <md-option value=1440>',
-                 l('1 day'),
-          '    </md-option>',
-          '  </md-select>',
-          ' </md-input-container>',
-          ' <md-button ng-click="cancel()">',
-              l('Cancel'),
-          ' </md-button>',
-          ' <md-button ng-click="ok()">',
-              l('Ok'),
-          ' </md-button>',
+          '  <div class="md-toast-content">',
+          '    <md-input-container>',
+          '      <label style="color: white;">' + data.summary + '</label>',
+          '      <md-select ng-model="reminder">',
+          '       <md-option value=5>',
+                    l('5 minutes'),
+          '       </md-option>',
+          '       <md-option value=10>',
+                    l('10 minutes'),
+          '       </md-option>',
+          '       <md-option value=15>',
+                    l('15 minutes'),
+          '       </md-option>',
+          '       <md-option value=30>',
+                    l('30 minutes'),
+          '       </md-option>',
+          '       <md-option value=45>',
+                    l('45 minutes'),
+          '       </md-option>',
+          '       <md-option value=60>',
+                    l('1 hour'),
+          '       </md-option>',
+          '       <md-option value=1440>',
+                    l('1 day'),
+          '       </md-option>',
+          '     </md-select>',
+          '    </md-input-container>',
+          '    <md-button ng-click="cancel()">',
+                 l('Cancel'),
+          '    </md-button>',
+          '    <md-button ng-click="ok()">',
+                 l('Ok'),
+          '    </md-button>',
+          '  </div>',
           '</md-toast>'
         ].join(''),
         locals: {
diff --git a/UI/WebServerResources/js/Common/navController.js b/UI/WebServerResources/js/Common/navController.js
index 392a56e8f..265ab4997 100644
--- a/UI/WebServerResources/js/Common/navController.js
+++ b/UI/WebServerResources/js/Common/navController.js
@@ -74,8 +74,10 @@
       $mdToast.show({
         template: [
           '<md-toast>',
-          '  <md-icon class="md-warn md-hue-1">error_outline</md-icon>',
-          '  <span flex>' + l(message) + '</span>',
+          '  <div class="md-toast-content">',
+          '    <md-icon class="md-warn md-hue-1">error_outline</md-icon>',
+          '    <span flex>' + l(message) + '</span>',
+          '  </div>',
           '</md-toast>'
         ].join(''),
         hideDelay: 5000,
diff --git a/UI/WebServerResources/js/Contacts/AddressBooksController.js b/UI/WebServerResources/js/Contacts/AddressBooksController.js
index 019fdacd2..1a30dab92 100644
--- a/UI/WebServerResources/js/Contacts/AddressBooksController.js
+++ b/UI/WebServerResources/js/Contacts/AddressBooksController.js
@@ -161,8 +161,10 @@
             $mdToast.show({
               template: [
                 '<md-toast>',
-                '  <md-icon class="md-warn md-hue-1">error_outline</md-icon>',
-                '  <span>' + l('An error occured while importing contacts.') + '</span>',
+                '  <div class="md-toast-content">',
+                '    <md-icon class="md-warn md-hue-1">error_outline</md-icon>',
+                '    <span>' + l('An error occured while importing contacts.') + '</span>',
+                '  </div>',
                 '</md-toast>'
               ].join(''),
               position: 'top right',
@@ -183,8 +185,10 @@
             $mdToast.show({
               template: [
                 '<md-toast>',
-                '  <md-icon class="md-warn md-hue-1">error_outline</md-icon>',
-                '  <span>' + l('Select a vCard or LDIF file.') + '</span>',
+                '  <div class="md-toast-content">',
+                '    <md-icon class="md-warn md-hue-1">error_outline</md-icon>',
+                '    <span>' + l('Select a vCard or LDIF file.') + '</span>',
+                '  </div>',
                 '</md-toast>'
               ].join(''),
               position: 'top right',
diff --git a/UI/WebServerResources/js/Preferences/PreferencesController.js b/UI/WebServerResources/js/Preferences/PreferencesController.js
index fcfe5739c..dd7bbff3b 100644
--- a/UI/WebServerResources/js/Preferences/PreferencesController.js
+++ b/UI/WebServerResources/js/Preferences/PreferencesController.js
@@ -249,10 +249,12 @@
             controller: 'savePreferencesToastCtrl',
             template: [
               '<md-toast>',
-              '   <span flex>' + l('Preferences saved') + '</span>',
-              '   <md-button class="md-icon-button md-primary" ng-click="closeToast()">',
+              '  <div class="md-toast-content">',
+              '    <span flex>' + l('Preferences saved') + '</span>',
+              '    <md-button class="md-icon-button md-primary" ng-click="closeToast()">',
               '      <md-icon>close</md-icon>',
-              '   </md-button>',
+              '    </md-button>',
+              '  </div>',
               '</md-toast>'
             ].join(''),
             hideDelay: 2000,
diff --git a/UI/WebServerResources/js/Scheduler/CalendarsController.js b/UI/WebServerResources/js/Scheduler/CalendarsController.js
index 8ee4c0894..e77559b1b 100644
--- a/UI/WebServerResources/js/Scheduler/CalendarsController.js
+++ b/UI/WebServerResources/js/Scheduler/CalendarsController.js
@@ -158,8 +158,10 @@
             $mdToast.show({
               template: [
                 '<md-toast>',
-                '  <md-icon class="md-warn md-hue-1">error_outline</md-icon>',
-                '  <span>' + l('An error occurred while importing calendar.') + '</span>',
+                '  <div class="md-toast-content">',
+                '    <md-icon class="md-warn md-hue-1">error_outline</md-icon>',
+                '    <span>' + l('An error occurred while importing calendar.') + '</span>',
+                '  </div>',
                 '</md-toast>'
               ].join(''),
               position: 'top right',
@@ -180,8 +182,10 @@
             $mdToast.show({
               template: [
                 '<md-toast>',
-                '  <md-icon class="md-warn md-hue-1">error_outline</md-icon>',
-                '  <span>' + l('Select an iCalendar file (.ics).') + '</span>',
+                '  <div class="md-toast-content">',
+                '    <md-icon class="md-warn md-hue-1">error_outline</md-icon>',
+                '    <span>' + l('Select an iCalendar file (.ics).') + '</span>',
+                '  </div>',
                 '</md-toast>'
               ].join(''),
               position: 'top right',