diff --git a/.changeset/twenty-wasps-attend.md b/.changeset/twenty-wasps-attend.md
new file mode 100644
index 0000000000000..24e5bf723d59d
--- /dev/null
+++ b/.changeset/twenty-wasps-attend.md
@@ -0,0 +1,15 @@
+---
+'@rocket.chat/mock-providers': minor
+'@rocket.chat/core-services': minor
+'@rocket.chat/model-typings': minor
+'@rocket.chat/core-typings': minor
+'@rocket.chat/rest-typings': minor
+'@rocket.chat/ui-contexts': minor
+'@rocket.chat/ui-client': minor
+'@rocket.chat/models': minor
+'@rocket.chat/i18n': minor
+'@rocket.chat/meteor': minor
+---
+
+Introduces the side navigation with a new filtering system. The update adds new filters for All, Mentions, Favorites, and Discussions, as well as dedicated filters for Omnichannel conversations and grouping by Teams, Channels, and DMs.
+> This change is being tested under `Enhanced navigation experience` feature preview, in order to check it you need to enabled it
diff --git a/apps/meteor/app/api/server/v1/rooms.ts b/apps/meteor/app/api/server/v1/rooms.ts
index b4d30d8cb0c5b..7206cfb5ce27e 100644
--- a/apps/meteor/app/api/server/v1/rooms.ts
+++ b/apps/meteor/app/api/server/v1/rooms.ts
@@ -363,13 +363,8 @@ API.v1.addRoute(
 			}
 
 			await Promise.all(
-				Object.keys(notifications as Notifications).map(async (notificationKey) =>
-					saveNotificationSettingsMethod(
-						this.userId,
-						roomId,
-						notificationKey as NotificationFieldType,
-						notifications[notificationKey as keyof Notifications],
-					),
+				Object.entries(notifications as Notifications).map(async ([notificationKey, notificationValue]) =>
+					saveNotificationSettingsMethod(this.userId, roomId, notificationKey as NotificationFieldType, notificationValue),
 				),
 			);
 
@@ -463,7 +458,7 @@ API.v1.addRoute(
 			const discussionParent =
 				room.prid &&
 				(await Rooms.findOneById<Pick<IRoom, 'name' | 'fname' | 't' | 'prid' | 'u'>>(room.prid, {
-					projection: { name: 1, fname: 1, t: 1, prid: 1, u: 1, sidepanel: 1 },
+					projection: { name: 1, fname: 1, t: 1, prid: 1, u: 1 },
 				}));
 			const { team, parentRoom } = await Team.getRoomInfo(room);
 			const parent = discussionParent || parentRoom;
diff --git a/apps/meteor/app/api/server/v1/teams.ts b/apps/meteor/app/api/server/v1/teams.ts
index 84d1ba5db264c..ee5ec7e273f66 100644
--- a/apps/meteor/app/api/server/v1/teams.ts
+++ b/apps/meteor/app/api/server/v1/teams.ts
@@ -1,6 +1,6 @@
 import { Team } from '@rocket.chat/core-services';
 import type { ITeam, UserStatus } from '@rocket.chat/core-typings';
-import { TEAM_TYPE, isValidSidepanel } from '@rocket.chat/core-typings';
+import { TEAM_TYPE } from '@rocket.chat/core-typings';
 import { Users, Rooms } from '@rocket.chat/models';
 import {
 	isTeamsConvertToChannelProps,
@@ -78,11 +78,7 @@ API.v1.addRoute(
 				}),
 			);
 
-			const { name, type, members, room, owner, sidepanel } = this.bodyParams;
-
-			if (sidepanel?.items && !isValidSidepanel(sidepanel)) {
-				throw new Error('error-invalid-sidepanel');
-			}
+			const { name, type, members, room, owner } = this.bodyParams;
 
 			const team = await Team.create(this.userId, {
 				team: {
@@ -92,7 +88,6 @@ API.v1.addRoute(
 				room,
 				members,
 				owner,
-				sidepanel,
 			});
 
 			return API.v1.success({ team });
diff --git a/apps/meteor/app/channel-settings/server/methods/saveRoomSettings.ts b/apps/meteor/app/channel-settings/server/methods/saveRoomSettings.ts
index 42adc75cb563a..7cbdca852cd6d 100644
--- a/apps/meteor/app/channel-settings/server/methods/saveRoomSettings.ts
+++ b/apps/meteor/app/channel-settings/server/methods/saveRoomSettings.ts
@@ -1,6 +1,6 @@
 import { Team } from '@rocket.chat/core-services';
 import type { IRoom, IRoomWithRetentionPolicy, IUser, MessageTypesValues } from '@rocket.chat/core-typings';
-import { TEAM_TYPE, isValidSidepanel } from '@rocket.chat/core-typings';
+import { TEAM_TYPE } from '@rocket.chat/core-typings';
 import type { ServerMethods } from '@rocket.chat/ddp-client';
 import { Rooms, Users } from '@rocket.chat/models';
 import { Match } from 'meteor/check';
@@ -47,7 +47,6 @@ type RoomSettings = {
 		favorite: boolean;
 		defaultValue: boolean;
 	};
-	sidepanel?: IRoom['sidepanel'];
 };
 
 type RoomSettingsValidators = {
@@ -79,23 +78,6 @@ const validators: RoomSettingsValidators = {
 			});
 		}
 	},
-	async sidepanel({ room, userId, value }) {
-		if (!room.teamMain) {
-			throw new Meteor.Error('error-action-not-allowed', 'Invalid room', {
-				method: 'saveRoomSettings',
-			});
-		}
-
-		if (!(await hasPermissionAsync(userId, 'edit-team', room._id))) {
-			throw new Meteor.Error('error-action-not-allowed', 'You do not have permission to change sidepanel items', {
-				method: 'saveRoomSettings',
-			});
-		}
-
-		if (!isValidSidepanel(value)) {
-			throw new Meteor.Error('error-invalid-sidepanel');
-		}
-	},
 
 	async roomType({ userId, room, value }) {
 		if (value === room.t) {
@@ -249,11 +231,6 @@ const settingSavers: RoomSettingsSavers = {
 			await saveRoomTopic(rid, value, user);
 		}
 	},
-	async sidepanel({ value, rid, room }) {
-		if (JSON.stringify(value) !== JSON.stringify(room.sidepanel)) {
-			await Rooms.setSidepanelById(rid, value);
-		}
-	},
 	async roomAnnouncement({ value, room, rid, user }) {
 		if (!value && !room.announcement) {
 			return;
@@ -376,7 +353,6 @@ const fields: (keyof RoomSettings)[] = [
 	'retentionOverrideGlobal',
 	'encrypted',
 	'favorite',
-	'sidepanel',
 ];
 
 const validate = <TRoomSetting extends keyof RoomSettings>(
diff --git a/apps/meteor/app/lib/server/functions/createRoom.ts b/apps/meteor/app/lib/server/functions/createRoom.ts
index 22a5d7c69dc7b..dd84fd450301a 100644
--- a/apps/meteor/app/lib/server/functions/createRoom.ts
+++ b/apps/meteor/app/lib/server/functions/createRoom.ts
@@ -126,7 +126,6 @@ export const createRoom = async <T extends RoomType>(
 	readOnly?: boolean,
 	roomExtraData?: Partial<IRoom>,
 	options?: ICreateRoomParams['options'],
-	sidepanel?: ICreateRoomParams['sidepanel'],
 ): Promise<
 	ICreatedRoom & {
 		rid: string;
@@ -202,7 +201,6 @@ export const createRoom = async <T extends RoomType>(
 		},
 		ts: now,
 		ro: readOnly === true,
-		...(sidepanel && { sidepanel }),
 	};
 
 	if (teamId) {
diff --git a/apps/meteor/client/NavBarV2/NavBarPagesGroup/NavBarItemSort.tsx b/apps/meteor/client/NavBarV2/NavBarPagesGroup/NavBarItemSort.tsx
deleted file mode 100644
index 430718e036820..0000000000000
--- a/apps/meteor/client/NavBarV2/NavBarPagesGroup/NavBarItemSort.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { SidebarV2Action } from '@rocket.chat/fuselage';
-import { GenericMenu } from '@rocket.chat/ui-client';
-import type { HTMLAttributes } from 'react';
-import { useTranslation } from 'react-i18next';
-
-import { useSortMenu } from './hooks/useSortMenu';
-
-type NavBarItemSortProps = Omit<HTMLAttributes<HTMLElement>, 'is'>;
-
-const NavBarItemSort = (props: NavBarItemSortProps) => {
-	const { t } = useTranslation();
-
-	const sections = useSortMenu();
-
-	return <GenericMenu icon='sort' sections={sections} title={t('Display')} selectionMode='multiple' is={SidebarV2Action} {...props} />;
-};
-
-export default NavBarItemSort;
diff --git a/apps/meteor/client/NavBarV2/NavBarPagesGroup/NavBarPagesGroup.tsx b/apps/meteor/client/NavBarV2/NavBarPagesGroup/NavBarPagesGroup.tsx
index f4d4a89068bac..f258706d513be 100644
--- a/apps/meteor/client/NavBarV2/NavBarPagesGroup/NavBarPagesGroup.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarPagesGroup/NavBarPagesGroup.tsx
@@ -6,7 +6,6 @@ import NavBarItemCreateNew from './NavBarItemCreateNew';
 import NavBarItemDirectoryPage from './NavBarItemDirectoryPage';
 import NavBarItemHomePage from './NavBarItemHomePage';
 import NavBarItemMarketPlaceMenu from './NavBarItemMarketPlaceMenu';
-import NavBarItemSort from './NavBarItemSort';
 import NavBarPagesStackMenu from './NavBarPagesStackMenu';
 
 const NavBarPagesGroup = () => {
@@ -28,7 +27,6 @@ const NavBarPagesGroup = () => {
 			)}
 			{showMarketplace && !isMobile && <NavBarItemMarketPlaceMenu />}
 			<NavBarItemCreateNew />
-			{!isMobile && <NavBarItemSort />}
 		</NavBarGroup>
 	);
 };
diff --git a/apps/meteor/client/NavBarV2/NavBarPagesGroup/actions/CreateTeamModal.tsx b/apps/meteor/client/NavBarV2/NavBarPagesGroup/actions/CreateTeamModal.tsx
index 2f2806f29d985..e80c4d0656712 100644
--- a/apps/meteor/client/NavBarV2/NavBarPagesGroup/actions/CreateTeamModal.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarPagesGroup/actions/CreateTeamModal.tsx
@@ -1,4 +1,3 @@
-import type { SidepanelItem } from '@rocket.chat/core-typings';
 import {
 	Box,
 	Button,
@@ -15,7 +14,6 @@ import {
 	FieldHint,
 	Accordion,
 	AccordionItem,
-	Divider,
 	ModalHeader,
 	ModalTitle,
 	ModalClose,
@@ -23,7 +21,6 @@ import {
 	ModalFooter,
 	ModalFooterControllers,
 } from '@rocket.chat/fuselage';
-import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '@rocket.chat/ui-client';
 import {
 	useEndpoint,
 	usePermission,
@@ -49,8 +46,6 @@ type CreateTeamModalInputs = {
 	encrypted: boolean;
 	broadcast: boolean;
 	members?: string[];
-	showDiscussions?: boolean;
-	showChannels?: boolean;
 };
 
 type CreateTeamModalProps = { onClose: () => void };
@@ -108,8 +103,6 @@ const CreateTeamModal = ({ onClose }: CreateTeamModalProps) => {
 			encrypted: (e2eEnabledForPrivateByDefault as boolean) ?? false,
 			broadcast: false,
 			members: [],
-			showChannels: true,
-			showDiscussions: true,
 		},
 	});
 
@@ -139,10 +132,7 @@ const CreateTeamModal = ({ onClose }: CreateTeamModalProps) => {
 		topic,
 		broadcast,
 		encrypted,
-		showChannels,
-		showDiscussions,
 	}: CreateTeamModalInputs): Promise<void> => {
-		const sidepanelItem = [showChannels && 'channels', showDiscussions && 'discussions'].filter(Boolean) as [SidepanelItem, SidepanelItem?];
 		const params = {
 			name,
 			members,
@@ -155,7 +145,6 @@ const CreateTeamModal = ({ onClose }: CreateTeamModalProps) => {
 					encrypted,
 				},
 			},
-			...((showChannels || showDiscussions) && { sidepanel: { items: sidepanelItem } }),
 		};
 
 		try {
@@ -177,8 +166,6 @@ const CreateTeamModal = ({ onClose }: CreateTeamModalProps) => {
 	const encryptedId = useId();
 	const broadcastId = useId();
 	const addMembersId = useId();
-	const showChannelsId = useId();
-	const showDiscussionsId = useId();
 
 	return (
 		<Modal
@@ -265,56 +252,6 @@ const CreateTeamModal = ({ onClose }: CreateTeamModalProps) => {
 				</FieldGroup>
 				<Accordion>
 					<AccordionItem title={t('Advanced_settings')}>
-						<FeaturePreview feature='sidepanelNavigation'>
-							<FeaturePreviewOff>{null}</FeaturePreviewOff>
-							<FeaturePreviewOn>
-								<FieldGroup>
-									<Box is='h5' fontScale='h5' color='titles-labels'>
-										{t('Navigation')}
-									</Box>
-									<Field>
-										<FieldRow>
-											<FieldLabel htmlFor={showChannelsId}>{t('Channels')}</FieldLabel>
-											<Controller
-												control={control}
-												name='showChannels'
-												render={({ field: { onChange, value, ref } }): ReactElement => (
-													<ToggleSwitch
-														aria-describedby={`${showChannelsId}-hint`}
-														id={showChannelsId}
-														onChange={onChange}
-														checked={value}
-														ref={ref}
-													/>
-												)}
-											/>
-										</FieldRow>
-										<FieldDescription id={`${showChannelsId}-hint`}>{t('Show_channels_description')}</FieldDescription>
-									</Field>
-
-									<Field>
-										<FieldRow>
-											<FieldLabel htmlFor={showDiscussionsId}>{t('Discussions')}</FieldLabel>
-											<Controller
-												control={control}
-												name='showDiscussions'
-												render={({ field: { onChange, value, ref } }): ReactElement => (
-													<ToggleSwitch
-														aria-describedby={`${showDiscussionsId}-hint`}
-														id={showDiscussionsId}
-														onChange={onChange}
-														checked={value}
-														ref={ref}
-													/>
-												)}
-											/>
-										</FieldRow>
-										<FieldDescription id={`${showDiscussionsId}-hint`}>{t('Show_discussions_description')}</FieldDescription>
-									</Field>
-								</FieldGroup>
-								<Divider mb={36} />
-							</FeaturePreviewOn>
-						</FeaturePreview>
 						<FieldGroup>
 							<Box is='h5' fontScale='h5' color='titles-labels'>
 								{t('Security_and_permissions')}
diff --git a/apps/meteor/client/NavBarV2/NavBarPagesGroup/hooks/useGroupingListItems.spec.tsx b/apps/meteor/client/NavBarV2/NavBarPagesGroup/hooks/useGroupingListItems.spec.tsx
deleted file mode 100644
index 4cd8928031f7d..0000000000000
--- a/apps/meteor/client/NavBarV2/NavBarPagesGroup/hooks/useGroupingListItems.spec.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import { renderHook } from '@testing-library/react';
-
-import { useGroupingListItems } from './useGroupingListItems';
-
-it('should render groupingList items', async () => {
-	const { result } = renderHook(() => useGroupingListItems());
-
-	expect(result.current[0]).toEqual(
-		expect.objectContaining({
-			id: 'unread',
-		}),
-	);
-
-	expect(result.current[1]).toEqual(
-		expect.objectContaining({
-			id: 'favorites',
-		}),
-	);
-
-	expect(result.current[2]).toEqual(
-		expect.objectContaining({
-			id: 'types',
-		}),
-	);
-});
diff --git a/apps/meteor/client/NavBarV2/NavBarPagesGroup/hooks/useGroupingListItems.tsx b/apps/meteor/client/NavBarV2/NavBarPagesGroup/hooks/useGroupingListItems.tsx
deleted file mode 100644
index b2deb3c6ea452..0000000000000
--- a/apps/meteor/client/NavBarV2/NavBarPagesGroup/hooks/useGroupingListItems.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import { CheckBox } from '@rocket.chat/fuselage';
-import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
-import { useEndpoint, useUserPreference } from '@rocket.chat/ui-contexts';
-import { useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
-
-export const useGroupingListItems = (): GenericMenuItemProps[] => {
-	const { t } = useTranslation();
-
-	const sidebarGroupByType = useUserPreference<boolean>('sidebarGroupByType');
-	const sidebarShowFavorites = useUserPreference<boolean>('sidebarShowFavorites');
-	const sidebarShowUnread = useUserPreference<boolean>('sidebarShowUnread');
-
-	const saveUserPreferences = useEndpoint('POST', '/v1/users.setPreferences');
-
-	const useHandleChange = (key: 'sidebarGroupByType' | 'sidebarShowFavorites' | 'sidebarShowUnread', value: boolean): (() => void) =>
-		useCallback(() => saveUserPreferences({ data: { [key]: value } }), [key, value]);
-
-	const handleChangeGroupByType = useHandleChange('sidebarGroupByType', !sidebarGroupByType);
-	const handleChangeShoFavorite = useHandleChange('sidebarShowFavorites', !sidebarShowFavorites);
-	const handleChangeShowUnread = useHandleChange('sidebarShowUnread', !sidebarShowUnread);
-
-	return [
-		{
-			id: 'unread',
-			content: t('Unread'),
-			icon: 'flag',
-			addon: <CheckBox onChange={handleChangeShowUnread} checked={sidebarShowUnread} />,
-		},
-		{
-			id: 'favorites',
-			content: t('Favorites'),
-			icon: 'star',
-			addon: <CheckBox onChange={handleChangeShoFavorite} checked={sidebarShowFavorites} />,
-		},
-		{
-			id: 'types',
-			content: t('Types'),
-			icon: 'group-by-type',
-			addon: <CheckBox onChange={handleChangeGroupByType} checked={sidebarGroupByType} />,
-		},
-	];
-};
diff --git a/apps/meteor/client/NavBarV2/NavBarPagesGroup/hooks/useSortMenu.tsx b/apps/meteor/client/NavBarV2/NavBarPagesGroup/hooks/useSortMenu.tsx
deleted file mode 100644
index af6a73ce6eabb..0000000000000
--- a/apps/meteor/client/NavBarV2/NavBarPagesGroup/hooks/useSortMenu.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { useTranslation } from 'react-i18next';
-
-import { useGroupingListItems } from './useGroupingListItems';
-import { useSortModeItems } from './useSortModeItems';
-import { useViewModeItems } from './useViewModeItems';
-
-export const useSortMenu = () => {
-	const { t } = useTranslation();
-
-	const viewModeItems = useViewModeItems();
-	const sortModeItems = useSortModeItems();
-	const groupingListItems = useGroupingListItems();
-
-	const sections = [
-		{ title: t('Display'), items: viewModeItems },
-		{ title: t('Sort_By'), items: sortModeItems },
-		{ title: t('Group_by'), items: groupingListItems },
-	];
-
-	return sections;
-};
diff --git a/apps/meteor/client/NavBarV2/NavBarPagesGroup/hooks/useSortModeItems.spec.tsx b/apps/meteor/client/NavBarV2/NavBarPagesGroup/hooks/useSortModeItems.spec.tsx
deleted file mode 100644
index fbda604809f0a..0000000000000
--- a/apps/meteor/client/NavBarV2/NavBarPagesGroup/hooks/useSortModeItems.spec.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import { renderHook } from '@testing-library/react';
-
-import { useSortModeItems } from './useSortModeItems';
-
-it('should render sortMode items', async () => {
-	const { result } = renderHook(() => useSortModeItems());
-
-	expect(result.current[0]).toEqual(
-		expect.objectContaining({
-			id: 'activity',
-		}),
-	);
-
-	expect(result.current[1]).toEqual(
-		expect.objectContaining({
-			id: 'name',
-		}),
-	);
-});
diff --git a/apps/meteor/client/NavBarV2/NavBarPagesGroup/hooks/useSortModeItems.tsx b/apps/meteor/client/NavBarV2/NavBarPagesGroup/hooks/useSortModeItems.tsx
deleted file mode 100644
index c1dfb4f3d71ec..0000000000000
--- a/apps/meteor/client/NavBarV2/NavBarPagesGroup/hooks/useSortModeItems.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import { RadioButton } from '@rocket.chat/fuselage';
-import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
-import { useEndpoint, useUserPreference } from '@rocket.chat/ui-contexts';
-import { useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
-
-import {
-	OmnichannelSortingDisclaimer,
-	useOmnichannelSortingDisclaimer,
-} from '../../../components/Omnichannel/OmnichannelSortingDisclaimer';
-
-export const useSortModeItems = (): GenericMenuItemProps[] => {
-	const { t } = useTranslation();
-
-	const saveUserPreferences = useEndpoint('POST', '/v1/users.setPreferences');
-	const sidebarSortBy = useUserPreference<'activity' | 'alphabetical'>('sidebarSortby', 'activity');
-	const isOmnichannelEnabled = useOmnichannelSortingDisclaimer();
-
-	const useHandleChange = (value: 'alphabetical' | 'activity'): (() => void) =>
-		useCallback(() => saveUserPreferences({ data: { sidebarSortby: value } }), [value]);
-
-	const setToAlphabetical = useHandleChange('alphabetical');
-	const setToActivity = useHandleChange('activity');
-
-	return [
-		{
-			id: 'activity',
-			content: t('Activity'),
-			icon: 'clock',
-			addon: <RadioButton onChange={setToActivity} checked={sidebarSortBy === 'activity'} />,
-			description: sidebarSortBy === 'activity' && isOmnichannelEnabled && <OmnichannelSortingDisclaimer />,
-		},
-		{
-			id: 'name',
-			content: t('Name'),
-			icon: 'sort-az',
-			addon: <RadioButton onChange={setToAlphabetical} checked={sidebarSortBy === 'alphabetical'} />,
-			description: sidebarSortBy === 'alphabetical' && isOmnichannelEnabled && <OmnichannelSortingDisclaimer />,
-		},
-	];
-};
diff --git a/apps/meteor/client/NavBarV2/NavBarPagesGroup/hooks/useViewModeItems.spec.tsx b/apps/meteor/client/NavBarV2/NavBarPagesGroup/hooks/useViewModeItems.spec.tsx
deleted file mode 100644
index 6b1d1f18aec81..0000000000000
--- a/apps/meteor/client/NavBarV2/NavBarPagesGroup/hooks/useViewModeItems.spec.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import { renderHook } from '@testing-library/react';
-
-import { useViewModeItems } from './useViewModeItems';
-
-it('should render viewMode items', async () => {
-	const { result } = renderHook(() => useViewModeItems());
-
-	expect(result.current[0]).toEqual(
-		expect.objectContaining({
-			id: 'extended',
-		}),
-	);
-
-	expect(result.current[1]).toEqual(
-		expect.objectContaining({
-			id: 'medium',
-		}),
-	);
-
-	expect(result.current[2]).toEqual(
-		expect.objectContaining({
-			id: 'condensed',
-		}),
-	);
-
-	expect(result.current[3]).toEqual(
-		expect.objectContaining({
-			id: 'avatars',
-		}),
-	);
-});
diff --git a/apps/meteor/client/NavBarV2/NavBarPagesGroup/hooks/useViewModeItems.tsx b/apps/meteor/client/NavBarV2/NavBarPagesGroup/hooks/useViewModeItems.tsx
deleted file mode 100644
index 7e60074cd7c26..0000000000000
--- a/apps/meteor/client/NavBarV2/NavBarPagesGroup/hooks/useViewModeItems.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-import { RadioButton, ToggleSwitch } from '@rocket.chat/fuselage';
-import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
-import { useEndpoint, useUserPreference } from '@rocket.chat/ui-contexts';
-import { useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
-
-export const useViewModeItems = (): GenericMenuItemProps[] => {
-	const { t } = useTranslation();
-
-	const saveUserPreferences = useEndpoint('POST', '/v1/users.setPreferences');
-
-	const useHandleChange = (value: 'medium' | 'extended' | 'condensed'): (() => void) =>
-		useCallback(() => saveUserPreferences({ data: { sidebarViewMode: value } }), [value]);
-
-	const sidebarViewMode = useUserPreference<'medium' | 'extended' | 'condensed'>('sidebarViewMode', 'extended');
-	const sidebarDisplayAvatar = useUserPreference('sidebarDisplayAvatar', false);
-
-	const setToExtended = useHandleChange('extended');
-	const setToMedium = useHandleChange('medium');
-	const setToCondensed = useHandleChange('condensed');
-
-	const handleChangeSidebarDisplayAvatar = useCallback(
-		() => saveUserPreferences({ data: { sidebarDisplayAvatar: !sidebarDisplayAvatar } }),
-		[saveUserPreferences, sidebarDisplayAvatar],
-	);
-
-	return [
-		{
-			id: 'extended',
-			content: t('Extended'),
-			icon: 'extended-view',
-			addon: <RadioButton onChange={setToExtended} checked={sidebarViewMode === 'extended'} />,
-		},
-		{
-			id: 'medium',
-			content: t('Medium'),
-			icon: 'medium-view',
-			addon: <RadioButton onChange={setToMedium} checked={sidebarViewMode === 'medium'} />,
-		},
-		{
-			id: 'condensed',
-			content: t('Condensed'),
-			icon: 'condensed-view',
-			addon: <RadioButton onChange={setToCondensed} checked={sidebarViewMode === 'condensed'} />,
-		},
-		{
-			id: 'avatars',
-			content: t('Avatars'),
-			icon: 'user-rounded',
-			addon: <ToggleSwitch onChange={handleChangeSidebarDisplayAvatar} checked={sidebarDisplayAvatar} />,
-		},
-	];
-};
diff --git a/apps/meteor/client/NavBarV2/NavBarSearch/NavBarSearchListbox.tsx b/apps/meteor/client/NavBarV2/NavBarSearch/NavBarSearchListbox.tsx
index f99f1e2ab54e8..6979191f83c7b 100644
--- a/apps/meteor/client/NavBarV2/NavBarSearch/NavBarSearchListbox.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarSearch/NavBarSearchListbox.tsx
@@ -57,7 +57,7 @@ const NavBarSearchListBox = ({ state, overlayProps }: NavBarSearchListBoxProps)
 				<div {...overlayProps} role='listbox' aria-label={t('Channels')} tabIndex={-1} onKeyDown={handleKeyDown}>
 					{items.length === 0 && !isLoading && <NavBarSearchNoResults />}
 					{items.length > 0 && (
-						<Box color='title-labels' fontScale='c1' fontWeight='bold' pi={12} mbe={4}>
+						<Box color='titles-labels' fontScale='c1' fontWeight='bold' pi={12} mbe={4}>
 							{filterText ? t('Results') : t('Recent')}
 						</Box>
 					)}
diff --git a/apps/meteor/client/components/FeaturePreviewSidePanelNavigation.tsx b/apps/meteor/client/components/FeaturePreviewSidePanelNavigation.tsx
deleted file mode 100644
index adffeea33cfda..0000000000000
--- a/apps/meteor/client/components/FeaturePreviewSidePanelNavigation.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import { FeaturePreview } from '@rocket.chat/ui-client';
-import type { ReactElement } from 'react';
-
-import { useSidePanelNavigationScreenSize } from '../hooks/useSidePanelNavigation';
-
-export const FeaturePreviewSidePanelNavigation = ({ children }: { children: ReactElement[] }) => {
-	const disabled = !useSidePanelNavigationScreenSize();
-	return <FeaturePreview feature='sidepanelNavigation' disabled={disabled} children={children} />;
-};
diff --git a/apps/meteor/client/components/GenericNoResults/GenericNoResults.tsx b/apps/meteor/client/components/GenericNoResults/GenericNoResults.tsx
index 83e8d20a8537c..ee0d8ea040996 100644
--- a/apps/meteor/client/components/GenericNoResults/GenericNoResults.tsx
+++ b/apps/meteor/client/components/GenericNoResults/GenericNoResults.tsx
@@ -6,10 +6,10 @@ type LinkProps = { linkText: string; linkHref: string } | { linkText?: never; li
 type ButtonProps = { buttonTitle: string; buttonAction: () => void } | { buttonTitle?: never; buttonAction?: never };
 
 type GenericNoResultsProps = {
-	icon?: IconName;
+	icon?: IconName | null;
 	title?: string;
 	description?: string;
-	buttonTitle?: string;
+	buttonPrimary?: boolean;
 } & LinkProps &
 	ButtonProps;
 
@@ -19,6 +19,7 @@ const GenericNoResults = ({
 	description,
 	buttonTitle,
 	buttonAction,
+	buttonPrimary = true,
 	linkHref,
 	linkText,
 }: GenericNoResultsProps) => {
@@ -27,12 +28,14 @@ const GenericNoResults = ({
 	return (
 		<Box display='flex' height='100%' flexDirection='column' justifyContent='center'>
 			<States>
-				<StatesIcon name={icon} />
+				{icon && <StatesIcon name={icon} />}
 				<StatesTitle>{title || t('No_results_found')}</StatesTitle>
 				{description && <StatesSubtitle>{description}</StatesSubtitle>}
 				{buttonTitle && buttonAction && (
 					<StatesActions>
-						<StatesAction onClick={buttonAction}>{buttonTitle}</StatesAction>
+						<StatesAction primary={buttonPrimary} onClick={buttonAction}>
+							{buttonTitle}
+						</StatesAction>
 					</StatesActions>
 				)}
 				{linkText && linkHref && (
diff --git a/apps/meteor/client/hooks/menuActions/useToggleNotificationsAction.ts b/apps/meteor/client/hooks/menuActions/useToggleNotificationsAction.ts
new file mode 100644
index 0000000000000..c99e6720fa2fe
--- /dev/null
+++ b/apps/meteor/client/hooks/menuActions/useToggleNotificationsAction.ts
@@ -0,0 +1,30 @@
+import type { IRoom } from '@rocket.chat/core-typings';
+import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
+import { useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
+import { useTranslation } from 'react-i18next';
+
+type useToggleNotificationActionProps = {
+	rid: IRoom['_id'];
+	isNotificationEnabled: boolean;
+	roomName: string;
+};
+
+export const useToggleNotificationAction = ({ rid, isNotificationEnabled, roomName }: useToggleNotificationActionProps) => {
+	const toggleNotification = useEndpoint('POST', '/v1/rooms.saveNotification');
+	const dispatchToastMessage = useToastMessageDispatch();
+	const { t } = useTranslation();
+
+	const handleToggleNotification = useEffectEvent(async () => {
+		try {
+			await toggleNotification({ roomId: rid, notifications: { disableNotifications: isNotificationEnabled ? '1' : '0' } });
+			dispatchToastMessage({
+				type: 'success',
+				message: t(isNotificationEnabled ? 'Room_notifications_off' : 'Room_notifications_on', { roomName }),
+			});
+		} catch (error) {
+			dispatchToastMessage({ type: 'error', message: error });
+		}
+	});
+
+	return handleToggleNotification;
+};
diff --git a/apps/meteor/client/hooks/useLivechatInquiryStore.ts b/apps/meteor/client/hooks/useLivechatInquiryStore.ts
index ba33752c3bbbf..8641e990aac99 100644
--- a/apps/meteor/client/hooks/useLivechatInquiryStore.ts
+++ b/apps/meteor/client/hooks/useLivechatInquiryStore.ts
@@ -1,10 +1,12 @@
 import type { ILivechatInquiryRecord, IRoom } from '@rocket.chat/core-typings';
 import { create } from 'zustand';
 
+export type LivechatInquiryLocalRecord = ILivechatInquiryRecord & { alert?: boolean };
+
 export const useLivechatInquiryStore = create<{
-	records: (ILivechatInquiryRecord & { alert?: boolean })[];
-	add: (record: ILivechatInquiryRecord & { alert?: boolean }) => void;
-	merge: (record: ILivechatInquiryRecord & { alert?: boolean }) => void;
+	records: LivechatInquiryLocalRecord[];
+	add: (record: LivechatInquiryLocalRecord) => void;
+	merge: (record: LivechatInquiryLocalRecord) => void;
 	discard: (id: ILivechatInquiryRecord['_id']) => void;
 	discardForRoom: (rid: IRoom['_id']) => void;
 	discardAll: () => void;
diff --git a/apps/meteor/client/hooks/useRoomInfoEndpoint.ts b/apps/meteor/client/hooks/useRoomInfoEndpoint.ts
index 6857e2590a069..294dc336fb463 100644
--- a/apps/meteor/client/hooks/useRoomInfoEndpoint.ts
+++ b/apps/meteor/client/hooks/useRoomInfoEndpoint.ts
@@ -9,14 +9,14 @@ import { roomsQueryKeys } from '../lib/queryKeys';
 type UseRoomInfoEndpointOptions<
 	TData = Serialized<{
 		room: IRoom | undefined;
-		parent?: Pick<IRoom, '_id' | 'name' | 'fname' | 't' | 'prid' | 'u' | 'sidepanel'>;
+		parent?: Pick<IRoom, '_id' | 'name' | 'fname' | 't' | 'prid' | 'u'>;
 		team?: Pick<ITeam, 'name' | 'roomId' | 'type' | '_id'>;
 	}>,
 > = Omit<
 	UseQueryOptions<
 		Serialized<{
 			room: IRoom | undefined;
-			parent?: Pick<IRoom, '_id' | 'name' | 'fname' | 't' | 'prid' | 'u' | 'sidepanel'>;
+			parent?: Pick<IRoom, '_id' | 'name' | 'fname' | 't' | 'prid' | 'u'>;
 			team?: Pick<ITeam, 'name' | 'roomId' | 'type' | '_id'>;
 		}>,
 		{ success: boolean; error: string },
@@ -29,7 +29,7 @@ type UseRoomInfoEndpointOptions<
 export const useRoomInfoEndpoint = <
 	TData = Serialized<{
 		room: IRoom | undefined;
-		parent?: Pick<IRoom, '_id' | 'name' | 'fname' | 't' | 'prid' | 'u' | 'sidepanel'>;
+		parent?: Pick<IRoom, '_id' | 'name' | 'fname' | 't' | 'prid' | 'u'>;
 		team?: Pick<ITeam, 'name' | 'roomId' | 'type' | '_id'>;
 	}>,
 >(
diff --git a/apps/meteor/client/hooks/useSidePanelNavigation.ts b/apps/meteor/client/hooks/useSidePanelNavigation.ts
deleted file mode 100644
index f9714580cf064..0000000000000
--- a/apps/meteor/client/hooks/useSidePanelNavigation.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { useBreakpoints } from '@rocket.chat/fuselage-hooks';
-import { useFeaturePreview } from '@rocket.chat/ui-client';
-
-export const useSidePanelNavigation = () => {
-	const isSidepanelFeatureEnabled = useFeaturePreview('sidepanelNavigation');
-	// ["xs", "sm", "md", "lg", "xl", xxl"]
-	return useSidePanelNavigationScreenSize() && isSidepanelFeatureEnabled;
-};
-
-export const useSidePanelNavigationScreenSize = () => {
-	const breakpoints = useBreakpoints();
-	// ["xs", "sm", "md", "lg", "xl", xxl"]
-	return breakpoints.includes('lg');
-};
diff --git a/apps/meteor/client/hooks/useSortQueryOptions.spec.tsx b/apps/meteor/client/hooks/useSortQueryOptions.spec.tsx
deleted file mode 100644
index 26128508f2216..0000000000000
--- a/apps/meteor/client/hooks/useSortQueryOptions.spec.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import { mockAppRoot } from '@rocket.chat/mock-providers';
-import { renderHook } from '@testing-library/react';
-
-import { useSortQueryOptions } from './useSortQueryOptions';
-
-it("should return query option to sort by last message when user preference is 'activity'", () => {
-	const { result } = renderHook(() => useSortQueryOptions(), {
-		wrapper: mockAppRoot().withUserPreference('sidebarSortby', 'activity').build(),
-	});
-	expect(result.current.sort).toHaveProperty('lm', -1);
-});
-
-it("should return query option to sort by name when user preference is 'name'", () => {
-	const { result } = renderHook(() => useSortQueryOptions(), {
-		wrapper: mockAppRoot().withUserPreference('sidebarSortby', 'name').build(),
-	});
-	expect(result.current.sort).toHaveProperty('lowerCaseName', 1);
-});
-
-it("should return query option to sort by fname when user preference is 'name' and showRealName is true", () => {
-	const { result } = renderHook(() => useSortQueryOptions(), {
-		wrapper: mockAppRoot().withUserPreference('sidebarSortby', 'name').withSetting('UI_Use_Real_Name', true).build(),
-	});
-	expect(result.current.sort).toHaveProperty('lowerCaseFName', 1);
-});
diff --git a/apps/meteor/client/hooks/useSortQueryOptions.ts b/apps/meteor/client/hooks/useSortQueryOptions.ts
deleted file mode 100644
index e65c6f9411f92..0000000000000
--- a/apps/meteor/client/hooks/useSortQueryOptions.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { useUserPreference, useSetting } from '@rocket.chat/ui-contexts';
-import { useMemo } from 'react';
-
-export const useSortQueryOptions = (): {
-	sort:
-		| {
-				lm?: -1 | 1 | undefined;
-		  }
-		| {
-				lowerCaseFName: -1 | 1;
-				lm?: -1 | 1 | undefined;
-		  }
-		| {
-				lowerCaseName: -1 | 1;
-				lm?: -1 | 1 | undefined;
-		  };
-} => {
-	const sortBy = useUserPreference('sidebarSortby');
-	const showRealName = useSetting('UI_Use_Real_Name');
-
-	return useMemo(
-		() => ({
-			sort: {
-				...(sortBy === 'activity' && { lm: -1 }),
-				...(sortBy !== 'activity' && {
-					...(showRealName ? { lowerCaseFName: 1 } : { lowerCaseName: 1 }),
-				}),
-			},
-		}),
-		[sortBy, showRealName],
-	);
-};
diff --git a/apps/meteor/client/lib/RoomManager.ts b/apps/meteor/client/lib/RoomManager.ts
index a7933f50ec595..cbdeb6f0f0843 100644
--- a/apps/meteor/client/lib/RoomManager.ts
+++ b/apps/meteor/client/lib/RoomManager.ts
@@ -56,8 +56,6 @@ export const RoomManager = new (class RoomManager extends Emitter<{
 
 	private rooms: Map<IRoom['_id'], RoomStore> = new Map();
 
-	private parentRid?: IRoom['_id'] | undefined;
-
 	constructor() {
 		super();
 		debugRoomManager &&
@@ -81,13 +79,6 @@ export const RoomManager = new (class RoomManager extends Emitter<{
 	}
 
 	get opened(): IRoom['_id'] | undefined {
-		return this.parentRid ?? this.rid;
-	}
-
-	get openedSecondLevel(): IRoom['_id'] | undefined {
-		if (!this.parentRid) {
-			return undefined;
-		}
 		return this.rid;
 	}
 
@@ -116,7 +107,7 @@ export const RoomManager = new (class RoomManager extends Emitter<{
 		this.emit('changed', this.rid);
 	}
 
-	private _open(rid: IRoom['_id'], parent?: IRoom['_id']): void {
+	open(rid: IRoom['_id']): void {
 		if (rid === this.rid) {
 			return;
 		}
@@ -125,19 +116,10 @@ export const RoomManager = new (class RoomManager extends Emitter<{
 			this.rooms.set(rid, new RoomStore(rid));
 		}
 		this.rid = rid;
-		this.parentRid = parent;
 		this.emit('opened', this.rid);
 		this.emit('changed', this.rid);
 	}
 
-	open(rid: IRoom['_id']): void {
-		this._open(rid);
-	}
-
-	openSecondLevel(parentId: IRoom['_id'], rid: IRoom['_id']): void {
-		this._open(rid, parentId);
-	}
-
 	getStore(rid: IRoom['_id']): RoomStore | undefined {
 		return this.rooms.get(rid);
 	}
@@ -148,11 +130,6 @@ const subscribeOpenedRoom = [
 	(): IRoom['_id'] | undefined => RoomManager.opened,
 ] as const;
 
-const subscribeOpenedSecondLevelRoom = [
-	(callback: () => void): (() => void) => RoomManager.on('changed', callback),
-	(): IRoom['_id'] | undefined => RoomManager.openedSecondLevel,
-] as const;
-
 export const useOpenedRoom = (): IRoom['_id'] | undefined => useSyncExternalStore(...subscribeOpenedRoom);
 
 export const useOpenedRoomUnreadSince = (): Date | undefined => {
@@ -170,5 +147,3 @@ export const useOpenedRoomUnreadSince = (): Date | undefined => {
 
 	return useSyncExternalStore(subscribe, getSnapshotValue);
 };
-
-export const useSecondLevelOpenedRoom = (): IRoom['_id'] | undefined => useSyncExternalStore(...subscribeOpenedSecondLevelRoom);
diff --git a/apps/meteor/client/lib/constants.ts b/apps/meteor/client/lib/constants.ts
index 89052eea93acb..d144e03fec2ef 100644
--- a/apps/meteor/client/lib/constants.ts
+++ b/apps/meteor/client/lib/constants.ts
@@ -1,3 +1,4 @@
 export const USER_STATUS_TEXT_MAX_LENGTH = 120;
 export const BIO_TEXT_MAX_LENGTH = 260;
 export const VIDEOCONF_STACK_MAX_USERS = 6;
+export const NAVIGATION_REGION_ID = 'navigation-region';
diff --git a/apps/meteor/client/omnichannel/hooks/useOmnichannelPrioritiesConfig.ts b/apps/meteor/client/omnichannel/hooks/useOmnichannelPrioritiesConfig.ts
new file mode 100644
index 0000000000000..dd9823613a7d8
--- /dev/null
+++ b/apps/meteor/client/omnichannel/hooks/useOmnichannelPrioritiesConfig.ts
@@ -0,0 +1,64 @@
+import { LivechatPriorityWeight } from '@rocket.chat/core-typings';
+import { Palette } from '@rocket.chat/fuselage';
+import type { Keys } from '@rocket.chat/icons';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { useOmnichannelPriorities } from './useOmnichannelPriorities';
+
+type PrioritiesConfig = { iconName: Keys; color?: string; variant?: 'secondary-danger' | 'secondary-warning' | 'secondary-info' };
+
+export const PRIORITIES_CONFIG: Record<number, PrioritiesConfig> = {
+	[LivechatPriorityWeight.NOT_SPECIFIED]: {
+		iconName: 'circle-unfilled',
+	},
+	[LivechatPriorityWeight.HIGHEST]: {
+		iconName: 'chevron-double-up',
+		color: Palette.badge['badge-background-level-4'].toString(),
+		variant: 'secondary-danger',
+	},
+	[LivechatPriorityWeight.HIGH]: {
+		iconName: 'chevron-up',
+		color: Palette.badge['badge-background-level-4'].toString(),
+		variant: 'secondary-danger',
+	},
+	[LivechatPriorityWeight.MEDIUM]: {
+		iconName: 'equal',
+		color: Palette.badge['badge-background-level-3'].toString(),
+		variant: 'secondary-warning',
+	},
+	[LivechatPriorityWeight.LOW]: {
+		iconName: 'chevron-down',
+		color: Palette.badge['badge-background-level-2'].toString(),
+		variant: 'secondary-info',
+	},
+	[LivechatPriorityWeight.LOWEST]: {
+		iconName: 'chevron-double-down',
+		color: Palette.badge['badge-background-level-2'].toString(),
+		variant: 'secondary-info',
+	},
+};
+
+export const useOmnichannelPrioritiesConfig = (level: LivechatPriorityWeight, showUnprioritized: boolean) => {
+	const { t } = useTranslation();
+
+	const { iconName, color, variant } = PRIORITIES_CONFIG[level];
+	const { data: priorities } = useOmnichannelPriorities();
+
+	const name = useMemo(() => {
+		const { _id, dirty, name, i18n } = priorities.find((p) => p.sortItem === level) || {};
+
+		if (!_id) {
+			return '';
+		}
+
+		return dirty ? name : t(i18n as TranslationKey);
+	}, [level, priorities, t]);
+
+	if (!showUnprioritized && level === LivechatPriorityWeight.NOT_SPECIFIED) {
+		return null;
+	}
+
+	return { iconName, name, color, variant };
+};
diff --git a/apps/meteor/client/omnichannel/hooks/useOmnichannelPrioritiesMenu.tsx b/apps/meteor/client/omnichannel/hooks/useOmnichannelPrioritiesMenu.tsx
index 7c8759c42241a..3ccfd5d12bea0 100644
--- a/apps/meteor/client/omnichannel/hooks/useOmnichannelPrioritiesMenu.tsx
+++ b/apps/meteor/client/omnichannel/hooks/useOmnichannelPrioritiesMenu.tsx
@@ -6,8 +6,8 @@ import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { useOmnichannelPriorities } from './useOmnichannelPriorities';
+import { PRIORITIES_CONFIG } from './useOmnichannelPrioritiesConfig';
 import { roomsQueryKeys } from '../../lib/queryKeys';
-import { PRIORITY_ICONS } from '../priorities/PriorityIcon';
 
 export const useOmnichannelPrioritiesMenu = (rid: IRoom['_id']) => {
 	const { t } = useTranslation();
@@ -30,8 +30,8 @@ export const useOmnichannelPrioritiesMenu = (rid: IRoom['_id']) => {
 
 		const unprioritizedOption = {
 			id: 'unprioritized',
-			icon: PRIORITY_ICONS[LivechatPriorityWeight.NOT_SPECIFIED].iconName,
-			iconColor: PRIORITY_ICONS[LivechatPriorityWeight.NOT_SPECIFIED].color,
+			icon: PRIORITIES_CONFIG[LivechatPriorityWeight.NOT_SPECIFIED].iconName,
+			iconColor: PRIORITIES_CONFIG[LivechatPriorityWeight.NOT_SPECIFIED].color,
 			content: t('Unprioritized'),
 			onClick: handlePriorityChange(''),
 		};
@@ -41,8 +41,8 @@ export const useOmnichannelPrioritiesMenu = (rid: IRoom['_id']) => {
 
 			return {
 				id: priorityId,
-				icon: PRIORITY_ICONS[sortItem].iconName,
-				iconColor: PRIORITY_ICONS[sortItem].color,
+				icon: PRIORITIES_CONFIG[sortItem].iconName,
+				iconColor: PRIORITIES_CONFIG[sortItem].color,
 				content: label,
 				onClick: handlePriorityChange(priorityId),
 			};
diff --git a/apps/meteor/client/omnichannel/priorities/PriorityIcon.tsx b/apps/meteor/client/omnichannel/priorities/PriorityIcon.tsx
index e41ef88a24150..ebce3561a5661 100644
--- a/apps/meteor/client/omnichannel/priorities/PriorityIcon.tsx
+++ b/apps/meteor/client/omnichannel/priorities/PriorityIcon.tsx
@@ -1,62 +1,20 @@
-import { LivechatPriorityWeight } from '@rocket.chat/core-typings';
-import { Icon, Palette } from '@rocket.chat/fuselage';
-import type { Keys } from '@rocket.chat/icons';
-import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import type { LivechatPriorityWeight } from '@rocket.chat/core-typings';
+import { Icon } from '@rocket.chat/fuselage';
 import type { ComponentProps, ReactElement } from 'react';
-import { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
 
-import { useOmnichannelPriorities } from '../hooks/useOmnichannelPriorities';
+import { useOmnichannelPrioritiesConfig } from '../hooks/useOmnichannelPrioritiesConfig';
 
 type PriorityIconProps = Omit<ComponentProps<typeof Icon>, 'name' | 'color'> & {
 	level: LivechatPriorityWeight;
 	showUnprioritized?: boolean;
 };
 
-export const PRIORITY_ICONS: Record<number, { iconName: Keys; color?: string }> = {
-	[LivechatPriorityWeight.NOT_SPECIFIED]: {
-		iconName: 'circle-unfilled',
-	},
-	[LivechatPriorityWeight.HIGHEST]: {
-		iconName: 'chevron-double-up',
-		color: Palette.badge['badge-background-level-4'].toString(),
-	},
-	[LivechatPriorityWeight.HIGH]: {
-		iconName: 'chevron-up',
-		color: Palette.badge['badge-background-level-4'].toString(),
-	},
-	[LivechatPriorityWeight.MEDIUM]: {
-		iconName: 'equal',
-		color: Palette.badge['badge-background-level-3'].toString(),
-	},
-	[LivechatPriorityWeight.LOW]: {
-		iconName: 'chevron-down',
-		color: Palette.badge['badge-background-level-2'].toString(),
-	},
-	[LivechatPriorityWeight.LOWEST]: {
-		iconName: 'chevron-double-down',
-		color: Palette.badge['badge-background-level-2'].toString(),
-	},
-};
-
 export const PriorityIcon = ({ level, size = 20, showUnprioritized = false, ...props }: PriorityIconProps): ReactElement | null => {
-	const { t } = useTranslation();
-	const { iconName, color } = PRIORITY_ICONS[level] || {};
-	const { data: priorities } = useOmnichannelPriorities();
-
-	const name = useMemo(() => {
-		const { _id, dirty, name, i18n } = priorities.find((p) => p.sortItem === level) || {};
-
-		if (!_id) {
-			return '';
-		}
-
-		return dirty ? name : t(i18n as TranslationKey);
-	}, [level, priorities, t]);
+	const prioritiesConfig = useOmnichannelPrioritiesConfig(level, showUnprioritized);
 
-	if (!showUnprioritized && level === LivechatPriorityWeight.NOT_SPECIFIED) {
+	if (!prioritiesConfig) {
 		return null;
 	}
 
-	return iconName ? <Icon {...props} name={iconName} color={color} size={size} title={name} /> : null;
+	return <Icon {...props} name={prioritiesConfig.iconName} color={prioritiesConfig.color} size={size} title={prioritiesConfig.name} />;
 };
diff --git a/apps/meteor/client/sidebar/SidebarPortal.tsx b/apps/meteor/client/portals/SidebarPortal/SidebarPortal.tsx
similarity index 100%
rename from apps/meteor/client/sidebar/SidebarPortal.tsx
rename to apps/meteor/client/portals/SidebarPortal/SidebarPortal.tsx
diff --git a/apps/meteor/client/portals/SidebarPortal/SidebarPortalV2.tsx b/apps/meteor/client/portals/SidebarPortal/SidebarPortalV2.tsx
new file mode 100644
index 0000000000000..9160b205b426a
--- /dev/null
+++ b/apps/meteor/client/portals/SidebarPortal/SidebarPortalV2.tsx
@@ -0,0 +1,39 @@
+import { Box, AnimatedVisibility } from '@rocket.chat/fuselage';
+import { useLayout } from '@rocket.chat/ui-contexts';
+import type { ReactNode } from 'react';
+import { memo, useEffect } from 'react';
+import { createPortal } from 'react-dom';
+
+import { NAVIGATION_REGION_ID } from '../../lib/constants';
+
+type SidebarPortalProps = { children?: ReactNode };
+
+const SidebarPortal = ({ children }: SidebarPortalProps) => {
+	const sidebarRoot = document.getElementById(NAVIGATION_REGION_ID);
+	const { sidebar } = useLayout();
+
+	useEffect(() => {
+		if (sidebarRoot) {
+			sidebar.setOverlayed(true);
+		}
+
+		return () => sidebar.setOverlayed(false);
+	}, [sidebar, sidebarRoot]);
+
+	if (!sidebarRoot) {
+		return null;
+	}
+
+	return (
+		<>
+			{createPortal(
+				<AnimatedVisibility visibility={AnimatedVisibility.UNHIDING}>
+					<Box className='rcx-sidebar flex-nav'>{children}</Box>
+				</AnimatedVisibility>,
+				sidebarRoot,
+			)}
+		</>
+	);
+};
+
+export default memo(SidebarPortal);
diff --git a/apps/meteor/client/portals/SidebarPortal/index.tsx b/apps/meteor/client/portals/SidebarPortal/index.tsx
new file mode 100644
index 0000000000000..e5b6daaf1964a
--- /dev/null
+++ b/apps/meteor/client/portals/SidebarPortal/index.tsx
@@ -0,0 +1,20 @@
+import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '@rocket.chat/ui-client';
+import type { ReactNode } from 'react';
+
+import SidebarPortalV1 from './SidebarPortal';
+import SidebarPortalV2 from './SidebarPortalV2';
+
+const SidebarPortal = ({ children }: { children: ReactNode }) => {
+	return (
+		<FeaturePreview feature='newNavigation'>
+			<FeaturePreviewOff>
+				<SidebarPortalV1 children={children} />
+			</FeaturePreviewOff>
+			<FeaturePreviewOn>
+				<SidebarPortalV2 children={children} />
+			</FeaturePreviewOn>
+		</FeaturePreview>
+	);
+};
+
+export default SidebarPortal;
diff --git a/apps/meteor/client/providers/LayoutProvider.tsx b/apps/meteor/client/providers/LayoutProvider.tsx
index 92b5b5d7871ff..9623e17018cef 100644
--- a/apps/meteor/client/providers/LayoutProvider.tsx
+++ b/apps/meteor/client/providers/LayoutProvider.tsx
@@ -18,6 +18,8 @@ type LayoutProviderProps = {
 const LayoutProvider = ({ children }: LayoutProviderProps) => {
 	const showTopNavbarEmbeddedLayout = useSetting('UI_Show_top_navbar_embedded_layout', false);
 	const [isCollapsed, setIsCollapsed] = useState(false);
+	const [displaySidePanel, setDisplaySidePanel] = useState(true);
+	const [overlayed, setOverlayed] = useState(false);
 	const [navBarSearchExpanded, setNavBarSearchExpanded] = useState(false);
 	const breakpoints = useBreakpoints(); // ["xs", "sm", "md", "lg", "xl", xxl"]
 	const [hiddenActions, setHiddenActions] = useState(hiddenActionsDefaultValue);
@@ -31,6 +33,7 @@ const LayoutProvider = ({ children }: LayoutProviderProps) => {
 	const isTablet = !breakpoints.includes('lg');
 
 	const shouldToggle = enhancedNavigationEnabled ? isTablet || isMobile : isMobile;
+	const shouldDisplaySidePanel = !isTablet || displaySidePanel;
 
 	useEffect(() => {
 		setIsCollapsed(shouldToggle);
@@ -63,14 +66,21 @@ const LayoutProvider = ({ children }: LayoutProviderProps) => {
 						collapseSearch: isMobile ? () => setNavBarSearchExpanded(false) : undefined,
 					},
 					sidebar: {
+						overlayed,
+						setOverlayed,
 						isCollapsed,
 						toggle: shouldToggle ? () => setIsCollapsed((isCollapsed) => !isCollapsed) : () => undefined,
 						collapse: () => setIsCollapsed(true),
 						expand: () => setIsCollapsed(false),
 						close: () => (isEmbedded ? setIsCollapsed(true) : router.navigate('/home')),
 					},
+					sidePanel: {
+						displaySidePanel: shouldDisplaySidePanel,
+						closeSidePanel: () => setDisplaySidePanel(false),
+						openSidePanel: () => setDisplaySidePanel(true),
+					},
 					size: {
-						sidebar: '240px',
+						sidebar: isTablet ? '280px' : '240px',
 						// eslint-disable-next-line no-nested-ternary
 						contextualBar: breakpoints.includes('sm') ? (breakpoints.includes('xl') ? '38%' : '380px') : '100%',
 					},
@@ -83,11 +93,13 @@ const LayoutProvider = ({ children }: LayoutProviderProps) => {
 				[
 					isMobile,
 					isTablet,
-					navBarSearchExpanded,
 					isEmbedded,
 					showTopNavbarEmbeddedLayout,
+					navBarSearchExpanded,
+					overlayed,
 					isCollapsed,
 					shouldToggle,
+					shouldDisplaySidePanel,
 					breakpoints,
 					hiddenActions,
 					router,
diff --git a/apps/meteor/client/sidebar/RoomMenu.tsx b/apps/meteor/client/sidebar/RoomMenu.tsx
index ea0bacccfef40..694dbd892ad78 100644
--- a/apps/meteor/client/sidebar/RoomMenu.tsx
+++ b/apps/meteor/client/sidebar/RoomMenu.tsx
@@ -4,7 +4,7 @@ import { useLayout, useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import { memo } from 'react';
 
-import { useRoomMenuActions } from '../hooks/useRoomMenuActions';
+import { useRoomMenuActions } from './hooks/useRoomMenuActions';
 
 type RoomMenuProps = {
 	rid: string;
diff --git a/apps/meteor/client/hooks/useRoomMenuActions.ts b/apps/meteor/client/sidebar/hooks/useRoomMenuActions.ts
similarity index 87%
rename from apps/meteor/client/hooks/useRoomMenuActions.ts
rename to apps/meteor/client/sidebar/hooks/useRoomMenuActions.ts
index 86c2727facea5..f43569310b9d8 100644
--- a/apps/meteor/client/hooks/useRoomMenuActions.ts
+++ b/apps/meteor/client/sidebar/hooks/useRoomMenuActions.ts
@@ -4,11 +4,11 @@ import { usePermission, useSetting, useUserSubscription } from '@rocket.chat/ui-
 import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { useLeaveRoomAction } from './menuActions/useLeaveRoom';
-import { useToggleFavoriteAction } from './menuActions/useToggleFavoriteAction';
-import { useToggleReadAction } from './menuActions/useToggleReadAction';
-import { useHideRoomAction } from './useHideRoomAction';
-import { useOmnichannelPrioritiesMenu } from '../omnichannel/hooks/useOmnichannelPrioritiesMenu';
+import { useLeaveRoomAction } from '../../hooks/menuActions/useLeaveRoom';
+import { useToggleFavoriteAction } from '../../hooks/menuActions/useToggleFavoriteAction';
+import { useToggleReadAction } from '../../hooks/menuActions/useToggleReadAction';
+import { useHideRoomAction } from '../../hooks/useHideRoomAction';
+import { useOmnichannelPrioritiesMenu } from '../../omnichannel/hooks/useOmnichannelPrioritiesMenu';
 
 type RoomMenuActionsProps = {
 	rid: string;
diff --git a/apps/meteor/client/sidebarv2/Item/Condensed.stories.tsx b/apps/meteor/client/sidebarv2/Item/Condensed.stories.tsx
deleted file mode 100644
index 3b819e2644acd..0000000000000
--- a/apps/meteor/client/sidebarv2/Item/Condensed.stories.tsx
+++ /dev/null
@@ -1,72 +0,0 @@
-import { Box, IconButton } from '@rocket.chat/fuselage';
-import { UserAvatar } from '@rocket.chat/ui-avatar';
-import { action } from '@storybook/addon-actions';
-import type { Meta, StoryFn } from '@storybook/react';
-
-import Condensed from './Condensed';
-import * as Status from '../../components/UserStatus';
-
-export default {
-	title: 'SidebarV2/Condensed',
-	component: Condensed,
-	args: {
-		clickable: true,
-		title: 'John Doe',
-	},
-	decorators: [
-		(fn) => (
-			<Box maxWidth='x300' bg='dark' borderRadius='x4'>
-				{fn()}
-			</Box>
-		),
-	],
-} satisfies Meta<typeof Condensed>;
-
-const Template: StoryFn<typeof Condensed> = (args) => (
-	<Condensed
-		{...args}
-		titleIcon={
-			<Box mi={4}>
-				<Status.Online />
-			</Box>
-		}
-		avatar={<UserAvatar username='john.doe' size='x16' url='https://via.placeholder.com/16' />}
-	/>
-);
-
-export const Normal = Template.bind({});
-
-export const Selected = Template.bind({});
-Selected.args = {
-	selected: true,
-};
-
-export const Menu = Template.bind({});
-Menu.args = {
-	menuOptions: {
-		hide: {
-			label: { label: 'Hide', icon: 'eye-off' },
-			action: action('action'),
-		},
-		read: {
-			label: { label: 'Mark_read', icon: 'flag' },
-			action: action('action'),
-		},
-		favorite: {
-			label: { label: 'Favorite', icon: 'star' },
-			action: action('action'),
-		},
-	},
-};
-
-export const Actions = Template.bind({});
-Actions.args = {
-	actions: (
-		<>
-			<IconButton secondary success icon='phone' />
-			<IconButton secondary danger icon='circle-cross' />
-			<IconButton secondary info icon='trash' />
-			<IconButton secondary icon='phone' />
-		</>
-	),
-};
diff --git a/apps/meteor/client/sidebarv2/Item/Extended.stories.tsx b/apps/meteor/client/sidebarv2/Item/Extended.stories.tsx
deleted file mode 100644
index 5822c77d20233..0000000000000
--- a/apps/meteor/client/sidebarv2/Item/Extended.stories.tsx
+++ /dev/null
@@ -1,87 +0,0 @@
-import { Box, IconButton, Badge } from '@rocket.chat/fuselage';
-import { UserAvatar } from '@rocket.chat/ui-avatar';
-import { action } from '@storybook/addon-actions';
-import type { Meta, StoryFn } from '@storybook/react';
-
-import Extended from './Extended';
-import * as Status from '../../components/UserStatus';
-
-export default {
-	title: 'SidebarV2/Extended',
-	component: Extended,
-	decorators: [
-		(fn) => (
-			<Box maxWidth='x300' bg='dark' borderRadius='x4'>
-				{fn()}
-			</Box>
-		),
-	],
-} satisfies Meta<typeof Extended>;
-
-const Template: StoryFn<typeof Extended> = (args) => (
-	<Extended
-		{...args}
-		title='John Doe'
-		subtitle={
-			<Box display='flex' flexDirection='row' w='full' alignItems='center'>
-				<Box flexGrow='1' withTruncatedText>
-					John Doe: test 123
-				</Box>
-				<Badge
-					{...({
-						style: {
-							backgroundColor: '#6c727a',
-							color: 'var(--rcx-color-surface, white)',
-							flexShrink: 0,
-						},
-					} as any)}
-				>
-					99
-				</Badge>
-			</Box>
-		}
-		titleIcon={
-			<Box mi={4}>
-				<Status.Online />
-			</Box>
-		}
-		avatar={<UserAvatar username='john.doe' size='x16' url='https://via.placeholder.com/16' />}
-	/>
-);
-
-export const Normal = Template.bind({});
-
-export const Selected = Template.bind({});
-Selected.args = {
-	selected: true,
-};
-
-export const Menu = Template.bind({});
-Menu.args = {
-	menuOptions: {
-		hide: {
-			label: { label: 'Hide', icon: 'eye-off' },
-			action: action('action'),
-		},
-		read: {
-			label: { label: 'Mark_read', icon: 'flag' },
-			action: action('action'),
-		},
-		favorite: {
-			label: { label: 'Favorite', icon: 'star' },
-			action: action('action'),
-		},
-	},
-};
-
-export const Actions = Template.bind({});
-Actions.args = {
-	actions: (
-		<>
-			<IconButton secondary success icon='phone' />
-			<IconButton secondary danger icon='circle-cross' />
-			<IconButton secondary info icon='trash' />
-			<IconButton secondary icon='phone' />
-		</>
-	),
-};
diff --git a/apps/meteor/client/sidebarv2/Item/Medium.stories.tsx b/apps/meteor/client/sidebarv2/Item/Medium.stories.tsx
deleted file mode 100644
index 7294d62bdae8c..0000000000000
--- a/apps/meteor/client/sidebarv2/Item/Medium.stories.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import { Box, IconButton } from '@rocket.chat/fuselage';
-import { UserAvatar } from '@rocket.chat/ui-avatar';
-import { action } from '@storybook/addon-actions';
-import type { Meta, StoryFn } from '@storybook/react';
-
-import Medium from './Medium';
-import * as Status from '../../components/UserStatus';
-
-export default {
-	title: 'SidebarV2/Medium',
-	component: Medium,
-	args: {
-		title: 'John Doe',
-	},
-	decorators: [
-		(fn) => (
-			<Box maxWidth='x300' bg='dark' borderRadius='x4'>
-				{fn()}
-			</Box>
-		),
-	],
-} satisfies Meta<typeof Medium>;
-
-const Template: StoryFn<typeof Medium> = (args) => (
-	<Medium
-		{...args}
-		titleIcon={
-			<Box mi={4}>
-				<Status.Online />
-			</Box>
-		}
-		avatar={<UserAvatar username='john.doe' size='x16' url='https://via.placeholder.com/16' />}
-	/>
-);
-
-export const Normal = Template.bind({});
-
-export const Selected = Template.bind({});
-Selected.args = {
-	selected: true,
-};
-
-export const Menu = Template.bind({});
-Menu.args = {
-	menuOptions: {
-		hide: {
-			label: { label: 'Hide', icon: 'eye-off' },
-			action: action('action'),
-		},
-		read: {
-			label: { label: 'Mark_read', icon: 'flag' },
-			action: action('action'),
-		},
-		favorite: {
-			label: { label: 'Favorite', icon: 'star' },
-			action: action('action'),
-		},
-	},
-};
-
-export const Actions = Template.bind({});
-Actions.args = {
-	actions: (
-		<>
-			<IconButton secondary success icon='phone' />
-			<IconButton secondary danger icon='circle-cross' />
-			<IconButton secondary info icon='trash' />
-			<IconButton secondary icon='phone' />
-		</>
-	),
-};
diff --git a/apps/meteor/client/sidebarv2/Item/Medium.tsx b/apps/meteor/client/sidebarv2/Item/Medium.tsx
deleted file mode 100644
index f26d64b983891..0000000000000
--- a/apps/meteor/client/sidebarv2/Item/Medium.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import { IconButton, SidebarV2Item, SidebarV2ItemAvatarWrapper, SidebarV2ItemMenu, SidebarV2ItemTitle } from '@rocket.chat/fuselage';
-import type { HTMLAttributes, ReactNode } from 'react';
-import { memo, useState } from 'react';
-
-type MediumProps = {
-	title: ReactNode;
-	titleIcon?: ReactNode;
-	avatar: ReactNode;
-	icon?: ReactNode;
-	actions?: ReactNode;
-	href?: string;
-	unread?: boolean;
-	menu?: () => ReactNode;
-	badges?: ReactNode;
-	selected?: boolean;
-	menuOptions?: any;
-} & Omit<HTMLAttributes<HTMLElement>, 'is'>;
-
-const Medium = ({ icon, title, avatar, actions, badges, unread, menu, ...props }: MediumProps) => {
-	const [menuVisibility, setMenuVisibility] = useState(!!window.DISABLE_ANIMATION);
-
-	const handleFocus = () => setMenuVisibility(true);
-	const handlePointerEnter = () => setMenuVisibility(true);
-
-	return (
-		<SidebarV2Item {...props} onFocus={handleFocus} onPointerEnter={handlePointerEnter}>
-			<SidebarV2ItemAvatarWrapper>{avatar}</SidebarV2ItemAvatarWrapper>
-			{icon}
-			<SidebarV2ItemTitle unread={unread}>{title}</SidebarV2ItemTitle>
-			{badges}
-			{actions}
-			{menu && (
-				<SidebarV2ItemMenu>
-					{menuVisibility ? menu() : <IconButton tabIndex={-1} aria-hidden mini rcx-sidebar-v2-item__menu icon='kebab' />}
-				</SidebarV2ItemMenu>
-			)}
-		</SidebarV2Item>
-	);
-};
-
-export default memo(Medium);
diff --git a/apps/meteor/client/sidebarv2/RoomList/OmnichannelFilters.tsx b/apps/meteor/client/sidebarv2/RoomList/OmnichannelFilters.tsx
new file mode 100644
index 0000000000000..03477d54a3d26
--- /dev/null
+++ b/apps/meteor/client/sidebarv2/RoomList/OmnichannelFilters.tsx
@@ -0,0 +1,34 @@
+import { Box, Divider } from '@rocket.chat/fuselage';
+import { usePermission, useSetting } from '@rocket.chat/ui-contexts';
+import { useTranslation } from 'react-i18next';
+
+import RoomListFiltersItem from './RoomListFiltersItem';
+import { useHasLicenseModule } from '../../hooks/useHasLicenseModule';
+import { sidePanelFiltersConfig } from '../../views/navigation/contexts/RoomsNavigationContext';
+
+const OmnichannelFilters = () => {
+	const { t } = useTranslation();
+	const hasModule = useHasLicenseModule('livechat-enterprise');
+	const hasAccess = usePermission('view-l-room');
+	const canViewOmnichannelQueue = usePermission('view-livechat-queue');
+	const queueEnabled = useSetting('Livechat_waiting_queue');
+
+	if (!hasAccess) {
+		return null;
+	}
+
+	return (
+		<>
+			<Box role='tablist' aria-label={t('Omnichannel_filters')} aria-orientation='vertical'>
+				<RoomListFiltersItem group='inProgress' icon={sidePanelFiltersConfig.inProgress.icon} />
+				{hasModule && queueEnabled && canViewOmnichannelQueue && (
+					<RoomListFiltersItem group='queue' icon={sidePanelFiltersConfig.queue.icon} />
+				)}
+				{hasModule && <RoomListFiltersItem group='onHold' icon={sidePanelFiltersConfig.onHold.icon} />}
+			</Box>
+			<Divider borderColor='stroke-light' mb={4} mi={16} />
+		</>
+	);
+};
+
+export default OmnichannelFilters;
diff --git a/apps/meteor/client/sidebarv2/RoomList/RoomList.tsx b/apps/meteor/client/sidebarv2/RoomList/RoomList.tsx
index 518a78033e28e..8e2e43befbf63 100644
--- a/apps/meteor/client/sidebarv2/RoomList/RoomList.tsx
+++ b/apps/meteor/client/sidebarv2/RoomList/RoomList.tsx
@@ -1,47 +1,36 @@
 import { Box } from '@rocket.chat/fuselage';
 import { useResizeObserver } from '@rocket.chat/fuselage-hooks';
-import { useUserPreference, useUserId } from '@rocket.chat/ui-contexts';
+import { useUserId } from '@rocket.chat/ui-contexts';
 import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { GroupedVirtuoso } from 'react-virtuoso';
 
 import RoomListCollapser from './RoomListCollapser';
+import RoomsListFilters from './RoomListFilters';
 import RoomListRow from './RoomListRow';
 import RoomListRowWrapper from './RoomListRowWrapper';
 import RoomListWrapper from './RoomListWrapper';
 import { VirtualizedScrollbars } from '../../components/CustomScrollbars';
 import { useOpenedRoom } from '../../lib/RoomManager';
-import { useAvatarTemplate } from '../hooks/useAvatarTemplate';
-import { useCollapsedGroups } from '../hooks/useCollapsedGroups';
+import { useSideBarRoomsList, sidePanelFiltersConfig } from '../../views/navigation/contexts/RoomsNavigationContext';
 import { usePreventDefault } from '../hooks/usePreventDefault';
-import { useRoomList } from '../hooks/useRoomList';
 import { useShortcutOpenMenu } from '../hooks/useShortcutOpenMenu';
-import { useTemplateByViewMode } from '../hooks/useTemplateByViewMode';
 
 const RoomList = () => {
 	const { t } = useTranslation();
 	const isAnonymous = !useUserId();
 
-	const { collapsedGroups, handleClick, handleKeyDown } = useCollapsedGroups();
-	const { groupsCount, groupsList, roomList, groupedUnreadInfo } = useRoomList({ collapsedGroups });
-	const avatarTemplate = useAvatarTemplate();
-	const sideBarItemTemplate = useTemplateByViewMode();
+	const { roomListGroups, groupCounts, collapsedGroups, handleClick, handleKeyDown, totalCount } = useSideBarRoomsList();
 	const { ref } = useResizeObserver<HTMLElement>({ debounceDelay: 100 });
 	const openedRoom = useOpenedRoom() ?? '';
-	const sidebarViewMode = useUserPreference<'extended' | 'medium' | 'condensed'>('sidebarViewMode') || 'extended';
 
-	const extended = sidebarViewMode === 'extended';
 	const itemData = useMemo(
 		() => ({
-			extended,
 			t,
-			SidebarItemTemplate: sideBarItemTemplate,
-			AvatarTemplate: avatarTemplate,
 			openedRoom,
-			sidebarViewMode,
 			isAnonymous,
 		}),
-		[avatarTemplate, extended, isAnonymous, openedRoom, sideBarItemTemplate, sidebarViewMode, t],
+		[isAnonymous, openedRoom, t],
 	);
 
 	usePreventDefault(ref);
@@ -51,20 +40,31 @@ const RoomList = () => {
 		<Box position='relative' overflow='hidden' height='full' ref={ref}>
 			<VirtualizedScrollbars>
 				<GroupedVirtuoso
-					groupCounts={groupsCount}
-					groupContent={(index) => (
-						<RoomListCollapser
-							collapsedGroups={collapsedGroups}
-							onClick={() => handleClick(groupsList[index])}
-							onKeyDown={(e) => handleKeyDown(e, groupsList[index])}
-							groupTitle={groupsList[index]}
-							unreadCount={groupedUnreadInfo[index]}
-						/>
-					)}
-					{...(roomList.length > 0 && {
-						itemContent: (index) => roomList[index] && <RoomListRow data={itemData} item={roomList[index]} />,
+					groupCounts={groupCounts}
+					groupContent={(index) => {
+						const { group, unreadInfo } = roomListGroups[index];
+
+						return (
+							<RoomListCollapser
+								collapsedGroups={collapsedGroups}
+								onClick={() => handleClick(group)}
+								onKeyDown={(e) => handleKeyDown(e, group)}
+								groupTitle={sidePanelFiltersConfig[group].title}
+								group={group}
+								unreadCount={unreadInfo}
+							/>
+						);
+					}}
+					{...(totalCount > 0 && {
+						itemContent: (index, groupIndex) => {
+							const { rooms } = roomListGroups[groupIndex];
+							// Grouped virtuoso index increases linearly, but we're indexing the list by group.
+							// Either we go back to providing a single list, or we do this.
+							const correctedIndex = index - groupCounts.slice(0, groupIndex).reduce((acc, count) => acc + count, 0);
+							return <RoomListRow data={itemData} item={rooms[correctedIndex]} />;
+						},
 					})}
-					components={{ Item: RoomListRowWrapper, List: RoomListWrapper }}
+					components={{ Header: RoomsListFilters, Item: RoomListRowWrapper, List: RoomListWrapper }}
 				/>
 			</VirtualizedScrollbars>
 		</Box>
diff --git a/apps/meteor/client/sidebarv2/RoomList/RoomListCollapser.tsx b/apps/meteor/client/sidebarv2/RoomList/RoomListCollapser.tsx
index 5f868a1e2a166..91862502dd13a 100644
--- a/apps/meteor/client/sidebarv2/RoomList/RoomListCollapser.tsx
+++ b/apps/meteor/client/sidebarv2/RoomList/RoomListCollapser.tsx
@@ -3,24 +3,26 @@ import { Badge, SidebarV2CollapseGroup } from '@rocket.chat/fuselage';
 import type { HTMLAttributes, KeyboardEvent, MouseEventHandler } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import type { AllGroupsKeys } from '../../views/navigation/contexts/RoomsNavigationContext';
 import { useUnreadDisplay } from '../hooks/useUnreadDisplay';
 
 type RoomListCollapserProps = {
+	group: AllGroupsKeys;
 	groupTitle: string;
 	collapsedGroups: string[];
 	onClick: MouseEventHandler<HTMLElement>;
 	onKeyDown: (e: KeyboardEvent) => void;
 	unreadCount: Pick<ISubscription, 'userMentions' | 'groupMentions' | 'unread' | 'tunread' | 'tunreadUser' | 'tunreadGroup'>;
 } & Omit<HTMLAttributes<HTMLElement>, 'onClick' | 'onKeyDown'>;
-const RoomListCollapser = ({ groupTitle, unreadCount: unreadGroupCount, collapsedGroups, ...props }: RoomListCollapserProps) => {
+
+const RoomListCollapser = ({ groupTitle, unreadCount: unreadGroupCount, collapsedGroups, group, ...props }: RoomListCollapserProps) => {
 	const { t } = useTranslation();
 
 	const { unreadTitle, unreadVariant, showUnread, unreadCount } = useUnreadDisplay(unreadGroupCount);
-
 	return (
 		<SidebarV2CollapseGroup
 			title={t(groupTitle)}
-			expanded={!collapsedGroups.includes(groupTitle)}
+			expanded={!collapsedGroups.includes(group)}
 			badge={
 				showUnread ? (
 					<Badge variant={unreadVariant} title={unreadTitle} aria-label={unreadTitle} role='status'>
@@ -28,6 +30,9 @@ const RoomListCollapser = ({ groupTitle, unreadCount: unreadGroupCount, collapse
 					</Badge>
 				) : undefined
 			}
+			aria-label={
+				!collapsedGroups.includes(group) ? t('Collapse_group', { group: t(groupTitle) }) : t('Expand_group', { group: t(groupTitle) })
+			}
 			{...props}
 		/>
 	);
diff --git a/apps/meteor/client/sidebarv2/RoomList/RoomListFilters.tsx b/apps/meteor/client/sidebarv2/RoomList/RoomListFilters.tsx
new file mode 100644
index 0000000000000..fcc2ebfdb14bc
--- /dev/null
+++ b/apps/meteor/client/sidebarv2/RoomList/RoomListFilters.tsx
@@ -0,0 +1,21 @@
+import { Divider, Box } from '@rocket.chat/fuselage';
+import { forwardRef } from 'react';
+import type { Components } from 'react-virtuoso';
+
+import OmnichannelFilters from './OmnichannelFilters';
+import TeamCollabFilters from './TeamCollabFilters';
+import { useOmnichannelEnabled } from '../../hooks/omnichannel/useOmnichannelEnabled';
+
+const RoomListFilters: Components['Header'] = forwardRef(function RoomListWrapper(_, ref) {
+	const showOmnichannel = useOmnichannelEnabled();
+
+	return (
+		<Box ref={ref} display='flex' flexDirection='column'>
+			<TeamCollabFilters />
+			<Divider borderColor='stroke-light' mb={4} mi={16} />
+			{showOmnichannel && <OmnichannelFilters />}
+		</Box>
+	);
+});
+
+export default RoomListFilters;
diff --git a/apps/meteor/client/sidebarv2/RoomList/RoomListFiltersItem.tsx b/apps/meteor/client/sidebarv2/RoomList/RoomListFiltersItem.tsx
new file mode 100644
index 0000000000000..c8bd57cc2e794
--- /dev/null
+++ b/apps/meteor/client/sidebarv2/RoomList/RoomListFiltersItem.tsx
@@ -0,0 +1,49 @@
+import { Icon, SidebarV2Item, SidebarV2ItemIcon, SidebarV2ItemTitle } from '@rocket.chat/fuselage';
+import { useButtonPattern } from '@rocket.chat/fuselage-hooks';
+import type { Keys as IconName } from '@rocket.chat/icons';
+import { memo } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import RoomListFiltersItemBadge from './RoomListFiltersItemBadge';
+import {
+	type SidePanelFiltersKeys,
+	sidePanelFiltersConfig,
+	useSidePanelFilter,
+	useSwitchSidePanelTab,
+} from '../../views/navigation/contexts/RoomsNavigationContext';
+import { useUnreadGroupData } from '../../views/navigation/contexts/RoomsNavigationContext';
+import { useUnreadDisplay } from '../hooks/useUnreadDisplay';
+
+type SidebarFiltersItemProps = {
+	group: SidePanelFiltersKeys;
+	icon: IconName;
+};
+
+const RoomListFiltersItem = ({ group, icon }: SidebarFiltersItemProps) => {
+	const { t } = useTranslation();
+	const switchSidePanelTab = useSwitchSidePanelTab();
+
+	const unreadGroupCount = useUnreadGroupData(group);
+	const buttonProps = useButtonPattern((e) => {
+		e.preventDefault();
+		switchSidePanelTab(group);
+	});
+	const [currentTab] = useSidePanelFilter();
+	const roomTitle = sidePanelFiltersConfig[group].title;
+	const { unreadTitle, showUnread, highlightUnread: highlighted } = useUnreadDisplay(unreadGroupCount);
+
+	return (
+		<SidebarV2Item
+			aria-label={showUnread ? t('__unreadTitle__from__roomTitle__', { unreadTitle, roomTitle }) : roomTitle}
+			selected={group === currentTab}
+			aria-selected={group === currentTab}
+			{...buttonProps}
+		>
+			<SidebarV2ItemIcon highlighted={highlighted} icon={<Icon size='x20' name={icon} />} />
+			<SidebarV2ItemTitle unread={highlighted}>{t(roomTitle)}</SidebarV2ItemTitle>
+			{showUnread && <RoomListFiltersItemBadge roomTitle={roomTitle} unreadGroupCount={unreadGroupCount} />}
+		</SidebarV2Item>
+	);
+};
+
+export default memo(RoomListFiltersItem);
diff --git a/apps/meteor/client/sidebarv2/RoomList/RoomListFiltersItemBadge.tsx b/apps/meteor/client/sidebarv2/RoomList/RoomListFiltersItemBadge.tsx
new file mode 100644
index 0000000000000..c5765e010f1f4
--- /dev/null
+++ b/apps/meteor/client/sidebarv2/RoomList/RoomListFiltersItemBadge.tsx
@@ -0,0 +1,37 @@
+import { SidebarV2ItemBadge } from '@rocket.chat/fuselage';
+import type { SubscriptionWithRoom, TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from 'react-i18next';
+
+import { useUnreadDisplay } from '../hooks/useUnreadDisplay';
+
+type RoomListFiltersItemBadgeProps = {
+	roomTitle: TranslationKey;
+	unreadGroupCount: Pick<
+		SubscriptionWithRoom,
+		'alert' | 'userMentions' | 'unread' | 'tunread' | 'tunreadUser' | 'groupMentions' | 'hideMentionStatus' | 'hideUnreadStatus'
+	>;
+};
+
+/**
+ * TODO: This component can be optimized and used in multiple places.
+ * The usage of the <span> to handle properly the aria label together with the
+ * unread number could be moved to fuselage
+ **/
+
+const RoomListFiltersItemBadge = ({ roomTitle, unreadGroupCount }: RoomListFiltersItemBadgeProps) => {
+	const { t } = useTranslation();
+	const { unreadTitle, unreadVariant, unreadCount } = useUnreadDisplay(unreadGroupCount);
+
+	return (
+		<SidebarV2ItemBadge
+			variant={unreadVariant}
+			title={unreadTitle}
+			role='status'
+			aria-label={t('__unreadTitle__from__roomTitle__', { unreadTitle, roomTitle })}
+		>
+			<span aria-hidden>{unreadCount.total}</span>
+		</SidebarV2ItemBadge>
+	);
+};
+
+export default RoomListFiltersItemBadge;
diff --git a/apps/meteor/client/sidebarv2/RoomList/RoomListRow.tsx b/apps/meteor/client/sidebarv2/RoomList/RoomListRow.tsx
index 832699a092ecc..65c1bd9664b26 100644
--- a/apps/meteor/client/sidebarv2/RoomList/RoomListRow.tsx
+++ b/apps/meteor/client/sidebarv2/RoomList/RoomListRow.tsx
@@ -3,25 +3,19 @@ import { useVideoConfAcceptCall, useVideoConfRejectIncomingCall, useVideoConfInc
 import type { TFunction } from 'i18next';
 import { memo, useMemo } from 'react';
 
-import SidebarItemTemplateWithData from './SidebarItemTemplateWithData';
-import type { useAvatarTemplate } from '../hooks/useAvatarTemplate';
-import type { useTemplateByViewMode } from '../hooks/useTemplateByViewMode';
+import SidebarItemWithData from './SidebarItemWithData';
 
 type RoomListRowProps = {
 	data: {
-		extended: boolean;
 		t: TFunction;
-		SidebarItemTemplate: ReturnType<typeof useTemplateByViewMode>;
-		AvatarTemplate: ReturnType<typeof useAvatarTemplate>;
 		openedRoom: string;
-		sidebarViewMode: 'extended' | 'condensed' | 'medium';
 		isAnonymous: boolean;
 	};
 	item: SubscriptionWithRoom;
 };
 
 const RoomListRow = ({ data, item }: RoomListRowProps) => {
-	const { extended, t, SidebarItemTemplate, AvatarTemplate, openedRoom, sidebarViewMode } = data;
+	const { t } = data;
 
 	const acceptCall = useVideoConfAcceptCall();
 	const rejectCall = useVideoConfRejectIncomingCall();
@@ -37,18 +31,7 @@ const RoomListRow = ({ data, item }: RoomListRowProps) => {
 		[acceptCall, rejectCall, currentCall],
 	);
 
-	return (
-		<SidebarItemTemplateWithData
-			sidebarViewMode={sidebarViewMode}
-			selected={item.rid === openedRoom}
-			t={t}
-			room={item}
-			extended={extended}
-			SidebarItemTemplate={SidebarItemTemplate}
-			AvatarTemplate={AvatarTemplate}
-			videoConfActions={videoConfActions}
-		/>
-	);
+	return <SidebarItemWithData t={t} room={item} videoConfActions={videoConfActions} />;
 };
 
 export default memo(RoomListRow);
diff --git a/apps/meteor/client/sidebarv2/Item/Condensed.tsx b/apps/meteor/client/sidebarv2/RoomList/SidebarItem.tsx
similarity index 57%
rename from apps/meteor/client/sidebarv2/Item/Condensed.tsx
rename to apps/meteor/client/sidebarv2/RoomList/SidebarItem.tsx
index 3c737cc30e7c9..73806479eb43c 100644
--- a/apps/meteor/client/sidebarv2/Item/Condensed.tsx
+++ b/apps/meteor/client/sidebarv2/RoomList/SidebarItem.tsx
@@ -1,23 +1,25 @@
 import { IconButton, SidebarV2Item, SidebarV2ItemAvatarWrapper, SidebarV2ItemMenu, SidebarV2ItemTitle } from '@rocket.chat/fuselage';
-import type { HTMLAttributes, ReactNode } from 'react';
+import { RoomAvatar } from '@rocket.chat/ui-avatar';
+import type { SubscriptionWithRoom } from '@rocket.chat/ui-contexts';
+import type { HTMLAttributes, ReactElement, ReactNode } from 'react';
 import { memo, useState } from 'react';
 
-type CondensedProps = {
+type SidebarItemProps = {
 	title: ReactNode;
 	titleIcon?: ReactNode;
-	avatar: ReactNode;
 	icon?: ReactNode;
 	actions?: ReactNode;
 	href?: string;
 	unread?: boolean;
-	menu?: () => ReactNode;
+	menu?: ReactElement;
 	menuOptions?: any;
 	selected?: boolean;
 	badges?: ReactNode;
 	clickable?: boolean;
+	room: SubscriptionWithRoom;
 } & Omit<HTMLAttributes<HTMLAnchorElement>, 'is'>;
 
-const Condensed = ({ icon, title, avatar, actions, unread, menu, badges, ...props }: CondensedProps) => {
+const SidebarItem = ({ icon, title, actions, unread, menu, badges, room, ...props }: SidebarItemProps) => {
 	const [menuVisibility, setMenuVisibility] = useState(!!window.DISABLE_ANIMATION);
 
 	const handleFocus = () => setMenuVisibility(true);
@@ -25,18 +27,20 @@ const Condensed = ({ icon, title, avatar, actions, unread, menu, badges, ...prop
 
 	return (
 		<SidebarV2Item {...props} onFocus={handleFocus} onPointerEnter={handlePointerEnter}>
-			{avatar && <SidebarV2ItemAvatarWrapper>{avatar}</SidebarV2ItemAvatarWrapper>}
+			<SidebarV2ItemAvatarWrapper>
+				<RoomAvatar size='x20' room={{ ...room, _id: room.rid || room._id, type: room.t }} />
+			</SidebarV2ItemAvatarWrapper>
 			{icon}
 			<SidebarV2ItemTitle unread={unread}>{title}</SidebarV2ItemTitle>
 			{badges}
 			{actions}
 			{menu && (
 				<SidebarV2ItemMenu>
-					{menuVisibility ? menu() : <IconButton tabIndex={-1} aria-hidden mini rcx-sidebar-v2-item__menu icon='kebab' />}
+					{menuVisibility ? menu : <IconButton tabIndex={-1} aria-hidden mini rcx-sidebar-v2-item__menu icon='kebab' />}
 				</SidebarV2ItemMenu>
 			)}
 		</SidebarV2Item>
 	);
 };
 
-export default memo(Condensed);
+export default memo(SidebarItem);
diff --git a/apps/meteor/client/sidebarv2/RoomList/SidebarItemTemplateWithData.tsx b/apps/meteor/client/sidebarv2/RoomList/SidebarItemTemplateWithData.tsx
deleted file mode 100644
index ede253834fc28..0000000000000
--- a/apps/meteor/client/sidebarv2/RoomList/SidebarItemTemplateWithData.tsx
+++ /dev/null
@@ -1,239 +0,0 @@
-import type { IMessage } from '@rocket.chat/core-typings';
-import { isDirectMessageRoom, isMultipleDirectMessageRoom, isOmnichannelRoom, isVideoConfMessage } from '@rocket.chat/core-typings';
-import { SidebarV2Action, SidebarV2Actions, SidebarV2ItemBadge, SidebarV2ItemIcon } from '@rocket.chat/fuselage';
-import type { SubscriptionWithRoom } from '@rocket.chat/ui-contexts';
-import { useLayout } from '@rocket.chat/ui-contexts';
-import type { TFunction } from 'i18next';
-import type { AllHTMLAttributes, ComponentType, ReactElement, ReactNode } from 'react';
-import { memo, useMemo } from 'react';
-
-import { normalizeSidebarMessage } from './normalizeSidebarMessage';
-import { RoomIcon } from '../../components/RoomIcon';
-import { roomCoordinator } from '../../lib/rooms/roomCoordinator';
-import { isIOsDevice } from '../../lib/utils/isIOsDevice';
-import { useOmnichannelPriorities } from '../../omnichannel/hooks/useOmnichannelPriorities';
-import RoomMenu from '../RoomMenu';
-import { OmnichannelBadges } from '../badges/OmnichannelBadges';
-import type { useAvatarTemplate } from '../hooks/useAvatarTemplate';
-import { useUnreadDisplay } from '../hooks/useUnreadDisplay';
-
-export const getMessage = (room: SubscriptionWithRoom, lastMessage: IMessage | undefined, t: TFunction): string | undefined => {
-	if (!lastMessage) {
-		return t('No_messages_yet');
-	}
-	if (isVideoConfMessage(lastMessage)) {
-		return t('Call_started');
-	}
-	if (!lastMessage.u) {
-		return normalizeSidebarMessage(lastMessage, t);
-	}
-	if (lastMessage.u?.username === room.u?.username) {
-		return `${t('You')}: ${normalizeSidebarMessage(lastMessage, t)}`;
-	}
-	if (isDirectMessageRoom(room) && !isMultipleDirectMessageRoom(room)) {
-		return normalizeSidebarMessage(lastMessage, t);
-	}
-	return `${lastMessage.u.name || lastMessage.u.username}: ${normalizeSidebarMessage(lastMessage, t)}`;
-};
-
-type RoomListRowProps = {
-	extended: boolean;
-	t: TFunction;
-	SidebarItemTemplate: ComponentType<
-		{
-			icon: ReactNode;
-			title: ReactNode;
-			avatar: ReactNode;
-			actions: ReactNode;
-			href: string;
-			time?: Date;
-			menu?: () => ReactNode;
-			menuOptions?: unknown;
-			subtitle?: ReactNode;
-			titleIcon?: ReactNode;
-			badges?: ReactNode;
-			threadUnread?: boolean;
-			unread?: boolean;
-			selected?: boolean;
-			is?: string;
-		} & AllHTMLAttributes<HTMLElement>
-	>;
-	AvatarTemplate: ReturnType<typeof useAvatarTemplate>;
-	openedRoom?: string;
-	// sidebarViewMode: 'extended';
-	isAnonymous?: boolean;
-
-	room: SubscriptionWithRoom;
-	id?: string;
-	/* @deprecated */
-	style?: AllHTMLAttributes<HTMLElement>['style'];
-
-	selected?: boolean;
-
-	sidebarViewMode?: unknown;
-	videoConfActions?: {
-		[action: string]: () => void;
-	};
-};
-
-const SidebarItemTemplateWithData = ({
-	room,
-	id,
-	selected,
-	style,
-	extended,
-	SidebarItemTemplate,
-	AvatarTemplate,
-	t,
-	isAnonymous,
-	videoConfActions,
-}: RoomListRowProps) => {
-	const { sidebar } = useLayout();
-
-	const href = roomCoordinator.getRouteLink(room.t, room) || '';
-	const title = roomCoordinator.getRoomName(room.t, room) || '';
-
-	const { unreadTitle, unreadVariant, showUnread, unreadCount, highlightUnread: highlighted } = useUnreadDisplay(room);
-
-	const { lastMessage, unread = 0, alert, rid, t: type, cl } = room;
-
-	const icon = (
-		<SidebarV2ItemIcon
-			highlighted={highlighted}
-			icon={<RoomIcon room={room} placement='sidebar' size='x20' isIncomingCall={Boolean(videoConfActions)} />}
-		/>
-	);
-
-	const actions = useMemo(
-		() =>
-			videoConfActions && (
-				<SidebarV2Actions>
-					<SidebarV2Action onClick={videoConfActions.acceptCall} mini secondary success icon='phone' />
-					<SidebarV2Action onClick={videoConfActions.rejectCall} mini secondary danger icon='phone-off' />
-				</SidebarV2Actions>
-			),
-		[videoConfActions],
-	);
-
-	const isQueued = isOmnichannelRoom(room) && room.status === 'queued';
-	const { enabled: isPriorityEnabled } = useOmnichannelPriorities();
-
-	const message = extended && getMessage(room, lastMessage, t);
-	const subtitle = message ? <span className='message-body--unstyled' dangerouslySetInnerHTML={{ __html: message }} /> : null;
-
-	const badges = (
-		<>
-			{showUnread && (
-				<SidebarV2ItemBadge
-					variant={unreadVariant}
-					title={unreadTitle}
-					role='status'
-					aria-label={t('__unreadTitle__from__roomTitle__', { unreadTitle, roomTitle: title })}
-				>
-					<span aria-hidden>{unreadCount.total}</span>
-				</SidebarV2ItemBadge>
-			)}
-			{isOmnichannelRoom(room) && <OmnichannelBadges room={room} />}
-		</>
-	);
-
-	return (
-		<SidebarItemTemplate
-			is='a'
-			id={id}
-			data-qa='sidebar-item'
-			data-unread={highlighted}
-			unread={highlighted}
-			selected={selected}
-			href={href}
-			onClick={(): void => {
-				!selected && sidebar.toggle();
-			}}
-			aria-label={showUnread ? t('__unreadTitle__from__roomTitle__', { unreadTitle, roomTitle: title }) : title}
-			title={title}
-			time={lastMessage?.ts}
-			subtitle={subtitle}
-			icon={icon}
-			style={style}
-			badges={badges}
-			avatar={AvatarTemplate && <AvatarTemplate {...room} />}
-			actions={actions}
-			menu={
-				!isIOsDevice && !isAnonymous && (!isQueued || (isQueued && isPriorityEnabled))
-					? (): ReactElement => (
-							<RoomMenu
-								alert={alert}
-								threadUnread={unreadCount.threads > 0}
-								rid={rid}
-								unread={!!unread}
-								roomOpen={selected}
-								type={type}
-								cl={cl}
-								name={title}
-								hideDefaultOptions={isQueued}
-							/>
-						)
-					: undefined
-			}
-		/>
-	);
-};
-
-function safeDateNotEqualCheck(a: Date | string | undefined, b: Date | string | undefined): boolean {
-	if (!a || !b) {
-		return a !== b;
-	}
-	return new Date(a).toISOString() !== new Date(b).toISOString();
-}
-
-const keys: (keyof RoomListRowProps)[] = [
-	'id',
-	'style',
-	'extended',
-	'selected',
-	'SidebarItemTemplate',
-	'AvatarTemplate',
-	't',
-	'sidebarViewMode',
-	'videoConfActions',
-];
-
-// eslint-disable-next-line react/no-multi-comp
-export default memo(SidebarItemTemplateWithData, (prevProps, nextProps) => {
-	if (keys.some((key) => prevProps[key] !== nextProps[key])) {
-		return false;
-	}
-
-	if (prevProps.room === nextProps.room) {
-		return true;
-	}
-
-	if (prevProps.room._id !== nextProps.room._id) {
-		return false;
-	}
-	if (prevProps.room._updatedAt?.toISOString() !== nextProps.room._updatedAt?.toISOString()) {
-		return false;
-	}
-	if (safeDateNotEqualCheck(prevProps.room.lastMessage?._updatedAt, nextProps.room.lastMessage?._updatedAt)) {
-		return false;
-	}
-	if (prevProps.room.alert !== nextProps.room.alert) {
-		return false;
-	}
-	if (isOmnichannelRoom(prevProps.room) && isOmnichannelRoom(nextProps.room) && prevProps.room?.v?.status !== nextProps.room?.v?.status) {
-		return false;
-	}
-	if (prevProps.room.teamMain !== nextProps.room.teamMain) {
-		return false;
-	}
-
-	if (
-		isOmnichannelRoom(prevProps.room) &&
-		isOmnichannelRoom(nextProps.room) &&
-		prevProps.room.priorityWeight !== nextProps.room.priorityWeight
-	) {
-		return false;
-	}
-
-	return true;
-});
diff --git a/apps/meteor/client/sidebarv2/RoomList/SidebarItemWithData.tsx b/apps/meteor/client/sidebarv2/RoomList/SidebarItemWithData.tsx
new file mode 100644
index 0000000000000..30585cce22f40
--- /dev/null
+++ b/apps/meteor/client/sidebarv2/RoomList/SidebarItemWithData.tsx
@@ -0,0 +1,159 @@
+import { isDirectMessageRoom, isOmnichannelRoom, isTeamRoom } from '@rocket.chat/core-typings';
+import { SidebarV2Action, SidebarV2Actions, SidebarV2ItemBadge, SidebarV2ItemIcon } from '@rocket.chat/fuselage';
+import { useButtonPattern } from '@rocket.chat/fuselage-hooks';
+import type { SubscriptionWithRoom } from '@rocket.chat/ui-contexts';
+import type { TFunction } from 'i18next';
+import type { AllHTMLAttributes } from 'react';
+import { memo, useCallback, useMemo } from 'react';
+
+import SidebarItem from './SidebarItem';
+import { RoomIcon } from '../../components/RoomIcon';
+import { roomCoordinator } from '../../lib/rooms/roomCoordinator';
+import { useSwitchSidePanelTab, useRoomsListContext, useIsRoomFilter } from '../../views/navigation/contexts/RoomsNavigationContext';
+import { useUnreadDisplay } from '../hooks/useUnreadDisplay';
+
+type RoomListRowProps = {
+	t: TFunction;
+	openedRoom?: string;
+	isAnonymous?: boolean;
+
+	room: SubscriptionWithRoom;
+	id?: string;
+	/* @deprecated */
+	style?: AllHTMLAttributes<HTMLElement>['style'];
+
+	videoConfActions?: {
+		[action: string]: () => void;
+	};
+};
+
+const SidebarItemWithData = ({ room, id, style, t, videoConfActions }: RoomListRowProps) => {
+	const title = roomCoordinator.getRoomName(room.t, room) || '';
+	const { unreadTitle, unreadVariant, showUnread, unreadCount, highlightUnread: highlighted } = useUnreadDisplay(room);
+
+	const icon = (
+		<SidebarV2ItemIcon
+			highlighted={highlighted}
+			icon={<RoomIcon room={room} placement='sidebar' size='x20' isIncomingCall={Boolean(videoConfActions)} />}
+		/>
+	);
+
+	const actions = useMemo(
+		() =>
+			videoConfActions && (
+				<SidebarV2Actions>
+					<SidebarV2Action onClick={videoConfActions.acceptCall} mini secondary success icon='phone' />
+					<SidebarV2Action onClick={videoConfActions.rejectCall} mini secondary danger icon='phone-off' />
+				</SidebarV2Actions>
+			),
+		[videoConfActions],
+	);
+
+	const badges = (
+		<>
+			{showUnread && (
+				<SidebarV2ItemBadge
+					variant={unreadVariant}
+					title={unreadTitle}
+					role='status'
+					aria-label={t('__unreadTitle__from__roomTitle__', { unreadTitle, roomTitle: title })}
+				>
+					<span aria-hidden>{unreadCount.total}</span>
+				</SidebarV2ItemBadge>
+			)}
+		</>
+	);
+
+	const switchSidePanelTab = useSwitchSidePanelTab();
+	const { parentRid } = useRoomsListContext();
+
+	const isRoomFilter = useIsRoomFilter();
+
+	const selected = isRoomFilter && room.rid === parentRid;
+
+	const handleClick = useCallback(() => {
+		if (isTeamRoom(room)) {
+			switchSidePanelTab('teams', { parentRid: room.rid });
+			return;
+		}
+
+		if (isDirectMessageRoom(room)) {
+			switchSidePanelTab('directMessages', { parentRid: room.rid });
+			return;
+		}
+
+		switchSidePanelTab('channels', { parentRid: room.rid });
+	}, [room, switchSidePanelTab]);
+
+	const buttonProps = useButtonPattern((e) => {
+		e.preventDefault();
+		handleClick();
+	});
+
+	return (
+		<SidebarItem
+			id={id}
+			data-qa='sidebar-item'
+			data-unread={highlighted}
+			unread={highlighted}
+			selected={selected}
+			aria-label={showUnread ? t('__unreadTitle__from__roomTitle__', { unreadTitle, roomTitle: title }) : title}
+			title={title}
+			icon={icon}
+			style={style}
+			badges={badges}
+			room={room}
+			actions={actions}
+			{...buttonProps}
+		/>
+	);
+};
+
+function safeDateNotEqualCheck(a: Date | string | undefined, b: Date | string | undefined): boolean {
+	if (!a || !b) {
+		return a !== b;
+	}
+	return new Date(a).toISOString() !== new Date(b).toISOString();
+}
+
+const keys: (keyof RoomListRowProps)[] = ['id', 'style', 't', 'videoConfActions'];
+
+// eslint-disable-next-line react/no-multi-comp
+export default memo(SidebarItemWithData, (prevProps, nextProps) => {
+	if (keys.some((key) => prevProps[key] !== nextProps[key])) {
+		return false;
+	}
+
+	if (prevProps.room === nextProps.room) {
+		return true;
+	}
+
+	if (prevProps.room._id !== nextProps.room._id) {
+		return false;
+	}
+	if (prevProps.room._updatedAt?.toISOString() !== nextProps.room._updatedAt?.toISOString()) {
+		return false;
+	}
+	if (safeDateNotEqualCheck(prevProps.room.lastMessage?._updatedAt, nextProps.room.lastMessage?._updatedAt)) {
+		return false;
+	}
+	if (prevProps.room.alert !== nextProps.room.alert) {
+		return false;
+	}
+	if (isOmnichannelRoom(prevProps.room) && isOmnichannelRoom(nextProps.room) && prevProps.room?.v?.status !== nextProps.room?.v?.status) {
+		return false;
+	}
+	if (prevProps.room.teamMain !== nextProps.room.teamMain) {
+		return false;
+	}
+
+	if (
+		isOmnichannelRoom(prevProps.room) &&
+		isOmnichannelRoom(nextProps.room) &&
+		prevProps.room.priorityWeight !== nextProps.room.priorityWeight
+	) {
+		return false;
+	}
+
+	return true;
+});
diff --git a/apps/meteor/client/sidebarv2/RoomList/TeamCollabFilters.tsx b/apps/meteor/client/sidebarv2/RoomList/TeamCollabFilters.tsx
new file mode 100644
index 0000000000000..723efc0d27cf6
--- /dev/null
+++ b/apps/meteor/client/sidebarv2/RoomList/TeamCollabFilters.tsx
@@ -0,0 +1,22 @@
+import { Box } from '@rocket.chat/fuselage';
+import { useSetting } from '@rocket.chat/ui-contexts';
+import { useTranslation } from 'react-i18next';
+
+import RoomListFiltersItem from './RoomListFiltersItem';
+import { sidePanelFiltersConfig } from '../../views/navigation/contexts/RoomsNavigationContext';
+
+const TeamCollabFilters = () => {
+	const { t } = useTranslation();
+	const isDiscussionEnabled = useSetting('Discussion_enabled');
+
+	return (
+		<Box role='tablist' aria-label={t('Team_collaboration_filters')} aria-orientation='vertical' mbs={8}>
+			<RoomListFiltersItem group='all' icon={sidePanelFiltersConfig.all.icon} />
+			<RoomListFiltersItem group='mentions' icon={sidePanelFiltersConfig.mentions.icon} />
+			<RoomListFiltersItem group='favorites' icon={sidePanelFiltersConfig.favorites.icon} />
+			{isDiscussionEnabled && <RoomListFiltersItem group='discussions' icon={sidePanelFiltersConfig.discussions.icon} />}
+		</Box>
+	);
+};
+
+export default TeamCollabFilters;
diff --git a/apps/meteor/client/sidebarv2/RoomList/useSidebarListNavigation.ts b/apps/meteor/client/sidebarv2/RoomList/useSidebarListNavigation.ts
index 6ebce12cac222..759c00f565295 100644
--- a/apps/meteor/client/sidebarv2/RoomList/useSidebarListNavigation.ts
+++ b/apps/meteor/client/sidebarv2/RoomList/useSidebarListNavigation.ts
@@ -1,7 +1,8 @@
 import { useCallback } from 'react';
 import { useFocusManager } from 'react-aria';
 
-const isListItem = (node: EventTarget) => (node as HTMLElement).classList.contains('rcx-sidebar-v2-item');
+const isListItem = (node: EventTarget) =>
+	(node as HTMLElement).classList.contains('rcx-sidebar-v2-item') && (node as HTMLElement).parentElement?.role === 'listitem';
 const isCollapseGroup = (node: EventTarget) => (node as HTMLElement).classList.contains('rcx-sidebar-v2-collapse-group__bar');
 const isListItemMenu = (node: EventTarget) => (node as HTMLElement).classList.contains('rcx-sidebar-v2-item__menu');
 
diff --git a/apps/meteor/client/sidebarv2/Sidebar.stories.tsx b/apps/meteor/client/sidebarv2/Sidebar.stories.tsx
index 548db777e57b2..31b8dd0aee01e 100644
--- a/apps/meteor/client/sidebarv2/Sidebar.stories.tsx
+++ b/apps/meteor/client/sidebarv2/Sidebar.stories.tsx
@@ -5,7 +5,7 @@ import type { Meta, StoryFn } from '@storybook/react';
 import type { ObjectId } from 'mongodb';
 import type { ContextType } from 'react';
 
-import Sidebar from './SidebarRegion';
+import Sidebar from './Sidebar';
 
 export default {
 	title: 'SidebarV2',
@@ -37,12 +37,10 @@ const settingContextValue: ContextType<typeof SettingsContext> = {
 };
 
 const userPreferences: Record<string, unknown> = {
-	sidebarViewMode: 'medium',
 	sidebarDisplayAvatar: true,
 	sidebarGroupByType: true,
 	sidebarShowFavorites: true,
 	sidebarShowUnread: true,
-	sidebarSortby: 'activity',
 };
 
 const subscriptions: SubscriptionWithRoom[] = [
diff --git a/apps/meteor/client/sidebarv2/Sidebar.tsx b/apps/meteor/client/sidebarv2/Sidebar.tsx
index 278c8b4f9d589..7d76924f656b8 100644
--- a/apps/meteor/client/sidebarv2/Sidebar.tsx
+++ b/apps/meteor/client/sidebarv2/Sidebar.tsx
@@ -1,22 +1,16 @@
 import { SidebarV2 } from '@rocket.chat/fuselage';
-import { useUserPreference } from '@rocket.chat/ui-contexts';
 import { memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import SidebarRoomList from './RoomList';
 import SidebarFooter from './footer';
 import BannerSection from './sections/BannerSection';
 
 const Sidebar = () => {
-	const sidebarViewMode = useUserPreference('sidebarViewMode');
-	const sidebarHideAvatar = !useUserPreference('sidebarDisplayAvatar');
+	const { t } = useTranslation();
 
 	return (
-		<SidebarV2
-			aria-label='sidebar'
-			className={['rcx-sidebar--main', `rcx-sidebar rcx-sidebar--${sidebarViewMode}`, sidebarHideAvatar && 'rcx-sidebar--hide-avatar']
-				.filter(Boolean)
-				.join(' ')}
-		>
+		<SidebarV2 aria-label={t('Sidebar')} className='rcx-sidebar--main rcx-sidebar'>
 			<BannerSection />
 			<SidebarRoomList />
 			<SidebarFooter />
diff --git a/apps/meteor/client/sidebarv2/SidebarPortal.tsx b/apps/meteor/client/sidebarv2/SidebarPortal.tsx
deleted file mode 100644
index 3acbfc12113c3..0000000000000
--- a/apps/meteor/client/sidebarv2/SidebarPortal.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Box } from '@rocket.chat/fuselage';
-import type { ReactNode } from 'react';
-import { memo } from 'react';
-import { createPortal } from 'react-dom';
-
-type SidebarPortalProps = { children?: ReactNode };
-
-const SidebarPortal = ({ children }: SidebarPortalProps) => {
-	const sidebarRoot = document.getElementById('sidebar-region');
-
-	if (!sidebarRoot) {
-		return null;
-	}
-
-	return <>{createPortal(<Box className='rcx-sidebar flex-nav'>{children}</Box>, sidebarRoot)}</>;
-};
-
-export default memo(SidebarPortal);
diff --git a/apps/meteor/client/sidebarv2/SidebarRegion.tsx b/apps/meteor/client/sidebarv2/SidebarRegion.tsx
deleted file mode 100644
index 83eb4e750c6da..0000000000000
--- a/apps/meteor/client/sidebarv2/SidebarRegion.tsx
+++ /dev/null
@@ -1,109 +0,0 @@
-import { css } from '@rocket.chat/css-in-js';
-import { Box } from '@rocket.chat/fuselage';
-import { useLayout } from '@rocket.chat/ui-contexts';
-import { memo } from 'react';
-import { FocusScope } from 'react-aria';
-
-import Sidebar from './Sidebar';
-
-const SidebarRegion = () => {
-	const { isTablet, sidebar } = useLayout();
-
-	const sidebarMobileClass = css`
-		position: absolute;
-		user-select: none;
-		transform: translate3d(-100%, 0, 0);
-		-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-		-webkit-user-drag: none;
-		touch-action: pan-y;
-		will-change: transform;
-
-		.rtl & {
-			transform: translate3d(200%, 0, 0);
-
-			&.opened {
-				box-shadow: rgba(0, 0, 0, 0.3) 0px 0px 15px 1px;
-				transform: translate3d(0px, 0px, 0px);
-			}
-		}
-	`;
-
-	const sideBarStyle = css`
-		position: relative;
-		z-index: 2;
-		display: flex;
-		flex-direction: column;
-		height: 100%;
-		user-select: none;
-		transition: transform 0.3s;
-		width: var(--sidebar-width);
-		min-width: var(--sidebar-width);
-
-		> .rcx-sidebar:not(:last-child) {
-			visibility: hidden;
-		}
-
-		&.opened {
-			box-shadow: rgba(0, 0, 0, 0.3) 0px 0px 15px 1px;
-			transform: translate3d(0px, 0px, 0px);
-		}
-
-		/* // 768px to 1599px
-		// using em unit base 16
-		@media (max-width: 48em) {
-			width: 80%;
-			min-width: 80%;
-		} */
-
-		// 1600px to 1919px
-		// using em unit base 16
-		@media (min-width: 100em) {
-			width: var(--sidebar-md-width);
-			min-width: var(--sidebar-md-width);
-		}
-
-		// 1920px and up
-		// using em unit base 16
-		@media (min-width: 120em) {
-			width: var(--sidebar-lg-width);
-			min-width: var(--sidebar-lg-width);
-		}
-	`;
-
-	const sidebarWrapStyle = css`
-		position: absolute;
-		z-index: 1;
-		top: 0;
-		left: 0;
-		height: 100%;
-		user-select: none;
-		transition: opacity 0.3s;
-		-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-		touch-action: pan-y;
-		-webkit-user-drag: none;
-
-		&.opened {
-			width: 100%;
-			background-color: rgb(0, 0, 0);
-			opacity: 0.8;
-		}
-	`;
-
-	return (
-		<FocusScope>
-			<Box
-				id='sidebar-region'
-				className={['rcx-sidebar', !sidebar.isCollapsed && isTablet && 'opened', sideBarStyle, isTablet && sidebarMobileClass].filter(
-					Boolean,
-				)}
-			>
-				<Sidebar />
-			</Box>
-			{isTablet && (
-				<Box className={[sidebarWrapStyle, !sidebar.isCollapsed && 'opened'].filter(Boolean)} onClick={() => sidebar.toggle()} />
-			)}
-		</FocusScope>
-	);
-};
-
-export default memo(SidebarRegion);
diff --git a/apps/meteor/client/sidebarv2/hooks/useAvatarTemplate.tsx b/apps/meteor/client/sidebarv2/hooks/useAvatarTemplate.tsx
deleted file mode 100644
index 697ac6d9f9b29..0000000000000
--- a/apps/meteor/client/sidebarv2/hooks/useAvatarTemplate.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import { RoomAvatar } from '@rocket.chat/ui-avatar';
-import type { SubscriptionWithRoom } from '@rocket.chat/ui-contexts';
-import { useUserPreference } from '@rocket.chat/ui-contexts';
-import type { ComponentType } from 'react';
-import { useMemo } from 'react';
-
-export const useAvatarTemplate = (
-	sidebarViewMode?: 'extended' | 'medium' | 'condensed',
-	sidebarDisplayAvatar?: boolean,
-): null | ComponentType<SubscriptionWithRoom & { rid: string }> => {
-	const sidebarViewModeFromSettings = useUserPreference<'extended' | 'medium' | 'condensed'>('sidebarViewMode');
-	const sidebarDisplayAvatarFromSettings = useUserPreference('sidebarDisplayAvatar');
-
-	const viewMode = sidebarViewMode ?? sidebarViewModeFromSettings;
-	const displayAvatar = sidebarDisplayAvatar ?? sidebarDisplayAvatarFromSettings;
-	return useMemo(() => {
-		if (!displayAvatar) {
-			return null;
-		}
-
-		const size = ((): 'x36' | 'x28' | 'x20' => {
-			switch (viewMode) {
-				case 'extended':
-					return 'x36';
-				case 'medium':
-					return 'x28';
-				case 'condensed':
-				default:
-					return 'x20';
-			}
-		})();
-
-		const renderRoomAvatar: ComponentType<SubscriptionWithRoom & { rid: string }> = (room) => (
-			<RoomAvatar size={size} room={{ ...room, _id: room.rid || room._id, type: room.t }} />
-		);
-
-		return renderRoomAvatar;
-	}, [displayAvatar, viewMode]);
-};
diff --git a/apps/meteor/client/sidebarv2/hooks/useRoomList.ts b/apps/meteor/client/sidebarv2/hooks/useRoomList.ts
index 40ac4db1c71b3..134cdca4c4faf 100644
--- a/apps/meteor/client/sidebarv2/hooks/useRoomList.ts
+++ b/apps/meteor/client/sidebarv2/hooks/useRoomList.ts
@@ -7,9 +7,9 @@ import { useMemo } from 'react';
 
 import { useOmnichannelEnabled } from '../../hooks/omnichannel/useOmnichannelEnabled';
 import { useQueuedInquiries } from '../../hooks/omnichannel/useQueuedInquiries';
-import { useSortQueryOptions } from '../../hooks/useSortQueryOptions';
 
 const query = { open: { $ne: false } };
+const sortOptions = { sort: { lm: -1 } } as const;
 
 const emptyQueue: ILivechatInquiryRecord[] = [];
 
@@ -44,9 +44,7 @@ export const useRoomList = ({ collapsedGroups }: { collapsedGroups?: string[] })
 	const isDiscussionEnabled = useSetting('Discussion_enabled');
 	const sidebarShowUnread = useUserPreference('sidebarShowUnread');
 
-	const options = useSortQueryOptions();
-
-	const rooms = useUserSubscriptions(query, options);
+	const rooms = useUserSubscriptions(query, sortOptions);
 
 	const inquiries = useQueuedInquiries();
 
diff --git a/apps/meteor/client/sidebarv2/hooks/useTemplateByViewMode.ts b/apps/meteor/client/sidebarv2/hooks/useTemplateByViewMode.ts
deleted file mode 100644
index 8e9c97b75c9d5..0000000000000
--- a/apps/meteor/client/sidebarv2/hooks/useTemplateByViewMode.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { useUserPreference } from '@rocket.chat/ui-contexts';
-import { useMemo } from 'react';
-
-import Condensed from '../Item/Condensed';
-import Extended from '../Item/Extended';
-import Medium from '../Item/Medium';
-
-export const useTemplateByViewMode = (): typeof Condensed | typeof Extended | typeof Medium => {
-	const sidebarViewMode = useUserPreference('sidebarViewMode');
-	return useMemo(() => {
-		switch (sidebarViewMode) {
-			case 'extended':
-				return Extended;
-			case 'medium':
-				return Medium;
-			case 'condensed':
-			default:
-				return Condensed;
-		}
-	}, [sidebarViewMode]);
-};
diff --git a/apps/meteor/client/sidebarv2/index.ts b/apps/meteor/client/sidebarv2/index.ts
index 55cd4f79dbf85..e842a8591f872 100644
--- a/apps/meteor/client/sidebarv2/index.ts
+++ b/apps/meteor/client/sidebarv2/index.ts
@@ -1 +1 @@
-export { default } from './SidebarRegion';
+export { default } from './Sidebar';
diff --git a/apps/meteor/client/views/account/AccountRouter.tsx b/apps/meteor/client/views/account/AccountRouter.tsx
index c44b05096c27e..ee0164773361e 100644
--- a/apps/meteor/client/views/account/AccountRouter.tsx
+++ b/apps/meteor/client/views/account/AccountRouter.tsx
@@ -4,7 +4,7 @@ import { Suspense, useEffect } from 'react';
 
 import AccountSidebar from './AccountSidebar';
 import PageSkeleton from '../../components/PageSkeleton';
-import SidebarPortal from '../../sidebar/SidebarPortal';
+import SidebarPortal from '../../portals/SidebarPortal';
 
 type AccountRouterProps = {
 	children?: ReactNode;
diff --git a/apps/meteor/client/views/admin/AdministrationLayout.tsx b/apps/meteor/client/views/admin/AdministrationLayout.tsx
index a46f2b715132a..f81aa938c290d 100644
--- a/apps/meteor/client/views/admin/AdministrationLayout.tsx
+++ b/apps/meteor/client/views/admin/AdministrationLayout.tsx
@@ -1,7 +1,7 @@
 import type { ReactNode } from 'react';
 
 import AdminSidebar from './sidebar/AdminSidebar';
-import SidebarPortal from '../../sidebar/SidebarPortal';
+import SidebarPortal from '../../portals/SidebarPortal';
 
 type AdministrationLayoutProps = {
 	children?: ReactNode;
diff --git a/apps/meteor/client/views/marketplace/MarketplaceRouter.tsx b/apps/meteor/client/views/marketplace/MarketplaceRouter.tsx
index 66143a53bb13b..f9ee37599112e 100644
--- a/apps/meteor/client/views/marketplace/MarketplaceRouter.tsx
+++ b/apps/meteor/client/views/marketplace/MarketplaceRouter.tsx
@@ -4,7 +4,7 @@ import { Suspense, useEffect } from 'react';
 
 import MarketPlaceSidebar from './MarketplaceSidebar';
 import PageSkeleton from '../../components/PageSkeleton';
-import SidebarPortal from '../../sidebar/SidebarPortal';
+import SidebarPortal from '../../portals/SidebarPortal';
 import NotFoundPage from '../notFound/NotFoundPage';
 
 const MarketplaceRouter = ({ children }: { children?: ReactNode }): ReactElement => {
diff --git a/apps/meteor/client/views/navigation/NavigationRegion.tsx b/apps/meteor/client/views/navigation/NavigationRegion.tsx
new file mode 100644
index 0000000000000..f7b15b496d554
--- /dev/null
+++ b/apps/meteor/client/views/navigation/NavigationRegion.tsx
@@ -0,0 +1,115 @@
+import { css } from '@rocket.chat/css-in-js';
+import { Box } from '@rocket.chat/fuselage';
+import { useLayout, useLayoutSizes } from '@rocket.chat/ui-contexts';
+import { memo } from 'react';
+import { FocusScope } from 'react-aria';
+
+import SidePanel from './sidepanel';
+import { NAVIGATION_REGION_ID } from '../../lib/constants';
+import Sidebar from '../../sidebarv2';
+
+const NavigationRegion = () => {
+	const {
+		isTablet,
+		sidebar,
+		sidePanel: { displaySidePanel },
+	} = useLayout();
+	const { sidebar: sidebarSize } = useLayoutSizes();
+
+	const navMobileStyle = css`
+		position: absolute;
+		user-select: none;
+		transform: translate3d(-100%, 0, 0);
+		-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+		-webkit-user-drag: none;
+		touch-action: pan-y;
+		will-change: transform;
+
+		.rtl & {
+			transform: translate3d(200%, 0, 0);
+
+			&.opened {
+				box-shadow: rgba(0, 0, 0, 0.3) 0px 0px 15px 1px;
+				transform: translate3d(0px, 0px, 0px);
+			}
+		}
+	`;
+
+	const navRegionStyle = css`
+		position: relative;
+		z-index: 2;
+		display: flex;
+		height: 100%;
+		user-select: none;
+		transition: transform 0.3s;
+
+		&.opened {
+			box-shadow: rgba(0, 0, 0, 0.3) 0px 0px 15px 1px;
+			transform: translate3d(0px, 0px, 0px);
+		}
+
+		.hidden-visibility {
+			visibility: hidden;
+		}
+	`;
+
+	const navBackdropStyle = css`
+		position: absolute;
+		z-index: 1;
+		top: 0;
+		left: 0;
+		height: 100%;
+		user-select: none;
+		transition: opacity 0.3s;
+		-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+		touch-action: pan-y;
+		-webkit-user-drag: none;
+
+		&.opened {
+			width: 100%;
+			background-color: rgb(0, 0, 0);
+			opacity: 0.8;
+		}
+	`;
+
+	const sidebarWrapStyle = css`
+		width: ${sidebarSize};
+		min-width: ${sidebarSize};
+		transition: transform 0.3s;
+
+		&.collapsed {
+			transform: translateX(-${sidebarSize});
+			margin-right: -${sidebarSize};
+		}
+	`;
+
+	const showSideBar = !displaySidePanel || !isTablet;
+	const isSidebarOpen = !sidebar.isCollapsed && isTablet;
+	const hideSidePanel = sidebar.overlayed || (sidebar.isCollapsed && isTablet);
+
+	return (
+		<>
+			<Box id={NAVIGATION_REGION_ID} className={[navRegionStyle, isSidebarOpen && 'opened', isTablet && navMobileStyle].filter(Boolean)}>
+				{showSideBar && (
+					<Box className={[sidebarWrapStyle, sidebar.overlayed && !isSidebarOpen && 'collapsed hidden-visibility']}>
+						<FocusScope>
+							<Sidebar />
+						</FocusScope>
+					</Box>
+				)}
+				{displaySidePanel && (
+					<Box width='x280' className={[hideSidePanel && 'hidden-visibility']}>
+						<FocusScope>
+							<SidePanel />
+						</FocusScope>
+					</Box>
+				)}
+			</Box>
+			{isTablet && (
+				<Box className={[navBackdropStyle, !sidebar.isCollapsed && 'opened'].filter(Boolean)} onClick={() => sidebar.toggle()} />
+			)}
+		</>
+	);
+};
+
+export default memo(NavigationRegion);
diff --git a/apps/meteor/client/views/navigation/contexts/RoomsNavigationContext.ts b/apps/meteor/client/views/navigation/contexts/RoomsNavigationContext.ts
new file mode 100644
index 0000000000000..0ff54f161942a
--- /dev/null
+++ b/apps/meteor/client/views/navigation/contexts/RoomsNavigationContext.ts
@@ -0,0 +1,208 @@
+import type { ILivechatInquiryRecord, IRoom } from '@rocket.chat/core-typings';
+import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
+import type { Keys as IconName } from '@rocket.chat/icons';
+import type { SubscriptionWithRoom, TranslationKey } from '@rocket.chat/ui-contexts';
+import { createContext, useContext, useEffect, useMemo } from 'react';
+
+import { isTruthy } from '../../../../lib/isTruthy';
+import { useCollapsedGroups } from '../hooks/useCollapsedGroups';
+
+export const sidePanelFiltersConfig: { [Key in AllGroupsKeys]: { title: TranslationKey; icon: IconName } } = {
+	all: {
+		title: 'All',
+		icon: 'inbox',
+	},
+	favorites: {
+		title: 'Favorites',
+		icon: 'star',
+	},
+	mentions: {
+		title: 'Mentions',
+		icon: 'at',
+	},
+	discussions: {
+		title: 'Discussions',
+		icon: 'balloons',
+	},
+	inProgress: {
+		title: 'In_progress',
+		icon: 'user-arrow-right',
+	},
+	queue: {
+		title: 'Queue',
+		icon: 'burger-arrow-left',
+	},
+	onHold: {
+		title: 'On_Hold',
+		icon: 'pause-unfilled',
+	},
+	teams: {
+		title: 'Teams',
+		icon: 'team',
+	},
+	channels: {
+		title: 'Channels',
+		icon: 'hashtag',
+	},
+	directMessages: {
+		title: 'Direct_Messages',
+		icon: 'at',
+	},
+};
+
+export type SidePanelFiltersKeys = 'all' | 'mentions' | 'favorites' | 'discussions' | 'inProgress' | 'queue' | 'onHold';
+
+export const collapsibleFilters: SideBarFiltersKeys[] = ['teams', 'channels', 'directMessages'];
+export type SidePanelFiltersUnreadKeys = `${SidePanelFiltersKeys}_unread`;
+export type SidePanelFilters = SidePanelFiltersKeys | SidePanelFiltersUnreadKeys;
+
+export type SideBarFiltersKeys = 'teams' | 'channels' | 'directMessages';
+export type SideBarFiltersUnreadKeys = `${SideBarFiltersKeys}_unread`;
+export type SideBarFilters = SidePanelFiltersKeys | SidePanelFiltersUnreadKeys;
+
+export type AllGroupsKeys = SidePanelFiltersKeys | SideBarFiltersKeys;
+
+export type AllGroupsKeysWithUnread = SidePanelFilters | SideBarFiltersKeys | SideBarFiltersUnreadKeys;
+
+export type RoomsNavigationContextValue = {
+	groups: Map<AllGroupsKeysWithUnread, Set<SubscriptionWithRoom | ILivechatInquiryRecord>>;
+	currentFilter: AllGroupsKeysWithUnread;
+	setFilter: (filter: AllGroupsKeys, unread: boolean, parentRid?: IRoom['_id']) => void;
+	unreadGroupData: Map<AllGroupsKeys, GroupedUnreadInfoData>;
+	parentRid?: IRoom['_id'];
+};
+
+export type GroupedUnreadInfoData = {
+	userMentions: number;
+	groupMentions: number;
+	tunread: string[];
+	tunreadUser: string[];
+	unread: number;
+};
+
+export const RoomsNavigationContext = createContext<RoomsNavigationContextValue | undefined>(undefined);
+
+export const useRoomsListContext = () => {
+	const contextValue = useContext(RoomsNavigationContext);
+
+	if (!contextValue) {
+		throw new Error('useRoomsListContext must be used within a RoomsNavigationContext');
+	}
+
+	return contextValue;
+};
+
+// Helper functions
+const splitFilter = (currentFilter: AllGroupsKeysWithUnread): [SidePanelFiltersKeys, boolean] => {
+	const [currentTab, unread] = currentFilter.split('_');
+	return [currentTab as SidePanelFiltersKeys, unread === 'unread'];
+};
+
+export const getFilterKey = (tab: AllGroupsKeys, unread: boolean): AllGroupsKeysWithUnread => {
+	return unread ? `${tab}_unread` : tab;
+};
+
+export const getEmptyUnreadInfo = (): GroupedUnreadInfoData => ({
+	userMentions: 0,
+	groupMentions: 0,
+	tunread: [],
+	tunreadUser: [],
+	unread: 0,
+});
+
+// Hooks
+type RoomListGroup<T extends AllGroupsKeys> = {
+	group: T;
+	rooms: Array<T extends SideBarFiltersKeys ? SubscriptionWithRoom : ILivechatInquiryRecord>;
+	unreadInfo: GroupedUnreadInfoData;
+};
+
+export const useSideBarRoomsList = (): {
+	roomListGroups: RoomListGroup<SideBarFiltersKeys>[];
+	groupCounts: number[];
+	totalCount: number;
+} & ReturnType<typeof useCollapsedGroups> => {
+	const { collapsedGroups, handleClick, handleKeyDown } = useCollapsedGroups();
+	const { groups, unreadGroupData } = useRoomsListContext();
+
+	const roomListGroups = collapsibleFilters
+		.map((group) => {
+			const roomSet = (groups as Map<SideBarFiltersKeys, Set<SubscriptionWithRoom>>).get(group);
+			const rooms = roomSet ? Array.from(roomSet) : [];
+			const unreadInfo = unreadGroupData.get(group) || getEmptyUnreadInfo();
+
+			if (!rooms.length) {
+				return undefined;
+			}
+
+			return { group, rooms, unreadInfo };
+		})
+		.filter(isTruthy);
+
+	const groupCounts = roomListGroups.map((group) => {
+		if (collapsedGroups.includes(group.group)) {
+			return 0;
+		}
+		return group.rooms.length;
+	});
+
+	return {
+		collapsedGroups,
+		handleClick,
+		handleKeyDown,
+		roomListGroups,
+		groupCounts,
+		totalCount: groupCounts.reduce((acc, count) => acc + count, 0),
+	};
+};
+
+export const useSidePanelRoomsListTab = (tab: AllGroupsKeys) => {
+	const [, unread] = useSidePanelFilter();
+	const roomSet = useRoomsListContext().groups.get(getFilterKey(tab, unread));
+	const roomsList = useMemo(() => {
+		if (!roomSet) {
+			return [];
+		}
+
+		return Array.from(roomSet);
+	}, [roomSet]);
+	return roomsList;
+};
+
+export const useSidePanelFilter = (): [AllGroupsKeys, boolean, AllGroupsKeysWithUnread] => {
+	const { currentFilter } = useRoomsListContext();
+	return [...splitFilter(currentFilter), currentFilter];
+};
+
+export const useUnreadOnlyToggle = (): [boolean, () => void] => {
+	const { setFilter, parentRid } = useRoomsListContext();
+	const [currentTab, unread] = useSidePanelFilter();
+
+	return [unread, useEffectEvent(() => setFilter(currentTab, !unread, parentRid))];
+};
+
+export const useSwitchSidePanelTab = () => {
+	const { setFilter } = useRoomsListContext();
+	const [, unread] = useSidePanelFilter();
+
+	return (tab: AllGroupsKeys, { parentRid }: { parentRid?: IRoom['_id'] } = {}) => {
+		setFilter(tab, unread, parentRid);
+	};
+};
+
+export const useUnreadGroupData = (key: SidePanelFiltersKeys) => useRoomsListContext().unreadGroupData.get(key) || getEmptyUnreadInfo();
+
+export const useIsRoomFilter = () => {
+	const [currentTab] = useSidePanelFilter();
+	return useMemo(() => collapsibleFilters.some((group) => currentTab === group), [currentTab]);
+};
+
+export const useRedirectToDefaultTab = (shouldRedirect: boolean) => {
+	const switchSidePanelTab = useSwitchSidePanelTab();
+
+	useEffect(() => {
+		if (shouldRedirect) {
+			switchSidePanelTab('all');
+		}
+	}, [shouldRedirect, switchSidePanelTab]);
+};
diff --git a/apps/meteor/client/views/navigation/hooks/useCollapsedGroups.ts b/apps/meteor/client/views/navigation/hooks/useCollapsedGroups.ts
new file mode 100644
index 0000000000000..b178f5c5121c2
--- /dev/null
+++ b/apps/meteor/client/views/navigation/hooks/useCollapsedGroups.ts
@@ -0,0 +1,30 @@
+import { useLocalStorage } from '@rocket.chat/fuselage-hooks';
+import type { KeyboardEvent } from 'react';
+import { useCallback } from 'react';
+
+export const useCollapsedGroups = () => {
+	const [collapsedGroups, setCollapsedGroups] = useLocalStorage<string[]>('sidebarGroups', []);
+
+	const handleClick = useCallback(
+		(group: string) => {
+			if (collapsedGroups.includes(group)) {
+				setCollapsedGroups(collapsedGroups.filter((item) => item !== group));
+			} else {
+				setCollapsedGroups([...collapsedGroups, group]);
+			}
+		},
+		[collapsedGroups, setCollapsedGroups],
+	);
+
+	const handleKeyDown = useCallback(
+		(event: KeyboardEvent, group: string) => {
+			if (['Enter', 'Space'].includes(event.code)) {
+				event.preventDefault();
+				handleClick(group);
+			}
+		},
+		[handleClick],
+	);
+
+	return { collapsedGroups, handleClick, handleKeyDown };
+};
diff --git a/apps/meteor/client/views/navigation/hooks/useSidePanelFilters.ts b/apps/meteor/client/views/navigation/hooks/useSidePanelFilters.ts
new file mode 100644
index 0000000000000..6106bcc5c7559
--- /dev/null
+++ b/apps/meteor/client/views/navigation/hooks/useSidePanelFilters.ts
@@ -0,0 +1,23 @@
+import type { IRoom } from '@rocket.chat/core-typings';
+import { useEffectEvent, useLocalStorage } from '@rocket.chat/fuselage-hooks';
+import { useLayout } from '@rocket.chat/ui-contexts';
+
+import { useSidePanelParentRid } from './useSidePanelParentRid';
+import type { AllGroupsKeysWithUnread, AllGroupsKeys } from '../contexts/RoomsNavigationContext';
+import { getFilterKey } from '../contexts/RoomsNavigationContext';
+
+export const useSidePanelFilters = () => {
+	const {
+		sidePanel: { openSidePanel },
+	} = useLayout();
+	const { setParentRoom } = useSidePanelParentRid();
+	const [currentFilter, setCurrentFilter] = useLocalStorage<AllGroupsKeysWithUnread>('sidePanelFilters', getFilterKey('all', false));
+
+	const setFilter = useEffectEvent((filter: AllGroupsKeys, unread: boolean, parentRid?: IRoom['_id']) => {
+		openSidePanel();
+		setCurrentFilter(getFilterKey(filter, unread));
+		setParentRoom(filter, parentRid);
+	});
+
+	return { currentFilter, setFilter };
+};
diff --git a/apps/meteor/client/views/navigation/hooks/useSidePanelParentRid.ts b/apps/meteor/client/views/navigation/hooks/useSidePanelParentRid.ts
new file mode 100644
index 0000000000000..e7c2d2d98ab97
--- /dev/null
+++ b/apps/meteor/client/views/navigation/hooks/useSidePanelParentRid.ts
@@ -0,0 +1,16 @@
+import type { IRoom } from '@rocket.chat/core-typings';
+import { useEffectEvent, useLocalStorage } from '@rocket.chat/fuselage-hooks';
+
+import { collapsibleFilters, type AllGroupsKeys } from '../contexts/RoomsNavigationContext';
+
+export const useSidePanelParentRid = () => {
+	const [parentRid, setParentRid] = useLocalStorage<IRoom['_id'] | undefined>('sidePanelParentRid', undefined);
+
+	const setParentRoom = useEffectEvent((filter: AllGroupsKeys, parentRid: IRoom['_id'] | undefined) => {
+		if (collapsibleFilters.some((group) => filter === group)) {
+			setParentRid(parentRid);
+		}
+	});
+
+	return { parentRid, setParentRoom };
+};
diff --git a/apps/meteor/client/views/navigation/index.ts b/apps/meteor/client/views/navigation/index.ts
new file mode 100644
index 0000000000000..c74f152e12e04
--- /dev/null
+++ b/apps/meteor/client/views/navigation/index.ts
@@ -0,0 +1 @@
+export { default } from './NavigationRegion';
diff --git a/apps/meteor/client/views/navigation/lib/getNavigationMessagePreview.ts b/apps/meteor/client/views/navigation/lib/getNavigationMessagePreview.ts
new file mode 100644
index 0000000000000..1b5fb95b37c0a
--- /dev/null
+++ b/apps/meteor/client/views/navigation/lib/getNavigationMessagePreview.ts
@@ -0,0 +1,32 @@
+import type { IMessage } from '@rocket.chat/core-typings';
+import { isDirectMessageRoom, isE2EEMessage, isMultipleDirectMessageRoom, isVideoConfMessage } from '@rocket.chat/core-typings';
+import type { SubscriptionWithRoom } from '@rocket.chat/ui-contexts';
+import type { TFunction } from 'i18next';
+
+import { normalizeNavigationMessage } from './normalizeNavigationMessage';
+
+export const getNavigationMessagePreview = (
+	room: SubscriptionWithRoom,
+	lastMessage: IMessage | undefined,
+	t: TFunction,
+): string | undefined => {
+	if (!lastMessage) {
+		return t('No_messages_yet');
+	}
+	if (isVideoConfMessage(lastMessage)) {
+		return t('Call_started');
+	}
+	if (isE2EEMessage(lastMessage) && lastMessage.e2e !== 'done') {
+		return t('Encrypted_message_preview_unavailable');
+	}
+	if (!lastMessage.u) {
+		return normalizeNavigationMessage(lastMessage, t);
+	}
+	if (lastMessage.u?.username === room.u?.username) {
+		return `${t('You')}: ${normalizeNavigationMessage(lastMessage, t)}`;
+	}
+	if (isDirectMessageRoom(room) && !isMultipleDirectMessageRoom(room)) {
+		return normalizeNavigationMessage(lastMessage, t);
+	}
+	return `${lastMessage.u.name || lastMessage.u.username}: ${normalizeNavigationMessage(lastMessage, t)}`;
+};
diff --git a/apps/meteor/client/sidebarv2/RoomList/normalizeSidebarMessage.ts b/apps/meteor/client/views/navigation/lib/normalizeNavigationMessage.ts
similarity index 78%
rename from apps/meteor/client/sidebarv2/RoomList/normalizeSidebarMessage.ts
rename to apps/meteor/client/views/navigation/lib/normalizeNavigationMessage.ts
index 7de2dd9d122da..cecf7ab4d717e 100644
--- a/apps/meteor/client/sidebarv2/RoomList/normalizeSidebarMessage.ts
+++ b/apps/meteor/client/views/navigation/lib/normalizeNavigationMessage.ts
@@ -3,9 +3,9 @@ import { escapeHTML } from '@rocket.chat/string-helpers';
 import emojione from 'emojione';
 import type { TFunction } from 'i18next';
 
-import { filterMarkdown } from '../../../app/markdown/lib/markdown';
+import { filterMarkdown } from '../../../../app/markdown/lib/markdown';
 
-export const normalizeSidebarMessage = (message: IMessage, t: TFunction): string | undefined => {
+export const normalizeNavigationMessage = (message: IMessage, t: TFunction): string | undefined => {
 	if (message.msg) {
 		return escapeHTML(filterMarkdown(emojione.shortnameToUnicode(message.msg)));
 	}
diff --git a/apps/meteor/client/views/navigation/providers/RoomsNavigationProvider.tsx b/apps/meteor/client/views/navigation/providers/RoomsNavigationProvider.tsx
new file mode 100644
index 0000000000000..9a5c53b8a0f13
--- /dev/null
+++ b/apps/meteor/client/views/navigation/providers/RoomsNavigationProvider.tsx
@@ -0,0 +1,167 @@
+import {
+	isDirectMessageRoom,
+	isDiscussion,
+	isLivechatInquiryRecord,
+	isOmnichannelRoom,
+	isPrivateRoom,
+	isPublicRoom,
+	isTeamRoom,
+} from '@rocket.chat/core-typings';
+import type { ILivechatInquiryRecord } from '@rocket.chat/core-typings';
+import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
+import type { SubscriptionWithRoom, TranslationKey } from '@rocket.chat/ui-contexts';
+import { useSetting, useUserPreference, useUserSubscriptions } from '@rocket.chat/ui-contexts';
+import type { ReactNode } from 'react';
+import { useMemo } from 'react';
+
+import { useOmnichannelEnabled } from '../../../hooks/omnichannel/useOmnichannelEnabled';
+import { useQueuedInquiries } from '../../../hooks/omnichannel/useQueuedInquiries';
+import type { GroupedUnreadInfoData, AllGroupsKeys, AllGroupsKeysWithUnread } from '../contexts/RoomsNavigationContext';
+import { RoomsNavigationContext, getEmptyUnreadInfo } from '../contexts/RoomsNavigationContext';
+import { useSidePanelFilters } from '../hooks/useSidePanelFilters';
+import { useSidePanelParentRid } from '../hooks/useSidePanelParentRid';
+
+const query = { open: { $ne: false } };
+const sortOptions = { sort: { lm: -1 } } as const;
+
+const emptyQueue: ILivechatInquiryRecord[] = [];
+
+export type useRoomsGroupsReturnType = {
+	sideBar: {
+		roomList: Array<SubscriptionWithRoom>;
+		groupsCount: number[];
+		groupsList: TranslationKey[];
+		groupedUnreadInfo: GroupedUnreadInfoData[];
+	};
+};
+
+const updateGroupUnreadInfo = (
+	room: SubscriptionWithRoom | ILivechatInquiryRecord,
+	current: GroupedUnreadInfoData,
+): GroupedUnreadInfoData => {
+	if (isLivechatInquiryRecord(room)) {
+		return getEmptyUnreadInfo();
+	}
+
+	return {
+		...current,
+		userMentions: current.userMentions + (room.userMentions || 0),
+		groupMentions: current.groupMentions + (room.groupMentions || 0),
+		tunread: [...current.tunread, ...(room.tunread || [])],
+		tunreadUser: [...current.tunreadUser, ...(room.tunreadUser || [])],
+		unread: current.unread + (room.unread || (!room.unread && !room.tunread?.length && room.alert ? 1 : 0)),
+	};
+};
+
+const isUnread = (room: SubscriptionWithRoom | ILivechatInquiryRecord) =>
+	'alert' in room && (room.alert || room.unread || room.tunread?.length) && !room.hideUnreadStatus;
+
+const hasMention = (room: SubscriptionWithRoom) =>
+	room.userMentions || room.groupMentions || room.tunreadUser?.length || room.tunreadGroup?.length;
+
+type GroupMap = Map<AllGroupsKeysWithUnread, Set<SubscriptionWithRoom | ILivechatInquiryRecord>>;
+type UnreadGroupDataMap = Map<AllGroupsKeys, GroupedUnreadInfoData>;
+
+const useRoomsGroups = (): [GroupMap, UnreadGroupDataMap] => {
+	const showOmnichannel = useOmnichannelEnabled();
+	const favoritesEnabled = useUserPreference('sidebarShowFavorites');
+	const isDiscussionEnabled = useSetting('Discussion_enabled');
+
+	const rooms = useUserSubscriptions(query, sortOptions);
+
+	const inquiries = useQueuedInquiries();
+	const queue = inquiries.enabled ? inquiries.queue : emptyQueue;
+
+	return useDebouncedValue(
+		useMemo(() => {
+			const groups: GroupMap = new Map();
+			showOmnichannel && groups.set('queue', new Set(queue));
+
+			const unreadGroupData: UnreadGroupDataMap = new Map();
+
+			const setGroupRoom = (key: AllGroupsKeys, room: SubscriptionWithRoom | ILivechatInquiryRecord) => {
+				const getGroupSet = (key: AllGroupsKeysWithUnread) => {
+					const roomSet = groups.get(key) || new Set<SubscriptionWithRoom | ILivechatInquiryRecord>();
+					if (!groups.has(key)) {
+						groups.set(key, roomSet);
+					}
+					return roomSet;
+				};
+
+				getGroupSet(key).add(room);
+
+				if (isUnread(room)) {
+					getGroupSet(`${key}_unread`).add(room);
+
+					const currentUnreadData = unreadGroupData.get(key) || getEmptyUnreadInfo();
+					const unreadInfo = updateGroupUnreadInfo(room, currentUnreadData);
+					unreadGroupData.set(key, unreadInfo);
+				}
+			};
+
+			rooms.forEach((room) => {
+				if (room.archived) {
+					return;
+				}
+
+				if (hasMention(room)) {
+					setGroupRoom('mentions', room);
+				}
+
+				if (favoritesEnabled && room.f) {
+					setGroupRoom('favorites', room);
+				}
+
+				if (isTeamRoom(room)) {
+					setGroupRoom('teams', room);
+				}
+
+				if (isDiscussionEnabled && isDiscussion(room)) {
+					setGroupRoom('discussions', room);
+				}
+
+				if ((isPrivateRoom(room) || isPublicRoom(room)) && !isDiscussion(room) && !isTeamRoom(room)) {
+					setGroupRoom('channels', room);
+				}
+
+				if (isOmnichannelRoom(room) && showOmnichannel) {
+					if (room.onHold) {
+						return setGroupRoom('onHold', room);
+					}
+
+					return setGroupRoom('inProgress', room);
+				}
+
+				if (isDirectMessageRoom(room)) {
+					setGroupRoom('directMessages', room);
+				}
+
+				setGroupRoom('all', room);
+			});
+
+			return [groups, unreadGroupData];
+		}, [rooms, showOmnichannel, queue, favoritesEnabled, isDiscussionEnabled]),
+		50,
+	);
+};
+
+const RoomsNavigationContextProvider = ({ children }: { children: ReactNode }) => {
+	const { currentFilter, setFilter } = useSidePanelFilters();
+	const { parentRid } = useSidePanelParentRid();
+
+	const [groups, unreadGroupData] = useRoomsGroups();
+
+	const contextValue = useMemo(() => {
+		return {
+			currentFilter,
+			setFilter,
+			groups,
+			unreadGroupData,
+			parentRid,
+		};
+	}, [parentRid, currentFilter, setFilter, groups, unreadGroupData]);
+
+	return <RoomsNavigationContext.Provider value={contextValue}>{children}</RoomsNavigationContext.Provider>;
+};
+
+export default RoomsNavigationContextProvider;
diff --git a/apps/meteor/client/views/navigation/sidepanel/SidePanel.tsx b/apps/meteor/client/views/navigation/sidepanel/SidePanel.tsx
new file mode 100644
index 0000000000000..11f96a212cdba
--- /dev/null
+++ b/apps/meteor/client/views/navigation/sidepanel/SidePanel.tsx
@@ -0,0 +1,75 @@
+import { isLivechatInquiryRecord, type ILivechatInquiryRecord } from '@rocket.chat/core-typings';
+import { Box, IconButton, Sidepanel, SidepanelHeader, SidepanelHeaderTitle, SidepanelListItem, ToggleSwitch } from '@rocket.chat/fuselage';
+import { useLayout, type SubscriptionWithRoom } from '@rocket.chat/ui-contexts';
+import { memo, useId, useRef } from 'react';
+import { useTranslation } from 'react-i18next';
+import { Virtuoso } from 'react-virtuoso';
+
+import SidePanelNoResults from './SidePanelNoResults';
+import RoomSidePanelItem from './SidepanelItem/RoomSidePanelItem';
+import SidepanelListWrapper from './SidepanelListWrapper';
+import { VirtualizedScrollbars } from '../../../components/CustomScrollbars';
+import { useOpenedRoom } from '../../../lib/RoomManager';
+import { usePreventDefault } from '../../../sidebarv2/hooks/usePreventDefault';
+import { useIsRoomFilter, type AllGroupsKeys } from '../contexts/RoomsNavigationContext';
+import InquireSidePanelItem from './omnichannel/InquireSidePanelItem';
+
+type SidePanelProps = {
+	title: string;
+	currentTab: AllGroupsKeys;
+	unreadOnly: boolean;
+	toggleUnreadOnly: () => void;
+	rooms: (SubscriptionWithRoom | ILivechatInquiryRecord)[];
+};
+
+const SidePanel = ({ title, currentTab, unreadOnly, toggleUnreadOnly, rooms }: SidePanelProps) => {
+	const { t } = useTranslation();
+	const ref = useRef(null);
+	const unreadFieldId = useId();
+	const openedRoom = useOpenedRoom();
+	const {
+		isTablet,
+		sidePanel: { closeSidePanel },
+	} = useLayout();
+	const isRoomFilter = useIsRoomFilter();
+
+	usePreventDefault(ref);
+
+	return (
+		<Sidepanel role='tabpanel' aria-label={t('Side_panel')}>
+			<SidepanelHeader role='heading' aria-label={title}>
+				<Box withTruncatedText display='flex' alignItems='center'>
+					{isTablet && <IconButton mie={8} icon='arrow-back' title={t('Back')} small onClick={closeSidePanel} />}
+					<SidepanelHeaderTitle>{title}</SidepanelHeaderTitle>
+				</Box>
+				<Box display='flex' alignItems='center'>
+					<Box htmlFor={unreadFieldId} is='label' fontScale='c1' mie={8}>
+						{t('Unread')}
+					</Box>
+					<ToggleSwitch id={unreadFieldId} checked={unreadOnly} onChange={toggleUnreadOnly} />
+				</Box>
+			</SidepanelHeader>
+			<Box pb={8} h='full' ref={ref}>
+				{rooms && rooms.length === 0 && (
+					<SidePanelNoResults currentTab={currentTab} unreadOnly={unreadOnly} toggleUnreadOnly={toggleUnreadOnly} />
+				)}
+				<VirtualizedScrollbars>
+					<Virtuoso
+						totalCount={rooms.length}
+						data={rooms}
+						components={{ Item: SidepanelListItem, List: SidepanelListWrapper }}
+						itemContent={(_, room) => {
+							if (isLivechatInquiryRecord(room)) {
+								return <InquireSidePanelItem openedRoom={openedRoom} room={room} />;
+							}
+
+							return <RoomSidePanelItem openedRoom={openedRoom} room={room} isRoomFilter={isRoomFilter} />;
+						}}
+					/>
+				</VirtualizedScrollbars>
+			</Box>
+		</Sidepanel>
+	);
+};
+
+export default memo(SidePanel);
diff --git a/apps/meteor/client/views/navigation/sidepanel/SidePanelNoResults.tsx b/apps/meteor/client/views/navigation/sidepanel/SidePanelNoResults.tsx
new file mode 100644
index 0000000000000..141780981d431
--- /dev/null
+++ b/apps/meteor/client/views/navigation/sidepanel/SidePanelNoResults.tsx
@@ -0,0 +1,116 @@
+import { useTranslation } from 'react-i18next';
+
+import GenericNoResults from '../../../components/GenericNoResults';
+import { sidePanelFiltersConfig } from '../contexts/RoomsNavigationContext';
+import type { AllGroupsKeys } from '../contexts/RoomsNavigationContext';
+
+type SidePanelNoResultsProps = { currentTab: AllGroupsKeys; unreadOnly: boolean; toggleUnreadOnly: () => void };
+
+const SidePanelNoResults = ({ currentTab, unreadOnly, toggleUnreadOnly }: SidePanelNoResultsProps) => {
+	const { t } = useTranslation();
+
+	const buttonProps = unreadOnly
+		? {
+				buttonAction: toggleUnreadOnly,
+				buttonTitle: t('Show_all'),
+				buttonPrimary: false,
+			}
+		: {};
+
+	switch (currentTab) {
+		case 'mentions':
+			return (
+				<GenericNoResults
+					icon={sidePanelFiltersConfig.mentions.icon}
+					title={unreadOnly ? t('No_unread_mentions') : t('No_mentions')}
+					description={unreadOnly ? t('No_unread_mentions_description') : t('No_mentions_description')}
+					{...buttonProps}
+				/>
+			);
+		case 'favorites':
+			return (
+				<GenericNoResults
+					icon={sidePanelFiltersConfig.favorites.icon}
+					title={unreadOnly ? t('No_unread_favorite_rooms') : t('No_favorite_rooms')}
+					description={unreadOnly ? t('No_unread_favorite_rooms_description') : t('No_favorite_rooms_description')}
+					{...buttonProps}
+				/>
+			);
+		case 'discussions':
+			return (
+				<GenericNoResults
+					icon={sidePanelFiltersConfig.discussions.icon}
+					title={unreadOnly ? t('No_unread_discussions') : t('No_discussions')}
+					description={unreadOnly ? t('No_unread_discussions_description') : t('No_discussions_description')}
+					{...buttonProps}
+				/>
+			);
+		case 'inProgress':
+			return (
+				<GenericNoResults
+					icon={sidePanelFiltersConfig.inProgress.icon}
+					title={unreadOnly ? t('No_unread_chats_in_progress') : t('No_chats_in_progress')}
+					description={unreadOnly ? t('No_unread_chats_in_progress_description') : t('No_chats_in_progress_description')}
+					{...buttonProps}
+				/>
+			);
+		case 'queue':
+			return (
+				<GenericNoResults
+					icon={sidePanelFiltersConfig.queue.icon}
+					title={unreadOnly ? t('No_unread_chats_in_queue') : t('No_chats_in_queue')}
+					description={unreadOnly ? t('No_unread_chats_in_queue_description') : t('No_chats_in_queue_description')}
+					{...buttonProps}
+				/>
+			);
+		case 'onHold':
+			return (
+				<GenericNoResults
+					icon={sidePanelFiltersConfig.onHold.icon}
+					title={unreadOnly ? t('No_unread_chats_on_hold') : t('No_chats_on_hold')}
+					description={unreadOnly ? t('No_unread_chats_on_hold_description') : t('No_chats_on_hold_description')}
+					{...buttonProps}
+				/>
+			);
+		case 'teams':
+			return (
+				<GenericNoResults
+					icon={null}
+					title={unreadOnly ? t('No_unread_channels_or_discussions') : t('No_channels_or_discussions')}
+					description={unreadOnly ? t('No_unread_channels_or_discussions_description') : t('No_channels_or_discussions_description')}
+					{...buttonProps}
+				/>
+			);
+		case 'channels':
+			return (
+				<GenericNoResults
+					icon={null}
+					title={unreadOnly ? t('No_unread_discussions') : t('No_discussions')}
+					description={
+						unreadOnly ? t('No_unread_discussions_channels_filter_description') : t('No_discussions_channels_filter_description')
+					}
+					{...buttonProps}
+				/>
+			);
+		case 'directMessages':
+			return (
+				<GenericNoResults
+					icon={null}
+					title={unreadOnly ? t('No_unread_discussions') : t('No_discussions')}
+					description={unreadOnly ? t('No_unread_discussions_dms_filter_description') : t('No_discussions_dms_filter_description')}
+					{...buttonProps}
+				/>
+			);
+		default:
+			return (
+				<GenericNoResults
+					icon='inbox'
+					title={unreadOnly ? t('No_unread_rooms') : t('No_rooms')}
+					description={unreadOnly ? t('No_unread_rooms_description') : t('No_rooms_description')}
+					{...buttonProps}
+				/>
+			);
+	}
+};
+
+export default SidePanelNoResults;
diff --git a/apps/meteor/client/views/navigation/sidepanel/SidePanelRouter.tsx b/apps/meteor/client/views/navigation/sidepanel/SidePanelRouter.tsx
new file mode 100644
index 0000000000000..90c2d0c866c2d
--- /dev/null
+++ b/apps/meteor/client/views/navigation/sidepanel/SidePanelRouter.tsx
@@ -0,0 +1,39 @@
+import SidePanelAll from './tabs/SidePanelAll';
+import { useRoomsListContext, useSidePanelFilter } from '../contexts/RoomsNavigationContext';
+import SidePanelInProgress from './omnichannel/tabs/SidePanelInProgress';
+import SidePanelQueue from './omnichannel/tabs/SidePanelQueue';
+import SidePanelOnHold from './omnichannel/tabs/SidepanelOnHold';
+import SidePanelDiscussions from './tabs/SidePanelDiscussions';
+import SidePanelFavorites from './tabs/SidePanelFavorites';
+import SidePanelMentions from './tabs/SidePanelMentions';
+import SidePanelRooms from './tabs/SidePanelRooms';
+
+const SidePanelRouter = () => {
+	const [currentTab] = useSidePanelFilter();
+	const { parentRid } = useRoomsListContext();
+
+	switch (currentTab) {
+		case 'all':
+			return <SidePanelAll />;
+		case 'mentions':
+			return <SidePanelMentions />;
+		case 'favorites':
+			return <SidePanelFavorites />;
+		case 'discussions':
+			return <SidePanelDiscussions />;
+		case 'teams':
+		case 'channels':
+		case 'directMessages':
+			return parentRid ? <SidePanelRooms parentRid={parentRid} /> : <SidePanelAll />;
+		case 'inProgress':
+			return <SidePanelInProgress />;
+		case 'onHold':
+			return <SidePanelOnHold />;
+		case 'queue':
+			return <SidePanelQueue />;
+		default:
+			return <SidePanelAll />;
+	}
+};
+
+export default SidePanelRouter;
diff --git a/apps/meteor/client/sidebarv2/RoomMenu.tsx b/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/RoomMenu.tsx
similarity index 78%
rename from apps/meteor/client/sidebarv2/RoomMenu.tsx
rename to apps/meteor/client/views/navigation/sidepanel/SidepanelItem/RoomMenu.tsx
index c6f2561ca9081..51dfdc06273e1 100644
--- a/apps/meteor/client/sidebarv2/RoomMenu.tsx
+++ b/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/RoomMenu.tsx
@@ -1,5 +1,6 @@
 import type { RoomType } from '@rocket.chat/core-typings';
 import { GenericMenu } from '@rocket.chat/ui-client';
+import type { LocationPathname } from '@rocket.chat/ui-contexts';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import { memo } from 'react';
 
@@ -15,13 +16,14 @@ type RoomMenuProps = {
 	cl?: boolean;
 	name?: string;
 	hideDefaultOptions: boolean;
+	href: LocationPathname | undefined;
 };
 
-const RoomMenu = ({ rid, unread, threadUnread, alert, roomOpen, type, cl, name = '', hideDefaultOptions = false }: RoomMenuProps) => {
+const RoomMenu = ({ rid, unread, threadUnread, alert, roomOpen, type, cl, name = '', hideDefaultOptions = false, href }: RoomMenuProps) => {
 	const t = useTranslation();
 
 	const isUnread = alert || unread || threadUnread;
-	const sections = useRoomMenuActions({ rid, type, name, isUnread, cl, roomOpen, hideDefaultOptions });
+	const sections = useRoomMenuActions({ rid, type, name, isUnread, cl, roomOpen, hideDefaultOptions, href });
 
 	return <GenericMenu detached title={t('Options')} mini aria-keyshortcuts='alt' sections={sections} />;
 };
diff --git a/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/RoomSidePanelItem.tsx b/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/RoomSidePanelItem.tsx
new file mode 100644
index 0000000000000..6706d99fc5d97
--- /dev/null
+++ b/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/RoomSidePanelItem.tsx
@@ -0,0 +1,92 @@
+import { isOmnichannelRoom } from '@rocket.chat/core-typings';
+import { SidebarV2ItemBadge, SidebarV2ItemIcon as SidebarItemIcon } from '@rocket.chat/fuselage';
+import { RoomAvatar } from '@rocket.chat/ui-avatar';
+import { useUserId, type SubscriptionWithRoom } from '@rocket.chat/ui-contexts';
+import { memo } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import RoomMenu from './RoomMenu';
+import SidePanelParent from './SidePanelParent';
+import SidePanelItem from './SidepanelItem';
+import { RoomIcon } from '../../../../components/RoomIcon';
+import { roomCoordinator } from '../../../../lib/rooms/roomCoordinator';
+import { isIOsDevice } from '../../../../lib/utils/isIOsDevice';
+import { useOmnichannelPriorities } from '../../../../omnichannel/hooks/useOmnichannelPriorities';
+import { useUnreadDisplay } from '../../../../sidebarv2/hooks/useUnreadDisplay';
+import { getNavigationMessagePreview } from '../../lib/getNavigationMessagePreview';
+import SidePanelOmnichannelBadges from '../omnichannel/SidePanelOmnichannelBadges';
+
+type RoomSidePanelItemProps = {
+	room: SubscriptionWithRoom;
+	openedRoom?: string;
+	isRoomFilter?: boolean;
+};
+
+const RoomSidePanelItem = ({ room, openedRoom, isRoomFilter, ...props }: RoomSidePanelItemProps) => {
+	const { t } = useTranslation();
+	const isAnonymous = !useUserId();
+
+	const { unreadTitle, unreadVariant, showUnread, highlightUnread: highlighted, unreadCount } = useUnreadDisplay(room);
+	const { unread = 0, alert, rid, t: type, cl } = room;
+
+	const time = 'lastMessage' in room ? room.lastMessage?.ts : undefined;
+	const message = getNavigationMessagePreview(room, room.lastMessage, t);
+	const title = roomCoordinator.getRoomName(room.t, room) || '';
+	const href = roomCoordinator.getRouteLink(room.t, room) || '';
+
+	const badges = (
+		<>
+			{isOmnichannelRoom(room) && <SidePanelOmnichannelBadges room={room} />}
+			{showUnread && (
+				<SidebarV2ItemBadge
+					variant={unreadVariant}
+					title={unreadTitle}
+					role='status'
+					aria-label={t('__unreadTitle__from__roomTitle__', { unreadTitle, roomTitle: title })}
+				>
+					<span aria-hidden>{unreadCount.total}</span>
+				</SidebarV2ItemBadge>
+			)}
+		</>
+	);
+
+	const isQueued = isOmnichannelRoom(room) && room.status === 'queued';
+	const { enabled: isPriorityEnabled } = useOmnichannelPriorities();
+
+	const parentRoomId = Boolean(room.prid || (room.teamId && !room.teamMain));
+
+	const menu =
+		!isIOsDevice && !isAnonymous && (!isQueued || (isQueued && isPriorityEnabled)) ? (
+			<RoomMenu
+				alert={alert}
+				threadUnread={unreadCount.threads > 0}
+				rid={rid}
+				unread={!!unread}
+				roomOpen={rid === openedRoom}
+				type={type}
+				cl={cl}
+				name={title}
+				hideDefaultOptions={isQueued}
+				href={href || undefined}
+			/>
+		) : undefined;
+
+	return (
+		<SidePanelItem
+			href={href}
+			selected={rid === openedRoom}
+			title={title}
+			avatar={<RoomAvatar size='x20' room={{ ...room, _id: room.rid || room._id, type: room.t }} />}
+			icon={<SidebarItemIcon highlighted={highlighted} icon={<RoomIcon room={room} placement='sidebar' size='x20' />} />}
+			unread={highlighted}
+			time={time}
+			subtitle={message ? <span className='message-body--unstyled' dangerouslySetInnerHTML={{ __html: message }} /> : null}
+			parentRoom={!isRoomFilter && parentRoomId && <SidePanelParent room={room} />}
+			badges={badges}
+			menu={menu}
+			{...props}
+		/>
+	);
+};
+
+export default memo(RoomSidePanelItem);
diff --git a/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/SidePanelParent.tsx b/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/SidePanelParent.tsx
new file mode 100644
index 0000000000000..7463cb392d895
--- /dev/null
+++ b/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/SidePanelParent.tsx
@@ -0,0 +1,15 @@
+import { type SubscriptionWithRoom } from '@rocket.chat/ui-contexts';
+import { memo } from 'react';
+
+import SidePanelParentRoom from './SidePanelParentRoom';
+import SidePanelParentTeam from './SidePanelParentTeam';
+
+const SidePanelParent = ({ room }: { room: SubscriptionWithRoom }) => {
+	if (room.prid) {
+		return <SidePanelParentRoom prid={room.prid} />;
+	}
+
+	return room.teamId && !room.teamMain && <SidePanelParentTeam room={room} />;
+};
+
+export default memo(SidePanelParent);
diff --git a/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/SidePanelParentRoom/SidePanelParentRoom.tsx b/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/SidePanelParentRoom/SidePanelParentRoom.tsx
new file mode 100644
index 0000000000000..55b0bde285aa5
--- /dev/null
+++ b/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/SidePanelParentRoom/SidePanelParentRoom.tsx
@@ -0,0 +1,26 @@
+import type { ISubscription } from '@rocket.chat/core-typings';
+import { isPrivateRoom } from '@rocket.chat/core-typings';
+import { useButtonPattern } from '@rocket.chat/fuselage-hooks';
+
+import { roomCoordinator } from '../../../../../lib/rooms/roomCoordinator';
+import SidePanelTag from '../SidePanelTag';
+import SidePanelTagIcon from '../SidePanelTagIcon';
+
+const SidePanelParentRoom = ({ subscription }: { subscription: ISubscription }) => {
+	const icon = isPrivateRoom(subscription) ? 'hashtag-lock' : 'hashtag';
+	const roomName = roomCoordinator.getRoomName(subscription?.t, subscription);
+
+	const buttonProps = useButtonPattern((e) => {
+		e.preventDefault();
+		roomCoordinator.openRouteLink(subscription.t, { ...subscription });
+	});
+
+	return (
+		<SidePanelTag {...buttonProps}>
+			{icon && <SidePanelTagIcon icon={{ name: icon }} />}
+			{roomName}
+		</SidePanelTag>
+	);
+};
+
+export default SidePanelParentRoom;
diff --git a/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/SidePanelParentRoom/SidePanelParentRoomWithData.tsx b/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/SidePanelParentRoom/SidePanelParentRoomWithData.tsx
new file mode 100644
index 0000000000000..27883dff31005
--- /dev/null
+++ b/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/SidePanelParentRoom/SidePanelParentRoomWithData.tsx
@@ -0,0 +1,15 @@
+import { useUserSubscription } from '@rocket.chat/ui-contexts';
+
+import SidePanelParentRoom from './SidePanelParentRoom';
+
+const SidePanelParentRoomWithData = ({ prid }: { prid: string }) => {
+	const subscription = useUserSubscription(prid);
+
+	if (!subscription) {
+		return null;
+	}
+
+	return <SidePanelParentRoom subscription={subscription} />;
+};
+
+export default SidePanelParentRoomWithData;
diff --git a/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/SidePanelParentRoom/index.ts b/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/SidePanelParentRoom/index.ts
new file mode 100644
index 0000000000000..9e29782a22e5a
--- /dev/null
+++ b/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/SidePanelParentRoom/index.ts
@@ -0,0 +1 @@
+export { default } from './SidePanelParentRoomWithData';
diff --git a/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/SidePanelParentTeam.tsx b/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/SidePanelParentTeam.tsx
new file mode 100644
index 0000000000000..70d2c94f6738a
--- /dev/null
+++ b/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/SidePanelParentTeam.tsx
@@ -0,0 +1,28 @@
+import { useButtonPattern } from '@rocket.chat/fuselage-hooks';
+import type { SubscriptionWithRoom } from '@rocket.chat/ui-contexts';
+
+import SidePanelTag from './SidePanelTag';
+import SidePanelTagIcon from './SidePanelTagIcon';
+import { useParentTeamData } from './useParentTeamData';
+
+const SidePanelParentTeam = ({ room }: { room: SubscriptionWithRoom }) => {
+	const { redirectToMainRoom, teamName, shouldDisplayTeam, teamInfoError, isTeamPublic } = useParentTeamData(room.teamId);
+
+	const buttonProps = useButtonPattern((e) => {
+		e.preventDefault();
+		redirectToMainRoom();
+	});
+
+	if (teamInfoError || !shouldDisplayTeam) {
+		return null;
+	}
+
+	return (
+		<SidePanelTag {...buttonProps}>
+			<SidePanelTagIcon icon={{ name: isTeamPublic ? 'team' : 'team-lock' }} />
+			{teamName}
+		</SidePanelTag>
+	);
+};
+
+export default SidePanelParentTeam;
diff --git a/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/SidePanelTag.tsx b/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/SidePanelTag.tsx
new file mode 100644
index 0000000000000..1eaf4b47aa7ce
--- /dev/null
+++ b/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/SidePanelTag.tsx
@@ -0,0 +1,8 @@
+import { Tag } from '@rocket.chat/fuselage';
+import type { ComponentProps } from 'react';
+
+const SidePanelTag = (props: ComponentProps<typeof Tag>) => (
+	<Tag role='button' tabIndex={0} {...props} maxWidth='50%' flexShrink={1} flexGrow={0} />
+);
+
+export default SidePanelTag;
diff --git a/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/SidePanelTagIcon.tsx b/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/SidePanelTagIcon.tsx
new file mode 100644
index 0000000000000..d2704a7e97a17
--- /dev/null
+++ b/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/SidePanelTagIcon.tsx
@@ -0,0 +1,7 @@
+import { Icon } from '@rocket.chat/fuselage';
+import type { ComponentProps } from 'react';
+
+const SidePanelTagIcon = ({ icon }: { icon: Pick<ComponentProps<typeof Icon>, 'name' | 'color'> | null }) =>
+	icon ? <Icon size='x12' mie={4} {...icon} /> : null;
+
+export default SidePanelTagIcon;
diff --git a/apps/meteor/client/sidebarv2/Item/Extended.tsx b/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/SidepanelItem.tsx
similarity index 51%
rename from apps/meteor/client/sidebarv2/Item/Extended.tsx
rename to apps/meteor/client/views/navigation/sidepanel/SidepanelItem/SidepanelItem.tsx
index ce9faea597849..4f47156711bdd 100644
--- a/apps/meteor/client/sidebarv2/Item/Extended.tsx
+++ b/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/SidepanelItem.tsx
@@ -1,53 +1,49 @@
 import {
+	IconButton,
 	SidebarV2Item,
 	SidebarV2ItemAvatarWrapper,
 	SidebarV2ItemCol,
-	SidebarV2ItemRow,
-	SidebarV2ItemTitle,
-	SidebarV2ItemTimestamp,
 	SidebarV2ItemContent,
 	SidebarV2ItemMenu,
-	IconButton,
+	SidebarV2ItemRow,
+	SidebarV2ItemTimestamp,
+	SidebarV2ItemTitle,
 } from '@rocket.chat/fuselage';
-import type { HTMLAttributes, ReactNode } from 'react';
+import { useLayout } from '@rocket.chat/ui-contexts';
+import type { ReactElement, ReactNode } from 'react';
 import { memo, useState } from 'react';
 
-import { useShortTimeAgo } from '../../hooks/useTimeAgo';
+import { useShortTimeAgo } from '../../../../hooks/useTimeAgo';
 
-type ExtendedProps = {
-	icon?: ReactNode;
-	title: ReactNode;
-	avatar?: ReactNode;
-	actions?: ReactNode;
-	href?: string;
-	time?: any;
-	menu?: () => ReactNode;
-	subtitle?: ReactNode;
-	badges?: ReactNode;
-	unread?: boolean;
-	selected?: boolean;
-	menuOptions?: any;
-	titleIcon?: ReactNode;
-	threadUnread?: boolean;
-} & Omit<HTMLAttributes<HTMLElement>, 'is'>;
+type SidePanelItemProps = {
+	href: string;
+	selected: boolean;
+	title: string;
+	avatar: ReactNode;
+	icon: ReactNode;
+	unread: boolean;
+	time?: Date;
+	subtitle: ReactElement | null;
+	parentRoom?: ReactNode;
+	badges?: ReactElement;
+	menu?: ReactElement;
+};
 
-const Extended = ({
-	icon,
+const SidePanelItem = ({
+	href,
+	selected,
 	title,
 	avatar,
-	actions,
-	href,
+	icon,
+	unread,
 	time,
-	menu,
-	menuOptions: _menuOptions,
-	subtitle = '',
-	titleIcon: _titleIcon,
+	subtitle,
+	parentRoom,
 	badges,
-	threadUnread: _threadUnread,
-	unread,
-	selected,
+	menu,
 	...props
-}: ExtendedProps) => {
+}: SidePanelItemProps) => {
+	const { sidebar } = useLayout();
 	const formatDate = useShortTimeAgo();
 	const [menuVisibility, setMenuVisibility] = useState(!!window.DISABLE_ANIMATION);
 
@@ -55,21 +51,30 @@ const Extended = ({
 	const handlePointerEnter = () => setMenuVisibility(true);
 
 	return (
-		<SidebarV2Item href={href} selected={selected} {...props} onFocus={handleFocus} onPointerEnter={handlePointerEnter}>
-			{avatar && <SidebarV2ItemAvatarWrapper>{avatar}</SidebarV2ItemAvatarWrapper>}
+		<SidebarV2Item
+			{...props}
+			href={href}
+			onClick={() => !selected && sidebar.toggle()}
+			selected={selected}
+			onFocus={handleFocus}
+			onPointerEnter={handlePointerEnter}
+			aria-label={title}
+			aria-selected={selected}
+		>
 			<SidebarV2ItemCol>
 				<SidebarV2ItemRow>
+					{avatar && <SidebarV2ItemAvatarWrapper>{avatar}</SidebarV2ItemAvatarWrapper>}
 					{icon}
 					<SidebarV2ItemTitle unread={unread}>{title}</SidebarV2ItemTitle>
 					{time && <SidebarV2ItemTimestamp>{formatDate(time)}</SidebarV2ItemTimestamp>}
 				</SidebarV2ItemRow>
 				<SidebarV2ItemRow>
 					<SidebarV2ItemContent unread={unread}>{subtitle}</SidebarV2ItemContent>
+					{parentRoom}
 					{badges}
-					{actions}
 					{menu && (
 						<SidebarV2ItemMenu>
-							{menuVisibility ? menu() : <IconButton tabIndex={-1} aria-hidden mini rcx-sidebar-v2-item__menu icon='kebab' />}
+							{menuVisibility ? menu : <IconButton tabIndex={-1} aria-hidden mini rcx-sidebar-v2-item__menu icon='kebab' />}
 						</SidebarV2ItemMenu>
 					)}
 				</SidebarV2ItemRow>
@@ -78,4 +83,4 @@ const Extended = ({
 	);
 };
 
-export default memo(Extended);
+export default memo(SidePanelItem);
diff --git a/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/index.ts b/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/index.ts
new file mode 100644
index 0000000000000..6cdec05e00a5e
--- /dev/null
+++ b/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/index.ts
@@ -0,0 +1 @@
+export { default } from './SidepanelItem';
diff --git a/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/useParentTeamData.ts b/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/useParentTeamData.ts
new file mode 100644
index 0000000000000..7dddf12ac6d8d
--- /dev/null
+++ b/apps/meteor/client/views/navigation/sidepanel/SidepanelItem/useParentTeamData.ts
@@ -0,0 +1,51 @@
+import type { ITeam } from '@rocket.chat/core-typings';
+import { TEAM_TYPE } from '@rocket.chat/core-typings';
+import { useUserId } from '@rocket.chat/ui-contexts';
+
+import { useTeamInfoQuery } from '../../../../hooks/useTeamInfoQuery';
+import { goToRoomById } from '../../../../lib/utils/goToRoomById';
+import { useUserTeamsQuery } from '../../../room/hooks/useUserTeamsQuery';
+
+type APIErrorResult = { success: boolean; error: string };
+
+export const useParentTeamData = (teamId?: ITeam['_id']) => {
+	const userId = useUserId();
+
+	if (!teamId) {
+		throw new Error('invalid rid');
+	}
+
+	if (!userId) {
+		throw new Error('invalid uid');
+	}
+
+	const {
+		data: teamInfo,
+		isLoading: teamInfoLoading,
+		isError: teamInfoError,
+	} = useTeamInfoQuery(teamId, { retry: (_, error) => (error as unknown as APIErrorResult)?.error !== 'unauthorized' });
+
+	const { data: userTeams, isLoading: userTeamsLoading } = useUserTeamsQuery(userId);
+
+	const userBelongsToTeam = Boolean(userTeams?.find((team) => team._id === teamId)) || false;
+	const isTeamPublic = teamInfo?.type === TEAM_TYPE.PUBLIC;
+	const shouldDisplayTeam = isTeamPublic || userBelongsToTeam;
+
+	const redirectToMainRoom = (): void => {
+		const rid = teamInfo?.roomId;
+		if (!rid) {
+			return;
+		}
+
+		goToRoomById(rid);
+	};
+
+	return {
+		teamName: teamInfo?.name,
+		isLoading: userTeamsLoading || teamInfoLoading,
+		redirectToMainRoom,
+		teamInfoError,
+		shouldDisplayTeam,
+		isTeamPublic,
+	};
+};
diff --git a/apps/meteor/client/views/room/RoomSidepanel/RoomSidepanelListWrapper.tsx b/apps/meteor/client/views/navigation/sidepanel/SidepanelListWrapper.tsx
similarity index 70%
rename from apps/meteor/client/views/room/RoomSidepanel/RoomSidepanelListWrapper.tsx
rename to apps/meteor/client/views/navigation/sidepanel/SidepanelListWrapper.tsx
index b600be8de3545..b03f022a24672 100644
--- a/apps/meteor/client/views/room/RoomSidepanel/RoomSidepanelListWrapper.tsx
+++ b/apps/meteor/client/views/navigation/sidepanel/SidepanelListWrapper.tsx
@@ -6,9 +6,9 @@ import { useTranslation } from 'react-i18next';
 
 import { useSidebarListNavigation } from '../../../sidebar/RoomList/useSidebarListNavigation';
 
-type RoomListWrapperProps = HTMLAttributes<HTMLDivElement>;
+type SidepanelListWrapperProps = HTMLAttributes<HTMLDivElement>;
 
-const RoomSidepanelListWrapper = forwardRef(function RoomListWrapper(props: RoomListWrapperProps, ref: ForwardedRef<HTMLDivElement>) {
+const SidepanelListWrapper = forwardRef(function SidepanelListWrapper(props: SidepanelListWrapperProps, ref: ForwardedRef<HTMLDivElement>) {
 	const { t } = useTranslation();
 	const { sidebarListRef } = useSidebarListNavigation();
 	const mergedRefs = useMergedRefs(ref, sidebarListRef);
@@ -16,4 +16,4 @@ const RoomSidepanelListWrapper = forwardRef(function RoomListWrapper(props: Room
 	return <SidepanelList aria-label={t('Channels')} ref={mergedRefs} {...props} />;
 });
 
-export default RoomSidepanelListWrapper;
+export default SidepanelListWrapper;
diff --git a/apps/meteor/client/views/navigation/sidepanel/hooks/useChannelsChildrenList.ts b/apps/meteor/client/views/navigation/sidepanel/hooks/useChannelsChildrenList.ts
new file mode 100644
index 0000000000000..3457d1c9bcdff
--- /dev/null
+++ b/apps/meteor/client/views/navigation/sidepanel/hooks/useChannelsChildrenList.ts
@@ -0,0 +1,41 @@
+import type { ISubscription } from '@rocket.chat/core-typings';
+import type { SubscriptionWithRoom } from '@rocket.chat/ui-contexts';
+import { useShallow } from 'zustand/shallow';
+
+import { pipe } from '../../../../lib/cachedStores';
+import { Subscriptions } from '../../../../stores';
+
+const filterUnread = (subscription: ISubscription, unreadOnly: boolean) => !unreadOnly || subscription.unread > 0;
+
+const sortByLmPipe = pipe<SubscriptionWithRoom>().sortByField('lm', -1);
+
+/**
+ * This helper function is used to ensure that the main room (main team room or parent's discussion room)
+ * is always at the top of the list.
+ */
+const getMainRoomAndSort = (records: SubscriptionWithRoom[]) => {
+	const [mainRoom, ...rest] = records;
+	return [mainRoom, ...sortByLmPipe.apply(rest)];
+};
+
+export const useChannelsChildrenList = (parentRid: string, unreadOnly: boolean, teamId?: string) => {
+	return Subscriptions.use(
+		useShallow((state) => {
+			const records = state.filter((subscription) => {
+				if (parentRid === subscription.prid || parentRid === subscription.rid) {
+					return filterUnread(subscription, unreadOnly);
+				}
+				if (teamId && subscription.teamId === teamId) {
+					return filterUnread(subscription, unreadOnly);
+				}
+				return false;
+			});
+
+			if (!records.length) {
+				return [];
+			}
+
+			return getMainRoomAndSort(records);
+		}),
+	);
+};
diff --git a/apps/meteor/client/views/navigation/sidepanel/hooks/useRoomMenuActions.spec.ts b/apps/meteor/client/views/navigation/sidepanel/hooks/useRoomMenuActions.spec.ts
new file mode 100644
index 0000000000000..8430d59662114
--- /dev/null
+++ b/apps/meteor/client/views/navigation/sidepanel/hooks/useRoomMenuActions.spec.ts
@@ -0,0 +1,106 @@
+import { mockAppRoot } from '@rocket.chat/mock-providers';
+import type { SubscriptionWithRoom } from '@rocket.chat/ui-contexts';
+import { renderHook } from '@testing-library/react';
+
+import { useRoomMenuActions } from './useRoomMenuActions';
+import { createFakeRoom, createFakeSubscription } from '../../../../../tests/mocks/data';
+
+const mockRoom = createFakeRoom({ _id: 'room1', t: 'c', name: 'room1', fname: 'Room 1' });
+const mockSubscription = createFakeSubscription({ name: 'room1', t: 'c', disableNotifications: false, rid: 'room1' });
+
+jest.mock('../../../../../client/lib/rooms/roomCoordinator', () => ({
+	roomCoordinator: {
+		getRoomDirectives: () => ({
+			getUiText: () => 'leaveWarning',
+		}),
+	},
+}));
+
+jest.mock('../../../../../app/ui-utils/client', () => ({
+	LegacyRoomManager: {
+		close: jest.fn(),
+	},
+}));
+
+// TODO: Update this mock when we get the mocked OmnichannelContext working
+jest.mock('../../../../omnichannel/hooks/useOmnichannelPrioritiesMenu', () => ({
+	useOmnichannelPrioritiesMenu: jest.fn(() => [{ id: 'priority', content: 'Priority', icon: 'priority', onClick: jest.fn() }]),
+}));
+
+const mockHookProps = {
+	rid: 'room1',
+	type: 'c',
+	name: 'Room 1',
+	isUnread: true,
+	cl: true,
+	roomOpen: true,
+	hideDefaultOptions: false,
+	href: '/channel/room1',
+} as const;
+
+describe('useRoomMenuActions', () => {
+	it('should return all menu options for normal rooms', () => {
+		const { result } = renderHook(() => useRoomMenuActions(mockHookProps), {
+			wrapper: mockAppRoot()
+				.withSubscriptions([{ ...mockSubscription, rid: 'room1' }] as unknown as SubscriptionWithRoom[])
+				.withPermission('leave-c')
+				.withPermission('leave-p')
+				.withSetting('Favorite_Rooms', true)
+				.build(),
+		});
+
+		const actions = result.current;
+		expect(actions).toHaveLength(2);
+		expect(actions[0].items).toHaveLength(4);
+		expect(actions[1].title).toBe('Notifications');
+		expect(actions[1].items).toHaveLength(2);
+	});
+
+	it('should return priorities section for omnichannel room', () => {
+		const { result } = renderHook(() => useRoomMenuActions({ ...mockHookProps, type: 'l' }), {
+			wrapper: mockAppRoot()
+				.withSubscriptions([{ ...mockSubscription, ...mockRoom, t: 'l' }] as unknown as SubscriptionWithRoom[])
+				.withPermission('leave-c')
+				.withPermission('leave-p')
+				.withSetting('Favorite_Rooms', true)
+				.build(),
+		});
+
+		expect(result.current.length).toBe(2);
+		expect(result.current[1].title).toBe('Priorities');
+		expect(result.current.some((section) => section.title === 'Notifications')).toBe(false);
+		expect(result.current[0].items).toHaveLength(2);
+		expect(result.current[0].title).toBe('');
+	});
+
+	it('should not return any menu option if hideDefaultOptions', () => {
+		const { result } = renderHook(() => useRoomMenuActions({ ...mockHookProps, hideDefaultOptions: true }), {
+			wrapper: mockAppRoot()
+				.withSubscriptions([{ ...mockSubscription, ...mockRoom }] as unknown as SubscriptionWithRoom[])
+				.withPermission('leave-c')
+				.withPermission('leave-p')
+				.withSetting('Favorite_Rooms', true)
+				.build(),
+		});
+
+		expect(result.current).toHaveLength(0);
+	});
+
+	it('should not return favorite room option if setting is disabled', () => {
+		const { result } = renderHook(() => useRoomMenuActions(mockHookProps), {
+			wrapper: mockAppRoot()
+				.withSubscriptions([{ ...mockSubscription, ...mockRoom }] as unknown as SubscriptionWithRoom[])
+				.withPermission('leave-c')
+				.withPermission('leave-p')
+				.withSetting('Favorite_Rooms', false)
+				.build(),
+		});
+
+		const actions = result.current;
+		expect(actions).toHaveLength(2);
+		expect(actions[0].items).toHaveLength(3);
+		expect(actions[0].items.some((item) => item.id === 'toggleFavorite')).toBe(false);
+		expect(actions[1].title).toBe('Notifications');
+		expect(actions[1].items).toHaveLength(2);
+	});
+});
diff --git a/apps/meteor/client/views/navigation/sidepanel/hooks/useRoomMenuActions.ts b/apps/meteor/client/views/navigation/sidepanel/hooks/useRoomMenuActions.ts
new file mode 100644
index 0000000000000..cf19a6b66bed6
--- /dev/null
+++ b/apps/meteor/client/views/navigation/sidepanel/hooks/useRoomMenuActions.ts
@@ -0,0 +1,145 @@
+import type { RoomType } from '@rocket.chat/core-typings';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
+import { usePermission, useRouter, useSetting, useUserSubscription } from '@rocket.chat/ui-contexts';
+import type { LocationPathname } from '@rocket.chat/ui-contexts';
+import { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { useLeaveRoomAction } from '../../../../hooks/menuActions/useLeaveRoom';
+import { useToggleFavoriteAction } from '../../../../hooks/menuActions/useToggleFavoriteAction';
+import { useToggleNotificationAction } from '../../../../hooks/menuActions/useToggleNotificationsAction';
+import { useToggleReadAction } from '../../../../hooks/menuActions/useToggleReadAction';
+import { useHideRoomAction } from '../../../../hooks/useHideRoomAction';
+import { useOmnichannelPrioritiesMenu } from '../../../../omnichannel/hooks/useOmnichannelPrioritiesMenu';
+
+type RoomMenuActionsProps = {
+	rid: string;
+	type: RoomType;
+	name: string;
+	isUnread?: boolean;
+	cl?: boolean;
+	roomOpen?: boolean;
+	hideDefaultOptions: boolean;
+	href: LocationPathname | undefined;
+};
+
+export const useRoomMenuActions = ({
+	rid,
+	type,
+	name,
+	isUnread,
+	cl,
+	roomOpen,
+	hideDefaultOptions,
+	href,
+}: RoomMenuActionsProps): { title: string; items: GenericMenuItemProps[] }[] => {
+	const { t } = useTranslation();
+	const subscription = useUserSubscription(rid);
+	const router = useRouter();
+
+	const isFavorite = Boolean(subscription?.f);
+	const canLeaveChannel = usePermission('leave-c');
+	const canLeavePrivate = usePermission('leave-p');
+	const canFavorite = useSetting('Favorite_Rooms', true);
+	const isNotificationEnabled = !subscription?.disableNotifications;
+
+	const canLeave = ((): boolean => {
+		if (type === 'c' && !canLeaveChannel) {
+			return false;
+		}
+		if (type === 'p' && !canLeavePrivate) {
+			return false;
+		}
+		return !((cl != null && !cl) || ['d', 'l'].includes(type));
+	})();
+
+	const handleHide = useHideRoomAction({ rid, type, name }, { redirect: false });
+	const handleToggleFavorite = useToggleFavoriteAction({ rid, isFavorite });
+	const handleToggleRead = useToggleReadAction({ rid, isUnread, subscription });
+	const handleLeave = useLeaveRoomAction({ rid, type, name, roomOpen });
+	const handleToggleNotification = useToggleNotificationAction({ rid, isNotificationEnabled, roomName: name });
+
+	const isOmnichannelRoom = type === 'l';
+	const prioritiesMenu = useOmnichannelPrioritiesMenu(rid);
+
+	const roomMenuOptions = useMemo<GenericMenuItemProps[]>(() => {
+		if (hideDefaultOptions || !subscription) {
+			return [];
+		}
+
+		const options: (GenericMenuItemProps | false)[] = [
+			!isOmnichannelRoom && {
+				id: 'hideRoom',
+				icon: 'eye-off',
+				content: t('Hide'),
+				onClick: handleHide,
+			},
+			{
+				id: 'toggleRead',
+				icon: 'flag',
+				content: isUnread ? t('Mark_read') : t('Mark_unread'),
+				onClick: handleToggleRead,
+			},
+			canFavorite && {
+				id: 'toggleFavorite',
+				icon: isFavorite ? 'star-filled' : 'star',
+				content: isFavorite ? t('Unfavorite') : t('Favorite'),
+				onClick: handleToggleFavorite,
+			},
+			canLeave && {
+				id: 'leaveRoom',
+				icon: 'sign-out',
+				content: t('Leave_room'),
+				onClick: handleLeave,
+			},
+		];
+		return options.filter(Boolean) as GenericMenuItemProps[];
+	}, [
+		hideDefaultOptions,
+		subscription,
+		isOmnichannelRoom,
+		t,
+		handleHide,
+		isUnread,
+		handleToggleRead,
+		canFavorite,
+		isFavorite,
+		handleToggleFavorite,
+		canLeave,
+		handleLeave,
+	]);
+
+	const notificationsMenuOptions = useMemo<GenericMenuItemProps[]>(() => {
+		if (!subscription || hideDefaultOptions || isOmnichannelRoom || !href) {
+			return [];
+		}
+
+		const options: GenericMenuItemProps[] = [
+			{
+				id: 'turnOnNotifications',
+				icon: isNotificationEnabled ? 'bell' : 'bell-off',
+				content: isNotificationEnabled ? t('Turn_OFF') : t('Turn_ON'),
+				onClick: handleToggleNotification,
+			},
+			{
+				id: 'notifications',
+				icon: 'customize',
+				content: t('Preferences'),
+				onClick: () => router.navigate(`${href}/push-notifications` as LocationPathname),
+			},
+		];
+		return options.filter(Boolean);
+	}, [hideDefaultOptions, isNotificationEnabled, subscription, t, router, href, handleToggleNotification, isOmnichannelRoom]);
+
+	if (isOmnichannelRoom) {
+		return [
+			...(roomMenuOptions.length > 0 ? [{ title: '', items: roomMenuOptions }] : []),
+			...(prioritiesMenu.length > 0 ? [{ title: t('Priorities'), items: prioritiesMenu }] : []),
+		];
+	}
+
+	return [
+		...(roomMenuOptions.length > 0 ? [{ title: '', items: roomMenuOptions }] : []),
+		...(notificationsMenuOptions.length > 0 ? [{ title: t('Notifications'), items: notificationsMenuOptions }] : []),
+	];
+};
diff --git a/apps/meteor/client/views/navigation/sidepanel/index.ts b/apps/meteor/client/views/navigation/sidepanel/index.ts
new file mode 100644
index 0000000000000..c6a33a4bee0b4
--- /dev/null
+++ b/apps/meteor/client/views/navigation/sidepanel/index.ts
@@ -0,0 +1 @@
+export { default } from './SidePanelRouter';
diff --git a/apps/meteor/client/views/navigation/sidepanel/omnichannel/InquireSidePanelItem.tsx b/apps/meteor/client/views/navigation/sidepanel/omnichannel/InquireSidePanelItem.tsx
new file mode 100644
index 0000000000000..bc33f6f06d197
--- /dev/null
+++ b/apps/meteor/client/views/navigation/sidepanel/omnichannel/InquireSidePanelItem.tsx
@@ -0,0 +1,78 @@
+import { isOmnichannelRoom } from '@rocket.chat/core-typings';
+import { SidebarV2ItemIcon as SidebarItemIcon } from '@rocket.chat/fuselage';
+import { RoomAvatar } from '@rocket.chat/ui-avatar';
+import { useUserId } from '@rocket.chat/ui-contexts';
+import { memo } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import SidePanelOmnichannelBadges from './SidePanelOmnichannelBadges';
+import { OmnichannelRoomIcon } from '../../../../components/RoomIcon/OmnichannelRoomIcon';
+import type { LivechatInquiryLocalRecord } from '../../../../hooks/useLivechatInquiryStore';
+import { roomCoordinator } from '../../../../lib/rooms/roomCoordinator';
+import { isIOsDevice } from '../../../../lib/utils/isIOsDevice';
+import { useOmnichannelPriorities } from '../../../../omnichannel/hooks/useOmnichannelPriorities';
+import { normalizeNavigationMessage } from '../../lib/normalizeNavigationMessage';
+import SidePanelItem from '../SidepanelItem';
+import RoomMenu from '../SidepanelItem/RoomMenu';
+
+type InquireSidePanelItemProps = {
+	room: LivechatInquiryLocalRecord;
+	openedRoom?: string;
+};
+
+const InquireSidePanelItem = ({ room, openedRoom, ...props }: InquireSidePanelItemProps) => {
+	const { t } = useTranslation();
+	const isAnonymous = !useUserId();
+
+	const highlighted = Boolean(room.alert);
+	const { alert, rid, t: type } = room;
+
+	const time = 'lastMessage' in room ? room.lastMessage?.ts : undefined;
+	const message =
+		room.lastMessage && `${room.lastMessage.u.name || room.lastMessage.u.username}: ${normalizeNavigationMessage(room.lastMessage, t)}`;
+	const title = roomCoordinator.getRoomName(room.t, room) || '';
+	const href = roomCoordinator.getRouteLink(room.t, room) || '';
+
+	const badges = <>{isOmnichannelRoom(room) && <SidePanelOmnichannelBadges room={room} />}</>;
+
+	const isQueued = room.status === 'queued';
+	const { enabled: isPriorityEnabled } = useOmnichannelPriorities();
+
+	const menu =
+		!isIOsDevice && !isAnonymous && (!isQueued || (isQueued && isPriorityEnabled)) ? (
+			<RoomMenu
+				alert={alert}
+				rid={rid}
+				roomOpen={rid === openedRoom}
+				type={type}
+				name={title}
+				hideDefaultOptions={isQueued}
+				href={href || undefined}
+			/>
+		) : undefined;
+
+	return (
+		<SidePanelItem
+			href={href}
+			selected={rid === openedRoom}
+			title={title}
+			avatar={<RoomAvatar size='x20' room={{ ...room, _id: room.rid || room._id, type: room.t }} />}
+			icon={
+				room.source && (
+					<SidebarItemIcon
+						highlighted={highlighted}
+						icon={<OmnichannelRoomIcon placement='sidebar' source={room.source} status={room.v.status} size='x20' />}
+					/>
+				)
+			}
+			unread={highlighted}
+			time={time}
+			subtitle={message ? <span className='message-body--unstyled' dangerouslySetInnerHTML={{ __html: message }} /> : null}
+			badges={badges}
+			menu={menu}
+			{...props}
+		/>
+	);
+};
+
+export default memo(InquireSidePanelItem);
diff --git a/apps/meteor/client/views/navigation/sidepanel/omnichannel/SidePanelOmnichannelBadges/SidePanelOmnichannelBadges.tsx b/apps/meteor/client/views/navigation/sidepanel/omnichannel/SidePanelOmnichannelBadges/SidePanelOmnichannelBadges.tsx
new file mode 100644
index 0000000000000..6af2e642027c6
--- /dev/null
+++ b/apps/meteor/client/views/navigation/sidepanel/omnichannel/SidePanelOmnichannelBadges/SidePanelOmnichannelBadges.tsx
@@ -0,0 +1,18 @@
+import type { IOmnichannelRoom } from '@rocket.chat/core-typings';
+
+import SidePanelPriorityTag from './SidePanelPriorityTag';
+import { RoomActivityIcon } from '../../../../../omnichannel/components/RoomActivityIcon';
+import { useOmnichannelPriorities } from '../../../../../omnichannel/hooks/useOmnichannelPriorities';
+
+const SidePanelOmnichannelBadges = ({ room }: { room: IOmnichannelRoom }) => {
+	const { enabled: isPriorityEnabled } = useOmnichannelPriorities();
+
+	return (
+		<>
+			{isPriorityEnabled ? <SidePanelPriorityTag priorityWeight={room.priorityWeight} /> : null}
+			<RoomActivityIcon room={room} />
+		</>
+	);
+};
+
+export default SidePanelOmnichannelBadges;
diff --git a/apps/meteor/client/views/navigation/sidepanel/omnichannel/SidePanelOmnichannelBadges/SidePanelPriorityTag.tsx b/apps/meteor/client/views/navigation/sidepanel/omnichannel/SidePanelOmnichannelBadges/SidePanelPriorityTag.tsx
new file mode 100644
index 0000000000000..b7fa1467d613e
--- /dev/null
+++ b/apps/meteor/client/views/navigation/sidepanel/omnichannel/SidePanelOmnichannelBadges/SidePanelPriorityTag.tsx
@@ -0,0 +1,20 @@
+import type { LivechatPriorityWeight } from '@rocket.chat/core-typings';
+import { Icon, Tag } from '@rocket.chat/fuselage';
+
+import { useOmnichannelPrioritiesConfig } from '../../../../../omnichannel/hooks/useOmnichannelPrioritiesConfig';
+
+const SidePanelPriorityTag = ({ priorityWeight }: { priorityWeight: LivechatPriorityWeight }) => {
+	const prioritiesConfig = useOmnichannelPrioritiesConfig(priorityWeight, false);
+
+	if (!prioritiesConfig?.iconName) {
+		return null;
+	}
+
+	return (
+		<Tag icon={<Icon mie={4} size='x12' name={prioritiesConfig?.iconName} />} variant={prioritiesConfig?.variant}>
+			{prioritiesConfig?.name}
+		</Tag>
+	);
+};
+
+export default SidePanelPriorityTag;
diff --git a/apps/meteor/client/views/navigation/sidepanel/omnichannel/SidePanelOmnichannelBadges/index.ts b/apps/meteor/client/views/navigation/sidepanel/omnichannel/SidePanelOmnichannelBadges/index.ts
new file mode 100644
index 0000000000000..b77e861403453
--- /dev/null
+++ b/apps/meteor/client/views/navigation/sidepanel/omnichannel/SidePanelOmnichannelBadges/index.ts
@@ -0,0 +1 @@
+export { default } from './SidePanelOmnichannelBadges';
diff --git a/apps/meteor/client/views/navigation/sidepanel/omnichannel/tabs/SidePanelInProgress.tsx b/apps/meteor/client/views/navigation/sidepanel/omnichannel/tabs/SidePanelInProgress.tsx
new file mode 100644
index 0000000000000..cac328656283e
--- /dev/null
+++ b/apps/meteor/client/views/navigation/sidepanel/omnichannel/tabs/SidePanelInProgress.tsx
@@ -0,0 +1,22 @@
+import { useTranslation } from 'react-i18next';
+
+import { sidePanelFiltersConfig, useSidePanelRoomsListTab, useUnreadOnlyToggle } from '../../../contexts/RoomsNavigationContext';
+import SidePanel from '../../SidePanel';
+
+const SidePanelInProgress = () => {
+	const { t } = useTranslation();
+	const rooms = useSidePanelRoomsListTab('inProgress');
+	const [unreadOnly, toggleUnreadOnly] = useUnreadOnlyToggle();
+
+	return (
+		<SidePanel
+			title={t(sidePanelFiltersConfig.inProgress.title)}
+			currentTab='inProgress'
+			unreadOnly={unreadOnly}
+			toggleUnreadOnly={toggleUnreadOnly}
+			rooms={rooms}
+		/>
+	);
+};
+
+export default SidePanelInProgress;
diff --git a/apps/meteor/client/views/navigation/sidepanel/omnichannel/tabs/SidePanelQueue.tsx b/apps/meteor/client/views/navigation/sidepanel/omnichannel/tabs/SidePanelQueue.tsx
new file mode 100644
index 0000000000000..b18c6c886a154
--- /dev/null
+++ b/apps/meteor/client/views/navigation/sidepanel/omnichannel/tabs/SidePanelQueue.tsx
@@ -0,0 +1,40 @@
+import { usePermission, useSetting } from '@rocket.chat/ui-contexts';
+import { useTranslation } from 'react-i18next';
+
+import { useHasLicenseModule } from '../../../../../hooks/useHasLicenseModule';
+import {
+	sidePanelFiltersConfig,
+	useRedirectToDefaultTab,
+	useSidePanelRoomsListTab,
+	useUnreadOnlyToggle,
+} from '../../../contexts/RoomsNavigationContext';
+import SidePanel from '../../SidePanel';
+
+const SidePanelQueue = () => {
+	const { t } = useTranslation();
+
+	const hasEEModule = useHasLicenseModule('livechat-enterprise');
+	const canViewOmnichannelQueue = usePermission('view-livechat-queue');
+	const isQueueEnabled = useSetting('Livechat_waiting_queue');
+
+	const rooms = useSidePanelRoomsListTab('queue');
+	const [unreadOnly, toggleUnreadOnly] = useUnreadOnlyToggle();
+	const shouldDisplayQueue = hasEEModule && canViewOmnichannelQueue && isQueueEnabled;
+	useRedirectToDefaultTab(!shouldDisplayQueue);
+
+	if (!shouldDisplayQueue) {
+		return null;
+	}
+
+	return (
+		<SidePanel
+			title={t(sidePanelFiltersConfig.queue.title)}
+			currentTab='queue'
+			unreadOnly={unreadOnly}
+			toggleUnreadOnly={toggleUnreadOnly}
+			rooms={rooms}
+		/>
+	);
+};
+
+export default SidePanelQueue;
diff --git a/apps/meteor/client/views/navigation/sidepanel/omnichannel/tabs/SidepanelOnHold.tsx b/apps/meteor/client/views/navigation/sidepanel/omnichannel/tabs/SidepanelOnHold.tsx
new file mode 100644
index 0000000000000..8cbcaa450fa13
--- /dev/null
+++ b/apps/meteor/client/views/navigation/sidepanel/omnichannel/tabs/SidepanelOnHold.tsx
@@ -0,0 +1,35 @@
+import { useTranslation } from 'react-i18next';
+
+import { useHasLicenseModule } from '../../../../../hooks/useHasLicenseModule';
+import {
+	sidePanelFiltersConfig,
+	useRedirectToDefaultTab,
+	useSidePanelRoomsListTab,
+	useUnreadOnlyToggle,
+} from '../../../contexts/RoomsNavigationContext';
+import SidePanel from '../../SidePanel';
+
+const SidePanelOnHold = () => {
+	const { t } = useTranslation();
+	const rooms = useSidePanelRoomsListTab('onHold');
+	const [unreadOnly, toggleUnreadOnly] = useUnreadOnlyToggle();
+
+	const hasEEModule = useHasLicenseModule('livechat-enterprise');
+	useRedirectToDefaultTab(!hasEEModule);
+
+	if (!hasEEModule) {
+		return null;
+	}
+
+	return (
+		<SidePanel
+			title={t(sidePanelFiltersConfig.onHold.title)}
+			currentTab='onHold'
+			unreadOnly={unreadOnly}
+			toggleUnreadOnly={toggleUnreadOnly}
+			rooms={rooms}
+		/>
+	);
+};
+
+export default SidePanelOnHold;
diff --git a/apps/meteor/client/views/navigation/sidepanel/tabs/SidePanelAll.tsx b/apps/meteor/client/views/navigation/sidepanel/tabs/SidePanelAll.tsx
new file mode 100644
index 0000000000000..07970fb63a347
--- /dev/null
+++ b/apps/meteor/client/views/navigation/sidepanel/tabs/SidePanelAll.tsx
@@ -0,0 +1,22 @@
+import { useTranslation } from 'react-i18next';
+
+import { sidePanelFiltersConfig, useSidePanelRoomsListTab, useUnreadOnlyToggle } from '../../contexts/RoomsNavigationContext';
+import SidePanel from '../SidePanel';
+
+const SidePanelAll = () => {
+	const { t } = useTranslation();
+	const rooms = useSidePanelRoomsListTab('all');
+	const [unreadOnly, toggleUnreadOnly] = useUnreadOnlyToggle();
+
+	return (
+		<SidePanel
+			title={t(sidePanelFiltersConfig.all.title)}
+			currentTab='all'
+			unreadOnly={unreadOnly}
+			toggleUnreadOnly={toggleUnreadOnly}
+			rooms={rooms}
+		/>
+	);
+};
+
+export default SidePanelAll;
diff --git a/apps/meteor/client/views/navigation/sidepanel/tabs/SidePanelChannels.tsx b/apps/meteor/client/views/navigation/sidepanel/tabs/SidePanelChannels.tsx
new file mode 100644
index 0000000000000..61073adf87668
--- /dev/null
+++ b/apps/meteor/client/views/navigation/sidepanel/tabs/SidePanelChannels.tsx
@@ -0,0 +1,26 @@
+import type { ISubscription } from '@rocket.chat/core-typings';
+import { useUserDisplayName } from '@rocket.chat/ui-client';
+
+import { useUnreadOnlyToggle } from '../../contexts/RoomsNavigationContext';
+import SidePanel from '../SidePanel';
+import { useChannelsChildrenList } from '../hooks/useChannelsChildrenList';
+
+const SidePanelChannels = ({ parentRid, subscription }: { parentRid: string; subscription: ISubscription }) => {
+	const isDirectSubscription = subscription?.t === 'd';
+
+	const username = useUserDisplayName({ name: subscription?.fname, username: subscription?.name });
+	const [unreadOnly, toggleUnreadOnly] = useUnreadOnlyToggle();
+	const rooms = useChannelsChildrenList(parentRid, unreadOnly);
+
+	return (
+		<SidePanel
+			title={(isDirectSubscription ? username : subscription?.fname) || subscription.name}
+			currentTab={isDirectSubscription ? 'directMessages' : 'channels'}
+			unreadOnly={unreadOnly}
+			toggleUnreadOnly={toggleUnreadOnly}
+			rooms={rooms}
+		/>
+	);
+};
+
+export default SidePanelChannels;
diff --git a/apps/meteor/client/views/navigation/sidepanel/tabs/SidePanelDiscussions.tsx b/apps/meteor/client/views/navigation/sidepanel/tabs/SidePanelDiscussions.tsx
new file mode 100644
index 0000000000000..62a43442d2b27
--- /dev/null
+++ b/apps/meteor/client/views/navigation/sidepanel/tabs/SidePanelDiscussions.tsx
@@ -0,0 +1,34 @@
+import { useSetting } from '@rocket.chat/ui-contexts';
+import { useTranslation } from 'react-i18next';
+
+import {
+	sidePanelFiltersConfig,
+	useRedirectToDefaultTab,
+	useSidePanelRoomsListTab,
+	useUnreadOnlyToggle,
+} from '../../contexts/RoomsNavigationContext';
+import SidePanel from '../SidePanel';
+
+const SidePanelDiscussions = () => {
+	const { t } = useTranslation();
+	const rooms = useSidePanelRoomsListTab('discussions');
+	const [unreadOnly, toggleUnreadOnly] = useUnreadOnlyToggle();
+	const isDiscussionEnabled = useSetting('Discussion_enabled');
+	useRedirectToDefaultTab(!isDiscussionEnabled);
+
+	if (!isDiscussionEnabled) {
+		return null;
+	}
+
+	return (
+		<SidePanel
+			title={t(sidePanelFiltersConfig.discussions.title)}
+			currentTab='discussions'
+			unreadOnly={unreadOnly}
+			toggleUnreadOnly={toggleUnreadOnly}
+			rooms={rooms}
+		/>
+	);
+};
+
+export default SidePanelDiscussions;
diff --git a/apps/meteor/client/views/navigation/sidepanel/tabs/SidePanelFavorites.tsx b/apps/meteor/client/views/navigation/sidepanel/tabs/SidePanelFavorites.tsx
new file mode 100644
index 0000000000000..852a5a694f58b
--- /dev/null
+++ b/apps/meteor/client/views/navigation/sidepanel/tabs/SidePanelFavorites.tsx
@@ -0,0 +1,22 @@
+import { useTranslation } from 'react-i18next';
+
+import { sidePanelFiltersConfig, useSidePanelRoomsListTab, useUnreadOnlyToggle } from '../../contexts/RoomsNavigationContext';
+import SidePanel from '../SidePanel';
+
+const SidePanelFavorites = () => {
+	const { t } = useTranslation();
+	const rooms = useSidePanelRoomsListTab('favorites');
+	const [unreadOnly, toggleUnreadOnly] = useUnreadOnlyToggle();
+
+	return (
+		<SidePanel
+			title={t(sidePanelFiltersConfig.favorites.title)}
+			currentTab='favorites'
+			unreadOnly={unreadOnly}
+			toggleUnreadOnly={toggleUnreadOnly}
+			rooms={rooms}
+		/>
+	);
+};
+
+export default SidePanelFavorites;
diff --git a/apps/meteor/client/views/navigation/sidepanel/tabs/SidePanelMentions.tsx b/apps/meteor/client/views/navigation/sidepanel/tabs/SidePanelMentions.tsx
new file mode 100644
index 0000000000000..cce5c82aa6008
--- /dev/null
+++ b/apps/meteor/client/views/navigation/sidepanel/tabs/SidePanelMentions.tsx
@@ -0,0 +1,22 @@
+import { useTranslation } from 'react-i18next';
+
+import { sidePanelFiltersConfig, useSidePanelRoomsListTab, useUnreadOnlyToggle } from '../../contexts/RoomsNavigationContext';
+import SidePanel from '../SidePanel';
+
+const SidePanelMentions = () => {
+	const { t } = useTranslation();
+	const rooms = useSidePanelRoomsListTab('mentions');
+	const [unreadOnly, toggleUnreadOnly] = useUnreadOnlyToggle();
+
+	return (
+		<SidePanel
+			title={t(sidePanelFiltersConfig.mentions.title)}
+			currentTab='mentions'
+			unreadOnly={unreadOnly}
+			toggleUnreadOnly={toggleUnreadOnly}
+			rooms={rooms}
+		/>
+	);
+};
+
+export default SidePanelMentions;
diff --git a/apps/meteor/client/views/navigation/sidepanel/tabs/SidePanelRooms.tsx b/apps/meteor/client/views/navigation/sidepanel/tabs/SidePanelRooms.tsx
new file mode 100644
index 0000000000000..26eeab9c67e7f
--- /dev/null
+++ b/apps/meteor/client/views/navigation/sidepanel/tabs/SidePanelRooms.tsx
@@ -0,0 +1,27 @@
+import { useUserSubscription } from '@rocket.chat/ui-contexts';
+
+import SidePanelChannels from './SidePanelChannels';
+import SidePanelTeams from './SidePanelTeams';
+import { withErrorBoundary } from '../../../../components/withErrorBoundary';
+import { useSidePanelFilter } from '../../contexts/RoomsNavigationContext';
+
+const SidePanelRooms = ({ parentRid }: { parentRid: string }) => {
+	const [currentTab] = useSidePanelFilter();
+	const subscription = useUserSubscription(parentRid);
+
+	if (!subscription) {
+		return null;
+	}
+
+	switch (currentTab) {
+		case 'teams':
+			return <SidePanelTeams parentRid={parentRid} subscription={subscription} />;
+		case 'channels':
+		case 'directMessages':
+			return <SidePanelChannels parentRid={parentRid} subscription={subscription} />;
+		default:
+			return null;
+	}
+};
+
+export default withErrorBoundary(SidePanelRooms);
diff --git a/apps/meteor/client/views/navigation/sidepanel/tabs/SidePanelTeams.tsx b/apps/meteor/client/views/navigation/sidepanel/tabs/SidePanelTeams.tsx
new file mode 100644
index 0000000000000..1dd9993f917cc
--- /dev/null
+++ b/apps/meteor/client/views/navigation/sidepanel/tabs/SidePanelTeams.tsx
@@ -0,0 +1,22 @@
+import type { ISubscription } from '@rocket.chat/core-typings';
+
+import { useUnreadOnlyToggle } from '../../contexts/RoomsNavigationContext';
+import SidePanel from '../SidePanel';
+import { useChannelsChildrenList } from '../hooks/useChannelsChildrenList';
+
+const SidePanelTeams = ({ parentRid, subscription }: { parentRid: string; subscription: ISubscription }) => {
+	const [unreadOnly, toggleUnreadOnly] = useUnreadOnlyToggle();
+	const rooms = useChannelsChildrenList(parentRid, unreadOnly, subscription?.teamId);
+
+	return (
+		<SidePanel
+			title={subscription?.fname || subscription?.name}
+			currentTab='teams'
+			unreadOnly={unreadOnly}
+			toggleUnreadOnly={toggleUnreadOnly}
+			rooms={rooms}
+		/>
+	);
+};
+
+export default SidePanelTeams;
diff --git a/apps/meteor/client/views/omnichannel/OmnichannelRouter.tsx b/apps/meteor/client/views/omnichannel/OmnichannelRouter.tsx
index cb22bd2c01211..400d3fa494256 100644
--- a/apps/meteor/client/views/omnichannel/OmnichannelRouter.tsx
+++ b/apps/meteor/client/views/omnichannel/OmnichannelRouter.tsx
@@ -4,7 +4,7 @@ import { Suspense, useEffect } from 'react';
 
 import OmnichannelSidebar from './sidebar/OmnichannelSidebar';
 import PageSkeleton from '../../components/PageSkeleton';
-import SidebarPortal from '../../sidebar/SidebarPortal';
+import SidebarPortal from '../../portals/SidebarPortal';
 
 type OmnichannelRouterProps = {
 	children?: ReactNode;
diff --git a/apps/meteor/client/views/room/RoomOpener.tsx b/apps/meteor/client/views/room/RoomOpener.tsx
index 2a8577214f7c8..c0868d359bbe7 100644
--- a/apps/meteor/client/views/room/RoomOpener.tsx
+++ b/apps/meteor/client/views/room/RoomOpener.tsx
@@ -1,15 +1,12 @@
 import type { RoomType } from '@rocket.chat/core-typings';
 import { Box, States, StatesIcon, StatesSubtitle, StatesTitle } from '@rocket.chat/fuselage';
-import { FeaturePreviewOff, FeaturePreviewOn } from '@rocket.chat/ui-client';
 import type { ReactElement } from 'react';
 import { lazy, Suspense } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import NotSubscribedRoom from './NotSubscribedRoom';
-import RoomSidepanel from './RoomSidepanel';
 import RoomSkeleton from './RoomSkeleton';
 import { useOpenRoom } from './hooks/useOpenRoom';
-import { FeaturePreviewSidePanelNavigation } from '../../components/FeaturePreviewSidePanelNavigation';
 import { Header } from '../../components/Header';
 import { getErrorMessage } from '../../lib/errorHandling';
 import { NotAuthorizedError } from '../../lib/errors/NotAuthorizedError';
@@ -28,23 +25,12 @@ type RoomOpenerProps = {
 	reference: string;
 };
 
-const isDirectOrOmnichannelRoom = (type: RoomType) => type === 'd' || type === 'l';
-
 const RoomOpener = ({ type, reference }: RoomOpenerProps): ReactElement => {
 	const { data, error, isSuccess, isError, isLoading } = useOpenRoom({ type, reference });
 	const { t } = useTranslation();
 
 	return (
 		<Box display='flex' w='full' h='full'>
-			{!isDirectOrOmnichannelRoom(type) && (
-				<FeaturePreviewSidePanelNavigation>
-					<FeaturePreviewOff>{null}</FeaturePreviewOff>
-					<FeaturePreviewOn>
-						<RoomSidepanel />
-					</FeaturePreviewOn>
-				</FeaturePreviewSidePanelNavigation>
-			)}
-
 			<Suspense fallback={<RoomSkeleton />}>
 				{isLoading && <RoomSkeleton />}
 				{isSuccess && (
diff --git a/apps/meteor/client/views/room/RoomOpenerEmbedded.tsx b/apps/meteor/client/views/room/RoomOpenerEmbedded.tsx
index 87501434aab8d..4350df68a6a83 100644
--- a/apps/meteor/client/views/room/RoomOpenerEmbedded.tsx
+++ b/apps/meteor/client/views/room/RoomOpenerEmbedded.tsx
@@ -1,6 +1,5 @@
 import type { RoomType } from '@rocket.chat/core-typings';
 import { Box, States, StatesIcon, StatesSubtitle, StatesTitle } from '@rocket.chat/fuselage';
-import { FeaturePreviewOff, FeaturePreviewOn } from '@rocket.chat/ui-client';
 import { useEndpoint, useStream, useUserId } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
@@ -8,12 +7,10 @@ import { lazy, Suspense, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import NotSubscribedRoom from './NotSubscribedRoom';
-import RoomSidepanel from './RoomSidepanel';
 import RoomSkeleton from './RoomSkeleton';
 import { useOpenRoom } from './hooks/useOpenRoom';
 import { LegacyRoomManager } from '../../../app/ui-utils/client';
 import { SubscriptionsCachedStore } from '../../cachedStores';
-import { FeaturePreviewSidePanelNavigation } from '../../components/FeaturePreviewSidePanelNavigation';
 import { Header } from '../../components/Header';
 import { getErrorMessage } from '../../lib/errorHandling';
 import { NotAuthorizedError } from '../../lib/errors/NotAuthorizedError';
@@ -34,8 +31,6 @@ type RoomOpenerProps = {
 	reference: string;
 };
 
-const isDirectOrOmnichannelRoom = (type: RoomType) => type === 'd' || type === 'l';
-
 const RoomOpenerEmbedded = ({ type, reference }: RoomOpenerProps): ReactElement => {
 	const { data, error, isSuccess, isError, isLoading } = useOpenRoom({ type, reference });
 	const uid = useUserId();
@@ -87,15 +82,6 @@ const RoomOpenerEmbedded = ({ type, reference }: RoomOpenerProps): ReactElement
 
 	return (
 		<Box display='flex' w='full' h='full'>
-			{!isDirectOrOmnichannelRoom(type) && (
-				<FeaturePreviewSidePanelNavigation>
-					<FeaturePreviewOff>{null}</FeaturePreviewOff>
-					<FeaturePreviewOn>
-						<RoomSidepanel />
-					</FeaturePreviewOn>
-				</FeaturePreviewSidePanelNavigation>
-			)}
-
 			<Suspense fallback={<RoomSkeleton />}>
 				{isLoading && <RoomSkeleton />}
 				{isSuccess && (
diff --git a/apps/meteor/client/views/room/RoomSidepanel/RoomSidepanel.tsx b/apps/meteor/client/views/room/RoomSidepanel/RoomSidepanel.tsx
deleted file mode 100644
index 4c21a45964491..0000000000000
--- a/apps/meteor/client/views/room/RoomSidepanel/RoomSidepanel.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-/* eslint-disable react/no-multi-comp */
-import { Box, Sidepanel, SidepanelListItem } from '@rocket.chat/fuselage';
-import { useUserPreference } from '@rocket.chat/ui-contexts';
-import { memo } from 'react';
-import { Virtuoso } from 'react-virtuoso';
-
-import RoomSidepanelListWrapper from './RoomSidepanelListWrapper';
-import RoomSidepanelLoading from './RoomSidepanelLoading';
-import RoomSidepanelItem from './SidepanelItem';
-import { useTeamsListChildrenUpdate } from './hooks/useTeamslistChildren';
-import { VirtualizedScrollbars } from '../../../components/CustomScrollbars';
-import { useRoomInfoEndpoint } from '../../../hooks/useRoomInfoEndpoint';
-import { useOpenedRoom, useSecondLevelOpenedRoom } from '../../../lib/RoomManager';
-
-const RoomSidepanel = () => {
-	const parentRid = useOpenedRoom();
-	const secondLevelOpenedRoom = useSecondLevelOpenedRoom() ?? parentRid;
-
-	if (!parentRid || !secondLevelOpenedRoom) {
-		return null;
-	}
-
-	return <RoomSidepanelWithData parentRid={parentRid} openedRoom={secondLevelOpenedRoom} />;
-};
-
-const RoomSidepanelWithData = ({ parentRid, openedRoom }: { parentRid: string; openedRoom: string }) => {
-	const sidebarViewMode = useUserPreference<'extended' | 'medium' | 'condensed'>('sidebarViewMode');
-
-	const roomInfo = useRoomInfoEndpoint(parentRid);
-	const sidepanelItems = roomInfo.data?.room?.sidepanel?.items || roomInfo.data?.parent?.sidepanel?.items;
-
-	const result = useTeamsListChildrenUpdate(
-		parentRid,
-		!roomInfo.data ? null : roomInfo.data.room?.teamId,
-		// eslint-disable-next-line no-nested-ternary
-		!sidepanelItems ? null : sidepanelItems?.length === 1 ? sidepanelItems[0] : undefined,
-	);
-	if (roomInfo.isSuccess && !roomInfo.data.room?.sidepanel && !roomInfo.data.parent?.sidepanel) {
-		return null;
-	}
-
-	if (roomInfo.isLoading || (roomInfo.isSuccess && result.isPending)) {
-		return <RoomSidepanelLoading />;
-	}
-
-	if (!result.isSuccess || !roomInfo.isSuccess) {
-		return null;
-	}
-
-	return (
-		<Box minWidth='x276'>
-			<Sidepanel>
-				<Box pb={8} h='full'>
-					<VirtualizedScrollbars>
-						<Virtuoso
-							totalCount={result.data.length}
-							data={result.data}
-							components={{ Item: SidepanelListItem, List: RoomSidepanelListWrapper }}
-							itemContent={(_, data) => (
-								<RoomSidepanelItem openedRoom={openedRoom} room={data} parentRid={parentRid} viewMode={sidebarViewMode} />
-							)}
-						/>
-					</VirtualizedScrollbars>
-				</Box>
-			</Sidepanel>
-		</Box>
-	);
-};
-
-export default memo(RoomSidepanel);
diff --git a/apps/meteor/client/views/room/RoomSidepanel/RoomSidepanelLoading.tsx b/apps/meteor/client/views/room/RoomSidepanel/RoomSidepanelLoading.tsx
deleted file mode 100644
index d8cc76506a56c..0000000000000
--- a/apps/meteor/client/views/room/RoomSidepanel/RoomSidepanelLoading.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import { SidebarV2Item as SidebarItem, Sidepanel, SidepanelList, Skeleton } from '@rocket.chat/fuselage';
-
-const RoomSidepanelLoading = () => (
-	<Sidepanel>
-		<SidepanelList>
-			<SidebarItem>
-				<Skeleton w='full' />
-			</SidebarItem>
-			<SidebarItem>
-				<Skeleton w='full' />
-			</SidebarItem>
-			<SidebarItem>
-				<Skeleton w='full' />
-			</SidebarItem>
-		</SidepanelList>
-	</Sidepanel>
-);
-
-export default RoomSidepanelLoading;
diff --git a/apps/meteor/client/views/room/RoomSidepanel/SidepanelItem/RoomSidepanelItem.tsx b/apps/meteor/client/views/room/RoomSidepanel/SidepanelItem/RoomSidepanelItem.tsx
deleted file mode 100644
index af2c01a2cd1fb..0000000000000
--- a/apps/meteor/client/views/room/RoomSidepanel/SidepanelItem/RoomSidepanelItem.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import type { SubscriptionWithRoom } from '@rocket.chat/ui-contexts';
-import { memo } from 'react';
-
-import { useTemplateByViewMode } from '../../../../sidebarv2/hooks/useTemplateByViewMode';
-import { useItemData } from '../hooks/useItemData';
-
-type RoomSidepanelItemProps = {
-	openedRoom?: string;
-	room: SubscriptionWithRoom;
-	parentRid: string;
-	viewMode?: 'extended' | 'medium' | 'condensed';
-};
-
-const RoomSidepanelItem = ({ room, openedRoom, viewMode }: RoomSidepanelItemProps) => {
-	const SidepanelItem = useTemplateByViewMode();
-
-	const itemData = useItemData(room, { viewMode, openedRoom });
-
-	return <SidepanelItem {...itemData} />;
-};
-
-export default memo(RoomSidepanelItem);
diff --git a/apps/meteor/client/views/room/RoomSidepanel/SidepanelItem/index.ts b/apps/meteor/client/views/room/RoomSidepanel/SidepanelItem/index.ts
deleted file mode 100644
index 5cfc0da3055b5..0000000000000
--- a/apps/meteor/client/views/room/RoomSidepanel/SidepanelItem/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './RoomSidepanelItem';
diff --git a/apps/meteor/client/views/room/RoomSidepanel/hooks/useItemData.tsx b/apps/meteor/client/views/room/RoomSidepanel/hooks/useItemData.tsx
deleted file mode 100644
index 6fb7c101af6c0..0000000000000
--- a/apps/meteor/client/views/room/RoomSidepanel/hooks/useItemData.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import { SidebarV2ItemBadge as SidebarItemBadge, SidebarV2ItemIcon as SidebarItemIcon } from '@rocket.chat/fuselage';
-import type { SubscriptionWithRoom } from '@rocket.chat/ui-contexts';
-import { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
-
-import { RoomIcon } from '../../../../components/RoomIcon';
-import { roomCoordinator } from '../../../../lib/rooms/roomCoordinator';
-import { getMessage } from '../../../../sidebarv2/RoomList/SidebarItemTemplateWithData';
-import { useAvatarTemplate } from '../../../../sidebarv2/hooks/useAvatarTemplate';
-import { useUnreadDisplay } from '../../../../sidebarv2/hooks/useUnreadDisplay';
-
-export const useItemData = (
-	room: SubscriptionWithRoom,
-	{ openedRoom, viewMode }: { openedRoom: string | undefined; viewMode?: 'extended' | 'medium' | 'condensed' },
-) => {
-	const { t } = useTranslation();
-	const AvatarTemplate = useAvatarTemplate();
-
-	const { unreadTitle, unreadVariant, showUnread, highlightUnread: highlighted, unreadCount } = useUnreadDisplay(room);
-
-	const icon = useMemo(
-		() => <SidebarItemIcon highlighted={highlighted} icon={<RoomIcon room={room} placement='sidebar' size='x20' />} />,
-		[highlighted, room],
-	);
-	const time = 'lastMessage' in room ? room.lastMessage?.ts : undefined;
-	const message = viewMode === 'extended' ? getMessage(room, room.lastMessage, t) : undefined;
-
-	const badges = useMemo(
-		() => (
-			<>
-				{showUnread && (
-					<SidebarItemBadge variant={unreadVariant} title={unreadTitle} role='status'>
-						<span aria-hidden>{unreadCount.total}</span>
-					</SidebarItemBadge>
-				)}
-			</>
-		),
-		[showUnread, unreadCount.total, unreadTitle, unreadVariant],
-	);
-
-	const itemData = useMemo(
-		() => ({
-			unread: highlighted,
-			selected: room.rid === openedRoom,
-			href: roomCoordinator.getRouteLink(room.t, room) || '',
-			title: roomCoordinator.getRoomName(room.t, room) || '',
-			icon,
-			time,
-			badges,
-			avatar: AvatarTemplate && <AvatarTemplate {...room} />,
-			subtitle: message ? <span className='message-body--unstyled' dangerouslySetInnerHTML={{ __html: message }} /> : null,
-		}),
-		[AvatarTemplate, badges, highlighted, icon, message, openedRoom, room, time],
-	);
-
-	return itemData;
-};
diff --git a/apps/meteor/client/views/room/RoomSidepanel/hooks/useTeamslistChildren.ts b/apps/meteor/client/views/room/RoomSidepanel/hooks/useTeamslistChildren.ts
deleted file mode 100644
index a478264d1a382..0000000000000
--- a/apps/meteor/client/views/room/RoomSidepanel/hooks/useTeamslistChildren.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import type { SubscriptionWithRoom } from '@rocket.chat/ui-contexts';
-import { keepPreviousData, useQuery } from '@tanstack/react-query';
-import { useCallback, useEffect } from 'react';
-
-import { useSortQueryOptions } from '../../../../hooks/useSortQueryOptions';
-import { applyQueryOptions } from '../../../../lib/cachedStores';
-import { Subscriptions } from '../../../../stores';
-
-export const useTeamsListChildrenUpdate = (
-	parentRid: string,
-	teamId?: string | null,
-	sidepanelItems?: 'channels' | 'discussions' | null,
-) => {
-	const options = useSortQueryOptions();
-
-	const predicate = useCallback(
-		(record: SubscriptionWithRoom): boolean => {
-			return (
-				((!sidepanelItems || sidepanelItems === 'channels') && teamId && record.teamId === teamId) ||
-				((!sidepanelItems || sidepanelItems === 'discussions') && record.prid === parentRid) ||
-				record._id === parentRid
-			);
-		},
-		[parentRid, sidepanelItems, teamId],
-	);
-
-	const result = useQuery({
-		queryKey: ['sidepanel', 'list', parentRid, sidepanelItems, options],
-		queryFn: () => applyQueryOptions(Subscriptions.state.filter(predicate), options),
-		enabled: sidepanelItems !== null && teamId !== null,
-		refetchInterval: 5 * 60 * 1000,
-		placeholderData: keepPreviousData,
-	});
-
-	const { refetch } = result;
-
-	useEffect(() => Subscriptions.use.subscribe(() => refetch()), [predicate, refetch]);
-
-	return result;
-};
diff --git a/apps/meteor/client/views/room/RoomSidepanel/index.ts b/apps/meteor/client/views/room/RoomSidepanel/index.ts
deleted file mode 100644
index c236142b8b0f7..0000000000000
--- a/apps/meteor/client/views/room/RoomSidepanel/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './RoomSidepanel';
diff --git a/apps/meteor/client/views/room/body/hooks/useRestoreScrollPosition.spec.tsx b/apps/meteor/client/views/room/body/hooks/useRestoreScrollPosition.spec.tsx
index 9f0bdbbe98b13..3dba16060261a 100644
--- a/apps/meteor/client/views/room/body/hooks/useRestoreScrollPosition.spec.tsx
+++ b/apps/meteor/client/views/room/body/hooks/useRestoreScrollPosition.spec.tsx
@@ -8,7 +8,6 @@ jest.mock('../../../../lib/RoomManager', () => ({
 		getStore: jest.fn(),
 	},
 	useOpenedRoom: jest.fn(() => 'room-id'),
-	useSecondLevelOpenedRoom: jest.fn(() => 'room-id'),
 }));
 
 describe('useRestoreScrollPosition', () => {
diff --git a/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx b/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx
index 9dc08fc62bb3d..9d5ed13c328b0 100644
--- a/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx
@@ -1,5 +1,5 @@
 /* eslint-disable complexity */
-import type { IRoomWithRetentionPolicy, SidepanelItem } from '@rocket.chat/core-typings';
+import type { IRoomWithRetentionPolicy } from '@rocket.chat/core-typings';
 import { isRoomFederated } from '@rocket.chat/core-typings';
 import type { SelectOption } from '@rocket.chat/fuselage';
 import {
@@ -21,10 +21,8 @@ import {
 	Box,
 	TextAreaInput,
 	AccordionItem,
-	Divider,
 } from '@rocket.chat/fuselage';
 import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
-import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '@rocket.chat/ui-client';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import { useSetting, useTranslation, useToastMessageDispatch, useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQueryClient } from '@tanstack/react-query';
@@ -125,8 +123,6 @@ const EditRoomInfo = ({ room, onClickClose, onClickBack }: EditRoomInfoProps) =>
 		retentionOverrideGlobal,
 		roomType: roomTypeP,
 		reactWhenReadOnly,
-		showChannels,
-		showDiscussions,
 	} = watch();
 
 	const {
@@ -169,21 +165,11 @@ const EditRoomInfo = ({ room, onClickClose, onClickBack }: EditRoomInfoProps) =>
 		}: EditRoomInfoFormData) => {
 			const data = getDirtyFields<Partial<typeof defaultValues>>(formData, dirtyFields);
 			delete data.archived;
-			delete data.showChannels;
-			delete data.showDiscussions;
-
-			const sidepanelItems = [showChannels && 'channels', showDiscussions && 'discussions'].filter(Boolean) as [
-				SidepanelItem,
-				SidepanelItem?,
-			];
-
-			const sidepanel = sidepanelItems.length > 0 ? { items: sidepanelItems } : null;
 
 			try {
 				await saveAction({
 					rid: room._id,
 					...data,
-					...(roomType === 'team' ? { sidepanel } : null),
 					...((data.joinCode || 'joinCodeRequired' in data) && { joinCode: joinCodeRequired ? data.joinCode : '' }),
 					...((data.systemMessages || !hideSysMes) && {
 						systemMessages: hideSysMes && data.systemMessages,
@@ -244,8 +230,6 @@ const EditRoomInfo = ({ room, onClickClose, onClickBack }: EditRoomInfoProps) =>
 	const retentionExcludePinnedField = useId();
 	const retentionFilesOnlyField = useId();
 	const retentionIgnoreThreads = useId();
-	const showDiscussionsField = useId();
-	const showChannelsField = useId();
 
 	const showAdvancedSettings = canViewEncrypted || canViewReadOnly || readOnly || canViewArchived || canViewJoinCode || canViewHideSysMes;
 	const showRetentionPolicy = canEditRoomRetentionPolicy && retentionPolicy?.enabled;
@@ -377,49 +361,6 @@ const EditRoomInfo = ({ room, onClickClose, onClickBack }: EditRoomInfoProps) =>
 						<Accordion>
 							{showAdvancedSettings && (
 								<AccordionItem title={t('Advanced_settings')}>
-									{roomType === 'team' && (
-										<FeaturePreview feature='sidepanelNavigation'>
-											<FeaturePreviewOff>{null}</FeaturePreviewOff>
-											<FeaturePreviewOn>
-												<FieldGroup>
-													<Box is='h5' fontScale='h5' color='titles-labels'>
-														{t('Navigation')}
-													</Box>
-													<Field>
-														<FieldRow>
-															<FieldLabel htmlFor={showChannelsField}>{t('Channels')}</FieldLabel>
-															<Controller
-																control={control}
-																name='showChannels'
-																render={({ field: { value, ...field } }) => (
-																	<ToggleSwitch id={showChannelsField} checked={value} {...field} />
-																)}
-															/>
-														</FieldRow>
-														<FieldRow>
-															<FieldHint id={`${showChannelsField}-hint`}>{t('Show_channels_description')}</FieldHint>
-														</FieldRow>
-													</Field>
-													<Field>
-														<FieldRow>
-															<FieldLabel htmlFor={showDiscussionsField}>{t('Discussions')}</FieldLabel>
-															<Controller
-																control={control}
-																name='showDiscussions'
-																render={({ field: { value, ...field } }) => (
-																	<ToggleSwitch id={showDiscussionsField} checked={value} {...field} />
-																)}
-															/>
-														</FieldRow>
-														<FieldRow>
-															<FieldHint id={`${showDiscussionsField}-hint`}>{t('Show_discussions_description')}</FieldHint>
-														</FieldRow>
-													</Field>
-												</FieldGroup>
-												<Divider mb={24} />
-											</FeaturePreviewOn>
-										</FeaturePreview>
-									)}
 									<FieldGroup>
 										<Box is='h5' fontScale='h5' color='titles-labels'>
 											{t('Security_and_permissions')}
diff --git a/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/useEditRoomInitialValues.ts b/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/useEditRoomInitialValues.ts
index 0b5f914b01b01..5aeb06a3a2114 100644
--- a/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/useEditRoomInitialValues.ts
+++ b/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/useEditRoomInitialValues.ts
@@ -35,20 +35,7 @@ export const useEditRoomInitialValues = (room: IRoomWithRetentionPolicy): Partia
 	const retentionPolicy = useRetentionPolicy(room);
 	const canEditRoomRetentionPolicy = usePermission('edit-room-retention-policy', room._id);
 
-	const {
-		t,
-		ro,
-		archived,
-		topic,
-		description,
-		announcement,
-		joinCodeRequired,
-		sysMes,
-		encrypted,
-		retention,
-		reactWhenReadOnly,
-		sidepanel,
-	} = room;
+	const { t, ro, archived, topic, description, announcement, joinCodeRequired, sysMes, encrypted, retention, reactWhenReadOnly } = room;
 
 	return useMemo(
 		(): Partial<EditRoomInfoFormData> => ({
@@ -75,8 +62,6 @@ export const useEditRoomInitialValues = (room: IRoomWithRetentionPolicy): Partia
 					retentionFilesOnly: retention?.filesOnly ?? retentionPolicy.filesOnly,
 					retentionIgnoreThreads: retention?.ignoreThreads ?? retentionPolicy.ignoreThreads,
 				}),
-			showDiscussions: sidepanel?.items.includes('discussions'),
-			showChannels: sidepanel?.items.includes('channels'),
 		}),
 		[
 			announcement,
@@ -93,7 +78,6 @@ export const useEditRoomInitialValues = (room: IRoomWithRetentionPolicy): Partia
 			encrypted,
 			reactWhenReadOnly,
 			canEditRoomRetentionPolicy,
-			sidepanel,
 		],
 	);
 };
diff --git a/apps/meteor/client/views/room/providers/RoomProvider.tsx b/apps/meteor/client/views/room/providers/RoomProvider.tsx
index 46f7d5f9265e3..78c76e553779a 100644
--- a/apps/meteor/client/views/room/providers/RoomProvider.tsx
+++ b/apps/meteor/client/views/room/providers/RoomProvider.tsx
@@ -12,8 +12,6 @@ import { RoomHistoryManager } from '../../../../app/ui-utils/client';
 import { omit } from '../../../../lib/utils/omit';
 import { useFireGlobalEvent } from '../../../hooks/useFireGlobalEvent';
 import { useReactiveValue } from '../../../hooks/useReactiveValue';
-import { useRoomInfoEndpoint } from '../../../hooks/useRoomInfoEndpoint';
-import { useSidePanelNavigation } from '../../../hooks/useSidePanelNavigation';
 import { RoomManager } from '../../../lib/RoomManager';
 import { roomCoordinator } from '../../../lib/rooms/roomCoordinator';
 import ImageGalleryProvider from '../../../providers/ImageGalleryProvider';
@@ -29,9 +27,8 @@ type RoomProviderProps = {
 };
 
 const RoomProvider = ({ rid, children }: RoomProviderProps): ReactElement => {
-	const resultFromServer = useRoomInfoEndpoint(rid);
-
 	const room = Rooms.use((state) => state.get(rid));
+
 	const subscritionFromLocal = Subscriptions.use((state) => state.find((record) => record.rid === rid));
 
 	useRedirectOnSettingsChanged(subscritionFromLocal);
@@ -78,8 +75,6 @@ const RoomProvider = ({ rid, children }: RoomProviderProps): ReactElement => {
 		};
 	}, [hasMoreNextMessages, hasMorePreviousMessages, isLoadingMoreMessages, pseudoRoom, rid, subscritionFromLocal]);
 
-	const isSidepanelFeatureEnabled = useSidePanelNavigation();
-
 	const { mutate: fireRoomOpenedEvent } = useFireGlobalEvent('room-opened', rid);
 
 	useEffect(() => {
@@ -89,66 +84,11 @@ const RoomProvider = ({ rid, children }: RoomProviderProps): ReactElement => {
 	}, [rid, room, fireRoomOpenedEvent]);
 
 	useEffect(() => {
-		if (isSidepanelFeatureEnabled) {
-			if (resultFromServer.isSuccess) {
-				if (resultFromServer.data.room?.teamMain) {
-					if (
-						resultFromServer.data.room.sidepanel?.items.includes('channels') ||
-						resultFromServer.data.room?.sidepanel?.items.includes('discussions')
-					) {
-						RoomManager.openSecondLevel(rid, rid);
-					} else {
-						RoomManager.open(rid);
-					}
-					return (): void => {
-						RoomManager.back(rid);
-					};
-				}
-
-				switch (true) {
-					case resultFromServer.data.room?.prid &&
-						resultFromServer.data.parent &&
-						resultFromServer.data.parent.sidepanel?.items.includes('discussions'):
-						RoomManager.openSecondLevel(resultFromServer.data.parent._id, rid);
-						break;
-					case resultFromServer.data.team?.roomId &&
-						!resultFromServer.data.room?.teamMain &&
-						resultFromServer.data.parent?.sidepanel?.items.includes('channels'):
-						RoomManager.openSecondLevel(resultFromServer.data.team.roomId, rid);
-						break;
-
-					default:
-						if (
-							resultFromServer.data.parent?.sidepanel?.items.includes('channels') ||
-							resultFromServer.data.parent?.sidepanel?.items.includes('discussions')
-						) {
-							RoomManager.openSecondLevel(rid, rid);
-						} else {
-							RoomManager.open(rid);
-						}
-						break;
-				}
-			}
-			return (): void => {
-				RoomManager.back(rid);
-			};
-		}
-
 		RoomManager.open(rid);
 		return (): void => {
 			RoomManager.back(rid);
 		};
-	}, [
-		isSidepanelFeatureEnabled,
-		rid,
-		resultFromServer.data?.room?.prid,
-		resultFromServer.data?.room?.teamId,
-		resultFromServer.data?.room?.teamMain,
-		resultFromServer.isSuccess,
-		resultFromServer.data?.parent,
-		resultFromServer.data?.team?.roomId,
-		resultFromServer.data,
-	]);
+	}, [rid]);
 
 	const subscribed = !!subscritionFromLocal;
 
diff --git a/apps/meteor/client/views/root/MainLayout/LayoutWithSidebarV2.tsx b/apps/meteor/client/views/root/MainLayout/LayoutWithSidebarV2.tsx
index 2d219a650e614..bda8552254b19 100644
--- a/apps/meteor/client/views/root/MainLayout/LayoutWithSidebarV2.tsx
+++ b/apps/meteor/client/views/root/MainLayout/LayoutWithSidebarV2.tsx
@@ -8,7 +8,8 @@ import AccessibilityShortcut from './AccessibilityShortcut';
 import MainContent from './MainContent';
 import { MainLayoutStyleTags } from './MainLayoutStyleTags';
 import NavBar from '../../../NavBarV2';
-import Sidebar from '../../../sidebarv2';
+import NavigationRegion from '../../navigation';
+import RoomsNavigationProvider from '../../navigation/providers/RoomsNavigationProvider';
 
 const LayoutWithSidebarV2 = ({ children }: { children: ReactNode }): ReactElement => {
 	const { isEmbedded: embeddedLayout } = useLayout();
@@ -50,7 +51,11 @@ const LayoutWithSidebarV2 = ({ children }: { children: ReactNode }): ReactElemen
 				className={[embeddedLayout ? 'embedded-view' : undefined, 'menu-nav'].filter(Boolean).join(' ')}
 			>
 				<MainLayoutStyleTags />
-				{!removeSidenav && <Sidebar />}
+				{!removeSidenav && (
+					<RoomsNavigationProvider>
+						<NavigationRegion />
+					</RoomsNavigationProvider>
+				)}
 				<MainContent>{children}</MainContent>
 			</Box>
 		</>
diff --git a/apps/meteor/client/views/root/MainLayout/MainLayoutStyleTags.tsx b/apps/meteor/client/views/root/MainLayout/MainLayoutStyleTags.tsx
index dcafc6631e5e7..4e891bf2d3a91 100644
--- a/apps/meteor/client/views/root/MainLayout/MainLayoutStyleTags.tsx
+++ b/apps/meteor/client/views/root/MainLayout/MainLayoutStyleTags.tsx
@@ -9,7 +9,7 @@ export const MainLayoutStyleTags = () => {
 	return (
 		<>
 			<PaletteStyleTag theme={theme} selector='.rcx-content--main, .rcx-tile' tagId={`main-palette-${theme}`} />
-			<PaletteStyleTag theme='dark' selector='.rcx-sidebar--main, .rcx-navbar' tagId='sidebar-palette' />
+			<PaletteStyleTag theme='dark' selector='.rcx-sidebar--main, .rcx-sidepanel, .rcx-navbar' tagId='sidebar-palette' />
 			{theme === 'dark' && <PaletteStyleTag selector='.rcx-content--main' palette={codeBlock} tagId='codeBlock-palette' />}
 		</>
 	);
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/settings.ts b/apps/meteor/ee/app/livechat-enterprise/server/settings.ts
index 6712cfa1bbdf9..935f73cc34bf9 100644
--- a/apps/meteor/ee/app/livechat-enterprise/server/settings.ts
+++ b/apps/meteor/ee/app/livechat-enterprise/server/settings.ts
@@ -88,6 +88,7 @@ export const createSettings = async (): Promise<void> => {
 				invalidValue: false,
 				modules: ['livechat-enterprise'],
 				enableQuery: omnichannelEnabledQuery,
+				public: true,
 			});
 
 			await this.add('Livechat_waiting_queue_message', '', {
diff --git a/apps/meteor/lib/publishFields.ts b/apps/meteor/lib/publishFields.ts
index 5f5170aed3a56..d3974bebf8af5 100644
--- a/apps/meteor/lib/publishFields.ts
+++ b/apps/meteor/lib/publishFields.ts
@@ -76,7 +76,6 @@ export const roomFields = {
 	avatarETag: 1,
 	usersCount: 1,
 	msgs: 1,
-	sidepanel: 1,
 
 	// @TODO create an API to register this fields based on room type
 	tags: 1,
diff --git a/apps/meteor/public/images/featurePreview/enhanced-navigation.png b/apps/meteor/public/images/featurePreview/enhanced-navigation.png
index 4240326ba985d..1ceb14dc804ca 100644
Binary files a/apps/meteor/public/images/featurePreview/enhanced-navigation.png and b/apps/meteor/public/images/featurePreview/enhanced-navigation.png differ
diff --git a/apps/meteor/server/services/room/service.ts b/apps/meteor/server/services/room/service.ts
index cc83ffe66e88a..99af41e9762c6 100644
--- a/apps/meteor/server/services/room/service.ts
+++ b/apps/meteor/server/services/room/service.ts
@@ -17,7 +17,7 @@ export class RoomService extends ServiceClassInternal implements IRoomService {
 	protected name = 'room';
 
 	async create(uid: string, params: ICreateRoomParams): Promise<IRoom> {
-		const { type, name, members = [], readOnly, extraData, options, sidepanel } = params;
+		const { type, name, members = [], readOnly, extraData, options } = params;
 
 		const hasPermission = await Authorization.hasPermission(uid, `create-${type}`);
 		if (!hasPermission) {
@@ -30,7 +30,7 @@ export class RoomService extends ServiceClassInternal implements IRoomService {
 		}
 
 		// TODO convert `createRoom` function to "raw" and move to here
-		return createRoom(type, name, user, members, false, readOnly, extraData, options, sidepanel) as unknown as IRoom;
+		return createRoom(type, name, user, members, false, readOnly, extraData, options) as unknown as IRoom;
 	}
 
 	async createDirectMessage({ to, from }: { to: string; from: string }): Promise<{ rid: string }> {
diff --git a/apps/meteor/server/services/team/service.ts b/apps/meteor/server/services/team/service.ts
index c79b59896f276..60fb07226d624 100644
--- a/apps/meteor/server/services/team/service.ts
+++ b/apps/meteor/server/services/team/service.ts
@@ -39,10 +39,7 @@ import { settings } from '../../../app/settings/server';
 export class TeamService extends ServiceClassInternal implements ITeamService {
 	protected name = 'team';
 
-	async create(
-		uid: string,
-		{ team, room = { name: team.name, extraData: {} }, members, owner, sidepanel }: ITeamCreateParams,
-	): Promise<ITeam> {
+	async create(uid: string, { team, room = { name: team.name, extraData: {} }, members, owner }: ITeamCreateParams): Promise<ITeam> {
 		if (!(await checkUsernameAvailability(team.name))) {
 			throw new Error('team-name-already-exists');
 		}
@@ -90,7 +87,6 @@ export class TeamService extends ServiceClassInternal implements ITeamService {
 						extraData: {
 							...room.extraData,
 						},
-						sidepanel,
 					})
 				)._id;
 
@@ -1058,9 +1054,9 @@ export class TeamService extends ServiceClassInternal implements ITeamService {
 		return rooms;
 	}
 
-	private getParentRoom(team: AtLeast<ITeam, 'roomId'>): Promise<Pick<IRoom, 'name' | 'fname' | 't' | '_id' | 'sidepanel'> | null> {
-		return Rooms.findOneById<Pick<IRoom, 'name' | 'fname' | 't' | '_id' | 'sidepanel'>>(team.roomId, {
-			projection: { name: 1, fname: 1, t: 1, sidepanel: 1 },
+	private getParentRoom(team: AtLeast<ITeam, 'roomId'>): Promise<Pick<IRoom, 'name' | 'fname' | 't' | '_id'> | null> {
+		return Rooms.findOneById<Pick<IRoom, 'name' | 'fname' | 't' | '_id'>>(team.roomId, {
+			projection: { name: 1, fname: 1, t: 1 },
 		});
 	}
 
diff --git a/apps/meteor/tests/e2e/feature-preview.spec.ts b/apps/meteor/tests/e2e/feature-preview.spec.ts
index d74ca0191f8f3..2148d6039ec8b 100644
--- a/apps/meteor/tests/e2e/feature-preview.spec.ts
+++ b/apps/meteor/tests/e2e/feature-preview.spec.ts
@@ -2,7 +2,7 @@ import { faker } from '@faker-js/faker';
 import type { Page } from '@playwright/test';
 
 import { Users } from './fixtures/userStates';
-import { AccountProfile, HomeChannel } from './page-objects';
+import { AccountProfile, Admin, HomeChannel } from './page-objects';
 import {
 	createTargetChannel,
 	createTargetTeam,
@@ -30,12 +30,29 @@ test.describe.serial('feature preview', () => {
 		await setSettingValueById(api, 'Accounts_AllowFeaturePreview', true);
 		targetChannel = await createTargetChannel(api, { members: ['user1'] });
 		targetDiscussion = await createTargetDiscussion(api);
+
+		await setUserPreferences(api, {
+			featuresPreview: [
+				{
+					name: 'newNavigation',
+					value: true,
+				},
+			],
+		});
 	});
 
 	test.afterAll(async ({ api }) => {
-		await setSettingValueById(api, 'Accounts_AllowFeaturePreview', false);
+		// await setSettingValueById(api, 'Accounts_AllowFeaturePreview', false);
 		await deleteChannel(api, targetChannel);
 		await deleteRoom(api, targetDiscussion._id);
+		await setUserPreferences(api, {
+			featuresPreview: [
+				{
+					name: 'newNavigation',
+					value: false,
+				},
+			],
+		});
 	});
 
 	test.beforeEach(async ({ page }) => {
@@ -47,9 +64,8 @@ test.describe.serial('feature preview', () => {
 		await page.goto('/account/feature-preview');
 		await page.waitForSelector('#main-content');
 
-		// FIXME: this timeout is too high
-		await expect(page.getByRole('button', { name: 'Message' })).toBeVisible({ timeout: 10_000 });
-		await expect(page.getByRole('button', { name: 'Navigation' })).toBeVisible();
+		await expect(page.getByRole('main').getByRole('button', { name: 'Message' })).toBeVisible();
+		await expect(page.getByRole('main').getByRole('button', { name: 'Navigation' })).toBeVisible();
 	});
 
 	test.describe('Enhanced navigation', () => {
@@ -109,7 +125,7 @@ test.describe.serial('feature preview', () => {
 			await test.step('should display home and directory inside a menu and sidebar toggler in tablet view', async () => {
 				await page.setViewportSize({ width: 1023, height: 767 });
 				await expect(poHomeChannel.navbar.btnMenuPages).toBeVisible();
-				await expect(poHomeChannel.navbar.btnSidebarToggler).toBeVisible();
+				await expect(poHomeChannel.navbar.btnSidebarToggler()).toBeVisible();
 			});
 
 			await test.step('should display voice and omnichannel items inside a menu in mobile view', async () => {
@@ -122,7 +138,7 @@ test.describe.serial('feature preview', () => {
 				await poHomeChannel.navbar.searchInput.click();
 
 				await expect(poHomeChannel.navbar.btnMenuPages).not.toBeVisible();
-				await expect(poHomeChannel.navbar.btnSidebarToggler).not.toBeVisible();
+				await expect(poHomeChannel.navbar.btnSidebarToggler()).not.toBeVisible();
 				await expect(poHomeChannel.navbar.btnVoiceAndOmnichannel).not.toBeVisible();
 				await expect(poHomeChannel.navbar.groupHistoryNavigation).not.toBeVisible();
 			});
@@ -137,7 +153,8 @@ test.describe.serial('feature preview', () => {
 
 		test('should expand/collapse sidebar groups', async ({ page }) => {
 			await page.goto('/home');
-			const collapser = poHomeChannel.sidebar.firstCollapser;
+
+			const collapser = poHomeChannel.sidebar.firstCollapser.getByRole('button');
 			let isExpanded: boolean;
 
 			await collapser.click();
@@ -152,7 +169,7 @@ test.describe.serial('feature preview', () => {
 		test('should expand/collapse sidebar groups with keyboard', async ({ page }) => {
 			await page.goto('/home');
 
-			const collapser = poHomeChannel.sidebar.firstCollapser;
+			const collapser = poHomeChannel.sidebar.firstCollapser.getByRole('button');
 
 			await expect(async () => {
 				await collapser.focus();
@@ -170,12 +187,13 @@ test.describe.serial('feature preview', () => {
 			}).toPass();
 		});
 
-		test('should be able to use keyboard to navigate through sidebar items', async ({ page }) => {
+		// TODO: fix, currently doesn't work due to grouped virtuoso
+		test.skip('should be able to use keyboard to navigate through sidebar items', async ({ page }) => {
 			await page.goto('/home');
 
 			const collapser = poHomeChannel.sidebar.firstCollapser;
-			const dataIndex = await collapser.locator('../..').getAttribute('data-index');
-			const nextItem = page.locator(`[data-index="${Number(dataIndex) + 1}"]`).getByRole('link');
+			const dataIndex = await collapser.locator('../..').getAttribute('data-item-index');
+			const nextItem = page.locator(`[data-item-index="${Number(dataIndex) + 1}"]`).getByRole('link');
 
 			await expect(async () => {
 				await collapser.focus();
@@ -197,14 +215,15 @@ test.describe.serial('feature preview', () => {
 			expect(isExpanded).toEqual(isExpandedAfterReload);
 		});
 
-		test('should show unread badge on collapser when group is collapsed and has unread items', async ({ page }) => {
+		// TODO: check if this still fails
+		test.skip('should show unread badge on collapser when group is collapsed and has unread items', async ({ page }) => {
 			await page.goto('/home');
 
 			await poHomeChannel.navbar.openChat(targetChannel);
 			await poHomeChannel.content.sendMessage('hello world');
 
+			await poHomeChannel.sidebar.firstCollapser.click();
 			const item = poHomeChannel.sidebar.getSearchRoomByName(targetChannel);
-
 			await expect(item).toBeVisible();
 
 			await poHomeChannel.sidebar.markItemAsUnread(item);
@@ -289,19 +308,14 @@ test.describe.serial('feature preview', () => {
 
 	test.describe('Sidepanel', () => {
 		test.beforeEach(async ({ api }) => {
-			sidepanelTeam = await createTargetTeam(api, { sidepanel: { items: ['channels', 'discussions'] } });
+			sidepanelTeam = await createTargetTeam(api);
 
 			await setUserPreferences(api, {
-				sidebarViewMode: 'Medium',
 				featuresPreview: [
 					{
 						name: 'newNavigation',
 						value: true,
 					},
-					{
-						name: 'sidepanelNavigation',
-						value: true,
-					},
 				],
 			});
 		});
@@ -310,47 +324,14 @@ test.describe.serial('feature preview', () => {
 			await deleteTeam(api, sidepanelTeam);
 
 			await setUserPreferences(api, {
-				sidebarViewMode: 'Medium',
 				featuresPreview: [
 					{
 						name: 'newNavigation',
 						value: false,
 					},
-					{
-						name: 'sidepanelNavigation',
-						value: false,
-					},
 				],
 			});
 		});
-		test('should be able to toggle "Sidepanel" feature', async ({ page }) => {
-			await page.goto('/account/feature-preview');
-
-			await poAccountProfile.getAccordionItemByName('Navigation').click();
-			const sidepanelCheckbox = poAccountProfile.getCheckboxByLabelText('Secondary navigation for teams');
-			await expect(sidepanelCheckbox).toBeChecked();
-			await sidepanelCheckbox.click();
-			await expect(sidepanelCheckbox).not.toBeChecked();
-
-			await poAccountProfile.btnSaveChanges.click();
-
-			await expect(poAccountProfile.btnSaveChanges).not.toBeVisible();
-			await expect(sidepanelCheckbox).not.toBeChecked();
-		});
-
-		test('should display sidepanel on a team and hide it on edit', async ({ page }) => {
-			await page.goto(`/group/${sidepanelTeam}`);
-			await poHomeChannel.content.waitForChannel();
-			await expect(poHomeChannel.sidepanel.sidepanelList).toBeVisible();
-
-			await poHomeChannel.tabs.btnRoomInfo.click();
-			await poHomeChannel.tabs.room.btnEdit.click();
-			await poHomeChannel.tabs.room.advancedSettingsAccordion.click();
-			await poHomeChannel.tabs.room.toggleSidepanelItems();
-			await poHomeChannel.tabs.room.btnSave.click();
-
-			await expect(poHomeChannel.sidepanel.sidepanelList).not.toBeVisible();
-		});
 
 		test('should display new channel from team on the sidepanel', async ({ page, api }) => {
 			await page.goto(`/group/${sidepanelTeam}`);
@@ -372,10 +353,9 @@ test.describe.serial('feature preview', () => {
 			await page.goto('/home');
 			const message = 'hello world';
 
-			await poHomeChannel.navbar.setDisplayMode('Extended');
 			await poHomeChannel.navbar.openChat(sidepanelTeam);
 			await poHomeChannel.content.sendMessage(message);
-			await expect(poHomeChannel.sidepanel.getExtendedItem(sidepanelTeam, message)).toBeVisible();
+			await expect(poHomeChannel.sidepanel.getItemByName(sidepanelTeam)).toBeVisible();
 		});
 
 		test('should escape special characters on item subtitle', async ({ page }) => {
@@ -383,12 +363,11 @@ test.describe.serial('feature preview', () => {
 			const message = 'hello > world';
 			const parsedWrong = 'hello &gt; world';
 
-			await poHomeChannel.navbar.setDisplayMode('Extended');
 			await poHomeChannel.navbar.openChat(sidepanelTeam);
 			await poHomeChannel.content.sendMessage(message);
 
-			await expect(poHomeChannel.sidepanel.getExtendedItem(sidepanelTeam, message)).toBeVisible();
-			await expect(poHomeChannel.sidepanel.getExtendedItem(sidepanelTeam, message)).not.toHaveText(parsedWrong);
+			await expect(poHomeChannel.sidepanel.getItemByName(sidepanelTeam)).toBeVisible();
+			await expect(poHomeChannel.sidepanel.getItemByName(sidepanelTeam)).not.toHaveText(parsedWrong);
 		});
 
 		test('should show channel in sidepanel after adding existing one', async ({ page }) => {
@@ -427,8 +406,8 @@ test.describe.serial('feature preview', () => {
 			}).toPass();
 			await poHomeChannel.tabs.channels.btnAdd.click();
 
-			const sidepanelTeamItem = poHomeChannel.sidepanel.getItemByName(sidepanelTeam);
-			const targetChannelItem = poHomeChannel.sidepanel.getItemByName(targetChannel);
+			const sidepanelTeamItem = poHomeChannel.sidepanel.getTeamItemByName(sidepanelTeam);
+			const targetChannelItem = poHomeChannel.sidepanel.getTeamItemByName(targetChannel);
 
 			await targetChannelItem.click();
 			expect(page.url()).toContain(`/channel/${targetChannel}`);
@@ -447,10 +426,488 @@ test.describe.serial('feature preview', () => {
 			await user1Channel.content.toggleAlsoSendThreadToChannel(false);
 			await user1Channel.content.sendMessageInThread('hello thread');
 
-			const item = poHomeChannel.sidepanel.getItemByName(targetChannel);
+			const item = poHomeChannel.sidepanel.getTeamItemByName(targetChannel);
 			await expect(item.locator('..')).toHaveAttribute('data-item-index', '0');
 
 			await user1Page.close();
 		});
+
+		test('sidebar and sidepanel should retain their state after opening a room through navbar search', async ({ page }) => {
+			await page.goto('/home');
+			await poHomeChannel.sidenav.waitForHome();
+
+			await poHomeChannel.sidebar.favoritesTeamCollabFilter.click();
+
+			await expect(poHomeChannel.sidepanel.getSidepanelHeader('Favorites')).toBeVisible();
+			await expect(poHomeChannel.sidenav.homepageHeader).toBeVisible();
+
+			await poHomeChannel.navbar.openChat(sidepanelTeam);
+			await poHomeChannel.content.waitForChannel();
+
+			await expect(page).toHaveURL(`/group/${sidepanelTeam}`);
+			await expect(poHomeChannel.sidepanel.getSidepanelHeader('Favorites')).toBeVisible();
+			await expect(poHomeChannel.sidebar.favoritesTeamCollabFilter).toHaveAttribute('aria-selected', 'true');
+		});
+
+		test('should open parent team when clicking button on sidepanel discussion item', async ({ page }) => {
+			await page.goto(`/group/${sidepanelTeam}`);
+
+			const discussionName = faker.string.uuid();
+			await poHomeChannel.content.btnMenuMoreActions.click();
+			await page.getByRole('menuitem', { name: 'Discussion' }).click();
+			await poHomeChannel.content.inputDiscussionName.fill(discussionName);
+			await poHomeChannel.content.btnCreateDiscussionModal.click();
+
+			await expect(page.getByRole('heading', { name: discussionName })).toBeVisible();
+
+			await expect(poHomeChannel.sidepanel.getItemByName(discussionName).getByRole('button', { name: sidepanelTeam })).toBeVisible();
+
+			await poHomeChannel.sidepanel.getItemByName(discussionName).getByRole('button', { name: sidepanelTeam }).click();
+
+			await expect(page).toHaveURL(`/group/${sidepanelTeam}`);
+			await expect(page.getByRole('heading', { name: sidepanelTeam })).toBeVisible();
+		});
+
+		test('should show all filters and tablist on sidepanel', async ({ page }) => {
+			await page.goto('/home');
+
+			await expect(poHomeChannel.sidebar.teamCollabFilters).toBeVisible();
+			await expect(poHomeChannel.sidebar.omnichannelFilters).toBeVisible();
+
+			await expect(poHomeChannel.sidebar.allTeamCollabFilter).toBeVisible();
+			await expect(poHomeChannel.sidebar.mentionsTeamCollabFilter).toBeVisible();
+			await expect(poHomeChannel.sidebar.favoritesTeamCollabFilter).toBeVisible();
+			await expect(poHomeChannel.sidebar.discussionsTeamCollabFilter).toBeVisible();
+		});
+
+		test('should show favorite team on the sidepanel', async ({ page }) => {
+			await page.goto(`/group/${sidepanelTeam}`);
+			await poHomeChannel.content.waitForChannel();
+			await poHomeChannel.sidebar.favoritesTeamCollabFilter.click();
+
+			await expect(poHomeChannel.sidepanel.getTeamItemByName(sidepanelTeam)).not.toBeVisible();
+
+			await poHomeChannel.roomHeaderFavoriteBtn.click();
+
+			await expect(poHomeChannel.sidepanel.getTeamItemByName(sidepanelTeam)).toBeVisible();
+		});
+
+		test('should show discussion in discussions and all sidepanel filter, should remove after deleting discussion', async ({ page }) => {
+			await page.goto(`/group/${sidepanelTeam}`);
+			await poHomeChannel.content.waitForChannel();
+
+			const discussionName = faker.string.uuid();
+
+			await poHomeChannel.content.btnMenuMoreActions.click();
+			await page.getByRole('menuitem', { name: 'Discussion' }).click();
+			await poHomeChannel.content.inputDiscussionName.fill(discussionName);
+			await poHomeChannel.content.btnCreateDiscussionModal.click();
+			await expect(page.getByRole('heading', { name: discussionName })).toBeVisible();
+
+			await poHomeChannel.sidebar.discussionsTeamCollabFilter.click();
+			await expect(poHomeChannel.sidepanel.getItemByName(discussionName)).toBeVisible();
+
+			await poHomeChannel.sidebar.allTeamCollabFilter.click();
+			await expect(poHomeChannel.sidepanel.getItemByName(discussionName)).toBeVisible();
+
+			await poHomeChannel.tabs.btnRoomInfo.click();
+			await poHomeChannel.tabs.room.btnMore.click();
+			await poHomeChannel.tabs.room.getMoreOption('Delete').click();
+			await poHomeChannel.tabs.room.confirmDeleteDiscussion();
+
+			await poHomeChannel.sidebar.discussionsTeamCollabFilter.click();
+			await expect(poHomeChannel.sidepanel.getItemByName(discussionName)).not.toBeVisible();
+
+			await poHomeChannel.sidebar.allTeamCollabFilter.click();
+			await expect(poHomeChannel.sidepanel.getItemByName(discussionName)).not.toBeVisible();
+		});
+
+		test('should persist sidepanel state after page reload', async ({ page }) => {
+			await page.goto('/home');
+			await poHomeChannel.sidebar.discussionsTeamCollabFilter.click();
+			await poHomeChannel.sidepanel.unreadToggleLabel.click({ force: true });
+
+			await expect(poHomeChannel.sidepanel.unreadCheckbox).toBeChecked();
+			await expect(poHomeChannel.sidepanel.getSidepanelHeader('Discussions')).toBeVisible();
+
+			await page.reload();
+
+			await expect(poHomeChannel.sidepanel.unreadCheckbox).toBeChecked();
+			await expect(poHomeChannel.sidepanel.getSidepanelHeader('Discussions')).toBeVisible();
+		});
+
+		test('should show unread filter for thread messages', async ({ page, browser }) => {
+			const user1Page = await browser.newPage({ storageState: Users.user1.state });
+			const user1Channel = new HomeChannel(user1Page);
+
+			await test.step('mark all rooms as read', async () => {
+				await page.goto('/home');
+				await poHomeChannel.sidenav.waitForHome();
+				await poHomeChannel.content.markAllRoomsAsRead();
+			});
+
+			await page.goto(`/channel/${targetChannel}`);
+			await poHomeChannel.content.waitForChannel();
+			await poHomeChannel.content.sendMessage('test thread message');
+
+			await poHomeChannel.navbar.homeButton.click();
+			await poHomeChannel.sidebar.allTeamCollabFilter.click();
+			await poHomeChannel.sidepanel.unreadToggleLabel.click();
+
+			await expect(poHomeChannel.sidepanel.unreadCheckbox).toBeChecked();
+			await expect(poHomeChannel.sidepanel.sidepanel.getByRole('heading', { name: 'No unread rooms' })).toBeVisible();
+
+			await test.step('send a thread message from another user', async () => {
+				await user1Page.goto(`/channel/${targetChannel}`);
+				await user1Channel.content.waitForChannel();
+				await user1Channel.content.openReplyInThread();
+				await user1Channel.content.toggleAlsoSendThreadToChannel(false);
+				await user1Channel.content.sendMessageInThread('hello thread');
+			});
+
+			await expect(poHomeChannel.sidepanel.sidepanel.getByRole('heading', { name: 'No unread rooms' })).not.toBeVisible();
+			await expect(poHomeChannel.sidepanel.getItemByName(targetChannel)).toBeVisible();
+			await expect(
+				poHomeChannel.sidepanel.getItemByName(targetChannel).getByRole('status', { name: '1 unread threaded message' }),
+			).toBeVisible();
+
+			await poHomeChannel.sidepanel.getItemByName(targetChannel).click();
+			await poHomeChannel.content.waitForChannel();
+
+			await expect(poHomeChannel.sidepanel.sidepanel.getByRole('heading', { name: 'No unread rooms' })).not.toBeVisible();
+			await expect(poHomeChannel.sidepanel.getItemByName(targetChannel)).toBeVisible();
+			await expect(
+				poHomeChannel.sidepanel.getItemByName(targetChannel).getByRole('status', { name: '1 unread threaded message' }),
+			).toBeVisible();
+
+			await poHomeChannel.content.openReplyInThread();
+
+			await expect(poHomeChannel.sidepanel.sidepanel.getByRole('heading', { name: 'No unread rooms' })).toBeVisible();
+			await user1Page.close();
+		});
+
+		test('unread mentions badges on filters', async ({ page, browser }) => {
+			const user1Page = await browser.newPage({ storageState: Users.user1.state });
+			const user1Channel = new HomeChannel(user1Page);
+
+			await test.step('mark all rooms as read', async () => {
+				await page.goto('/home');
+				await poHomeChannel.sidenav.waitForHome();
+				await poHomeChannel.content.markAllRoomsAsRead();
+			});
+
+			await test.step('should favorite the target channel', async () => {
+				await page.goto(`/channel/${targetChannel}`);
+				await poHomeChannel.content.waitForChannel();
+				await poHomeChannel.sidebar.favoritesTeamCollabFilter.click();
+
+				await expect(poHomeChannel.sidepanel.getItemByName(targetChannel)).not.toBeVisible();
+
+				await poHomeChannel.roomHeaderFavoriteBtn.click();
+
+				await expect(poHomeChannel.sidepanel.getItemByName(targetChannel)).toBeVisible();
+			});
+
+			await test.step('unread state should be empty', async () => {
+				await poHomeChannel.sidebar.allTeamCollabFilter.click();
+				await poHomeChannel.sidepanel.unreadToggleLabel.click();
+
+				await expect(poHomeChannel.sidepanel.unreadCheckbox).toBeChecked();
+				await expect(poHomeChannel.sidepanel.sidepanel.getByRole('heading', { name: 'No unread rooms' })).toBeVisible();
+
+				await poHomeChannel.sidebar.mentionsTeamCollabFilter.click();
+
+				await expect(poHomeChannel.sidepanel.unreadCheckbox).toBeChecked();
+				await expect(poHomeChannel.sidepanel.sidepanel.getByRole('heading', { name: 'No unread mentions' })).toBeVisible();
+
+				await poHomeChannel.sidebar.favoritesTeamCollabFilter.click();
+
+				await expect(poHomeChannel.sidepanel.unreadCheckbox).toBeChecked();
+				await expect(poHomeChannel.sidepanel.sidepanel.getByRole('heading', { name: 'No unread favorite rooms' })).toBeVisible();
+			});
+
+			await poHomeChannel.navbar.homeButton.click();
+
+			await test.step('send a mention message from another user', async () => {
+				await user1Page.goto(`/channel/${targetChannel}`);
+				await user1Channel.content.waitForChannel();
+				await user1Channel.content.sendMessage(`hello @${Users.admin.data.username}`);
+			});
+
+			await test.step('unread mentions badge should be visible on all filters', async () => {
+				await poHomeChannel.sidebar.allTeamCollabFilter.click();
+
+				await expect(poHomeChannel.sidepanel.sidepanel.getByRole('heading', { name: 'No unread rooms' })).not.toBeVisible();
+				await expect(poHomeChannel.sidepanel.getItemByName(targetChannel)).toBeVisible();
+				await expect(poHomeChannel.sidepanel.getItemByName(targetChannel).getByRole('status', { name: '1 mention' })).toBeVisible();
+				await expect(poHomeChannel.sidebar.allTeamCollabFilter.getByRole('status', { name: '1 mention from All' })).toBeVisible();
+
+				await poHomeChannel.sidebar.mentionsTeamCollabFilter.click();
+				await expect(poHomeChannel.sidepanel.sidepanel.getByRole('heading', { name: 'No unread mentions' })).not.toBeVisible();
+				await expect(poHomeChannel.sidepanel.getItemByName(targetChannel)).toBeVisible();
+				await expect(poHomeChannel.sidepanel.getItemByName(targetChannel).getByRole('status', { name: '1 mention' })).toBeVisible();
+				await expect(poHomeChannel.sidebar.mentionsTeamCollabFilter.getByRole('status', { name: '1 mention from Mentions' })).toBeVisible();
+
+				await poHomeChannel.sidebar.favoritesTeamCollabFilter.click();
+				await expect(poHomeChannel.sidepanel.sidepanel.getByRole('heading', { name: 'No unread favorite rooms' })).not.toBeVisible();
+				await expect(poHomeChannel.sidepanel.getItemByName(targetChannel)).toBeVisible();
+				await expect(poHomeChannel.sidepanel.getItemByName(targetChannel).getByRole('status', { name: '1 mention' })).toBeVisible();
+				await expect(
+					poHomeChannel.sidebar.favoritesTeamCollabFilter.getByRole('status', { name: '1 mention from Favorites' }),
+				).toBeVisible();
+			});
+
+			await test.step('read the room', async () => {
+				await poHomeChannel.sidepanel.getItemByName(targetChannel).click();
+				await poHomeChannel.content.waitForChannel();
+			});
+
+			await test.step('unread mentions badge should not be visible on any filters', async () => {
+				await expect(poHomeChannel.sidepanel.unreadCheckbox).toBeChecked();
+				await expect(poHomeChannel.sidepanel.getItemByName(targetChannel)).not.toBeVisible();
+
+				await poHomeChannel.sidebar.mentionsTeamCollabFilter.click();
+
+				await expect(poHomeChannel.sidepanel.unreadCheckbox).toBeChecked();
+				await expect(poHomeChannel.sidepanel.getItemByName(targetChannel)).not.toBeVisible();
+				await expect(poHomeChannel.sidepanel.sidepanel.getByRole('heading', { name: 'No unread mentions' })).toBeVisible();
+
+				await poHomeChannel.sidebar.favoritesTeamCollabFilter.click();
+
+				await expect(poHomeChannel.sidepanel.unreadCheckbox).toBeChecked();
+				await expect(poHomeChannel.sidepanel.getItemByName(targetChannel)).not.toBeVisible();
+				await expect(poHomeChannel.sidepanel.sidepanel.getByRole('heading', { name: 'No unread favorite rooms' })).toBeVisible();
+
+				await poHomeChannel.sidebar.allTeamCollabFilter.click();
+
+				await expect(poHomeChannel.sidepanel.unreadCheckbox).toBeChecked();
+				await expect(poHomeChannel.sidepanel.getItemByName(targetChannel)).not.toBeVisible();
+				await expect(poHomeChannel.sidepanel.sidepanel.getByRole('heading', { name: 'No unread rooms' })).toBeVisible();
+			});
+
+			await user1Page.close();
+		});
+
+		test('should persist sidepanel state after switching admin panel', async ({ page }) => {
+			await page.goto('/home');
+			await poHomeChannel.sidebar.discussionsTeamCollabFilter.click();
+			await poHomeChannel.sidepanel.unreadToggleLabel.click();
+
+			await expect(poHomeChannel.sidepanel.unreadCheckbox).toBeChecked();
+			await expect(poHomeChannel.sidepanel.getSidepanelHeader('Discussions')).toBeVisible();
+
+			await poHomeChannel.navbar.openAdminPanel();
+			await expect(page).toHaveURL(/\/admin/);
+
+			const adminPage = new Admin(page);
+
+			await adminPage.btnClose.click();
+			await expect(page).toHaveURL(/\/home/);
+
+			await expect(poHomeChannel.sidepanel.unreadCheckbox).toBeChecked();
+			await expect(poHomeChannel.sidepanel.getSidepanelHeader('Discussions')).toBeVisible();
+		});
+
+		test.describe('sidebar and sidepanel in small viewport', () => {
+			test.beforeEach(async ({ page }) => {
+				await page.setViewportSize({ width: 640, height: 460 });
+			});
+
+			test('should show button to toggle sidebar/sidepanel', async ({ page }) => {
+				await page.goto('/home');
+
+				await expect(poHomeChannel.sidebar.sidebar).not.toBeVisible();
+				await expect(poHomeChannel.sidepanel.sidepanel).not.toBeVisible();
+				await expect(poHomeChannel.navbar.btnSidebarToggler()).toBeVisible();
+			});
+
+			test('should toggle sidebar/sidepanel when clicking the button', async ({ page }) => {
+				await page.goto('/home');
+
+				await poHomeChannel.navbar.btnSidebarToggler().click();
+				await expect(poHomeChannel.sidebar.sidebar).not.toBeVisible();
+				await expect(poHomeChannel.sidepanel.sidepanel).toBeVisible();
+
+				await poHomeChannel.navbar.btnSidebarToggler(true).click();
+				await expect(poHomeChannel.sidebar.sidebar).not.toBeVisible();
+				await expect(poHomeChannel.sidepanel.sidepanel).not.toBeVisible();
+			});
+
+			test('toggle sidebar and sidepanel', async ({ page }) => {
+				await page.goto('/home');
+				await poHomeChannel.navbar.btnSidebarToggler().click();
+
+				await expect(poHomeChannel.sidepanel.sidepanelBackButton).toBeVisible();
+
+				await poHomeChannel.sidepanel.sidepanelBackButton.click();
+
+				await expect(poHomeChannel.sidebar.sidebar).toBeVisible();
+				await expect(poHomeChannel.sidepanel.sidepanel).not.toBeVisible();
+
+				await poHomeChannel.sidebar.mentionsTeamCollabFilter.click();
+
+				await expect(poHomeChannel.sidepanel.sidepanel).toBeVisible();
+				await expect(poHomeChannel.sidepanel.getSidepanelHeader('Mentions')).toBeVisible();
+			});
+
+			test('should close nav region when clicking outside of it', async ({ page }) => {
+				await page.goto('/home');
+				await poHomeChannel.navbar.btnSidebarToggler().click();
+
+				await expect(poHomeChannel.sidepanel.sidepanel).toBeVisible();
+
+				await page.click('main', { force: true });
+
+				await expect(poHomeChannel.sidepanel.sidepanel).not.toBeVisible();
+				await expect(poHomeChannel.sidebar.sidebar).not.toBeVisible();
+			});
+
+			test('should close nav region when opening a room', async ({ page }) => {
+				await page.goto('/home');
+				await poHomeChannel.navbar.btnSidebarToggler().click();
+
+				await expect(poHomeChannel.sidepanel.sidepanel).toBeVisible();
+
+				await poHomeChannel.sidepanel.getItemByName(targetChannel).click();
+				await poHomeChannel.content.waitForChannel();
+				await expect(poHomeChannel.content.channelHeader).toContainText(targetChannel);
+
+				await expect(poHomeChannel.sidepanel.sidepanel).not.toBeVisible();
+				await expect(poHomeChannel.sidebar.sidebar).not.toBeVisible();
+			});
+		});
+	});
+
+	test.describe('Sidebar room filters', () => {
+		test.beforeAll(async ({ api }) => {
+			sidepanelTeam = await createTargetTeam(api);
+
+			await setUserPreferences(api, {
+				featuresPreview: [
+					{
+						name: 'newNavigation',
+						value: true,
+					},
+				],
+			});
+		});
+
+		test.afterAll(async ({ api }) => {
+			await deleteTeam(api, sidepanelTeam);
+
+			await setUserPreferences(api, {
+				featuresPreview: [
+					{
+						name: 'newNavigation',
+						value: false,
+					},
+				],
+			});
+		});
+
+		test('should not open rooms when clicking on sidebar filters', async ({ page }) => {
+			await page.goto('/home');
+
+			await poHomeChannel.sidenav.waitForHome();
+
+			await expect(poHomeChannel.sidebar.channelsList).toBeVisible();
+			// TODO: flaky without force click, for some reason opens 2nd channel in list
+			await poHomeChannel.sidebar.getSearchRoomByName(sidepanelTeam).click({ force: true });
+
+			await expect(poHomeChannel.sidepanel.sidepanel).toBeVisible();
+			await expect(poHomeChannel.sidepanel.getSidepanelHeader(sidepanelTeam)).toBeVisible();
+
+			await expect(poHomeChannel.sidepanel.getTeamItemByName(sidepanelTeam)).toBeVisible();
+			await expect(page).toHaveURL('/home');
+			await expect(poHomeChannel.sidenav.homepageHeader).toBeVisible();
+		});
+
+		test('should open room when clicking on sidepanel item', async ({ page }) => {
+			await page.goto('/home');
+
+			await poHomeChannel.sidenav.waitForHome();
+			await poHomeChannel.sidebar.getSearchRoomByName(sidepanelTeam).click();
+
+			await expect(poHomeChannel.sidepanel.sidepanel).toBeVisible();
+			await expect(poHomeChannel.sidepanel.getSidepanelHeader(sidepanelTeam)).toBeVisible();
+
+			await poHomeChannel.sidepanel.getTeamItemByName(sidepanelTeam).click();
+			await poHomeChannel.content.waitForChannel();
+			await expect(page).toHaveURL(`/group/${sidepanelTeam}`);
+		});
+
+		test('should display rooms in direct message filter', async ({ page }) => {
+			const discussionName = faker.string.uuid();
+
+			await test.step('create a direct message with user1', async () => {
+				await page.goto('/home');
+				await poHomeChannel.sidenav.waitForHome();
+
+				await poHomeChannel.navbar.openChat(Users.user1.data.username);
+				await poHomeChannel.content.waitForChannel();
+				await expect(poHomeChannel.content.channelHeader).toContainText(Users.user1.data.username);
+			});
+
+			await test.step('create discussion in DM', async () => {
+				await poHomeChannel.content.btnMenuMoreActions.click();
+				await page.getByRole('menuitem', { name: 'Discussion' }).click();
+				await poHomeChannel.content.inputDiscussionName.fill(discussionName);
+				await poHomeChannel.content.btnCreateDiscussionModal.click();
+				await poHomeChannel.content.waitForChannel();
+				await poHomeChannel.content.sendMessage('hello');
+
+				await expect(page.getByRole('heading', { name: discussionName })).toBeVisible();
+			});
+
+			await test.step('open direct message sidebar filter', async () => {
+				await poHomeChannel.sidebar.teamsCollapser.click();
+				await poHomeChannel.sidebar.channelsCollapser.click();
+
+				await expect(poHomeChannel.sidebar.directMessagesCollapser).toBeVisible();
+				await expect(poHomeChannel.sidebar.directMessagesCollapser.getByRole('button')).toHaveAttribute('aria-expanded', 'true');
+				await expect(poHomeChannel.sidebar.getSearchRoomByName(Users.user1.data.username)).toBeVisible();
+
+				await poHomeChannel.sidebar.getSearchRoomByName(Users.user1.data.username).click();
+
+				await expect(poHomeChannel.sidepanel.sidepanel).toBeVisible();
+				await expect(poHomeChannel.sidepanel.getSidepanelHeader(Users.user1.data.username)).toBeVisible();
+				await expect(poHomeChannel.sidepanel.getMainRoomByName(Users.user1.data.username)).toBeVisible();
+				await expect(poHomeChannel.sidepanel.getItemByName(discussionName)).toBeVisible();
+				await expect(poHomeChannel.sidepanel.getItemByName(discussionName)).toContainText('hello');
+
+				await poHomeChannel.sidepanel.getMainRoomByName(Users.user1.data.username).click();
+				await poHomeChannel.content.waitForChannel();
+				await poHomeChannel.content.sendMessage('hello DM');
+
+				await expect(poHomeChannel.content.channelHeader).toContainText(Users.user1.data.username);
+				await expect(page).toHaveURL(/direct/);
+				await expect(poHomeChannel.sidepanel.getMainRoomByName(Users.user1.data.username)).toHaveAttribute('aria-selected', 'true');
+				await expect(poHomeChannel.sidepanel.getMainRoomByName(Users.user1.data.username)).toContainText('hello DM');
+				await expect(poHomeChannel.sidepanel.getItemByName(discussionName)).toHaveAttribute('aria-selected', 'false');
+				await expect(poHomeChannel.sidepanel.getItemByName(discussionName)).toContainText('hello');
+
+				await poHomeChannel.sidepanel.getItemByName(discussionName).click();
+				await poHomeChannel.content.waitForChannel();
+
+				await expect(page).toHaveURL(/group/);
+				await expect(poHomeChannel.sidepanel.getMainRoomByName(Users.user1.data.username)).toHaveAttribute('aria-selected', 'false');
+				await expect(poHomeChannel.sidepanel.getMainRoomByName(Users.user1.data.username)).toContainText('hello DM');
+				await expect(poHomeChannel.sidepanel.getItemByName(discussionName)).toHaveAttribute('aria-selected', 'true');
+				await expect(poHomeChannel.sidepanel.getItemByName(discussionName)).toContainText('hello');
+				await expect(poHomeChannel.sidepanel.getSidepanelHeader(Users.user1.data.username)).toBeVisible();
+			});
+		});
+
+		test('should not open rooms when clicking on sidebar filters in small viewport', async ({ page }) => {
+			await page.setViewportSize({ width: 640, height: 460 });
+			await page.goto('/home');
+
+			await poHomeChannel.sidenav.waitForHome();
+
+			await expect(poHomeChannel.sidebar.sidebar).not.toBeVisible();
+			await expect(poHomeChannel.sidepanel.sidepanel).not.toBeVisible();
+			await poHomeChannel.navbar.btnSidebarToggler().click();
+			await expect(poHomeChannel.sidepanel.sidepanel).toBeVisible();
+		});
 	});
 });
diff --git a/apps/meteor/tests/e2e/page-objects/admin.ts b/apps/meteor/tests/e2e/page-objects/admin.ts
index aaf0f194f6d1f..650615e127282 100644
--- a/apps/meteor/tests/e2e/page-objects/admin.ts
+++ b/apps/meteor/tests/e2e/page-objects/admin.ts
@@ -342,4 +342,8 @@ export class Admin {
 	findFileCheckboxByUsername(username: string) {
 		return this.findFileRowByUsername(username).locator('label', { has: this.page.getByRole('checkbox') });
 	}
+
+	get btnClose(): Locator {
+		return this.page.locator('role=navigation >> role=button[name=Close]');
+	}
 }
diff --git a/apps/meteor/tests/e2e/page-objects/fragments/home-content.ts b/apps/meteor/tests/e2e/page-objects/fragments/home-content.ts
index cae0a54e89c55..d033186e69cc4 100644
--- a/apps/meteor/tests/e2e/page-objects/fragments/home-content.ts
+++ b/apps/meteor/tests/e2e/page-objects/fragments/home-content.ts
@@ -610,4 +610,16 @@ export class HomeContent {
 		}
 		await this.sendMessage(quoteText);
 	}
+
+	get clearAllUnreadsModal(): Locator {
+		return this.page.getByRole('dialog', { name: 'Clear all unreads?' });
+	}
+
+	async markAllRoomsAsRead(): Promise<void> {
+		await this.page.keyboard.down('Shift');
+		await this.page.keyboard.press('Escape');
+		await this.page.keyboard.up('Shift');
+		await expect(this.clearAllUnreadsModal).toBeVisible();
+		await this.clearAllUnreadsModal.getByRole('button', { name: 'Yes, clear all!' }).click();
+	}
 }
diff --git a/apps/meteor/tests/e2e/page-objects/fragments/home-flextab-room.ts b/apps/meteor/tests/e2e/page-objects/fragments/home-flextab-room.ts
index dff205812555f..70a1e06fc9301 100644
--- a/apps/meteor/tests/e2e/page-objects/fragments/home-flextab-room.ts
+++ b/apps/meteor/tests/e2e/page-objects/fragments/home-flextab-room.ts
@@ -35,10 +35,18 @@ export class HomeFlextabRoom {
 		return this.page.getByRole('dialog', { name: 'Delete team', exact: true });
 	}
 
+	get confirmDeleteDiscussionModal(): Locator {
+		return this.page.getByRole('dialog', { name: 'Delete discussion', exact: true });
+	}
+
 	async confirmDeleteTeam() {
 		return this.confirmDeleteTeamModal.getByRole('button', { name: 'Yes, delete', exact: true }).click();
 	}
 
+	async confirmDeleteDiscussion() {
+		return this.confirmDeleteDiscussionModal.getByRole('button', { name: 'Yes, delete', exact: true }).click();
+	}
+
 	get confirmConvertModal(): Locator {
 		return this.page.getByRole('dialog', { name: 'Confirmation', exact: true });
 	}
diff --git a/apps/meteor/tests/e2e/page-objects/fragments/home-sidenav.ts b/apps/meteor/tests/e2e/page-objects/fragments/home-sidenav.ts
index ba46c28108547..0318752e96885 100644
--- a/apps/meteor/tests/e2e/page-objects/fragments/home-sidenav.ts
+++ b/apps/meteor/tests/e2e/page-objects/fragments/home-sidenav.ts
@@ -230,4 +230,12 @@ export class HomeSidenav {
 
 		await toastMessages.dismissToast('success');
 	}
+
+	async waitForHome(): Promise<void> {
+		await this.page.waitForSelector('main');
+	}
+
+	get homepageHeader(): Locator {
+		return this.page.locator('main').getByRole('heading', { name: 'Home' });
+	}
 }
diff --git a/apps/meteor/tests/e2e/page-objects/fragments/navbar.ts b/apps/meteor/tests/e2e/page-objects/fragments/navbar.ts
index be70571a65f22..3bd73043505f5 100644
--- a/apps/meteor/tests/e2e/page-objects/fragments/navbar.ts
+++ b/apps/meteor/tests/e2e/page-objects/fragments/navbar.ts
@@ -13,10 +13,6 @@ export class Navbar {
 		return this.page.getByRole('navigation', { name: 'header' });
 	}
 
-	get btnSidebarToggler(): Locator {
-		return this.navbar.getByRole('button', { name: 'Open sidebar' });
-	}
-
 	get btnVoiceAndOmnichannel(): Locator {
 		return this.navbar.getByRole('button', { name: 'Voice and omnichannel' });
 	}
@@ -53,6 +49,24 @@ export class Navbar {
 		return this.navbarSearchSection.getByRole('listbox', { name: 'Channels' });
 	}
 
+	get workspaceGroup(): Locator {
+		return this.navbar.getByRole('group', { name: 'Workspace and user preferences' });
+	}
+
+	get manageWorkspaceButton(): Locator {
+		return this.workspaceGroup.getByRole('button', { name: 'Manage' });
+	}
+
+	btnSidebarToggler(closeSidebar?: boolean): Locator {
+		return this.navbar.getByRole('button', { name: closeSidebar ? 'Close sidebar' : 'Open sidebar' });
+	}
+
+	async openAdminPanel(): Promise<void> {
+		await this.manageWorkspaceButton.click();
+		await this.page.getByRole('menuitem', { name: 'Workspace' }).click();
+		await this.page.waitForURL(/\/admin/);
+	}
+
 	async typeSearch(name: string): Promise<void> {
 		return this.searchInput.fill(name);
 	}
@@ -67,7 +81,7 @@ export class Navbar {
 	}
 
 	getSearchRoomByName(name: string): Locator {
-		return this.searchList.getByRole('option', { name });
+		return this.searchList.getByRole('option', { name, exact: true });
 	}
 
 	async openChat(name: string): Promise<void> {
@@ -75,10 +89,4 @@ export class Navbar {
 		await this.getSearchRoomByName(name).click();
 		await this.waitForChannel();
 	}
-
-	async setDisplayMode(mode: 'Extended' | 'Medium' | 'Condensed'): Promise<void> {
-		await this.pagesGroup.getByRole('button', { name: 'Display', exact: true }).click();
-		await this.page.getByRole('menu', { name: 'Display' }).getByRole('menuitemcheckbox', { name: mode }).click();
-		await this.page.keyboard.press('Escape');
-	}
 }
diff --git a/apps/meteor/tests/e2e/page-objects/fragments/sidebar.ts b/apps/meteor/tests/e2e/page-objects/fragments/sidebar.ts
index 27ae799b4e4d9..63760cc4214ec 100644
--- a/apps/meteor/tests/e2e/page-objects/fragments/sidebar.ts
+++ b/apps/meteor/tests/e2e/page-objects/fragments/sidebar.ts
@@ -9,19 +9,62 @@ export class Sidebar {
 
 	// New navigation locators
 	get sidebar(): Locator {
-		return this.page.getByRole('navigation', { name: 'sidebar' });
+		return this.page.getByRole('navigation', { name: 'Sidebar' });
+	}
+
+	get teamCollabFilters(): Locator {
+		return this.sidebar.getByRole('tablist', { name: 'Team collaboration filters' });
+	}
+
+	get omnichannelFilters(): Locator {
+		return this.sidebar.getByRole('tablist', { name: 'Omnichannel filters' });
+	}
+
+	get allTeamCollabFilter(): Locator {
+		return this.teamCollabFilters.getByRole('button', { name: 'All' });
+	}
+
+	get mentionsTeamCollabFilter(): Locator {
+		return this.teamCollabFilters.getByRole('button').filter({ hasText: 'Mentions' });
+	}
+
+	get favoritesTeamCollabFilter(): Locator {
+		return this.teamCollabFilters.getByRole('button', { name: 'Favorites' });
+	}
+
+	get discussionsTeamCollabFilter(): Locator {
+		return this.teamCollabFilters.getByRole('button', { name: 'Discussions' });
+	}
+
+	// TODO: fix this filter, workaround due to virtuoso
+	get topChannelList(): Locator {
+		return this.sidebar.getByTestId('virtuoso-top-item-list');
 	}
 
 	get channelsList(): Locator {
-		return this.sidebar.getByRole('list', { name: 'Channels' });
+		// TODO: fix this filter, workaround due to virtuoso
+		// return this.sidebar.getByRole('list', { name: 'Channels' }).filter({ has: this.page.getByRole('listitem') });
+		return this.sidebar.getByTestId('virtuoso-item-list');
 	}
 
 	getSearchRoomByName(name: string) {
-		return this.channelsList.getByRole('link', { name });
+		return this.channelsList.getByRole('button', { name, exact: true });
 	}
 
 	get firstCollapser(): Locator {
-		return this.channelsList.getByRole('button').first();
+		return this.topChannelList.getByRole('region').first();
+	}
+
+	get teamsCollapser(): Locator {
+		return this.sidebar.getByRole('region', { name: 'Collapse Teams' }).first();
+	}
+
+	get channelsCollapser(): Locator {
+		return this.channelsList.getByRole('region', { name: 'Collapse Channels' });
+	}
+
+	get directMessagesCollapser(): Locator {
+		return this.channelsList.getByRole('region', { name: 'Collapse Direct messages' });
 	}
 
 	get firstChannelFromList(): Locator {
diff --git a/apps/meteor/tests/e2e/page-objects/fragments/sidepanel.ts b/apps/meteor/tests/e2e/page-objects/fragments/sidepanel.ts
index a7c8b036d70cd..1c568348f56f1 100644
--- a/apps/meteor/tests/e2e/page-objects/fragments/sidepanel.ts
+++ b/apps/meteor/tests/e2e/page-objects/fragments/sidepanel.ts
@@ -7,19 +7,50 @@ export class Sidepanel {
 		this.page = page;
 	}
 
+	get sidepanel(): Locator {
+		return this.page.getByRole('tabpanel', { name: 'Side panel' });
+	}
+
 	get sidepanelList(): Locator {
-		return this.page.getByRole('main').getByRole('list', { name: 'Channels' });
+		return this.sidepanel.getByRole('list', { name: 'Channels' });
 	}
 
 	get firstChannelFromList(): Locator {
 		return this.sidepanelList.getByRole('listitem').first();
 	}
 
+	get unreadCheckbox(): Locator {
+		return this.sidepanel.getByRole('heading').getByRole('checkbox', { name: 'Unread' });
+	}
+
+	get unreadToggleLabel(): Locator {
+		return this.sidepanel.getByRole('heading').locator('label', { hasText: 'Unread' });
+	}
+
+	get sidepanelBackButton(): Locator {
+		return this.sidepanel.getByRole('button', { name: 'Back' });
+	}
+
+	getSidepanelHeader(name: string): Locator {
+		return this.sidepanel.getByRole('heading', { name, exact: true });
+	}
+
+	getTeamItemByName(name: string): Locator {
+		return this.sidepanelList
+			.getByRole('link')
+			.filter({ hasText: name })
+			.filter({ hasNot: this.page.getByRole('button', { name }) });
+	}
+
+	getMainRoomByName(name: string): Locator {
+		return this.getTeamItemByName(name);
+	}
+
 	getItemByName(name: string): Locator {
-		return this.sidepanelList.getByRole('link').filter({ hasText: name });
+		return this.sidepanelList.getByRole('link', { name });
 	}
 
-	getExtendedItem(name: string, subtitle?: string): Locator {
+	getSidepanelItem(name: string, subtitle?: string): Locator {
 		const regex = new RegExp(`${name}.*${subtitle}`);
 		return this.sidepanelList.getByRole('link', { name: regex });
 	}
diff --git a/apps/meteor/tests/e2e/page-objects/home-channel.ts b/apps/meteor/tests/e2e/page-objects/home-channel.ts
index 17d84d7b9b760..60d14ae72123d 100644
--- a/apps/meteor/tests/e2e/page-objects/home-channel.ts
+++ b/apps/meteor/tests/e2e/page-objects/home-channel.ts
@@ -62,7 +62,7 @@ export class HomeChannel {
 	}
 
 	get roomHeaderFavoriteBtn(): Locator {
-		return this.page.getByRole('button', { name: 'Favorite' });
+		return this.page.getByRole('main').getByRole('button', { name: 'Favorite' });
 	}
 
 	get readOnlyFooter(): Locator {
diff --git a/apps/meteor/tests/e2e/utils/create-target-channel.ts b/apps/meteor/tests/e2e/utils/create-target-channel.ts
index 402d45a2731ba..7d72f6da8f2d2 100644
--- a/apps/meteor/tests/e2e/utils/create-target-channel.ts
+++ b/apps/meteor/tests/e2e/utils/create-target-channel.ts
@@ -56,10 +56,7 @@ export async function createTargetPrivateChannel(api: BaseTest['api'], options?:
 	return name;
 }
 
-export async function createTargetTeam(
-	api: BaseTest['api'],
-	options?: { sidepanel?: IRoom['sidepanel'] } & Omit<GroupsCreateProps, 'name'>,
-): Promise<string> {
+export async function createTargetTeam(api: BaseTest['api'], options?: Omit<GroupsCreateProps, 'name'>): Promise<string> {
 	const name = faker.string.uuid();
 	await api.post('/teams.create', { name, type: 1, members: ['user2', 'user1'], ...options });
 
diff --git a/apps/meteor/tests/end-to-end/api/rooms.ts b/apps/meteor/tests/end-to-end/api/rooms.ts
index 0e4e0d183d9f3..a1c29b1d2121d 100644
--- a/apps/meteor/tests/end-to-end/api/rooms.ts
+++ b/apps/meteor/tests/end-to-end/api/rooms.ts
@@ -2792,64 +2792,6 @@ describe('[Rooms]', () => {
 					expect(res.body.room).to.not.have.property('favorite');
 				});
 		});
-		it('should update the team sidepanel items to channels and discussions', async () => {
-			const sidepanelItems = ['channels', 'discussions'];
-			const response = await request
-				.post(api('rooms.saveRoomSettings'))
-				.set(credentials)
-				.send({
-					rid: testTeam.roomId,
-					sidepanel: { items: sidepanelItems },
-				})
-				.expect('Content-Type', 'application/json')
-				.expect(200);
-
-			expect(response.body).to.have.property('success', true);
-
-			const channelInfoResponse = await request
-				.get(api('channels.info'))
-				.set(credentials)
-				.query({ roomId: response.body.rid })
-				.expect('Content-Type', 'application/json')
-				.expect(200);
-
-			expect(channelInfoResponse.body).to.have.property('success', true);
-			expect(channelInfoResponse.body.channel).to.have.property('sidepanel');
-			expect(channelInfoResponse.body.channel.sidepanel).to.have.property('items').that.is.an('array').to.have.deep.members(sidepanelItems);
-		});
-		it('should throw error when updating team sidepanel with incorrect items', async () => {
-			const sidepanelItems = ['wrong'];
-			await request
-				.post(api('rooms.saveRoomSettings'))
-				.set(credentials)
-				.send({
-					rid: testTeam.roomId,
-					sidepanel: { items: sidepanelItems },
-				})
-				.expect(400);
-		});
-		it('should throw error when updating team sidepanel with more than 2 items', async () => {
-			const sidepanelItems = ['channels', 'discussions', 'extra'];
-			await request
-				.post(api('rooms.saveRoomSettings'))
-				.set(credentials)
-				.send({
-					rid: testTeam.roomId,
-					sidepanel: { items: sidepanelItems },
-				})
-				.expect(400);
-		});
-		it('should throw error when updating team sidepanel with duplicated items', async () => {
-			const sidepanelItems = ['channels', 'channels'];
-			await request
-				.post(api('rooms.saveRoomSettings'))
-				.set(credentials)
-				.send({
-					rid: testTeam.roomId,
-					sidepanel: { items: sidepanelItems },
-				})
-				.expect(400);
-		});
 	});
 
 	describe('rooms.images', () => {
diff --git a/apps/meteor/tests/end-to-end/api/teams.ts b/apps/meteor/tests/end-to-end/api/teams.ts
index 71d9f63e3458c..267137ef52441 100644
--- a/apps/meteor/tests/end-to-end/api/teams.ts
+++ b/apps/meteor/tests/end-to-end/api/teams.ts
@@ -188,84 +188,6 @@ describe('[Teams]', () => {
 				.end(done);
 		});
 
-		it('should create a team with sidepanel items containing channels', async () => {
-			const teamName = `test-team-with-sidepanel-${Date.now()}`;
-			const sidepanelItems = ['channels'];
-
-			const response = await request
-				.post(api('teams.create'))
-				.set(credentials)
-				.send({
-					name: teamName,
-					type: 0,
-					sidepanel: {
-						items: sidepanelItems,
-					},
-				})
-				.expect('Content-Type', 'application/json')
-				.expect(200)
-				.expect((res) => {
-					expect(res.body).to.have.property('success', true);
-				});
-
-			await request
-				.get(api('channels.info'))
-				.set(credentials)
-				.query({ roomId: response.body.team.roomId })
-				.expect('Content-Type', 'application/json')
-				.expect(200)
-				.expect((response) => {
-					expect(response.body).to.have.property('success', true);
-					expect(response.body.channel).to.have.property('sidepanel');
-					expect(response.body.channel.sidepanel).to.have.property('items').that.is.an('array').to.have.deep.members(sidepanelItems);
-				});
-			await deleteTeam(credentials, teamName);
-		});
-
-		it('should throw error when creating a team with sidepanel with more than 2 items', async () => {
-			await request
-				.post(api('teams.create'))
-				.set(credentials)
-				.send({
-					name: `test-team-with-sidepanel-error-${Date.now()}`,
-					type: 0,
-					sidepanel: {
-						items: ['channels', 'discussion', 'other'],
-					},
-				})
-				.expect('Content-Type', 'application/json')
-				.expect(400);
-		});
-
-		it('should throw error when creating a team with sidepanel with incorrect items', async () => {
-			await request
-				.post(api('teams.create'))
-				.set(credentials)
-				.send({
-					name: `test-team-with-sidepanel-error-${Date.now()}`,
-					type: 0,
-					sidepanel: {
-						items: ['other'],
-					},
-				})
-				.expect('Content-Type', 'application/json')
-				.expect(400);
-		});
-		it('should throw error when creating a team with sidepanel with duplicated items', async () => {
-			await request
-				.post(api('teams.create'))
-				.set(credentials)
-				.send({
-					name: `test-team-with-sidepanel-error-${Date.now()}`,
-					type: 0,
-					sidepanel: {
-						items: ['channels', 'channels'],
-					},
-				})
-				.expect('Content-Type', 'application/json')
-				.expect(400);
-		});
-
 		it('should not create a team with no associated room', async () => {
 			const teamName = 'invalid*team*name';
 			await request
diff --git a/packages/core-services/src/types/IRoomService.ts b/packages/core-services/src/types/IRoomService.ts
index 1334bfce40414..aed0be0e2dc1a 100644
--- a/packages/core-services/src/types/IRoomService.ts
+++ b/packages/core-services/src/types/IRoomService.ts
@@ -24,7 +24,6 @@ export interface ICreateRoomParams {
 	readOnly?: boolean;
 	extraData?: Partial<ICreateRoomExtraData>;
 	options?: ICreateRoomOptions;
-	sidepanel?: IRoom['sidepanel'];
 }
 export interface IRoomService {
 	addMember(uid: string, rid: string): Promise<boolean>;
diff --git a/packages/core-services/src/types/ITeamService.ts b/packages/core-services/src/types/ITeamService.ts
index 132df89470ca4..bd103eaed7332 100644
--- a/packages/core-services/src/types/ITeamService.ts
+++ b/packages/core-services/src/types/ITeamService.ts
@@ -24,7 +24,6 @@ export interface ITeamCreateParams {
 	room: ITeamCreateRoom;
 	members?: Array<string> | null; // list of user _ids
 	owner?: string | null; // the team owner. If not present, owner = requester
-	sidepanel?: IRoom['sidepanel'];
 }
 
 export interface ITeamMemberParams {
diff --git a/packages/core-typings/src/IInquiry.ts b/packages/core-typings/src/IInquiry.ts
index f825261f9d5f7..a7f11290bf27e 100644
--- a/packages/core-typings/src/IInquiry.ts
+++ b/packages/core-typings/src/IInquiry.ts
@@ -4,6 +4,7 @@ import type { IMessage } from './IMessage';
 import type { IOmnichannelServiceLevelAgreements } from './IOmnichannelServiceLevelAgreements';
 import type { IRocketChatRecord } from './IRocketChatRecord';
 import type { IOmnichannelRoom, OmnichannelSourceType } from './IRoom';
+import type { ISubscription } from './ISubscription';
 import type { SelectedAgent } from './omnichannel/routing';
 
 export interface IInquiry {
@@ -60,6 +61,8 @@ export interface ILivechatInquiryRecord extends IRocketChatRecord {
 	estimatedWaitingTimeQueue: IOmnichannelServiceLevelAgreements['dueTimeInMinutes'];
 }
 
+export const isLivechatInquiryRecord = (record: Partial<ISubscription>): record is ILivechatInquiryRecord => 'status' in record;
+
 export type InquiryWithAgentInfo = Pick<ILivechatInquiryRecord, '_id' | 'rid' | 'name' | 'ts' | 'status' | 'department' | 'v'> & {
 	position?: number;
 	defaultAgent?: SelectedAgent;
diff --git a/packages/core-typings/src/IRoom.ts b/packages/core-typings/src/IRoom.ts
index 8c4ed58013aa9..5934c78069d43 100644
--- a/packages/core-typings/src/IRoom.ts
+++ b/packages/core-typings/src/IRoom.ts
@@ -8,8 +8,6 @@ import type { IUser, Username } from './IUser';
 import type { RoomType } from './RoomType';
 
 type CallStatus = 'ringing' | 'ended' | 'declined' | 'ongoing';
-const sidepanelItemValues = ['channels', 'discussions'] as const;
-export type SidepanelItem = (typeof sidepanelItemValues)[number];
 
 export type RoomID = string;
 export type ChannelName = string;
@@ -90,35 +88,12 @@ export interface IRoom extends IRocketChatRecord {
 
 	usersWaitingForE2EKeys?: { userId: IUser['_id']; ts: Date }[];
 
-	sidepanel?: {
-		items: [SidepanelItem, SidepanelItem?];
-	};
-
 	/**
 	 * @deprecated Using `boolean` is deprecated. Use `number` instead.
 	 */
 	rolePrioritiesCreated?: number | boolean;
 }
 
-export const isSidepanelItem = (item: any): item is SidepanelItem => {
-	return sidepanelItemValues.includes(item);
-};
-
-export const isValidSidepanel = (sidepanel: IRoom['sidepanel']) => {
-	if (sidepanel === null) {
-		return true;
-	}
-	if (!sidepanel?.items) {
-		return false;
-	}
-	return (
-		Array.isArray(sidepanel.items) &&
-		sidepanel.items.length &&
-		sidepanel.items.every(isSidepanelItem) &&
-		sidepanel.items.length === new Set(sidepanel.items).size
-	);
-};
-
 export const isRoomWithJoinCode = (room: Partial<IRoom>): room is IRoomWithJoinCode =>
 	'joinCodeRequired' in room && (room as any).joinCodeRequired === true;
 
diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json
index 1732fbfb00756..015b71c077220 100644
--- a/packages/i18n/src/locales/en.i18n.json
+++ b/packages/i18n/src/locales/en.i18n.json
@@ -1090,6 +1090,7 @@
   "Collapse": "Collapse",
   "Collapse_all": "Collapse All",
   "Collapse_Embedded_Media_By_Default": "Collapse Embedded Media by Default",
+  "Collapse_group": "Collapse {{group}}",
   "Color": "Color",
   "Colors": "Colors",
   "Commands": "Commands",
@@ -1929,6 +1930,8 @@
   "End_suspicious_sessions": "End any suspicious sessions",
   "Engagement": "Engagement",
   "Engagement_Dashboard": "Engagement dashboard",
+  "Enhanced_navigation": "Enhanced navigation",
+  "Enhanced_navigation_description": "Reduce noise and increase focus using the new global header and sidebar filters that add a secondary navigation layer. Filter your mentions, favorite rooms, discussions or filter by a specific room to see its associated channels and discussions.",
   "Enrich_your_workspace": "Enrich your workspace perspective with the engagement dashboard. Analyze practical usage statistics about your users, messages and channels. Included in Premium plans.",
   "Ensure_secure_workspace_access": "Ensure secure workspace access",
   "Enter": "Enter",
@@ -2001,6 +2004,7 @@
   "Execute_Synchronization_Now": "Execute Synchronization Now",
   "Exit_Full_Screen": "Exit Full Screen",
   "Expand": "Expand",
+  "Expand_group":"Expand {{group}}",
   "Expand_all": "Expand all",
   "Expand_view": "Expand view",
   "Experimental_Feature_Alert": "This is an experimental feature! Please be aware that it may change, break, or even be removed in the future without any notice.",
@@ -3547,8 +3551,6 @@
   "New_logs": "New logs",
   "New_messages": "New messages",
   "New_messages_cannot_be_sent": "New messages cannot be sent",
-  "New_navigation": "Enhanced navigation experience",
-  "New_navigation_description": "Explore our improved navigation, designed with clear scopes for easy access to what you need. This change serves as the foundation for future advancements in navigation management.",
   "New_password": "New Password",
   "New_role": "New role",
   "New_user": "New user",
@@ -3590,6 +3592,18 @@
   "No_channels_in_team": "No Channels on this Team",
   "No_channels_yet": "No channels yet",
   "No_channels_yet_description": "Channels associated to this contact will appear here.",
+  "No_chats_in_progress": "No chats in progress",
+  "No_chats_in_progress_description": "Chats assigned to you will appear here.",
+  "No_unread_chats_in_progress": "No unread chats in progress",
+  "No_unread_chats_in_progress_description": "Unread chats assigned to you will appear here.",
+  "No_chats_in_queue": "No chats in queue",
+  "No_chats_in_queue_description": "Queued chats will appear here.",
+  "No_unread_chats_in_queue": "No unread chats in queue",
+  "No_unread_chats_in_queue_description": "Unread queued chats will appear here.",
+  "No_chats_on_hold": "No chats on hold",
+  "No_chats_on_hold_description": "Chats on hold will appear here.",
+  "No_unread_chats_on_hold": "No unread chats on hold",
+  "No_unread_chats_on_hold_description": "Unread chats on hold will appear here.",
   "No_chats_yet": "No chats yet",
   "No_chats_yet_description": "All your chats will appear here.",
   "No_contacts_yet": "No contacts yet",
@@ -3603,9 +3617,25 @@
   "No_departments_yet": "No departments yet",
   "No_departments_yet_description": "Organize agents into departments, set how tickets get forwarded and monitor their performance.",
   "No_direct_messages_yet": "No Direct Messages.",
+  "No_channels_or_discussions": "No channels or discussions",
+  "No_channels_or_discussions_description": "Channels and discussions belonging to this team will appear hear.",
+  "No_discussions": "No discussions",
+  "No_discussions_description": "Discussions you've joined will appear hear.",
+  "No_discussions_channels_filter_description": "Discussions belonging to this channel will appear hear.",
+  "No_discussions_dms_filter_description": "Discussions belonging to this user will appear hear.",
+  "No_unread_channels_or_discussions": "No unread channels or discussions",
+  "No_unread_channels_or_discussions_description": "Unread channels and discussions belonging to this team will appear hear.",
+  "No_unread_discussions": "No unread discussions",
+  "No_unread_discussions_description": "Unread discussions you've joined will appear hear.",
+  "No_unread_discussions_channels_filter_description": "Unread discussions belonging to this channel will appear hear.",
+  "No_unread_discussions_dms_filter_description": "Unread discussions belonging to this user will appear hear.",
   "No_discussions_yet": "No discussions yet",
   "No_emojis_found": "No emojis found",
   "No_feature_to_preview": "No feature to preview",
+  "No_favorite_rooms": "No favorite rooms",
+  "No_favorite_rooms_description": "Your favorite rooms will appear here.",
+  "No_unread_favorite_rooms": "No unread favorite rooms",
+  "No_unread_favorite_rooms_description": "Your unread favorite rooms will appear here.",
   "No_files_found": "No files found",
   "No_files_found_to_prune": "No files found to prune",
   "No_files_left_to_download": "No files left to download",
@@ -3621,6 +3651,10 @@
   "No_marketplace_matches_for": "No Marketplace matches for",
   "No_members_found": "No members found",
   "No_mentions_found": "No mentions found",
+  "No_mentions": "No mentions",
+  "No_mentions_description": "@{username}, @all, @here mentions and highlighted words will appear here.",
+  "No_unread_mentions": "No unread mentions",
+  "No_unread_mentions_description": "Unread @{username}, @all, @here mentions and highlighted words will appear here.",
   "No_message_reports": "No message reports",
   "No_messages_found_to_prune": "No messages found to prune",
   "No_messages_yet": "No messages yet",
@@ -3647,6 +3681,10 @@
   "No_units_yet": "No units yet",
   "No_units_yet_description": "Use units to group departments and manage them better.",
   "No_user_reports": "No user reports",
+  "No_rooms": "No rooms",
+  "No_rooms_description": "@{username}, @all, @here  mentions and highlighted words will appear here.",
+  "No_unread_rooms": "No unread rooms",
+  "No_unread_rooms_description": "Unread rooms wil appear here.",
   "Nobody_available": "Nobody available",
   "Node_version": "Node Version",
   "None": "None",
@@ -3763,6 +3801,7 @@
   "Omnichannel_External_Frame_Encryption_JWK": "Encryption key (JWK)",
   "Omnichannel_External_Frame_Encryption_JWK_Description": "If provided it will encrypt the user's token with the provided key and the external system will need to decrypt the data to access the token",
   "Omnichannel_External_Frame_URL": "External frame URL",
+  "Omnichannel_filters": "Omnichannel filters",
   "Omnichannel_Ignore_automatic_responses_for_performance_metrics": "Ignore bots activities for performance metrics",
   "Omnichannel_On_Hold_due_to_inactivity": "The chat was automatically placed On Hold because we haven't received any reply from {{guest}} in {{timeout}} seconds",
   "Omnichannel_On_Hold_manually": "The chat was manually placed On Hold by {{user}}",
@@ -4391,6 +4430,8 @@
   "Room_name_changed_to": "changed room name to {{room_name}}",
   "Room_not_exist_or_not_permission": "The room does not exist or you may not have access permission",
   "Room_not_found": "Room not found",
+  "Room_notifications_on": "{{roomName}} notifications on",
+  "Room_notifications_off": "{{roomName}} notifications off",
   "Room_password_changed_successfully": "Room password changed successfully",
   "Room_topic_changed_successfully": "Room topic changed successfully",
   "Room_type_changed_successfully": "Room type changed successfully",
@@ -4709,10 +4750,8 @@
   "Show_agent_email": "Show agent email",
   "Show_agent_info": "Show agent information",
   "Show_all": "Show All",
-  "Show_channels_description": "Show team channels in second sidebar",
   "Show_counter": "Mark as unread",
   "Show_default_content": "Show default content",
-  "Show_discussions_description": "Show team discussions in second sidebar",
   "Show_email_field": "Show email field",
   "Show_mentions": "Show badge for mentions",
   "Show_more": "Show more",
@@ -4740,8 +4779,7 @@
   "Sidebar_Sections_Order_Description": "Select the categories in your preferred order",
   "Sidebar_actions": "Sidebar actions",
   "Sidebar_list_mode": "Sidebar Channel List Mode",
-  "Sidepanel_navigation": "Secondary navigation for teams",
-  "Sidepanel_navigation_description": "Display channels and/or discussions associated with teams by default. This allows team owners to customize communication methods to best meet their team’s needs. This is currently in feature preview and will be a premium capability once fully released.",
+  "Side_panel": "Side panel",
   "Sign_in_to_start_talking": "Sign in to start talking",
   "Sign_in_with__provider__": "Sign in with {{provider}}",
   "Site_Name": "Site Name",
@@ -4958,6 +4996,7 @@
   "Team_Auto-join": "Auto-join",
   "Team_Auto-join_exceeded_user_limit": "Auto-join has a limit of {{limit}} members, #{{channelName}} now has {{numberOfMembers}} members",
   "Team_Auto-join_updated": "#{{channelName}} now has {{numberOfMembers}} members",
+  "Team_collaboration_filters": "Team collaboration filters",
   "Team_Channels": "Team Channels",
   "Team_Delete_Channel_modal_content": "Would you like to delete this Channel?",
   "Team_Delete_Channel_modal_content_danger": "This can’t be undone.",
@@ -5203,8 +5242,8 @@
   "Try_now": "Try now",
   "Try_searching_in_the_marketplace_instead": "Try searching in the Marketplace instead",
   "Tuesday": "Tuesday",
-  "Turn_OFF": "Turn OFF",
-  "Turn_ON": "Turn ON",
+  "Turn_OFF": "Turn off",
+  "Turn_ON": "Turn on",
   "Turn_off_answer_calls": "Turn off answer calls",
   "Turn_off_answer_chats": "Turn off answer chats",
   "Turn_off_microphone": "Turn off microphone",
diff --git a/packages/i18n/src/locales/nb.i18n.json b/packages/i18n/src/locales/nb.i18n.json
index 090680f59531d..e28a734d596d9 100644
--- a/packages/i18n/src/locales/nb.i18n.json
+++ b/packages/i18n/src/locales/nb.i18n.json
@@ -3540,8 +3540,6 @@
   "New_logs": "Nye logger",
   "New_messages": "Nye meldinger",
   "New_messages_cannot_be_sent": "Nye meldinger kan ikke sendes",
-  "New_navigation": "Forbedret navigasjonsopplevelse",
-  "New_navigation_description": "Utforsk vår forbedrede navigasjon, designet med ett klart omfang for enkel tilgang til det du trenger. Denne endringen fungerer som grunnlaget for fremtidige fremskritt innen navigasjonsadministrasjon.",
   "New_password": "Nytt passord",
   "New_role": "Ny rolle",
   "New_user": "Ny bruker",
@@ -4702,10 +4700,8 @@
   "Show_agent_email": "Vis agentens e-post",
   "Show_agent_info": "Vis agentinformasjon",
   "Show_all": "Vis alt",
-  "Show_channels_description": "Vis teamkanaler i andre sidefelt",
   "Show_counter": "Marker som ulest",
   "Show_default_content": "Vis standardinnhold",
-  "Show_discussions_description": "Vis teamdiskusjoner i andre sidefelt",
   "Show_email_field": "Vis e-postfelt",
   "Show_mentions": "Vis merke for omtaler",
   "Show_more": "Vis mer",
@@ -4733,8 +4729,6 @@
   "Sidebar_Sections_Order_Description": "Velg kategoriene i din foretrukne rekkefølge",
   "Sidebar_actions": "Sidepanelhandlinger",
   "Sidebar_list_mode": "Kanallistemodus i sidefeltet",
-  "Sidepanel_navigation": "Sekundærnavigasjon for team",
-  "Sidepanel_navigation_description": "Vis kanaler og/eller diskusjoner knyttet til team som standard. Dette lar teameiere tilpasse kommunikasjonsmetoder for å møte teamets behov best mulig. Dette er for øyeblikket en forhåndsvisning og vil være en premium-funksjon når den er ferdig.",
   "Sign_in_to_start_talking": "Logg inn for å begynne å snakke",
   "Sign_in_with__provider__": "Logg på med {{provider}}",
   "Site_Name": "Navn på nettsted",
diff --git a/packages/i18n/src/locales/nn.i18n.json b/packages/i18n/src/locales/nn.i18n.json
index 42be83fa4db66..2d4879b960643 100644
--- a/packages/i18n/src/locales/nn.i18n.json
+++ b/packages/i18n/src/locales/nn.i18n.json
@@ -3484,8 +3484,6 @@
   "New_logs": "Nye logger",
   "New_messages": "Nye meldinger",
   "New_messages_cannot_be_sent": "Nye meldinger kan ikke sendes",
-  "New_navigation": "Forbedret navigasjonsopplevelse",
-  "New_navigation_description": "Utforsk vår forbedrede navigasjon, designet med ett klart omfang for enkel tilgang til det du trenger. Denne endringen fungerer som grunnlaget for fremtidige fremskritt innen navigasjonsadministrasjon.",
   "New_password": "Nytt passord",
   "New_role": "Ny rolle",
   "New_user": "Ny bruker",
@@ -4468,10 +4466,8 @@
   "Show_additional_fields": "Vis flere felt",
   "Show_agent_email": "Vis agent-e-post",
   "Show_all": "Vis alt",
-  "Show_channels_description": "Vis teamkanaler i andre sidefelt",
   "Show_counter": "Vis teller",
   "Show_default_content": "Vis standardinnhold",
-  "Show_discussions_description": "Vis teamdiskusjoner i andre sidefelt",
   "Show_email_field": "Vis e-postfelt",
   "Show_more": "Vis mer",
   "Show_name_field": "Vis navnefelt",
@@ -4497,8 +4493,6 @@
   "Sidebar_Sections_Order_Description": "Velg kategoriene i din foretrukne rekkefølge",
   "Sidebar_actions": "Sidepanelhandlinger",
   "Sidebar_list_mode": "Sidebar Kanallistemodus",
-  "Sidepanel_navigation": "Sekundærnavigasjon for team",
-  "Sidepanel_navigation_description": "Vis kanaler og/eller diskusjoner knyttet til team som standard. Dette lar teameiere tilpasse kommunikasjonsmetoder for å møte teamets behov best mulig. Dette er for øyeblikket en forhåndsvisning og vil være en premium-funksjon når den er ferdig.",
   "Sign_in_to_start_talking": "Logg inn for å begynne å snakke",
   "Sign_in_with__provider__": "Logg på med {{provider}}",
   "Site_Name": "Side navn",
diff --git a/packages/i18n/src/locales/pt-BR.i18n.json b/packages/i18n/src/locales/pt-BR.i18n.json
index 5141dcd8c5de5..59521da8fe683 100644
--- a/packages/i18n/src/locales/pt-BR.i18n.json
+++ b/packages/i18n/src/locales/pt-BR.i18n.json
@@ -3523,8 +3523,6 @@
   "New_logs": "Novos registros",
   "New_messages": "Novas mensagens",
   "New_messages_cannot_be_sent": "Não é possível enviar novas mensagens",
-  "New_navigation": "Experiência de navegação aprimorada",
-  "New_navigation_description": "Explore nossa navegação aprimorada, projetada com escopos claros para facilitar o acesso ao que você precisa. Essa mudança serve como base para futuros avanços no gerenciamento da navegação.",
   "New_password": "Nova senha",
   "New_role": "Nova função",
   "New_user": "Novo usuário",
@@ -4676,10 +4674,8 @@
   "Show_agent_email": "Mostrar o e-mail do agente",
   "Show_agent_info": "Mostrar dados do agente",
   "Show_all": "Mostrar tudo",
-  "Show_channels_description": "Mostrar canais da equipe na segunda barra lateral",
   "Show_counter": "Marcar como não lido",
   "Show_default_content": "Mostrar conteúdo padrão",
-  "Show_discussions_description": "Mostrar discussões da equipe na segunda barra lateral",
   "Show_email_field": "Mostrar campo de e-mail",
   "Show_mentions": "Mostrar emblema para menções",
   "Show_more": "Mostrar mais",
@@ -4707,8 +4703,6 @@
   "Sidebar_Sections_Order_Description": "Selecione as categorias em sua ordem preferida",
   "Sidebar_actions": "Ações da barra lateral",
   "Sidebar_list_mode": "Modo de Lista de Canais da Barra Lateral",
-  "Sidepanel_navigation": "Navegação secundária para equipes",
-  "Sidepanel_navigation_description": "Exibir canais e/ou discussões associados às equipes por padrão. Isso permite que os proprietários de equipes personalizem os métodos de comunicação para melhor atender às necessidades de suas equipes. Atualmente, esse recurso está em fase de visualização e será um recurso premium quando for totalmente lançado.",
   "Sign_in_to_start_talking": "Faça login para começar a conversar",
   "Sign_in_with__provider__": "Faça login com {{provider}}",
   "Site_Name": "Nome do site",
diff --git a/packages/i18n/src/locales/sv.i18n.json b/packages/i18n/src/locales/sv.i18n.json
index e8674f45ef259..5de0c4c6c933e 100644
--- a/packages/i18n/src/locales/sv.i18n.json
+++ b/packages/i18n/src/locales/sv.i18n.json
@@ -3539,8 +3539,6 @@
   "New_logs": "Nya loggar",
   "New_messages": "Nya meddelanden",
   "New_messages_cannot_be_sent": "Nya meddelanden kan inte skickas",
-  "New_navigation": "Förbättrad navigationsupplevelse",
-  "New_navigation_description": "Utforska vår förbättrade navigering, utformad med tydliga omfattningar för enkel åtkomst till det du behöver. Den här förändringen utgör grunden för framtida framsteg inom navigeringshantering.",
   "New_password": "Nytt lösenord",
   "New_role": "Ny roll",
   "New_user": "Ny användare",
@@ -4699,10 +4697,8 @@
   "Show_agent_email": "Visa agent-e-post",
   "Show_agent_info": "Visa information om agenten",
   "Show_all": "Visa alla",
-  "Show_channels_description": "Visa teamkanaler i andra sidofältet",
   "Show_counter": "Markera som oläst",
   "Show_default_content": "Visa standardinnehåll",
-  "Show_discussions_description": "Visa teamdiskussioner i andra sidofältet",
   "Show_email_field": "Visa e-postfältet",
   "Show_mentions": "Visa märke för omnämnanden",
   "Show_more": "Visa mer",
@@ -4730,8 +4726,6 @@
   "Sidebar_Sections_Order_Description": "Välj kategorierna i önskad ordning",
   "Sidebar_actions": "Åtgärder i sidofältet",
   "Sidebar_list_mode": "Sidpanel Kanallista läge",
-  "Sidepanel_navigation": "Sekundär navigering för team",
-  "Sidepanel_navigation_description": "Visa kanaler och/eller diskussioner som är kopplade till team som standard. Detta gör det möjligt för teamägare att anpassa kommunikationsmetoderna så att de bäst uppfyller teamets behov. Detta är för närvarande en förhandsgranskning av funktionen och kommer att vara en premiumfunktion när den är helt lanserad.",
   "Sign_in_to_start_talking": "Logga in för att diskutera",
   "Sign_in_with__provider__": "Logga in med {{provider}}",
   "Site_Name": "Webbplatsnamn",
diff --git a/packages/mock-providers/src/MockedAppRootBuilder.tsx b/packages/mock-providers/src/MockedAppRootBuilder.tsx
index 8a89e8d8ebf86..625934876a135 100644
--- a/packages/mock-providers/src/MockedAppRootBuilder.tsx
+++ b/packages/mock-providers/src/MockedAppRootBuilder.tsx
@@ -3,6 +3,7 @@ import type {
 	DirectCallData,
 	IRoom,
 	ISetting,
+	ISubscription,
 	IUser,
 	ProviderCapabilities,
 	Serialized,
@@ -111,7 +112,7 @@ export class MockedAppRootBuilder {
 		onLogout: () => () => undefined,
 		queryPreference: () => [() => () => undefined, () => undefined],
 		queryRoom: () => [() => () => undefined, () => this.room],
-		querySubscription: () => [() => () => undefined, () => undefined],
+		querySubscription: () => [() => () => undefined, () => this.subscriptions as unknown as ISubscription],
 		querySubscriptions: () => [() => () => undefined, () => this.subscriptions], // apply query and option
 		user: null,
 		userId: null,
diff --git a/packages/model-typings/src/models/IRoomsModel.ts b/packages/model-typings/src/models/IRoomsModel.ts
index 597b3e69fbf4a..86e6e5d45f4c3 100644
--- a/packages/model-typings/src/models/IRoomsModel.ts
+++ b/packages/model-typings/src/models/IRoomsModel.ts
@@ -130,8 +130,6 @@ export interface IRoomsModel extends IBaseModel<IRoom> {
 
 	setRoomNameById(roomId: IRoom['_id'], name: IRoom['name']): Promise<UpdateResult>;
 
-	setSidepanelById(roomId: IRoom['_id'], sidepanel: IRoom['sidepanel']): Promise<UpdateResult>;
-
 	setFnameById(_id: IRoom['_id'], fname: IRoom['fname']): Promise<UpdateResult>;
 
 	setRoomTopicById(roomId: IRoom['_id'], topic: IRoom['description']): Promise<UpdateResult>;
diff --git a/packages/models/src/models/Rooms.ts b/packages/models/src/models/Rooms.ts
index 9a9091f05e96a..382a67335a664 100644
--- a/packages/models/src/models/Rooms.ts
+++ b/packages/models/src/models/Rooms.ts
@@ -676,10 +676,6 @@ export class RoomsRaw extends BaseRaw<IRoom> implements IRoomsModel {
 		return this.updateOne({ _id: roomId }, { $set: { name } });
 	}
 
-	setSidepanelById(roomId: IRoom['_id'], sidepanel: IRoom['sidepanel']): Promise<UpdateResult> {
-		return this.updateOne({ _id: roomId }, { $set: { sidepanel } });
-	}
-
 	setFnameById(_id: IRoom['_id'], fname: IRoom['fname']): Promise<UpdateResult> {
 		const query: Filter<IRoom> = { _id };
 
diff --git a/packages/rest-typings/src/v1/rooms.ts b/packages/rest-typings/src/v1/rooms.ts
index 60aabf356cb28..68f83cbe56b38 100644
--- a/packages/rest-typings/src/v1/rooms.ts
+++ b/packages/rest-typings/src/v1/rooms.ts
@@ -475,13 +475,13 @@ const RoomsIsMemberPropsSchema = {
 export const isRoomsIsMemberProps = ajv.compile<RoomsIsMemberProps>(RoomsIsMemberPropsSchema);
 
 export type Notifications = {
-	disableNotifications: string;
-	muteGroupMentions: string;
-	hideUnreadStatus: string;
-	desktopNotifications: string;
-	audioNotificationValue: string;
-	mobilePushNotifications: string;
-	emailNotifications: string;
+	disableNotifications?: string;
+	muteGroupMentions?: string;
+	hideUnreadStatus?: string;
+	desktopNotifications?: string;
+	audioNotificationValue?: string;
+	mobilePushNotifications?: string;
+	emailNotifications?: string;
 };
 
 type RoomsGetDiscussionsProps = PaginatedRequest<BaseRoomsProps>;
@@ -716,7 +716,7 @@ export type RoomsEndpoints = {
 	'/v1/rooms.info': {
 		GET: (params: RoomsInfoProps) => {
 			room: IRoom | undefined;
-			parent?: Pick<IRoom, '_id' | 'name' | 'fname' | 't' | 'prid' | 'u' | 'sidepanel'>;
+			parent?: Pick<IRoom, '_id' | 'name' | 'fname' | 't' | 'prid' | 'u'>;
 			team?: Pick<ITeam, 'name' | 'roomId' | 'type' | '_id'>;
 		};
 	};
diff --git a/packages/rest-typings/src/v1/teams/index.ts b/packages/rest-typings/src/v1/teams/index.ts
index 31c4e588fb736..bc2f0dc9ddc42 100644
--- a/packages/rest-typings/src/v1/teams/index.ts
+++ b/packages/rest-typings/src/v1/teams/index.ts
@@ -91,7 +91,6 @@ export type TeamsEndpoints = {
 				};
 			};
 			owner?: IUser['_id'];
-			sidepanel?: IRoom['sidepanel'];
 		}) => {
 			team: ITeam;
 		};
diff --git a/packages/ui-client/src/hooks/useFeaturePreviewList.ts b/packages/ui-client/src/hooks/useFeaturePreviewList.ts
index 371cee4d7a7d3..6feaaa28dcbfc 100644
--- a/packages/ui-client/src/hooks/useFeaturePreviewList.ts
+++ b/packages/ui-client/src/hooks/useFeaturePreviewList.ts
@@ -1,11 +1,6 @@
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
 
-export type FeaturesAvailable =
-	| 'quickReactions'
-	| 'enable-timestamp-message-parser'
-	| 'contextualbarResizable'
-	| 'newNavigation'
-	| 'sidepanelNavigation';
+export type FeaturesAvailable = 'quickReactions' | 'enable-timestamp-message-parser' | 'contextualbarResizable' | 'newNavigation';
 
 export type FeaturePreviewProps = {
 	name: FeaturesAvailable;
@@ -53,25 +48,13 @@ export const defaultFeaturesPreview: FeaturePreviewProps[] = [
 	},
 	{
 		name: 'newNavigation',
-		i18n: 'New_navigation',
-		description: 'New_navigation_description',
+		i18n: 'Enhanced_navigation',
+		description: 'Enhanced_navigation_description',
 		group: 'Navigation',
 		imageUrl: 'images/featurePreview/enhanced-navigation.png',
 		value: false,
 		enabled: true,
 	},
-	{
-		name: 'sidepanelNavigation',
-		i18n: 'Sidepanel_navigation',
-		description: 'Sidepanel_navigation_description',
-		group: 'Navigation',
-		value: false,
-		enabled: true,
-		enableQuery: {
-			name: 'newNavigation',
-			value: true,
-		},
-	},
 ];
 
 export const enabledDefaultFeatures = defaultFeaturesPreview.filter((feature) => feature.enabled);
diff --git a/packages/ui-contexts/src/LayoutContext.ts b/packages/ui-contexts/src/LayoutContext.ts
index 3e4c9a665a864..106c35488bfca 100644
--- a/packages/ui-contexts/src/LayoutContext.ts
+++ b/packages/ui-contexts/src/LayoutContext.ts
@@ -12,12 +12,19 @@ export type LayoutContextValue = {
 	isMobile: boolean;
 	roomToolboxExpanded: boolean;
 	sidebar: {
+		overlayed: boolean;
+		setOverlayed: (value: boolean) => void;
 		isCollapsed: boolean;
 		toggle: () => void;
 		collapse: () => void;
 		expand: () => void;
 		close: () => void;
 	};
+	sidePanel: {
+		displaySidePanel: boolean;
+		closeSidePanel: () => void;
+		openSidePanel: () => void;
+	};
 	navbar: {
 		searchExpanded: boolean;
 		expandSearch?: () => void;
@@ -46,14 +53,21 @@ export const LayoutContext = createContext<LayoutContextValue>({
 		collapseSearch: () => undefined,
 	},
 	sidebar: {
+		overlayed: false,
+		setOverlayed: () => undefined,
 		isCollapsed: false,
 		toggle: () => undefined,
 		collapse: () => undefined,
 		expand: () => undefined,
 		close: () => undefined,
 	},
+	sidePanel: {
+		displaySidePanel: true,
+		closeSidePanel: () => undefined,
+		openSidePanel: () => undefined,
+	},
 	size: {
-		sidebar: '380px',
+		sidebar: '240px',
 		contextualBar: '380px',
 	},
 	contextualBarPosition: 'relative',