diff --git a/src/Umbraco.Web.UI.Client/src/less/tables.less b/src/Umbraco.Web.UI.Client/src/less/tables.less
index cd6304ef49..65b3eacdcd 100644
--- a/src/Umbraco.Web.UI.Client/src/less/tables.less
+++ b/src/Umbraco.Web.UI.Client/src/less/tables.less
@@ -263,3 +263,15 @@ table th[class*="span"],
 .table-sortable tbody tr {
   cursor: move;
 }
+
+.table__action-overlay{
+    background: transparent;
+    border: 0 none;
+    padding: 0;
+    font-style: italic;
+
+    &:focus,
+    &:hover{
+        text-decoration: underline;
+    }
+}
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.html
index bb11addf08..31a37796f0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.html
@@ -31,15 +31,15 @@
                         <div class="umb-panel-group__details-status" ng-repeat="indexer in vm.indexerDetails">
 
                             <div class="umb-panel-group__details-status-icon-container">
-                                <i class="umb-panel-status-icon"
+                                <i class="umb-panel-status-icon" aria-hidden="true"
                                    ng-class="{'icon-check color-green' : indexer.isHealthy, 'icon-delete color-red' : !indexer.isHealthy}"></i>
                             </div>
 
                             <div class="umb-panel-group__details-status-content">
                                 <div class="umb-panel-group__details-status-text">
-                                    <a class="btn-link -underline" href="" ng-click="vm.showIndexInfo(indexer)">
+                                    <button type="button" class="btn-link -underline" ng-click="vm.showIndexInfo(indexer)">
                                         {{indexer.name}}
-                                    </a>
+                                    </button>
                                 </div>
                             </div>
 
@@ -67,14 +67,14 @@
                         <div class="umb-panel-group__details-status" ng-repeat="searcher in vm.searcherDetails">
 
                             <div class="umb-panel-group__details-status-icon-container">
-                                <i class="umb-panel-status-icon icon-info"></i>
+                                <i class="umb-panel-status-icon icon-info" aria-hidden="true"></i>
                             </div>
 
                             <div class="umb-panel-group__details-status-content">
                                 <div class="umb-panel-group__details-status-text">
-                                    <a class="btn-link -underline" href="" ng-click="vm.showSearcherInfo(searcher)">
+                                    <button type="button" class="btn-link -underline" ng-click="vm.showSearcherInfo(searcher)">
                                         {{searcher.name}}
-                                    </a>
+                                    </button>
                                 </div>
                             </div>
                         </div>
@@ -159,10 +159,7 @@
                                                                 <td>
                                                                     <a ng-show="result.editUrl" ng-click="vm.goToResult(result, $event)" ng-href="#{{result.editUrl}}">{{result.values['nodeName']}}</a>
                                                                     <span ng-hide="result.editUrl">{{result.values['nodeName']}}</span>
-                                                                    &nbsp;
-                                                                    <a class="color-green" href="" ng-click="vm.showSearchResultDialog(result.values)">
-                                                                        <em>({{result.fieldCount}} fields)</em>
-                                                                    </a>
+                                                                    <button type="button" class="table__action-overlay color-green" ng-click="vm.showSearchResultDialog(result.values)">({{result.fieldCount}} <localize key="examineManagement_fields">fields</localize>)</button>
                                                                 </td>
                                                             </tr>
                                                         </tbody>
@@ -227,7 +224,7 @@
                             <div class="umb-panel-group__details-status">
 
                                 <div class="umb-panel-group__details-status-icon-container">
-                                    <i class="umb-panel-status-icon"
+                                    <i class="umb-panel-status-icon" aria-hidden="true"
                                        ng-class="{'icon-check color-green' : vm.selectedIndex.isHealthy, 'icon-delete color-red' : !vm.selectedIndex.isHealthy}"></i>
                                 </div>
 
@@ -302,10 +299,7 @@
                                                                 <td>
                                                                     <a ng-show="result.editUrl" ng-click="vm.goToResult(result, $event)" ng-href="#{{result.editUrl}}">{{result.values['nodeName']}}</a>
                                                                     <span ng-hide="result.editUrl">{{result.values['nodeName']}}</span>
-                                                                    &nbsp;
-                                                                    <a class="color-green" href="" ng-click="vm.showSearchResultDialog(result.values)">
-                                                                        <em>({{result.fieldCount}} fields)</em>
-                                                                    </a>
+                                                                    <button type="button" class="table__action-overlay color-green" ng-click="vm.showSearchResultDialog(result.values)">({{result.fieldCount}} <localize key="examineManagement_fields">fields</localize>)</button>
                                                                 </td>
                                                             </tr>
                                                         </tbody>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index e2a9b02086..9968af4d26 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -512,6 +512,7 @@
     <key alias="searchDescription">Søg i indekset og se resultaterne</key>
     <key alias="tools">Værktøjer</key>
     <key alias="toolsDescription">Værktøjer til at administrere indekset</key>
+    <key alias="fields">felter</key>
   </area>
   <area alias="placeholders">
     <key alias="username">Indtast dit brugernavn</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 8a421c6e70..0e87eb7898 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -514,6 +514,7 @@
     <key alias="searchDescription">Search the index and view the results</key>
     <key alias="tools">Tools</key>
     <key alias="toolsDescription">Tools to manage the index</key>
+    <key alias="fields">fields</key>
   </area>
   <area alias="placeholders">
     <key alias="username">Enter your username</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index 2834e68a0f..a867aff69b 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -517,6 +517,7 @@
     <key alias="searchDescription">Search the index and view the results</key>
     <key alias="tools">Tools</key>
     <key alias="toolsDescription">Tools to manage the index</key>
+    <key alias="fields">fields</key>
   </area>
   <area alias="placeholders">
     <key alias="username">Enter your username</key>