diff --git a/core/dashboard/dashboard_edit.php b/core/dashboard/dashboard_edit.php
index 9bf5af6e77..4cd4320436 100644
--- a/core/dashboard/dashboard_edit.php
+++ b/core/dashboard/dashboard_edit.php
@@ -788,12 +788,12 @@
 	echo "<td class='vtable' style='position: relative;' align='left'>\n";
 	if (substr($_SESSION['theme']['input_toggle_style']['text'], 0, 6) == 'switch') {
 		echo "	<label class='switch'>\n";
-		echo "		<input type='checkbox' id='dashboard_label_enabled' name='dashboard_label_enabled' value='true' ".($dashboard_label_enabled == 'true' ? "checked='checked'" : null).">\n";
+		echo "		<input type='checkbox' id='dashboard_label_enabled' name='dashboard_label_enabled' value='true' ".($dashboard_label_enabled == 'true' ? "checked='checked'" : null)." onclick=\"$('.type_label').toggle();\">\n";
 		echo "		<span class='slider'></span>\n";
 		echo "	</label>\n";
 	}
 	else {
-		echo "	<select class='formfld' id='dashboard_label_enabled' name='dashboard_label_enabled'>\n";
+		echo "	<select class='formfld' id='dashboard_label_enabled' name='dashboard_label_enabled' onchange=\"$('.type_label').toggle();\">\n";
 		echo "		<option value='false'>".$text['option-false']."</option>\n";
 		echo "		<option value='true' ".($dashboard_label_enabled == 'true' ? "selected='selected'" : null).">".$text['option-true']."</option>\n";
 		echo "	</select>\n";
@@ -803,7 +803,7 @@
 	echo "</td>\n";
 	echo "</tr>\n";
 
-	echo "<tr>\n";
+	echo "<tr class='type_label' ".($dashboard_label_enabled != 'true' ? "style='display: none;'" : null).">\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 	echo $text['label-dashboard_label_text_color']."\n";
 	echo "</td>\n";
@@ -815,7 +815,7 @@
 	echo "</tr>\n";
 
 	if ($action == "add" || $dashboard_path == "core/dashboard/resources/dashboard/icon.php") {
-		echo "<tr class='type_icon' ".($dashboard_path != 'core/dashboard/resources/dashboard/icon.php' ? "style='display: none;'" : null).">\n";
+		echo "<tr class='type_icon type_label' ".($dashboard_path != 'core/dashboard/resources/dashboard/icon.php' || $dashboard_label_enabled != 'true' ? "style='display: none;'" : null).">\n";
 		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 		echo $text['label-dashboard_label_text_color_hover']."\n";
 		echo "</td>\n";
@@ -827,7 +827,7 @@
 		echo "</tr>\n";
 	}
 
-	echo "<tr>\n";
+	echo "<tr class='type_label' ".($dashboard_label_enabled != 'true' ? "style='display: none;'" : null).">\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 	echo $text['label-dashboard_label_background_color']."\n";
 	echo "</td>\n";
@@ -839,7 +839,7 @@
 	echo "</tr>\n";
 
 	if ($action == "add" || $dashboard_path == "core/dashboard/resources/dashboard/icon.php") {
-		echo "<tr class='type_icon' ".($dashboard_path != 'core/dashboard/resources/dashboard/icon.php' ? "style='display: none;'" : null).">\n";
+		echo "<tr class='type_icon type_label' ".($dashboard_path != 'core/dashboard/resources/dashboard/icon.php' || $dashboard_label_enabled != 'true' ? "style='display: none;'" : null).">\n";
 		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 		echo $text['label-dashboard_label_background_color_hover']."\n";
 		echo "</td>\n";
diff --git a/themes/default/app_config.php b/themes/default/app_config.php
index 3af27a6a89..739c642c7f 100644
--- a/themes/default/app_config.php
+++ b/themes/default/app_config.php
@@ -905,67 +905,67 @@
 		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "b0e092e8-ade5-4607-b57b-a5c5b4b9c426";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "dashboard_heading_background_color";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "dashboard_label_background_color";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "#8e96a5";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the background color (and opacity) of the Dashboard block heading.";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the background color (and opacity) of the Dashboard block label.";
 		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "dd536d7f-ee46-45fe-a28e-7baca9d25357";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "dashboard_heading_background_color_hover";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "dashboard_label_background_color_hover";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "#969dab";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the background hover color (and opacity) of the Dashboard block heading.";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the background hover color (and opacity) of the Dashboard block label.";
 		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "b5e33723-0ef5-4223-8352-33f74476732e";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "dashboard_heading_text_color";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "dashboard_label_text_color";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "#ffffff";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the color (and opacity) of the Dashboard block heading text.";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the color (and opacity) of the Dashboard block label text.";
 		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "b09126da-c68b-473c-83f8-8e9a7523ce37";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "dashboard_heading_text_color_hover";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "dashboard_label_text_color_hover";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "#ffffff";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the hover color (and opacity) of the Dashboard block heading text.";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the hover color (and opacity) of the Dashboard block label text.";
 		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "759391b7-8af9-4661-a676-867e01e8f21f";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "dashboard_heading_text_font";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "dashboard_label_text_font";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "Calibri, Candara, Segoe, Segoe UI, Optima, Arial, sans-serif";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the font of the Dashboard block heading text.";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the font of the Dashboard block label text.";
 		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "1a52a4b6-5722-4fbe-ae4e-7b3d38cff437";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "dashboard_heading_text_size";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "dashboard_label_text_size";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "10.5pt";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the size of the Dashboard block heading text.";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the size of the Dashboard block label text.";
 		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "b7bdbe98-f667-42ed-8864-cf92e3b048df";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "dashboard_heading_text_shadow_color";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "dashboard_label_text_shadow_color";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "#000000";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the shadow color (and opacity) of the Dashboard block heading text.";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the shadow color (and opacity) of the Dashboard block label text.";
 		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "6e33d5d8-679a-4fe2-bd6a-f192a8637e8b";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "dashboard_heading_text_shadow_color_hover";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "dashboard_label_text_shadow_color_hover";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "#000000";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the shadow hover color (and opacity) of the Dashboard block heading text.";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the shadow hover color (and opacity) of the Dashboard block label text.";
 		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "320bae87-47dc-4b21-a2f0-eea875ce5b50";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
diff --git a/themes/default/css.php b/themes/default/css.php
index ae44c2e6e8..43c058189f 100644
--- a/themes/default/css.php
+++ b/themes/default/css.php
@@ -213,13 +213,13 @@ $dashboard_detail_background_color_center = $_SESSION['theme']['dashboard_detail
 $dashboard_border_radius = $_SESSION['theme']['dashboard_border_radius']['text'] ?? '5px';
 $dashboard_border_color = $_SESSION['theme']['dashboard_border_color']['text'] ?? '#dbe0ea';
 $dashboard_border_color_hover = $_SESSION['theme']['dashboard_border_color_hover']['text'] ?? '#cbd3e1';
-$dashboard_heading_text_color = $_SESSION['theme']['dashboard_heading_text_color']['text'] ?? '#444';
-$dashboard_heading_text_color_hover = $_SESSION['theme']['dashboard_heading_text_color_hover']['text'] ?? '';
-$dashboard_heading_text_size = $_SESSION['theme']['dashboard_heading_text_size']['text'] ?? '13px';
-$dashboard_heading_text_font = $_SESSION['theme']['dashboard_heading_text_font']['text'] ?? 'Arial, Calibri, Candara, Segoe, "Segoe UI", Optima, sans-serif';
-$dashboard_heading_text_shadow_color = $_SESSION['theme']['dashboard_heading_text_shadow_color']['text'] ?? 'rgba(0,0,0,0)';
-$dashboard_heading_background_color = $_SESSION['theme']['dashboard_heading_background_color']['text'] ?? '';
-$dashboard_heading_background_color_hover = $_SESSION['theme']['dashboard_heading_background_color_hover']['text'] ?? '';
+$dashboard_label_text_color = $_SESSION['theme']['dashboard_label_text_color']['text'] ?? '#444';
+$dashboard_label_text_color_hover = $_SESSION['theme']['dashboard_label_text_color_hover']['text'] ?? '';
+$dashboard_label_text_size = $_SESSION['theme']['dashboard_label_text_size']['text'] ?? '13px';
+$dashboard_label_text_font = $_SESSION['theme']['dashboard_label_text_font']['text'] ?? 'Arial, Calibri, Candara, Segoe, "Segoe UI", Optima, sans-serif';
+$dashboard_label_text_shadow_color = $_SESSION['theme']['dashboard_label_text_shadow_color']['text'] ?? 'rgba(0,0,0,0)';
+$dashboard_label_background_color = $_SESSION['theme']['dashboard_label_background_color']['text'] ?? '';
+$dashboard_label_background_color_hover = $_SESSION['theme']['dashboard_label_background_color_hover']['text'] ?? '';
 $dashboard_number_text_color = $_SESSION['theme']['dashboard_number_text_color']['text'] ?? '#444';
 $dashboard_number_text_color_hover = $_SESSION['theme']['dashboard_number_text_color_hover']['text'] ?? '';
 $dashboard_number_text_font = $_SESSION['theme']['dashboard_number_text_font']['text'] ?? 'Arial, Calibri, Candara, Segoe, "Segoe UI", Optima, sans-serif';
@@ -2583,15 +2583,15 @@ else { //default: white
 	span.hud_title {
 		display: block;
 		width: 100%;
-		font-family: <?=$dashboard_heading_text_font?>;
-		text-shadow: 0px 1px 2px <?=$dashboard_heading_text_shadow_color?>;
+		font-family: <?=$dashboard_label_text_font?>;
+		text-shadow: 0px 1px 2px <?=$dashboard_label_text_shadow_color?>;
 		letter-spacing: -0.02em;
-		color: <?=$dashboard_heading_text_color?>;
-		font-size: <?=$dashboard_heading_text_size?>;
+		color: <?=$dashboard_label_text_color?>;
+		font-size: <?=$dashboard_label_text_size?>;
 		font-weight: bold;
 		<?php
 		//calculate line height based on font size
-		$font_size = strtolower($dashboard_heading_text_size);
+		$font_size = strtolower($dashboard_label_text_size);
 		$tmp = str_replace(' ', '', $font_size);
 		$tmp = str_replace('pt', '', $tmp);
 		$tmp = str_replace('px', '', $tmp);
@@ -2602,15 +2602,15 @@ else { //default: white
 		?>
 		line-height: <?php echo ($line_height_number > 0) ? str_replace($font_size_number, $line_height_number, $font_size) : '26.25pt'; ?>;
 		text-align: center;
-		background: <?=$dashboard_heading_background_color?>;
-		border-bottom: 1px solid <?php echo color_adjust($dashboard_heading_background_color, 0.2); ?>;
+		background: <?=$dashboard_label_background_color?>;
+		border-bottom: 1px solid <?php echo color_adjust($dashboard_label_background_color, 0.2); ?>;
 		overflow: hidden;
 		}
 
 	span.hud_title:hover {
-		color: <?=$dashboard_heading_text_color_hover?>;
-		text-shadow: 0px 1px 2px <?=$dashboard_heading_text_shadow_color?>;
-		background: <?=$dashboard_heading_background_color_hover?>;
+		color: <?=$dashboard_label_text_color_hover?>;
+		text-shadow: 0px 1px 2px <?=$dashboard_label_text_shadow_color?>;
+		background: <?=$dashboard_label_background_color_hover?>;
 		cursor: pointer;
 		}
 
@@ -2641,7 +2641,7 @@ else { //default: white
 		overflow: hidden;
 		<?php
 		//calculate font padding
-		$font_size = strtolower($dashboard_heading_text_size);
+		$font_size = strtolower($dashboard_label_text_size);
 		$tmp = str_replace(' ', '', $font_size);
 		$tmp = str_replace('pt', '', $tmp);
 		$tmp = str_replace('px', '', $tmp);