diff --git a/framework/core/js/src/admin/components/UserListPage.tsx b/framework/core/js/src/admin/components/UserListPage.tsx
index fec51bb615..5a4af6e70e 100644
--- a/framework/core/js/src/admin/components/UserListPage.tsx
+++ b/framework/core/js/src/admin/components/UserListPage.tsx
@@ -4,6 +4,7 @@ import app from '../../admin/app';
 
 import LoadingIndicator from '../../common/components/LoadingIndicator';
 import Button from '../../common/components/Button';
+import Dropdown from '../../common/components/Dropdown';
 
 import listItems from '../../common/helpers/listItems';
 
@@ -363,17 +364,18 @@ export default class UserListPage extends AdminPage {
     );
 
     columns.add(
-      'editUser',
+      'userActions',
       {
-        name: app.translator.trans('core.admin.users.grid.columns.edit_user.title'),
+        name: app.translator.trans('core.admin.users.grid.columns.user_actions.title'),
         content: (user: User) => (
-          <Button
-            className="Button UserList-editModalBtn"
-            title={app.translator.trans('core.admin.users.grid.columns.edit_user.tooltip', { username: user.username() })}
-            onclick={() => app.modal.show(() => import('../../common/components/EditUserModal'), { user })}
+          <Dropdown
+            className="User-controls"
+            buttonClassName="Button Button--icon Button--flat"
+            menuClassName="Dropdown-menu--right"
+            icon="fas fa-ellipsis-h"
           >
-            {app.translator.trans('core.admin.users.grid.columns.edit_user.button')}
-          </Button>
+            {this.userActionItems(user).toArray()}
+          </Dropdown>
         ),
       },
       -90
@@ -382,6 +384,23 @@ export default class UserListPage extends AdminPage {
     return columns;
   }
 
+  userActionItems(user: User): ItemList<Mithril.Children> {
+    const items = new ItemList<Mithril.Children>();
+
+    items.add(
+      'editUser',
+      <Button
+        icon="fas fa-pencil-alt"
+        title={app.translator.trans('core.admin.users.grid.columns.user_actions.edit_user.tooltip', { username: user.displayName() }, true)}
+        onclick={() => app.modal.show(() => import('../../common/components/EditUserModal'), { user })}
+      >
+        {app.translator.trans('core.admin.users.grid.columns.user_actions.edit_user.button')}
+      </Button>
+    );
+
+    return items;
+  }
+
   headerInfo() {
     return {
       className: 'UserListPage',
diff --git a/framework/core/locale/core.yml b/framework/core/locale/core.yml
index 3286204230..242144c9df 100644
--- a/framework/core/locale/core.yml
+++ b/framework/core/locale/core.yml
@@ -359,11 +359,6 @@ core:
           display_name:
             title: Display name
 
-          edit_user:
-            button: => core.ref.edit
-            title: => core.ref.edit_user
-            tooltip: Edit {username}
-
           email:
             title: => core.ref.email
             visibility_hide: Hide email address
@@ -376,6 +371,12 @@ core:
           join_time:
             title: Joined
 
+          user_actions:
+            title: Actions
+            edit_user:
+              button: => core.ref.edit
+              tooltip: Edit {username}
+
           user_id:
             title: ID