diff --git a/scripts/pi-hole/js/settings.js b/scripts/pi-hole/js/settings.js
index dc5c1ff4..660bb56a 100644
--- a/scripts/pi-hole/js/settings.js
+++ b/scripts/pi-hole/js/settings.js
@@ -37,10 +37,26 @@ function setConfigValues(topic, key, value) {
 
   // else: we have a setting we can set
   var escapedKey = key.replaceAll(".", "\\.");
+  var envTitle = $(`.${escapedKey}`);
+
+  if (value.flags.advanced) {
+    if (envTitle.find(".advanced-warning").length === 0) {
+      envTitle.append(
+        `<span class="advanced-warning">&nbsp;&nbsp;<i class="fas fa-wrench" title="This is an advanced level setting"></i></span>`
+      );
+    }
+  }
+
+  if (value.flags.restart_dnsmasq) {
+    if (envTitle.find(".restart-warning").length === 0) {
+      envTitle.append(
+        `<span class="restart-warning">&nbsp;&nbsp;<i class="fas fa-redo text-orange" title="Setting requires FTL restart on change"></i></span>`
+      );
+    }
+  }
 
   if (value.flags.env_var) {
     // If this setting has been set by environment variable, display a padlock in the section title
-    var envTitle = $(`.${escapedKey}`);
     if (envTitle.find(".env-warning").length === 0) {
       envTitle.append(
         `<span class="env-warning">&nbsp;&nbsp;<i class="fas fa-lock text-orange env-warning" title="Settings overwritten by an environmental variable are read-only"></i></span>`
diff --git a/settings-dhcp.lp b/settings-dhcp.lp
index e66609fb..60a64cb8 100644
--- a/settings-dhcp.lp
+++ b/settings-dhcp.lp
@@ -146,7 +146,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
     <div class="col-md-12 settings-level-2">
         <div class="box box-warning">
             <div class="box-header with-border">
-                <h3 class="box-title">Static DHCP configuration&nbsp;&nbsp;<i class="fas fa-wrench" title="This is an advanced-level setting"></i></h3>
+                <h3 class="box-title">Static DHCP configuration</h3>
             </div>
             <div class="box-body">
                 <div class="row">
diff --git a/settings-dns.lp b/settings-dns.lp
index 5cb8e884..9b7e969f 100644
--- a/settings-dns.lp
+++ b/settings-dns.lp
@@ -59,7 +59,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
         </div>
         <div class="box box-warning settings-level-1">
             <div class="box-header with-border">
-                <h3 class="box-title dns.revServer.active dns.revServer.cidr dns.revServer.target dns.revServer.domain">Conditional forwarding&nbsp;&nbsp;<i class="fas fa-wrench" title="This is an advanced-level setting"></i></h3>
+                <h3 class="box-title dns.revServer.active dns.revServer.cidr dns.revServer.target dns.revServer.domain">Conditional forwarding</h3>
             </div>
             <div class="box-body">
                 <div class="row">
@@ -125,7 +125,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
     <div class="col-lg-6 settings-level-1">
         <div class="box box-warning">
             <div class="box-header with-border">
-                <h1 class="box-title dns.listeningMode">Interface settings&nbsp;&nbsp;<i class="fas fa-wrench" title="This is an advanced-level setting"></i></h1>
+                <h1 class="box-title dns.listeningMode">Interface settings</h1>
             </div>
             <div class="box-body">
                 <div class="row">
@@ -212,7 +212,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
         </div>
         <div class="box box-warning settings-level-2">
             <div class="box-header with-border">
-                <h3 class="box-title dns.rateLimit.count dns.rateLimit.interval">Rate-limiting&nbsp;&nbsp;<i class="fas fa-wrench" title="This is an advanced-level setting"></i></h3>
+                <h3 class="box-title dns.rateLimit.count dns.rateLimit.interval">Rate-limiting</h3>
             </div>
             <div class="box-body">
                 <div class="row">
diff --git a/settings-system.lp b/settings-system.lp
index 68b8b63b..44b2fc59 100644
--- a/settings-system.lp
+++ b/settings-system.lp
@@ -282,7 +282,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
     <div class="col-md-12 settings-level-1">
         <div class="box box-warning">
             <div class="box-header with-border">
-                <h3 class="box-title">Actions<span id="actions-title"></span>&nbsp;&nbsp;<i class="fas fa-wrench" title="This is an advanced-level setting"></i></h3>
+                <h3 class="box-title">Actions<span id="actions-title"></span></h3>
             </div>
             <div class="box-body">
                 <div class="row">