diff --git a/core/users/app_languages.php b/core/users/app_languages.php
index fbdecdfb44..2bd87214de 100644
--- a/core/users/app_languages.php
+++ b/core/users/app_languages.php
@@ -462,4 +462,9 @@
 	$text['message-group_exists']['pt-pt'] = "O Grupo já Existe";
 	$text['message-group_exists']['fr-fr'] = "Groupe Existe Déjà";
 
+	$text['message-default_system_group']['en-us'] = "Default system groups cannot be edited or deleted.";
+	$text['message-default_system_group']['es-cl'] = "Grupos predeterminados del sistema no pueden ser editados o eliminados.";
+	$text['message-default_system_group']['pt-pt'] = "Grupos de sistema padrão não podem ser editados ou apagados.";
+	$text['message-default_system_group']['fr-fr'] = "Les groupes du système par défaut ne peuvent pas être modifiés ou supprimés.";
+
 ?>
\ No newline at end of file
diff --git a/core/users/groups.php b/core/users/groups.php
index 8ae3d0539e..b954d1001a 100644
--- a/core/users/groups.php
+++ b/core/users/groups.php
@@ -185,13 +185,21 @@ require_once "resources/require.php";
 			$echo .= "</td>\n";
 			$echo .= "<td class='row_stylebg' nowrap>".$group_description."</td>\n";
 			$echo .= "<td class='list_control_icons' style='width: 25px;'>";
-			if (!($domain_uuid == '' && in_array($group_name, $system_groups))) {
-				if (permission_exists('group_edit')) {
+			if (permission_exists('group_edit')) {
+				if (!($domain_uuid == '' && in_array($group_name, $system_groups))) {
 					$echo .= "<a href='groupedit.php?id=".$group_uuid."' alt='".$text['button-edit']."'>".$v_link_label_edit."</a>";
 				}
-				if (permission_exists('group_delete')) {
+				else {
+					$echo .= "<span onclick=\"alert('".$text['message-default_system_group']."');\" alt='".$text['button-edit']."'>".str_replace("list_control_icon", "list_control_icon_disabled", $v_link_label_edit)."</span>";
+				}
+			}
+			if (permission_exists('group_delete')) {
+				if (!($domain_uuid == '' && in_array($group_name, $system_groups))) {
 					$echo .= "<a href='groupdelete.php?id=".$group_uuid."' onclick=\"return confirm('".$text['confirm-delete']."')\" alt='".$text['button-delete']."'>".$v_link_label_delete."</a>";
 				}
+				else {
+					$echo .= "<span onclick=\"alert('".$text['message-default_system_group']."');\" alt='".$text['button-delete']."'>".str_replace("list_control_icon", "list_control_icon_disabled", $v_link_label_delete)."</span>";
+				}
 			}
 			$echo .= "</td>\n";
 			$echo .= "</tr>\n";
diff --git a/core/users/users.php b/core/users/users.php
index dc34c96315..2a7b0a4a23 100644
--- a/core/users/users.php
+++ b/core/users/users.php
@@ -212,7 +212,7 @@ else {
 						echo "<a href='userdelete.php?id=".$row['user_uuid']."' alt='".$text['button-delete']."' onclick=\"return confirm('".$text['confirm-delete']."')\">".$v_link_label_delete."</a>";
 					}
 					else {
-						echo "<span onclick=\"alert('".$text['message-cannot_delete_own_account']."');\">".$v_link_label_delete."</span>";
+						echo "<span onclick=\"alert('".$text['message-cannot_delete_own_account']."');\">".str_replace("list_control_icon", "list_control_icon_disabled", $v_link_label_delete)."</span>";
 					}
 				}
 				echo "	</td>\n";
diff --git a/themes/enhanced/template.php b/themes/enhanced/template.php
index ee18fcb1d1..d88c711ae4 100644
--- a/themes/enhanced/template.php
+++ b/themes/enhanced/template.php
@@ -228,6 +228,15 @@ img.list_control_icon {
 	-moz-opacity: 0.4;
 	}
 
+img.list_control_icon_disabled {
+	margin: 2px;
+	width: 21px;
+	height: 21px;
+	border: none;
+	opacity: 0.4;
+	-moz-opacity: 0.4;
+	}
+
 form {
 	margin: 0;
 	}
diff --git a/themes/minimized/template.php b/themes/minimized/template.php
index 3f0f996941..8f10dd2ba1 100644
--- a/themes/minimized/template.php
+++ b/themes/minimized/template.php
@@ -228,6 +228,15 @@ img.list_control_icon {
 	-moz-opacity: 0.4;
 	}
 
+img.list_control_icon_disabled {
+	margin: 2px;
+	width: 21px;
+	height: 21px;
+	border: none;
+	opacity: 0.4;
+	-moz-opacity: 0.4;
+	}
+
 form {
 	margin: 0;
 	}