diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php
index db6519ae..c8b4ea14 100644
--- a/scripts/pi-hole/php/header.php
+++ b/scripts/pi-hole/php/header.php
@@ -423,19 +423,19 @@ if($auth) {
                 <!-- Home Page -->
                 <li<?php if($scriptname === "index.php"){ ?> class="active"<?php } ?>>
                     <a href="index.php">
-                        <i class="fa fa-fw fa-home"></i> <span>Dashboard</span>
+                        <i class="fa fa-fw menu-icon fa-home"></i> Dashboard
                     </a>
                 </li>
                 <?php if($auth){ ?>
                 <!-- Query Log -->
                 <li<?php if($scriptname === "queries.php"){ ?> class="active"<?php } ?>>
                     <a href="queries.php">
-                        <i class="fa fa-fw fa-file-alt"></i> <span>Query Log</span>
+                        <i class="fa fa-fw menu-icon fa-file-alt"></i> Query Log
                     </a>
                 </li>
                 <li class="treeview<?php if($scriptname === "db_queries.php" || $scriptname === "db_lists.php" || $scriptname === "db_graph.php"){ ?> active<?php } ?>">
                   <a href="#">
-                    <i class="fa fa-clock"></i> <span>Long-term data</span>
+                    <i class="fa fa-fw menu-icon fa-clock"></i> Long-term data
                     <span class="pull-right-container">
                       <i class="fa fa-angle-left pull-right"></i>
                     </span>
@@ -443,17 +443,17 @@ if($auth) {
                   <ul class="treeview-menu">
                     <li<?php if($scriptname === "db_graph.php"){ ?> class="active"<?php } ?>>
                         <a href="db_graph.php">
-                            <i class="fa fa-fw fa-file-alt"></i> Graphics
+                            <i class="fa fa-fw menu-icon fa-file-alt"></i> Graphics
                         </a>
                     </li>
                     <li<?php if($scriptname === "db_queries.php"){ ?> class="active"<?php } ?>>
                         <a href="db_queries.php">
-                            <i class="fa fa-fw fa-file-alt"></i> Query Log
+                            <i class="fa fa-fw menu-icon fa-file-alt"></i> Query Log
                         </a>
                     </li>
                     <li<?php if($scriptname === "db_lists.php"){ ?> class="active"<?php } ?>>
                         <a href="db_lists.php">
-                            <i class="fa fa-fw fa-file-alt"></i> Top Lists
+                            <i class="fa fa-fw menu-icon fa-file-alt"></i> Top Lists
                         </a>
                     </li>
                   </ul>
@@ -461,19 +461,19 @@ if($auth) {
                 <!-- Whitelist -->
                 <li<?php if($scriptname === "whitelist"){ ?> class="active"<?php } ?>>
                     <a href="groups-domains.php?type=white">
-                        <i class="fa fa-fw fa-check-circle "></i> <span>Whitelist</span>
+                        <i class="fa fa-fw menu-icon fa-check-circle"></i> <span>Whitelist
                     </a>
                 </li>
                 <!-- Blacklist -->
                 <li<?php if($scriptname === "blacklist"){ ?> class="active"<?php } ?>>
                     <a href="groups-domains.php?type=black">
-                        <i class="fa fa-fw fa-ban"></i> <span>Blacklist</span>
+                        <i class="fa fa-fw menu-icon fa-ban"></i> <span>Blacklist
                     </a>
                 </li>
                 <!-- Group Management -->
                 <li class="treeview<?php if (in_array($scriptname, array("groups.php", "groups-adlists.php", "groups-clients.php", "groups-domains.php"))){ ?> active<?php } ?>">
                   <a href="#">
-                    <i class="fa fa-fw fa-users-cog"></i> <span>Group Management</span>
+                    <i class="fa fa-fw menu-icon fa-users-cog"></i> Group Management
                     <span class="pull-right-container">
                       <i class="fa fa-angle-left pull-right"></i>
                     </span>
@@ -481,22 +481,22 @@ if($auth) {
                   <ul class="treeview-menu">
                     <li<?php if($scriptname === "groups.php"){ ?> class="active"<?php } ?>>
                         <a href="groups.php">
-                            <i class="fa fa-fw fa-user-friends"></i> Groups
+                            <i class="fa fa-fw menu-icon fa-user-friends"></i> Groups
                         </a>
                     </li>
                     <li<?php if($scriptname === "groups-clients.php"){ ?> class="active"<?php } ?>>
                         <a href="groups-clients.php">
-                            <i class="fa fa-fw fa-laptop"></i> Clients
+                            <i class="fa fa-fw menu-icon fa-laptop"></i> Clients
                         </a>
                     </li>
                     <li<?php if($scriptname === "groups-domains.php"){ ?> class="active"<?php } ?>>
                         <a href="groups-domains.php">
-                            <i class="fa fa-fw fa-list"></i> Domains
+                            <i class="fa fa-fw menu-icon fa-list"></i> Domains
                         </a>
                     </li>
                     <li<?php if($scriptname === "groups-adlists.php"){ ?> class="active"<?php } ?>>
                         <a href="groups-adlists.php">
-                            <i class="fa fa-fw fa-shield-alt"></i> Adlists
+                            <i class="fa fa-fw menu-icon fa-shield-alt"></i> Adlists
                         </a>
                     </li>
                   </ul>
@@ -507,40 +507,40 @@ if($auth) {
                     <span class="pull-right-container">
                       <i class="fa fa-angle-left pull-right"></i>
                     </span>
-                    <i class="fa fa-fw fa-stop"></i> <span>Disable&nbsp;&nbsp;&nbsp;<span id="flip-status-disable"></span></span>
+                    <i class="fa fa-fw menu-icon fa-stop"></i> Disable&nbsp;&nbsp;&nbsp;<span id="flip-status-disable"></span>
                   </a>
                   <ul class="treeview-menu">
                     <li>
                         <a href="#" id="pihole-disable-indefinitely">
-                            <i class="fa fa-fw fa-stop"></i> Indefinitely
+                            <i class="fa fa-fw menu-icon fa-stop"></i> Indefinitely
                         </a>
                     </li>
                     <li>
                         <a href="#" id="pihole-disable-10s">
-                            <i class="fa fa-fw fa-clock"></i> For 10 seconds
+                            <i class="fa fa-fw menu-icon fa-clock"></i> For 10 seconds
                         </a>
                     </li>
                     <li>
                         <a href="#" id="pihole-disable-30s">
-                            <i class="fa fa-fw fa-clock"></i> For 30 seconds
+                            <i class="fa fa-fw menu-icon fa-clock"></i> For 30 seconds
                         </a>
                     </li>
                     <li>
                         <a href="#" id="pihole-disable-5m">
-                            <i class="fa fa-fw fas fa-clock"></i> For 5 minutes
+                            <i class="fa fa-fw menu-icon fas fa-clock"></i> For 5 minutes
                         </a>
                     </li>
                     <li>
                       <a href="#" id="pihole-disable-cst" data-toggle="modal" data-target="#customDisableModal">
-                            <i class="fa fa-fw fa-clock"></i> <span>Custom time</span>
+                            <i class="fa fa-fw menu-icon fa-clock"></i> Custom time
                       </a>
                     </li>
                   </ul>
-                    <!-- <a href="#" id="flip-status"><i class="fa fa-stop"></i> <span>Disable</span></a> -->
+                    <!-- <a href="#" id="flip-status"><i class="fa fa-stop"></i> Disable</a> -->
                 </li>
                 <li id="pihole-enable" class="treeview"<?php if ($pistatus == "1") { ?> hidden<?php } ?>>
                     <a href="#">
-                      <i class="fa fa-fw fa-play"></i>
+                      <i class="fa fa-fw menu-icon fa-play"></i>
                       <span id="enableLabel">Enable&nbsp;&nbsp;&nbsp;
                         <span id="flip-status-enable"></span>
                       </span>
@@ -549,7 +549,7 @@ if($auth) {
                 <!-- Tools -->
                 <li class="treeview<?php if (in_array($scriptname, array("messages.php", "gravity.php", "queryads.php", "auditlog.php", "taillog.php", "taillog-FTL.php", "debug.php", "network.php"))){ ?> active<?php } ?>">
                   <a href="#">
-                    <i class="fa fa-fw fa-folder"></i> <span>Tools</span>
+                    <i class="fa fa-fw menu-icon fa-folder"></i> Tools
                     <span class="pull-right-container">
                       <i class="fa fa-angle-left pull-right"></i>
                     </span>
@@ -558,49 +558,49 @@ if($auth) {
                     <!-- Pi-hole diagnosis -->
                     <li<?php if($scriptname === "messages.php"){ ?> class="active"<?php } ?>>
                         <a href="messages.php">
-                            <i class="fa fa-fw fa-stethoscope"></i> Pi-hole diagnosis
+                            <i class="fa fa-fw menu-icon fa-stethoscope"></i> Pi-hole diagnosis
                         </a>
                     </li>
                     <!-- Run gravity.sh -->
                     <li<?php if($scriptname === "gravity.php"){ ?> class="active"<?php } ?>>
                         <a href="gravity.php">
-                            <i class="fa fa-fw fa-arrow-circle-down"></i> Update Gravity
+                            <i class="fa fa-fw menu-icon fa-arrow-circle-down"></i> Update Gravity
                         </a>
                     </li>
                     <!-- Query Lists -->
                     <li<?php if($scriptname === "queryads.php"){ ?> class="active"<?php } ?>>
                         <a href="queryads.php">
-                            <i class="fa fa-fw fa-search"></i> Query Lists
+                            <i class="fa fa-fw menu-icon fa-search"></i> Query Lists
                         </a>
                     </li>
                     <!-- Audit log -->
                     <li<?php if($scriptname === "auditlog.php"){ ?> class="active"<?php } ?>>
                         <a href="auditlog.php">
-                            <i class="fa fa-fw fa-balance-scale"></i> Audit log
+                            <i class="fa fa-fw menu-icon fa-balance-scale"></i> Audit log
                         </a>
                     </li>
                     <!-- Tail pihole.log -->
                     <li<?php if($scriptname === "taillog.php"){ ?> class="active"<?php } ?>>
                         <a href="taillog.php">
-                            <i class="fa fa-fw fa-list-ul"></i> Tail pihole.log
+                            <i class="fa fa-fw menu-icon fa-list-ul"></i> Tail pihole.log
                         </a>
                     </li>
                     <!-- Tail pihole-FTL.log -->
                     <li<?php if($scriptname === "taillog-FTL.php"){ ?> class="active"<?php } ?>>
                         <a href="taillog-FTL.php">
-                            <i class="fa fa-fw fa-list-ul"></i> Tail pihole-FTL.log
+                            <i class="fa fa-fw menu-icon fa-list-ul"></i> Tail pihole-FTL.log
                         </a>
                     </li>
                     <!-- Generate debug log -->
                     <li<?php if($scriptname === "debug.php"){ ?> class="active"<?php } ?>>
                         <a href="debug.php">
-                            <i class="fa fa-fw fa-ambulance"></i> Generate debug log
+                            <i class="fa fa-fw menu-icon fa-ambulance"></i> Generate debug log
                         </a>
                     </li>
                     <!-- Network -->
                     <li<?php if($scriptname === "network.php"){ ?> class="active"<?php } ?>>
                         <a href="network.php">
-                            <i class="fa fa-fw fa-network-wired"></i> Network
+                            <i class="fa fa-fw menu-icon fa-network-wired"></i> Network
                         </a>
                     </li>
                   </ul>
@@ -608,13 +608,13 @@ if($auth) {
                 <!-- Settings -->
                 <li<?php if($scriptname === "settings.php"){ ?> class="active"<?php } ?>>
                     <a href="settings.php">
-                        <i class="fa fa-fw fa-cogs"></i> <span>Settings</span>
+                        <i class="fa fa-fw menu-icon fa-cogs"></i> Settings
                     </a>
                 </li>
                 <!-- Local DNS Records -->
                 <li class="treeview <?php if(in_array($scriptname, array("dns_records.php", "cname_records.php"))){ ?>active<?php } ?>">
                   <a href="#">
-                    <i class="fa fa-fw fa-address-book"></i> <span>Local DNS</span>
+                    <i class="fa fa-fw menu-icon fa-address-book"></i> Local DNS
                     <span class="pull-right-container">
                       <i class="fa fa-angle-left pull-right"></i>
                     </span>
@@ -622,12 +622,12 @@ if($auth) {
                   <ul class="treeview-menu">
                     <li<?php if($scriptname === "dns_records.php"){ ?> class="active"<?php } ?>>
                         <a href="dns_records.php">
-                            <i class="fa fa-fw fa-address-book"></i> <span>DNS Records</span>
+                            <i class="fa fa-fw menu-icon fa-address-book"></i> DNS Records
                         </a>
                     </li>
                     <li<?php if($scriptname === "cname_records.php"){ ?> class="active"<?php } ?>>
                         <a href="cname_records.php">
-                            <i class="fa fa-fw fa-address-book"></i> <span>CNAME Records</span>
+                            <i class="fa fa-fw menu-icon fa-address-book"></i> CNAME Records
                         </a>
                     </li>
                   </ul>
@@ -638,7 +638,7 @@ if($auth) {
                 if(strlen($pwhash) > 0) { ?>
                 <li>
                     <a href="?logout">
-                        <i class="fa fa-fw fa-user-times"></i> <span>Logout</span>
+                        <i class="fa fa-fw menu-icon fa-user-times"></i> Logout
                     </a>
                 </li>
                 <?php } ?>
@@ -649,20 +649,20 @@ if($auth) {
                 if(strlen($pwhash) > 0 && !$auth) { ?>
                 <li<?php if($scriptname === "login"){ ?> class="active"<?php } ?>>
                     <a href="index.php?login">
-                        <i class="fa fa-fw fa-user"></i> <span>Login</span>
+                        <i class="fa fa-fw menu-icon fa-user"></i> Login
                     </a>
                 </li>
                 <?php } ?>
                 <!-- Donate -->
                 <li>
                     <a href="https://pi-hole.net/donate/" rel="noopener" target="_blank">
-                        <i class="fab fa-fw fa-paypal"></i> <span>Donate</span>
+                        <i class="fab fa-fw menu-icon fa-paypal"></i> Donate
                     </a>
                 </li>
                  <!-- Docs -->
                  <li>
                     <a href="https://docs.pi-hole.net/" rel="noopener" target="_blank">
-                        <i class="fa fa-fw fa-question-circle"></i> <span>Documentation</span>
+                        <i class="fa fa-fw menu-icon fa-question-circle"></i> Documentation
                     </a>
                 </li>
             </ul>
diff --git a/style/pi-hole.css b/style/pi-hole.css
index 838e9f62..97ddd594 100644
--- a/style/pi-hole.css
+++ b/style/pi-hole.css
@@ -473,3 +473,7 @@ td.details-control {
   box-shadow: 0 0 2px -1px #bbb;
   border-radius: 6px;
 }
+
+.menu-icon {
+  margin-right: 0.5em;
+}