diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-locked-field.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-locked-field.less
index 3dd169e892..2b49348190 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-locked-field.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-locked-field.less
@@ -6,13 +6,26 @@
 }
 
 .umb-locked-field__wrapper {
-   display: flex;
-   align-items: center;
-   margin-bottom: 5px;
+  display: flex;
+  align-items: center;
+  margin-bottom: 5px;
 }
 
 .umb-locked-field__toggle {
   margin-right: 3px;
+  padding: 0;
+  background: none;
+  border: 0;
+  font-size: inherit;
+  line-height: inherit;
+
+  &:focus {
+    outline: none;
+
+    .tabbing-active & {
+      outline: 2px solid @inputBorderTabFocus;
+    }
+  }
 }
 
 .umb-locked-field__toggle:hover,
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-locked-field.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-locked-field.html
index 624ca8e923..edc96ee1f6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-locked-field.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-locked-field.html
@@ -2,13 +2,13 @@
 
     <div class="umb-locked-field__wrapper">
 
-        <a ng-if="locked" href="" ng-click="unlock()" class="umb-locked-field__toggle">
-            <i class="umb-locked-field__lock-icon icon-lock"></i>
-        </a>
+        <button ng-if="locked" ng-click="unlock()" class="umb-locked-field__toggle">
+            <i class="umb-locked-field__lock-icon icon-lock" aria-hidden="true"></i>
+        </button>
 
-        <a ng-if="!locked" href="" ng-click="lock()" class="umb-locked-field__toggle">
-            <i class="umb-locked-field__lock-icon icon-unlocked -unlocked"></i>
-        </a>
+        <button ng-if="!locked" ng-click="lock()" class="umb-locked-field__toggle">
+            <i class="umb-locked-field__lock-icon icon-unlocked -unlocked" aria-hidden="true"></i>
+        </button>
 
         <input type="text"
                no-password-manager