diff --git a/celements-user-manager/web-module/src/main/webapp/resources/celJS/userAdmin/doubleclickEditAction.mjs b/celements-user-manager/web-module/src/main/webapp/resources/celJS/userAdmin/doubleclickEditAction.mjs
new file mode 100644
index 00000000..0c12ecff
--- /dev/null
+++ b/celements-user-manager/web-module/src/main/webapp/resources/celJS/userAdmin/doubleclickEditAction.mjs
@@ -0,0 +1,8 @@
+const editUser = (li, event) => {
+  const url = li.querySelector('.column_edit a').href;
+  window.location.href = url;  
+};
+
+document.querySelectorAll('li.struct_table_row').forEach((li) => {
+  li.addEventListener('dblclick', (event) => (editUser(li, event)));
+});
diff --git a/celements-user-manager/web-module/src/main/webapp/resources/celRes/userAdmin/buttonRow.css b/celements-user-manager/web-module/src/main/webapp/resources/celRes/userAdmin/buttonRow.css
index add11402..5963fb1b 100644
--- a/celements-user-manager/web-module/src/main/webapp/resources/celRes/userAdmin/buttonRow.css
+++ b/celements-user-manager/web-module/src/main/webapp/resources/celRes/userAdmin/buttonRow.css
@@ -11,19 +11,27 @@
 }
 
 #userAdminActionRow .actionButtonLarge a {
-  align-content: center;
   text-decoration: none;
+  display: flex;
+  flex-flow: row;
+  align-items: center;
+  gap: 7px;
+  color: black;
+}
+
+#userAdminActionRow .actionButtonLarge a:hover {
+  color: var(--accent-color);
 }
 
 #userAdminActionRow .actionButtonLarge a i {
-  width: 30px;
-  height: 30px;
+  width: 26px;
+  height: 26px;
   align-content: center;
   text-align: center;
-  border-radius: 20px;
+  border-radius: 13px;
   border: 2px solid var(--accent-color);
   color: var(--accent-color);
-  font-size: 20px;
+  font-size: 18px;
 }
 
 #userAdminActionRow .actionButtonLarge a:hover i {
diff --git a/celements-user-manager/web-module/src/main/webapp/resources/celRes/userAdmin/main.css b/celements-user-manager/web-module/src/main/webapp/resources/celRes/userAdmin/main.css
index ff152839..1758b607 100644
--- a/celements-user-manager/web-module/src/main/webapp/resources/celRes/userAdmin/main.css
+++ b/celements-user-manager/web-module/src/main/webapp/resources/celRes/userAdmin/main.css
@@ -14,6 +14,7 @@
   display: flex;
   flex-flow: column;
   margin: 0px 2%;
+  max-width: 1536px;
 }
 #userAdmin  *,
 #userAdminEdit *{
@@ -58,6 +59,9 @@
   font-weight: 600;
   margin: 0px;
 }
+#cell\:celements2web\.\.UserAdmin\.subtitleSearch {
+  display: none;
+}
 #userAdmin li,
 #userAdmin a,
 #userAdminEdit a,
diff --git a/celements-user-manager/web-module/src/main/webapp/resources/celRes/userAdmin/table.css b/celements-user-manager/web-module/src/main/webapp/resources/celRes/userAdmin/table.css
index 7dc838cc..b7365ed4 100644
--- a/celements-user-manager/web-module/src/main/webapp/resources/celRes/userAdmin/table.css
+++ b/celements-user-manager/web-module/src/main/webapp/resources/celRes/userAdmin/table.css
@@ -3,7 +3,7 @@
   display: flex;
   flex-flow: column;
   gap: 3px;
-  min-width: 930px;
+  min-width: 975px;
 }
 #searchoutput .struct_table ul.struct_table_header, 
 #searchoutput .struct_table ul.struct_table_data {
@@ -29,8 +29,8 @@
   display: flex;
   flex-flow: row wrap;
   align-items: flex-start;
-  padding: 3px 0px;
-  gap: 0px 3px;
+  padding: 5px 0px;
+  gap: 0px 5px;
 }
 #searchoutput .struct_table ul.struct_table_data li.struct_table_row:hover,
 #searchoutput .struct_table ul.struct_table_data li.struct_table_row.open {
@@ -92,6 +92,10 @@
 #searchoutput .struct_table .column_sendMail a.icon-link:hover {
   color: var(--accent-color);
 }
+#searchoutput .struct_table .column_delete a.icon-link.disabled {
+  pointer-events: none;
+  color: gray;
+}
 #searchoutput .struct_table ul li.struct_table_row .editContentRTE {
 	display: flex;
   flex-flow: column;
diff --git a/celements-user-manager/web-module/src/main/webapp/templates/celMacros/userAdmin/col_delete.vm b/celements-user-manager/web-module/src/main/webapp/templates/celMacros/userAdmin/col_delete.vm
new file mode 100644
index 00000000..2b4eb5ca
--- /dev/null
+++ b/celements-user-manager/web-module/src/main/webapp/templates/celMacros/userAdmin/col_delete.vm
@@ -0,0 +1,10 @@
+#set($iconDeleteCssClass = "fa-solid fa-trash-can")
+#set($xredirect = "/app/cel/admin/UserAdmin")
+#set($xcancel = "/app/cel/admin/UserAdmin")
+#set($userDocRef = $services.reference.resolveDocRef(${context.getUser()}))
+#if($userDocRef == $doc.getDocumentReference())
+  #set($isDisabled = true)
+#else
+  #set($isDisabled = false)
+#end
+#parse('celStruct/table/col_delete.vm')
diff --git a/celements-user-manager/web-module/src/main/webapp/templates/celMacros/userAdmin/col_sendMail.vm b/celements-user-manager/web-module/src/main/webapp/templates/celMacros/userAdmin/col_sendMail.vm
index dd285bc9..a70ce611 100644
--- a/celements-user-manager/web-module/src/main/webapp/templates/celMacros/userAdmin/col_sendMail.vm
+++ b/celements-user-manager/web-module/src/main/webapp/templates/celMacros/userAdmin/col_sendMail.vm
@@ -1,4 +1,6 @@
 #set($userFN = $services.reference.serialize($doc.getDocumentReference()))
 #set($userAdminDocRef = $services.reference.create().space('Content').doc('UserAdmin').build())
 #set($params = "xpage=celements_ajax&ajax_mode=userAdmin/sendActivationMail&user=$userFN")
-<a class="icon-link sendMailAction" href="$services.url.getURL($userAdminDocRef, 'view', $params)"><i class="icon $!{iconSendMailCssClass}" title="send mail"></i></a>
+<a class="icon-link sendMailAction" href="$services.url.getURL($userAdminDocRef, 'view', $params)">
+  <i class="icon $!{iconSendMailCssClass}" title="$adminMsg.get('cel_useradmin_send_new_validation')"></i>
+</a>