diff --git a/admin/css/debug-toolbar/toolbar.scss b/admin/css/debug-toolbar/toolbar.scss
index dfcb7e58ae..e129a4b1c5 100644
--- a/admin/css/debug-toolbar/toolbar.scss
+++ b/admin/css/debug-toolbar/toolbar.scss
@@ -13,10 +13,6 @@
 @import '_mixins';
 @import '_settings';
 
-a[role="button"] {
-    cursor: pointer;
-}
-
 // DEBUG ICON
 // ========================================================================== */
 
@@ -39,7 +35,6 @@ a[role="button"] {
     clear: both;
     text-align: center;
 
-    // Cursor
     cursor: pointer;
 
     a svg {
@@ -62,6 +57,10 @@ a[role="button"] {
 // DEBUG BAR
 // ========================================================================== */
 
+.debug-bar-vars {
+    cursor: pointer;
+}
+
 #debug-bar {
     // Position
     bottom: 0;
@@ -247,6 +246,7 @@ a[role="button"] {
     #debug-bar-link {
         display: flex;
         padding: 6px;
+        cursor: pointer;
     }
 
     // The toolbar menus
diff --git a/system/Debug/Toolbar/Views/toolbar.css b/system/Debug/Toolbar/Views/toolbar.css
index 612a1ee873..4154f4c5c4 100644
--- a/system/Debug/Toolbar/Views/toolbar.css
+++ b/system/Debug/Toolbar/Views/toolbar.css
@@ -6,10 +6,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-a[role=button] {
-  cursor: pointer;
-}
-
 #debug-icon {
   bottom: 0;
   position: fixed;
@@ -36,6 +32,10 @@ a[role=button] {
   display: none;
 }
 
+.debug-bar-vars {
+  cursor: pointer;
+}
+
 #debug-bar {
   bottom: 0;
   left: 0;
@@ -175,6 +175,7 @@ a[role=button] {
 #debug-bar #debug-bar-link {
   display: flex;
   padding: 6px;
+  cursor: pointer;
 }
 #debug-bar .ci-label {
   display: inline-flex;
diff --git a/system/Debug/Toolbar/Views/toolbar.tpl.php b/system/Debug/Toolbar/Views/toolbar.tpl.php
index 4bae5b54c7..0350045675 100644
--- a/system/Debug/Toolbar/Views/toolbar.tpl.php
+++ b/system/Debug/Toolbar/Views/toolbar.tpl.php
@@ -124,7 +124,7 @@
         <?php if (isset($vars['varData'])) : ?>
             <?php foreach ($vars['varData'] as $heading => $items) : ?>
 
-                <a role="button" data-toggle="datatable" data-table="<?= strtolower(str_replace(' ', '-', $heading)) ?>">
+                <a class="debug-bar-vars" data-toggle="datatable" data-table="<?= strtolower(str_replace(' ', '-', $heading)) ?>">
                     <h2><?= $heading ?></h2>
                 </a>
 
@@ -148,7 +148,7 @@
         <?php endif ?>
 
         <!-- Session -->
-        <a role="button" data-toggle="datatable" data-table="session">
+        <a class="debug-bar-vars" data-toggle="datatable" data-table="session">
             <h2>Session User Data</h2>
         </a>
 
@@ -174,7 +174,7 @@
         <h2>Request <span>( <?= $vars['request'] ?> )</span></h2>
 
         <?php if (isset($vars['get']) && $get = $vars['get']) : ?>
-            <a role="button" data-toggle="datatable" data-table="get">
+            <a class="debug-bar-vars" data-toggle="datatable" data-table="get">
                 <h3>$_GET</h3>
             </a>
 
@@ -191,7 +191,7 @@
         <?php endif ?>
 
         <?php if (isset($vars['post']) && $post = $vars['post']) : ?>
-            <a role="button" data-toggle="datatable" data-table="post">
+            <a class="debug-bar-vars" data-toggle="datatable" data-table="post">
                 <h3>$_POST</h3>
             </a>
 
@@ -208,7 +208,7 @@
         <?php endif ?>
 
         <?php if (isset($vars['headers']) && $headers = $vars['headers']) : ?>
-            <a role="button" data-toggle="datatable" data-table="request_headers">
+            <a class="debug-bar-vars" data-toggle="datatable" data-table="request_headers">
                 <h3>Headers</h3>
             </a>
 
@@ -225,7 +225,7 @@
         <?php endif ?>
 
         <?php if (isset($vars['cookies']) && $cookies = $vars['cookies']) : ?>
-            <a role="button" data-toggle="datatable" data-table="cookie">
+            <a class="debug-bar-vars" data-toggle="datatable" data-table="cookie">
                 <h3>Cookies</h3>
             </a>
 
@@ -246,7 +246,7 @@
         </h2>
 
         <?php if (isset($vars['response']['headers']) && $headers = $vars['response']['headers']) : ?>
-            <a role="button" data-toggle="datatable" data-table="response_headers">
+            <a class="debug-bar-vars" data-toggle="datatable" data-table="response_headers">
                 <h3>Headers</h3>
             </a>