diff --git a/UI/Templates/PreferencesUI/UIxAccountEditor.wox b/UI/Templates/PreferencesUI/UIxAccountEditor.wox
index c3c64a5ee..2c5133f6d 100644
--- a/UI/Templates/PreferencesUI/UIxAccountEditor.wox
+++ b/UI/Templates/PreferencesUI/UIxAccountEditor.wox
@@ -10,16 +10,23 @@
     className="UIxPageFrame"
     >
   <md-dialog flex="50" flex-sm="100">
-    <md-dialog-content>
-
-      <form id="mainForm" name="accountForm" var:href="ownPath">
-
+    <md-toolbar class="md-padding">
+      <div class="md-toolbar-tools">
+        <md-icon class="material-icons sg-icon-toolbar-bg">account_box</md-icon>
         <md-input-container>
           <label><var:string label:value="Account Name"/></label>
           <input type="text" required="required"
                  ng-readonly="$AccountDialogController.accountId == 0"
                  ng-model="$AccountDialogController.account.name"/>
         </md-input-container>
+        <md-button type="button" class="sg-icon-button " ng-click="$AccountDialogController.cancel()">
+          <md-icon>close</md-icon>
+        </md-button>
+      </div>
+    </md-toolbar>
+    <md-dialog-content>
+
+      <form id="mainForm" name="accountForm" var:href="ownPath">
 
         <md-input-container>
           <label><var:string label:value="Server Name"/></label>
@@ -130,7 +137,6 @@
       </form>
     </md-dialog-content>
     <div class="md-actions">
-      <md-button type="button" ng-click="$AccountDialogController.cancel()"><var:string label:value="Cancel"/></md-button>
       <md-button ng-disabled="$AccountDialogController.accountForm.$invalid" ng-click="$AccountDialogController.save()"><var:string label:value="Save"/></md-button>
     </div>
   </md-dialog>