diff --git a/apps/meteor/client/views/admin/users/AdminUserInfoActions.tsx b/apps/meteor/client/views/admin/users/AdminUserInfoActions.tsx
index 5cbc7673fd5a..db3fe9c2f758 100644
--- a/apps/meteor/client/views/admin/users/AdminUserInfoActions.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserInfoActions.tsx
@@ -1,31 +1,13 @@
-import type { IUser } from '@rocket.chat/core-typings';
-import { ButtonGroup, Menu, Option } from '@rocket.chat/fuselage';
-import { useRoute, usePermission } from '@rocket.chat/ui-contexts';
+import { ButtonGroup, IconButton } from '@rocket.chat/fuselage';
+import { GenericMenu } from '@rocket.chat/ui-client';
 import type { ReactElement } from 'react';
-import { useCallback, useMemo } from 'react';
+import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import type { AdminUsersTab } from './AdminUsersPage';
-import { useChangeAdminStatusAction } from './hooks/useChangeAdminStatusAction';
-import { useChangeUserStatusAction } from './hooks/useChangeUserStatusAction';
-import { useDeleteUserAction } from './hooks/useDeleteUserAction';
-import { useResetE2EEKeyAction } from './hooks/useResetE2EEKeyAction';
-import { useResetTOTPAction } from './hooks/useResetTOTPAction';
+import type { AdminUserInfoActionsProps } from './hooks/useAdminUserInfoActions';
+import { useAdminUserInfoActions } from './hooks/useAdminUserInfoActions';
 import { UserInfoAction } from '../../../components/UserInfo';
-import { useActionSpread } from '../../hooks/useActionSpread';
 
