diff --git a/src/Module/Admin/BaseUsers.php b/src/Module/Admin/BaseUsers.php
index 97b10f41fb..37f7acdf62 100644
--- a/src/Module/Admin/BaseUsers.php
+++ b/src/Module/Admin/BaseUsers.php
@@ -120,7 +120,7 @@ abstract class BaseUsers extends BaseAdmin
 			$user['login_date'] = Temporal::getRelativeDate($user['login_date']);
 			$user['lastitem_date'] = Temporal::getRelativeDate($user['last-item']);
 			$user['is_admin'] = in_array($user['email'], $adminlist);
-			$user['is_deletable'] = (intval($user['uid']) != local_user());
+			$user['is_deletable'] = !$user['account_removed'] && intval($user['uid']) != local_user();
 			$user['deleted'] = ($user['account_removed'] ? Temporal::getRelativeDate($user['account_expires_on']) : False);
 
 			return $user;
diff --git a/view/theme/frio/templates/admin/users/active.tpl b/view/theme/frio/templates/admin/users/active.tpl
index c2909088ac..c381cf0cf8 100644
--- a/view/theme/frio/templates/admin/users/active.tpl
+++ b/view/theme/frio/templates/admin/users/active.tpl
@@ -129,15 +129,9 @@
 					</td>
 					<td class="text-right">
 				{{if $u.is_deletable}}
-					{{if $u.blocked}}
-						<a href="{{$baseurl}}/admin/users/unblock/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link" title="{{$unblock}}">
-							<i class="fa fa-circle-o" aria-hidden="true"></i>
-						</a>
-					{{else}}
 						<a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link" title="{{$block}}">
 							<i class="fa fa-ban" aria-hidden="true"></i>
 						</a>
-					{{/if}}
 						<a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link" title="{{$delete}}" onclick="return confirm_delete('{{$confirm_delete}}','{{$u.name}}')">
 							<i class="fa fa-trash" aria-hidden="true"></i>
 						</a>
diff --git a/view/theme/frio/templates/admin/users/blocked.tpl b/view/theme/frio/templates/admin/users/blocked.tpl
index 3b80556518..f53dc16b7c 100644
--- a/view/theme/frio/templates/admin/users/blocked.tpl
+++ b/view/theme/frio/templates/admin/users/blocked.tpl
@@ -86,6 +86,7 @@
 						</i>
 						{{/if}}
 						{{if $u.is_admin}}<i class="fa fa-user-secret text-primary" title="{{$siteadmin}}"></i>{{/if}}
+						{{if $u.blocked}}<i class="fa fa-ban text-danger" title="{{$blocked}}"></i>{{/if}}
 						{{if $u.account_expired}}<i class="fa fa-clock-o text-warning" title="{{$accountexpired}}"></i>{{/if}}
 					</td>
 				{{/if}}
diff --git a/view/theme/frio/templates/admin/users/index.tpl b/view/theme/frio/templates/admin/users/index.tpl
index 41226eb44c..e8ae271bb6 100644
--- a/view/theme/frio/templates/admin/users/index.tpl
+++ b/view/theme/frio/templates/admin/users/index.tpl
@@ -87,6 +87,8 @@
 						</i>
 						{{/if}}
 						{{if $u.is_admin}}<i class="fa fa-user-secret text-primary" title="{{$siteadmin}}"></i>{{/if}}
+						{{if $u.blocked}}<i class="fa fa-ban text-danger" title="{{$blocked}}"></i>{{/if}}
+						{{if $u.deleted}}<i class="fa fa-user-times" title="{{$h_deleted}}"></i>{{/if}}
 						{{if $u.account_expired}}<i class="fa fa-clock-o text-warning" title="{{$accountexpired}}"></i>{{/if}}
 					</td>
 				{{/if}}
@@ -131,7 +133,7 @@
 				{{if $u.is_deletable}}
 					{{if $u.blocked}}
 						<a href="{{$baseurl}}/admin/users/unblock/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link" title="{{$unblock}}">
-							<i class="fa fa-circle-o" aria-hidden="true"></i>
+							<i class="fa fa-check-circle-o" aria-hidden="true"></i>
 						</a>
 					{{else}}
 						<a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link" title="{{$block}}">