diff --git a/apps/meteor/client/views/audit/components/forms/DateRangePicker.tsx b/apps/meteor/client/views/audit/components/forms/DateRangePicker.tsx
index 9d659169622e8..9c8b7ea3010bd 100644
--- a/apps/meteor/client/views/audit/components/forms/DateRangePicker.tsx
+++ b/apps/meteor/client/views/audit/components/forms/DateRangePicker.tsx
@@ -1,5 +1,6 @@
-import { Box, InputBox, Menu, Margins, Option } from '@rocket.chat/fuselage';
+import { Box, InputBox, Margins } from '@rocket.chat/fuselage';
 import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
+import { GenericMenu } from '@rocket.chat/ui-client';
 import moment from 'moment';
 import type { ReactElement, ComponentProps, SetStateAction, FormEvent } from 'react';
 import { useMemo } from 'react';
@@ -141,46 +142,53 @@ const DateRangePicker = ({ value, onChange, ...props }: DateRangePickerProps): R
 	const { t } = useTranslation();
 
 	const presets = useMemo(
-		() =>
-			({
-				today: {
-					label: t('Today'),
-					action: () => dispatch('today'),
-				},
-				yesterday: {
-					label: t('Yesterday'),
-					action: () => dispatch('yesterday'),
-				},
-				thisWeek: {
-					label: t('This_week'),
-					action: () => dispatch('this-week'),
-				},
-				previousWeek: {
-					label: t('Previous_week'),
-					action: () => dispatch('last-week'),
-				},
-				thisMonth: {
-					label: t('This_month'),
-					action: () => dispatch('this-month'),
-				},
-				lastMonth: {
-					label: t('Previous_month'),
-					action: () => dispatch('last-month'),
-				},
-			}) as const,
+		() => [
+			{
+				id: 'today',
+				icon: 'history' as const,
+				content: t('Today'),
+				onClick: () => dispatch('today'),
+			},
+			{
+				id: 'yesterday',
+				icon: 'history' as const,
+				content: t('Yesterday'),
+				onClick: () => dispatch('yesterday'),
+			},
+			{
+				id: 'thisWeek',
+				icon: 'history' as const,
+				content: t('This_week'),
+				onClick: () => dispatch('this-week'),
+			},
+			{
+				id: 'previousWeek',
+				icon: 'history' as const,
+				content: t('Previous_week'),
+				onClick: () => dispatch('last-week'),
+			},
+			{
+				id: 'thisMonth',
+				icon: 'history' as const,
+				content: t('This_month'),
+				onClick: () => dispatch('this-month'),
+			},
+			{
+				id: 'lastMonth',
+				icon: 'history' as const,
+				content: t('Previous_month'),
+				onClick: () => dispatch('last-month'),
+			},
+		],
 		[dispatch, t],
 	);
 
 	return (
-		<Box marginInline={-4} {...props}>
+		<Box marginInline={-4} alignItems='center' {...props}>
 			<Margins inline={4}>
 				<InputBox type='date' value={startDate} max={maxStartDate} flexGrow={1} height={20} onChange={handleChangeStart} />
 				<InputBox type='date' min={minEndDate} value={endDate} max={maxEndDate} flexGrow={1} height={20} onChange={handleChangeEnd} />
-				<Menu
-					options={presets}
-					renderItem={(props: ComponentProps<typeof Option>) => <Option icon='history' {...props} />}
-					alignSelf='center'
-				/>
+				<GenericMenu title={t('Date_range_presets')} items={presets} small />
 			</Margins>
 		</Box>
 	);
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilter.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilter.tsx
index e9a3cb80556f6..8ce935b64a4f9 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilter.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilter.tsx
@@ -58,7 +58,7 @@ export const AppLogsFilter = ({ appId, expandAll, collapseAll, refetchLogs, isLo
 	const compactMode = useCompactMode();
 
 	return (
-		<Box display='flex' flexDirection='row' width='full' flexWrap='wrap' alignContent='flex-end'>
+		<Box display='flex' alignItems='flex-end' flexDirection='row' width='full' flexWrap='wrap' alignContent='flex-end'>
 			<Box display='flex' flexDirection='column' mie={10} flexGrow={1}>
 				<Label id='eventFilterLabel' htmlFor='eventFilter'>
 					{t('Event')}
@@ -70,71 +70,69 @@ export const AppLogsFilter = ({ appId, expandAll, collapseAll, refetchLogs, isLo
 				/>
 			</Box>
 			{!compactMode && (
-				<Box display='flex' flexDirection='column' mie={10} flexGrow={1}>
-					<Label id='timeFilterLabel' htmlFor='timeFilter'>
-						{t('Time')}
-					</Label>
-					<TimeFilterSelect id='timeFilter' aria-labelledby='timeFilterLabel' />
-				</Box>
-			)}
-			{!compactMode && (
-				<Box display='flex' flexDirection='column' mie={10} flexGrow={1}>
-					<Label id='instanceFilterLabel' htmlFor='instanceFilter'>
-						{t('Instance')}
-					</Label>
-					<Controller
-						control={control}
-						name='instance'
-						render={({ field }) => (
-							<InstanceFilterSelect appId={appId} aria-labelledby='instanceFilterLabel' id='instanceFilter' {...field} />
-						)}
+				<>
+					<Box display='flex' flexDirection='column' mie={10} flexGrow={1}>
+						<Label id='timeFilterLabel' htmlFor='timeFilter'>
+							{t('Time')}
+						</Label>
+						<TimeFilterSelect id='timeFilter' aria-labelledby='timeFilterLabel' />
+					</Box>
+
+					<Box display='flex' flexDirection='column' mie={10} flexGrow={1}>
+						<Label id='instanceFilterLabel' htmlFor='instanceFilter'>
+							{t('Instance')}
+						</Label>
+						<Controller
+							control={control}
+							name='instance'
+							render={({ field }) => (
+								<InstanceFilterSelect appId={appId} aria-labelledby='instanceFilterLabel' id='instanceFilter' {...field} />
+							)}
+						/>
+					</Box>
+
+					<Box display='flex' flexDirection='column' mie={10} flexGrow={1}>
+						<Label>{t('Severity')}</Label>
+						<Controller control={control} name='severity' render={({ field }) => <SeverityFilterSelect id='severityFilter' {...field} />} />
+					</Box>
+
+					<IconButton
+						title={isLoading ? t('Loading') : t('Refresh_logs')}
+						disabled={isLoading}
+						icon='refresh'
+						secondary
+						mie={10}
+						onClick={() => refreshLogs()}
 					/>
-				</Box>
-			)}
-			{!compactMode && (
-				<Box display='flex' flexDirection='column' mie={10} flexGrow={1}>
-					<Label>{t('Severity')}</Label>
-					<Controller control={control} name='severity' render={({ field }) => <SeverityFilterSelect id='severityFilter' {...field} />} />
-				</Box>
-			)}
-			{!compactMode && (
-				<IconButton
-					title={isLoading ? t('Loading') : t('Refresh_logs')}
-					alignSelf='flex-end'
-					disabled={isLoading}
-					icon='refresh'
-					secondary
-					mie={10}
-					onClick={() => refreshLogs()}
-				/>
-			)}
-			{!compactMode && (
-				<IconButton
-					title={noResults ? t('No_data_to_export') : t('Export')}
-					alignSelf='flex-end'
-					icon='circle-arrow-down'
-					disabled={noResults}
-					secondary
-					mie={10}
-					onClick={() => openExportModal()}
-					aria-label={noResults ? t('No_data_to_export') : t('Export')}
-					aria-disabled={noResults}
-				/>
-			)}
-			{compactMode && (
-				<Button alignSelf='flex-end' icon='customize' secondary mie={10} onClick={() => openContextualBar()}>
-					{t('Filters')}
-				</Button>
+
+					<IconButton
+						title={noResults ? t('No_data_to_export') : t('Export')}
+						icon='circle-arrow-down'
+						disabled={noResults}
+						secondary
+						mie={10}
+						onClick={() => openExportModal()}
+						aria-label={noResults ? t('No_data_to_export') : t('Export')}
+						aria-disabled={noResults}
+					/>
+
+					<AppsLogsFilterOptions onExpandAll={openAllLogs} onCollapseAll={collapseAll} />
+				</>
 			)}
-			{!compactMode && <AppsLogsFilterOptions onExpandAll={openAllLogs} onCollapseAll={collapseAll} />}
+
 			{compactMode && (
-				<CompactFilterOptions
-					isLoading={isLoading}
-					onExportLogs={openExportModal}
-					onExpandAll={openAllLogs}
-					onCollapseAll={collapseAll}
-					onRefreshLogs={refreshLogs}
-				/>
+				<>
+					<Button alignSelf='flex-end' icon='customize' secondary mie={10} onClick={() => openContextualBar()}>
+						{t('Filters')}
+					</Button>
+					<CompactFilterOptions
+						isLoading={isLoading}
+						onExportLogs={openExportModal}
+						onExpandAll={openAllLogs}
+						onCollapseAll={collapseAll}
+						onRefreshLogs={refreshLogs}
+					/>
+				</>
 			)}
 		</Box>
 	);
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilterOptions.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilterOptions.tsx
index 08cbc95056f37..e716e86790473 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilterOptions.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilterOptions.tsx
@@ -1,4 +1,4 @@
-import { Box, Icon, Menu } from '@rocket.chat/fuselage';
+import { GenericMenu } from '@rocket.chat/ui-client';
 import { useTranslation } from 'react-i18next';
 
 type AppsLogsFilterOptionsProps = {
@@ -9,27 +9,22 @@ type AppsLogsFilterOptionsProps = {
 const AppsLogsFilterOptions = ({ onExpandAll, onCollapseAll, ...props }: AppsLogsFilterOptionsProps) => {
 	const { t } = useTranslation();
 
-	const menuOptions = {
-		expandAll: {
-			label: (
-				<Box>
-					<Icon name='arrow-expand' size='x16' marginInlineEnd={4} />
-					{t('Expand_all')}
-				</Box>
-			),
-			action: onExpandAll,
+	const items = [
+		{
+			id: 'expandAll',
+			icon: 'arrow-expand' as const,
+			content: t('Expand_all'),
+			onClick: onExpandAll,
 		},
-		collapseAll: {
-			label: (
-				<Box>
-					<Icon name='arrow-collapse' size='x16' marginInlineEnd={4} />
-					{t('Collapse_all')}
-				</Box>
-			),
-			action: onCollapseAll,
+		{
+			id: 'collapseAll',
+			icon: 'arrow-collapse' as const,
+			content: t('Collapse_all'),
+			onClick: onCollapseAll,
 		},
-	};
-	return <Menu title={t('Options')} small={false} alignSelf='flex-end' options={menuOptions} {...props} />;
+	];
+
+	return <GenericMenu large title={t('Options')} items={items} {...props} />;
 };
 
 export default AppsLogsFilterOptions;
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/CompactFilterOptions.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/CompactFilterOptions.tsx
index d2e822855e1d1..6bb540c933a1e 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/CompactFilterOptions.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/CompactFilterOptions.tsx
@@ -1,4 +1,4 @@
-import { Box, Icon, Menu } from '@rocket.chat/fuselage';
+import { GenericMenu } from '@rocket.chat/ui-client';
 import { useTranslation } from 'react-i18next';
 
 type CompactFilterOptionsProps = {
@@ -19,46 +19,35 @@ const CompactFilterOptions = ({
 }: CompactFilterOptionsProps) => {
 	const { t } = useTranslation();
 
-	const menuOptions = {
-		exportLogs: {
-			label: (
-				<Box>
-					<Icon name='circle-arrow-down' size='x16' marginInlineEnd={4} />
-					{t('Export')}
-				</Box>
-			),
-			action: onExportLogs,
+	const items = [
+		{
+			id: 'exportLogs',
+			icon: 'circle-arrow-down' as const,
+			content: t('Export'),
+			onClick: onExportLogs,
 		},
-		expandAll: {
-			label: (
-				<Box>
-					<Icon name='arrow-expand' size='x16' marginInlineEnd={4} />
-					{t('Expand_all')}
-				</Box>
-			),
-			action: onExpandAll,
+		{
+			id: 'expandAll',
+			icon: 'arrow-expand' as const,
+			content: t('Expand_all'),
+			onClick: onExpandAll,
 		},
-		collapseAll: {
-			label: (
-				<Box>
-					<Icon name='arrow-collapse' size='x16' marginInlineEnd={4} />
-					{t('Collapse_all')}
-				</Box>
-			),
-			action: onCollapseAll,
+		{
+			id: 'collapseAll',
+			icon: 'arrow-collapse' as const,
+			content: t('Collapse_all'),
+			onClick: onCollapseAll,
 		},
-		refreshLogs: {
-			label: (
-				<Box>
-					<Icon name='refresh' size='x16' marginInlineEnd={4} />
-					{t('Refresh_logs')}
-				</Box>
-			),
-			action: onRefreshLogs,
+		{
+			id: 'refreshLogs',
+			icon: 'refresh' as const,
+			content: t('Refresh_logs'),
+			onClick: onRefreshLogs,
 			disabled: isLoading,
 		},
-	};
-	return <Menu title={t('Options')} small={false} alignSelf='flex-end' options={menuOptions} {...props} />;
+	];
+
+	return <GenericMenu title={t('Options')} large items={items} {...props} />;
 };
 
 export default CompactFilterOptions;
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/AppLogsFilterCompact.spec.tsx.snap b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/AppLogsFilterCompact.spec.tsx.snap
index fc4fd37a8c3eb..874497e97b4a5 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/AppLogsFilterCompact.spec.tsx.snap
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/AppLogsFilterCompact.spec.tsx.snap
@@ -7,7 +7,7 @@ exports[`renders AppLogsItem without crashing 1`] = `
       class="rcx-box rcx-box--full rcx-css-4jy2w6"
     >
       <div
-        class="rcx-box rcx-box--full rcx-css-1w4asan"
+        class="rcx-box rcx-box--full rcx-css-rovs2w"
       >
         <div
           class="rcx-box rcx-box--full rcx-css-1rfw4fq"
@@ -46,16 +46,19 @@ exports[`renders AppLogsItem without crashing 1`] = `
           </span>
         </button>
         <button
-          class="rcx-box rcx-box--full rcx-button--large-square rcx-button--square rcx-button--icon rcx-button rcx-css-17zzf5z"
-          data-testid="menu"
+          aria-expanded="false"
+          aria-haspopup="true"
+          aria-label="Options"
+          class="rcx-box rcx-box--full rcx-button--large-square rcx-button--square rcx-button--icon rcx-button"
+          id="react-aria-:r0:"
           title="Options"
           type="button"
         >
           <i
             aria-hidden="true"
-            class="rcx-box rcx-box--full rcx-icon--name-kebab rcx-icon rcx-css-1x2l7ts"
+            class="rcx-box rcx-box--full rcx-icon--name-menu rcx-icon rcx-css-1x2l7ts"
           >
-            
+            
           </i>
         </button>
       </div>
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/AppLogsFilterExpanded.spec.tsx.snap b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/AppLogsFilterExpanded.spec.tsx.snap
index ff46264562686..022683cb0e004 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/AppLogsFilterExpanded.spec.tsx.snap
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/AppLogsFilterExpanded.spec.tsx.snap
@@ -7,7 +7,7 @@ exports[`renders AppLogsItem without crashing 1`] = `
       class="rcx-box rcx-box--full rcx-css-4jy2w6"
     >
       <div
-        class="rcx-box rcx-box--full rcx-css-1w4asan"
+        class="rcx-box rcx-box--full rcx-css-rovs2w"
       >
         <div
           class="rcx-box rcx-box--full rcx-css-1rfw4fq"
@@ -205,7 +205,7 @@ exports[`renders AppLogsItem without crashing 1`] = `
           </button>
         </div>
         <button
-          class="rcx-box rcx-box--full rcx-button--large-square rcx-button--icon-secondary rcx-button--square rcx-button--icon rcx-button rcx-css-qv9v2f"
+          class="rcx-box rcx-box--full rcx-button--large-square rcx-button--icon-secondary rcx-button--square rcx-button--icon rcx-button rcx-css-1itpmo6"
           title="Refresh_logs"
           type="button"
         >
@@ -219,7 +219,7 @@ exports[`renders AppLogsItem without crashing 1`] = `
         <button
           aria-disabled="false"
           aria-label="Export"
-          class="rcx-box rcx-box--full rcx-button--large-square rcx-button--icon-secondary rcx-button--square rcx-button--icon rcx-button rcx-css-qv9v2f"
+          class="rcx-box rcx-box--full rcx-button--large-square rcx-button--icon-secondary rcx-button--square rcx-button--icon rcx-button rcx-css-1itpmo6"
           title="Export"
           type="button"
         >
@@ -231,16 +231,19 @@ exports[`renders AppLogsItem without crashing 1`] = `
           </i>
         </button>
         <button
-          class="rcx-box rcx-box--full rcx-button--large-square rcx-button--square rcx-button--icon rcx-button rcx-css-17zzf5z"
-          data-testid="menu"
+          aria-expanded="false"
+          aria-haspopup="true"
+          aria-label="Options"
+          class="rcx-box rcx-box--full rcx-button--large-square rcx-button--square rcx-button--icon rcx-button"
+          id="react-aria-:rg:"
           title="Options"
           type="button"
         >
           <i
             aria-hidden="true"
-            class="rcx-box rcx-box--full rcx-icon--name-kebab rcx-icon rcx-css-1x2l7ts"
+            class="rcx-box rcx-box--full rcx-icon--name-menu rcx-icon rcx-css-1x2l7ts"
           >
-            
+            
           </i>
         </button>
       </div>
diff --git a/apps/meteor/client/views/omnichannel/analytics/DateRangePicker.tsx b/apps/meteor/client/views/omnichannel/analytics/DateRangePicker.tsx
index 427591f4aeaa2..b74940a58f937 100644
--- a/apps/meteor/client/views/omnichannel/analytics/DateRangePicker.tsx
+++ b/apps/meteor/client/views/omnichannel/analytics/DateRangePicker.tsx
@@ -1,5 +1,6 @@
-import { Box, InputBox, Menu, Field, FieldLabel, FieldRow } from '@rocket.chat/fuselage';
+import { Box, InputBox, Field, FieldLabel, FieldRow } from '@rocket.chat/fuselage';
 import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
+import { GenericMenu } from '@rocket.chat/ui-client';
 import type { Moment } from 'moment';
 import moment from 'moment';
 import type { ComponentProps, FormEvent } from 'react';
@@ -63,50 +64,56 @@ const DateRangePicker = ({ onChange = () => undefined, ...props }: DateRangePick
 	}, [handleRange]);
 
 	const options = useMemo(
-		() => ({
-			today: {
-				icon: 'history',
-				label: t('Today'),
-				action: () => {
+		() => [
+			{
+				id: 'today',
+				icon: 'history' as const,
+				content: t('Today'),
+				onClick: () => {
 					handleRange(getWeekRange(0, 0));
 				},
 			},
-			yesterday: {
-				icon: 'history',
-				label: t('Yesterday'),
-				action: () => {
+			{
+				id: 'yesterday',
+				icon: 'history' as const,
+				content: t('Yesterday'),
+				onClick: () => {
 					handleRange(getWeekRange(1, 1));
 				},
 			},
-			thisWeek: {
-				icon: 'history',
-				label: t('This_week'),
-				action: () => {
+			{
+				id: 'thisWeek',
+				icon: 'history' as const,
+				content: t('This_week'),
+				onClick: () => {
 					handleRange(getWeekRange(7, 0));
 				},
 			},
-			previousWeek: {
-				icon: 'history',
-				label: t('Previous_week'),
-				action: () => {
+			{
+				id: 'previousWeek',
+				icon: 'history' as const,
+				content: t('Previous_week'),
+				onClick: () => {
 					handleRange(getWeekRange(14, 7));
 				},
 			},
-			thisMonth: {
-				icon: 'history',
-				label: t('This_month'),
-				action: () => {
+			{
+				id: 'thisMonth',
+				icon: 'history' as const,
+				content: t('This_month'),
+				onClick: () => {
 					handleRange(getMonthRange(0));
 				},
 			},
-			lastMonth: {
-				icon: 'history',
-				label: t('Previous_month'),
-				action: () => {
+			{
+				id: 'lastMonth',
+				icon: 'history' as const,
+				content: t('Previous_month'),
+				onClick: () => {
 					handleRange(getMonthRange(1));
 				},
 			},
-		}),
+		],
 		[handleRange, t],
 	);
 
@@ -127,7 +134,9 @@ const DateRangePicker = ({ onChange = () => undefined, ...props }: DateRangePick
 						<Box height='x40' display='flex' width='full'>
 							<InputBox type='date' onChange={handleEnd} min={start} max={todayDate} value={end} />
 						</Box>
-						<Menu mis={8} options={options} />
+						<Box mis={8}>
+							<GenericMenu title={t('Date_range_presets')} items={options} small />
+						</Box>
 					</FieldRow>
 				</Field>
 			</Box>
diff --git a/apps/meteor/client/views/omnichannel/departments/DepartmentsTable/DepartmentItemMenu.tsx b/apps/meteor/client/views/omnichannel/departments/DepartmentsTable/DepartmentItemMenu.tsx
index 253ad9d10c4b6..ecae635d81527 100644
--- a/apps/meteor/client/views/omnichannel/departments/DepartmentsTable/DepartmentItemMenu.tsx
+++ b/apps/meteor/client/views/omnichannel/departments/DepartmentsTable/DepartmentItemMenu.tsx
@@ -1,10 +1,11 @@
 import type { ILivechatDepartment } from '@rocket.chat/core-typings';
-import { Box, Icon, Menu } from '@rocket.chat/fuselage';
 import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
-import { useToastMessageDispatch, useEndpoint, useRoute, useSetModal, useTranslation, useSetting } from '@rocket.chat/ui-contexts';
+import { GenericMenu } from '@rocket.chat/ui-client';
+import { useToastMessageDispatch, useEndpoint, useRoute, useSetModal, useSetting } from '@rocket.chat/ui-contexts';
 import { useQueryClient } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
-import { useCallback } from 'react';
+import { useCallback, useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import RemoveDepartmentModal from './RemoveDepartmentModal';
 
@@ -20,7 +21,7 @@ type DepartmentItemMenuProps = {
 
 // TODO: Use MenuV2 instead of Menu
 const DepartmentItemMenu = ({ department, archived }: DepartmentItemMenuProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const queryClient = useQueryClient();
 	const setModal = useSetModal();
 	const dispatchToastMessage = useToastMessageDispatch();
@@ -60,39 +61,37 @@ const DepartmentItemMenu = ({ department, archived }: DepartmentItemMenuProps):
 		setModal(<RemoveDepartmentModal _id={_id} reset={handleReload} onClose={() => setModal(null)} name={name} />);
 	});
 
-	const menuOptions = {
-		...(!archived && {
-			edit: {
-				label: (
-					<>
-						<Icon name='edit' size='x16' mie={4} />
-						{t('Edit')}
-					</>
-				),
-				action: (): void => handleEdit(),
+	const items = useMemo(
+		() => [
+			...(archived
+				? []
+				: [
+						{
+							id: 'edit',
+							icon: 'edit' as const,
+							content: t('Edit'),
+							onClick: handleEdit,
+						},
+					]),
+			{
+				id: archived ? 'unarchive' : 'archive',
+				icon: archived ? ('undo' as const) : ('arrow-down-box' as const),
+				content: archived ? t('Unarchive') : t('Archive'),
+				onClick: handleToggleArchive,
 			},
-		}),
-		[archived ? 'unarchive' : 'archive']: {
-			label: (
-				<>
-					<Icon name={archived ? 'undo' : 'arrow-down-box'} size='x16' mie={4} />
-					{archived ? t('Unarchive') : t('Archive')}
-				</>
-			),
-			action: (): Promise<void> => handleToggleArchive(),
-		},
-		delete: {
-			label: (
-				<Box data-tooltip={!departmentRemovalEnabled ? t('Department_Removal_Disabled') : undefined}>
-					<Icon name='trash' size='x16' mie={4} />
-					{t('Delete')}
-				</Box>
-			),
-			action: (): void => handlePermanentDepartmentRemoval(),
-			disabled: !departmentRemovalEnabled,
-		},
-	};
-	return <Menu title={t('Options')} options={menuOptions} />;
+			{
+				id: 'delete',
+				icon: 'trash' as const,
+				content: t('Delete'),
+				onClick: handlePermanentDepartmentRemoval,
+				disabled: !departmentRemovalEnabled,
+				tooltip: !departmentRemovalEnabled ? t('Department_Removal_Disabled') : undefined,
+			},
+		],
+		[archived, departmentRemovalEnabled, handleEdit, handleToggleArchive, handlePermanentDepartmentRemoval, t],
+	);
+
+	return <GenericMenu title={t('Options')} items={items} />;
 };
 
 export default DepartmentItemMenu;
diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-departaments.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-departaments.spec.ts
index 9070744d23f4c..190f485067ba2 100644
--- a/apps/meteor/tests/e2e/omnichannel/omnichannel-departaments.spec.ts
+++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-departaments.spec.ts
@@ -234,7 +234,7 @@ test.describe('OC - Manage Departments', () => {
 			});
 		});
 
-		test('Toggle department removal', async ({ api }) => {
+		test('Toggle department removal', async ({ api, page }) => {
 			await test.step('expect create new department', async () => {
 				await poOmnichannelDepartments.search(department.name);
 				await expect(poOmnichannelDepartments.departmentsTable.findRowByName(department.name)).toBeVisible();
@@ -244,6 +244,7 @@ test.describe('OC - Manage Departments', () => {
 				await poOmnichannelDepartments.search(department.name);
 				await poOmnichannelDepartments.getDepartmentMenuByName(department.name).click();
 				await expect(poOmnichannelDepartments.menuDeleteOption).toBeEnabled();
+				await page.keyboard.press('Escape');
 			});
 
 			await test.step('expect to disable department removal setting', async () => {
@@ -255,6 +256,7 @@ test.describe('OC - Manage Departments', () => {
 				await poOmnichannelDepartments.search(department.name);
 				await poOmnichannelDepartments.getDepartmentMenuByName(department.name).click();
 				await expect(poOmnichannelDepartments.menuDeleteOption).toBeDisabled();
+				await page.keyboard.press('Escape');
 			});
 
 			await test.step('expect to enable department removal setting', async () => {
diff --git a/apps/meteor/tests/e2e/page-objects/fragments/menu.ts b/apps/meteor/tests/e2e/page-objects/fragments/menu.ts
index 4353ec8d12e03..58634cb4d36c4 100644
--- a/apps/meteor/tests/e2e/page-objects/fragments/menu.ts
+++ b/apps/meteor/tests/e2e/page-objects/fragments/menu.ts
@@ -13,8 +13,12 @@ export abstract class Menu {
 		return expect(this.root).not.toBeVisible();
 	}
 
+	getMenuItem(itemName: string) {
+		return this.root.getByRole('menuitem', { name: itemName, exact: true });
+	}
+
 	selectMenuItem(itemName: string) {
-		return this.root.getByRole('menuitem', { name: itemName, exact: true }).click();
+		return this.getMenuItem(itemName).click();
 	}
 }
 
@@ -29,3 +33,9 @@ export class MenuMoreActions extends Menu {
 		super(page.getByRole('menu', { name: 'More actions' }));
 	}
 }
+
+export class MenuOptions extends Menu {
+	constructor(page: Page) {
+		super(page.getByRole('menu', { name: 'Options' }));
+	}
+}
diff --git a/apps/meteor/tests/e2e/page-objects/omnichannel/omnichannel-departments.ts b/apps/meteor/tests/e2e/page-objects/omnichannel/omnichannel-departments.ts
index fea573cd2cc6d..4991974463828 100644
--- a/apps/meteor/tests/e2e/page-objects/omnichannel/omnichannel-departments.ts
+++ b/apps/meteor/tests/e2e/page-objects/omnichannel/omnichannel-departments.ts
@@ -1,6 +1,7 @@
 import type { Locator, Page } from '@playwright/test';
 
 import { OmnichannelAdmin } from './omnichannel-admin';
+import { MenuOptions } from '../fragments';
 import { Listbox } from '../fragments/listbox';
 import { OmnichannelUpsellDepartmentsModal, ConfirmDeleteDepartmentModal } from '../fragments/modals';
 import { Table } from '../fragments/table';
@@ -26,6 +27,8 @@ export class OmnichannelDepartments extends OmnichannelAdmin {
 
 	readonly listbox: Listbox;
 
+	readonly menOptions: MenuOptions;
+
 	override readonly deleteModal: ConfirmDeleteDepartmentModal;
 
 	constructor(page: Page) {
@@ -34,6 +37,7 @@ export class OmnichannelDepartments extends OmnichannelAdmin {
 		this.agentsTable = new OmnichannelDepartmentAgentsTable(page);
 		this.upsellDepartmentsModal = new OmnichannelUpsellDepartmentsModal(page);
 		this.listbox = new Listbox(page);
+		this.menOptions = new MenuOptions(page);
 		this.deleteModal = new ConfirmDeleteDepartmentModal(page);
 	}
 
@@ -62,7 +66,7 @@ export class OmnichannelDepartments extends OmnichannelAdmin {
 	}
 
 	get btnSave() {
-		return this.page.getByRole('button', { name: 'Save' });
+		return this.page.getByRole('button', { name: 'Save', exact: true });
 	}
 
 	get tabArchivedDepartments() {
@@ -74,19 +78,19 @@ export class OmnichannelDepartments extends OmnichannelAdmin {
 	}
 
 	get menuEditOption() {
-		return this.listbox.getOption('Edit');
+		return this.menOptions.getMenuItem('Edit');
 	}
 
 	get menuDeleteOption() {
-		return this.listbox.getOption('Delete');
+		return this.menOptions.getMenuItem('Delete');
 	}
 
 	get menuArchiveOption() {
-		return this.listbox.getOption('Archive');
+		return this.menOptions.getMenuItem('Archive');
 	}
 
 	get menuUnarchiveOption() {
-		return this.listbox.getOption('Unarchive');
+		return this.menOptions.getMenuItem('Unarchive');
 	}
 
 	async archiveDepartmentByName(name: string) {
diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json
index e3ac97c6b6dc8..e9f5b196a88e2 100644
--- a/packages/i18n/src/locales/en.i18n.json
+++ b/packages/i18n/src/locales/en.i18n.json
@@ -7095,5 +7095,6 @@
   "timestamps.relativeTimeDescription": "1 year ago",
   "Message_composer": "Message composer",
   "Thread_composer": "Thread composer",
-  "Room_composer": "Room composer"
+  "Room_composer": "Room composer",
+  "Date_range_presets": "Date range presets"
 }
\ No newline at end of file