diff --git a/js/src/admin/extendAdminNav.tsx b/js/src/admin/extendAdminNav.tsx
index 7978b23..f223a05 100644
--- a/js/src/admin/extendAdminNav.tsx
+++ b/js/src/admin/extendAdminNav.tsx
@@ -9,7 +9,7 @@ export default function extendAdminNav() {
   extend(AdminNav.prototype, 'items', function (items: ItemList<Mithril.Children>) {
     items.add(
       'gdpr',
-      <LinkButton href={app.route('gdpr')} icon="fas fa-user-shield" title={app.translator.trans('flarum-gdpr.admin.gdpr.title')}>
+      <LinkButton href={app.route('gdpr')} icon="fas fa-user-shield" title={app.translator.trans('flarum-gdpr.admin.nav.gdpr_title')}>
         {app.translator.trans('flarum-gdpr.admin.nav.gdpr_button')}
       </LinkButton>,
       48
diff --git a/js/src/admin/extendUserListPage.tsx b/js/src/admin/extendUserListPage.tsx
index 4dd8dcc..220fb99 100644
--- a/js/src/admin/extendUserListPage.tsx
+++ b/js/src/admin/extendUserListPage.tsx
@@ -2,16 +2,23 @@ import app from 'flarum/admin/app';
 import { extend } from 'flarum/common/extend';
 import UserListPage from 'flarum/admin/components/UserListPage';
 import Button from 'flarum/common/components/Button';
-import username from 'flarum/common/helpers/username';
 import RequestDataExportModal from '../common/components/RequestDataExportModal';
 
+import type User from 'flarum/common/models/User';
+import type ItemList from 'flarum/common/utils/ItemList';
+import type Mithril from 'mithril';
+
 export default function extendUserListPage() {
-  extend(UserListPage.prototype, 'userActionItems', function (items, user) {
+  extend(UserListPage.prototype, 'userActionItems', function (items: ItemList<Mithril.Children>, user: User) {
     if (!user.canModerateExports()) return;
     items.add(
       'export-data',
-      <Button className="Button" icon="fas fa-file-export" onclick={() => app.modal.show(RequestDataExportModal, { user: user })}>
-        {app.translator.trans('flarum-gdpr.admin.userlist.columns.gdpr_actions.export', { username: username(user) })}
+      <Button
+        icon="fas fa-file-export"
+        title={app.translator.trans('flarum-gdpr.admin.userlist.columns.user_actions.data_export.tooltip', { username: user.displayName() }, true)}
+        onclick={() => app.modal.show(RequestDataExportModal, { user: user })}
+      >
+        {app.translator.trans('flarum-gdpr.admin.userlist.columns.user_actions.data_export.button')}
       </Button>
     );
   });
diff --git a/resources/locale/en.yml b/resources/locale/en.yml
index 3432d8f..7002fd1 100644
--- a/resources/locale/en.yml
+++ b/resources/locale/en.yml
@@ -25,6 +25,8 @@ flarum-gdpr:
                     However, there are some special cases, which are listed below.
         nav:
             gdpr_button: GDPR Integrations
+            gdpr_title: => flarum-gdpr.admin.gdpr_page.description
+
         permissions:
             process_erasure: Process erasure requests
             process_export_for_others: Request and receive data exports for other users
@@ -46,8 +48,10 @@ flarum-gdpr:
                 help_text: Before deciding on which actions to use on your forum, it is vital to understand which data is integrated, and how it is handled for both anonymization and deletion. Vist the GDPR overview to understand how data is handled, and which optional extensions have registered their data to be handled by this extension.
         userlist:
             columns:
-                gdpr_actions:
-                    export: Export data for {username}
+                user_actions:
+                    data_export:
+                        button: Export
+                        tooltip: Export data for {username}
 
     lib:
         data: