diff --git a/app/devices/app_config.php b/app/devices/app_config.php
index 0c6e43ae2d..e559fd3a43 100644
--- a/app/devices/app_config.php
+++ b/app/devices/app_config.php
@@ -268,19 +268,15 @@
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'device_profile_view';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'device_profile_add';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'device_profile_edit';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'device_profile_delete';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'device_profile_all';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
@@ -290,38 +286,30 @@
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'device_profile_key_view';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'device_profile_key_add';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'device_profile_key_edit';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'device_profile_key_delete';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'device_profile_key_all';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'device_profile_setting_view';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'device_profile_setting_add';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'device_profile_setting_edit';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'device_profile_setting_delete';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'device_profile_setting_all';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
@@ -329,6 +317,8 @@
 		$apps[$x]['permissions'][$y]['name'] = 'device_export';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
 		$y++;
+		$apps[$x]['permissions'][$y]['name'] = 'device_key_icon';
+		$y++;
 
 	//default settings
 		$y = 0;
diff --git a/app/devices/device_edit.php b/app/devices/device_edit.php
index ad627395a9..9918c29818 100644
--- a/app/devices/device_edit.php
+++ b/app/devices/device_edit.php
@@ -391,7 +391,9 @@
 								}
 								//$array['devices'][0]['device_keys'][$y]['device_key_protected'] = $row["device_key_protected"];
 								$array['devices'][0]['device_keys'][$y]['device_key_label'] = $row["device_key_label"];
-								$array['devices'][0]['device_keys'][$y]['device_key_icon'] = $row["device_key_icon"];
+								if (permission_exists('device_key_icon')) {
+									$array['devices'][0]['device_keys'][$y]['device_key_icon'] = $row["device_key_icon"];
+								}
 								$y++;
 							}
 						}
@@ -1335,7 +1337,9 @@
 				echo "				<td class='vtable'>".$text['label-device_key_extension']."</td>\n";
 			}
 			echo "				<td class='vtable'>".$text['label-device_key_label']."</td>\n";
-			echo "				<td class='vtable'>".$text['label-device_key_icon']."</td>\n";
+			if (permission_exists('device_key_icon')) {
+				echo "				<td class='vtable'>".$text['label-device_key_icon']."</td>\n";
+			}
 			if (is_array($device_keys) && @sizeof($device_keys) > 1 && permission_exists('device_key_delete')) {
 				echo "				<td class='vtable edit_delete_checkbox_all' onmouseover=\"swap_display('delete_label_keys', 'delete_toggle_keys');\" onmouseout=\"swap_display('delete_label_keys', 'delete_toggle_keys');\">\n";
 				echo "					<span id='delete_label_keys'>".$text['label-delete']."</span>\n";
@@ -1367,7 +1371,9 @@
 						echo "				<td class='vtable'>".$text['label-device_key_extension']."</td>\n";
 					}
 					echo "				<td class='vtable'>".$text['label-device_key_label']."</td>\n";
