diff --git a/UI/Templates/ContactsUI/UIxContactFolderLinksTemplate.wox b/UI/Templates/ContactsUI/UIxContactFolderLinksTemplate.wox
index 6eeb72893..7376433a5 100644
--- a/UI/Templates/ContactsUI/UIxContactFolderLinksTemplate.wox
+++ b/UI/Templates/ContactsUI/UIxContactFolderLinksTemplate.wox
@@ -6,38 +6,37 @@
     xmlns:const="http://www.skyrix.com/od/constant"
     xmlns:label="OGo:label"
     >
+  <md-dialog flex="40">
+    <md-toolbar class="sg-padded">
+      <div class="md-toolbar-tools">
+        <div class="pseudo-input-container md-flex">
+          <label class="pseudo-input-label"><var:string label:value="Links to this Address Book"/></label>
+          <div class="pseudo-input-field sg-md-title"><var:string value="addressBook.displayName"/></div>
+        </div>
+        <md-button class="md-icon-button" ng-click="close()">
+          <md-icon aria-label="Close dialog">close</md-icon>
+        </md-button>
+      </div>
+    </md-toolbar>
 
-  <md-dialog>
     <md-dialog-content>
-      <div  layout="column" layout-padding="layout-padding">
-
+      <div layout="column" layout-padding="layout-padding">
+        <div class="sg-md-title"><var:string label:value="Authenticated User Access"/></div>
+        <md-input-container>
+          <label><var:string label:value="CardDAV URL: "/></label>
+          <input var:value="cardDavURL" ng-readonly="true"/>
+        </md-input-container>
+      </div>
+      <var:if condition="isPublicAccessEnabled">
         <div layout="column" layout-padding="layout-padding">
-          <span><var:string label:value="Authenticated User Access"/></span>
-          
+          <div class="sg-md-title"><var:string label:value="Public Access"/></div>
           <md-input-container>
             <label><var:string label:value="CardDAV URL: "/></label>
-            <input var:value="cardDavURL" ng-readonly="true"/>
+            <input var:value="publicCardDavURL" ng-readonly="true"/>
           </md-input-container>
         </div>
-        
-        <var:if condition="isPublicAccessEnabled">
-          <div layout="column" layout-padding="layout-padding">
-            <span><var:string label:value="Public Access"/></span>
-
-            <md-input-container>
-              <label><var:string label:value="CardDAV URL: "/></label>
-              <input var:value="publicCardDavURL" ng-readonly="true"/>
-            </md-input-container>
-          </div>
-
-        </var:if>
-      </div>
-        
-      <md-button type="button" ng-click="close()">
-        <var:string label:value="OK"/>
-      </md-button>
-      
+      </var:if>
     </md-dialog-content>
   </md-dialog>
-  
+
 </container>
diff --git a/UI/Templates/SchedulerUI/UIxCalendarProperties.wox b/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
index 111db07cb..72866086d 100644
--- a/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
+++ b/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
@@ -6,8 +6,13 @@
     xmlns:const="http://www.skyrix.com/od/constant"
     xmlns:label="OGo:label"
     >
-
   <md-dialog>
+    <md-toolbar class="sg-padded">
+      <div class="pseudo-input-container">
+        <label class="pseudo-input-label"><var:string label:value="Properties"/></label>
+        <div class="pseudo-input-field sg-md-title">{{properties.calendar.name}}</div>
+      </div>
+    </md-toolbar>
     <md-dialog-content>
       <div id="colorPickerDialog" style="display: none;" class="dialog left">
         <div>
@@ -84,8 +89,6 @@
         </div>
       </div>
 
-      <h2 class="md-headline"><var:string label:value="Properties"/> - {{properties.calendar.name}}</h2>
-
       <md-input-container>
         <label><var:string label:value="Name:"/></label>
         <input ng-model="properties.calendar.name"/>
@@ -95,14 +98,14 @@
         <var:string label:value="Color:"/>
         <input type="color" value="{{properties.calendar.color}}"/>
       </span>
-      
+
       <md-checkbox
           ng-model="properties.calendar.includeInFreeBusy"
           ng-true-value="1"
           ng-false-value="0">
         <var:string label:value="Include in free-busy"/>
       </md-checkbox>
-      
+
       <md-checkbox
           ng-model="properties.calendar.showCalendarAlarms"
           ng-true-value="1"
@@ -125,7 +128,7 @@
         <var:string label:value="Reload on login"/>
       </md-checkbox>
 
-      
+
       <div ng-hide="properties.calendar.isWebCalendar || !properties.calendar.isOwned">
         <md-checkbox
             ng-model="properties.calendar.notifications.notifyOnPersonalModifications"
@@ -140,7 +143,7 @@
             ng-false-value="0">
           <var:string label:value="Receive a mail when someone else modifies my calendar"/>
         </md-checkbox>
-        
+
         <md-checkbox
             ng-model="properties.calendar.notifications.notifyUserOnPersonalModifications"
             ng-true-value="1"
@@ -153,13 +156,12 @@
                ng-disabled="!properties.calendar.notifications.notifyUserOnPersonalModifications"/>
       </div>
 
-      
-      <div class="md-actions">
-        <md-button ng-click="properties.close()"><var:string label:value="Cancel"/></md-button>
-        <md-button class="md-primitive" ng-click="properties.saveProperties()"><var:string label:value="Save"/></md-button>
-      </div>
-      
     </md-dialog-content>
-  </md-dialog>
 
+    <div class="md-actions">
+      <md-button type="button" ng-click="properties.close()"><var:string label:value="Cancel"/></md-button>
+      <md-button type="button" ng-click="properties.saveProperties()"><var:string label:value="Save"/></md-button>
+    </div>
+
+  </md-dialog>
 </container>
diff --git a/UI/Templates/UIxAclEditor.wox b/UI/Templates/UIxAclEditor.wox
index 9b0b3761d..14b4ab6dc 100644
--- a/UI/Templates/UIxAclEditor.wox
+++ b/UI/Templates/UIxAclEditor.wox
@@ -7,8 +7,13 @@
     xmlns:label="OGo:label"
     >
   <md-dialog flex="50" flex-sm="100">
+    <md-toolbar class="sg-padded">
+      <div class="pseudo-input-container">
+        <label class="pseudo-input-label"><var:string label:value="Access Rights"/></label>
+        <div class="pseudo-input-field sg-md-title">{{acl.folder.name}}</div>
+      </div>
+    </md-toolbar>
     <md-dialog-content>
-      <h2 class="md-headline"><var:string label:value="Access Rights"/> - {{acl.folder.name}}</h2>
       <md-card ng-repeat="user in acl.users | orderBy:['userClass', 'displayName']"
                ng-click="acl.selectUser(user)"
                ng-class="{ 'sg-collapsed': user.uid != acl.selectedUser.uid, 'sg-expanded': user.uid == acl.selectedUser.uid }">