diff --git a/dns_records.php b/dns_records.php
index d95e7739..dbd6c55a 100644
--- a/dns_records.php
+++ b/dns_records.php
@@ -81,7 +81,7 @@
                     </tr>
                     </thead>
                 </table>
-                <button type="button" id="resetButton" hidden="true" class="btn btn-default btn-sm text-red">Clear Filters</button>
+                <button type="button" id="resetButton" class="btn btn-default btn-sm text-red hidden">Clear Filters</button>
             </div>
             <!-- /.box-body -->
         </div>
diff --git a/groups-adlists.php b/groups-adlists.php
index f90e4634..16b11216 100644
--- a/groups-adlists.php
+++ b/groups-adlists.php
@@ -65,7 +65,7 @@
                     </tr>
                     </thead>
                 </table>
-                <button type="button" id="resetButton" hidden="true" class="btn btn-default btn-sm text-red">Reset sorting</button>
+                <button type="button" id="resetButton" class="btn btn-default btn-sm text-red hidden">Reset sorting</button>
             </div>
             <!-- /.box-body -->
         </div>
diff --git a/groups-clients.php b/groups-clients.php
index 52d242a3..843b08f4 100644
--- a/groups-clients.php
+++ b/groups-clients.php
@@ -66,7 +66,7 @@
                     </tr>
                     </thead>
                 </table>
-                <button type="button" id="resetButton" hidden="true" class="btn btn-default btn-sm text-red">Reset sorting</button>
+                <button type="button" id="resetButton" class="btn btn-default btn-sm text-red hidden">Reset sorting</button>
             </div>
             <!-- /.box-body -->
         </div>
diff --git a/groups-domains.php b/groups-domains.php
index a6c25074..4914e125 100644
--- a/groups-domains.php
+++ b/groups-domains.php
@@ -131,7 +131,7 @@
                     </tr>
                     </thead>
                 </table>
-                <button type="button" id="resetButton" hidden="true" class="btn btn-default btn-sm text-red">Reset sorting</button>
+                <button type="button" id="resetButton" class="btn btn-default btn-sm text-red hidden">Reset sorting</button>
             </div>
             <!-- /.box-body -->
         </div>
diff --git a/groups.php b/groups.php
index b3b84ed9..7c091015 100644
--- a/groups.php
+++ b/groups.php
@@ -63,7 +63,7 @@
                     </tr>
                     </thead>
                 </table>
-                <button type="button" id="resetButton" hidden="true" class="btn btn-default btn-sm text-red">Reset sorting</button>
+                <button type="button" id="resetButton" class="btn btn-default btn-sm text-red hidden">Reset sorting</button>
             </div>
             <!-- /.box-body -->
         </div>
diff --git a/queries.php b/queries.php
index 0518b8b3..7404c0a6 100644
--- a/queries.php
+++ b/queries.php
@@ -147,7 +147,7 @@ if(strlen($showing) > 0)
                 </tfoot>
             </table>
             <label><input type="checkbox" id="autofilter">&nbsp;Apply filtering on click on Type, Domain, and Clients</label><br/>
-            <button type="button" id="resetButton" hidden="true" class="btn btn-default btn-sm text-red">Clear Filters</button>
+            <button type="button" id="resetButton" class="btn btn-default btn-sm text-red hidden">Clear Filters</button>
         </div>
         <!-- /.box-body -->
       </div>
diff --git a/scripts/pi-hole/js/footer.js b/scripts/pi-hole/js/footer.js
index 3259cf0e..b2528e6b 100644
--- a/scripts/pi-hole/js/footer.js
+++ b/scripts/pi-hole/js/footer.js
@@ -105,7 +105,7 @@ function checkMessages() {
 
       $("#pihole-diagnosis").prop("title", title);
       $("#pihole-diagnosis-count").text(data.message_count);
-      $("#pihole-diagnosis").removeClass("d-none");
+      $("#pihole-diagnosis").removeClass("hidden");
     }
   });
 }
