diff --git a/src/views/tools/tools_adminpw.ms b/src/views/tools/tools_adminpw.ms
index eeff4e78..d5f250fb 100644
--- a/src/views/tools/tools_adminpw.ms
+++ b/src/views/tools/tools_adminpw.ms
@@ -33,7 +33,7 @@
 	</div>
 
 	<div class="text-center">
-	    <input type="submit" class="btn btn-success slide back" value="{{t 'save'}}">
+	    <input role="button" type="submit" class="btn btn-success slide back" value="{{t 'save'}}">
 	</div>
 
 </form>
diff --git a/src/views/tools/tools_ca.ms b/src/views/tools/tools_ca.ms
index 1e59eec2..1498bb7d 100644
--- a/src/views/tools/tools_ca.ms
+++ b/src/views/tools/tools_ca.ms
@@ -9,6 +9,6 @@
 <div class="panel panel-default">
     <div class="panel-body">
     	<p>{{t 'tools_download_ca_desc'}}</p>
-    	<a href="ca.crt" class="btn btn-success">CA.crt</a>
+    	<a role="button" href="ca.crt" class="btn btn-success">CA.crt</a>
     </div>
 </div>
diff --git a/src/views/tools/tools_diagnosis.ms b/src/views/tools/tools_diagnosis.ms
index 2105a134..cf996617 100644
--- a/src/views/tools/tools_diagnosis.ms
+++ b/src/views/tools/tools_diagnosis.ms
@@ -16,10 +16,10 @@
     <div class="panel-body">
         <pre id="diagnosis">{{ diagnosis }}</pre>
         {{#if private}}
-        <a class="btn btn-primary" href="#/tools/diagnosis"><i class="fa-eye-slash"></i> {{t 'diagnosis_hide_private'}}</a>
+        <a class="btn btn-primary" role="button" href="#/tools/diagnosis"><i class="fa-eye-slash"></i> {{t 'diagnosis_hide_private'}}</a>
         {{else}}
-        <a class="btn btn-primary" href="#/tools/diagnosis/private"><i class="fa-eye"></i> {{t 'diagnosis_view_private'}}</a>
+        <a class="btn btn-primary" role="button" href="#/tools/diagnosis/private"><i class="fa-eye"></i> {{t 'diagnosis_view_private'}}</a>
         {{/if}}
-        <button data-paste-content="#diagnosis"><i class="fa-cloud-upload"></i> {{t 'upload'}}</button>
+        <button data-paste-content="#diagnosis"><i role="button" class="fa-cloud-upload"></i> {{t 'upload'}}</button>
     </div>
 </div>
diff --git a/src/views/tools/tools_firewall.ms b/src/views/tools/tools_firewall.ms
index afe7e538..a22ef665 100644
--- a/src/views/tools/tools_firewall.ms
+++ b/src/views/tools/tools_firewall.ms
@@ -153,7 +153,7 @@
             </div>
             <div class="form-group row">
                 <div class="col-xs-6 col-sm-3">
-                    <input type="submit" class="btn btn-success slide back" value="{{t 'save'}}">
+                    <input role="button" type="submit" class="btn btn-success slide back" value="{{t 'save'}}">
                 </div>
             </div>
 
@@ -168,10 +168,10 @@
     <div class="panel-body">
         {{#if upnp}}
             <p class="text-success">{{t 'upnp_enabled'}}</p>
-            <a href="#/tools/firewall/upnp/disable" class="btn btn-danger">{{t 'disable'}}</a>
+            <a role="button"  href="#/tools/firewall/upnp/disable" class="btn btn-danger">{{t 'disable'}}</a>
         {{else}}
             <p class="text-danger">{{t 'upnp_disabled'}}</p>
-            <a href="#/tools/firewall/upnp/enable" class="btn btn-success">{{t 'enable'}}</a>
+            <a role="button" href="#/tools/firewall/upnp/enable" class="btn btn-success">{{t 'enable'}}</a>
         {{/if}}
     </div>
 </div>
diff --git a/src/views/tools/tools_reboot.ms b/src/views/tools/tools_reboot.ms
index 6786334e..c66bc0a0 100644
--- a/src/views/tools/tools_reboot.ms
+++ b/src/views/tools/tools_reboot.ms
@@ -15,12 +15,12 @@
     </div>
     <div class="panel-body">
         <p>   
-            <a href="#/tools/reboot/reboot" class="btn btn-danger">
+            <a role="button" href="#/tools/reboot/reboot" class="btn btn-danger">
                 <i class="fa-refresh"></i> {{t 'tools_reboot_btn'}}
             </a>
         </p>
         <p>
-            <a href="#/tools/reboot/shutdown" class="btn btn-danger">
+            <a role="button" href="#/tools/reboot/shutdown" class="btn btn-danger">
                 <i class="fa-power-off"></i> {{t 'tools_shutdown_btn'}}
             </a>
         </p>
diff --git a/src/views/tools/tools_security_feed.ms b/src/views/tools/tools_security_feed.ms
index b7bd0711..faed2f87 100644
--- a/src/views/tools/tools_security_feed.ms
+++ b/src/views/tools/tools_security_feed.ms
@@ -16,7 +16,7 @@
                 <p class="pub-date"><em>{{date}}</em></p>
                 {{{desc}}}
                 <p class="text-right">
-                    <a href="{{url}}" class="btn btn-default">{{t 'read_more'}}</a>
+                    <a href="{{url}}" role="button"  class="btn btn-default">{{t 'read_more'}}</a>
                 </p>
             </div>
         </div>
@@ -29,6 +29,6 @@
 {{/if}}
 
 <div>
-    <a href="{{url.web}}" class="btn btn-success" target="_blank"><span class="fa-list"></span> {{t 'tools_security_feed_view_items'}}</a> 
-    <a href="{{url.rss}}" class="btn btn-warning" target="_blank"><span class="fa-rss"></span> {{t 'tools_security_feed_subscribe_rss'}}</a>
-</div>
\ No newline at end of file
+    <a role="button" href="{{url.web}}" class="btn btn-success" target="_blank"><span class="fa-list"></span> {{t 'tools_security_feed_view_items'}}</a> 
+    <a role="button" href="{{url.rss}}" class="btn btn-warning" target="_blank"><span class="fa-rss"></span> {{t 'tools_security_feed_subscribe_rss'}}</a>
+</div>
diff --git a/src/views/tools/tools_versions.ms b/src/views/tools/tools_versions.ms
index a7bc334e..4327b979 100644
--- a/src/views/tools/tools_versions.ms
+++ b/src/views/tools/tools_versions.ms
@@ -17,6 +17,6 @@
             <dd>{{version}} ({{repo}})</dd>
             {{/each}}
         </dl>
-        <a href="#/update" class="btn btn-success pull-right">{{t 'system_update'}}</a>
+        <a role="button" href="#/update" class="btn btn-success pull-right">{{t 'system_update'}}</a>
     </div>
 </div>