-type AdminUserInfoActionsProps = {
-	username: IUser['username'];
-	userId: IUser['_id'];
-	isFederatedUser: IUser['federated'];
-	isActive: boolean;
-	isAdmin: boolean;
-	tab: AdminUsersTab;
-	onChange: () => void;
-	onReload: () => void;
-};
-
-// TODO: Replace menu
 const AdminUserInfoActions = ({
 	username,
 	userId,
@@ -37,78 +19,16 @@ const AdminUserInfoActions = ({
 	onReload,
 }: AdminUserInfoActionsProps): ReactElement => {
 	const { t } = useTranslation();
-	const directRoute = useRoute('direct');
-	const userRoute = useRoute('admin-users');
-	const canDirectMessage = usePermission('create-d');
-	const canEditOtherUserInfo = usePermission('edit-other-user-info');
-
-	const changeAdminStatusAction = useChangeAdminStatusAction(userId, isAdmin, onChange);
-	const changeUserStatusAction = useChangeUserStatusAction(userId, isActive, onChange);
-	const deleteUserAction = useDeleteUserAction(userId, onChange, onReload);
-	const resetTOTPAction = useResetTOTPAction(userId);
-	const resetE2EKeyAction = useResetE2EEKeyAction(userId);
-
-	const directMessageClick = useCallback(
-		() =>
-			username &&
-			directRoute.push({
-				rid: username,
-			}),
-		[directRoute, username],
-	);
-
-	const editUserClick = useCallback(
-		() =>
-			userRoute.push({
-				context: 'edit',
-				id: userId,
-			}),
-		[userId, userRoute],
-	);
-
-	const isNotPendingDeactivatedNorFederated = tab !== 'pending' && tab !== 'deactivated' && !isFederatedUser;
-	const options = useMemo(
-		() => ({
-			...(canDirectMessage && {
-				directMessage: {
-					icon: 'balloon' as const,
-					label: t('Direct_Message'),
-					title: t('Direct_Message'),
-					action: directMessageClick,
-				},
-			}),
-			...(canEditOtherUserInfo && {
-				editUser: {
-					icon: 'edit' as const,
-					label: t('Edit'),
-					title: isFederatedUser ? t('Edit_Federated_User_Not_Allowed') : t('Edit'),
-					action: editUserClick,
-					disabled: isFederatedUser,
-				},
-			}),
-			...(isNotPendingDeactivatedNorFederated && changeAdminStatusAction && { makeAdmin: changeAdminStatusAction }),
-			...(isNotPendingDeactivatedNorFederated && resetE2EKeyAction && { resetE2EKey: resetE2EKeyAction }),
-			...(isNotPendingDeactivatedNorFederated && resetTOTPAction && { resetTOTP: resetTOTPAction }),
-			...(changeUserStatusAction && !isFederatedUser && { changeActiveStatus: changeUserStatusAction }),
-			...(deleteUserAction && { delete: deleteUserAction }),
-		}),
-		[
-			canDirectMessage,
-			canEditOtherUserInfo,
-			changeAdminStatusAction,
-			changeUserStatusAction,
-			deleteUserAction,
-			directMessageClick,
-			editUserClick,
-			isFederatedUser,
-			isNotPendingDeactivatedNorFederated,
-			resetE2EKeyAction,
-			resetTOTPAction,
-			t,
-		],
-	);
-
-	const { actions: actionsDefinition, menu: menuOptions } = useActionSpread(options);
+	const { actions: actionsDefinition, menuActions: menuOptions } = useAdminUserInfoActions({
+		username,
+		userId,
+		isFederatedUser,
+		isActive,
+		isAdmin,
+		tab,
+		onChange,
+		onReload,
+	});
 
 	const menu = useMemo(() => {
 		if (!menuOptions) {
@@ -116,25 +36,21 @@ const AdminUserInfoActions = ({
 		}
 
 		return (
-			<Menu
-				mi={4}
-				placement='bottom-start'
-				small={false}
-				secondary
-				flexShrink={0}
+			<GenericMenu
 				key='menu'
-				renderItem={({ label: { label, icon }, ...props }): ReactElement => (
-					<Option label={label} title={label} icon={icon} variant={label === 'Delete' ? 'danger' : ''} {...props} />
-				)}
-				options={menuOptions}
+				button={<IconButton icon='kebab' secondary />}
+				title={t('More')}
+				sections={menuOptions}
+				placement='bottom-end'
+				small={false}
 			/>
 		);
-	}, [menuOptions]);
+	}, [t, menuOptions]);
 
 	// TODO: sanitize Action type to avoid any
 	const actions = useMemo(() => {
-		const mapAction = ([key, { label, icon, action, disabled, title }]: any): ReactElement => (
-			<UserInfoAction key={key} title={title} label={label} onClick={action} disabled={disabled} icon={icon} />
+		const mapAction = ([key, { content, title, icon, onClick, disabled }]: any): ReactElement => (
+			<UserInfoAction key={key} title={title} label={content} onClick={onClick} disabled={disabled} icon={icon} />
 		);
 		return [...actionsDefinition.map(mapAction), menu].filter(Boolean);
 	}, [actionsDefinition, menu]);
diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.spec.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.spec.tsx
index ff339aec0137..7793272e40c5 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.spec.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.spec.tsx
@@ -35,9 +35,9 @@ it('should not render voip extension column when voice call is disabled', async
 	expect(screen.queryByText('Voice_call_extension')).not.toBeInTheDocument();
 
 	screen.getByRole('button', { name: 'More_actions' }).click();
-	expect(await screen.findByRole('listbox')).toBeInTheDocument();
-	expect(screen.queryByRole('option', { name: /Assign_extension/ })).not.toBeInTheDocument();
-	expect(screen.queryByRole('option', { name: /Unassign_extension/ })).not.toBeInTheDocument();
+	expect(await screen.findByRole('menu')).toBeInTheDocument();
+	expect(screen.queryByRole('menuitem', { name: /Assign_extension/ })).not.toBeInTheDocument();
+	expect(screen.queryByRole('menuitem', { name: /Unassign_extension/ })).not.toBeInTheDocument();
 });
 
 it('should not render voip extension column or actions if user doesnt have the required permission', async () => {
@@ -63,9 +63,9 @@ it('should not render voip extension column or actions if user doesnt have the r
 	expect(screen.queryByText('Voice_call_extension')).not.toBeInTheDocument();
 
 	screen.getByRole('button', { name: 'More_actions' }).click();
-	expect(await screen.findByRole('listbox')).toBeInTheDocument();
-	expect(screen.queryByRole('option', { name: /Assign_extension/ })).not.toBeInTheDocument();
-	expect(screen.queryByRole('option', { name: /Unassign_extension/ })).not.toBeInTheDocument();
+	expect(await screen.findByRole('menu')).toBeInTheDocument();
+	expect(screen.queryByRole('menuitem', { name: /Assign_extension/ })).not.toBeInTheDocument();
+	expect(screen.queryByRole('menuitem', { name: /Unassign_extension/ })).not.toBeInTheDocument();
 });
 
 it('should render "Unassign_extension" button when user has a associated extension', async () => {
@@ -91,9 +91,9 @@ it('should render "Unassign_extension" button when user has a associated extensi
 	expect(screen.getByText('Voice_call_extension')).toBeInTheDocument();
 
 	screen.getByRole('button', { name: 'More_actions' }).click();
-	expect(await screen.findByRole('listbox')).toBeInTheDocument();
-	expect(screen.queryByRole('option', { name: /Assign_extension/ })).not.toBeInTheDocument();
-	expect(screen.getByRole('option', { name: /Unassign_extension/ })).toBeInTheDocument();
+	expect(await screen.findByRole('menu')).toBeInTheDocument();
+	expect(screen.queryByRole('menuitem', { name: /Assign_extension/ })).not.toBeInTheDocument();
+	expect(screen.getByRole('menuitem', { name: /Unassign_extension/ })).toBeInTheDocument();
 });
 
 it('should render "Assign_extension" button when user has no associated extension', async () => {
@@ -119,7 +119,7 @@ it('should render "Assign_extension" button when user has no associated extensio
 	expect(screen.getByText('Voice_call_extension')).toBeInTheDocument();
 
 	screen.getByRole('button', { name: 'More_actions' }).click();
-	expect(await screen.findByRole('listbox')).toBeInTheDocument();
-	expect(screen.getByRole('option', { name: /Assign_extension/ })).toBeInTheDocument();
-	expect(screen.queryByRole('option', { name: /Unassign_extension/ })).not.toBeInTheDocument();
+	expect(await screen.findByRole('menu')).toBeInTheDocument();
+	expect(screen.getByRole('menuitem', { name: /Assign_extension/ })).toBeInTheDocument();
+	expect(screen.queryByRole('menuitem', { name: /Unassign_extension/ })).not.toBeInTheDocument();
 });
diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
index e298b75fe037..d712eeefcdd7 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
@@ -1,9 +1,10 @@
 import { UserStatus as Status } from '@rocket.chat/core-typings';
 import type { IRole, IUser, Serialized } from '@rocket.chat/core-typings';
-import { Box, Button, Menu, Option } from '@rocket.chat/fuselage';
+import { Box, Button } from '@rocket.chat/fuselage';
 import type { DefaultUserInfo } from '@rocket.chat/rest-typings';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
-import type { ReactElement, MouseEvent, KeyboardEvent } from 'react';
+import { GenericMenu } from '@rocket.chat/ui-client';
+import type { KeyboardEvent, MouseEvent, ReactElement } from 'react';
 import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
@@ -101,38 +102,26 @@ const UsersTableRow = ({
 	});
 
 	const isNotPendingDeactivatedNorFederated = tab !== 'pending' && tab !== 'deactivated' && !isFederatedUser;
-	const menuOptions = useMemo(
+	const actions = useMemo(
 		() => ({
 			...(voipExtensionAction && {
-				voipExtensionAction: {
-					label: { label: voipExtensionAction.label, icon: voipExtensionAction.icon },
-					action: voipExtensionAction.action,
-				},
+				voipExtensionAction,
 			}),
 			...(isNotPendingDeactivatedNorFederated &&
 				changeAdminStatusAction && {
-					makeAdmin: {
-						label: { label: changeAdminStatusAction.label, icon: changeAdminStatusAction.icon },
-						action: changeAdminStatusAction.action,
-					},
+					changeAdminStatusAction,
 				}),
 			...(isNotPendingDeactivatedNorFederated &&
 				resetE2EKeyAction && {
-					resetE2EKey: { label: { label: resetE2EKeyAction.label, icon: resetE2EKeyAction.icon }, action: resetE2EKeyAction.action },
-				}),
-			...(isNotPendingDeactivatedNorFederated &&
-				resetTOTPAction && {
-					resetTOTP: { label: { label: resetTOTPAction.label, icon: resetTOTPAction.icon }, action: resetTOTPAction.action },
+					resetE2EKeyAction,
 				}),
+			...(isNotPendingDeactivatedNorFederated && resetTOTPAction && { resetTOTPAction }),
 			...(changeUserStatusAction &&
 				!isFederatedUser && {
-					changeActiveStatus: {
-						label: { label: changeUserStatusAction.label, icon: changeUserStatusAction.icon },
-						action: changeUserStatusAction.action,
-					},
+					changeUserStatusAction,
 				}),
 			...(deleteUserAction && {
-				delete: { label: { label: deleteUserAction.label, icon: deleteUserAction.icon }, action: deleteUserAction.action },
+				deleteUserAction,
 			}),
 		}),
 		[
@@ -147,6 +136,14 @@ const UsersTableRow = ({
 		],
 	);
 
+	const menuOptions = Object.entries(actions).map(([_key, item]) => {
+		return {
+			...item,
+			id: item.content || item.title || '',
+			content: item.content || item.title,
+		};
+	});
+
 	const handleResendWelcomeEmail = () => resendWelcomeEmail.mutateAsync({ email: emails?.[0].address });
 
 	return (
@@ -208,25 +205,13 @@ const UsersTableRow = ({
 									{t('Resend_welcome_email')}
 								</Button>
 							) : (
-								<Button small primary onClick={changeUserStatusAction?.action} disabled={isSeatsCapExceeded}>
+								<Button small primary onClick={changeUserStatusAction?.onClick} disabled={isSeatsCapExceeded}>
 									{t('Activate')}
 								</Button>
 							)}
 						</>
 					)}
-
-					<Menu
-						mi={4}
-						placement='bottom-start'
-						flexShrink={0}
-						key='menu'
-						aria-label={t('More_actions')}
-						title={t('More_actions')}
-						renderItem={({ label: { label, icon }, ...props }): ReactElement => (
-							<Option label={label} title={label} icon={icon} variant={label === 'Delete' ? 'danger' : ''} {...props} />
-						)}
-						options={menuOptions}
-					/>
+					<GenericMenu detached title={t('More_actions')} sections={[{ title: '', items: menuOptions }]} placement='bottom-end' />
 				</Box>
 			</GenericTableCell>
 		</GenericTableRow>
diff --git a/apps/meteor/client/views/admin/users/hooks/useAdminUserInfoActions.ts b/apps/meteor/client/views/admin/users/hooks/useAdminUserInfoActions.ts
new file mode 100644
index 000000000000..1f958bb5bbaa
--- /dev/null
+++ b/apps/meteor/client/views/admin/users/hooks/useAdminUserInfoActions.ts
@@ -0,0 +1,159 @@
+import type { IUser } from '@rocket.chat/core-typings';
+import type { IconProps } from '@rocket.chat/fuselage';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
+import { usePermission, useRoute } from '@rocket.chat/ui-contexts';
+import { useCallback, useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import type { AdminUsersTab } from '../AdminUsersPage';
+import { useChangeAdminStatusAction } from './useChangeAdminStatusAction';
+import { useChangeUserStatusAction } from './useChangeUserStatusAction';
+import { useDeleteUserAction } from './useDeleteUserAction';
+import { useResetE2EEKeyAction } from './useResetE2EEKeyAction';
+import { useResetTOTPAction } from './useResetTOTPAction';
+
+export type AdminUserAction = {
+	type?: string;
+	content: string;
+	icon?: IconProps['name'];
+	title?: string;
+	variant?: 'danger';
+	onClick: () => void;
+};
+
+type AdminUserMenuAction = {
+	id: string;
+	title: string;
+	items: GenericMenuItemProps[];
+}[];
+
+export type AdminUserInfoActionsProps = {
+	username: IUser['username'];
+	userId: IUser['_id'];
+	isFederatedUser: IUser['federated'];
+	isActive: boolean;
+	isAdmin: boolean;
+	tab: AdminUsersTab;
+	onChange: () => void;
+	onReload: () => void;
+};
+
+const useAdminUserInfoActionsSpread = (actions: Record<string, AdminUserAction>, size = 2) => {
+	const actionSpread = useMemo(() => {
+		const entries = Object.entries(actions);
+
+		const options = entries.slice(0, size);
+		const slicedOptions = entries.slice(size, entries.length);
+
+		const menuActions = slicedOptions.reduce((acc, [_key, item]) => {
+			const group = item.type ? item.type : '';
+			const section = acc.find((section: { id: string }) => section.id === group);
+
+			const newItem = {
+				...item,
+				id: item.content || item.title || '',
+				content: item.content || item.title,
+			};
+
+			if (section) {
+				section.items.push(newItem);
+				return acc;
+			}
+
+			const newSection = { id: group, title: '', items: [newItem] };
+			acc.push(newSection);
+
+			return acc;
+		}, [] as AdminUserMenuAction);
+
+		return { actions: options, menuActions };
+	}, [size, actions]);
+
+	return actionSpread;
+};
+
+export const useAdminUserInfoActions = ({
+	username,
+	userId,
+	isFederatedUser,
+	isActive,
+	isAdmin,
+	tab,
+	onChange,
+	onReload,
+}: AdminUserInfoActionsProps) => {
+	const { t } = useTranslation();
+	const directRoute = useRoute('direct');
+	const userRoute = useRoute('admin-users');
+
+	const canDirectMessage = usePermission('create-d');
+	const canEditOtherUserInfo = usePermission('edit-other-user-info');
+
+	const changeAdminStatusAction = useChangeAdminStatusAction(userId, isAdmin, onChange);
+	const changeUserStatusAction = useChangeUserStatusAction(userId, isActive, onChange);
+	const deleteUserAction = useDeleteUserAction(userId, onChange, onReload);
+	const resetTOTPAction = useResetTOTPAction(userId);
+	const resetE2EKeyAction = useResetE2EEKeyAction(userId);
+
+	const directMessageClick = useCallback(
+		() =>
+			username &&
+			directRoute.push({
+				rid: username,
+			}),
+		[directRoute, username],
+	);
+
+	const editUserClick = useCallback(
+		() =>
+			userRoute.push({
+				context: 'edit',
+				id: userId,
+			}),
+		[userId, userRoute],
+	);
+
+	const isNotPendingDeactivatedNorFederated = tab !== 'pending' && tab !== 'deactivated' && !isFederatedUser;
+
+	const options = useMemo(
+		() => ({
+			...(canDirectMessage && {
+				directMessage: {
+					icon: 'balloon',
+					content: t('Direct_Message'),
+					onClick: directMessageClick,
+				} as AdminUserAction,
+			}),
+			...(canEditOtherUserInfo && {
+				editUsereditUser: {
+					icon: 'edit',
+					content: t('Edit'),
+					title: isFederatedUser ? t('Edit_Federated_User_Not_Allowed') : t('Edit'),
+					onClick: editUserClick,
+					disabled: isFederatedUser,
+				} as AdminUserAction,
+			}),
+			...(isNotPendingDeactivatedNorFederated && changeAdminStatusAction && { changeAdminStatusAction }),
+			...(isNotPendingDeactivatedNorFederated && resetE2EKeyAction && { resetE2EKeyAction }),
+			...(isNotPendingDeactivatedNorFederated && resetTOTPAction && { resetTOTPAction }),
+			...(changeUserStatusAction && !isFederatedUser && { changeUserStatusAction }),
+			...(deleteUserAction && { deleteUserAction }),
+		}),
+		[
+			canDirectMessage,
+			canEditOtherUserInfo,
+			changeAdminStatusAction,
+			changeUserStatusAction,
+			deleteUserAction,
+			directMessageClick,
+			editUserClick,
+			isFederatedUser,
+			isNotPendingDeactivatedNorFederated,
+			resetE2EKeyAction,
+			resetTOTPAction,
+			t,
+		],
+	);
+
+	return useAdminUserInfoActionsSpread(options);
+};
diff --git a/apps/meteor/client/views/admin/users/hooks/useChangeAdminStatusAction.ts b/apps/meteor/client/views/admin/users/hooks/useChangeAdminStatusAction.ts
index 405dbc599115..af778833bba8 100644
--- a/apps/meteor/client/views/admin/users/hooks/useChangeAdminStatusAction.ts
+++ b/apps/meteor/client/views/admin/users/hooks/useChangeAdminStatusAction.ts
@@ -2,9 +2,9 @@ import type { IUser } from '@rocket.chat/core-typings';
 import { useToastMessageDispatch, useMethod, useTranslation, usePermission } from '@rocket.chat/ui-contexts';
 import { useCallback } from 'react';
 
-import type { Action } from '../../../hooks/useActionSpread';
+import type { AdminUserAction } from './useAdminUserInfoActions';
 
-export const useChangeAdminStatusAction = (userId: IUser['_id'], isAdmin: boolean, onChange: () => void): Action | undefined => {
+export const useChangeAdminStatusAction = (userId: IUser['_id'], isAdmin: boolean, onChange: () => void): AdminUserAction | undefined => {
 	const t = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
 	const setAdminStatus = useMethod('setAdminStatus');
@@ -24,8 +24,8 @@ export const useChangeAdminStatusAction = (userId: IUser['_id'], isAdmin: boolea
 	return canAssignAdminRole
 		? {
 				icon: 'key',
-				label: isAdmin ? t('Remove_Admin') : t('Make_Admin'),
-				action: changeAdminStatus,
+				content: isAdmin ? t('Remove_Admin') : t('Make_Admin'),
+				onClick: changeAdminStatus,
 			}
 		: undefined;
 };
diff --git a/apps/meteor/client/views/admin/users/hooks/useChangeUserStatusAction.ts b/apps/meteor/client/views/admin/users/hooks/useChangeUserStatusAction.ts
index bd680216c12d..554f2f2b7118 100644
--- a/apps/meteor/client/views/admin/users/hooks/useChangeUserStatusAction.ts
+++ b/apps/meteor/client/views/admin/users/hooks/useChangeUserStatusAction.ts
@@ -2,10 +2,10 @@ import type { IUser } from '@rocket.chat/core-typings';
 import { useToastMessageDispatch, useTranslation, useEndpoint, usePermission } from '@rocket.chat/ui-contexts';
 import { useMemo } from 'react';
 
+import type { AdminUserAction } from './useAdminUserInfoActions';
 import { useConfirmOwnerChanges } from './useConfirmOwnerChanges';
-import type { Action } from '../../../hooks/useActionSpread';
 
-export const useChangeUserStatusAction = (userId: IUser['_id'], isActive: boolean, onChange: () => void): Action | undefined => {
+export const useChangeUserStatusAction = (userId: IUser['_id'], isActive: boolean, onChange: () => void): AdminUserAction | undefined => {
 	const t = useTranslation();
 	const confirmOwnerChanges = useConfirmOwnerChanges();
 	const dispatchToastMessage = useToastMessageDispatch();
@@ -46,8 +46,8 @@ export const useChangeUserStatusAction = (userId: IUser['_id'], isActive: boolea
 	return canEditOtherUserActiveStatus
 		? {
 				icon: 'user',
-				label: isActive ? t('Deactivate') : t('Activate'),
-				action: changeActiveStatus,
+				content: isActive ? t('Deactivate') : t('Activate'),
+				onClick: changeActiveStatus,
 			}
 		: undefined;
 };
diff --git a/apps/meteor/client/views/admin/users/hooks/useDeleteUserAction.tsx b/apps/meteor/client/views/admin/users/hooks/useDeleteUserAction.tsx
index d257491102f5..6f8559283e16 100644
--- a/apps/meteor/client/views/admin/users/hooks/useDeleteUserAction.tsx
+++ b/apps/meteor/client/views/admin/users/hooks/useDeleteUserAction.tsx
@@ -12,11 +12,11 @@ import {
 } from '@rocket.chat/ui-contexts';
 import { useMemo } from 'react';
 
+import type { AdminUserAction } from './useAdminUserInfoActions';
 import { useConfirmOwnerChanges } from './useConfirmOwnerChanges';
 import GenericModal from '../../../../components/GenericModal';
-import type { Action } from '../../../hooks/useActionSpread';
 
-export const useDeleteUserAction = (userId: IUser['_id'], onChange: () => void, onReload: () => void): Action | undefined => {
+export const useDeleteUserAction = (userId: IUser['_id'], onChange: () => void, onReload: () => void): AdminUserAction | undefined => {
 	const t = useTranslation();
 	const setModal = useSetModal();
 	const userRoute = useRoute('admin-users');
@@ -67,8 +67,9 @@ export const useDeleteUserAction = (userId: IUser['_id'], onChange: () => void,
 	return canDeleteUser
 		? {
 				icon: 'trash',
-				label: t('Delete'),
-				action: confirmDeleteUser,
+				content: t('Delete'),
+				onClick: confirmDeleteUser,
+				variant: 'danger',
 			}
 		: undefined;
 };
diff --git a/apps/meteor/client/views/admin/users/hooks/useResetE2EEKeyAction.tsx b/apps/meteor/client/views/admin/users/hooks/useResetE2EEKeyAction.tsx
index 74e259cf494e..8be4d6d220ce 100644
--- a/apps/meteor/client/views/admin/users/hooks/useResetE2EEKeyAction.tsx
+++ b/apps/meteor/client/views/admin/users/hooks/useResetE2EEKeyAction.tsx
@@ -2,10 +2,10 @@ import type { IUser } from '@rocket.chat/core-typings';
 import { useSetModal, usePermission, useEndpoint, useTranslation, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import { useCallback } from 'react';
 
+import type { AdminUserAction } from './useAdminUserInfoActions';
 import GenericModal from '../../../../components/GenericModal';
-import type { Action } from '../../../hooks/useActionSpread';
 
-export const useResetE2EEKeyAction = (userId: IUser['_id']): Action | undefined => {
+export const useResetE2EEKeyAction = (userId: IUser['_id']): AdminUserAction | undefined => {
 	const t = useTranslation();
 	const setModal = useSetModal();
 	const dispatchToastMessage = useToastMessageDispatch();
@@ -34,8 +34,8 @@ export const useResetE2EEKeyAction = (userId: IUser['_id']): Action | undefined
 	return canResetE2EEKey
 		? {
 				icon: 'key',
-				label: t('Reset_E2E_Key'),
-				action: confirmResetE2EEKey,
+				content: t('Reset_E2E_Key'),
+				onClick: confirmResetE2EEKey,
 			}
 		: undefined;
 };
diff --git a/apps/meteor/client/views/admin/users/hooks/useResetTOTPAction.tsx b/apps/meteor/client/views/admin/users/hooks/useResetTOTPAction.tsx
index c0050775a520..04973be8d39a 100644
--- a/apps/meteor/client/views/admin/users/hooks/useResetTOTPAction.tsx
+++ b/apps/meteor/client/views/admin/users/hooks/useResetTOTPAction.tsx
@@ -2,10 +2,10 @@ import type { IUser } from '@rocket.chat/core-typings';
 import { useSetModal, usePermission, useSetting, useEndpoint, useTranslation, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import { useCallback } from 'react';
 
+import type { AdminUserAction } from './useAdminUserInfoActions';
 import GenericModal from '../../../../components/GenericModal';
-import type { Action } from '../../../hooks/useActionSpread';
 
-export const useResetTOTPAction = (userId: IUser['_id']): Action | undefined => {
+export const useResetTOTPAction = (userId: IUser['_id']): AdminUserAction | undefined => {
 	const t = useTranslation();
 	const setModal = useSetModal();
 	const dispatchToastMessage = useToastMessageDispatch();
@@ -35,8 +35,8 @@ export const useResetTOTPAction = (userId: IUser['_id']): Action | undefined =>
 	return canResetTOTP && twoFactorEnabled
 		? {
 				icon: 'key',
-				label: t('Reset_TOTP'),
-				action: confirmResetTOTP,
+				content: t('Reset_TOTP'),
+				onClick: confirmResetTOTP,
 			}
 		: undefined;
 };
diff --git a/apps/meteor/client/views/admin/users/hooks/useVoipExtensionAction.tsx b/apps/meteor/client/views/admin/users/hooks/useVoipExtensionAction.tsx
deleted file mode 100644
index ec9591163270..000000000000
--- a/apps/meteor/client/views/admin/users/hooks/useVoipExtensionAction.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
-import { useSetModal } from '@rocket.chat/ui-contexts';
-import { useTranslation } from 'react-i18next';
-
-import type { Action } from '../../../hooks/useActionSpread';
-import AssignExtensionModal from '../voip/AssignExtensionModal';
-import RemoveExtensionModal from '../voip/RemoveExtensionModal';
-import { useVoipExtensionPermission } from '../voip/hooks/useVoipExtensionPermission';
-
-type VoipExtensionActionParams = {
-	name: string;
-	username: string;
-	extension?: string;
-};
-
-export const useVoipExtensionAction = ({ name, username, extension }: VoipExtensionActionParams): Action | undefined => {
-	const canManageVoipExtensions = useVoipExtensionPermission();
-	const { t } = useTranslation();
-	const setModal = useSetModal();
-
-	const handleExtensionAssignment = useEffectEvent(() => {
-		if (extension) {
-			setModal(<RemoveExtensionModal name={name} username={username} extension={extension} onClose={(): void => setModal(null)} />);
-			return;
-		}
-
-		setModal(<AssignExtensionModal defaultUsername={username} onClose={(): void => setModal(null)} />);
-	});
-
-	return canManageVoipExtensions
-		? {
-				icon: extension ? 'phone-disabled' : 'phone',
-				label: extension ? t('Unassign_extension') : t('Assign_extension'),
-				action: handleExtensionAssignment,
-			}
-		: undefined;
-};
diff --git a/apps/meteor/client/views/admin/users/voip/hooks/useVoipExtensionAction.tsx b/apps/meteor/client/views/admin/users/voip/hooks/useVoipExtensionAction.tsx
index 5fd311c21916..3f7f7fe84d09 100644
--- a/apps/meteor/client/views/admin/users/voip/hooks/useVoipExtensionAction.tsx
+++ b/apps/meteor/client/views/admin/users/voip/hooks/useVoipExtensionAction.tsx
@@ -2,7 +2,7 @@ import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
 import { useSetModal } from '@rocket.chat/ui-contexts';
 import { useTranslation } from 'react-i18next';
 
-import type { Action } from '../../../../hooks/useActionSpread';
+import type { AdminUserAction } from '../../hooks/useAdminUserInfoActions';
 import AssignExtensionModal from '../AssignExtensionModal';
 import RemoveExtensionModal from '../RemoveExtensionModal';
 
@@ -13,7 +13,7 @@ type VoipExtensionActionParams = {
 	enabled: boolean;
 };
 
-export const useVoipExtensionAction = ({ name, username, extension, enabled }: VoipExtensionActionParams): Action | undefined => {
+export const useVoipExtensionAction = ({ name, username, extension, enabled }: VoipExtensionActionParams): AdminUserAction | undefined => {
 	const { t } = useTranslation();
 	const setModal = useSetModal();
 
@@ -29,8 +29,8 @@ export const useVoipExtensionAction = ({ name, username, extension, enabled }: V
 	return enabled
 		? {
 				icon: extension ? 'phone-disabled' : 'phone',
-				label: extension ? t('Unassign_extension') : t('Assign_extension'),
-				action: handleExtensionAssignment,
+				content: extension ? t('Unassign_extension') : t('Assign_extension'),
+				onClick: handleExtensionAssignment,
 			}
 		: undefined;
 };
diff --git a/apps/meteor/client/views/hooks/useActionSpread.ts b/apps/meteor/client/views/hooks/useActionSpread.ts
deleted file mode 100644
index 8cf69f1b62a3..000000000000
--- a/apps/meteor/client/views/hooks/useActionSpread.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import type { Keys as IconName } from '@rocket.chat/icons';
-import type { ReactNode } from 'react';
-import { useMemo } from 'react';
-
-export type Action = {
-	label: ReactNode;
-	icon?: IconName;
-	action: () => void;
-};
-
-type MenuOption = {
-	label: { label: ReactNode; icon?: string };
-	action: () => void;
-};
-
-const mapOptions = ([key, { action, label, icon }]: [string, Action]): [string, MenuOption] => [
-	key,
-	{
-		label: { label, icon }, // TODO fuselage
-		action,
-	},
-];
-
-export const useActionSpread = (
-	actions: {
-		[key: string]: Action;
-	},
-	size = 2,
-): { actions: [string, Action][]; menu: { [id: string]: MenuOption } | undefined } =>
-	useMemo(() => {
-		const entries = Object.entries(actions);
-
-		const options = entries.slice(0, size);
-		const menuOptions = entries.slice(size, entries.length).map(mapOptions);
-		const menu = menuOptions.length ? Object.fromEntries(menuOptions) : undefined;
-
-		return { actions: options, menu };
-	}, [actions, size]);