diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-contextmenu.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-contextmenu.html
index a6d42d923b..820ef4a886 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-contextmenu.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-contextmenu.html
@@ -5,13 +5,9 @@
 
     <div class='umb-modalcolumn-body'>
         <ul class="umb-actions">
-            <li data-element="action-{{action.alias}}" ng-click="executeMenuItem(action)" class="umb-action" ng-class="{sep:action.separator, '-opens-dialog': action.opensDialog}" ng-repeat="action in menuActions">
-                <button class="umb-action-link btn-reset umb-outline" prevent-default umb-auto-focus ng-if="$index === 0">
-                    <i class="icon icon-{{action.cssclass}}"></i>
-                    <span class="menu-label">{{action.name}}</span>
-                </button>
-                <button class="umb-action-link btn-reset umb-outline" prevent-default ng-if="$index !== 0">
-                    <i class="icon icon-{{action.cssclass}}"></i>
+            <li data-element="action-{{action.alias}}" class="umb-action" ng-class="{sep:action.separator, '-opens-dialog': action.opensDialog}" ng-repeat="action in menuActions">
+                <button type="button" umb-auto-focus="{{$index === 0}}" ng-click="executeMenuItem(action)" class="umb-action-link btn-reset umb-outline" prevent-default>
+                    <i class="icon icon-{{action.cssclass}}" aria-hidden="true"></i>
                     <span class="menu-label">{{action.name}}</span>
                 </button>
             </li>