-					echo "				<td class='vtable'>".$text['label-device_key_icon']."</td>\n";
+					if (permission_exists('device_key_icon')) {
+						echo "				<td class='vtable'>".$text['label-device_key_icon']."</td>\n";
+					}
 					if (is_array($device_keys) && @sizeof($device_keys) > 1 && permission_exists('device_key_delete')) {
 						echo "				<td class='vtable edit_delete_checkbox_all' onmouseover=\"swap_display('delete_label_keys', 'delete_toggle_keys');\" onmouseout=\"swap_display('delete_label_keys', 'delete_toggle_keys');\">\n";
 						echo "					<span id='delete_label_keys'>".$text['label-delete']."</span>\n";
@@ -1579,10 +1585,12 @@
 				echo "<td align='left'>\n";
 				echo "	<input class='formfld' type='text' name='device_keys[".$x."][device_key_label]' style='width: 75px;' maxlength='255' value=\"".escape($row['device_key_label'])."\"/>\n";
 				echo "</td>\n";
-				
-				echo "<td align='left'>\n";
-				echo "	<input class='formfld' type='text' name='device_keys[".$x."][device_key_icon]' style='width: 75px;' maxlength='255' value=\"".escape($row['device_key_icon'])."\"/>\n";
-				echo "</td>\n";
+
+				if (permission_exists('device_key_icon')) {
+					echo "<td align='left'>\n";
+					echo "	<input class='formfld' type='text' name='device_keys[".$x."][device_key_icon]' style='width: 75px;' maxlength='255' value=\"".escape($row['device_key_icon'])."\"/>\n";
+					echo "</td>\n";
+				}
 
 				if (is_array($device_keys) && @sizeof($device_keys) > 1 && permission_exists('device_key_delete')) {
 					if (is_uuid($row['device_key_uuid'])) {
diff --git a/app/devices/resources/dashboard/device_keys.php b/app/devices/resources/dashboard/device_keys.php
index 4155b4f9a1..6536fbdd84 100644
--- a/app/devices/resources/dashboard/device_keys.php
+++ b/app/devices/resources/dashboard/device_keys.php
@@ -17,7 +17,7 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2016-2021
+	Portions created by the Initial Developer are Copyright (C) 2016-2022
 	the Initial Developer. All Rights Reserved.
 
 */
@@ -231,7 +231,9 @@
 											$array['device_keys'][0]['device_key_line'] = $device_key_line;
 											$array['device_keys'][0]['device_key_value'] = $device_key_value;
 											$array['device_keys'][0]['device_key_label'] = $device_key_label;
-											$array['device_keys'][0]['device_key_icon'] = $device_key_icon;
+											if (permission_exists('device_key_icon')) {
+												$array['device_keys'][0]['device_key_icon'] = $device_key_icon;
+											}
 											$array['device_keys'][0]['device_key_category'] = $device_key_category;
 											$array['device_keys'][0]['device_key_vendor'] = $device_key_vendor;
 
@@ -252,7 +254,9 @@
 										$array['device_keys'][0]['device_key_type'] = $device_key_type;
 										$array['device_keys'][0]['device_key_value'] = $device_key_value;
 										$array['device_keys'][0]['device_key_label'] = $device_key_label;
-										$array['device_keys'][0]['device_key_icon'] = $device_key_icon;
+										if (permission_exists('device_key_icon')) {
+											$array['device_keys'][0]['device_key_icon'] = $device_key_icon;
+										}
 								}
 								if ($save) {
 									//add the temporary permissions
@@ -470,7 +474,9 @@
 					}
 					echo "		<th>".$text['label-device_key_value']."</th>\n";
 					echo "		<th>".$text['label-device_key_label']."</th>\n";
-					echo "		<th class='shrink'>".$text['label-device_key_icon']."</th>\n";
+					if (permission_exists('device_key_icon')) {
+						echo "		<th class='shrink'>".$text['label-device_key_icon']."</th>\n";
+					}
 					echo "	</tr>\n";
 				}
 
@@ -610,11 +616,13 @@
 				echo "		</td>\n";
 				echo "		<td class='input'>\n";
 				echo "			<input class='formfld' style='min-width: 50px; max-width: 100px;' type='text' name='device_keys[".$x."][device_key_label]' maxlength='255' value=\"".$row['device_key_label']."\">\n";
-				echo "		</td>\n";
-				echo "		<td class='input'>\n";
-				echo "			<input class='formfld' style='min-width: 50px; max-width: 100px;' type='text' name='device_keys[".$x."][device_key_icon]' maxlength='255' value=\"".$row['device_key_icon']."\">\n";
 				echo "			<input type='hidden' name='device_keys[".$x."][device_profile_uuid]' value=\"".$row['device_profile_uuid']."\">\n";
 				echo "		</td>\n";
+				if (permission_exists('device_key_icon')) {
+					echo "		<td class='input'>\n";
+					echo "			<input class='formfld' style='min-width: 50px; max-width: 100px;' type='text' name='device_keys[".$x."][device_key_icon]' maxlength='255' value=\"".$row['device_key_icon']."\">\n";
+					echo "		</td>\n";
+				}
 				echo "	</tr>\n";
 
 			//set the previous vendor