diff --git a/app/templates/components/edit-panel.hbs b/app/templates/components/edit-panel.hbs
index 70458f5c5d..3c027d4c6e 100644
--- a/app/templates/components/edit-panel.hbs
+++ b/app/templates/components/edit-panel.hbs
@@ -3,6 +3,13 @@
     {{yield}}
   </div>
   <div class="panel-footer">
+    {{#unless editPanelProps.hideCancelButton}}
+      {{#if editPanelProps.cancelButtonText}}
+        <button class="btn btn-default warning" {{action 'cancel'}}>{{editPanelProps.cancelButtonText}}</button>
+      {{else}}
+        <button class="btn btn-default warning" {{action 'cancel'}}>{{t 'buttons.cancel'}}</button>
+      {{/if}}
+    {{/unless}}
     {{#if editPanelProps.showUpdateButton}}
       {{#if editPanelProps.disabledAction}}
         <button class="btn btn-primary on-white disabled-btn" {{action 'disabledAction'}}>{{editPanelProps.updateButtonText}}</button>
@@ -12,13 +19,6 @@
         </button>
       {{/if}}
     {{/if}}
-    {{#unless editPanelProps.hideCancelButton}}
-      {{#if editPanelProps.cancelButtonText}}
-        <button class="btn btn-default warning" {{action 'cancel'}}>{{editPanelProps.cancelButtonText}}</button>
-      {{else}}
-        <button class="btn btn-default warning" {{action 'cancel'}}>{{t 'buttons.cancel'}}</button>
-      {{/if}}
-    {{/unless}}
     {{#each editPanelProps.additionalButtons as |button|}}
       <button class="{{button.class}}" {{action 'fireButtonAction' button.buttonAction}}>
         {{#if button.buttonIcon}}
diff --git a/app/templates/components/modal-dialog.hbs b/app/templates/components/modal-dialog.hbs
index 4499b76b9a..ae0cc0b05a 100644
--- a/app/templates/components/modal-dialog.hbs
+++ b/app/templates/components/modal-dialog.hbs
@@ -9,12 +9,12 @@
                 {{yield}}
             </div>
             <div class="modal-footer">
-                {{#unless hideUpdateButton}}
-                    <button class="btn btn-primary on-white {{updateButtonClass}}" {{action "updateAction" }} disabled={{isUpdateDisabled}}>{{ updateButtonText }}</button>
-                {{/unless}}
                 {{#unless hideCancelButton}}
                     <button class="btn btn-default warning" {{action "cancelAction"}}>{{cancelBtnText}}</button>
                 {{/unless}}
+                {{#unless hideUpdateButton}}
+                    <button class="btn btn-primary on-white {{updateButtonClass}}" {{action "updateAction" }} disabled={{isUpdateDisabled}}>{{ updateButtonText }}</button>
+                {{/unless}}
             </div>
         </div>
     </div>
diff --git a/app/users/index/template.hbs b/app/users/index/template.hbs
index cf00ce7bb7..df93bfa3e9 100644
--- a/app/users/index/template.hbs
+++ b/app/users/index/template.hbs
@@ -23,7 +23,7 @@
                   <button class="btn btn-default" {{action 'editItem' user bubbles=false }}>{{t 'labels.edit'}}</button>
                 {{/if}}
                 {{#if canDelete}}
-                  <button class="btn btn-default" {{action 'deleteItem' user bubbles=false }}>{{t 'labels.delete'}}</button>
+                  <button class="btn btn-default warning" {{action 'deleteItem' user bubbles=false }}><span class="octicon octicon-x"></span>{{t 'labels.delete'}}</button>
                 {{/if}}
               </td>
             {{/if}}