diff --git a/UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox b/UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox
index ff93cc590..488533416 100644
--- a/UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox
+++ b/UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox
@@ -79,7 +79,7 @@
                       <var:string label:value="Delegate ..." />
                     </md-button>
                     
-		    <div class="md-actions" layout="row"
+		    <md-dialog-actions layout="row"
                          layout-align="start center"
                          ng-show="delegateInvitation == true">
                       
@@ -104,7 +104,7 @@
                       <md-button class="md-primitive"
                                  ng-click="iCalendarAction('delegate')"
                                  ng-disabled="!delegatedTo || delegatedTo.length == 0"><var:string label:value="OK"/></md-button>
-                    </div>
+                    </md-dialog-actions>
 	          </var:if>
                   <!-- TODO - should we re-enable this? It never
                        worked in v2!
diff --git a/UI/Templates/MailPartViewers/UIxMailPartImageViewer.wox b/UI/Templates/MailPartViewers/UIxMailPartImageViewer.wox
index b03594228..b8d8471b7 100644
--- a/UI/Templates/MailPartViewers/UIxMailPartImageViewer.wox
+++ b/UI/Templates/MailPartViewers/UIxMailPartImageViewer.wox
@@ -16,11 +16,11 @@
         <var:string value="bodyInfo.size" formatter="sizeFormatter"/>
       </p>
     </md-card-content>
-    <div class="md-actions" layout="row" layout-align="end center">
+    <md-dialog-actions layout="row" layout-align="end center">
       <md-button class="sg-icon-button" var:href="pathForDownload">
         <md-tooltip md-direction="left"><var:string label:value="Save Attachment"/></md-tooltip>
         <md-icon>save</md-icon>
       </md-button>
-    </div>
+    </md-dialog-actions>
   </md-card>
 </container>
diff --git a/UI/Templates/MailPartViewers/UIxMailPartLinkViewer.wox b/UI/Templates/MailPartViewers/UIxMailPartLinkViewer.wox
index f22b861b0..64fc23ae4 100644
--- a/UI/Templates/MailPartViewers/UIxMailPartLinkViewer.wox
+++ b/UI/Templates/MailPartViewers/UIxMailPartLinkViewer.wox
@@ -12,7 +12,7 @@
           <var:string value="bodyInfo.size" formatter="sizeFormatter"/>
         </p>
       </md-card-content>
-    <div class="md-actions" layout="row" layout-align="end center">
+    <md-dialog-actions layout="row" layout-align="end center">
       <md-button class="sg-icon-button" var:href="pathToAttachment" target="_blank">
         <md-tooltip md-direction="left"><var:string label:value="View Attachment"/></md-tooltip>
         <md-icon>open_in_browser</md-icon>
@@ -21,7 +21,7 @@
         <md-tooltip md-direction="left"><var:string label:value="Save Attachment"/></md-tooltip>
         <md-icon>save</md-icon>
       </md-button>
-    </div>
+    </md-dialog-actions>
     
     <!-- DEBUG
          <pre><var:string value="bodyInfo"/></pre>
diff --git a/UI/Templates/MailerUI/UIxMailEditor.wox b/UI/Templates/MailerUI/UIxMailEditor.wox
index 6221e260e..1eda09a31 100644
--- a/UI/Templates/MailerUI/UIxMailEditor.wox
+++ b/UI/Templates/MailerUI/UIxMailEditor.wox
@@ -205,7 +205,7 @@
     </md-dialog-content>
 
     <!-- TOOLBAR BUTTONS -->
-    <div class="md-actions">
+    <md-dialog-actions>
       <div layout="row" layout-align="space-between center" layout-fill="layout-fill">
         <div>
           <!-- md-icon does not play well with Firefox - makes the
@@ -246,6 +246,6 @@
           </md-chips>
         </div>
       </div>
-    </div>
+    </md-dialog-actions>
   </md-dialog>
 </container>
diff --git a/UI/Templates/MainUI/SOGoRootPage.wox b/UI/Templates/MainUI/SOGoRootPage.wox
index 55761a8d1..676bc4793 100644
--- a/UI/Templates/MainUI/SOGoRootPage.wox
+++ b/UI/Templates/MainUI/SOGoRootPage.wox
@@ -108,9 +108,9 @@
         <p><var:string label:value="AboutBox" const:escapeHTML="NO"/></p>
         <!--<img class="full-image" const:alt="Inverse" rsrc:src="img/inverse.png"/>-->
       </md-dialog-content>