diff --git a/scripts/pi-hole/js/groups-adlists.js b/scripts/pi-hole/js/groups-adlists.js
index fe9f3e85..ea5d7367 100644
--- a/scripts/pi-hole/js/groups-adlists.js
+++ b/scripts/pi-hole/js/groups-adlists.js
@@ -198,14 +198,14 @@ function initTable() {
   table.on("order.dt", function () {
     var order = table.order();
     if (order[0][0] !== 0 || order[0][1] !== "asc") {
-      $("#resetButton").show();
+      $("#resetButton").removeClass("hidden");
     } else {
-      $("#resetButton").hide();
+      $("#resetButton").addClass("hidden");
     }
   });
   $("#resetButton").on("click", function () {
     table.order([[0, "asc"]]).draw();
-    $("#resetButton").hide();
+    $("#resetButton").addClass("hidden");
   });
 
   // Disable autocorrect in the search box
diff --git a/scripts/pi-hole/js/groups-clients.js b/scripts/pi-hole/js/groups-clients.js
index 6d7ab3cd..b7368ede 100644
--- a/scripts/pi-hole/js/groups-clients.js
+++ b/scripts/pi-hole/js/groups-clients.js
@@ -240,14 +240,14 @@ function initTable() {
   table.on("order.dt", function () {
     var order = table.order();
     if (order[0][0] !== 0 || order[0][1] !== "asc") {
-      $("#resetButton").show();
+      $("#resetButton").removeClass("hidden");
     } else {
-      $("#resetButton").hide();
+      $("#resetButton").addClass("hidden");
     }
   });
   $("#resetButton").on("click", function () {
     table.order([[0, "asc"]]).draw();
-    $("#resetButton").hide();
+    $("#resetButton").addClass("hidden");
   });
 }
 
diff --git a/scripts/pi-hole/js/groups-domains.js b/scripts/pi-hole/js/groups-domains.js
index 56648de7..3239e0fb 100644
--- a/scripts/pi-hole/js/groups-domains.js
+++ b/scripts/pi-hole/js/groups-domains.js
@@ -292,14 +292,14 @@ function initTable() {
   table.on("order.dt", function () {
     var order = table.order();
     if (order[0][0] !== 0 || order[0][1] !== "asc") {
-      $("#resetButton").show();
+      $("#resetButton").removeClass("hidden");
     } else {
-      $("#resetButton").hide();
+      $("#resetButton").addClass("hidden");
     }
   });
   $("#resetButton").on("click", function () {
     table.order([[0, "asc"]]).draw();
-    $("#resetButton").hide();
+    $("#resetButton").addClass("hidden");
   });
 }
 
diff --git a/scripts/pi-hole/js/groups.js b/scripts/pi-hole/js/groups.js
index e8e182ed..2a97d1c6 100644
--- a/scripts/pi-hole/js/groups.js
+++ b/scripts/pi-hole/js/groups.js
@@ -122,14 +122,14 @@ $(document).ready(function () {
   table.on("order.dt", function () {
     var order = table.order();
     if (order[0][0] !== 0 || order[0][1] !== "asc") {
-      $("#resetButton").show();
+      $("#resetButton").removeClass("hidden");
     } else {
-      $("#resetButton").hide();
+      $("#resetButton").addClass("hidden");
     }
   });
   $("#resetButton").on("click", function () {
     table.order([[0, "asc"]]).draw();
-    $("#resetButton").hide();
+    $("#resetButton").addClass("hidden");
   });
 });
 
diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js
index b4551f22..2c4a3951 100644
--- a/scripts/pi-hole/js/queries.js
+++ b/scripts/pi-hole/js/queries.js
@@ -431,7 +431,7 @@ $(document).ready(function () {
       api.$("td:eq(1)").click(function () {
         if (autofilter()) {
           api.search(this.textContent).draw();
-          $("#resetButton").show();
+          $("#resetButton").removeClass("hidden");
         }
       });
       api.$("td:eq(1)").hover(
@@ -454,7 +454,7 @@ $(document).ready(function () {
         if (autofilter()) {
           var domain = this.textContent.split("\n")[0];
           api.search(domain).draw();
-          $("#resetButton").show();
+          $("#resetButton").removeClass("hidden");
         }
       });
       api.$("td:eq(2)").hover(
@@ -477,7 +477,7 @@ $(document).ready(function () {
       api.$("td:eq(3)").click(function () {
         if (autofilter()) {
           api.search(this.textContent).draw();
-          $("#resetButton").show();
+          $("#resetButton").removeClass("hidden");
         }
       });
       api.$("td:eq(3)").hover(
@@ -509,7 +509,7 @@ $(document).ready(function () {
 
   $("#resetButton").click(function () {
     tableApi.search("").draw();
-    $("#resetButton").hide();
+    $("#resetButton").addClass("hidden");
   });
 
   // Disable autocorrect in the search box
diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php
index f614a7cb..45dd83b3 100644
--- a/scripts/pi-hole/php/header.php
+++ b/scripts/pi-hole/php/header.php
@@ -270,7 +270,7 @@ if($auth) {
             </a>
             <div class="navbar-custom-menu">
                 <ul class="nav navbar-nav">
-                    <li id="pihole-diagnosis" class="d-none">
+                    <li id="pihole-diagnosis" class="hidden">
                         <a href="messages.php">
                             <i class="fa fa-exclamation-triangle"></i>
                             <span class="label label-warning" id="pihole-diagnosis-count"></span>
diff --git a/style/pi-hole.css b/style/pi-hole.css
index 8cb9379c..b45a5f48 100644
--- a/style/pi-hole.css
+++ b/style/pi-hole.css
@@ -276,10 +276,6 @@
 	padding: 0 12px;
 }
 
-.d-none {
-    display: none !important;
-}
-
 .user-panel > .info > span {
     padding-right: 5px;
     margin-top: 3px;