diff --git a/front/php/templates/language/en_us.json b/front/php/templates/language/en_us.json
index 69f895524..2f589ffc7 100755
--- a/front/php/templates/language/en_us.json
+++ b/front/php/templates/language/en_us.json
@@ -460,31 +460,28 @@
         "Plugins_Filters_Mac" : "Mac Filter",
         "Plugins_Out_of" : "out of",        
         "Plugins_no_control" : "No form control was found to render this value.",        
-        "Plugins_enabled_settings" : "Enabled settings",        
-        "Plugins_enabled_settings_icon" : "fa-solid fa-toggle-on",        
-        "Plugins_type_core" : "Core",        
-        "Plugins_type_core_icon" : "fa-solid fa-gem",        
-        "Plugins_type_device_scanner" : "Device Scanners",        
-        "Plugins_type_device_scanner_icon" : "fa-solid fa-magnifying-glass-plus",        
-        "Plugins_type_other" : "Others",        
-        "Plugins_type_other_icon" : "fa-solid fa-recycle",        
-        "Plugins_type_system" : "System",        
-        "Plugins_type_system_icon" : "fa-solid fa-gear",        
-        "Plugins_type_publisher" : "Publishers",        
-        "Plugins_type_publisher_icon" : "fa-solid fa-comment-dots",        
+        "settings_enabled" : "Enabled settings",        
+        "settings_enabled_icon" : "fa-solid fa-toggle-on",        
+        "settings_core_icon" : "fa-solid fa-gem",                 
+        "settings_device_scanners_icon" : "fa-solid fa-magnifying-glass-plus",                    
+        "settings_other_scanners_icon" : "fa-solid fa-recycle",                
+        "settings_system_icon" : "fa-solid fa-gear",      
+        "settings_publisher_icon" : "fa-solid fa-comment-dots",   
         "Settings_Metadata_Toggle" : "Show/hide metadata for the given setting.",
         "settings_missing" : "Not all settings loaded, refresh the page! This is probably caused by a high load on the database or app startup sequence.",
         "settings_missing_block" : "You can not save your settings without specifying all setting keys. Refresh the page. This is probably caused by a high load on the database.",
         "settings_old" : "Importing settings and re-initializing...",
         "settings_saved" : "<br/>Settings saved to the <code>pialert.conf</code> file.<br/><br/>A time-stamped backup of the previous file created. <br/><br/> Reloading...<br/>",        
+        "settings_system_label" : "System",        
+        "settings_core_label" : "Core",   
         "settings_imported_label" : "Settings imported",
         "settings_imported" : "Last time settings were imported from the pialert.conf file",
         "settings_other_scanners_label" : "Other scanners",
         "settings_other_scanners" : "Other, non-device scanner plugins that are currently enabled.",
         "settings_device_scanners_label" : "Device scanners",
         "settings_device_scanners" : "Device scanners used to discover devices that write into the CurrentScan database table.",
-        "settings_publishers_enabled_label" : "Publishers",        
-        "settings_publishers_enabled" : "Enabled notification gateways - publishers, that will send a notification depending on your settings.",        
+        "settings_publisher_label" : "Publishers",     
+        "settings_publishers" : "Enabled notification gateways - publishers, that will send a notification depending on your settings.",        
         "settings_expand_all" : "Expand all",
         "Settings_device_Scanners_desync": "⚠ Device scanner schedules are out-of-sync.",
         "Settings_device_Scanners_desync_popup": "Schedules of devices scanners (<code>*_RUN_SCHD</code>) are not the same. This will result into inconsistent device online/offline notifications. Unless this is intended, please use the same schedule for all enabled <b>🔍Device scanners</b>.",
diff --git a/front/settings.php b/front/settings.php
index 2fea2f2b2..092305a43 100755
--- a/front/settings.php
+++ b/front/settings.php
@@ -89,7 +89,7 @@
       <!-- Settings imported time -->
 
       <div class ="settings-group col-sm-12">
-            <i class="<?= lang("Plugins_enabled_settings_icon");?>"></i>  <?= lang("Plugins_enabled_settings");?>       
+            <i class="<?= lang("settings_enabled_icon");?>"></i>  <?= lang("settings_enabled");?>       
           </div>        
           <div class =" col-sm-12" id=""></div>
 
@@ -100,35 +100,35 @@
 
       <div class ="bg-grey-dark color-palette box panel panel-default col-sm-12 box-default box-info" >        
           <div class ="settings-group col-sm-12">
-            <i class="<?= lang("Plugins_type_core_icon");?>"></i>  <?= lang("Plugins_type_core");?>       
+            <i class="<?= lang("settings_core_icon");?>"></i>  <?= lang("settings_core_label");?>       
           </div>        
           <div class =" col-sm-12" id="core_content"></div>
       </div>    
 
       <div class ="bg-grey-dark color-palette box panel panel-default col-sm-12 box-default box-info" >        
           <div class ="settings-group col-sm-12">
-            <i class="<?= lang("Plugins_type_system_icon");?>"></i>  <?= lang("Plugins_type_system");?>       
+            <i class="<?= lang("settings_system_icon");?>"></i>  <?= lang("settings_system_label");?>       
           </div>        
           <div class =" col-sm-12" id="system_content"></div>
       </div> 
 
       <div class ="bg-grey-dark color-palette box panel panel-default col-sm-12 box-default box-info" >        
           <div class ="settings-group col-sm-12">
-            <i class="<?= lang("Plugins_type_device_scanner_icon");?>"></i>  <?= lang("Plugins_type_device_scanner");?>     
+            <i class="<?= lang("settings_device_scanners_icon");?>"></i>  <?= lang("settings_device_scanners_label");?>     
           </div>        
           <div class =" col-sm-12" id="device_scanner_content"></div>
       </div> 
 
       <div class ="bg-grey-dark color-palette box panel panel-default col-sm-12 box-default box-info" >        
           <div class ="settings-group col-sm-12">
-            <i class="<?= lang("Plugins_type_other_icon");?>"></i>  <?= lang("Plugins_type_other");?>       
+            <i class="<?= lang("settings_other_scanners_icon");?>"></i>  <?= lang("settings_other_scanners_label");?>       
           </div>        
           <div class =" col-sm-12" id="other_content"></div>
       </div> 
 
       <div class ="bg-grey-dark color-palette box panel panel-default col-sm-12 box-default box-info" >        
           <div class ="settings-group col-sm-12">
-            <i class="<?= lang("Plugins_type_publisher_icon");?>"></i>  <?= lang("Plugins_type_publisher");?>       
+            <i class="<?= lang("settings_publisher_icon");?>"></i>  <?= lang("settings_publisher_label");?>       
           </div>        
           <div class =" col-sm-12" id="publisher_content"></div>
       </div> 
@@ -219,6 +219,9 @@ function initSettingsPage(settingsData, pluginsData){
       overviewSections_html += `<div class="overview-section col-sm-12" id="${section}">
                                   <div class="col-sm-12 " title="${getString("settings_"+section)}">
                                     <div class="overview-group col-sm-12">
+                                    
+                                      <i title="${section}" class="${getString("settings_"+section+"_icon")}"></i>       
+          
                                       ${getString("settings_"+section+"_label")}                                      
                                     </div>                                    
                                   </div>