-      <div class="md-actions">
+      <md-dialog-actions>
         <md-button ng-click="about.closeDialog()"><var:string label:value="Close"/></md-button>
-      </div>
+      </md-dialog-actions>
     </md-dialog>
   </script>
 
diff --git a/UI/Templates/PreferencesUI/UIxAccountEditor.wox b/UI/Templates/PreferencesUI/UIxAccountEditor.wox
index b4ee5dd22..44094e29c 100644
--- a/UI/Templates/PreferencesUI/UIxAccountEditor.wox
+++ b/UI/Templates/PreferencesUI/UIxAccountEditor.wox
@@ -136,8 +136,8 @@
 
       </form>
     </md-dialog-content>
-    <div class="md-actions">
+    <md-dialog-actions>
       <md-button ng-disabled="$AccountDialogController.accountForm.$invalid" ng-click="$AccountDialogController.save()"><var:string label:value="Save"/></md-button>
-    </div>
+    </md-dialog-actions>
   </md-dialog>
 </var:component>
diff --git a/UI/Templates/PreferencesUI/UIxFilterEditor.wox b/UI/Templates/PreferencesUI/UIxFilterEditor.wox
index e065fc6e7..88653df48 100644
--- a/UI/Templates/PreferencesUI/UIxFilterEditor.wox
+++ b/UI/Templates/PreferencesUI/UIxFilterEditor.wox
@@ -170,9 +170,9 @@
         </div>
       </div>
     </md-dialog-content>
-    <div class="md-actions">
+    <md-dialog-actions>
       <md-button type="submit"><var:string label:value="Save"/></md-button>
-    </div>
+    </md-dialog-actions>
   </form>
 </md-dialog>
 </container>
diff --git a/UI/Templates/SchedulerUI/UIxCalendarProperties.wox b/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
index 440eb7693..ba60ae186 100644
--- a/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
+++ b/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
@@ -88,10 +88,10 @@
       </div>
     </md-dialog-content>
 
-    <div class="md-actions">
+    <md-dialog-actions>
       <md-button type="button" ng-click="properties.close()"><var:string label:value="Cancel"/></md-button>
       <md-button ng-click="properties.saveProperties()"><var:string label:value="Save"/></md-button>
-    </div>
+    </md-dialog-actions>
 
   </md-dialog>
 </container>
diff --git a/UI/Templates/SchedulerUI/UIxTaskEditorTemplate.wox b/UI/Templates/SchedulerUI/UIxTaskEditorTemplate.wox
index 41cdb8e44..542d27ee1 100644
--- a/UI/Templates/SchedulerUI/UIxTaskEditorTemplate.wox
+++ b/UI/Templates/SchedulerUI/UIxTaskEditorTemplate.wox
@@ -224,7 +224,7 @@
         </div>
       </md-dialog-content>
       <!-- cancel/reset/save -->
-      <div class="md-actions">
+      <md-dialog-actions>
         <md-button type="button" ng-click="editor.cancel()">
           <var:string label:value="Cancel"/>
         </md-button>
@@ -235,7 +235,7 @@
                    ng-disabled="editor.eventForm.$invalid">
           <var:string label:value="Save"/>
         </md-button>
-      </div>
+      </md-dialog-actions>
     </form>
   </md-dialog>
 </container>
diff --git a/UI/Templates/UIxAclEditor.wox b/UI/Templates/UIxAclEditor.wox
index b300310a7..dbc6e3808 100644
--- a/UI/Templates/UIxAclEditor.wox
+++ b/UI/Templates/UIxAclEditor.wox
@@ -94,10 +94,10 @@
       </md-card>
     </md-dialog-content>
 
-    <div class="md-actions" ng-hide="acl.confirmation.showing">
+    <md-dialog-actions ng-hide="acl.confirmation.showing">
       <md-button class="md-primary" ng-click="acl.saveModal()"><var:string label:value="Save"/></md-button>
-    </div>
-    <div class="md-actions" ng-show="acl.confirmation.showing">
+    </md-dialog-actions>
+    <md-dialog-actions ng-show="acl.confirmation.showing">
       <span>{{acl.confirmation.message}}</span>
       <md-button ng-click="acl.selectedUser.$resetRights(true); acl.confirmation.showing = false">
         <var:string label:value="Cancel"/>
@@ -105,7 +105,7 @@
       <md-button class="md-warn" ng-click="acl.confirmation.showing = false">
         <var:string label:value="Ok"/>
       </md-button>
-    </div>
+    </md-dialog-actions>
   </md-dialog>
 
 </container>