diff --git a/src/Umbraco.Web.UI.Client/src/views/templates/edit.html b/src/Umbraco.Web.UI.Client/src/views/templates/edit.html
index d24d703765..255b2c4885 100644
--- a/src/Umbraco.Web.UI.Client/src/views/templates/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/templates/edit.html
@@ -30,12 +30,11 @@
 
                                 <div ng-class="{'btn-group': vm.template.masterTemplateAlias}" style="margin-right: 10px;">
 
-                                    <button
-                                        data-element="button-masterTemplate"
-                                        type="button"
-                                        class="btn umb-button--xs"
-                                        ng-click="vm.openMasterTemplateOverlay()"
-                                        style="font-size: 14px;">
+                                    <button type="button"
+                                            data-element="button-masterTemplate"
+                                            class="btn umb-button__button umb-button--xs umb-outline"
+                                            style="font-size: 14px;"
+                                            ng-click="vm.openMasterTemplateOverlay()">
                                         <span class="bold"><localize key="template_mastertemplate">Master template</localize>:</span>
                                         <span style="margin-left: 5px;">
                                             <span ng-if="vm.template.masterTemplateAlias">{{ vm.getMasterTemplateName(vm.template.masterTemplateAlias, vm.templates) }}</span>
@@ -43,9 +42,15 @@
                                         </span>
                                     </button>
 
-                                    <a ng-if="vm.template.masterTemplateAlias" ng-click="vm.removeMasterTemplate()" class="btn umb-button--xs dropdown-toggle umb-button-group__toggle">
+                                    <button type="button"
+                                            class="btn umb-button__button umb-button--xs dropdown-toggle umb-button-group__toggle flex-inline items-center"
+                                            style="font-size: 14px; height: 100%;"
+                                            localize="title"
+                                            title="@general_remove"
+                                            ng-if="vm.template.masterTemplateAlias"
+                                            ng-click="vm.removeMasterTemplate()">
                                         <umb-icon icon="icon-wrong" class="icon icon-wrong"></umb-icon>
-                                    </a>
+                                    </button>
 
                                 </div>
 
@@ -115,6 +120,7 @@
                     type="button"
                     button-style="link"
                     label-key="general_close"
+                    shortcut="esc"
                     action="vm.close()">
                 </umb-button>