diff --git a/.env.example b/.env.example
index 33a55f912..a25a6ba06 100644
--- a/.env.example
+++ b/.env.example
@@ -4,7 +4,6 @@ REACT_APP_STORJ_BRIDGE=
 REACT_APP_STRIPE_PK=
 REACT_APP_STRIPE_TEST_PK=
 REACT_APP_API_URL=
-REACT_APP_PHOTOS_API_URL=
 REACT_APP_PAYMENTS_API_URL=
 GENERATE_SOURCEMAP=
 REACT_APP_MAGIC_IV=
diff --git a/.github/workflows/cd-to-share.yml b/.github/workflows/cd-to-share.yml
index 5a268ecdd..c91dd782a 100644
--- a/.github/workflows/cd-to-share.yml
+++ b/.github/workflows/cd-to-share.yml
@@ -22,7 +22,6 @@ jobs:
       - run: echo REACT_APP_SENTRY_DSN=${{ secrets.REACT_APP_SENTRY_DSN }} >> ./infrastructure/share/share.env
       - run: echo REACT_APP_STORJ_BRIDGE=${{ secrets.REACT_APP_STORJ_BRIDGE }} >> ./infrastructure/share/share.env
       - run: echo REACT_APP_HOSTNAME=${{ secrets.REACT_APP_HOSTNAME }} >> ./infrastructure/share/share.env
-      - run: echo REACT_APP_PHOTOS_API_URL=${{ secrets.REACT_APP_PHOTOS_API_URL }} >> ./infrastructure/share/share.env
       - run: echo REACT_APP_PAYMENTS_API_URL=${{ secrets.REACT_APP_PAYMENTS_API_URL }} >> ./infrastructure/share/share.env
       - run: echo REACT_APP_DRIVE_NEW_API_URL=${{ secrets.REACT_APP_DRIVE_NEW_API_URL }} >> ./infrastructure/share/share.env
       - run: echo REACT_APP_RECAPTCHA_V3=${{ secrets.REACT_APP_RECAPTCHA_V3 }} >> ./infrastructure/share/share.env
diff --git a/.github/workflows/cd-to-staging.yml b/.github/workflows/cd-to-staging.yml
index b82379899..fb824b85f 100644
--- a/.github/workflows/cd-to-staging.yml
+++ b/.github/workflows/cd-to-staging.yml
@@ -21,7 +21,6 @@ jobs:
       - run: echo REACT_APP_STORJ_BRIDGE=${{ secrets.REACT_APP_STORJ_BRIDGE }} >> ./infrastructure/staging/staging.env
       - run: echo REACT_APP_HOSTNAME=${{ secrets.REACT_APP_HOSTNAME }} >> ./infrastructure/staging/staging.env
       - run: echo REACT_APP_PROXY=${{ secrets.REACT_APP_PROXY }} >> ./infrastructure/staging/staging.env
-      - run: echo REACT_APP_PHOTOS_API_URL=${{ secrets.REACT_APP_PHOTOS_API_URL }} >> ./infrastructure/staging/staging.env
       - run: echo REACT_APP_SENTRY_DSN=${{ secrets.REACT_APP_SENTRY_DSN }} >> ./infrastructure/staging/staging.env
       - run: echo REACT_APP_PAYMENTS_API_URL=${{ secrets.REACT_APP_PAYMENTS_API_URL }} >> ./infrastructure/staging/staging.env
       - run: echo REACT_APP_DRIVE_NEW_API_URL=${{ secrets.REACT_APP_DRIVE_NEW_API_URL }} >> ./infrastructure/staging/staging.env
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2329c656c..a181887fd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -42,7 +42,6 @@ jobs:
       - run: echo REACT_APP_HOSTNAME=${{ secrets.REACT_APP_HOSTNAME }} >> ./.env
       - run: echo REACT_APP_PROXY=${{ secrets.REACT_APP_PROXY }} >> ./.env
       - run: echo REACT_APP_DONT_USE_PROXY=${{ secrets.REACT_APP_DONT_USE_PROXY }} >> ./.env
-      - run: echo REACT_APP_PHOTOS_API_URL=${{ secrets.REACT_APP_PHOTOS_API_URL }} >> ./.env
       - run: echo REACT_APP_SENTRY_DSN=${{ secrets.REACT_APP_SENTRY_DSN }} >> ./.env
       - run: echo REACT_APP_PAYMENTS_API_URL=${{ secrets.REACT_APP_PAYMENTS_API_URL }} >> ./.env
       - run: echo REACT_APP_DRIVE_NEW_API_URL=${{ secrets.REACT_APP_DRIVE_NEW_API_URL }} >> ./.env
diff --git a/package.json b/package.json
index 304168cdb..6ef5c543b 100644
--- a/package.json
+++ b/package.json
@@ -1,13 +1,13 @@
 {
   "name": "drive-web",
-  "version": "v1.0.279",
+  "version": "v1.0.304",
   "private": true,
   "dependencies": {
     "@headlessui/react": "1.7.5",
     "@iconscout/react-unicons": "^1.1.6",
     "@internxt/inxt-js": "=1.2.21",
     "@internxt/lib": "^1.2.0",
-    "@internxt/sdk": "^1.4.77",
+    "@internxt/sdk": "^1.5.3",
     "@phosphor-icons/react": "^2.0.10",
     "@popperjs/core": "^2.11.6",
     "@reduxjs/toolkit": "^1.6.0",
@@ -29,6 +29,7 @@
     "dayjs": "^1.11.7",
     "detect-browser": "^5.3.0",
     "docx-preview": "^0.1.18",
+    "fflate": "^0.8.2",
     "file-saver": "^2.0.5",
     "heic2any": "^0.0.4",
     "history": "^4.10.1",
@@ -46,7 +47,7 @@
     "prettysize": "^2.0.0",
     "query-string": "^6.13.8",
     "react": "^18.2.0",
-    "react-avatar-editor": "^13.0.0",
+    "react-avatar-editor": "^13.0.2",
     "react-bootstrap": "^2.9.0",
     "react-device-detect": "^1.15.0",
     "react-dnd": "^14.0.4",
@@ -61,6 +62,7 @@
     "react-i18next": "^12.1.4",
     "react-image-file-resizer": "^0.4.8",
     "react-infinite-scroll-component": "6.1.0",
+    "react-international-phone": "^4.3.0",
     "react-live-chat-loader": "^2.8.2",
     "react-loading-skeleton": "^2.2.0",
     "react-pdf": "^5.4.0",
@@ -139,7 +141,7 @@
     "@types/node": "^12.0.0",
     "@types/openpgp": "^4.4.18",
     "@types/react": "^18.2.28",
-    "@types/react-avatar-editor": "^12.0.0",
+    "@types/react-avatar-editor": "^13.0.2",
     "@types/react-dom": "^18.2.13",
     "@types/react-redux": "^7.1.17",
     "@types/react-router-dom": "^5.3.3",
diff --git a/public/index.html b/public/index.html
index f0b76ca7d..cb7ecc1f5 100644
--- a/public/index.html
+++ b/public/index.html
@@ -7,7 +7,7 @@
     <meta name="theme-color" content="#000000" />
     <meta
       name="description"
-      content="Stand for privacy, switch to Internxt. Internxt's open-source cloud storage services, Internxt Drive, Photos, Send, and more, protect your right to privacy."
+      content="Stand for privacy, switch to Internxt. Internxt's open-source cloud storage services, Internxt Drive, Send, and more, protect your right to privacy."
     />
     <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
     <!--
diff --git a/src/App.tsx b/src/App.tsx
index 301700a26..a8d75bf99 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -4,9 +4,12 @@ import { Toaster } from 'react-hot-toast';
 import { connect } from 'react-redux';
 import { Redirect, Route, Router, Switch } from 'react-router-dom';
 
+import { Portal } from '@headlessui/react';
 import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
 import { AppView } from 'app/core/types';
 import { FolderPath } from 'app/drive/types';
+import { useAppSelector } from 'app/store/hooks';
+import workspacesSelectors from 'app/store/slices/workspaces/workspaces.selectors';
 import i18next, { t } from 'i18next';
 import { pdfjs } from 'react-pdf';
 import { PATH_NAMES, serverPage } from './app/analytics/services/analytics.service';
@@ -21,12 +24,13 @@ import RealtimeService from './app/core/services/socket.service';
 import { AppViewConfig } from './app/core/types';
 import { LRUFilesCacheManager } from './app/database/services/database.service/LRUFilesCacheManager';
 import { LRUFilesPreviewCacheManager } from './app/database/services/database.service/LRUFilesPreviewCacheManager';
-import { LRUPhotosCacheManager } from './app/database/services/database.service/LRUPhotosCacheManager';
-import { LRUPhotosPreviewsCacheManager } from './app/database/services/database.service/LRUPhotosPreviewCacheManager';
 import FileViewerWrapper from './app/drive/components/FileViewer/FileViewerWrapper';
 import Mobile from './app/drive/views/MobileView/MobileView';
+import PreferencesDialog from './app/newSettings/PreferencesDialog';
+import { usePreferencesParamsChange } from './app/newSettings/hooks/usePreferencesParamsChange';
 import NewsletterDialog from './app/newsletter/components/NewsletterDialog/NewsletterDialog';
 import SharingRedirect from './app/routes/Share/ShareRedirection';
+import WorkspacesRedirect from './app/routes/Workspaces/WorkspacesRedirection';
 import { getRoutes } from './app/routes/routes';
 import { domainManager } from './app/share/services/DomainManager';
 import { PreviewFileItem } from './app/share/types';
@@ -34,6 +38,7 @@ import { AppDispatch, RootState } from './app/store';
 import { sessionActions } from './app/store/slices/session';
 import { uiActions } from './app/store/slices/ui';
 import { initializeUserThunk } from './app/store/slices/user';
+import { workspaceThunks } from './app/store/slices/workspaces/workspacesStore';
 import SurveyDialog from './app/survey/components/SurveyDialog/SurveyDialog';
 import { manager } from './app/utils/dnd-utils';
 import useBeforeUnload from './hooks/useBeforeUnload';
@@ -45,6 +50,7 @@ interface AppProps {
   isFileViewerOpen: boolean;
   isNewsletterDialogOpen: boolean;
   isSurveyDialogOpen: boolean;
+  isPreferencesDialogOpen: boolean;
   fileViewerItem: PreviewFileItem | null;
   user: UserSettings | undefined;
   namePath: FolderPath[];
@@ -58,6 +64,7 @@ const App = (props: AppProps): JSX.Element => {
     isFileViewerOpen,
     isNewsletterDialogOpen,
     isSurveyDialogOpen,
+    isPreferencesDialogOpen,
     fileViewerItem,
     dispatch,
   } = props;
@@ -66,11 +73,13 @@ const App = (props: AppProps): JSX.Element => {
   const params = new URLSearchParams(window.location.search);
   const skipSignupIfLoggedIn = params.get('skipSignupIfLoggedIn') === 'true';
   const queryParameters = navigationService.history.location.search;
+  const havePreferencesParamsChanged = usePreferencesParamsChange();
   const routes = getRoutes();
   const isDev = !envService.isProduction();
   const currentRouteConfig: AppViewConfig | undefined = configService.getViewConfig({
     path: navigationService.history.location.pathname,
   });
+  const selectedWorkspace = useAppSelector(workspacesSelectors.getSelectedWorkspace);
 
   useBeforeUnload();
 
@@ -101,13 +110,13 @@ const App = (props: AppProps): JSX.Element => {
     try {
       await LRUFilesCacheManager.getInstance();
       await LRUFilesPreviewCacheManager.getInstance();
-      await LRUPhotosCacheManager.getInstance();
-      await LRUPhotosPreviewsCacheManager.getInstance();
 
       await domainManager.fetchDomains();
 
       RealtimeService.getInstance().init();
 
+      dispatch(workspaceThunks.fetchWorkspaces());
+
       await props.dispatch(
         initializeUserThunk({
           redirectToLogin: !!currentRouteConfig?.auth,
@@ -148,8 +157,10 @@ const App = (props: AppProps): JSX.Element => {
       dispatch(uiActions.setIsFileViewerOpen(false));
       navigationService.push(AppView.Drive);
     } else {
-      navigationService.pushFolder(fileViewerItem?.folderUuid);
+      navigationService.pushFolder(fileViewerItem?.folderUuid, selectedWorkspace?.workspaceUser.workspaceId);
     }
+
+    dispatch(uiActions.setFileViewerItem(null));
   };
 
   if (!isAuthenticated || isInitialized) {
@@ -165,10 +176,17 @@ const App = (props: AppProps): JSX.Element => {
               {t('general.stage.development')}
             </span>
           )}
-
           <Switch>
+            <Route path="/workspaces/:invitationId/:action" component={WorkspacesRedirect} />
             <Route path="/sharings/:sharingId/:action" component={SharingRedirect} />
-            <Redirect from="/account" to="/preferences" />
+            <Redirect from="/s/file/:token([a-z0-9]{20})/:code?" to="/sh/file/:token([a-z0-9]{20})/:code?" />
+            <Redirect from="/s/folder/:token([a-z0-9]{20})/:code?" to="/sh/folder/:token([a-z0-9]{20})/:code?" />
+            <Redirect from="/s/photos/:token([a-z0-9]{20})/:code?" to="/sh/photos/:token([a-z0-9]{20})/:code?" />
+            <Redirect from="/account" to="/?preferences=open&section=account&subsection=account" />
+            <Redirect
+              from="/preferences"
+              to={`/?preferences=open&section=account&subsection=${params.get('tab') ?? 'account'}`}
+            />
             <Redirect from="/app/:section?" to={{ pathname: '/:section?', search: `${queryParameters}` }} />
             {pathName !== 'checkout-plan' && isMobile && isAuthenticated ? (
               <Route path="*">
@@ -179,16 +197,22 @@ const App = (props: AppProps): JSX.Element => {
             )}
           </Switch>
 
-          <Toaster
-            position="bottom-center"
-            containerStyle={{
-              filter: 'drop-shadow(0 32px 40px rgba(18, 22, 25, 0.08))',
-            }}
+          <Portal>
+            <Toaster
+              position="bottom-center"
+              containerStyle={{
+                filter: 'drop-shadow(0 32px 40px rgba(18, 22, 25, 0.08))',
+              }}
+            />
+          </Portal>
+
+          <PreferencesDialog
+            haveParamsChanged={havePreferencesParamsChanged}
+            isPreferencesDialogOpen={isPreferencesDialogOpen}
           />
 
           <NewsletterDialog isOpen={isNewsletterDialogOpen} />
           {isSurveyDialogOpen && <SurveyDialog isOpen={isSurveyDialogOpen} />}
-
           {isFileViewerOpen && fileViewerItem && (
             <FileViewerWrapper file={fileViewerItem} onClose={onCloseFileViewer} showPreview={isFileViewerOpen} />
           )}
@@ -206,6 +230,7 @@ export default connect((state: RootState) => ({
   isFileViewerOpen: state.ui.isFileViewerOpen,
   isNewsletterDialogOpen: state.ui.isNewsletterDialogOpen,
   isSurveyDialogOpen: state.ui.isSurveyDialogOpen,
+  isPreferencesDialogOpen: state.ui.isPreferencesDialogOpen,
   fileViewerItem: state.ui.fileViewerItem,
   user: state.user.user,
   namePath: state.storage.namePath,
diff --git a/src/app/analytics/TrackingPlan.ts b/src/app/analytics/TrackingPlan.ts
index 62d97921a..9b898d090 100644
--- a/src/app/analytics/TrackingPlan.ts
+++ b/src/app/analytics/TrackingPlan.ts
@@ -22,7 +22,7 @@ export namespace TrackingPlan {
     file_upload_id?: string;
     is_multiple: 0 | 1;
     file_name?: string;
-    parent_folder_id: number;
+    parent_folder_id: string;
     is_brave: boolean;
   }
 
diff --git a/src/app/analytics/services/analytics.service.ts b/src/app/analytics/services/analytics.service.ts
index c5d6727a9..3c9938c2d 100644
--- a/src/app/analytics/services/analytics.service.ts
+++ b/src/app/analytics/services/analytics.service.ts
@@ -247,7 +247,7 @@ export function trackFolderCreated(payload: { email: string; platform: DevicePla
   // window.analytics.track(AnalyticsTrackNames.FolderCreated, payload);
 }
 
-export function trackFolderRename(payload: { email: string; fileId: number; platform: DevicePlatform }): void {
+export function trackFolderRename(payload: { email: string; fileId: string; platform: DevicePlatform }): void {
   // window.analytics.track(AnalyticsTrackNames.FolderRename, payload);
 }
 
@@ -257,7 +257,7 @@ export function trackFileRename(payload: { email: string; file_id: number | stri
 
 export function trackMoveItem(
   keyOp: string,
-  payload: { email: string; file_id: number; platform: DevicePlatform },
+  payload: { email: string; file_id?: number; uuid?: string; platform: DevicePlatform },
 ): void {
   // window.analytics.track(`${keyOp}-move`.toLowerCase(), payload);
 }
diff --git a/src/app/auth/components/LogIn/LogIn.tsx b/src/app/auth/components/LogIn/LogIn.tsx
index 35be07f1a..fc73026a5 100644
--- a/src/app/auth/components/LogIn/LogIn.tsx
+++ b/src/app/auth/components/LogIn/LogIn.tsx
@@ -1,34 +1,36 @@
+import { auth } from '@internxt/lib';
+import QueryString from 'qs';
 import { useEffect, useMemo, useState } from 'react';
+import { Helmet } from 'react-helmet-async';
 import { SubmitHandler, useForm, useWatch } from 'react-hook-form';
-import { auth } from '@internxt/lib';
 import { useSelector } from 'react-redux';
 import { Link } from 'react-router-dom';
-import { Helmet } from 'react-helmet-async';
-import QueryString from 'qs';
 
-import { initializeUserThunk, userActions } from 'app/store/slices/user';
+import localStorageService from 'app/core/services/local-storage.service';
+import { twoFactorRegexPattern } from 'app/core/services/validation.service';
 import { RootState } from 'app/store';
 import { useAppDispatch } from 'app/store/hooks';
-import { twoFactorRegexPattern } from 'app/core/services/validation.service';
-import authService, { is2FANeeded, doLogin } from '../../services/auth.service';
-import localStorageService from 'app/core/services/local-storage.service';
+import { initializeUserThunk, userActions } from 'app/store/slices/user';
+import authService, { doLogin, is2FANeeded } from '../../services/auth.service';
 
+import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
 import { WarningCircle } from '@phosphor-icons/react';
-import { planThunks } from 'app/store/slices/plan';
-import { productsThunks } from 'app/store/slices/products';
 import errorService from 'app/core/services/error.service';
-import AppError, { AppView, IFormValues } from 'app/core/types';
 import navigationService from 'app/core/services/navigation.service';
-import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
-import TextInput from '../TextInput/TextInput';
-import PasswordInput from '../PasswordInput/PasswordInput';
-import { referralsThunks } from 'app/store/slices/referrals';
+import AppError, { AppView, IFormValues } from 'app/core/types';
 import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
-import shareService from '../../../share/services/share.service';
-import notificationsService, { ToastType } from '../../../notifications/services/notifications.service';
 import Button from 'app/shared/components/Button/Button';
+import { planThunks } from 'app/store/slices/plan';
+import { productsThunks } from 'app/store/slices/products';
+import { referralsThunks } from 'app/store/slices/referrals';
 import { trackAccountUnblockEmailSent } from '../../../analytics/services/analytics.service';
+import workspacesService from '../../../core/services/workspace.service';
+import notificationsService, { ToastType } from '../../../notifications/services/notifications.service';
 import useLoginRedirections from '../../../routes/hooks/Login/useLoginRedirections';
+import shareService from '../../../share/services/share.service';
+import PasswordInput from '../PasswordInput/PasswordInput';
+import TextInput from '../TextInput/TextInput';
+import { workspaceThunks } from 'app/store/slices/workspaces/workspacesStore';
 
 const showNotification = ({ text, isError }: { text: string; isError: boolean }) => {
   notificationsService.show({
@@ -50,17 +52,24 @@ export default function LogIn(): JSX.Element {
   const user = useSelector((state: RootState) => state.user.user) as UserSettings;
   const mnemonic = localStorageService.get('xMnemonic');
 
-  const { isUniversalLinkMode, isSharingInvitation, redirectWithCredentials, handleShareInvitation } =
-    useLoginRedirections({
-      navigateTo(viewId, queryMap) {
-        navigationService.push(viewId, queryMap);
-      },
-      processInvitation: shareService.processInvitation,
-      showNotification,
-    });
+  const {
+    isUniversalLinkMode,
+    isSharingInvitation,
+    redirectWithCredentials,
+    handleShareInvitation,
+    handleWorkspaceInvitation,
+  } = useLoginRedirections({
+    navigateTo(viewId, queryMap) {
+      navigationService.push(viewId, queryMap);
+    },
+    processInvitation: shareService.processInvitation,
+    processWorkspaceInvitation: workspacesService.processInvitation,
+    showNotification,
+  });
 
   useEffect(() => {
     handleShareInvitation();
+    handleWorkspaceInvitation();
   }, []);
 
   useEffect(() => {
@@ -139,6 +148,8 @@ export default function LogIn(): JSX.Element {
           dispatch(planThunks.initializeThunk());
           dispatch(referralsThunks.initializeThunk());
           await dispatch(initializeUserThunk()).unwrap();
+          dispatch(workspaceThunks.fetchWorkspaces());
+          dispatch(workspaceThunks.checkAndSetLocalWorkspace());
         } catch (e: unknown) {
           // PASS
         }
diff --git a/src/app/auth/components/SignUp/CreateAccountForm.tsx b/src/app/auth/components/SignUp/CreateAccountForm.tsx
new file mode 100644
index 000000000..1f7f6f563
--- /dev/null
+++ b/src/app/auth/components/SignUp/CreateAccountForm.tsx
@@ -0,0 +1,144 @@
+import { Info, WarningCircle } from '@phosphor-icons/react';
+import PasswordInput from 'app/auth/components/PasswordInput/PasswordInput';
+import TextInput from 'app/auth/components/TextInput/TextInput';
+import Button from 'app/shared/components/Button/Button';
+import PasswordStrengthIndicator from 'app/shared/components/PasswordStrengthIndicator';
+import { ReactComponent as InternxtLogo } from 'assets/icons/big-logo.svg';
+import { Helmet } from 'react-helmet-async';
+import { MAX_PASSWORD_LENGTH } from '../../../shared/components/ValidPassword';
+
+const CreateAccountForm = ({
+  handleSubmit,
+  onSubmit,
+  translate,
+  hasEmailParam,
+  register,
+  errors,
+  passwordState,
+  setShowPasswordIndicator,
+  showPasswordIndicator,
+  bottomInfoError,
+  isLoading,
+  isValidPassword,
+  isValid,
+}) => {
+  return (
+    <div className={'flex h-full w-full flex-col overflow-auto bg-surface dark:bg-gray-1'}>
+      <div className="flex shrink-0 flex-row justify-center py-10 sm:justify-start sm:pl-20">
+        <InternxtLogo className="h-auto w-28 text-gray-100" />
+      </div>
+
+      <div className={'flex h-full flex-col items-center justify-center'}>
+        <Helmet>
+          <link rel="canonical" href={`${process.env.REACT_APP_HOSTNAME}/shared-guest`} />
+        </Helmet>
+        <div className={'flex h-fit w-96 flex-col items-center justify-center rounded-2xl px-8 py-10'}>
+          <div className="flex flex-col items-start space-y-5">
+            <form className="flex w-full flex-col space-y-5" onSubmit={handleSubmit(onSubmit)}>
+              <h1 className="text-3xl font-medium">{translate('auth.signup.title')}</h1>
+              <div className="flex flex-col space-y-3">
+                <label className="space-y-0.5">
+                  <TextInput
+                    placeholder={translate('auth.email')}
+                    label="email"
+                    type="email"
+                    disabled={hasEmailParam}
+                    register={register}
+                    required={true}
+                    minLength={{ value: 1, message: translate('notificationMessages.emailNotEmpty') }}
+                    error={errors.email}
+                  />
+                </label>
+
+                <label className="space-y-0.5">
+                  <PasswordInput
+                    className={passwordState ? passwordState.tag : ''}
+                    placeholder={translate('auth.password')}
+                    label="password"
+                    maxLength={MAX_PASSWORD_LENGTH}
+                    register={register}
+                    onFocus={() => setShowPasswordIndicator(true)}
+                    required={true}
+                    error={errors.password}
+                  />
+                  {showPasswordIndicator && passwordState && (
+                    <PasswordStrengthIndicator
+                      className="pt-1"
+                      strength={passwordState.tag}
+                      label={passwordState.label}
+                    />
+                  )}
+                  {bottomInfoError && (
+                    <div className="flex flex-row items-start pt-1">
+                      <div className="flex h-5 flex-row items-center">
+                        <WarningCircle weight="fill" className="mr-1 h-4 text-red" />
+                      </div>
+                      <span className="font-base w-56 text-sm text-red">{bottomInfoError}</span>
+                    </div>
+                  )}
+                </label>
+
+                <div className="flex space-x-2.5 rounded-lg bg-primary/10 p-3 pr-4 dark:bg-primary/20">
+                  <Info size={20} className="shrink-0 text-primary" />
+                  <p className="text-xs">
+                    {translate('auth.signup.info.normalText')}{' '}
+                    <span className="font-semibold">{translate('auth.signup.info.boldText')}</span>{' '}
+                    <span className="font-semibold text-primary underline">
+                      <a
+                        href="https://help.internxt.com/en/articles/8450457-how-do-i-create-a-backup-key"
+                        target="_blank"
+                      >
+                        {translate('auth.signup.info.cta')}
+                      </a>
+                    </span>
+                  </p>
+                </div>
+
+                <Button
+                  disabled={isLoading || !isValidPassword}
+                  loading={isLoading}
+                  variant="primary"
+                  className="w-full"
+                  type="submit"
+                >
+                  {isLoading && isValid && isValidPassword
+                    ? `${translate('auth.signup.encrypting')}...`
+                    : translate('auth.signup.title')}
+                </Button>
+              </div>
+              <span className="mt-2 w-full text-xs text-gray-50">
+                {translate('auth.terms1')}{' '}
+                <a
+                  href="https://internxt.com/legal"
+                  target="_blank"
+                  className="text-xs text-gray-50 hover:text-gray-60"
+                >
+                  {translate('auth.terms2')}
+                </a>
+              </span>
+            </form>
+          </div>
+        </div>
+      </div>
+
+      <div className="flex flex-shrink-0 flex-row justify-center py-8">
+        <a
+          href="https://internxt.com/legal"
+          target="_blank"
+          className="font-regular mr-4 mt-6 text-base text-gray-80 no-underline hover:text-gray-100"
+        >
+          {translate('general.terms')}
+        </a>
+        <a
+          href="https://help.internxt.com"
+          target="_blank"
+          className="font-regular mr-4 mt-6 text-base text-gray-80 no-underline hover:text-gray-100"
+        >
+          {translate('general.help')}
+        </a>
+      </div>
+    </div>
+  );
+};
+
+export default CreateAccountForm;
diff --git a/src/app/auth/components/SignUp/SignUp.tsx b/src/app/auth/components/SignUp/SignUp.tsx
index 8cbfac2e3..ebbedbb06 100644
--- a/src/app/auth/components/SignUp/SignUp.tsx
+++ b/src/app/auth/components/SignUp/SignUp.tsx
@@ -5,7 +5,7 @@ import { auth } from '@internxt/lib';
 import { Link } from 'react-router-dom';
 import { Info, WarningCircle } from '@phosphor-icons/react';
 import { Helmet } from 'react-helmet-async';
-import localStorageService, { STORAGE_KEYS } from '../../../core/services/local-storage.service';
+import localStorageService from '../../../core/services/local-storage.service';
 
 import { useAppDispatch } from '../../../store/hooks';
 import { userActions, userThunks } from '../../../store/slices/user';
@@ -167,7 +167,9 @@ function SignUp(props: SignUpProps): JSX.Element {
       dispatch(userActions.setUser(user));
       await dispatch(userThunks.initializeUserThunk());
       dispatch(productsThunks.initializeThunk());
-      dispatch(planThunks.initializeThunk());
+      if (!redeemCodeObject) {
+        dispatch(planThunks.initializeThunk());
+      }
 
       if (isNewUser) {
         dispatch(referralsThunks.initializeThunk());
@@ -184,9 +186,7 @@ function SignUp(props: SignUpProps): JSX.Element {
         window.location.replace(redirectUrl);
         return;
       } else if (redeemCodeObject) {
-        await paymentService.redeemCode(redeemCodeObject).catch((err) => {
-          errorService.reportError(err);
-        });
+        await paymentService.redeemCode(redeemCodeObject);
         dispatch(planThunks.initializeThunk());
         navigationService.push(AppView.Drive);
       } else {
diff --git a/src/app/auth/components/SignUp/WorkspaceGuestSignUp.tsx b/src/app/auth/components/SignUp/WorkspaceGuestSignUp.tsx
new file mode 100644
index 000000000..86fb264a4
--- /dev/null
+++ b/src/app/auth/components/SignUp/WorkspaceGuestSignUp.tsx
@@ -0,0 +1,191 @@
+import { auth } from '@internxt/lib';
+import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
+import { useSignUp } from 'app/auth/components/SignUp/useSignUp';
+import { getNewToken } from 'app/auth/services/auth.service';
+import errorService from 'app/core/services/error.service';
+import localStorageService from 'app/core/services/local-storage.service';
+import navigationService from 'app/core/services/navigation.service';
+import { AppView, IFormValues } from 'app/core/types';
+import { decryptPrivateKey } from 'app/crypto/services/keys.service';
+import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
+import ExpiredLink from 'app/shared/views/ExpiredLink/ExpiredLinkView';
+import { RootState } from 'app/store';
+import { useAppDispatch } from 'app/store/hooks';
+import { planThunks } from 'app/store/slices/plan';
+import { productsThunks } from 'app/store/slices/products';
+import { referralsThunks } from 'app/store/slices/referrals';
+import { userActions, userThunks } from 'app/store/slices/user';
+import queryString from 'query-string';
+import { useEffect, useState } from 'react';
+import { SubmitHandler, useForm, useWatch } from 'react-hook-form';
+import { useSelector } from 'react-redux';
+import { onChangePasswordHandler } from '../../utils';
+import CreateAccountForm from './CreateAccountForm';
+import workspacesService from 'app/core/services/workspace.service';
+
+function WorkspaceGuestSingUpView(): JSX.Element {
+  const dispatch = useAppDispatch();
+  const { translate } = useTranslationContext();
+  const qs = queryString.parse(navigationService.history.location.search);
+  const hasEmailParam = (qs.email && auth.isValidEmail(decodeURIComponent(qs.email as string))) || false;
+
+  const [isValidPassword, setIsValidPassword] = useState(false);
+  const [signupError, setSignupError] = useState<Error | string>();
+  const [showError, setShowError] = useState(false);
+  const [isLoading, setIsLoading] = useState(false);
+  const { doRegisterPreCreatedUser } = useSignUp('activate');
+  const [passwordState, setPasswordState] = useState<{
+    tag: 'error' | 'warning' | 'success';
+    label: string;
+  } | null>(null);
+  const [invitationId, setInvitationId] = useState<string>();
+  const [showPasswordIndicator, setShowPasswordIndicator] = useState(false);
+  const user = useSelector((state: RootState) => state.user.user) as UserSettings;
+  const mnemonic = localStorageService.get('xMnemonic');
+
+  const getInitialEmailValue = () => {
+    if (hasEmailParam) {
+      return decodeURIComponent(qs.email as string);
+    }
+  };
+
+  const {
+    register,
+    formState: { errors, isValid },
+    handleSubmit,
+    control,
+  } = useForm<IFormValues>({
+    mode: 'onChange',
+    defaultValues: {
+      email: getInitialEmailValue(),
+      password: '',
+    },
+  });
+  const password = useWatch({ control, name: 'password', defaultValue: '' });
+
+  const [invitationValidation, setInvitationValidation] = useState({
+    isLoading: true,
+    isValid: false,
+  });
+
+  const formInputError = Object.values(errors)[0];
+
+  let bottomInfoError: null | string = null;
+
+  if (formInputError?.message) {
+    bottomInfoError = formInputError.message;
+  } else if (showError && signupError) {
+    bottomInfoError = signupError.toString();
+  }
+
+  const validateInvitation = async (id: string) => {
+    setInvitationValidation((prev) => ({ ...prev, isLoading: true }));
+
+    try {
+      await workspacesService.validateWorkspaceInvitation(id);
+      setInvitationId(id);
+      setInvitationValidation((prev) => ({ ...prev, isLoading: false, isValid: true }));
+    } catch (error) {
+      errorService.reportError(error);
+      setInvitationValidation((prev) => ({ ...prev, isLoading: false, isValid: false }));
+    }
+  };
+
+  useEffect(() => {
+    const inviteId = qs.invitation as string;
+
+    if (inviteId) {
+      validateInvitation(inviteId);
+    } else {
+      return navigationService.push(AppView.Signup);
+    }
+  }, [invitationId]);
+
+  useEffect(() => {
+    if (user && mnemonic) {
+      dispatch(userActions.setUser(user));
+      if (user?.registerCompleted && mnemonic) {
+        return navigationService.push(AppView.Drive);
+      }
+    }
+  }, []);
+
+  useEffect(() => {
+    if (password.length > 0)
+      onChangePasswordHandler({ password, setPasswordState, setIsValidPassword, email: qs.email });
+  }, [password]);
+
+  const onSubmit: SubmitHandler<IFormValues> = async (formData, event) => {
+    event?.preventDefault();
+    setIsLoading(true);
+
+    try {
+      const { email, password, token } = formData;
+      const { xUser, xToken, mnemonic } = await doRegisterPreCreatedUser(email, password, invitationId ?? '', token);
+
+      localStorageService.clear();
+
+      localStorageService.set('xToken', xToken);
+      localStorageService.set('xMnemonic', mnemonic);
+
+      const xNewToken = await getNewToken();
+      localStorageService.set('xNewToken', xNewToken);
+
+      const decryptedPrivateKey = decryptPrivateKey(xUser.privateKey, password);
+
+      const privateKey = xUser.privateKey ? Buffer.from(decryptedPrivateKey).toString('base64') : undefined;
+
+      const user = {
+        ...xUser,
+        privateKey,
+      } as UserSettings;
+
+      dispatch(userActions.setUser(user));
+      await dispatch(userThunks.initializeUserThunk());
+      dispatch(productsThunks.initializeThunk());
+      dispatch(planThunks.initializeThunk());
+
+      dispatch(referralsThunks.initializeThunk());
+
+      window.rudderanalytics.identify(xUser.uuid, { email, uuid: xUser.uuid });
+      window.rudderanalytics.track('User Signup', { email });
+
+      return navigationService.push(AppView.Drive);
+    } catch (err: unknown) {
+      setIsLoading(false);
+      errorService.reportError(err);
+      const castedError = errorService.castError(err);
+      setSignupError(castedError.message);
+    } finally {
+      setShowError(true);
+    }
+  };
+
+  if (invitationValidation.isLoading) {
+    return <></>;
+  }
+
+  if (!invitationValidation.isValid) {
+    return <ExpiredLink />;
+  }
+
+  return (
+    <CreateAccountForm
+      handleSubmit={handleSubmit}
+      onSubmit={onSubmit}
+      translate={translate}
+      hasEmailParam={hasEmailParam}
+      register={register}
+      errors={errors}
+      passwordState={passwordState}
+      setShowPasswordIndicator={setShowPasswordIndicator}
+      showPasswordIndicator={showPasswordIndicator}
+      bottomInfoError={bottomInfoError}
+      isLoading={isLoading}
+      isValidPassword={isValidPassword}
+      isValid={isValid}
+    />
+  );
+}
+
+export default WorkspaceGuestSingUpView;
diff --git a/src/app/auth/components/SignUp/useSignUp.ts b/src/app/auth/components/SignUp/useSignUp.ts
index f5b8cf919..cf8a1e1f4 100644
--- a/src/app/auth/components/SignUp/useSignUp.ts
+++ b/src/app/auth/components/SignUp/useSignUp.ts
@@ -143,7 +143,14 @@ export function useSignUp(
 
     user.mnemonic = decryptTextWithKey(user.mnemonic, password);
 
-    return { xUser: user, xToken: token, mnemonic: user.mnemonic };
+    return {
+      xUser: {
+        ...user,
+        rootFolderId: user.rootFolderUuid ?? user.rootFolderId,
+      },
+      xToken: token,
+      mnemonic: user.mnemonic,
+    };
   };
 
   const generateRegisterDetails = async (
diff --git a/src/app/auth/services/user.service.ts b/src/app/auth/services/user.service.ts
index 58b0cedba..378f1d4b4 100644
--- a/src/app/auth/services/user.service.ts
+++ b/src/app/auth/services/user.service.ts
@@ -1,5 +1,3 @@
-import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
-import { SdkFactory } from '../../core/factory/sdk';
 import {
   CheckChangeEmailExpirationResponse,
   FriendInvite,
@@ -9,6 +7,8 @@ import {
   UserPublicKeyResponse,
   VerifyEmailChangeResponse,
 } from '@internxt/sdk/dist/drive/users/types';
+import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
+import { SdkFactory } from '../../core/factory/sdk';
 
 export async function initializeUser(email: string, mnemonic: string): Promise<InitializeUserResponse> {
   const usersClient = SdkFactory.getInstance().createUsersClient();
@@ -38,6 +38,11 @@ const refreshUser = async (): Promise<{ user: UserSettings; token: string }> =>
   return usersClient.refreshUser();
 };
 
+const refreshUserData = async (userUUID: string): Promise<{ user: UserSettings }> => {
+  const usersClient = SdkFactory.getNewApiInstance().createNewUsersClient();
+  return usersClient.getUserData({ userUuid: userUUID });
+};
+
 const updateUserProfile = (payload: Required<UpdateProfilePayload>): Promise<void> => {
   const usersClient = SdkFactory.getInstance().createUsersClient();
   return usersClient.updateProfile(payload);
@@ -98,6 +103,7 @@ const userService = {
   verifyEmailChange,
   checkChangeEmailLinkExpiration,
   preCreateUser,
+  refreshUserData,
 };
 
 export default userService;
diff --git a/src/app/auth/utils.ts b/src/app/auth/utils.ts
new file mode 100644
index 000000000..070a8bd9e
--- /dev/null
+++ b/src/app/auth/utils.ts
@@ -0,0 +1,40 @@
+import testPasswordStrength from '@internxt/lib/dist/src/auth/testPasswordStrength';
+import { t } from 'i18next';
+import { MAX_PASSWORD_LENGTH } from '../shared/components/ValidPassword';
+
+const onChangePasswordHandler = ({
+  password,
+  setIsValidPassword,
+  setPasswordState,
+  email,
+}: {
+  password: string;
+  setIsValidPassword: (value: boolean) => void;
+  setPasswordState: ({ tag, label }: { tag: 'error' | 'warning' | 'success'; label: string }) => void;
+  email?: string | string[] | null;
+}) => {
+  setIsValidPassword(false);
+  if (password.length > MAX_PASSWORD_LENGTH) {
+    setPasswordState({ tag: 'error', label: t('modals.changePasswordModal.errors.longPassword') });
+    return;
+  }
+
+  const result = testPasswordStrength(password, (email as string) === undefined ? '' : (email as string));
+
+  setIsValidPassword(result.valid);
+  if (!result.valid) {
+    setPasswordState({
+      tag: 'error',
+      label:
+        result.reason === 'NOT_COMPLEX_ENOUGH'
+          ? 'Password is not complex enough'
+          : 'Password has to be at least 8 characters long',
+    });
+  } else if (result.strength === 'medium') {
+    setPasswordState({ tag: 'warning', label: 'Password is weak' });
+  } else {
+    setPasswordState({ tag: 'success', label: 'Password is strong' });
+  }
+};
+
+export { onChangePasswordHandler };
diff --git a/src/app/auth/views/Auth/SignupBlog.tsx b/src/app/auth/views/Auth/SignupBlog.tsx
index a6e8ff0df..26d4c0904 100644
--- a/src/app/auth/views/Auth/SignupBlog.tsx
+++ b/src/app/auth/views/Auth/SignupBlog.tsx
@@ -14,7 +14,7 @@ const textContent = {
     passwordLabel: 'Password',
     emailEmpty: 'Email cannot be empty',
     passwordLabelEmpty: 'Password cannot be empty',
-    buttonText: 'Get up to 10GB - For free!',
+    buttonText: 'Get up to 1GB - For free!',
     legal: {
       line1: 'By creating an account you accept the',
       line2: 'terms of service, and privacy policy',
@@ -30,7 +30,7 @@ const textContent = {
     passwordLabel: 'Contraseña',
     emailEmpty: 'El correo electrónico no puede estar vacío',
     passwordLabelEmpty: 'La contraseña no puede estar vacía',
-    buttonText: 'Consigue 10GB - ¡Gratis!',
+    buttonText: 'Consigue 1GB - ¡Gratis!',
     legal: {
       line1: 'Al crear una cuenta aceptas los',
       line2: 'términos de servicio y la política de privacidad',
diff --git a/src/app/auth/views/DownloadBackupKey/DownloadBackupKey.tsx b/src/app/auth/views/DownloadBackupKey/DownloadBackupKey.tsx
index bb8ee6b24..1787d4a2c 100644
--- a/src/app/auth/views/DownloadBackupKey/DownloadBackupKey.tsx
+++ b/src/app/auth/views/DownloadBackupKey/DownloadBackupKey.tsx
@@ -1,12 +1,12 @@
 import Button from '../../../shared/components/Button/Button';
 import { useTranslationContext } from '../../../i18n/provider/TranslationProvider';
-import { handleExport } from '../../../core/views/Preferences/tabs/Security/BackupKey';
+import { handleExportBackupKey } from '../../../utils/backupKeyUtils';
 
 const DownloadBackupKey = ({ onRedirect }: { onRedirect: () => void }) => {
   const { translate } = useTranslationContext();
 
   const handleKeyDownload = () => {
-    handleExport(translate);
+    handleExportBackupKey(translate);
     onRedirect();
   };
 
diff --git a/src/app/auth/views/UnivesalLinkSuccessView/UniversalLinkSuccessView.tsx b/src/app/auth/views/UnivesalLinkSuccessView/UniversalLinkSuccessView.tsx
index 174f2f678..3c51fdf89 100644
--- a/src/app/auth/views/UnivesalLinkSuccessView/UniversalLinkSuccessView.tsx
+++ b/src/app/auth/views/UnivesalLinkSuccessView/UniversalLinkSuccessView.tsx
@@ -36,12 +36,12 @@ export default function UniversalLinkSuccessView(): JSX.Element {
     authService.logOut();
   };
   return (
-    <main className="flex h-full w-full flex-col bg-gray-5">
+    <main className="flex h-full w-full flex-col bg-gray-5 dark:bg-surface">
       <div className="flex shrink-0 flex-row justify-center py-10 sm:justify-start sm:pl-20">
         <InternxtLogo className="h-auto w-28 text-gray-100" />
       </div>
-      <div className="flex flex-1 items-center justify-center">
-        <div className="w-96 rounded-lg bg-white px-8 py-10 shadow-soft">
+      <div className="flex flex-1 items-center justify-center bg-gray-5 dark:bg-surface">
+        <div className="w-96 rounded-lg px-8 py-10 shadow-soft dark:bg-gray-5">
           <div className="mb-6 flex justify-center">
             <img src={squareLogo} alt="" className="shadow-soft" height={64} />
           </div>
diff --git a/src/app/backups/components/BackupsAsFoldersList/BackupsAsFoldersList.tsx b/src/app/backups/components/BackupsAsFoldersList/BackupsAsFoldersList.tsx
index 4dc1ece17..9cd08297c 100644
--- a/src/app/backups/components/BackupsAsFoldersList/BackupsAsFoldersList.tsx
+++ b/src/app/backups/components/BackupsAsFoldersList/BackupsAsFoldersList.tsx
@@ -1,23 +1,23 @@
+import { DriveFolderData } from '@internxt/sdk/dist/drive/storage/types';
+import folderEmptyImage from 'assets/icons/light/folder-open.svg';
+import _ from 'lodash';
 import { useEffect, useState } from 'react';
 import { useDispatch } from 'react-redux';
-import _ from 'lodash';
-import { DriveFolderData } from '@internxt/sdk/dist/drive/storage/types';
 import { SdkFactory } from '../../../core/factory/sdk';
-import Empty from '../../../shared/components/Empty/Empty';
-import { DriveFolderData as DriveWebFolderData, DriveItemData } from '../../../drive/types';
-import { deleteItemsThunk } from '../../../store/slices/storage/storage.thunks/deleteItemsThunk';
-import folderEmptyImage from 'assets/icons/light/folder-open.svg';
-import { downloadItemsThunk } from '../../../store/slices/storage/storage.thunks/downloadItemsThunk';
-import { uiActions } from '../../../store/slices/ui';
+import dateService from '../../../core/services/date.service';
+import { contextMenuSelectedBackupItems } from '../../../drive/components/DriveExplorer/DriveExplorerList/DriveItemContextMenu';
 import DriveListItemSkeleton from '../../../drive/components/DriveListItemSkeleton/DriveListItemSkeleton';
-import { deleteBackupDeviceAsFolder } from '../../../drive/services/folder.service';
 import { deleteFile } from '../../../drive/services/file.service';
-import List from '../../../shared/components/List';
-import { contextMenuSelectedBackupItems } from '../../../drive/components/DriveExplorer/DriveExplorerList/DriveItemContextMenu';
-import { useTranslationContext } from '../../../i18n/provider/TranslationProvider';
+import { deleteBackupDeviceAsFolder } from '../../../drive/services/folder.service';
 import iconService from '../../../drive/services/icon.service';
-import dateService from '../../../core/services/date.service';
 import sizeService from '../../../drive/services/size.service';
+import { DriveItemData, DriveFolderData as DriveWebFolderData } from '../../../drive/types';
+import { useTranslationContext } from '../../../i18n/provider/TranslationProvider';
+import Empty from '../../../shared/components/Empty/Empty';
+import List from '../../../shared/components/List';
+import { deleteItemsThunk } from '../../../store/slices/storage/storage.thunks/deleteItemsThunk';
+import { downloadItemsThunk } from '../../../store/slices/storage/storage.thunks/downloadItemsThunk';
+import { uiActions } from '../../../store/slices/ui';
 
 export default function BackupsAsFoldersList({
   className = '',
@@ -25,7 +25,7 @@ export default function BackupsAsFoldersList({
   onFolderPush,
 }: {
   className?: string;
-  folderId: number;
+  folderId: string;
   onFolderPush: (folder: DriveFolderData) => void;
 }): JSX.Element {
   const dispatch = useDispatch();
@@ -42,8 +42,8 @@ export default function BackupsAsFoldersList({
   async function refreshFolderContent() {
     setIsloading(true);
     setSelectedItems([]);
-    const storageClient = SdkFactory.getInstance().createStorageClient();
-    const [responsePromise] = storageClient.getFolderContent(folderId);
+    const storageClient = SdkFactory.getNewApiInstance().createNewStorageClient();
+    const [responsePromise] = storageClient.getFolderContentByUuid(folderId);
     const response = await responsePromise;
     const folders = response.children.map((folder) => ({ ...folder, isFolder: true }));
     const items = _.concat(folders as DriveItemData[], response.files as DriveItemData[]);
@@ -128,7 +128,9 @@ export default function BackupsAsFoldersList({
             isLoading={isLoading}
             itemComposition={[
               (item) => {
-                const displayName = item.type ? `${item.name}.${item.type}` : item.name;
+                const displayName = item.type
+                  ? `${item.plainName ?? item.name}.${item.type}`
+                  : item.plainName ?? item.name;
                 const Icon = iconService.getItemIcon(item.isFolder, item.type);
 
                 return (
diff --git a/src/app/backups/views/BackupsView/BackupsView.tsx b/src/app/backups/views/BackupsView/BackupsView.tsx
index cc5ef20e2..fb79e8d69 100644
--- a/src/app/backups/views/BackupsView/BackupsView.tsx
+++ b/src/app/backups/views/BackupsView/BackupsView.tsx
@@ -1,19 +1,19 @@
+import { DriveFolderData } from '@internxt/sdk/dist/drive/storage/types';
+import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
+import BreadcrumbsBackupsView from 'app/shared/components/Breadcrumbs/Containers/BreadcrumbsBackupsView';
+import { useAppDispatch, useAppSelector } from 'app/store/hooks';
+import { backupsActions, backupsThunks } from 'app/store/slices/backups';
 import { useEffect, useState } from 'react';
 import { Helmet } from 'react-helmet-async';
-import DeviceList from '../../components/DeviceList/DeviceList';
-import { Device } from '../../types';
-import { backupsActions, backupsThunks } from 'app/store/slices/backups';
-import { useAppDispatch, useAppSelector } from 'app/store/hooks';
-import { DriveFolderData } from '@internxt/sdk/dist/drive/storage/types';
-import BackupsAsFoldersList from '../../components/BackupsAsFoldersList/BackupsAsFoldersList';
-import { deleteItemsThunk } from '../../../store/slices/storage/storage.thunks/deleteItemsThunk';
-import { DriveFolderData as DriveWebFolderData, DriveItemData } from '../../../drive/types';
-import { deleteBackupDeviceAsFolder } from '../../../drive/services/folder.service';
-import Dialog from '../../../shared/components/Dialog/Dialog';
 import DeleteBackupDialog from '../../../drive/components/DeleteBackupDialog/DeleteBackupDialog';
-import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
 import WarningMessageWrapper from '../../../drive/components/WarningMessage/WarningMessageWrapper';
-import BreadcrumbsBackupsView from 'app/shared/components/Breadcrumbs/Containers/BreadcrumbsBackupsView';
+import { deleteBackupDeviceAsFolder } from '../../../drive/services/folder.service';
+import { DriveItemData, DriveFolderData as DriveWebFolderData } from '../../../drive/types';
+import Dialog from '../../../shared/components/Dialog/Dialog';
+import { deleteItemsThunk } from '../../../store/slices/storage/storage.thunks/deleteItemsThunk';
+import BackupsAsFoldersList from '../../components/BackupsAsFoldersList/BackupsAsFoldersList';
+import DeviceList from '../../components/DeviceList/DeviceList';
+import { Device } from '../../types';
 
 export default function BackupsView(): JSX.Element {
   const { translate } = useTranslationContext();
@@ -102,7 +102,7 @@ export default function BackupsView(): JSX.Element {
     body = (
       <BackupsAsFoldersList
         onFolderPush={(folder) => setBackupsAsFoldersPath((current) => [...current, folder])}
-        folderId={backupsAsFoldersPath[backupsAsFoldersPath.length - 1].id}
+        folderId={backupsAsFoldersPath[backupsAsFoldersPath.length - 1].uuid}
       />
     );
   }
diff --git a/src/app/banners/BannerManager.ts b/src/app/banners/BannerManager.ts
new file mode 100644
index 000000000..dd6e08abd
--- /dev/null
+++ b/src/app/banners/BannerManager.ts
@@ -0,0 +1,60 @@
+import localStorageService from '../core/services/local-storage.service';
+import { useAppSelector } from '../store/hooks';
+import { PlanState } from '../store/slices/plan';
+import { userSelectors } from '../store/slices/user';
+import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
+
+const BANNER_NAME_IN_LOCAL_STORAGE = 'show_banner';
+const BANNER_NAME_FOR_FREE_USERS = 'show_free_users_banner';
+const OFFER_END_DAY = new Date('2024-07-08');
+
+export class BannerManager {
+  private plan: PlanState;
+  private isTutorialCompleted: boolean;
+  private isNewAccount: boolean;
+  private bannerItemInLocalStorage: string | null;
+  private todayDate: string;
+
+  constructor(user: UserSettings, plan: PlanState) {
+    this.plan = plan;
+    this.isTutorialCompleted = localStorageService.hasCompletedTutorial(user.userId);
+    this.bannerItemInLocalStorage = localStorageService.get(BANNER_NAME_FOR_FREE_USERS);
+    this.isNewAccount = useAppSelector(userSelectors.hasSignedToday);
+    this.todayDate = new Date().getDate().toString();
+  }
+
+  shouldShowBanner(): boolean {
+    const isNewUser = this.plan.individualSubscription?.type === 'free';
+    const isOfferOffDay = new Date() > OFFER_END_DAY;
+    const showBannerIfLocalStorageItemExpires = JSON.parse(this.bannerItemInLocalStorage as string) < this.todayDate;
+
+    if (isOfferOffDay) {
+      localStorageService.removeItem(BANNER_NAME_IN_LOCAL_STORAGE);
+      localStorageService.removeItem(BANNER_NAME_FOR_FREE_USERS);
+    }
+
+    if (showBannerIfLocalStorageItemExpires) {
+      localStorageService.removeItem(BANNER_NAME_FOR_FREE_USERS);
+    }
+
+    return (
+      isNewUser &&
+      !this.bannerItemInLocalStorage &&
+      !isOfferOffDay &&
+      ((this.isNewAccount && this.isTutorialCompleted) || !this.isNewAccount)
+    );
+  }
+
+  handleBannerDisplay(setShowBanner: (show: boolean) => void): void {
+    if (this.shouldShowBanner()) {
+      setTimeout(() => {
+        setShowBanner(true);
+      }, 5000);
+    }
+  }
+
+  onCloseBanner(setShowBanner: (show: boolean) => void): void {
+    localStorageService.set(BANNER_NAME_FOR_FREE_USERS, this.todayDate);
+    setShowBanner(false);
+  }
+}
diff --git a/src/app/banners/BannerWrapper.tsx b/src/app/banners/BannerWrapper.tsx
index ecf35e10a..fc039fbb0 100644
--- a/src/app/banners/BannerWrapper.tsx
+++ b/src/app/banners/BannerWrapper.tsx
@@ -1,48 +1,27 @@
-import localStorageService from '../core/services/local-storage.service';
 import { RootState } from '../store';
-import { useAppSelector } from '../store/hooks';
 import { PlanState } from '../store/slices/plan';
-import { userSelectors } from '../store/slices/user';
-import { useEffect, useState } from 'react';
 import { useSelector } from 'react-redux';
 
 import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
 
-import Banner from './Banner';
-
-const SHOW_BANNER_COOKIE_NAME = 'lifetime_soft_banner';
-const OFFER_OFF_DAY = new Date('2024-05-26');
+import FeaturesBanner from './FeaturesBanner';
+import { BannerManager } from './BannerManager';
+import { useEffect, useState } from 'react';
 
 const BannerWrapper = (): JSX.Element => {
-  const [showBanner, setShowBanner] = useState(false);
+  const [showBanner, setShowBanner] = useState<boolean>(false);
   const user = useSelector((state: RootState) => state.user.user) as UserSettings;
   const plan = useSelector<RootState, PlanState>((state) => state.plan);
-  const isTutorialCompleted = localStorageService.hasCompletedTutorial(user.userId);
-  const userPlan = plan.subscription?.type;
 
-  const isNewUser = userPlan === 'free';
-  const isNewAccount = useAppSelector(userSelectors.hasSignedToday);
-  const isLocalStorage = localStorageService.get(SHOW_BANNER_COOKIE_NAME);
-  const isOfferOffDay = new Date() > OFFER_OFF_DAY;
-
-  const shouldShowBanner = isNewUser && !isLocalStorage && !isOfferOffDay;
+  const bannerManager = new BannerManager(user, plan);
 
   useEffect(() => {
-    handleBannerDisplay();
-  }, [isTutorialCompleted, userPlan, isNewAccount]);
-
-  const onCloseBanner = () => {
-    localStorageService.set(SHOW_BANNER_COOKIE_NAME, 'false');
-    setShowBanner(false);
-  };
+    bannerManager.handleBannerDisplay(setShowBanner);
+  }, [user, plan]);
 
-  function handleBannerDisplay() {
-    if ((isNewAccount && isTutorialCompleted && shouldShowBanner) || (!isNewAccount && shouldShowBanner)) {
-      setShowBanner(true);
-    }
-  }
+  const onCloseBanner = () => bannerManager.onCloseBanner(setShowBanner);
 
-  return <Banner showBanner={showBanner} onClose={onCloseBanner} />;
+  return <FeaturesBanner showBanner={showBanner} onClose={onCloseBanner} />;
 };
 
 export default BannerWrapper;
diff --git a/src/app/banners/FeaturesBanner.tsx b/src/app/banners/FeaturesBanner.tsx
index 33f18111f..b30d87284 100644
--- a/src/app/banners/FeaturesBanner.tsx
+++ b/src/app/banners/FeaturesBanner.tsx
@@ -1,6 +1,5 @@
-import { Asterisk, CheckCircle, X } from '@phosphor-icons/react';
+import { CheckCircle, TreePalm, X } from '@phosphor-icons/react';
 
-import StarWarsBG from '../../assets/images/banner/star-wars-bg.webp';
 import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
 
 const FeaturesBanner = ({ showBanner, onClose }: { showBanner: boolean; onClose: () => void }): JSX.Element => {
@@ -10,6 +9,7 @@ const FeaturesBanner = ({ showBanner, onClose }: { showBanner: boolean; onClose:
 
   const handleOnClick = () => {
     window.open('https://internxt.com/pricing', '_blank', 'noopener noreferrer');
+    onClose();
   };
 
   return (
@@ -21,21 +21,32 @@ const FeaturesBanner = ({ showBanner, onClose }: { showBanner: boolean; onClose:
       {/* Banner */}
       <div
         className={
-          'fixed left-1/2 top-1/2 flex h-auto -translate-x-[50%] -translate-y-[50%] flex-col overflow-hidden rounded-2xl border-4 border-primary/10 px-10'
+          'fixed left-1/2 top-1/2 flex h-auto -translate-x-[50%] -translate-y-[50%] flex-col overflow-hidden rounded-[32px] border-4 border-primary/20 bg-white px-10'
         }
-        style={{
-          backgroundImage: `url(${StarWarsBG})`,
-        }}
       >
-        <button className="absolute  right-0 m-7 flex text-white" onClick={onClose}>
+        <button className="absolute  right-0 m-7 flex text-black hover:bg-white/5" onClick={onClose}>
           <X size={32} />
         </button>
         <div className="flex w-full flex-col space-x-10 py-14 lg:flex-row">
-          <div className="flex  w-max max-w-[310px] flex-col  items-center justify-center space-y-3 text-center lg:items-start lg:justify-between lg:text-start">
-            <div className="flex rounded-lg border-4 border-primary/90 bg-black px-3 py-1.5">
-              <p className="text-2xl font-bold text-white">{translate('featuresBanner.label')}</p>
+          <div className="flex  w-max max-w-[400px] flex-col  items-center justify-center space-y-3 text-center lg:items-start lg:justify-between lg:text-start">
+            <div className="flex items-center gap-1 rounded-xl bg-primary/10 px-3 py-1.5 font-bold text-primary">
+              {/* <p className="text-xs">{translate('featuresBanner.label.upTo')}</p> */}
+              <p className="text-2xl">{translate('featuresBanner.label.discount')}</p>
             </div>
-            <p className="w-full text-4xl font-bold leading-tight text-white">{translate('featuresBanner.title')}</p>
+            <p className="w-full text-5xl font-bold leading-tight text-gray-80 dark:text-gray-20">
+              {translate('featuresBanner.title')}
+            </p>
+
+            {/* <p className="w-full text-lg font-semibold text-gray-80 dark:text-gray-20">
+              {translate('featuresBanner.subtitle.line1')}{' '}
+              <span className="font-bold">
+                {translate('featuresBanner.subtitle.line2.normal1')}
+                <button onClick={handleCopyOnClipboardAction} className="cursor-pointer text-primary hover:underline">
+                  {translate('featuresBanner.subtitle.line2.blue')}
+                </button>
+                {translate('featuresBanner.subtitle.line2.normal2')}
+              </span>
+            </p> */}
 
             <div className="flex flex-col items-center space-y-3 lg:items-start">
               <button
@@ -44,21 +55,23 @@ const FeaturesBanner = ({ showBanner, onClose }: { showBanner: boolean; onClose:
               >
                 {translate('featuresBanner.cta')}
               </button>
-              <div className="flex flex-row items-center space-x-3 pt-2 text-white">
-                <CheckCircle size={24} className="text-primary" />
+              <div className="flex flex-row space-x-3 pt-2 text-gray-80 dark:text-gray-20">
+                <div className="flex h-6 w-6">
+                  <CheckCircle size={24} className="mt-0.5 w-max text-primary" />
+                </div>
                 <p className="font-medium lg:text-lg">{translate('featuresBanner.guarantee')}</p>
               </div>
 
-              <p className="text-sm font-medium text-gray-50">{translate('featuresBanner.lastCta')}</p>
+              {/* <p className="text-sm font-medium text-gray-50">{translate('featuresBanner.lastCta')}</p> */}
             </div>
           </div>
           <div className="hidden items-center lg:flex">
             <div className="flex flex-col">
               <div className="flex flex-col space-y-8">
                 {features.map((card) => (
-                  <div className="flex flex-row space-x-4" key={card}>
-                    <Asterisk weight="fill" size={32} className="text-primary" />
-                    <p className="whitespace-nowrap text-xl font-semibold text-white">{card}</p>
+                  <div className="flex flex-row items-center space-x-4" key={card}>
+                    <TreePalm weight="fill" size={32} className="text-primary" />
+                    <p className="whitespace-nowrap text-xl font-semibold text-gray-80 dark:text-gray-20">{card}</p>
                   </div>
                 ))}
               </div>
diff --git a/src/app/core/components/Navbar/AccountPopover.tsx b/src/app/core/components/Navbar/AccountPopover.tsx
index 5f91953e6..f15dedee5 100644
--- a/src/app/core/components/Navbar/AccountPopover.tsx
+++ b/src/app/core/components/Navbar/AccountPopover.tsx
@@ -1,15 +1,16 @@
 import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
-import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
-import notificationsService, { ToastType } from 'app/notifications/services/notifications.service';
+import { useTranslationContext } from '../../../i18n/provider/TranslationProvider';
+import notificationsService, { ToastType } from '../../../notifications/services/notifications.service';
 import { Desktop, SignOut, UserPlus, Gear } from '@phosphor-icons/react';
 import { ReactNode } from 'react';
-import { Link } from 'react-router-dom';
 import Popover from '../../../shared/components/Popover';
-import { useAppDispatch } from '../../../store/hooks';
+import { useAppDispatch, useAppSelector } from '../../../store/hooks';
 import { uiActions } from '../../../store/slices/ui';
 import { userThunks } from '../../../store/slices/user';
 import desktopService from '../../services/desktop.service';
-import AvatarWrapper from '../../views/Preferences/tabs/Account/AvatarWrapper';
+import AvatarWrapper from '../../../newSettings/Sections/Account/Account/components/AvatarWrapper';
+import navigationService from '../../../core/services/navigation.service';
+import { RootState } from 'app/store';
 
 export default function AccountPopover({
   className = '',
@@ -18,9 +19,19 @@ export default function AccountPopover({
 }: {
   className?: string;
   user: UserSettings;
-  plan: { planLimit: number; planUsage: number; showUpgrade: boolean };
+  plan: {
+    planLimit: number;
+    planUsage: number;
+    showUpgrade: boolean;
+    businessPlanLimit: number;
+    businessPlanUsage: number;
+  };
 }): JSX.Element {
   const dispatch = useAppDispatch();
+  const { selectedWorkspace } = useAppSelector((state: RootState) => state.workspaces);
+  const memberId = selectedWorkspace?.workspaceUser?.memberId;
+  const usage = !memberId ? plan.planUsage : plan.businessPlanUsage;
+  const limit = !memberId ? plan.planLimit : plan.businessPlanLimit;
 
   const { translate } = useTranslationContext();
   const fullName = `${user.name} ${user.lastname}`;
@@ -29,7 +40,7 @@ export default function AccountPopover({
     <AvatarWrapper diameter={36} style={{ minWidth: 36 }} fullName={fullName} avatarSrcURL={user.avatar} />
   );
 
-  const percentageUsed = Math.round((plan.planUsage / plan.planLimit) * 100);
+  const percentageUsed = Math.round((usage / limit) * 100) || 0;
 
   const separator = <div className="border-translate mx-3 my-0.5 border-gray-10" />;
 
@@ -77,9 +88,19 @@ export default function AccountPopover({
           {translate('views.account.popover.spaceUsed', { space: percentageUsed })}
         </p>
         {plan.showUpgrade && (
-          <Link to="/preferences?tab=billing" className="text-sm font-medium text-primary no-underline">
+          <button
+            className="w-full cursor-pointer text-sm font-medium text-primary no-underline"
+            onClick={() => {
+              navigationService.openPreferencesDialog({
+                section: 'account',
+                subsection: 'billing',
+                workspaceUuid: selectedWorkspace?.workspaceUser.workspaceId,
+              });
+              dispatch(uiActions.setIsPreferencesDialogOpen(true));
+            }}
+          >
             {translate('actions.upgrade')}
-          </Link>
+          </button>
         )}
       </div>
       {separator}
@@ -87,13 +108,20 @@ export default function AccountPopover({
         <Desktop size={20} />
         <p className="ml-3">{translate('views.account.popover.downloadApp')}</p>
       </Item>
-      <Link
-        to="/preferences"
-        className="flex cursor-pointer items-center px-3 py-2 text-gray-80 no-underline hover:bg-gray-1 hover:text-gray-80 dark:hover:bg-gray-10"
+      <button
+        className="flex w-full cursor-pointer items-center px-3 py-2 text-gray-80 no-underline hover:bg-gray-1 hover:text-gray-80 dark:hover:bg-gray-10"
+        onClick={() => {
+          navigationService.openPreferencesDialog({
+            section: 'general',
+            subsection: 'general',
+            workspaceUuid: selectedWorkspace?.workspaceUser.workspaceId,
+          });
+          dispatch(uiActions.setIsPreferencesDialogOpen(true));
+        }}
       >
         <Gear size={20} />
         <p className="ml-3">{translate('views.account.popover.settings')}</p>
-      </Link>
+      </button>
       {user && user.sharedWorkspace && (
         <Item onClick={onGuestInviteClick}>
           <UserPlus size={20} />
diff --git a/src/app/core/components/Navbar/Navbar.tsx b/src/app/core/components/Navbar/Navbar.tsx
deleted file mode 100644
index 034e6c344..000000000
--- a/src/app/core/components/Navbar/Navbar.tsx
+++ /dev/null
@@ -1,101 +0,0 @@
-import React from 'react';
-import { connect } from 'react-redux';
-import { AppDispatch, RootState } from '../../../store';
-import { storageActions, storageSelectors } from '../../../store/slices/storage';
-import validationService from '../../services/validation.service';
-import { StorageFilters } from '../../../store/slices/storage/storage.model';
-import { sessionSelectors } from '../../../store/slices/session/session.selectors';
-import { Workspace } from '../../types';
-import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
-import { TeamsSettings } from '../../../teams/types';
-import { Gear, MagnifyingGlass } from '@phosphor-icons/react';
-import AccountPopover from './AccountPopover';
-import { PlanState } from '../../../store/slices/plan';
-import { Link } from 'react-router-dom';
-import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
-
-interface NavbarProps {
-  user: UserSettings | undefined;
-  team: TeamsSettings | undefined | null;
-  workspace: Workspace;
-  isTeam: boolean;
-  storageFilters: StorageFilters;
-  currentFolderId: number;
-  dispatch: AppDispatch;
-  hideSearch?: boolean;
-  plan: PlanState;
-}
-
-const Navbar = (props: NavbarProps) => {
-  const { translate } = useTranslationContext();
-
-  const onSearchButtonClicked = (): void => {
-    // TODO: do search
-  };
-
-  const onSearchInputChange = (e: React.ChangeEvent<HTMLInputElement>): void => {
-    if (validationService.validateSearchText(e.target.value)) {
-      props.dispatch(
-        storageActions.setFilters({
-          text: e.target.value,
-        }),
-      );
-    }
-  };
-
-  const { user, storageFilters, hideSearch } = props;
-  if (!user) throw new Error('User is not defined');
-
-  return (
-    <div className="flex h-14 w-full items-center justify-between border-b border-gray-5 text-gray-40 dark:bg-gray-1">
-      {hideSearch ? (
-        <div />
-      ) : (
-        <div className="flex">
-          <input
-            value={storageFilters.text}
-            onChange={onSearchInputChange}
-            type="text"
-            placeholder={translate('general.searchBar.oldSearchBarPlaceholder') as string}
-            className="no-ring-at-all h-9 w-80 max-w-md bg-gray-5 px-3 duration-200 focus:ring-0"
-          />
-          <MagnifyingGlass
-            onClick={onSearchButtonClicked}
-            className="relative right-7 top-2.5 cursor-pointer"
-            size={16}
-          />
-        </div>
-      )}
-      <div className="flex">
-        <Link
-          to="/preferences"
-          className="mr-5 flex h-10 w-10 items-center justify-center rounded-lg text-gray-80 hover:bg-gray-5 hover:text-gray-80 active:bg-gray-10"
-        >
-          <Gear size={24} />
-        </Link>
-        <AccountPopover
-          className="z-40 mr-5"
-          user={user}
-          plan={{
-            ...props.plan,
-            showUpgrade: (props.plan.individualPlan && props.plan.individualPlan.name === 'Free Plan') ?? false,
-          }}
-        />
-      </div>
-    </div>
-  );
-};
-
-export default connect((state: RootState) => {
-  const isTeam = sessionSelectors.isTeam(state);
-
-  return {
-    user: state.user.user,
-    team: state.team.team,
-    workspace: state.session.workspace,
-    isTeam,
-    storageFilters: state.storage.filters,
-    currentFolderId: storageSelectors.currentFolderId(state),
-    plan: state.plan,
-  };
-})(Navbar);
diff --git a/src/app/core/components/Navbar/NavbarGlobalSearch.tsx b/src/app/core/components/Navbar/NavbarGlobalSearch.tsx
index 1d92db585..ee1a9056e 100644
--- a/src/app/core/components/Navbar/NavbarGlobalSearch.tsx
+++ b/src/app/core/components/Navbar/NavbarGlobalSearch.tsx
@@ -8,7 +8,6 @@ import { SearchResult } from '@internxt/sdk/dist/drive/storage/types';
 import { Gear, MagnifyingGlass, X } from '@phosphor-icons/react';
 import AccountPopover from './AccountPopover';
 import { PlanState } from '../../../store/slices/plan';
-import { Link } from 'react-router-dom';
 import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
 import iconService from 'app/drive/services/icon.service';
 import { useHotkeys } from 'react-hotkeys-hook';
@@ -23,6 +22,7 @@ import EmptyState from './EmptyState';
 import FilterItem from './FilterItem';
 import { getItemPlainName } from 'app/crypto/services/utils';
 import navigationService from 'app/core/services/navigation.service';
+import workspacesSelectors from 'app/store/slices/workspaces/workspaces.selectors';
 
 interface NavbarProps {
   user: UserSettings | undefined;
@@ -70,6 +70,7 @@ const Navbar = (props: NavbarProps) => {
   const doneTypingInterval = 200;
 
   const isGlobalSearch = useAppSelector((state: RootState) => state.ui.isGlobalSearch);
+  const selectedWorkspace = useAppSelector(workspacesSelectors.getSelectedWorkspace);
 
   useHotkeys(
     ['Meta+F', 'Control+F'],
@@ -127,14 +128,14 @@ const Navbar = (props: NavbarProps) => {
       isGlobalSearch && dispatch(storageThunks.resetNamePathThunk());
       dispatch(uiActions.setIsGlobalSearch(true));
 
-      navigationService.pushFolder(itemData.uuid);
+      navigationService.pushFolder(itemData.uuid, selectedWorkspace?.workspaceUser.workspaceId);
       searchInput.current?.blur();
       setQuery('');
       setSearchResult([]);
       setOpenSearchBox(false);
       setPreventBlur(false);
     } else {
-      navigationService.pushFile(itemData.uuid);
+      navigationService.pushFile(itemData.uuid, selectedWorkspace?.workspaceUser.workspaceId);
     }
   };
 
@@ -340,12 +341,19 @@ const Navbar = (props: NavbarProps) => {
       )}
 
       <div className="flex shrink-0">
-        <Link
-          to="/preferences"
+        <button
+          onClick={() => {
+            navigationService.openPreferencesDialog({
+              section: 'general',
+              subsection: 'general',
+              workspaceUuid: selectedWorkspace?.workspaceUser.workspaceId,
+            });
+            dispatch(uiActions.setIsPreferencesDialogOpen(true));
+          }}
           className="mr-5 flex h-10 w-10 items-center justify-center rounded-lg text-gray-80 hover:bg-gray-5 hover:text-gray-80 active:bg-gray-10"
         >
           <Gear size={24} />
-        </Link>
+        </button>
         <AccountPopover
           className="z-40 mr-5"
           user={user}
diff --git a/src/app/core/components/Sidenav/PendingInvitationsDialog.tsx b/src/app/core/components/Sidenav/PendingInvitationsDialog.tsx
new file mode 100644
index 000000000..83a01ac2c
--- /dev/null
+++ b/src/app/core/components/Sidenav/PendingInvitationsDialog.tsx
@@ -0,0 +1,130 @@
+import { PendingInvitesResponse } from '@internxt/sdk/dist/workspaces';
+import { CheckCircle, X } from '@phosphor-icons/react';
+import errorService from 'app/core/services/error.service';
+import localStorageService from 'app/core/services/local-storage.service';
+import workspacesService from 'app/core/services/workspace.service';
+import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
+import Button from 'app/shared/components/Button/Button';
+import Modal from 'app/shared/components/Modal';
+import { useAppDispatch } from 'app/store/hooks';
+import { workspaceThunks } from 'app/store/slices/workspaces/workspacesStore';
+import dayjs from 'dayjs';
+
+const PendingInvitationsDialog = ({
+  pendingWorkspacesInvites,
+  isDialogOpen,
+  onCloseDialog,
+  isLoading,
+  setIsLoading,
+}: {
+  pendingWorkspacesInvites: PendingInvitesResponse;
+  isDialogOpen: boolean;
+  onCloseDialog: () => void;
+  isLoading: boolean;
+  setIsLoading: (boolean) => void;
+}) => {
+  const dispatch = useAppDispatch();
+  const { translate } = useTranslationContext();
+  const token = localStorageService.get('xNewToken');
+
+  function formatDate(dateString) {
+    const date = dayjs(dateString);
+    const now = dayjs();
+
+    if (date.isSame(now, 'day')) {
+      return `${translate('modals.sharedInvitationsModal.todayAt')} ${date.format('HH:mm')}`;
+    } else {
+      return date.format('MMMM DD [at] HH:mm');
+    }
+  }
+
+  async function onAcceptInvitation(invitationId: string) {
+    setIsLoading(true);
+    try {
+      token && (await workspacesService.acceptWorkspaceInvite({ invitationId, token }));
+      dispatch(workspaceThunks.fetchWorkspaces());
+    } catch (err) {
+      const error = errorService.castError(err);
+      errorService.reportError(error);
+    } finally {
+      setIsLoading(false);
+    }
+  }
+
+  async function onDeclineInvitation(invitationId: string) {
+    setIsLoading(true);
+    try {
+      token && (await workspacesService.declineWorkspaceInvite({ invitationId, token }));
+    } catch (err) {
+      const error = errorService.castError(err);
+      errorService.reportError(error);
+    } finally {
+      setIsLoading(false);
+    }
+  }
+
+  return (
+    <Modal isOpen={isDialogOpen} onClose={onCloseDialog} className="p-0" maxWidth="max-w-xl">
+      <div className="flex w-full flex-col">
+        <div className="flex h-full max-h-12 w-full items-center justify-between rounded-t-xl border-b border-gray-10 px-5 py-8">
+          <p className="text-xl font-medium">{translate('workspaces.pendingInvitations.title')}</p>
+          <div className="flex h-full flex-col items-center justify-center">
+            <div className="flex h-9 w-9 cursor-pointer items-center justify-center rounded-md bg-black/0 transition-all duration-200 ease-in-out hover:bg-black/4 active:bg-black/8">
+              <X onClick={() => (isLoading ? null : onCloseDialog())} size={22} />
+            </div>
+          </div>
+        </div>
+        <div className="relative flex flex-col space-y-3 pb-24" style={{ minHeight: '377px', maxHeight: '700px' }}>
+          {pendingWorkspacesInvites.length === 0 ? (
+            <div className="absolute inset-0 flex items-center justify-center">
+              <div className="flex flex-col items-center justify-center space-y-1 rounded-2xl bg-gray-5 p-6 text-lg font-medium text-gray-50">
+                <CheckCircle weight="thin" size={64} />
+                <span>{translate('workspaces.pendingInvitations.empty')}</span>
+              </div>
+            </div>
+          ) : (
+            <div className="flex flex-col px-5 pt-2">
+              {pendingWorkspacesInvites.map((invitation) => {
+                return (
+                  <div
+                    key={invitation.id}
+                    className="flex w-full flex-col space-y-3.5"
+                    style={{ transition: 'opacity 0.3s ease' }}
+                  >
+                    <div className="flex flex-row justify-between pt-3.5">
+                      <div className="flex w-full max-w-[263px] flex-row items-center space-x-2.5">
+                        <div className="flex max-w-xxs flex-col truncate">
+                          <p className="truncate font-medium text-gray-100">{invitation.workspace.name}</p>
+                          <p className="truncate text-sm text-gray-50">
+                            {translate('workspaces.pendingInvitations.invitedOn')}
+                            {': '}
+                            {formatDate(invitation.workspace.createdAt)}
+                          </p>
+                        </div>
+                      </div>
+                      <div className="flex flex-row items-center space-x-1.5">
+                        <Button
+                          variant="secondary"
+                          onClick={() => onDeclineInvitation(invitation.id)}
+                          disabled={isLoading}
+                        >
+                          {translate('workspaces.pendingInvitations.deny')}
+                        </Button>
+                        <Button onClick={() => onAcceptInvitation(invitation.id)} loading={isLoading}>
+                          {translate('workspaces.pendingInvitations.accept')}
+                        </Button>
+                      </div>
+                    </div>
+                    <div className="flex w-full border border-gray-5" />
+                  </div>
+                );
+              })}
+            </div>
+          )}
+        </div>
+      </div>
+    </Modal>
+  );
+};
+
+export default PendingInvitationsDialog;
diff --git a/src/app/core/components/Sidenav/Sidenav.tsx b/src/app/core/components/Sidenav/Sidenav.tsx
index ceec039cb..6271c6b3f 100644
--- a/src/app/core/components/Sidenav/Sidenav.tsx
+++ b/src/app/core/components/Sidenav/Sidenav.tsx
@@ -1,5 +1,5 @@
 import { Clock, ClockCounterClockwise, Desktop, FolderSimple, Trash, Users } from '@phosphor-icons/react';
-import { connect } from 'react-redux';
+import { connect, useSelector } from 'react-redux';
 
 import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
 import desktopService from 'app/core/services/desktop.service';
@@ -17,6 +17,9 @@ import notificationsService, { ToastType } from 'app/notifications/services/noti
 import ReferralsWidget from 'app/referrals/components/ReferralsWidget/ReferralsWidget';
 import { useAppSelector } from 'app/store/hooks';
 
+import workspacesSelectors from '../../../store/slices/workspaces/workspaces.selectors';
+import WorkspaceSelectorContainer from './WorkspaceSelectorContainer';
+
 interface SidenavProps {
   user: UserSettings | undefined;
   subscription: UserSubscription | null;
@@ -27,7 +30,9 @@ interface SidenavProps {
 }
 
 const Sidenav = (props: SidenavProps) => {
+  const { user } = props;
   const { translate } = useTranslationContext();
+  const isB2BWorskpace = !!useSelector(workspacesSelectors.getSelectedWorkspace);
 
   const onDownloadAppButtonClicked = (): void => {
     const getDownloadApp = async () => {
@@ -50,7 +55,7 @@ const Sidenav = (props: SidenavProps) => {
     navigationService.push(AppView.Drive);
   };
 
-  const { planUsage, planLimit, isLoadingPlanLimit, isLoadingPlanUsage } = props;
+  const { subscription, planUsage, planLimit, isLoadingPlanLimit, isLoadingPlanUsage } = props;
 
   const pendingInvitations = useAppSelector((state: RootState) => state.shared.pendingInvitations);
 
@@ -64,24 +69,31 @@ const Sidenav = (props: SidenavProps) => {
       </div>
       <div className="flex grow flex-col overflow-x-auto border-r border-gray-5 px-2">
         <div className="mt-2">
+          {user && <WorkspaceSelectorContainer user={user} />}
           <SidenavItem label={translate('sideNav.drive')} to="/" Icon={FolderSimple} iconDataCy="sideNavDriveIcon" />
-          <SidenavItem label={translate('sideNav.backups')} to="/backups" Icon={ClockCounterClockwise} />
+          {!isB2BWorskpace && (
+            <SidenavItem label={translate('sideNav.backups')} to="/backups" Icon={ClockCounterClockwise} />
+          )}
           <SidenavItem
             label={translate('sideNav.shared')}
             to="/shared"
             Icon={Users}
             notifications={pendingInvitations.length}
+            isB2BWorskpace={isB2BWorskpace}
           />
-          <SidenavItem label={translate('sideNav.recents')} to="/recents" Icon={Clock} />
+          {!isB2BWorskpace && <SidenavItem label={translate('sideNav.recents')} to="/recents" Icon={Clock} />}
           <SidenavItem label={translate('sideNav.trash')} to="/trash" Icon={Trash} />
-          <SidenavItem label={translate('sideNav.desktop')} Icon={Desktop} onClick={onDownloadAppButtonClicked} />
+          {!isB2BWorskpace && (
+            <SidenavItem label={translate('sideNav.desktop')} Icon={Desktop} onClick={onDownloadAppButtonClicked} />
+          )}
         </div>
-        {props.subscription && props.subscription.type === 'free' ? <ReferralsWidget /> : <div className="grow"></div>}
+        {subscription && subscription.type === 'free' ? <ReferralsWidget /> : <div className="grow"></div>}
 
         <div className="mb-11 mt-8 px-5">
           <PlanUsage
             limit={planLimit}
             usage={planUsage}
+            subscriptionType={subscription?.type}
             isLoading={isLoadingPlanUsage || isLoadingPlanLimit}
           ></PlanUsage>
         </div>
@@ -92,8 +104,8 @@ const Sidenav = (props: SidenavProps) => {
 
 export default connect((state: RootState) => ({
   user: state.user.user,
-  planUsage: state.plan.planUsage,
-  subscription: state.plan.subscription,
+  subscription: planSelectors.subscriptionToShow(state),
+  planUsage: planSelectors.planUsageToShow(state),
   planLimit: planSelectors.planLimitToShow(state),
   isLoadingPlanLimit: state.plan.isLoadingPlanLimit,
   isLoadingPlanUsage: state.plan.isLoadingPlanUsage,
diff --git a/src/app/core/components/Sidenav/SidenavItem/SidenavItem.tsx b/src/app/core/components/Sidenav/SidenavItem/SidenavItem.tsx
index 7d7916427..28e15f348 100644
--- a/src/app/core/components/Sidenav/SidenavItem/SidenavItem.tsx
+++ b/src/app/core/components/Sidenav/SidenavItem/SidenavItem.tsx
@@ -11,6 +11,7 @@ interface SidenavItemProps {
   Icon: React.ForwardRefExoticComponent<IconProps & React.RefAttributes<SVGSVGElement>>;
   onClick?: () => void;
   iconDataCy?: string;
+  isB2BWorskpace?: boolean;
 }
 
 const SidenavItem = ({
@@ -21,6 +22,7 @@ const SidenavItem = ({
   showNew,
   notifications,
   iconDataCy,
+  isB2BWorskpace,
 }: SidenavItemProps): JSX.Element => {
   const isActive = !!matchPath(window.location.pathname, { path: to, exact: true });
 
@@ -44,7 +46,7 @@ const SidenavItem = ({
           <p className="leading-5">{translate('general.new')}</p>
         </div>
       )}
-      {!!notifications && (
+      {!isB2BWorskpace && !!notifications && (
         <div className="flex h-5 min-w-[20px] items-center justify-center rounded-full bg-primary px-1.5 text-xs text-white">
           <span>{notifications}</span>
         </div>
diff --git a/src/app/core/components/Sidenav/WorkspaceSelector.tsx b/src/app/core/components/Sidenav/WorkspaceSelector.tsx
new file mode 100644
index 000000000..0e701f6f4
--- /dev/null
+++ b/src/app/core/components/Sidenav/WorkspaceSelector.tsx
@@ -0,0 +1,198 @@
+import { CaretUpDown, Check, Icon } from '@phosphor-icons/react';
+import { useEffect, useRef } from 'react';
+
+import { useTranslationContext } from '../../../i18n/provider/TranslationProvider';
+import WorkspaceAvatarWrapper from '../../../newSettings/Sections/Workspace/Overview/components/WorkspaceAvatarWrapper';
+
+export interface Workspace {
+  uuid: string;
+  name: string;
+  type: 'Business' | 'Personal';
+  avatar: string | null;
+  isPending?: boolean;
+}
+
+interface WorkspaceSelectorProps {
+  userWorkspace: Workspace;
+  workspaces: Workspace[];
+  onCreateWorkspaceButtonClicked: () => void;
+  onChangeWorkspace: (workspaceId: string | null) => void;
+  selectedWorkspace: Workspace | null;
+  setIsDialogOpen: (boolean) => void;
+  pendingWorkspacesInvitesLength: number;
+  isWorkspaceSelectorOpen: boolean;
+  setIsWorkspaceSelectorOpen: (isWorkspaceSelectorOpen) => void;
+}
+
+const WorkspaceCard = ({
+  workspace,
+  isSelected,
+  Icon,
+  onClick,
+  translate,
+}: {
+  workspace: Workspace;
+  isSelected: boolean;
+  onClick: (workspace: Workspace) => void;
+  Icon: Icon;
+  translate: (key: string, props?: Record<string, unknown> | undefined) => string;
+}) => {
+  const handleOnClick = () => {
+    onClick(workspace);
+  };
+
+  return (
+    <button className="w-full px-2 py-3 text-left hover:bg-gray-5 dark:hover:bg-gray-10" onClick={handleOnClick}>
+      <div className="flex w-full flex-row items-center justify-between space-x-2">
+        <WorkspaceAvatarWrapper
+          diameter={28}
+          workspaceId={workspace.uuid}
+          fullName={workspace.name}
+          avatarSrcURL={workspace.avatar}
+        />
+        <div className="flex grow flex-col truncate">
+          <p className="truncate text-sm font-medium leading-4 text-gray-100">{workspace.name}</p>
+          <p className="truncate text-xs font-medium leading-3 text-gray-60">
+            {translate(`workspaces.workspaceTypes.${workspace.type.toLocaleLowerCase()}`)}
+          </p>
+        </div>
+        <div className="h-4 w-4">{isSelected && <Icon colorRendering="bg-gray-100" weight="bold" size={16} />}</div>
+      </div>
+    </button>
+  );
+};
+
+const WorkspaceSelector: React.FC<WorkspaceSelectorProps> = ({
+  userWorkspace,
+  workspaces,
+  onCreateWorkspaceButtonClicked,
+  onChangeWorkspace,
+  setIsDialogOpen,
+  pendingWorkspacesInvitesLength,
+  selectedWorkspace,
+  isWorkspaceSelectorOpen,
+  setIsWorkspaceSelectorOpen,
+}) => {
+  const dropdownRef = useRef<HTMLInputElement>(null);
+
+  const { translate } = useTranslationContext();
+
+  const toggleDropdown = () => {
+    setIsWorkspaceSelectorOpen(!isWorkspaceSelectorOpen);
+  };
+
+  const handleWorkspaceClick = (workspace: Workspace | null) => {
+    if (workspace?.type === 'Personal') {
+      onChangeWorkspace(null);
+    } else {
+      onChangeWorkspace(workspace?.uuid ?? null);
+    }
+    setIsWorkspaceSelectorOpen(false);
+  };
+
+  useEffect(() => {
+    const handleClickOutside = (event) => {
+      if (dropdownRef.current && !dropdownRef.current.contains(event.target)) {
+        setIsWorkspaceSelectorOpen(false);
+      }
+    };
+    document.addEventListener('mousedown', handleClickOutside);
+    return () => {
+      document.removeEventListener('mousedown', handleClickOutside);
+    };
+  });
+
+  return (
+    <div className="relative mb-2 inline-block w-full" ref={dropdownRef}>
+      {/* TOGGLE BUTTON */}
+      <button
+        className={`w-full justify-center rounded-lg border border-gray-10 ${
+          isWorkspaceSelectorOpen ? 'bg-gray-1' : 'bg-surface'
+        } p-3 text-left dark:bg-gray-5`}
+        onClick={toggleDropdown}
+      >
+        <div className="flex w-full flex-row items-center justify-between space-x-2">
+          <WorkspaceAvatarWrapper
+            diameter={28}
+            workspaceId={selectedWorkspace?.uuid ?? ''}
+            fullName={selectedWorkspace?.name ?? ''}
+            avatarSrcURL={selectedWorkspace?.avatar ?? null}
+          />
+          <div className="flex grow flex-col truncate">
+            <p className="truncate text-sm font-medium leading-4 text-gray-100">{selectedWorkspace?.name}</p>
+            <p className="truncate text-xs font-medium leading-3 text-gray-60">
+              {translate(`workspaces.workspaceTypes.${selectedWorkspace?.type?.toLocaleLowerCase()}`)}
+            </p>
+          </div>
+          <div className="w-4">
+            <CaretUpDown colorRendering="bg-gray-100" weight="bold" size={16} />
+          </div>
+        </div>
+      </button>
+      {/* DROPDOWN LIST */}
+      <div
+        className={`fixed left-2 z-50 w-72 overflow-hidden transition-all duration-300 ease-in-out ${
+          isWorkspaceSelectorOpen ? 'max-h-screen opacity-100' : 'max-h-0 opacity-0'
+        }`}
+      >
+        <div className="h-1"></div>
+        <div
+          className={`rounded-lg border border-gray-10 bg-surface shadow-xl dark:bg-gray-5 ${
+            isWorkspaceSelectorOpen ? 'block' : 'hidden'
+          }`}
+        >
+          <p className="px-2 pt-3 text-sm font-medium text-gray-100">{translate('workspaces.workspaces')}</p>
+          <WorkspaceCard
+            key={`${userWorkspace.name}-${userWorkspace.type}`}
+            workspace={{
+              name: userWorkspace.name,
+              uuid: userWorkspace.uuid,
+              type: 'Personal',
+              avatar: userWorkspace.avatar,
+            }}
+            isSelected={selectedWorkspace?.uuid === userWorkspace.uuid}
+            Icon={Check}
+            onClick={handleWorkspaceClick}
+            translate={translate}
+          />
+          {workspaces.map((workspace) => (
+            <WorkspaceCard
+              key={`${workspace.name}-${workspace.type}`}
+              workspace={{
+                name: workspace.name,
+                uuid: workspace.uuid,
+                type: workspace.type,
+                avatar: workspace.avatar,
+              }}
+              isSelected={selectedWorkspace?.uuid === workspace.uuid}
+              Icon={Check}
+              onClick={handleWorkspaceClick}
+              translate={translate}
+            />
+          ))}
+          {/* NOT USING FOR THE MOMENT */}
+          <div className="mx-3 h-px bg-gray-10"></div>
+          {/* <button
+            className="w-full rounded-b-lg px-2 py-3 text-left text-sm font-medium leading-4 text-gray-100 hover:bg-gray-5 dark:hover:bg-gray-10"
+            onClick={onCreateWorkspaceButtonClicked}
+          >
+            {translate('workspaces.createWorkspace')}
+          </button> */}
+          {pendingWorkspacesInvitesLength > 0 && (
+            <button
+              className="flex w-full items-center space-x-2 rounded-b-lg px-2 py-3 text-left text-sm font-medium leading-4 text-gray-100 hover:bg-gray-5 dark:hover:bg-gray-10"
+              onClick={() => setIsDialogOpen(true)}
+            >
+              <span>{translate('workspaces.pending')}</span>
+              <span className="flex h-5 min-w-[20px] items-center justify-center rounded-full bg-primary px-1.5 text-xs text-white">
+                {pendingWorkspacesInvitesLength}
+              </span>
+            </button>
+          )}
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default WorkspaceSelector;
diff --git a/src/app/core/components/Sidenav/WorkspaceSelectorContainer.tsx b/src/app/core/components/Sidenav/WorkspaceSelectorContainer.tsx
new file mode 100644
index 000000000..4952a3bf6
--- /dev/null
+++ b/src/app/core/components/Sidenav/WorkspaceSelectorContainer.tsx
@@ -0,0 +1,111 @@
+import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
+import { PendingInvitesResponse, PendingWorkspace, WorkspaceData } from '@internxt/sdk/dist/workspaces';
+import { planThunks } from 'app/store/slices/plan';
+import { useEffect, useState } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import PendingInvitationsDialog from '../../../core/components/Sidenav/PendingInvitationsDialog';
+import errorService from '../../../core/services/error.service';
+import workspacesService from '../../../core/services/workspace.service';
+import { RootState } from '../../../store';
+import { workspaceThunks } from '../../../store/slices/workspaces/workspacesStore';
+import WorkspaceSelector, { Workspace } from './WorkspaceSelector';
+
+const WorkspaceSelectorContainer = ({ user }: { user: UserSettings | undefined }) => {
+  const dispatch = useDispatch();
+  const workspaces = useSelector((state: RootState) => state.workspaces.workspaces);
+  const selectedWorkspace = useSelector((state: RootState) => state.workspaces.selectedWorkspace);
+  const pendingWorkspaces = useSelector((state: RootState) => state.workspaces.pendingWorkspaces);
+  const parsedWorkspaces = parseWorkspaces(workspaces);
+  const parsedPendingWorkspaces = parsePendingWorkspaces(pendingWorkspaces);
+  const allParsedWorkspaces = [...parsedWorkspaces, ...parsedPendingWorkspaces];
+  const [pendingWorkspacesInvites, setPendingWorkspacesInvites] = useState<PendingInvitesResponse>([]);
+  const [isDialogOpen, setIsDialogOpen] = useState<boolean>(false);
+  const [isLoading, setIsLoading] = useState<boolean>(false);
+  const [isWorkspaceSelectorOpen, setIsWorkspaceSelectorOpen] = useState<boolean>(false);
+
+  useEffect(() => {
+    (isDialogOpen || isWorkspaceSelectorOpen) && getPendingInvites();
+  }, [isLoading, isWorkspaceSelectorOpen]);
+
+  const getPendingInvites = async () => {
+    try {
+      const pendingWorkspacesInvites = await workspacesService.getPendingInvites();
+      setPendingWorkspacesInvites(pendingWorkspacesInvites);
+    } catch (error) {
+      errorService.reportError(error);
+    }
+  };
+
+  const handleWorkspaceChange = (workspaceId: string | null) => {
+    const selectedWorkspace = allParsedWorkspaces.find((workspace) => workspace.uuid === workspaceId);
+
+    if (selectedWorkspace?.isPending) {
+      const selectedPendingWorkspace = pendingWorkspaces.find((workspace) => workspace.id === selectedWorkspace.uuid);
+
+      selectedPendingWorkspace &&
+        dispatch(workspaceThunks.setupWorkspace({ pendingWorkspace: selectedPendingWorkspace }));
+      return;
+    }
+    dispatch(workspaceThunks.setSelectedWorkspace({ workspaceId }));
+    dispatch(planThunks.fetchBusinessLimitUsageThunk());
+  };
+
+  if (!user) return null;
+
+  const onCloseDialog = () => {
+    setIsDialogOpen(false);
+  };
+
+  const userWorkspace: Workspace = {
+    name: user.name,
+    type: 'Personal',
+    uuid: user.uuid,
+    avatar: user?.avatar,
+  };
+
+  return (
+    <>
+      <PendingInvitationsDialog
+        pendingWorkspacesInvites={pendingWorkspacesInvites}
+        isDialogOpen={isDialogOpen}
+        onCloseDialog={onCloseDialog}
+        isLoading={isLoading}
+        setIsLoading={setIsLoading}
+      />
+      <WorkspaceSelector
+        userWorkspace={userWorkspace}
+        workspaces={allParsedWorkspaces}
+        onChangeWorkspace={handleWorkspaceChange}
+        onCreateWorkspaceButtonClicked={() => undefined}
+        selectedWorkspace={selectedWorkspace ? parseWorkspaces([selectedWorkspace])[0] : userWorkspace}
+        pendingWorkspacesInvitesLength={pendingWorkspacesInvites.length}
+        setIsDialogOpen={setIsDialogOpen}
+        isWorkspaceSelectorOpen={isWorkspaceSelectorOpen}
+        setIsWorkspaceSelectorOpen={setIsWorkspaceSelectorOpen}
+      />
+    </>
+  );
+};
+
+const parseWorkspaces = (workspaces: WorkspaceData[]): Workspace[] =>
+  workspaces?.map((workspace) => {
+    return {
+      name: workspace.workspace.name,
+      uuid: workspace.workspace.id,
+      type: 'Business',
+      avatar: workspace.workspace.avatar,
+    };
+  });
+
+const parsePendingWorkspaces = (workspaces: PendingWorkspace[]): Workspace[] =>
+  workspaces?.map((workspace) => {
+    return {
+      name: workspace.name,
+      uuid: workspace.id,
+      type: 'Business',
+      isPending: true,
+      avatar: null,
+    };
+  });
+
+export default WorkspaceSelectorContainer;
diff --git a/src/app/core/config/app.json b/src/app/core/config/app.json
index 40a90e017..53694985c 100644
--- a/src/app/core/config/app.json
+++ b/src/app/core/config/app.json
@@ -16,7 +16,7 @@
   },
   "database": {
     "name": "app-database",
-    "version": 5,
+    "version": 6,
     "provider": "indexed-db"
   }
 }
diff --git a/src/app/core/config/views.ts b/src/app/core/config/views.ts
index 25615dd02..c730d1ce9 100644
--- a/src/app/core/config/views.ts
+++ b/src/app/core/config/views.ts
@@ -2,35 +2,34 @@ import { ComponentClass, FunctionComponent } from 'react';
 
 import { AppView } from '../types';
 
-import AuthView from 'app/auth/views/Auth/AuthView';
-import ButtonAuth from 'app/auth/views/Auth/ButtonAuth';
-import SignupBlog from 'app/auth/views/Auth/SignupBlog';
-import BlockedAccountView from 'app/auth/views/BlockedAccountView/BlockedAccountView';
-import RecoverAccountView from 'app/auth/views/RecoverAccountView/RecoverAccountView';
-import RecoveryLinkView from 'app/auth/views/RecoveryLinkView/RecoveryLinkView';
-import SignInView from 'app/auth/views/SignInView/SignInView';
-import SignUpView from 'app/auth/views/SignUpView/SignUpView';
-import UniversalLinkSuccessView from 'app/auth/views/UnivesalLinkSuccessView/UniversalLinkSuccessView';
-import BackupsView from 'app/backups/views/BackupsView/BackupsView';
-import DeactivationView from 'app/core/views/DeactivationView/DeactivationView';
-import Preferences from 'app/core/views/Preferences';
-import DriveView from 'app/drive/views/DriveView/DriveView';
-import FolderFileNotFound from 'app/drive/views/FolderFileNotFound/FolderFileNotFound';
-import RecentsView from 'app/drive/views/RecentsView/RecentsView';
-import RequestAccess from 'app/drive/views/RequestAccess/RequestAccess';
-import TrashView from 'app/drive/views/TrashView/TrashView';
-import GuestAcceptInvitationView from 'app/guests/views/GuestAcceptInviteView/GuestAcceptInviteView';
-import CheckoutCancelView from 'app/payment/views/CheckoutCancelView/CheckoutCancelView';
-import CheckoutSuccessView from 'app/payment/views/CheckoutSuccessView/CheckoutSuccessView';
-import CheckoutPlanView from 'app/payment/views/CheckoutView/CheckoutPlanView';
-import CheckoutView from 'app/payment/views/CheckoutView/CheckoutView';
-import ShareFileView from 'app/share/views/ShareView/ShareFileView';
-import DeactivationTeamsView from 'app/teams/views/DeactivationTeamsView/DeactivationTeamsView';
-import JoinTeamView from 'app/teams/views/JoinTeamView/JoinTeamView';
-import TeamSuccessView from 'app/teams/views/TeamSuccessView/TeamSuccessView';
+import AuthView from '../../auth/views/Auth/AuthView';
+import ButtonAuth from '../../auth/views/Auth/ButtonAuth';
+import SignupBlog from '../../auth/views/Auth/SignupBlog';
+import BlockedAccountView from '../../auth/views/BlockedAccountView/BlockedAccountView';
+import RecoverAccountView from '../../auth/views/RecoverAccountView/RecoverAccountView';
+import RecoveryLinkView from '../../auth/views/RecoveryLinkView/RecoveryLinkView';
+import SignInView from '../../auth/views/SignInView/SignInView';
+import SignUpView from '../../auth/views/SignUpView/SignUpView';
+import UniversalLinkSuccessView from '../../auth/views/UnivesalLinkSuccessView/UniversalLinkSuccessView';
+import BackupsView from '../../backups/views/BackupsView/BackupsView';
+import DeactivationView from '../../core/views/DeactivationView/DeactivationView';
+import DriveView from '../../drive/views/DriveView/DriveView';
+import FolderFileNotFound from '../../drive/views/FolderFileNotFound/FolderFileNotFound';
+import RecentsView from '../../drive/views/RecentsView/RecentsView';
+import RequestAccess from '../../drive/views/RequestAccess/RequestAccess';
+import TrashView from '../../drive/views/TrashView/TrashView';
+import GuestAcceptInvitationView from '../../guests/views/GuestAcceptInviteView/GuestAcceptInviteView';
+import CheckoutCancelView from '../../payment/views/CheckoutCancelView/CheckoutCancelView';
+import CheckoutSuccessView from '../../payment/views/CheckoutSuccessView/CheckoutSuccessView';
+import CheckoutPlanView from '../../payment/views/CheckoutView/CheckoutPlanView';
+import CheckoutView from '../../payment/views/CheckoutView/CheckoutView';
+import ShareFileView from '../../share/views/ShareView/ShareFileView';
+import DeactivationTeamsView from '../../teams/views/DeactivationTeamsView/DeactivationTeamsView';
+import JoinTeamView from '../../teams/views/JoinTeamView/JoinTeamView';
+import TeamSuccessView from '../../teams/views/TeamSuccessView/TeamSuccessView';
+import WorkspaceGuestSingUpView from '../../auth/components/SignUp/WorkspaceGuestSignUp';
 import RedirectToAppView from '../../core/views/RedirectToAppView/RedirectToAppView';
 import ShareFolderView from '../../share/views/ShareView/ShareFolderView';
-import SharePhotosView from '../../share/views/ShareView/SharePhotosView';
 import ShareGuestSingUpView from '../../share/views/SharedGuestSignUp/ShareGuestSingUpView';
 import SharedViewWrapper from '../../share/views/SharedLinksView/SharedViewWrapper';
 import ChangeEmailView from '../views/ChangeEmailView';
@@ -49,6 +48,7 @@ const views: Array<{
   { id: AppView.Login, component: SignInView },
   { id: AppView.SignupBlog, component: SignupBlog },
   { id: AppView.ShareGuestAcceptInvite, component: ShareGuestSingUpView },
+  { id: AppView.WorkspaceGuestInvite, component: WorkspaceGuestSingUpView },
   { id: AppView.Auth, component: AuthView },
   { id: AppView.ButtonAuth, component: ButtonAuth },
   { id: AppView.RecoverAccount, component: RecoverAccountView },
@@ -56,7 +56,6 @@ const views: Array<{
   { id: AppView.Trash, component: TrashView },
   { id: AppView.Backups, component: BackupsView },
   { id: AppView.Shared, component: SharedViewWrapper },
-  { id: AppView.Preferences, component: Preferences },
   { id: AppView.FolderFileNotFound, component: FolderFileNotFound },
   { id: AppView.TeamsJoin, component: JoinTeamView },
   { id: AppView.GuestAcceptInvite, component: GuestAcceptInvitationView },
@@ -69,8 +68,9 @@ const views: Array<{
   { id: AppView.CheckoutPlan, component: CheckoutPlanView },
   { id: AppView.RecoveryLink, component: RecoveryLinkView },
   { id: AppView.ShareFileToken, component: ShareFileView },
+  { id: AppView.ShareFileToken2, component: ShareFileView },
   { id: AppView.ShareFolderToken, component: ShareFolderView },
-  { id: AppView.SharePhotosToken, component: SharePhotosView },
+  { id: AppView.ShareFolderToken2, component: ShareFolderView },
   { id: AppView.RedirectToApp, component: RedirectToAppView },
   { id: AppView.VerifyEmail, component: VerifyEmailView },
   { id: AppView.ChangeEmail, component: ChangeEmailView },
diff --git a/src/app/core/factory/sdk/index.ts b/src/app/core/factory/sdk/index.ts
index fcbfe988d..212979287 100644
--- a/src/app/core/factory/sdk/index.ts
+++ b/src/app/core/factory/sdk/index.ts
@@ -1,12 +1,12 @@
 import { Auth, Token } from '@internxt/sdk/dist/auth';
 import { Backups, Payments, Referrals, Share, Storage, Trash, Users } from '@internxt/sdk/dist/drive';
-import { Photos } from '@internxt/sdk/dist/photos';
 import { ApiSecurity, ApiUrl, AppDetails } from '@internxt/sdk/dist/shared';
+import { WorkspaceCredentialsDetails, Workspaces } from '@internxt/sdk/dist/workspaces';
 import packageJson from '../../../../../package.json';
 import authService from '../../../auth/services/auth.service';
 import { AppDispatch } from '../../../store';
 import { userThunks } from '../../../store/slices/user';
-import { LocalStorageService } from '../../services/local-storage.service';
+import { LocalStorageService, STORAGE_KEYS } from '../../services/local-storage.service';
 import { Workspace } from '../../types';
 
 export class SdkFactory {
@@ -73,6 +73,13 @@ export class SdkFactory {
     return Storage.client(apiUrl, appDetails, apiSecurity);
   }
 
+  public createWorkspacesClient(): Workspaces {
+    const apiUrl = this.getApiUrl();
+    const appDetails = SdkFactory.getAppDetails();
+    const apiSecurity = this.getNewApiSecurity();
+    return Workspaces.client(apiUrl, appDetails, apiSecurity);
+  }
+
   public createShareClient(): Share {
     const apiUrl = this.getApiUrl();
     const appDetails = SdkFactory.getAppDetails();
@@ -130,25 +137,14 @@ export class SdkFactory {
     return Backups.client(apiUrl, appDetails, apiSecurity);
   }
 
-  public async createPhotosClient(): Promise<Photos> {
-    if (!SdkFactory.sdk.localStorage.get('xToken')) {
-      return new Photos(process.env.REACT_APP_PHOTOS_API_URL);
-    }
-
-    let newToken = SdkFactory.sdk.localStorage.get('xNewToken');
-
-    if (!newToken) {
-      newToken = await authService.getNewToken();
-      SdkFactory.sdk.localStorage.set('xNewToken', newToken);
-    }
-    return new Photos(process.env.REACT_APP_PHOTOS_API_URL, newToken);
-  }
   /** Helpers **/
 
   private getApiSecurity(): ApiSecurity {
     const workspace = SdkFactory.sdk.localStorage.getWorkspace();
+    const workspaceToken = this.getWorkspaceToken();
     return {
       token: this.getToken(workspace),
+      workspaceToken,
       unauthorizedCallback: async () => {
         SdkFactory.sdk.dispatch(userThunks.logoutThunk());
       },
@@ -157,8 +153,10 @@ export class SdkFactory {
 
   private getNewApiSecurity(): ApiSecurity {
     const workspace = SdkFactory.sdk.localStorage.getWorkspace();
+    const workspaceToken = this.getWorkspaceToken();
     return {
       token: this.getNewToken(workspace),
+      workspaceToken,
       unauthorizedCallback: async () => {
         SdkFactory.sdk.dispatch(userThunks.logoutThunk());
       },
@@ -206,4 +204,18 @@ export class SdkFactory {
     };
     return tokenByWorkspace[workspace];
   }
+
+  private getWorkspaceToken(): Token | undefined {
+    const workspace = SdkFactory.sdk.localStorage.get(STORAGE_KEYS.B2B_WORKSPACE);
+    let token: string | undefined = undefined;
+    if (workspace) {
+      const credentials: WorkspaceCredentialsDetails | null = JSON.parse(
+        SdkFactory.sdk.localStorage.get(STORAGE_KEYS.WORKSPACE_CREDENTIALS) ?? 'null',
+      );
+      if (credentials) {
+        token = credentials.tokenHeader;
+      }
+    }
+    return token;
+  }
 }
diff --git a/src/app/core/plugins/sentry.plugin.ts b/src/app/core/plugins/sentry.plugin.ts
index deddfa370..01bb619c4 100644
--- a/src/app/core/plugins/sentry.plugin.ts
+++ b/src/app/core/plugins/sentry.plugin.ts
@@ -1,14 +1,14 @@
 import * as Sentry from '@sentry/react';
 import { BrowserTracing } from '@sentry/tracing';
-import { AppPlugin } from '../../core/types';
 import packageJson from '../../../../package.json';
+import { AppPlugin } from '../../core/types';
 
 const sentryPlugin: AppPlugin = {
   install(): void {
     Sentry.init({
       dsn: process.env.REACT_APP_SENTRY_DSN,
       integrations: [new BrowserTracing()],
-      tracesSampleRate: 1.0,
+      tracesSampleRate: 0.3,
       debug: process.env.NODE_ENV !== 'production' && process.env.REACT_APP_DEBUG === 'true',
       environment: process.env.NODE_ENV,
       release: packageJson.name + '@' + packageJson.version,
diff --git a/src/app/core/services/local-storage.service.ts b/src/app/core/services/local-storage.service.ts
index 801084d7e..1edf15109 100644
--- a/src/app/core/services/local-storage.service.ts
+++ b/src/app/core/services/local-storage.service.ts
@@ -1,9 +1,12 @@
 import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
+import { WorkspaceCredentialsDetails, WorkspaceData } from '@internxt/sdk/dist/workspaces';
 import { TeamsSettings } from '../../teams/types';
 import { Workspace } from '../types';
 
 export const STORAGE_KEYS = {
   TUTORIAL_COMPLETED_ID: 'signUpTutorialCompleted',
+  B2B_WORKSPACE: 'b2bWorkspace',
+  WORKSPACE_CREDENTIALS: 'workspace_credentials',
 };
 
 function get(key: string): string | null {
@@ -27,7 +30,25 @@ function getTeams(): TeamsSettings | null {
 }
 
 function getWorkspace(): string {
-  return localStorage.getItem('workspace') || Workspace.Individuals;
+  return localStorage.getItem('workspace') ?? Workspace.Individuals;
+}
+
+function getB2BWorkspace(): WorkspaceData | null {
+  const b2bWorkspace = localStorage.getItem(STORAGE_KEYS.B2B_WORKSPACE);
+  if (b2bWorkspace === 'null') return null;
+
+  if (b2bWorkspace) return JSON.parse(b2bWorkspace);
+
+  return null;
+}
+
+function getWorkspaceCredentials(): WorkspaceCredentialsDetails | null {
+  const workspaceCredentials = localStorage.getItem(STORAGE_KEYS.WORKSPACE_CREDENTIALS);
+  if (workspaceCredentials === 'null') return null;
+
+  if (workspaceCredentials) return JSON.parse(workspaceCredentials);
+
+  return null;
 }
 
 function removeItem(key: string): void {
@@ -59,6 +80,8 @@ function clear(): void {
   localStorage.removeItem('xInvitedToken');
   localStorage.removeItem('xResourcesToken');
   localStorage.removeItem('star_wars_theme_enabled');
+  localStorage.removeItem(STORAGE_KEYS.B2B_WORKSPACE);
+  localStorage.removeItem(STORAGE_KEYS.WORKSPACE_CREDENTIALS);
 }
 
 const localStorageService = {
@@ -71,6 +94,8 @@ const localStorageService = {
   removeItem,
   exists,
   clear,
+  getB2BWorkspace,
+  getWorkspaceCredentials,
 };
 
 export default localStorageService;
diff --git a/src/app/core/services/navigation.service.ts b/src/app/core/services/navigation.service.ts
index 89c9e8272..f6b157078 100644
--- a/src/app/core/services/navigation.service.ts
+++ b/src/app/core/services/navigation.service.ts
@@ -1,9 +1,11 @@
 import { BrowserHistoryBuildOptions, createBrowserHistory } from 'history';
 import queryString from 'query-string';
 
+import { SelectSectionProps } from 'app/newSettings/types/types';
 import { PATH_NAMES, serverPage } from '../../analytics/services/analytics.service';
 import { AppView } from '../types';
 import configService from './config.service';
+import errorService from './error.service';
 
 const browserHistoryConfig: BrowserHistoryBuildOptions = {
   forceRefresh: false,
@@ -41,11 +43,13 @@ const navigationService = {
 
     instance.push({ pathname: viewConfig?.path ?? 'view-not-found', search: viewSearch });
   },
-  pushFolder(uuid: string | undefined): void {
-    instance.push(`/folder/${uuid}`);
+  pushFolder(folderUuid: string | undefined, workspaceUuid?: string): void {
+    workspaceUuid
+      ? instance.push(`/folder/${folderUuid}?workspaceid=${workspaceUuid}`)
+      : instance.push(`/folder/${folderUuid}`);
   },
-  pushFile(uuid: string | undefined): void {
-    instance.push(`/file/${uuid}`);
+  pushFile(uuid: string | undefined, workspaceUuid?: string): void {
+    workspaceUuid ? instance.push(`/file/${uuid}?workspaceid=${workspaceUuid}`) : instance.push(`/file/${uuid}`);
   },
   isCurrentPath(path: string): boolean {
     const pathname = navigationService.history.location.pathname.split('/');
@@ -57,6 +61,26 @@ const navigationService = {
     const lastSegment = pathname[pathname.length - 1];
     return lastSegment;
   },
+  openPreferencesDialog({ section, subsection, workspaceUuid }: SelectSectionProps) {
+    workspaceUuid
+      ? instance.push(`?workspaceid=${workspaceUuid}&preferences=open&section=${section}&subsection=${subsection}`)
+      : instance.push(`?preferences=open&section=${section}&subsection=${subsection}`);
+  },
+  closePreferencesDialog({ workspaceUuid }: { workspaceUuid: string | undefined }) {
+    workspaceUuid
+      ? instance.push(`${navigationService.history.location.pathname}?workspaceid=${workspaceUuid}`)
+      : instance.push(navigationService.history.location.pathname);
+  },
+  replaceState(uuid: string | undefined): void {
+    try {
+      const pathname = navigationService.history.location.pathname.split('/');
+      pathname[pathname.length - 1] = uuid ?? '';
+      const newPathname = pathname.join('/');
+      window.history.replaceState(null, '', newPathname);
+    } catch (error) {
+      errorService.reportError(error);
+    }
+  },
 };
 
 export default navigationService;
diff --git a/src/app/core/services/workspace.service.ts b/src/app/core/services/workspace.service.ts
new file mode 100644
index 000000000..6b1648e61
--- /dev/null
+++ b/src/app/core/services/workspace.service.ts
@@ -0,0 +1,418 @@
+import { ListAllSharedFoldersResponse, SharingMeta } from '@internxt/sdk/dist/drive/share/types';
+import {
+  CreateFolderResponse,
+  DriveFileData,
+  FetchPaginatedFolderContentResponse,
+  FetchTrashContentResponse,
+} from '@internxt/sdk/dist/drive/storage/types';
+import { RequestCanceler } from '@internxt/sdk/dist/shared/http/types';
+import {
+  CreateFolderPayload,
+  CreateTeamData,
+  CreateWorkspaceSharingPayload,
+  FileEntry,
+  GetMemberDetailsResponse,
+  GetMemberUsageResponse,
+  InviteMemberBody,
+  ListWorkspaceSharedItemsResponse,
+  OrderByOptions,
+  PendingInvitesResponse,
+  Workspace,
+  WorkspaceCredentialsDetails,
+  WorkspaceMembers,
+  WorkspacePendingInvitations,
+  WorkspaceSetupInfo,
+  WorkspaceTeamResponse,
+  WorkspacesResponse,
+} from '@internxt/sdk/dist/workspaces';
+import { SdkFactory } from '../../core/factory/sdk';
+import errorService from '../../core/services/error.service';
+
+export function getWorkspaces(): Promise<WorkspacesResponse> {
+  const workspaceClient = SdkFactory.getNewApiInstance().createWorkspacesClient();
+  return workspaceClient.getWorkspaces().catch((error) => {
+    throw errorService.castError(error);
+  });
+}
+
+export function getWorkspacesMembers(workspaceId: string): Promise<WorkspaceMembers> {
+  const workspaceClient = SdkFactory.getNewApiInstance().createWorkspacesClient();
+  return workspaceClient.getWorkspacesMembers(workspaceId).catch((error) => {
+    throw errorService.castError(error);
+  });
+}
+
+export function getWorkspaceTeams(workspaceId: string): Promise<WorkspaceTeamResponse> {
+  const workspaceClient = SdkFactory.getNewApiInstance().createWorkspacesClient();
+  return workspaceClient.getWorkspacesTeams(workspaceId).catch((error) => {
+    throw errorService.castError(error);
+  });
+}
+
+export function getTeamMembers(workspaceId: string, teamId: string): Promise<void> {
+  const workspaceClient = SdkFactory.getNewApiInstance().createWorkspacesClient();
+  return workspaceClient.getWorkspacesTeamMembers(workspaceId, teamId).catch((error) => {
+    throw errorService.castError(error);
+  });
+}
+
+export function getMemberDetails(workspaceId: string, memberId: string): Promise<GetMemberDetailsResponse> {
+  const workspaceClient = SdkFactory.getNewApiInstance().createWorkspacesClient();
+  return workspaceClient.getMemberDetails(workspaceId, memberId).catch((error) => {
+    throw errorService.castError(error);
+  });
+}
+
+export function inviteUserToTeam(inviteUserBody: InviteMemberBody): Promise<void> {
+  const workspaceClient = SdkFactory.getNewApiInstance().createWorkspacesClient();
+  return workspaceClient.inviteMemberToWorkspace(inviteUserBody).catch((error) => {
+    throw errorService.castError(error);
+  });
+}
+
+export const processInvitation = async (
+  isDeclineAction: boolean,
+  invitationId: string,
+  token: string,
+): Promise<void> => {
+  const invitationData = {
+    invitationId,
+    token,
+  };
+
+  const response = isDeclineAction
+    ? await declineWorkspaceInvite(invitationData)
+    : await acceptWorkspaceInvite(invitationData);
+
+  return response;
+};
+
+export function acceptWorkspaceInvite({ invitationId, token }: { invitationId: string; token: string }): Promise<void> {
+  const shareClient = SdkFactory.getNewApiInstance().createWorkspacesClient();
+  return shareClient.acceptInvitation(invitationId, token).catch((error) => {
+    throw errorService.castError(error);
+  });
+}
+
+export function declineWorkspaceInvite({
+  invitationId,
+  token,
+}: {
+  invitationId: string;
+  token: string;
+}): Promise<void> {
+  const shareClient = SdkFactory.getNewApiInstance().createWorkspacesClient();
+  return shareClient.declineInvitation(invitationId, token).catch((error) => {
+    throw errorService.castError(error);
+  });
+}
+
+export function setupWorkspace(workspaceSetupInfo: WorkspaceSetupInfo): Promise<void> {
+  const workspaceClient = SdkFactory.getNewApiInstance().createWorkspacesClient();
+  return workspaceClient.setupWorkspace(workspaceSetupInfo).catch((error) => {
+    throw errorService.castError(error);
+  });
+}
+
+export async function editWorkspace(
+  workspaceId: string,
+  details: { name?: string; description?: string; address?: string },
+): Promise<void> {
+  const workspaceClient = SdkFactory.getNewApiInstance().createWorkspacesClient();
+  return workspaceClient.editWorkspace(workspaceId, details).catch((error) => {
+    throw errorService.castError(error);
+  });
+}
+
+export async function updateWorkspaceAvatar(workspaceId: string, avatar: Blob): Promise<{ avatar: string }> {
+  const workspaceClient = SdkFactory.getNewApiInstance().createWorkspacesClient();
+  return workspaceClient.updateAvatar(workspaceId, { avatar }).catch((error) => {
+    throw errorService.castError(error);
+  });
+}
+
+export async function deleteWorkspaceAvatar(workspaceId: string): Promise<void> {
+  const workspaceClient = SdkFactory.getNewApiInstance().createWorkspacesClient();
+  return workspaceClient.deleteAvatar(workspaceId).catch((error) => {
+    throw errorService.castError(error);
+  });
+}
+
+export function createTeam(createTeamData: CreateTeamData): Promise<void> {
+  const workspaceClient = SdkFactory.getNewApiInstance().createWorkspacesClient();
+  return workspaceClient.createTeam(createTeamData).catch((error) => {
+    throw errorService.castError(error);
+  });
+}
+
+export function editTeam(teamId: string, name: string): Promise<void> {
+  const workspaceClient = SdkFactory.getNewApiInstance().createWorkspacesClient();
+  return workspaceClient.editTeam({ teamId, name }).catch((error) => {
+    throw errorService.castError(error);
+  });
+}
+
+export function deleteTeam(teamId: string): Promise<void> {
+  const workspaceClient = SdkFactory.getNewApiInstance().createWorkspacesClient();
+  return workspaceClient.deleteTeam({ teamId }).catch((error) => {
+    throw errorService.castError(error);
+  });
+}
+
+export function addTeamUser(teamId: string, userUuid: string): Promise<void> {
+  const workspaceClient = SdkFactory.getNewApiInstance().createWorkspacesClient();
+  return workspaceClient.addTeamUser(teamId, userUuid).catch((error) => {
+    throw errorService.castError(error);
+  });
+}
+
+export function removeTeamUser(teamId: string, userUuid: string): Promise<void> {
+  const workspaceClient = SdkFactory.getNewApiInstance().createWorkspacesClient();
+  return workspaceClient.removeTeamUser(teamId, userUuid).catch((error) => {
+    throw errorService.castError(error);
+  });
+}
+
+export function changeTeamManager(teamId: string): Promise<void> {
+  const workspaceClient = SdkFactory.getNewApiInstance().createWorkspacesClient();
+  return workspaceClient.changeTeamManager(teamId).catch((error) => {
+    throw errorService.castError(error);
+  });
+}
+
+export function createFileEntry(
+  fileEntry: FileEntry,
+  workspaceId: string,
+  resourcesToken?: string,
+): Promise<DriveFileData> {
+  const workspaceClient = SdkFactory.getNewApiInstance().createWorkspacesClient();
+  return workspaceClient.createFileEntry(fileEntry, workspaceId, resourcesToken).catch((error) => {
+    throw errorService.castError(error);
+  });
+}
+
+export function createFolder(payload: CreateFolderPayload): [Promise<CreateFolderResponse>, RequestCanceler] {
+  const workspaceClient = SdkFactory.getNewApiInstance().createWorkspacesClient();
+  return workspaceClient.createFolder(payload);
+}
+
+export function getWorkspaceCredentials(workspaceId: string): Promise<WorkspaceCredentialsDetails> {
+  const workspaceClient = SdkFactory.getNewApiInstance().createWorkspacesClient();
+  return workspaceClient.getWorkspaceCredentials(workspaceId).catch((error) => {
+    throw errorService.castError(error);
+  });
+}
+
+export function changeUserRole({
+  teamId,
+  memberId,
+  role,
+}: {
+  teamId: string;
+  memberId: string;
+  role: string;
+}): Promise<void> {
+  const workspaceClient = SdkFactory.getNewApiInstance().createWorkspacesClient();
+  return workspaceClient.changeUserRole(teamId, memberId, role).catch((error) => {
+    throw errorService.castError(error);
+  });
+}
+
+export function getWorkspacePendingInvitations(
+  workspaceId: string,
+  limit: number,
+  offset: number,
+): Promise<WorkspacePendingInvitations[]> {
+  const workspaceClient = SdkFactory.getNewApiInstance().createWorkspacesClient();
+  return workspaceClient.getWorkspacePendingInvitations(workspaceId, limit, offset).catch((error) => {
+    throw errorService.castError(error);
+  });
+}
+export function getTrashItems(
+  workspaceId: string,
+  type: 'file' | 'folder',
+  offset,
+): Promise<FetchTrashContentResponse> {
+  const workspaceClient = SdkFactory.getNewApiInstance().createWorkspacesClient();
+  return workspaceClient.getPersonalTrash(workspaceId, type, offset).catch((error) => {
+    throw errorService.castError(error);
+  });
+}
+
+export function validateWorkspaceInvitation(inviteId: string): Promise<{ uuid: string }> {
+  const workspaceClient = SdkFactory.getNewApiInstance().createWorkspacesClient();
+  return workspaceClient.validateWorkspaceInvitation(inviteId).catch((error) => {
+    throw errorService.castError(error);
+  });
+}
+
+export function getPendingInvites(): Promise<PendingInvitesResponse> {
+  const workspaceClient = SdkFactory.getNewApiInstance().createWorkspacesClient();
+  return workspaceClient.getPendingInvites().catch((error) => {
+    throw errorService.castError(error);
+  });
+}
+export function emptyTrash(workspaceId: string): Promise<void> {
+  const workspaceClient = SdkFactory.getNewApiInstance().createWorkspacesClient();
+  return workspaceClient.emptyPersonalTrash(workspaceId).catch((error) => {
+    throw errorService.castError(error);
+  });
+}
+
+export function shareItemWithTeam(shareItemWithTeamPayload: CreateWorkspaceSharingPayload): Promise<SharingMeta> {
+  const workspaceClient = SdkFactory.getNewApiInstance().createWorkspacesClient();
+  return workspaceClient.shareItem(shareItemWithTeamPayload).catch((error) => {
+    throw errorService.castError(error);
+  });
+}
+
+export function getAllWorkspaceTeamSharedFolders(
+  workspaceId: string,
+  teamId: string,
+  orderBy?: OrderByOptions,
+): [Promise<ListAllSharedFoldersResponse>, RequestCanceler] {
+  const workspaceClient = SdkFactory.getNewApiInstance().createWorkspacesClient();
+  return workspaceClient.getWorkspaceTeamSharedFolders(workspaceId, teamId, orderBy);
+}
+
+export function getAllWorkspaceTeamSharedFiles(
+  workspaceId: string,
+  teamId: string,
+  orderBy?: OrderByOptions,
+): [Promise<ListAllSharedFoldersResponse>, RequestCanceler] {
+  const workspaceClient = SdkFactory.getNewApiInstance().createWorkspacesClient();
+  return workspaceClient.getWorkspaceTeamSharedFiles(workspaceId, teamId, orderBy);
+}
+
+export function getAllWorkspaceTeamSharedFolderFolders(
+  workspaceId: string,
+  teamId: string,
+  sharedFolderUUID: string,
+  page: number,
+  perPage: number,
+  token?: string,
+  orderBy?: OrderByOptions,
+): [Promise<ListWorkspaceSharedItemsResponse>, RequestCanceler] {
+  const workspaceClient = SdkFactory.getNewApiInstance().createWorkspacesClient();
+  return workspaceClient.getWorkspaceTeamSharedFolderFolders(
+    workspaceId,
+    teamId,
+    sharedFolderUUID,
+    page,
+    perPage,
+    token,
+    orderBy,
+  );
+}
+
+export function getAllWorkspaceTeamSharedFolderFiles(
+  workspaceId: string,
+  teamId: string,
+  sharedFolderUUID: string,
+  page: number,
+  perPage: number,
+  token?: string,
+  orderBy?: OrderByOptions,
+): [Promise<ListWorkspaceSharedItemsResponse>, RequestCanceler] {
+  const workspaceClient = SdkFactory.getNewApiInstance().createWorkspacesClient();
+  return workspaceClient.getWorkspaceTeamSharedFolderFiles(
+    workspaceId,
+    teamId,
+    sharedFolderUUID,
+    page,
+    perPage,
+    token,
+    orderBy,
+  );
+}
+
+export function getWorkspaceFolders(
+  workspaceId: string,
+  folderId: string,
+  offset: number,
+  limit: number,
+): [Promise<FetchPaginatedFolderContentResponse>, RequestCanceler] {
+  const workspaceClient = SdkFactory.getNewApiInstance().createWorkspacesClient();
+  return workspaceClient.getFolders(workspaceId, folderId, offset, limit, 'plainName', 'ASC');
+}
+export function getWorkspaceFiles(
+  workspaceId: string,
+  folderId: string,
+  offset: number,
+  limit: number,
+): [Promise<FetchPaginatedFolderContentResponse>, RequestCanceler] {
+  const workspaceClient = SdkFactory.getNewApiInstance().createWorkspacesClient();
+  return workspaceClient.getFiles(workspaceId, folderId, offset, limit, 'plainName', 'ASC');
+}
+
+export function deactivateMember(workspaceId: string, memberId: string): Promise<void> {
+  const workspaceClient = SdkFactory.getNewApiInstance().createWorkspacesClient();
+  return workspaceClient.deactivateMember(workspaceId, memberId).catch((error) => {
+    throw errorService.castError(error);
+  });
+}
+
+export function reactivateMember(workspaceId: string, memberId: string): Promise<void> {
+  const workspaceClient = SdkFactory.getNewApiInstance().createWorkspacesClient();
+  return workspaceClient.activateMember(workspaceId, memberId).catch((error) => {
+    throw errorService.castError(error);
+  });
+}
+
+export function getUsage(workspaceId: string): Promise<GetMemberUsageResponse> {
+  const workspaceClient = SdkFactory.getNewApiInstance().createWorkspacesClient();
+  return workspaceClient.getMemberUsage(workspaceId).catch((error) => {
+    throw errorService.castError(error);
+  });
+}
+
+export function getWorkspace(workspaceId: string): Promise<Workspace> {
+  const workspaceClient = SdkFactory.getNewApiInstance().createWorkspacesClient();
+  return workspaceClient.getWorkspace(workspaceId).catch((error) => {
+    throw errorService.castError(error);
+  });
+}
+
+const workspacesService = {
+  getWorkspaces,
+  getWorkspacesMembers,
+  getWorkspaceTeams,
+  getTeamMembers,
+  getMemberDetails,
+  inviteUserToTeam,
+  setupWorkspace,
+  editWorkspace,
+  updateWorkspaceAvatar,
+  deleteWorkspaceAvatar,
+  createTeam,
+  editTeam,
+  deleteTeam,
+  addTeamUser,
+  removeTeamUser,
+  changeTeamManager,
+  changeUserRole,
+  processInvitation,
+  createFileEntry,
+  createFolder,
+  getWorkspaceCredentials,
+  getWorkspacePendingInvitations,
+  validateWorkspaceInvitation,
+  getPendingInvites,
+  acceptWorkspaceInvite,
+  declineWorkspaceInvite,
+  getTrashItems,
+  emptyTrash,
+  shareItemWithTeam,
+  getAllWorkspaceTeamSharedFiles,
+  getAllWorkspaceTeamSharedFolders,
+  getAllWorkspaceTeamSharedFolderFiles,
+  getAllWorkspaceTeamSharedFolderFolders,
+  getWorkspaceFolders,
+  getWorkspaceFiles,
+  deactivateMember,
+  reactivateMember,
+  getUsage,
+  getWorkspace,
+};
+
+export default workspacesService;
diff --git a/src/app/core/services/zip.service.ts b/src/app/core/services/zip.service.ts
index f1ca32870..4025985dd 100644
--- a/src/app/core/services/zip.service.ts
+++ b/src/app/core/services/zip.service.ts
@@ -1,8 +1,9 @@
 import fileDownload from 'js-file-download';
 import streamSaver from 'streamsaver';
+import { AsyncZipDeflate, Zip } from 'fflate';
 
 import browserService from './browser.service';
-import { binaryStreamToBlob, buildProgressStream } from './stream.service';
+import { binaryStreamToBlob } from './stream.service';
 
 type FlatFolderZipOpts = {
   abortController?: AbortController;
@@ -18,11 +19,13 @@ export class FlatFolderZip {
 
   constructor(folderName: string, opts: FlatFolderZipOpts) {
     this.folderName = folderName;
-    this.zip = createFolderWithFilesWritable();
+
+    console.info('Using fast method for creating a zip');
+    this.zip = createFolderWithFilesWritable(opts.progress);
     this.abortController = opts.abortController;
 
     // TODO: check why opts.progress is causing zip corruption
-    this.passThrough = opts.progress ? buildProgressStream(this.zip.stream, opts.progress) : this.zip.stream;
+    this.passThrough = this.zip.stream;
 
     if (browserService.isBrave()) return;
 
@@ -70,261 +73,6 @@ export class FlatFolderZip {
   }
 }
 
-interface FileLike {
-  name: string;
-  lastModified?: Date;
-  directory?: boolean;
-  comment?: string;
-  stream: () => ReadableStream;
-}
-
-interface ZipObject {
-  level: number;
-  ctrl: ReadableStreamController<unknown>;
-  directory: boolean;
-  nameBuf: Uint8Array;
-  comment: Uint8Array;
-  compressedLength: number;
-  uncompressedLength: number;
-  writeHeader: () => void;
-  writeFooter: (x?: unknown) => void;
-  offset?: number;
-  header?: {
-    array: Uint8Array;
-    view: DataView;
-  };
-  crc?: Crc32;
-  fileLike: FileLike;
-  reader?: ReadableStreamDefaultReader<Uint8Array>;
-}
-
-class Crc32 {
-  private crc: number;
-  private table: number[];
-
-  constructor() {
-    this.crc = -1;
-
-    let i: number;
-    let j: number;
-    let t: number;
-
-    const table: number[] = [];
-
-    for (i = 0; i < 256; i++) {
-      t = i;
-      for (j = 0; j < 8; j++) {
-        t = t & 1 ? (t >>> 1) ^ 0xedb88320 : t >>> 1;
-      }
-      table[i] = t;
-    }
-
-    this.table = table;
-  }
-
-  append(data: Uint8Array) {
-    let crc = this.crc | 0;
-    const table = this.table;
-    for (let offset = 0, len = data.length | 0; offset < len; offset++) {
-      crc = (crc >>> 8) ^ table[(crc ^ data[offset]) & 0xff];
-    }
-    this.crc = crc;
-  }
-
-  get() {
-    return ~this.crc;
-  }
-}
-
-const getDataHelper = (byteLength: number) => {
-  const uint8 = new Uint8Array(byteLength);
-
-  return {
-    array: uint8,
-    view: new DataView(uint8.buffer),
-  };
-};
-
-const pump = (zipObj: ZipObject) =>
-  zipObj.reader?.read().then((chunk: { done: boolean; value?: Uint8Array }) => {
-    if (chunk.done) return zipObj.writeFooter();
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    const outputData = chunk.value!;
-    zipObj.crc?.append(outputData);
-    zipObj.uncompressedLength += outputData.length;
-    zipObj.compressedLength += outputData.length;
-    zipObj.ctrl.enqueue(outputData);
-  });
-
-/**
- * [createWriter description]
- * @param  {Object} underlyingSource [description]
- * @return {Boolean}                  [description]
- */
-export default function createZipReadable(underlyingSource: {
-  start: (writer: { enqueue: (fileLike: FileLike) => void; close: () => void }) => void | undefined;
-  pull?: (writer: { enqueue: (fileLike: FileLike) => void; close: () => void }) => void;
-}): ReadableStream<Uint8Array> {
-  const files: Record<string, ZipObject> = Object.create(null);
-  const filenames: string[] = [];
-  const encoder = new TextEncoder();
-  let offset = 0;
-  let activeZipIndex = 0;
-  let ctrl: ReadableStreamController<Uint8Array>;
-  let activeZipObject: ZipObject, closed: boolean;
-
-  function next() {
-    activeZipIndex++;
-    activeZipObject = files[filenames[activeZipIndex]];
-    if (activeZipObject) processNextChunk();
-    else if (closed) closeZip();
-  }
-
-  const zipWriter = {
-    enqueue(fileLike: FileLike) {
-      if (closed) {
-        // eslint-disable-next-line max-len
-        throw new TypeError(
-          'Cannot enqueue a chunk into a readable stream that is closed or has been requested to be closed',
-        );
-      }
-
-      let name = fileLike.name.trim();
-      const date = new Date(typeof fileLike.lastModified === 'undefined' ? Date.now() : fileLike.lastModified);
-
-      if (fileLike.directory && !name.endsWith('/')) name += '/';
-      if (files[name]) throw new Error('File already exists.');
-
-      const nameBuf = encoder.encode(name);
-      filenames.push(name);
-
-      const zipObject = (files[name] = {
-        level: 0,
-        ctrl,
-        crc: new Crc32(),
-        directory: !!fileLike.directory,
-        nameBuf,
-        comment: encoder.encode(fileLike.comment || ''),
-        compressedLength: 0,
-        uncompressedLength: 0,
-        header: {
-          array: new Uint8Array(),
-          view: new DataView(new ArrayBuffer(0)),
-        },
-        offset: 0,
-        writeHeader() {
-          const header = getDataHelper(26);
-          const data = getDataHelper(30 + nameBuf.length);
-
-          zipObject.offset = offset;
-          zipObject.header = header;
-
-          if (zipObject.level !== 0 && !zipObject.directory) {
-            header.view.setUint16(4, 0x0800);
-          }
-          header.view.setUint32(0, 0x14000808);
-          header.view.setUint16(6, (((date.getHours() << 6) | date.getMinutes()) << 5) | (date.getSeconds() / 2), true);
-          header.view.setUint16(
-            8,
-            ((((date.getFullYear() - 1980) << 4) | (date.getMonth() + 1)) << 5) | date.getDate(),
-            true,
-          );
-          header.view.setUint16(22, nameBuf.length, true);
-          data.view.setUint32(0, 0x504b0304);
-          data.array.set(header.array, 4);
-          data.array.set(nameBuf, 30);
-          offset += data.array.length;
-          ctrl.enqueue(data.array);
-        },
-        writeFooter() {
-          const footer = getDataHelper(16);
-          footer.view.setUint32(0, 0x504b0708);
-
-          if (zipObject.crc) {
-            zipObject.header.view.setUint32(10, zipObject.crc.get(), true);
-            zipObject.header.view.setUint32(14, zipObject.compressedLength, true);
-            zipObject.header.view.setUint32(18, zipObject.uncompressedLength, true);
-            footer.view.setUint32(4, zipObject.crc.get(), true);
-            footer.view.setUint32(8, zipObject.compressedLength, true);
-            footer.view.setUint32(12, zipObject.uncompressedLength, true);
-          }
-
-          ctrl.enqueue(footer.array);
-          offset += zipObject.compressedLength + 16;
-          next();
-        },
-        fileLike,
-      });
-
-      if (!activeZipObject) {
-        activeZipObject = zipObject;
-        processNextChunk();
-      }
-    },
-    close() {
-      if (closed) throw new TypeError('Cannot close a readable stream that has already been requested to be closed');
-      if (!activeZipObject) closeZip();
-      closed = true;
-    },
-  };
-
-  function closeZip() {
-    let length = 0;
-    let index = 0;
-    let indexFilename, file;
-    for (indexFilename = 0; indexFilename < filenames.length; indexFilename++) {
-      file = files[filenames[indexFilename]];
-      length += 46 + file.nameBuf.length + file.comment.length;
-    }
-    const data = getDataHelper(length + 22);
-    for (indexFilename = 0; indexFilename < filenames.length; indexFilename++) {
-      file = files[filenames[indexFilename]];
-      data.view.setUint32(index, 0x504b0102);
-      data.view.setUint16(index + 4, 0x1400);
-
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      data.array.set(file.header!.array, index + 6);
-      data.view.setUint16(index + 32, file.comment.length, true);
-      if (file.directory) {
-        data.view.setUint8(index + 38, 0x10);
-      }
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      data.view.setUint32(index + 42, file.offset!, true);
-      data.array.set(file.nameBuf, index + 46);
-      data.array.set(file.comment, index + 46 + file.nameBuf.length);
-      index += 46 + file.nameBuf.length + file.comment.length;
-    }
-    data.view.setUint32(index, 0x504b0506);
-    data.view.setUint16(index + 8, filenames.length, true);
-    data.view.setUint16(index + 10, filenames.length, true);
-    data.view.setUint32(index + 12, length, true);
-    data.view.setUint32(index + 16, offset, true);
-    ctrl.enqueue(data.array);
-    ctrl.close();
-  }
-
-  function processNextChunk() {
-    if (!activeZipObject) return;
-    if (activeZipObject.directory) return activeZipObject.writeFooter(activeZipObject.writeHeader());
-    if (activeZipObject.reader) return pump(activeZipObject);
-    if (activeZipObject.fileLike.stream) {
-      activeZipObject.crc = new Crc32();
-      activeZipObject.reader = activeZipObject.fileLike.stream().getReader();
-      activeZipObject.writeHeader();
-    } else next();
-  }
-
-  return new ReadableStream({
-    start: (c) => {
-      ctrl = c;
-      underlyingSource.start && Promise.resolve(underlyingSource.start(zipWriter));
-    },
-    pull() {
-      return processNextChunk() || (underlyingSource.pull && Promise.resolve(underlyingSource.pull(zipWriter)));
-    },
-  });
-}
-
 export function loadWritableStreamPonyfill(): Promise<void> {
   const script = document.createElement('script');
   script.src = 'https://cdn.jsdelivr.net/npm/web-streams-polyfill@2.0.2/dist/ponyfill.min.js';
@@ -346,26 +94,74 @@ export interface ZipStream {
   end: () => void;
 }
 
-export function createFolderWithFilesWritable(): ZipStream {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  let controller: any;
+export function createFolderWithFilesWritable(progress?: FlatFolderZipOpts['progress']): ZipStream {
+  const zip = new Zip();
+  let passthroughController: ReadableStreamDefaultController<Uint8Array> | null = null;
 
-  const zipStream = createZipReadable({
-    start(ctrl) {
-      controller = ctrl;
+  const passthrough = new ReadableStream<Uint8Array>({
+    start(controller) {
+      passthroughController = controller;
+    },
+    cancel() {
+      if (passthroughController) {
+        passthroughController.close();
+        passthroughController = null;
+      }
     },
   });
 
+  zip.ondata = (err, data, final) => {
+    if (err) {
+      console.error('Error in ZIP data event:', err);
+      return;
+    }
+
+    if (data) {
+      passthroughController?.enqueue(data);
+    }
+
+    if (final) {
+      passthroughController?.close();
+      passthroughController = null;
+    }
+  };
+
+  let processedSize = 0;
+
+  // todo: abort with .terminate()
   return {
     addFile: (name: string, source: ReadableStream<Uint8Array>): void => {
-      controller.enqueue({ name, stream: () => source });
+      const writer = new AsyncZipDeflate(name, {
+        level: 0,
+      });
+
+      zip.add(writer);
+
+      source.pipeTo(
+        new WritableStream({
+          write(chunk) {
+            processedSize += chunk.length;
+
+            progress?.(processedSize);
+
+            writer.push(chunk, false);
+          },
+          close() {
+            writer.push(new Uint8Array(0), true);
+          },
+        }),
+      );
     },
     addFolder: (name: string): void => {
-      controller.enqueue({ name, directory: true });
+      const writer = new AsyncZipDeflate(name + '/', {
+        level: 0,
+      });
+      zip.add(writer);
+      writer.push(new Uint8Array(0), true);
     },
-    stream: zipStream,
+    stream: passthrough,
     end: () => {
-      controller.close();
+      zip.end();
     },
   };
 }
diff --git a/src/app/core/services/zipFolder.service.ts b/src/app/core/services/zipFolder.service.ts
deleted file mode 100644
index 3fa211a74..000000000
--- a/src/app/core/services/zipFolder.service.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-import createZipReadable from 'app/drive/services/download.service/downloadFolder/zipStream';
-import { loadWritableStreamPonyfill } from 'app/network/download';
-import streamSaver from 'streamsaver';
-import { buildProgressStream } from './stream.service';
-
-type FlatFolderZipOpts = {
-  abortController?: AbortController;
-  progress?: (loadedBytes: number) => void;
-};
-
-type AddFileToZipFunction = (name: string, source: ReadableStream<Uint8Array>) => void;
-type AddFolderToZipFunction = (name: string) => void;
-
-interface ZipStream {
-  addFile: AddFileToZipFunction;
-  addFolder: AddFolderToZipFunction;
-  stream: ReadableStream<Uint8Array>;
-  end: () => void;
-}
-
-function createFolderWithFilesWritable(): ZipStream {
-  let controller;
-
-  const zipStream = createZipReadable({
-    start(ctrl) {
-      controller = ctrl;
-    },
-  });
-
-  return {
-    addFile: (name: string, source: ReadableStream<Uint8Array>): void => {
-      controller.enqueue({ name, stream: () => source });
-    },
-    addFolder: (name: string): void => {
-      controller.enqueue({ name, directory: true });
-    },
-    stream: zipStream,
-    end: () => {
-      controller.close();
-    },
-  };
-}
-
-export class FlatFolderZip {
-  private finished!: Promise<void>;
-  private zip: ZipStream;
-  private abortController?: AbortController;
-
-  constructor(folderName: string, opts: FlatFolderZipOpts) {
-    this.zip = createFolderWithFilesWritable();
-    this.abortController = opts.abortController;
-
-    // TODO: check why opts.progress is causing zip corruption
-    const passThrough = opts.progress ? buildProgressStream(this.zip.stream, opts.progress) : this.zip.stream;
-
-    const isFirefox = navigator.userAgent.indexOf('Firefox') != -1;
-
-    if (isFirefox) {
-      loadWritableStreamPonyfill().then(() => {
-        streamSaver.WritableStream = window.WritableStream;
-        this.finished = passThrough.pipeTo(streamSaver.createWriteStream(folderName + '.zip'), {
-          signal: opts.abortController?.signal,
-        });
-      });
-    } else {
-      this.finished = passThrough.pipeTo(streamSaver.createWriteStream(folderName + '.zip'), {
-        signal: opts.abortController?.signal,
-      });
-    }
-  }
-
-  addFile(name: string, source: ReadableStream<Uint8Array>): void {
-    if (this.abortController?.signal.aborted) return;
-
-    this.zip.addFile(name, source);
-  }
-
-  addFolder(name: string): void {
-    if (this.abortController?.signal.aborted) return;
-
-    this.zip.addFolder(name);
-  }
-
-  async close(): Promise<void> {
-    if (this.abortController?.signal.aborted) return;
-
-    this.zip.end();
-    await this.finished;
-  }
-
-  abort(): void {
-    this.abortController?.abort();
-  }
-}
diff --git a/src/app/core/types.ts b/src/app/core/types.ts
index b29d57aa3..944bf51ec 100644
--- a/src/app/core/types.ts
+++ b/src/app/core/types.ts
@@ -118,7 +118,6 @@ export enum AppView {
   Backups = 'backups',
   SharedLinks = 'shared-links',
   Shared = 'shared',
-  Photos = 'photos',
   Preferences = 'preferences',
   DriveItems = 'drive-items',
   FolderFileNotFound = 'folder-file-not-found',
@@ -132,9 +131,11 @@ export enum AppView {
   Checkout = 'checkout',
   RecoveryLink = 'recovery-link',
   ShareFileToken = 'share-token',
+  ShareFileToken2 = 'share-token-2',
   ShareFolderToken = 'share-folder-token',
-  SharePhotosToken = 'share-photos-token',
+  ShareFolderToken2 = 'share-folder-token-2',
   ShareGuestAcceptInvite = 'share-guest-accept-invite',
+  WorkspaceGuestInvite = 'workspace-guest-invite',
   GuestAcceptInvite = 'guest-accept-invite',
   RedirectToApp = 'redirect-to-app',
   NotFound = 'not-found',
diff --git a/src/app/core/views/ChangeEmailView/index.tsx b/src/app/core/views/ChangeEmailView/index.tsx
index 56722f882..c5bf67913 100644
--- a/src/app/core/views/ChangeEmailView/index.tsx
+++ b/src/app/core/views/ChangeEmailView/index.tsx
@@ -1,16 +1,17 @@
 import { CheckCircle, ClockCountdown, Envelope, WarningCircle } from '@phosphor-icons/react';
 import { useEffect, useState } from 'react';
+import { useDispatch } from 'react-redux';
 import { Link, useRouteMatch } from 'react-router-dom';
-import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
-import Input from 'app/shared/components/Input';
-import Button from 'app/shared/components/Button/Button';
-import { areCredentialsCorrect } from 'app/auth/services/auth.service';
-import Spinner from 'app/shared/components/Spinner/Spinner';
-import localStorageService from '../../services/local-storage.service';
+import { areCredentialsCorrect } from '../../../auth/services/auth.service';
 import userService from '../../../auth/services/user.service';
-import errorService from '../../services/error.service';
+import { useTranslationContext } from '../../../i18n/provider/TranslationProvider';
+import Button from '../../../shared/components/Button/Button';
+import Input from '../../../shared/components/Input';
+import Spinner from '../../../shared/components/Spinner/Spinner';
+import { uiActions } from '../../../store/slices/ui';
 import { userThunks } from '../../../store/slices/user';
-import { useDispatch } from 'react-redux';
+import errorService from '../../services/error.service';
+import localStorageService from '../../services/local-storage.service';
 
 type StatusType = 'loading' | 'auth' | 'error' | 'success' | 'expired';
 
@@ -38,18 +39,23 @@ export default function ChangeEmailView(): JSX.Element {
   const [auth, setAuth] = useState<boolean>(false);
 
   async function getInfo() {
-    const isExpired = (await userService.checkChangeEmailLinkExpiration(token)).isExpired;
-
-    if (isExpired) {
-      setStatus(STATUS.EXPIRED);
-      setExpired(true);
-    } else {
-      setStatus(STATUS.AUTH);
-      setExpired(false);
-
-      const user = localStorageService.getUser();
-      if (user) setEmail(user.email);
-      if (newEmailParam) setNewEmail(newEmailParam);
+    try {
+      const isExpired = (await userService.checkChangeEmailLinkExpiration(token)).isExpired;
+
+      if (isExpired) {
+        setStatus(STATUS.EXPIRED);
+        setExpired(true);
+      } else {
+        setStatus(STATUS.AUTH);
+        setExpired(false);
+
+        const user = localStorageService.getUser();
+        if (user) setEmail(user.email);
+        if (newEmailParam) setNewEmail(newEmailParam);
+      }
+    } catch (error) {
+      errorService.reportError(error, { extra: { view: 'Change email view', emailLinkExpirationToken: token } });
+      setStatus(STATUS.ERROR);
     }
   }
 
@@ -116,11 +122,11 @@ export default function ChangeEmailView(): JSX.Element {
     },
     error: {
       label: translate('views.emailChange.error.cta'),
-      path: '/preferences?tab=account',
+      path: '/?preferences=open&section=account&subsection=account',
     },
     expired: {
       label: translate('views.emailChange.expired.cta'),
-      path: '/preferences?tab=account',
+      path: '/?preferences=open&section=account&subsection=account',
     },
   };
 
@@ -169,8 +175,11 @@ export default function ChangeEmailView(): JSX.Element {
             <State {...layout[status]} />
 
             <Link
-              className="flex h-10 items-center justify-center rounded-lg bg-primary px-5 font-medium text-white no-underline hover:text-white"
+              className="flex h-10 cursor-pointer items-center justify-center rounded-lg bg-primary px-5 font-medium text-white no-underline hover:text-white"
               to={cta[status]?.path}
+              onClick={() => {
+                if (status !== STATUS.SUCCESS) dispatch(uiActions.setIsPreferencesDialogOpen(true));
+              }}
             >
               {cta[status]?.label}
             </Link>
diff --git a/src/app/core/views/Preferences/components/CurrentPlanWrapper.tsx b/src/app/core/views/Preferences/components/CurrentPlanWrapper.tsx
deleted file mode 100644
index 63fd53b64..000000000
--- a/src/app/core/views/Preferences/components/CurrentPlanWrapper.tsx
+++ /dev/null
@@ -1,90 +0,0 @@
-import { UserSubscription } from '@internxt/sdk/dist/drive/payments/types';
-import { useTranslationContext } from '../../../../i18n/provider/TranslationProvider';
-import CurrentPlan from '../../../../shared/components/CurrentPlan';
-import navigationService from '../../../services/navigation.service';
-import { AppView } from '../../../types';
-
-const CURRENCY_SYMBOLS = {
-  USD: '$', // US Dollar
-  EUR: '€', // Euro
-  CRC: '₡', // Costa Rican Colón
-  GBP: '£', // British Pound Sterling
-  ILS: '₪', // Israeli New Sheqel
-  INR: '₹', // Indian Rupee
-  JPY: '¥', // Japanese Yen
-  KRW: '₩', // South Korean Won
-  NGN: '₦', // Nigerian Naira
-  PHP: '₱', // Philippine Peso
-  PLN: 'zł', // Polish Zloty
-  PYG: '₲', // Paraguayan Guarani
-  THB: '฿', // Thai Baht
-  UAH: '₴', // Ukrainian Hryvnia
-  VND: '₫', // Vietnamese Dong
-};
-
-export default function CurrentPlanWrapper({
-  className = '',
-  bytesInPlan,
-  userSubscription,
-}: {
-  className?: string;
-  bytesInPlan: number;
-  userSubscription: UserSubscription;
-}): JSX.Element {
-  const { translate } = useTranslationContext();
-  let planName = '';
-  let button: string | undefined;
-
-  switch (userSubscription.type) {
-    case 'free':
-      planName = translate('views.account.tabs.account.view.free.planName');
-      button = translate('views.account.tabs.account.view.free.button') as string;
-      break;
-    case 'lifetime':
-      planName = translate('views.account.tabs.account.view.lifetime.planName');
-      button = undefined;
-      break;
-    case 'subscription':
-      planName = translate('views.account.tabs.account.view.subscription.planName');
-      button = translate('views.account.tabs.account.view.subscription.button') as string;
-      break;
-  }
-
-  let planSubtitle: Parameters<typeof CurrentPlan>[0]['planSubtitle'];
-
-  if (userSubscription.type === 'subscription') {
-    const amount = userSubscription.amount;
-    const amountAfterCoupon = userSubscription.amountAfterCoupon;
-
-    const currencySymbol =
-      CURRENCY_SYMBOLS[userSubscription.currency.toUpperCase()] ?? userSubscription.currency.toUpperCase();
-    const mainLabel = `${amount / 100} ${currencySymbol}/ ${
-      userSubscription.interval === 'year'
-        ? translate('views.account.tabs.account.view.subscription.yearly')
-        : translate('views.account.tabs.account.view.subscription.monthly')
-    }`;
-
-    let beforeMainLabelCrossed;
-
-    if (amountAfterCoupon || amountAfterCoupon === 0) {
-      beforeMainLabelCrossed = `${amountAfterCoupon / 100} ${currencySymbol}`;
-    }
-
-    planSubtitle = { mainLabel, beforeMainLabelCrossed, amount, amountAfterCoupon };
-  }
-
-  function onClick() {
-    navigationService.push(AppView.Preferences, { tab: 'plans' });
-  }
-
-  return (
-    <CurrentPlan
-      className={className}
-      onButtonClick={onClick}
-      bytesInPlan={bytesInPlan}
-      planName={planName}
-      button={button}
-      planSubtitle={planSubtitle}
-    />
-  );
-}
diff --git a/src/app/core/views/Preferences/components/Section.tsx b/src/app/core/views/Preferences/components/Section.tsx
deleted file mode 100644
index 061b42a9e..000000000
--- a/src/app/core/views/Preferences/components/Section.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { ReactNode } from 'react';
-
-export default function Section({
-  className = '',
-  children,
-  title,
-}: {
-  className?: string;
-  children: ReactNode;
-  title: string;
-}): JSX.Element {
-  return (
-    <div className={`${className} space-y-2`}>
-      <span className="text-lg font-medium text-gray-100">{title}</span>
-      {children}
-    </div>
-  );
-}
diff --git a/src/app/core/views/Preferences/index.tsx b/src/app/core/views/Preferences/index.tsx
deleted file mode 100644
index 1a3524167..000000000
--- a/src/app/core/views/Preferences/index.tsx
+++ /dev/null
@@ -1,107 +0,0 @@
-import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
-import { createContext, useEffect, useMemo, useState } from 'react';
-import { Helmet } from 'react-helmet-async';
-import AccountTab from './tabs/Account';
-import BillingTab from './tabs/Billing';
-import PlansTab from './tabs/Plans';
-import SecurityTab from './tabs/Security';
-import navigationService from 'app/core/services/navigation.service';
-import { AppView } from 'app/core/types';
-
-const PREFERENCES_TABS = ['account', 'billing', 'plans', 'security'] as const;
-type PreferencesTabID = (typeof PREFERENCES_TABS)[number];
-
-export const TabContext = createContext<{
-  activeTab: PreferencesTabID;
-  setActiveTab: (value: PreferencesTabID) => void;
-}>({ activeTab: 'account', setActiveTab: () => undefined });
-
-export default function Preferences(): JSX.Element {
-  const { translate } = useTranslationContext();
-  const TABS: {
-    id: PreferencesTabID;
-    label: string;
-    component: React.FunctionComponent<{ className?: string }>;
-  }[] = [
-    { id: 'account', label: translate('views.account.tabs.account.label'), component: AccountTab },
-    { id: 'billing', label: translate('views.account.tabs.billing.label'), component: BillingTab },
-    { id: 'plans', label: translate('views.account.tabs.plans.label'), component: PlansTab },
-    { id: 'security', label: translate('views.account.tabs.security.label'), component: SecurityTab },
-  ];
-  const params = new URLSearchParams(window.location.search);
-  const urlTab = params.get('tab');
-  const [activeTab, setActiveTab] = useState<PreferencesTabID>('account');
-  const [currentTabTitle, setCurrentTabTitle] = useState<string>('account');
-
-  const tabContextValues = useMemo(
-    () => ({
-      activeTab,
-      setActiveTab,
-    }),
-    [activeTab, setActiveTab],
-  );
-
-  useEffect(() => {
-    if (urlTab) {
-      const currentTab = TABS.filter((tab) => tab.id === urlTab);
-      setActiveTab(urlTab as PreferencesTabID);
-      setCurrentTabTitle(currentTab[0].label);
-    } else {
-      navigationService.history.replace({ search: new URLSearchParams({ tab: activeTab }).toString() });
-    }
-  }, [urlTab]);
-
-  const navigateTab = (tabId) => {
-    navigationService.push(AppView.Preferences, { tab: `${tabId}` });
-  };
-
-  return (
-    <div className="flex h-full w-full flex-col">
-      <Helmet>
-        <title>{currentTabTitle} - Internxt Drive</title>
-      </Helmet>
-      <TabSelector tabs={TABS} activeTab={activeTab} onChange={navigateTab} />
-      <TabContext.Provider value={tabContextValues}>
-        <div className="flex grow flex-row justify-center overflow-y-auto p-8">
-          <div className="w-screen max-w-screen-xl overflow-x-visible">
-            {TABS.map(
-              ({ component: Component, id }) =>
-                Component && <Component className={`${activeTab !== id ? 'hidden' : ''}`} key={id} />,
-            )}
-            <div className="h-8" />
-          </div>
-        </div>
-      </TabContext.Provider>
-    </div>
-  );
-}
-
-function TabSelector({
-  activeTab,
-  onChange,
-  tabs,
-}: {
-  tabs: { id: PreferencesTabID; label: string }[];
-  activeTab: PreferencesTabID;
-  onChange: (newActiveTab: PreferencesTabID) => void;
-}): JSX.Element {
-  return (
-    <div className="px-8 pt-5">
-      <div className="flex space-x-8 border-b border-gray-5">
-        {tabs.map((tab) => (
-          <button
-            key={tab.id}
-            className={`flex h-10 items-center border-b-2 font-medium ${
-              tab.id === activeTab
-                ? 'border-primary text-primary'
-                : 'cursor-pointer border-transparent text-gray-60 hover:text-gray-70'
-            }`}
-            onClick={() => onChange(tab.id)}
-          >
-            {tab.label}
-          </button>
-        ))}
-      </div>
-    </div>
-  );
-}
diff --git a/src/app/core/views/Preferences/tabs/Account/AccountDetails.tsx b/src/app/core/views/Preferences/tabs/Account/AccountDetails.tsx
deleted file mode 100644
index 1bd1e514e..000000000
--- a/src/app/core/views/Preferences/tabs/Account/AccountDetails.tsx
+++ /dev/null
@@ -1,340 +0,0 @@
-import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
-import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
-import { CheckCircle, Warning } from '@phosphor-icons/react';
-import { useEffect, useState } from 'react';
-import { useSelector } from 'react-redux';
-import userService from '../../../../../auth/services/user.service';
-import notificationsService, { ToastType } from '../../../../../notifications/services/notifications.service';
-import Button from '../../../../../shared/components/Button/Button';
-import Card from '../../../../../shared/components/Card';
-import Input from '../../../../../shared/components/Input';
-import Modal from '../../../../../shared/components/Modal';
-import Tooltip from '../../../../../shared/components/Tooltip';
-import { RootState } from '../../../../../store';
-import { useAppDispatch } from '../../../../../store/hooks';
-import { updateUserProfileThunk } from '../../../../../store/slices/user';
-import Section from '../../components/Section';
-import { areCredentialsCorrect } from 'app/auth/services/auth.service';
-import errorService from '../../../../services/error.service';
-
-export default function AccountDetails({ className = '' }: { className?: string }): JSX.Element {
-  const { translate } = useTranslationContext();
-  const [isDetailsModalOpen, setIsDetailsModalOpen] = useState(false);
-  const [isEmailModalOpen, setIsEmailModalOpen] = useState(false);
-
-  const [isSendingVerificationEmail, setIsSendingVerificationEmail] = useState(false);
-
-  async function onResend() {
-    setIsSendingVerificationEmail(true);
-    await userService.sendVerificationEmail();
-    notificationsService.show({ text: translate('notificationMessages.verificationEmail'), type: ToastType.Success });
-    setIsSendingVerificationEmail(false);
-  }
-
-  const user = useSelector<RootState, UserSettings | undefined>((state) => state.user.user);
-  if (!user) throw new Error('User is not defined');
-
-  const isVerified = user.emailVerified;
-
-  return (
-    <Section className={className} title={translate('views.account.tabs.account.accountDetails.head')}>
-      <Card>
-        <div className="flex justify-between">
-          <div className="flex min-w-0">
-            <Detail label={translate('views.account.tabs.account.accountDetails.card.name')} value={user.name} />
-            <Detail
-              label={translate('views.account.tabs.account.accountDetails.card.lastname')}
-              value={user.lastname}
-              className="ml-8 pr-2"
-            />
-          </div>
-          <Button variant="secondary" onClick={() => setIsDetailsModalOpen(true)}>
-            {translate('actions.edit')}
-          </Button>
-        </div>
-        <div className="mt-5 flex items-center justify-between">
-          <div>
-            <Detail label={translate('views.account.tabs.account.accountDetails.card.email')} value={user.email} />
-            {!isVerified && (
-              <button
-                onClick={onResend}
-                disabled={isSendingVerificationEmail}
-                className="font-medium text-primary hover:text-primary-dark disabled:text-gray-60"
-              >
-                {translate('views.account.tabs.account.accountDetails.card.resendEmail')}
-              </button>
-            )}
-          </div>
-          <Tooltip
-            title={
-              isVerified
-                ? translate('views.account.tabs.account.accountDetails.verify.verified')
-                : translate('views.account.tabs.account.accountDetails.verify.verify')
-            }
-            popsFrom="top"
-            subtitle={
-              isVerified
-                ? undefined
-                : (translate('views.account.tabs.account.accountDetails.verify.description') as string)
-            }
-          >
-            {isVerified ? (
-              <CheckCircle weight="fill" className="text-green" size={24} />
-            ) : (
-              <Warning weight="fill" className="text-yellow" size={24} />
-            )}
-          </Tooltip>
-        </div>
-      </Card>
-
-      <AccountDetailsModal
-        isOpen={isDetailsModalOpen}
-        onClose={() => setIsDetailsModalOpen(false)}
-        openEditEmail={() => {
-          setIsDetailsModalOpen(false);
-          setIsEmailModalOpen(true);
-        }}
-        name={user.name}
-        lastname={user.lastname}
-        email={user.email}
-      />
-      <ChangeEmailModal isOpen={isEmailModalOpen} onClose={() => setIsEmailModalOpen(false)} email={user.email} />
-    </Section>
-  );
-}
-
-function Detail({ className = '', label, value }: { className?: string; label: string; value: string }): JSX.Element {
-  return (
-    <div className={`${className} min-w-0 text-gray-80`}>
-      <h2 className="truncate text-sm">{label}</h2>
-      <h1 className="truncate text-lg font-medium">{value}</h1>
-    </div>
-  );
-}
-
-function AccountDetailsModal({
-  isOpen,
-  onClose,
-  openEditEmail,
-  name,
-  lastname,
-  email,
-}: {
-  isOpen: boolean;
-  onClose: () => void;
-  openEditEmail: () => void;
-  name: string;
-  lastname: string;
-  email: string;
-}) {
-  const { translate } = useTranslationContext();
-  const dispatch = useAppDispatch();
-  const [nameValue, setNameValue] = useState(name);
-  const [lastnameValue, setLastnameValue] = useState(lastname);
-  const emailValue = email;
-
-  const [status, setStatus] = useState<
-    { tag: 'ready' } | { tag: 'loading' } | { tag: 'error'; type: 'NAME_INVALID' | 'LASTNAME_INVALID' | 'UNKNOWN' }
-  >({ tag: 'ready' });
-
-  const nameIsInvalid = status.tag === 'error' && status.type === 'NAME_INVALID';
-  const lastnameIsInvalid = status.tag === 'error' && status.type === 'LASTNAME_INVALID';
-
-  useEffect(() => {
-    if (isOpen) {
-      setStatus({ tag: 'ready' });
-    }
-  }, [isOpen]);
-
-  function validate(value: string) {
-    return value.length > 0 && value.length < 20;
-  }
-
-  async function onSave() {
-    if (!validate(nameValue)) {
-      setStatus({ tag: 'error', type: 'NAME_INVALID' });
-    } else if (!validate(lastnameValue)) {
-      setStatus({ tag: 'error', type: 'LASTNAME_INVALID' });
-    } else {
-      try {
-        setStatus({ tag: 'loading' });
-        await dispatch(updateUserProfileThunk({ name: nameValue, lastname: lastnameValue })).unwrap();
-        notificationsService.show({
-          text: translate('views.account.tabs.account.accountDetails.editProfile.updatedProfile'),
-          type: ToastType.Success,
-        });
-        onClose();
-      } catch {
-        setStatus({ tag: 'error', type: 'UNKNOWN' });
-        notificationsService.show({
-          text: translate('views.account.tabs.account.accountDetails.editProfile.errorUpdatingProfile'),
-          type: ToastType.Error,
-        });
-      }
-    }
-  }
-
-  return (
-    <Modal isOpen={isOpen} onClose={onClose}>
-      <div className="flex flex-col space-y-5">
-        <h1 className="text-2xl font-medium text-gray-80">
-          {translate('views.account.tabs.account.accountDetails.editProfile.title')}
-        </h1>
-        <div className="flex space-x-3">
-          <Input
-            disabled={status.tag === 'loading'}
-            label={translate('views.account.tabs.account.accountDetails.name') as string}
-            value={nameValue}
-            onChange={setNameValue}
-            accent={nameIsInvalid ? 'error' : undefined}
-            message={nameIsInvalid ? 'This name is invalid' : undefined}
-            name="firstName"
-          />
-          <Input
-            disabled={status.tag === 'loading'}
-            label={translate('views.account.tabs.account.accountDetails.lastname') as string}
-            value={lastnameValue}
-            onChange={setLastnameValue}
-            accent={lastnameIsInvalid ? 'error' : undefined}
-            message={lastnameIsInvalid ? 'This lastname is invalid' : undefined}
-            name="lastName"
-          />
-        </div>
-
-        <div className="flex items-end space-x-3">
-          <Input
-            disabled
-            className="flex-1"
-            label={translate('views.account.tabs.account.accountDetails.card.email') as string}
-            value={emailValue}
-            name="email"
-          />
-          <div className="flex h-11 items-center">
-            <Button disabled={status.tag === 'loading'} variant="secondary" onClick={openEditEmail}>
-              {translate('actions.change')}
-            </Button>
-          </div>
-        </div>
-
-        <div className="flex justify-end">
-          <Button disabled={status.tag === 'loading'} variant="secondary" onClick={onClose}>
-            {translate('actions.cancel')}
-          </Button>
-          <Button loading={status.tag === 'loading'} className="ml-2" onClick={onSave}>
-            {status.tag === 'loading' ? translate('actions.saving') : translate('actions.save')}
-          </Button>
-        </div>
-      </div>
-    </Modal>
-  );
-}
-
-function ChangeEmailModal({ isOpen, onClose, email }: { isOpen: boolean; onClose: () => void; email: string }) {
-  const { translate } = useTranslationContext();
-  const [password, setPassword] = useState<string>('');
-  const [newEmail, setNewEmail] = useState<string>('');
-
-  const [status, setStatus] = useState<
-    | { tag: 'ready' }
-    | { tag: 'loading' }
-    | { tag: 'error'; type: 'NAME_INVALID' | 'LASTNAME_INVALID' | 'PASSWORD_INVALID' | 'SAME_EMAIL' | 'UNKNOWN' }
-  >({ tag: 'ready' });
-
-  const isInvalidPasswordError = status.tag === 'error' && status.type === 'PASSWORD_INVALID';
-  const isLoadingStatus = status.tag === 'loading';
-
-  useEffect(() => {
-    if (isOpen) {
-      setStatus({ tag: 'ready' });
-    }
-  }, [isOpen]);
-
-  async function onChange(e) {
-    e.preventDefault();
-    if (email === newEmail) {
-      setStatus({ tag: 'error', type: 'SAME_EMAIL' });
-    } else {
-      try {
-        setStatus({ tag: 'loading' });
-        const correctPassword = await areCredentialsCorrect(email, password);
-        if (correctPassword) {
-          await userService.changeEmail(newEmail);
-          notificationsService.show({
-            text: translate('views.account.tabs.account.accountDetails.changeEmail.sucessSendingVerification', {
-              email: newEmail,
-            }),
-            type: ToastType.Success,
-          });
-          onClose();
-        } else {
-          setStatus({ tag: 'error', type: 'PASSWORD_INVALID' });
-        }
-      } catch (error) {
-        errorService.reportError(error);
-        setStatus({ tag: 'error', type: 'UNKNOWN' });
-        notificationsService.show({
-          text: translate('views.account.tabs.account.accountDetails.changeEmail.errorSendingVerification'),
-          type: ToastType.Error,
-        });
-      }
-    }
-  }
-
-  return (
-    <Modal isOpen={isOpen} onClose={onClose}>
-      <form className="flex flex-col space-y-5" onSubmit={onChange}>
-        <h1 className="text-2xl font-medium text-gray-80">
-          {translate('views.account.tabs.account.accountDetails.changeEmail.title')}
-        </h1>
-
-        <div className="flex flex-col space-y-3">
-          <Input
-            disabled
-            label={translate('views.account.tabs.account.accountDetails.changeEmail.email') as string}
-            value={email}
-            name="email"
-          />
-          <Input
-            required
-            variant="email"
-            autoComplete="off"
-            label={translate('views.account.tabs.account.accountDetails.changeEmail.newEmail') as string}
-            onChange={setNewEmail}
-            accent={status.tag === 'error' && status.type === 'SAME_EMAIL' ? 'error' : undefined}
-            message={
-              status.tag === 'error' && status.type === 'SAME_EMAIL'
-                ? (translate('views.account.tabs.account.accountDetails.changeEmail.errorSameEmail') as string)
-                : undefined
-            }
-            name="newemail"
-          />
-          <Input
-            required
-            disabled={isLoadingStatus}
-            label={translate('views.account.tabs.account.accountDetails.changeEmail.password') as string}
-            variant="password"
-            onChange={setPassword}
-            accent={isInvalidPasswordError ? 'error' : undefined}
-            message={
-              isInvalidPasswordError
-                ? (translate('views.account.tabs.account.accountDetails.changeEmail.errorPassword') as string)
-                : undefined
-            }
-            name="password"
-          />
-        </div>
-
-        <div className="flex justify-end space-x-2">
-          <Button disabled={isLoadingStatus} variant="secondary" onClick={onClose}>
-            {translate('actions.cancel')}
-          </Button>
-          <Button loading={isLoadingStatus} type="submit">
-            {isLoadingStatus
-              ? translate('views.account.tabs.account.accountDetails.changeEmail.sendingVerification')
-              : translate('views.account.tabs.account.accountDetails.changeEmail.sendVerification')}
-          </Button>
-        </div>
-      </form>
-    </Modal>
-  );
-}
diff --git a/src/app/core/views/Preferences/tabs/Account/Appearance.tsx b/src/app/core/views/Preferences/tabs/Account/Appearance.tsx
deleted file mode 100644
index 332f5a349..000000000
--- a/src/app/core/views/Preferences/tabs/Account/Appearance.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-import { CaretDown } from '@phosphor-icons/react';
-import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
-import { isStarWarsThemeAvailable } from 'app/payment/utils/checkStarWarsCode';
-import { RootState } from 'app/store';
-import { useEffect, useState } from 'react';
-import { useSelector } from 'react-redux';
-import Card from '../../../../../shared/components/Card';
-import { Theme, useThemeContext } from '../../../../../theme/ThemeProvider';
-import Section from '../../components/Section';
-import ItemsDropdown from './components/ItemsDropdown';
-import MenuItem from './components/MenuItem';
-import errorService from 'app/core/services/error.service';
-
-const initialAppearances: Theme[] = ['system', 'light', 'dark'];
-
-const Appearance = () => {
-  const plan = useSelector((state: RootState) => state.plan);
-
-  const { translate } = useTranslationContext();
-  const { currentTheme, toggleTheme } = useThemeContext();
-  const [appearances, setAppearances] = useState<Theme[]>(initialAppearances);
-
-  useEffect(() => {
-    isStarWarsThemeAvailable(plan)
-      .then((isStarWarsThemeAvailable) => {
-        if (!appearances.includes('starwars') && isStarWarsThemeAvailable) {
-          setAppearances([...appearances, 'starwars']);
-        }
-      })
-      .catch((err) => {
-        const error = err as Error;
-        errorService.reportError(error);
-      });
-  }, []);
-
-  return (
-    <Section className="" title={translate('theme.title')}>
-      <Card>
-        <ItemsDropdown
-          title={
-            <div className="flex w-full flex-row justify-between">
-              <p>{translate(`theme.${currentTheme}`)}</p>
-              <CaretDown size={20} />
-            </div>
-          }
-          menuItems={appearances.map((theme) => (
-            <MenuItem
-              key={theme}
-              onClick={() => {
-                toggleTheme(theme);
-              }}
-            >
-              <p>{translate(`theme.${theme}`)}</p>
-            </MenuItem>
-          ))}
-        />
-      </Card>
-    </Section>
-  );
-};
-
-export default Appearance;
diff --git a/src/app/core/views/Preferences/tabs/Account/ContactSupport.tsx b/src/app/core/views/Preferences/tabs/Account/ContactSupport.tsx
deleted file mode 100644
index d74fd2e0a..000000000
--- a/src/app/core/views/Preferences/tabs/Account/ContactSupport.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import { useChat } from 'react-live-chat-loader';
-import Section from '../../components/Section';
-import Card from 'app/shared/components/Card';
-import Button from 'app/shared/components/Button/Button';
-import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
-
-const ContactSupport = () => {
-  const { translate } = useTranslationContext();
-  const [state, loadChat] = useChat();
-
-  const onClick = () => {
-    loadChat({ open: true });
-  };
-
-  return (
-    <Section title={translate('views.account.tabs.account.support.title')}>
-      <Card>
-        <p className="text-gray-80">{translate('views.account.tabs.account.support.description')}</p>
-        <Button className="mt-5" variant="secondary" onClick={onClick}>
-          {translate('views.account.tabs.account.support.cta')}
-        </Button>
-      </Card>
-    </Section>
-  );
-};
-
-export default ContactSupport;
diff --git a/src/app/core/views/Preferences/tabs/Account/DeleteAccount.tsx b/src/app/core/views/Preferences/tabs/Account/DeleteAccount.tsx
deleted file mode 100644
index a13a3227e..000000000
--- a/src/app/core/views/Preferences/tabs/Account/DeleteAccount.tsx
+++ /dev/null
@@ -1,74 +0,0 @@
-import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
-import { useState } from 'react';
-import { useSelector } from 'react-redux';
-import authService from '../../../../../auth/services/auth.service';
-import notificationsService, { ToastType } from '../../../../../notifications/services/notifications.service';
-import Button from '../../../../../shared/components/Button/Button';
-import Card from '../../../../../shared/components/Card';
-import Dialog from '../../../../../shared/components/Dialog/Dialog';
-import { RootState } from '../../../../../store';
-import { PlanState } from '../../../../../store/slices/plan';
-import errorService from '../../../../services/error.service';
-import Section from '../../components/Section';
-
-export default function DeleteAccount({ className = '' }: { className?: string }): JSX.Element {
-  const { translate } = useTranslationContext();
-  const [isDialogOpen, setIsDialogOpen] = useState(false);
-  const [isLoading, setIsLoading] = useState(false);
-  const plan = useSelector<RootState, PlanState>((state) => state.plan);
-
-  function onClose() {
-    setIsDialogOpen(false);
-  }
-
-  function onClick() {
-    if (plan.subscription?.type === 'subscription') {
-      notificationsService.show({
-        text: translate('views.account.tabs.account.deleteAccount.isSubscribed'),
-        type: ToastType.Info,
-      });
-    } else {
-      setIsDialogOpen(true);
-    }
-  }
-
-  async function onConfirm() {
-    try {
-      setIsLoading(true);
-      await authService.cancelAccount();
-      notificationsService.show({
-        text: translate('views.account.tabs.account.deleteAccount.confirmationEmail'),
-        type: ToastType.Success,
-      });
-      onClose();
-    } catch (err: unknown) {
-      const castedError = errorService.castError(err);
-      notificationsService.show({ text: castedError.message, type: ToastType.Error });
-    } finally {
-      setIsLoading(false);
-    }
-  }
-
-  return (
-    <Section className={className} title={translate('views.account.tabs.account.deleteAccount.head')}>
-      <Card>
-        <p className="text-gray-80">{translate('views.account.tabs.account.deleteAccount.description')}</p>
-        <Button className="mt-5" variant="secondary" onClick={onClick}>
-          {translate('views.account.tabs.account.deleteAccount.head')}
-        </Button>
-      </Card>
-      <Dialog
-        isOpen={isDialogOpen}
-        onClose={onClose}
-        onSecondaryAction={onClose}
-        onPrimaryAction={onConfirm}
-        secondaryAction={translate('modals.deleteAccountModal.cancel')}
-        primaryAction={translate('modals.deleteAccountModal.confirm')}
-        title={translate('modals.deleteAccountModal.title')}
-        subtitle={translate('modals.deleteAccountModal.subtitle')}
-        primaryActionColor="danger"
-        isLoading={isLoading}
-      />
-    </Section>
-  );
-}
diff --git a/src/app/core/views/Preferences/tabs/Account/InviteAFriend.tsx b/src/app/core/views/Preferences/tabs/Account/InviteAFriend.tsx
deleted file mode 100644
index 3b2fafd1e..000000000
--- a/src/app/core/views/Preferences/tabs/Account/InviteAFriend.tsx
+++ /dev/null
@@ -1,187 +0,0 @@
-import { ReferralKey } from '@internxt/sdk/dist/drive/referrals/types';
-import { FriendInvite } from '@internxt/sdk/dist/drive/users/types';
-import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
-import { useAppSelector } from 'app/store/hooks';
-import { CheckCircle, Info, Question } from '@phosphor-icons/react';
-import { useEffect, useState } from 'react';
-import userService from '../../../../../auth/services/user.service';
-import notificationsService, { ToastType } from '../../../../../notifications/services/notifications.service';
-import Button from '../../../../../shared/components/Button/Button';
-import Card from '../../../../../shared/components/Card';
-import Input from '../../../../../shared/components/Input';
-import Modal from '../../../../../shared/components/Modal';
-import Spinner from '../../../../../shared/components/Spinner/Spinner';
-import errorService from '../../../../services/error.service';
-import Section from '../../components/Section';
-
-export default function InviteAFriend({ className = '' }: { className?: string }): JSX.Element {
-  const { translate } = useTranslationContext();
-  const [email, setEmail] = useState('');
-
-  const referrals = useAppSelector((state) => state.referrals.list);
-
-  const inviteAFriendReferral = referrals.find((referral) => referral.key === ReferralKey.InviteFriends);
-
-  const [status, setStatus] = useState<'READY' | 'LOADING' | 'CANT_INVITE_MORE'>('READY');
-
-  const [modalOpen, setModalOpen] = useState(false);
-
-  async function onInvite() {
-    try {
-      setStatus('LOADING');
-      await userService.inviteAFriend(email);
-      setEmail('');
-      notificationsService.show({ text: translate('success.inviteAFriend', { email }), type: ToastType.Info });
-      setStatus('READY');
-    } catch (err) {
-      const castedError = errorService.castError(err);
-      if (castedError.message !== 'Mail invitation daily limit reached') {
-        notificationsService.show({
-          text: translate('error.inviteAFriendEmpty'),
-          type: ToastType.Error,
-        });
-        setStatus('READY');
-      } else {
-        setStatus('CANT_INVITE_MORE');
-      }
-    }
-  }
-
-  return (
-    <Section className={className} title={translate('inviteAFriend.title')}>
-      <Card>
-        <p className="text-gray-80">{translate('inviteAFriend.description', { N: inviteAFriendReferral?.steps })}</p>
-        <div className="mt-3">
-          {status !== 'CANT_INVITE_MORE' ? (
-            <Input
-              disabled={status === 'LOADING'}
-              value={email}
-              onChange={setEmail}
-              label={translate('inviteAFriend.label') as string}
-              placeholder={translate('inviteAFriend.placeholder') as string}
-            />
-          ) : (
-            <div className="flex h-9 items-center rounded-lg bg-gray-5 px-3 py-2.5 text-gray-80">
-              <Info size={18} />
-              <p className="ml-1.5 text-sm">{translate('inviteAFriend.errors.dailyEmailLimit')}</p>
-            </div>
-          )}
-        </div>
-        <div className="mt-5 flex">
-          {status !== 'CANT_INVITE_MORE' && (
-            <Button loading={status === 'LOADING'} onClick={onInvite} className="mr-4" variant="secondary">
-              {translate('inviteAFriend.actions.sendInvitation')}
-            </Button>
-          )}
-          <button onClick={() => setModalOpen(true)} className="font-medium text-primary">
-            {translate('inviteAFriend.actions.seeInvitations')}
-          </button>
-        </div>
-      </Card>
-      <InviteListModal isOpen={modalOpen} onClose={() => setModalOpen(false)} />
-    </Section>
-  );
-}
-function InviteListModal({ isOpen, onClose }: { isOpen: boolean; onClose: () => void }) {
-  const { translate } = useTranslationContext();
-  const [invites, setInvites] = useState<FriendInvite[]>([]);
-  const [isLoading, setIsLoading] = useState(false);
-
-  useEffect(() => {
-    if (isOpen) {
-      setIsLoading(true);
-      userService.getFriendInvites().then((invites) => {
-        setInvites(invites);
-        setIsLoading(false);
-      });
-    }
-  }, [isOpen]);
-
-  const numberOfAcceptedInvites = invites.reduce((prev, current) => prev + (current.accepted ? 1 : 0), 0);
-  const numberOfPendingInvites = invites.length - numberOfAcceptedInvites;
-
-  const [resendingEmail, setResendingEmail] = useState<null | string>(null);
-
-  async function onResend(email) {
-    setResendingEmail(email);
-    try {
-      await userService.inviteAFriend(email);
-      notificationsService.show({
-        text: translate('modals.friendsInvitedModal.resentInvitation'),
-        type: ToastType.Info,
-      });
-    } catch (err) {
-      const castedError = errorService.castError(err);
-      notificationsService.show({
-        text: translate('modals.friendsInvitedModal.resendError', {
-          reason: castedError.message,
-        }),
-        type: ToastType.Error,
-      });
-    } finally {
-      setResendingEmail(null);
-    }
-  }
-
-  return (
-    <Modal isOpen={isOpen} onClose={onClose}>
-      <div className="flex items-center justify-between">
-        <h1 className="text-2xl font-medium text-gray-80">{translate('modals.friendsInvitedModal.title')}</h1>
-        <div className="flex">
-          <div className="flex h-7 items-center rounded-md bg-gray-5 px-2 text-gray-80">
-            <Question size={14} />
-            <p className="ml-1 text-xs">{translate('modals.friendsInvitedModal.pending')}</p>
-            <p className="ml-2 text-sm font-medium">{numberOfPendingInvites}</p>
-          </div>
-          <div className="ml-2 flex h-7 items-center rounded-md bg-gray-5 px-2 text-gray-80">
-            <CheckCircle weight="fill" className="text-green" size={14} />
-            <p className="ml-1 text-xs">{translate('modals.friendsInvitedModal.accepted')}</p>
-            <p className="ml-2 text-sm font-medium">{numberOfAcceptedInvites}</p>
-          </div>
-        </div>
-      </div>
-      {!isLoading && invites.length !== 0 ? (
-        <>
-          <div className="mt-4 flex justify-between border-b border-gray-5 px-3 pb-1 font-medium text-gray-80">
-            <div className="flex items-center">
-              <Info size={20} />
-              <p className="ml-2">{translate('modals.friendsInvitedModal.email')}</p>
-            </div>
-            <p>
-              {translate('modals.friendsInvitedModal.total')}: {invites.length}
-            </p>
-          </div>
-          {invites.map((invite) => (
-            <div className="group flex h-9 items-center justify-between rounded-md px-3 hover:bg-gray-5">
-              <div className="flex items-center">
-                {invite.accepted ? (
-                  <CheckCircle className="text-green" weight="fill" size={20} />
-                ) : (
-                  <Question className="text-gray-40" size={20} />
-                )}
-                <p className="ml-2 text-lg">{invite.guestEmail}</p>
-              </div>
-              {!invite.accepted && (
-                <button
-                  className="hidden font-medium text-primary disabled:text-gray-50 group-hover:block"
-                  disabled={resendingEmail === invite.guestEmail}
-                  onClick={() => onResend(invite.guestEmail)}
-                >
-                  {translate('modals.friendsInvitedModal.resend')}
-                </button>
-              )}
-            </div>
-          ))}
-        </>
-      ) : (
-        <div className="flex h-32 items-center justify-center">
-          {isLoading ? (
-            <Spinner className="h-8 w-8 text-gray-50" />
-          ) : (
-            <p className="font-medium text-gray-50">{translate('modals.friendsInvitedModal.empty')}</p>
-          )}
-        </div>
-      )}
-    </Modal>
-  );
-}
diff --git a/src/app/core/views/Preferences/tabs/Account/Usage.tsx b/src/app/core/views/Preferences/tabs/Account/Usage.tsx
deleted file mode 100644
index ccbef8943..000000000
--- a/src/app/core/views/Preferences/tabs/Account/Usage.tsx
+++ /dev/null
@@ -1,66 +0,0 @@
-import { SdkFactory } from 'app/core/factory/sdk';
-import usageService, { UsageDetailsProps } from 'app/drive/services/usage.service';
-import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
-import { useEffect, useState } from 'react';
-
-import { useSelector } from 'react-redux';
-import Card from '../../../../../shared/components/Card';
-import Spinner from '../../../../../shared/components/Spinner/Spinner';
-import UsageDetails from '../../../../../shared/components/UsageDetails';
-import { RootState } from '../../../../../store';
-import { PlanState } from '../../../../../store/slices/plan';
-import CurrentPlanWrapper from '../../components/CurrentPlanWrapper';
-import Section from '../../components/Section';
-import errorService from 'app/core/services/error.service';
-
-export default function Usage({ className = '' }: { className?: string }): JSX.Element {
-  const { translate } = useTranslationContext();
-  const [planUsage, setPlanUsage] = useState<UsageDetailsProps | null>(null);
-  const plan = useSelector<RootState, PlanState>((state) => state.plan);
-
-  useEffect(() => {
-    usageService
-      .getUsageDetails()
-      .then((usageDetails) => {
-        setPlanUsage(usageDetails);
-      })
-      .catch((err) => {
-        const error = errorService.castError(err);
-        errorService.reportError(error);
-      });
-  }, []);
-
-  const products: Parameters<typeof UsageDetails>[0]['products'] | null = planUsage
-    ? [
-        {
-          name: translate('sideNav.drive'),
-          usageInBytes: planUsage.drive,
-          color: 'primary',
-        },
-        {
-          name: translate('views.account.tabs.account.view.backups'),
-          usageInBytes: planUsage.backups,
-          color: 'indigo',
-        },
-      ]
-    : null;
-
-  const userSubscription = plan.subscription;
-
-  return (
-    <Section className={className} title={translate('drive.usage')}>
-      <Card>
-        {products && plan.planLimit && userSubscription ? (
-          <>
-            <CurrentPlanWrapper bytesInPlan={plan.planLimit} userSubscription={userSubscription} />
-            <UsageDetails className="mt-5" planLimitInBytes={plan.planLimit} products={products} />
-          </>
-        ) : (
-          <div className="flex items-center justify-center" style={{ height: '122px' }}>
-            <Spinner className="h-7 w-7 text-primary" />
-          </div>
-        )}
-      </Card>
-    </Section>
-  );
-}
diff --git a/src/app/core/views/Preferences/tabs/Account/UserHeader.tsx b/src/app/core/views/Preferences/tabs/Account/UserHeader.tsx
deleted file mode 100644
index bcc1d7d8d..000000000
--- a/src/app/core/views/Preferences/tabs/Account/UserHeader.tsx
+++ /dev/null
@@ -1,197 +0,0 @@
-import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
-import { Image, PencilSimple } from '@phosphor-icons/react';
-import React, { lazy, Suspense, useEffect, useRef, useState } from 'react';
-import { useSelector } from 'react-redux';
-import Button from '../../../../../shared/components/Button/Button';
-import Avatar from '../../../../../shared/components/Avatar';
-import Modal from '../../../../../shared/components/Modal';
-import { RootState } from '../../../../../store';
-import notificationsService, { ToastType } from '../../../../../notifications/services/notifications.service';
-
-import type AvatarEditorType from 'react-avatar-editor';
-import Spinner from '../../../../../shared/components/Spinner/Spinner';
-import { deleteUserAvatarThunk, updateUserAvatarThunk } from '../../../../../store/slices/user';
-import { useAppDispatch } from '../../../../../store/hooks';
-import Dropdown from '../../../../../shared/components/Dropdown';
-import { getDatabaseProfileAvatar } from '../../../../../drive/services/database.service';
-import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
-
-const AvatarEditor = lazy(() => import('react-avatar-editor'));
-
-export default function UserHeader({ className = '' }: { className?: string }): JSX.Element {
-  const { translate } = useTranslationContext();
-  const dispatch = useAppDispatch();
-  const user = useSelector<RootState, UserSettings | undefined>((state) => state.user.user);
-  if (!user) throw new Error('User is not defined');
-
-  const fullName = `${user.name} ${user.lastname}`;
-
-  const [openModal, setOpenModal] = useState(false);
-  const [avatarBlob, setAvatarBlob] = useState<Blob | null>(null);
-
-  useEffect(() => {
-    getDatabaseProfileAvatar().then((avatarData) => setAvatarBlob(avatarData?.avatarBlob ?? null));
-  }, [user.avatar]);
-
-  async function deleteAvatar() {
-    await dispatch(deleteUserAvatarThunk()).unwrap();
-    notificationsService.show({ type: ToastType.Success, text: translate('views.account.avatar.removed') });
-  }
-
-  const dropdownOptions = [{ text: translate('views.account.avatar.updatePhoto'), onClick: () => setOpenModal(true) }];
-
-  if (user.avatar) {
-    dropdownOptions.push({ text: translate('views.account.avatar.removePhoto'), onClick: deleteAvatar });
-  }
-
-  return (
-    <div className={`${className} flex h-44 flex-col items-center p-5`}>
-      <Dropdown
-        options={dropdownOptions}
-        classMenuItems={'-left-6 mt-1 w-max rounded-md border border-gray-10 bg-surface dark:bg-gray-5 py-1.5'}
-        openDirection={'right'}
-      >
-        <div className="relative">
-          <Avatar diameter={80} fullName={fullName} src={avatarBlob ? URL.createObjectURL(avatarBlob) : null} />
-          <div className="absolute -bottom-1.5 -right-0.5 flex h-8 w-8 items-center justify-center rounded-full border-3 border-surface bg-gray-5 text-gray-60 dark:bg-gray-10">
-            <PencilSimple size={16} />
-          </div>
-        </div>
-      </Dropdown>
-
-      <h1 className="mt-3 text-xl font-medium text-gray-80">{fullName}</h1>
-      <h2 className="leading-tight text-gray-50">{user.email}</h2>
-      <UploadAvatarModal isOpen={openModal} onClose={() => setOpenModal(false)} />
-    </div>
-  );
-}
-
-function UploadAvatarModal({ isOpen, onClose }: { isOpen: boolean; onClose: () => void }) {
-  const { translate } = useTranslationContext();
-  const dispatch = useAppDispatch();
-  const inputRef = useRef<HTMLInputElement>(null);
-  const editorRef = useRef<AvatarEditorType>(null);
-  const [state, setState] = useState<
-    { tag: 'empty' } | { tag: 'editing' | 'loading' | 'error'; source: File; zoom: number }
-  >({ tag: 'empty' });
-
-  useEffect(() => {
-    if (isOpen) setState({ tag: 'empty' });
-  }, [isOpen]);
-
-  function validateFile(file: File) {
-    if (file.size > 1024 * 1024 * 10) {
-      notificationsService.show({ type: ToastType.Error, text: translate('views.account.avatar.underLimitSize') });
-    } else {
-      setState({ tag: 'editing', source: file, zoom: 1 });
-    }
-  }
-  function onInputChange(e: React.ChangeEvent<HTMLInputElement>) {
-    e.preventDefault();
-    const file = e.target.files?.[0];
-
-    if (file) {
-      validateFile(file);
-    }
-  }
-
-  function onDrop(e: React.DragEvent<HTMLDivElement>) {
-    e.preventDefault();
-    const file = e.dataTransfer.files[0];
-
-    if (file) {
-      validateFile(file);
-    }
-  }
-
-  async function onSave() {
-    if (state.tag === 'empty') return;
-
-    setState({ ...state, tag: 'loading' });
-
-    try {
-      const avatarBlob = await new Promise<Blob>((resolve, reject) =>
-        editorRef.current?.getImageScaledToCanvas().toBlob((blob) => (blob ? resolve(blob) : reject())),
-      );
-
-      await dispatch(updateUserAvatarThunk({ avatar: avatarBlob })).unwrap();
-
-      notificationsService.show({ type: ToastType.Success, text: translate('views.account.avatar.success') });
-      onClose();
-    } catch (err) {
-      console.error(err);
-      notificationsService.show({ type: ToastType.Error, text: translate('views.account.avatar.error') });
-    }
-  }
-
-  return (
-    <Modal isOpen={isOpen} onClose={onClose}>
-      <h1 className="text-2xl font-medium text-gray-80">{translate('views.account.avatar.title')}</h1>
-      <div className="mt-4">
-        {state.tag !== 'empty' ? (
-          <div>
-            <Suspense fallback={<Spinner className="mx-auto mt-4 h-10 w-10" />}>
-              <AvatarEditor
-                ref={editorRef}
-                scale={state.zoom}
-                className="mx-auto"
-                image={state.source}
-                width={320}
-                height={320}
-              />
-              <div className="mt-1 flex justify-center">
-                <input
-                  className="mx-auto"
-                  type="range"
-                  min={1}
-                  max={2}
-                  step={0.01}
-                  defaultValue={1}
-                  disabled={state.tag === 'loading'}
-                  onChange={(e) => setState({ ...state, zoom: parseFloat(e.target.value) })}
-                />
-              </div>
-            </Suspense>
-          </div>
-        ) : (
-          <>
-            <input accept="image/*" ref={inputRef} className="hidden" type="file" onChange={onInputChange} />
-            <div
-              className="flex h-32 w-full cursor-pointer items-center justify-center rounded-md border-2 border-dashed border-gray-10"
-              onClick={() => inputRef.current?.click()}
-              onDrop={onDrop}
-              onDragOver={(e) => {
-                e.stopPropagation();
-                e.preventDefault();
-                e.dataTransfer.dropEffect = 'copy';
-              }}
-            >
-              <div className="text-gray-20 hover:text-gray-30">
-                <Image className="mx-auto" weight="light" size={80} />
-                <p className="font-medium">{translate('views.account.avatar.dragNDrop')}</p>
-              </div>
-            </div>
-          </>
-        )}
-      </div>
-      <div className="mt-6 flex justify-end">
-        <div className="flex">
-          {state.tag === 'empty' ? (
-            <Button variant="secondary" onClick={onClose}>
-              {translate('actions.cancel')}
-            </Button>
-          ) : (
-            <Button variant="secondary" onClick={() => setState({ tag: 'empty' })} disabled={state.tag === 'loading'}>
-              {translate('actions.back')}
-            </Button>
-          )}
-          {state.tag !== 'empty' && (
-            <Button loading={state.tag === 'loading'} className="ml-2" onClick={onSave}>
-              {translate('actions.save')}
-            </Button>
-          )}
-        </div>
-      </div>
-    </Modal>
-  );
-}
diff --git a/src/app/core/views/Preferences/tabs/Account/index.tsx b/src/app/core/views/Preferences/tabs/Account/index.tsx
deleted file mode 100644
index e6189d5aa..000000000
--- a/src/app/core/views/Preferences/tabs/Account/index.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
-import { RootState } from 'app/store';
-import { useSelector } from 'react-redux';
-import AccountDetails from './AccountDetails';
-import DeleteAccount from './DeleteAccount';
-import InviteAFriend from './InviteAFriend';
-import Language from './Language';
-import Usage from './Usage';
-import UserHeader from './UserHeader';
-import Appearance from './Appearance';
-import ContactSupport from './ContactSupport';
-
-export default function AccountTab({ className = '' }: { className?: string }): JSX.Element {
-  const user = useSelector<RootState, UserSettings | undefined>((state) => state.user.user);
-  const isFreeAccount = user?.hasReferralsProgram;
-
-  return (
-    <>
-      {isFreeAccount ? (
-        <div className={className}>
-          <UserHeader />
-          <div className="mt-8 flex flex-col flex-wrap gap-x-10 gap-y-8 xl:flex-row">
-            <div className="flex flex-1 flex-col space-y-8">
-              <Usage />
-              <Language />
-              <InviteAFriend />
-            </div>
-            <div className="flex flex-1 flex-col space-y-8">
-              <AccountDetails />
-              <Appearance />
-              <ContactSupport />
-              <DeleteAccount />
-            </div>
-          </div>
-        </div>
-      ) : (
-        <div className={className}>
-          <UserHeader />
-          <div className="mt-8 flex flex-row flex-wrap gap-x-10 gap-y-8">
-            <div className="flex flex-1 flex-col space-y-8">
-              <Usage />
-              <Language />
-              <Appearance />
-              <DeleteAccount />
-            </div>
-            <div className="flex flex-1 flex-col space-y-8">
-              <AccountDetails />
-              <ContactSupport />
-            </div>
-          </div>
-        </div>
-      )}
-    </>
-  );
-}
diff --git a/src/app/core/views/Preferences/tabs/Billing/CurrentPlanExtended.tsx b/src/app/core/views/Preferences/tabs/Billing/CurrentPlanExtended.tsx
deleted file mode 100644
index 8cf6ff6d5..000000000
--- a/src/app/core/views/Preferences/tabs/Billing/CurrentPlanExtended.tsx
+++ /dev/null
@@ -1,154 +0,0 @@
-import analyticsService, { trackCanceledSubscription } from '../../../../../analytics/services/analytics.service';
-import { FreeStoragePlan, StoragePlan } from '../../../../../drive/types';
-import { useTranslationContext } from '../../../../../i18n/provider/TranslationProvider';
-import moneyService from '../../../../../payment/services/money.service';
-import { RenewalPeriod } from '../../../../../payment/types';
-import { useEffect, useState } from 'react';
-import { useSelector } from 'react-redux';
-import notificationsService, { ToastType } from '../../../../../notifications/services/notifications.service';
-import paymentService from '../../../../../payment/services/payment.service';
-import Card from '../../../../../shared/components/Card';
-import Spinner from '../../../../../shared/components/Spinner/Spinner';
-import { RootState } from '../../../../../store';
-import { useAppDispatch } from '../../../../../store/hooks';
-import { PlanState, planThunks } from '../../../../../store/slices/plan';
-import CurrentPlanWrapper from '../../components/CurrentPlanWrapper';
-import Section from '../../components/Section';
-import CancelSubscriptionModal from './CancelSubscriptionModal';
-import Button from 'app/shared/components/Button/Button';
-
-export default function CurrentPlanExtended({ className = '' }: { className?: string }): JSX.Element {
-  const plan = useSelector<RootState, PlanState>((state) => state.plan);
-  const [isCancelSubscriptionModalOpen, setIsCancelSubscriptionModalOpen] = useState(false);
-  const [cancellingSubscription, setCancellingSubscription] = useState(false);
-  const dispatch = useAppDispatch();
-  const { translate } = useTranslationContext();
-
-  const userSubscription = plan.subscription;
-
-  let subscriptionExtension:
-    | { daysUntilRenewal: string; interval: 'monthly' | 'yearly'; renewDate: string }
-    | undefined;
-
-  if (userSubscription?.type === 'subscription') {
-    const nextPayment = new Date(userSubscription.nextPayment * 1000);
-
-    const renewDate = Intl.DateTimeFormat(undefined, { dateStyle: 'short' }).format(nextPayment);
-
-    const interval = userSubscription.interval === 'month' ? 'monthly' : 'yearly';
-
-    const daysUntilRenewal = ((nextPayment.valueOf() - new Date().valueOf()) / (1000 * 3600 * 24)).toFixed(0);
-
-    subscriptionExtension = { daysUntilRenewal, interval, renewDate };
-  }
-
-  async function cancelSubscription(feedback: string) {
-    setCancellingSubscription(true);
-    try {
-      await paymentService.cancelSubscription();
-      notificationsService.show({ text: translate('notificationMessages.successCancelSubscription') });
-      setIsCancelSubscriptionModalOpen(false);
-      trackCanceledSubscription({ feedback });
-    } catch (err) {
-      console.error(err);
-      notificationsService.show({
-        text: translate('notificationMessages.errorCancelSubscription'),
-        type: ToastType.Error,
-      });
-    } finally {
-      setCancellingSubscription(false);
-      setTimeout(() => {
-        dispatch(planThunks.initializeThunk()).unwrap();
-      }, 1000);
-    }
-  }
-
-  const getPlanName = (storagePlan: StoragePlan | null) => {
-    return storagePlan?.simpleName || FreeStoragePlan.simpleName;
-  };
-
-  const getPlanInfo = (storagePlan: StoragePlan | null) => {
-    if (storagePlan) {
-      if (storagePlan.paymentInterval === RenewalPeriod.Annually) {
-        return (
-          moneyService.getCurrencySymbol(storagePlan.currency) +
-          storagePlan.price +
-          '/' +
-          translate('views.account.tabs.billing.cancelSubscriptionModal.infoBox.year')
-        );
-      } else {
-        return (
-          moneyService.getCurrencySymbol(storagePlan.currency) +
-          storagePlan.monthlyPrice +
-          '/' +
-          translate('views.account.tabs.billing.cancelSubscriptionModal.infoBox.month')
-        );
-      }
-    } else {
-      return translate('views.account.tabs.billing.cancelSubscriptionModal.infoBox.free');
-    }
-  };
-
-  const getCurrentUsage = () => {
-    return plan.usageDetails?.total || -1;
-  };
-
-  return (
-    <Section className={className} title={translate('views.account.tabs.billing.currentPlan')}>
-      <Card>
-        {plan.planLimit && userSubscription ? (
-          <>
-            <CurrentPlanWrapper userSubscription={userSubscription} bytesInPlan={plan.planLimit} />
-            {subscriptionExtension && (
-              <div className="mt-4 flex flex-col items-center border-t border-gray-5">
-                <div className="flex flex-col items-center py-4">
-                  <p className="font-medium text-gray-80">
-                    {translate('views.account.tabs.billing.subsRenew', {
-                      daysUntilRenewal: subscriptionExtension.daysUntilRenewal,
-                    })}
-                  </p>
-                  <p className="text-sm text-gray-50">
-                    {translate('views.account.tabs.billing.billed', {
-                      interval:
-                        subscriptionExtension.interval === 'monthly'
-                          ? translate('general.renewalPeriod.monthly')
-                          : translate('general.renewalPeriod.annually'),
-                      renewDate: subscriptionExtension.renewDate,
-                    })}
-                  </p>
-                </div>
-
-                <Button
-                  variant="secondary"
-                  disabled={cancellingSubscription}
-                  onClick={() => {
-                    analyticsService.page('Cancelation Incentive');
-                    setIsCancelSubscriptionModalOpen(true);
-                  }}
-                >
-                  {translate('views.account.tabs.billing.cancelSubscriptionModal.title')}
-                </Button>
-
-                <CancelSubscriptionModal
-                  isOpen={isCancelSubscriptionModalOpen}
-                  onClose={() => {
-                    setIsCancelSubscriptionModalOpen(false);
-                  }}
-                  cancellingSubscription={cancellingSubscription}
-                  cancelSubscription={cancelSubscription}
-                  currentPlanName={getPlanName(plan.individualPlan || plan.teamPlan)}
-                  currentPlanInfo={getPlanInfo(plan.individualPlan || plan.teamPlan)}
-                  currentUsage={getCurrentUsage()}
-                />
-              </div>
-            )}
-          </>
-        ) : (
-          <div className="flex items-center justify-center" style={{ height: '122px' }}>
-            <Spinner className="h-7 w-7 text-primary" />
-          </div>
-        )}
-      </Card>
-    </Section>
-  );
-}
diff --git a/src/app/core/views/Preferences/tabs/Billing/Invoices.tsx b/src/app/core/views/Preferences/tabs/Billing/Invoices.tsx
deleted file mode 100644
index fe49fa726..000000000
--- a/src/app/core/views/Preferences/tabs/Billing/Invoices.tsx
+++ /dev/null
@@ -1,97 +0,0 @@
-import { useEffect, useState } from 'react';
-import { Invoice } from '@internxt/sdk/dist/drive/payments/types';
-import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
-import { DownloadSimple } from '@phosphor-icons/react';
-import { bytesToString } from '../../../../../drive/services/size.service';
-import paymentService from '../../../../../payment/services/payment.service';
-import Card from '../../../../../shared/components/Card';
-import Spinner from '../../../../../shared/components/Spinner/Spinner';
-import Section from '../../components/Section';
-import dateService from '../../../../../core/services/date.service';
-
-export default function Invoices({ className = '' }: { className?: string }): JSX.Element {
-  const [state, setState] = useState<{ tag: 'ready'; invoices: Invoice[] } | { tag: 'loading' | 'empty' }>({
-    tag: 'loading',
-  });
-  const { translate } = useTranslationContext();
-
-  useEffect(() => {
-    paymentService
-      .getInvoices()
-      .then((invoices) => setState({ tag: 'ready', invoices }))
-      .catch(() => setState({ tag: 'empty' }));
-  }, []);
-
-  const invoices = state.tag === 'ready' ? state.invoices : [];
-
-  function isLastInvoice(i: number) {
-    return invoices && i === invoices.length - 1;
-  }
-
-  function displayDate(unixSeconds: number) {
-    const date = new Date(unixSeconds * 1000);
-
-    return dateService.format(date, 'dddd, DD MMMM YYYY');
-  }
-
-  const body =
-    state.tag === 'empty' ? (
-      <Empty />
-    ) : state.tag === 'ready' ? (
-      <div className="flex">
-        <div className="flex grow flex-col">
-          <h1 className="pb-1 text-sm font-medium text-gray-80">
-            {translate('views.account.tabs.billing.invoices.billingDate')}
-          </h1>
-          {invoices.map(({ created, id }, i) => (
-            <div
-              key={id}
-              className={`border-t border-gray-5 ${isLastInvoice(i) ? 'pt-2' : 'py-2'} text-sm text-gray-80`}
-            >
-              {displayDate(created)}
-            </div>
-          ))}
-        </div>
-        <div className="flex flex-col">
-          <h1 className="pb-1 text-sm font-medium text-gray-80">
-            {translate('views.account.tabs.billing.invoices.plan')}
-          </h1>
-          {invoices.map(({ bytesInPlan, pdf, id }, i) => (
-            <div key={id} className={`border-t border-gray-5 ${isLastInvoice(i) ? 'pt-2' : 'py-2'}`}>
-              <div className="flex justify-between">
-                <p className="text-sm text-gray-50">{bytesToString(bytesInPlan)}</p>
-                <a
-                  className="ml-4 text-primary hover:text-primary-dark dark:text-white dark:hover:text-white"
-                  href={pdf}
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                  <DownloadSimple size={18} />
-                </a>
-              </div>
-            </div>
-          ))}
-        </div>
-      </div>
-    ) : (
-      <div className="flex h-10 items-center justify-center">
-        <Spinner className="h-6 w-6" />
-      </div>
-    );
-
-  return (
-    <Section className={className} title={translate('views.account.tabs.billing.invoices.head')}>
-      <Card>{body}</Card>
-    </Section>
-  );
-}
-
-function Empty() {
-  const { translate } = useTranslationContext();
-  return (
-    <div className="text-center">
-      <h1 className="font-medium text-gray-60">{translate('views.account.tabs.billing.invoices.empty.title')}</h1>
-      <p className="text-sm text-gray-50">{translate('views.account.tabs.billing.invoices.empty.subtitle')}</p>
-    </div>
-  );
-}
diff --git a/src/app/core/views/Preferences/tabs/Billing/PaymentMethod.tsx b/src/app/core/views/Preferences/tabs/Billing/PaymentMethod.tsx
deleted file mode 100644
index bb664f0c6..000000000
--- a/src/app/core/views/Preferences/tabs/Billing/PaymentMethod.tsx
+++ /dev/null
@@ -1,208 +0,0 @@
-import { PaymentMethod } from '@internxt/sdk/dist/drive/payments/types';
-import { Elements, PaymentElement, useElements, useStripe } from '@stripe/react-stripe-js';
-import { useEffect, useState } from 'react';
-import paymentService from '../../../../../payment/services/payment.service';
-import Button from '../../../../../shared/components/Button/Button';
-import Card from '../../../../../shared/components/Card';
-import Modal from '../../../../../shared/components/Modal';
-import Spinner from '../../../../../shared/components/Spinner/Spinner';
-import useEffectAsync from '../../../../hooks/useEffectAsync';
-import Section from '../../components/Section';
-
-import visaIcon from '../../../../../../assets/icons/card-brands/visa.png';
-import amexIcon from '../../../../../../assets/icons/card-brands/amex.png';
-import dinersIcon from '../../../../../../assets/icons/card-brands/diners_club.png';
-import discoverIcon from '../../../../../../assets/icons/card-brands/discover.png';
-import jcbIcon from '../../../../../../assets/icons/card-brands/jcb.png';
-import mastercardIcon from '../../../../../../assets/icons/card-brands/mastercard.png';
-import unionpayIcon from '../../../../../../assets/icons/card-brands/unionpay.png';
-import unknownIcon from '../../../../../../assets/icons/card-brands/unknown.png';
-import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
-import { Source } from '@stripe/stripe-js';
-
-interface StateProps {
-  tag: 'ready' | 'loading' | 'empty';
-  card?: PaymentMethod['card'];
-  type?: Source.Type;
-}
-
-const cardBrands: Record<PaymentMethod['card']['brand'], string> = {
-  visa: visaIcon,
-  amex: amexIcon,
-  diners: dinersIcon,
-  discover: discoverIcon,
-  jcb: jcbIcon,
-  mastercard: mastercardIcon,
-  unionpay: unionpayIcon,
-  unknown: unknownIcon,
-};
-
-const paymentsTypes = {
-  paypal: 'PayPal',
-  sepa_debit: 'SEPA Direct Debit',
-};
-
-export default function PaymentMethodComponent({ className = '' }: { className?: string }): JSX.Element {
-  const [isModalOpen, setIsModalOpen] = useState(false);
-  const [state, setState] = useState<StateProps>({
-    tag: 'loading',
-  });
-  const { translate } = useTranslationContext();
-
-  useEffect(() => {
-    paymentService
-      .getDefaultPaymentMethod()
-      .then((data: PaymentMethod | Source) => {
-        if (data.card) {
-          setState({ tag: 'ready', card: data.card as PaymentMethod['card'] });
-        } else if ('type' in data) {
-          setState({ tag: 'ready', type: data.type });
-        } else {
-          setState({ tag: 'empty' });
-        }
-      })
-      .catch(() => setState({ tag: 'empty' }));
-  }, []);
-
-  return (
-    <Section className={className} title={translate('views.account.tabs.billing.paymentMethod.head')}>
-      <Card>
-        {(state.tag === 'ready' && state.card) || (state.tag === 'ready' && state.type) ? (
-          <InitialState payment={state} setIsModalOpen={setIsModalOpen} />
-        ) : state.tag === 'loading' ? (
-          <div className="flex h-10 items-center justify-center">
-            <Spinner className="h-5 w-5" />
-          </div>
-        ) : (
-          <Empty />
-        )}
-      </Card>
-
-      <PaymentMethodModal isOpen={isModalOpen} onClose={() => setIsModalOpen(false)} />
-    </Section>
-  );
-}
-
-//Create a function that returns the component when the state.tag = ready
-function InitialState({ payment, setIsModalOpen }: { payment: StateProps; setIsModalOpen: (value: boolean) => void }) {
-  const { translate } = useTranslationContext();
-  const { card, type } = payment;
-
-  return (
-    <div className="flex">
-      {card ? (
-        <>
-          <img className="h-9 rounded-md" src={cardBrands[card.brand]} />
-          <div className="ml-4 flex-1">
-            <div className="flex items-center text-gray-80">
-              <p style={{ lineHeight: 1 }} className="font-serif text-2xl">
-                {'···· ···· ····'}
-              </p>
-              <p className="ml-1.5 text-sm">{card.last4}</p>
-            </div>
-            <p className="text-xs text-gray-50">{`${card.exp_month}/${card.exp_year}`}</p>
-          </div>
-          <Button variant="secondary" onClick={() => setIsModalOpen(true)}>
-            {translate('actions.edit')}
-          </Button>
-        </>
-      ) : (
-        type && (
-          <>
-            <div className="ml-4 flex-1">
-              <div className="flex items-center text-gray-100">
-                <p className="text-base font-medium leading-tight">{paymentsTypes[type]}</p>
-              </div>
-              <p className="text-sm text-gray-50">
-                {translate('views.account.tabs.billing.paymentMethod.contactUs.description')}
-              </p>
-            </div>
-            <Button variant="secondary" onClick={() => window.open('mailto:hello@internxt.com', '_blank')}>
-              {translate('views.account.tabs.billing.paymentMethod.contactUs.contact')}
-            </Button>
-          </>
-        )
-      )}
-    </div>
-  );
-}
-
-function PaymentMethodModal({ isOpen, onClose }: { isOpen: boolean; onClose: () => void }) {
-  const [setupIntentSecret, setSetupIntentSecret] = useState<null | string>(null);
-  const { translate } = useTranslationContext();
-
-  useEffectAsync(async () => {
-    if (isOpen) {
-      setSetupIntentSecret(null);
-
-      const { clientSecret } = await paymentService.createSetupIntent();
-
-      setSetupIntentSecret(clientSecret);
-    }
-  }, [isOpen]);
-
-  const spinnerSection = (
-    <div className="flex h-32 items-center justify-center">
-      <Spinner className="h-8 w-8 text-gray-80" />
-    </div>
-  );
-
-  return (
-    <Modal isOpen={isOpen} onClose={onClose}>
-      <h1 className="text-2xl font-medium text-gray-80">
-        {translate('views.account.tabs.billing.paymentMethod.title')}
-      </h1>
-      {setupIntentSecret ? (
-        <Elements stripe={paymentService.getStripe()} options={{ clientSecret: setupIntentSecret }}>
-          <PaymentForm onClose={onClose} />
-        </Elements>
-      ) : (
-        spinnerSection
-      )}
-    </Modal>
-  );
-}
-function PaymentForm({ onClose }: { onClose: () => void }) {
-  const [error, setError] = useState<null | string>(null);
-  const { translate } = useTranslationContext();
-  const stripe = useStripe();
-  const elements = useElements();
-  async function handleSubmit() {
-    if (!stripe || !elements) return;
-
-    const result = await stripe.confirmSetup({
-      elements,
-      confirmParams: { return_url: window.location.href },
-    });
-
-    if (result.error.message) {
-      setError(result.error.message);
-    } else {
-      setError('Something went wrong while trying to change your payment method');
-    }
-  }
-  return (
-    <>
-      <PaymentElement className="mt-5" />
-      {error && <p className="mt-2 text-sm text-red">{error}</p>}
-      <div className="mt-3 flex items-center justify-end">
-        <Button variant="secondary" onClick={onClose}>
-          {translate('actions.cancel')}
-        </Button>
-        <Button onClick={handleSubmit} className="ml-2">
-          {translate('actions.save')}
-        </Button>
-      </div>
-    </>
-  );
-}
-
-function Empty() {
-  const { translate } = useTranslationContext();
-  return (
-    <div className="text-center">
-      <h1 className="font-medium text-gray-60">{translate('views.account.tabs.billing.paymentMethod.empty.title')}</h1>
-      <p className="text-sm text-gray-50">{translate('views.account.tabs.billing.paymentMethod.empty.subtitle')}</p>
-    </div>
-  );
-}
diff --git a/src/app/core/views/Preferences/tabs/Billing/index.tsx b/src/app/core/views/Preferences/tabs/Billing/index.tsx
deleted file mode 100644
index d409f889a..000000000
--- a/src/app/core/views/Preferences/tabs/Billing/index.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import CurrentPlanExtended from './CurrentPlanExtended';
-import Invoices from './Invoices';
-import PaymentMethod from './PaymentMethod';
-
-export default function BillingTab({ className = '' }: { className?: string }): JSX.Element {
-  return (
-    <div className={className}>
-      <div className="flex flex-col flex-wrap gap-y-8 gap-x-10 xl:flex-row">
-        <div className="flex flex-1 flex-col space-y-8">
-          <CurrentPlanExtended />
-        </div>
-        <div className="flex flex-1 flex-col space-y-8">
-          <PaymentMethod />
-          <Invoices />
-        </div>
-      </div>
-    </div>
-  );
-}
diff --git a/src/app/core/views/Preferences/tabs/Plans/Features.tsx b/src/app/core/views/Preferences/tabs/Plans/Features.tsx
deleted file mode 100644
index d983f8a58..000000000
--- a/src/app/core/views/Preferences/tabs/Plans/Features.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
-import { ArrowsClockwise, Check, LockKey, Shield } from '@phosphor-icons/react';
-
-export default function Features({ className = '' }: { className?: string }): JSX.Element {
-  const { translate } = useTranslationContext();
-  const sections: { title: string; icon: typeof Shield; points: string[] }[] = [
-    {
-      title: translate('views.account.tabs.plans.features.sections.section1.title'),
-      icon: Shield,
-      points: [
-        translate('views.account.tabs.plans.features.sections.section1.point1'),
-        translate('views.account.tabs.plans.features.sections.section1.point2'),
-        translate('views.account.tabs.plans.features.sections.section1.point3'),
-      ],
-    },
-    {
-      title: translate('views.account.tabs.plans.features.sections.section2.title'),
-      icon: LockKey,
-      points: [
-        translate('views.account.tabs.plans.features.sections.section2.point1'),
-        translate('views.account.tabs.plans.features.sections.section2.point2'),
-        translate('views.account.tabs.plans.features.sections.section2.point3'),
-      ],
-    },
-    {
-      title: translate('views.account.tabs.plans.features.sections.section3.title'),
-      icon: ArrowsClockwise,
-      points: [
-        translate('views.account.tabs.plans.features.sections.section3.point1'),
-        translate('views.account.tabs.plans.features.sections.section3.point2'),
-        translate('views.account.tabs.plans.features.sections.section3.point3'),
-      ],
-    },
-  ];
-  return (
-    <div className={`${className}`}>
-      <h1 className="text-2xl font-medium text-gray-100 lg:text-center">
-        {translate('views.account.tabs.plans.features.title')}
-      </h1>
-      <div className="mt-7 justify-between space-y-6 lg:flex lg:space-y-0 lg:space-x-6">
-        {sections.map((section) => (
-          <div key={section.title} className="flex flex-1 flex-col">
-            <div className="flex items-center">
-              <section.icon size={24} weight="duotone" className="text-primary" />
-              <h1 className="ml-2 flex-1 text-lg font-medium text-gray-80">{section.title}</h1>
-            </div>
-            <div className="mt-3 space-y-2 pl-2">
-              {section.points.map((point) => (
-                <div key={point} className="flex flex-row">
-                  <Check size={16} weight="bold" className="mt-1 text-gray-40" />
-                  <p className="ml-2 flex-1 text-gray-80">{point}</p>
-                </div>
-              ))}
-            </div>
-          </div>
-        ))}
-      </div>
-    </div>
-  );
-}
diff --git a/src/app/core/views/Preferences/tabs/Plans/PlanSelector.tsx b/src/app/core/views/Preferences/tabs/Plans/PlanSelector.tsx
deleted file mode 100644
index fbe48b1da..000000000
--- a/src/app/core/views/Preferences/tabs/Plans/PlanSelector.tsx
+++ /dev/null
@@ -1,496 +0,0 @@
-import { DisplayPrice } from '@internxt/sdk/dist/drive/payments/types';
-import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
-import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
-import { useEffect, useState } from 'react';
-import { useSelector } from 'react-redux';
-import { ArrowRight } from '@phosphor-icons/react';
-import { bytesToString } from '../../../../../drive/services/size.service';
-import notificationsService, { ToastType } from '../../../../../notifications/services/notifications.service';
-import paymentService from '../../../../../payment/services/payment.service';
-import Button from '../../../../../shared/components/Button/Button';
-import { RootState } from '../../../../../store';
-import { useAppDispatch } from '../../../../../store/hooks';
-import { PlanState, planThunks } from '../../../../../store/slices/plan';
-import Modal from 'app/shared/components/Modal';
-import moneyService from 'app/payment/services/money.service';
-import { loadStripe, Stripe } from '@stripe/stripe-js';
-import envService from 'app/core/services/env.service';
-import errorService from 'app/core/services/error.service';
-
-const WEBSITE_BASE_URL = process.env.REACT_APP_WEBSITE_URL;
-
-const productValue = {
-  US: 'usd',
-};
-
-export default function PlanSelector({ className = '' }: { className?: string }): JSX.Element {
-  const dispatch = useAppDispatch();
-  const { translate } = useTranslationContext();
-
-  const plan = useSelector<RootState, PlanState>((state) => state.plan);
-  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-  const user = useSelector<RootState, UserSettings>((state) => state.user.user!);
-  if (user === undefined) throw new Error('User is not defined');
-
-  const { subscription } = plan;
-
-  const priceButtons = subscription?.type === 'subscription' ? 'change' : 'upgrade';
-
-  const [prices, setPrices] = useState<DisplayPrice[]>([]);
-  const [interval, setInterval] = useState<DisplayPrice['interval']>('year');
-  const [isDialogOpen, setIsDialogOpen] = useState(false);
-  const [priceIdSelected, setPriceIdSelected] = useState('');
-
-  useEffect(() => {
-    const app = fetch(`${WEBSITE_BASE_URL}/api/get_country`, {
-      method: 'GET',
-    });
-
-    app
-      .then((res) => res.json())
-      .then(({ country }) => {
-        const currencyValue = productValue[country] ?? 'eur';
-        paymentService.getPrices(currencyValue).then(setPrices);
-      })
-      .catch((error) => {
-        console.error(error);
-        paymentService
-          .getPrices('eur')
-          .then(setPrices)
-          .catch((err) => {
-            const error = errorService.castError(err);
-            errorService.reportError(error);
-          });
-      });
-  }, []);
-
-  let stripe;
-
-  async function getStripe(): Promise<Stripe> {
-    if (!stripe) {
-      stripe = (await loadStripe(
-        envService.isProduction() ? process.env.REACT_APP_STRIPE_PK : process.env.REACT_APP_STRIPE_TEST_PK,
-      )) as Stripe;
-    }
-
-    return stripe;
-  }
-
-  const pricesFilteredAndSorted = prices
-    ?.filter((price) => price.interval === interval)
-    .sort((a, b) => a.amount - b.amount);
-
-  const [loadingPlanAction, setLoadingPlanAction] = useState<string | null>(null);
-
-  async function onPlanClick(priceId: string, currency: string) {
-    setLoadingPlanAction(priceId);
-
-    if (subscription?.type !== 'subscription') {
-      try {
-        const response = await paymentService.createCheckoutSession({
-          price_id: priceId,
-          success_url: `${window.location.origin}/checkout/success`,
-          cancel_url: `${window.location.origin}/checkout/cancel?price_id=${priceId}`,
-          customer_email: user.email,
-          mode: interval === 'lifetime' ? 'payment' : 'subscription',
-          currency: currency,
-        });
-        localStorage.setItem('sessionId', response.sessionId);
-        await paymentService.redirectToCheckout(response);
-      } catch (err) {
-        const error = errorService.castError(err);
-        notificationsService.show({
-          text: translate('notificationMessages.errorCancelSubscription'),
-          type: ToastType.Error,
-        });
-        errorService.reportError(error);
-      } finally {
-        setLoadingPlanAction(null);
-        setIsDialogOpen(false);
-      }
-    } else {
-      if (interval === 'lifetime') {
-        try {
-          const response = await paymentService.createCheckoutSession({
-            price_id: priceId,
-            success_url: `${window.location.origin}/checkout/success`,
-            cancel_url: `${window.location.origin}/checkout/cancel?price_id=${priceId}`,
-            customer_email: user.email,
-            mode: 'payment',
-            currency: currency,
-          });
-          localStorage.setItem('sessionId', response.sessionId);
-          await paymentService.redirectToCheckout(response).then(async (result) => {
-            await paymentService.cancelSubscription();
-            if (result.error) {
-              notificationsService.show({
-                type: ToastType.Error,
-                text: result.error.message as string,
-              });
-            } else {
-              notificationsService.show({
-                type: ToastType.Success,
-                text: 'Payment successful',
-              });
-            }
-          });
-        } catch (err) {
-          const error = errorService.castError(err);
-          errorService.reportError(error);
-          notificationsService.show({
-            text: translate('notificationMessages.errorCancelSubscription'),
-            type: ToastType.Error,
-          });
-        }
-      } else {
-        try {
-          const stripe = await getStripe();
-          const updatedSubscription = await paymentService.updateSubscriptionPrice(priceId);
-          if (updatedSubscription.request3DSecure) {
-            stripe
-              .confirmCardPayment(updatedSubscription.clientSecret)
-              .then(async (result) => {
-                if (result.error) {
-                  notificationsService.show({
-                    type: ToastType.Error,
-                    text: result.error.message as string,
-                  });
-                } else {
-                  notificationsService.show({ text: 'Subscription updated successfully', type: ToastType.Success });
-                  dispatch(planThunks.initializeThunk()).unwrap();
-                }
-              })
-              .catch((err) => {
-                const error = errorService.castError(err);
-                errorService.reportError(error);
-                notificationsService.show({
-                  text: translate('notificationMessages.errorCancelSubscription'),
-                  type: ToastType.Error,
-                });
-              });
-          } else {
-            notificationsService.show({ text: 'Subscription updated successfully', type: ToastType.Success });
-            dispatch(planThunks.initializeThunk()).unwrap();
-          }
-        } catch (err) {
-          const error = errorService.castError(err);
-          errorService.reportError(error);
-          notificationsService.show({
-            text: translate('notificationMessages.errorCancelSubscription'),
-            type: ToastType.Error,
-          });
-        } finally {
-          dispatch(planThunks.initializeThunk()).unwrap();
-          setLoadingPlanAction(null);
-          setIsDialogOpen(false);
-        }
-      }
-    }
-  }
-
-  const onPlanSelected = (priceId: string) => {
-    setPriceIdSelected(priceId);
-    setIsDialogOpen(true);
-  };
-
-  return (
-    <>
-      {prices && (
-        <ChangePlanDialog
-          prices={prices}
-          isDialgOpen={isDialogOpen}
-          setIsDialogOpen={setIsDialogOpen}
-          onPlanClick={onPlanClick}
-          priceIdSelected={priceIdSelected}
-        />
-      )}
-      <div className={`${className}`}>
-        <div className="flex justify-center">
-          <div className="flex flex-row rounded-lg bg-gray-5 p-0.5 text-sm">
-            <IntervalSwitch
-              active={interval === 'month'}
-              text={translate('general.renewal.monthly')}
-              onClick={() => setInterval('month')}
-            />
-            <IntervalSwitch
-              active={interval === 'year'}
-              text={translate('general.renewal.annually')}
-              onClick={() => setInterval('year')}
-            />
-            <IntervalSwitch
-              active={interval === 'lifetime'}
-              text={translate('general.renewal.lifetime')}
-              onClick={() => setInterval('lifetime')}
-            />
-          </div>
-        </div>
-        <div className="mt-5 flex flex-col justify-center gap-y-5 lg:flex-row lg:gap-x-5 lg:gap-y-0">
-          {pricesFilteredAndSorted?.map((price) => (
-            <Price
-              key={price.id}
-              {...price}
-              button={
-                subscription?.type === 'subscription' && subscription.priceId === price.id ? 'current' : priceButtons
-              }
-              onClick={() => onPlanSelected(price.id)}
-              loading={loadingPlanAction === price.id}
-              disabled={loadingPlanAction !== null}
-              onPlanClick={() => onPlanClick(price.id, price.currency)}
-              priceID={price.id}
-              currency={price.currency}
-            />
-          ))}
-        </div>
-      </div>
-    </>
-  );
-}
-
-function IntervalSwitch({
-  text,
-  active,
-  onClick,
-}: {
-  text: string;
-  active: boolean;
-  onClick?: () => void;
-}): JSX.Element {
-  return (
-    <button
-      className={`${
-        active ? 'bg-surface text-gray-100 shadow-sm dark:bg-gray-20' : 'text-gray-50'
-      } rounded-lg px-6 py-1.5 font-medium`}
-      onClick={onClick}
-    >
-      {text}
-    </button>
-  );
-}
-
-function Price({
-  bytes,
-  amount,
-  interval,
-  button,
-  className = '',
-  onClick,
-  disabled,
-  loading,
-  onPlanClick,
-  priceID,
-  currency,
-}: DisplayPrice & {
-  button: 'change' | 'current' | 'upgrade';
-  onClick?: () => void;
-  className?: string;
-  disabled: boolean;
-  loading: boolean;
-  onPlanClick: (value: string) => void;
-  priceID: string;
-  currency: string;
-}): JSX.Element {
-  let amountMonthly: number | null = null;
-  let amountAnnually: number | null = null;
-  const { translate } = useTranslationContext();
-  const plan = useSelector<RootState, PlanState>((state) => state.plan);
-
-  if (interval === 'month') {
-    amountMonthly = amount;
-    amountAnnually = amount * 12;
-  } else if (interval === 'year') {
-    amountMonthly = amount / 12;
-    amountAnnually = amount;
-  }
-
-  function displayAmount(value) {
-    return (value / 100).toFixed(2);
-  }
-
-  const displayButtonText =
-    button === 'change'
-      ? translate('actions.change')
-      : button === 'current'
-      ? translate('drive.currentPlan')
-      : translate('actions.purchasePlan');
-
-  return (
-    <div className={`${className} w-full rounded-xl border border-gray-10 p-6 dark:bg-gray-1 lg:w-64`}>
-      <h1 className="text-4xl font-medium text-primary">{bytesToString(bytes)}</h1>
-      <div className="border-translate mt-5 border-gray-10" />
-      <p className="mt-5 text-2xl font-medium text-gray-100">
-        <span>{moneyService.getCurrencySymbol(currency.toUpperCase())}</span>
-        {interval === 'lifetime'
-          ? translate('views.account.tabs.plans.card.lifetime', {
-              amount: displayAmount(amount),
-            })
-          : translate('views.account.tabs.plans.card.monthly', {
-              amount: displayAmount(amountMonthly),
-            })}
-      </p>
-      {interval !== 'lifetime' ? (
-        <p className=" text-gray-50">
-          <span>{moneyService.getCurrencySymbol(currency.toUpperCase())}</span>
-          {translate('views.account.tabs.plans.card.annually', {
-            amount: displayAmount(amountAnnually),
-          })}
-        </p>
-      ) : (
-        <p className=" text-gray-50">{translate('views.account.tabs.plans.card.oneTimePayment')}</p>
-      )}
-
-      {plan.subscription?.type === 'free' ? (
-        <Button
-          loading={loading}
-          onClick={() => onPlanClick(priceID)}
-          disabled={button === 'current' || disabled}
-          variant="primary"
-          className="mt-5 w-full"
-        >
-          {displayButtonText}
-        </Button>
-      ) : (
-        <Button
-          loading={loading}
-          onClick={onClick}
-          disabled={button === 'current' || disabled}
-          variant="primary"
-          className="mt-5 w-full"
-        >
-          {displayButtonText}
-        </Button>
-      )}
-    </div>
-  );
-}
-
-const ChangePlanDialog = ({
-  prices,
-  isDialgOpen,
-  setIsDialogOpen,
-  onPlanClick,
-  priceIdSelected,
-}: {
-  prices: DisplayPrice[];
-  isDialgOpen: boolean;
-  setIsDialogOpen: (value: boolean) => void;
-  onPlanClick: (value: string, currency: string) => void;
-  priceIdSelected: string;
-}): JSX.Element => {
-  const plan = useSelector<RootState, PlanState>((state) => state.plan);
-  const { translate } = useTranslationContext();
-
-  const { planLimit, planUsage, subscription } = plan;
-  const selectedPlan: any = prices.find((plan) => plan.id === priceIdSelected);
-  const selectedPlanSize = selectedPlan?.bytes;
-  const selectedPlanSizeString = bytesToString(selectedPlanSize);
-  const selectedPlanAmount = selectedPlan?.amount;
-  const selectedPlanInterval = selectedPlan?.interval;
-  const currentPlanSizeString = bytesToString(planLimit);
-
-  let amountMonthly: number | null = null;
-  let currentAmountMonthly: number | null = null;
-  let subscriptionCurrencySymbol: string | null = null;
-
-  if (selectedPlanInterval === 'month') {
-    amountMonthly = selectedPlanAmount;
-  } else if (selectedPlanInterval === 'year') {
-    amountMonthly = selectedPlanAmount / 12;
-  }
-
-  if (subscription?.type === 'subscription') {
-    subscriptionCurrencySymbol = moneyService.getCurrencySymbol(subscription?.currency.toUpperCase());
-    if (subscription.interval === 'month') {
-      currentAmountMonthly = subscription.amount;
-    } else if (subscription.interval === 'year') {
-      currentAmountMonthly = subscription.amount / 12;
-    }
-  }
-
-  const onClose = (): void => {
-    setIsDialogOpen(false);
-  };
-
-  const displayAmount = (value) => {
-    return (value / 100).toFixed(2);
-  };
-
-  return (
-    <Modal isOpen={isDialgOpen} onClose={onClose}>
-      <h3 className="mb-5 text-2xl font-medium">{translate('views.account.tabs.plans.dialog.title')}</h3>
-      <p className="font-regular mb-9 text-lg">
-        {translate('views.account.tabs.plans.dialog.subtitle1')}
-        <span className="font-semibold">{currentPlanSizeString}</span>
-        {translate('views.account.tabs.plans.dialog.subtitle2')}
-        <span className="font-semibold">{selectedPlanSizeString}</span>
-        {translate('views.account.tabs.plans.dialog.subtitle3')}
-      </p>
-      <div className="mb-9 flex items-center justify-center">
-        <div className="flex w-40 flex-col items-center rounded-xl border border-gray-10 p-4 shadow-soft">
-          <p className="mb-2.5 rounded-xl border border-gray-10 bg-gray-5 px-2 py-1 text-xs font-medium text-gray-80">
-            {translate('views.account.tabs.plans.dialog.plan.current')}
-          </p>
-          <p className="text-2xl font-medium text-primary">{currentPlanSizeString}</p>
-          {subscription?.type === 'subscription' ? (
-            <div>
-              <span className="text-base font-medium">{`${subscriptionCurrencySymbol}${displayAmount(
-                currentAmountMonthly,
-              )}`}</span>
-              <span>/</span>
-              <span className="text-xs font-medium">{translate('views.account.tabs.plans.dialog.plan.interval')}</span>
-            </div>
-          ) : (
-            <p className="text-base font-medium capitalize">{subscription?.type}</p>
-          )}
-        </div>
-        <ArrowRight size={32} className="mx-5 font-semibold text-gray-20" />
-        <div className="flex w-40 flex-col items-center rounded-xl border border-gray-10 p-4 shadow-soft">
-          <p className="mb-2.5 rounded-xl border border-gray-10 bg-gray-5 px-2 py-1 text-xs font-medium text-gray-80">
-            {translate('views.account.tabs.plans.dialog.plan.new')}
-          </p>
-          <p className={`text-2xl font-medium ${selectedPlanSize < planUsage ? 'text-red' : 'text-primary'}`}>
-            {selectedPlanSizeString}
-          </p>
-          {selectedPlanInterval === 'lifetime' ? (
-            <div>
-              <span className="text-base font-medium">{`${subscriptionCurrencySymbol}${displayAmount(
-                selectedPlanAmount,
-              )}`}</span>
-            </div>
-          ) : (
-            <div>
-              <span className="text-base font-medium">{`${subscriptionCurrencySymbol}${displayAmount(
-                amountMonthly,
-              )}`}</span>
-              <span>/</span>
-              <span className="text-xs font-medium">{translate('views.account.tabs.plans.dialog.plan.interval')}</span>
-            </div>
-          )}
-        </div>
-      </div>
-      {selectedPlanSize < planUsage && (
-        <div className="mb-5 flex flex-col items-center rounded-xl border border-red/20 bg-red/10 px-4 py-5 text-red">
-          <h4 className="mb-1.5 text-center text-xl font-semibold">
-            {translate('views.account.tabs.plans.dialog.alert.title')}
-            {selectedPlanSizeString}
-          </h4>
-          <p className="font-regular text-center text-base">
-            {translate('views.account.tabs.plans.dialog.alert.text1')}
-            <span className="font-semibold">{bytesToString(planUsage)}</span>
-            {translate('views.account.tabs.plans.dialog.alert.text2')}
-          </p>
-        </div>
-      )}
-      <div className="font-regular mb-5 rounded-xl bg-gray-1 p-4 text-center text-base">
-        <p>{translate('views.account.tabs.plans.dialog.message.text')}</p>
-      </div>
-      <div className="flex w-full justify-end">
-        <Button className="mr-2" variant="secondary" onClick={onClose}>
-          {translate('views.account.tabs.plans.dialog.button.back')}
-        </Button>
-        <Button variant="primary" onClick={() => onPlanClick(priceIdSelected, selectedPlan.currency)}>
-          {translate('views.account.tabs.plans.dialog.button.continue')}
-        </Button>
-      </div>
-    </Modal>
-  );
-};
diff --git a/src/app/core/views/Preferences/tabs/Plans/index.tsx b/src/app/core/views/Preferences/tabs/Plans/index.tsx
deleted file mode 100644
index 52e0ce533..000000000
--- a/src/app/core/views/Preferences/tabs/Plans/index.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import Features from './Features';
-import PlanSelector from './PlanSelector';
-
-export default function PlansTab({ className = '' }: { className?: string }): JSX.Element {
-  return (
-    <div className={className}>
-      <PlanSelector />
-      <Features className="mt-8" />
-    </div>
-  );
-}
diff --git a/src/app/core/views/Preferences/tabs/Security/BackupKey.tsx b/src/app/core/views/Preferences/tabs/Security/BackupKey.tsx
deleted file mode 100644
index 0c04c42a7..000000000
--- a/src/app/core/views/Preferences/tabs/Security/BackupKey.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
-import { saveAs } from 'file-saver';
-import notificationsService, { ToastType } from '../../../../../notifications/services/notifications.service';
-import Button from '../../../../../shared/components/Button/Button';
-import Card from '../../../../../shared/components/Card';
-import localStorageService from '../../../../services/local-storage.service';
-import Section from '../../components/Section';
-import { TrackingPlan } from 'app/analytics/TrackingPlan';
-import { trackBackupKeyDownloaded } from 'app/analytics/services/analytics.service';
-
-/**
- * Downloads the backup key of the user and shows a notification
- * @param translate used for the notification message
- */
-export function handleExport(translate) {
-  const trackBackupKeyDownloadedProperties: TrackingPlan.BackupKeyDownloadedProperties = {
-    backup_key_downloaded: true,
-  };
-  const mnemonic = localStorageService.get('xMnemonic');
-  if (!mnemonic) {
-    notificationsService.show({
-      text: translate('views.account.tabs.security.backupKey.error'),
-      type: ToastType.Error,
-    });
-  } else {
-    saveAs(new Blob([mnemonic], { type: 'text/plain' }), 'INTERNXT-BACKUP-KEY.txt');
-    notificationsService.show({
-      text: translate('views.account.tabs.security.backupKey.success'),
-      type: ToastType.Success,
-    });
-    trackBackupKeyDownloaded(trackBackupKeyDownloadedProperties);
-  }
-}
-
-export default function BackupKey({ className = '' }: { className?: string }): JSX.Element {
-  const { translate } = useTranslationContext();
-
-  return (
-    <Section className={className} title={translate('views.account.tabs.security.backupKey.title')}>
-      <Card>
-        <p className="text-gray-60">{translate('views.account.tabs.security.backupKey.description')}</p>
-        <Button onClick={() => handleExport(translate)} className="mt-3">
-          {translate('views.account.tabs.security.backupKey.button')}
-        </Button>
-      </Card>
-    </Section>
-  );
-}
diff --git a/src/app/core/views/Preferences/tabs/Security/index.tsx b/src/app/core/views/Preferences/tabs/Security/index.tsx
deleted file mode 100644
index f33ea42ce..000000000
--- a/src/app/core/views/Preferences/tabs/Security/index.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import { useState } from 'react';
-import BackupKey from './BackupKey';
-import ChangePassword from './ChangePassword';
-import Faq from './Faq';
-import Lock from './Lock';
-import TwoFA from './TwoFA';
-
-export default function SecurityTab({ className = '' }: { className?: string }): JSX.Element {
-  const [state, setState] = useState<{ tag: 'locked' } | { tag: 'unlocked'; password: string }>({ tag: 'locked' });
-
-  return (
-    <div className={className}>
-      <div className="flex flex-col xl:flex-row justify-center flex-wrap gap-y-8 gap-x-10">
-        
-          {state.tag === 'unlocked' ? (
-            <>
-              <div className="flex flex-1 flex-col space-y-8">
-                <ChangePassword
-                  onPasswordChanged={(newPassword) => setState({ tag: 'unlocked', password: newPassword })}
-                  currentPassword={state.password}
-                />
-                <TwoFA password={state.password} />
-                <BackupKey />
-              </div>
-
-              <div className="flex w-full xl:w-96 flex-col space-y-8">
-                <Faq />
-              </div>
-            </>
-          ) : (
-            <Lock className="w-full max-w-lg" onUnlock={(password) => setState({ tag: 'unlocked', password })} />
-          )}
-      </div>
-    </div>
-  );
-}
diff --git a/src/app/core/views/VerifyEmailView/index.tsx b/src/app/core/views/VerifyEmailView/index.tsx
index 19805943a..c468c2e65 100644
--- a/src/app/core/views/VerifyEmailView/index.tsx
+++ b/src/app/core/views/VerifyEmailView/index.tsx
@@ -1,12 +1,15 @@
 import { CheckCircle, WarningCircle } from '@phosphor-icons/react';
 import { useEffect, useState } from 'react';
 import { Link, useRouteMatch } from 'react-router-dom';
+import { useDispatch } from 'react-redux';
 import Spinner from '../../../shared/components/Spinner/Spinner';
 import { SdkFactory } from '../../factory/sdk';
-import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
+import { useTranslationContext } from '../../../i18n/provider/TranslationProvider';
+import { uiActions } from '../../../store/slices/ui';
 
 export default function VerifyEmailView(): JSX.Element {
   const { translate } = useTranslationContext();
+  const dispatch = useDispatch();
   const { params } = useRouteMatch<{ token: string }>();
   const { token } = params;
 
@@ -49,7 +52,7 @@ export default function VerifyEmailView(): JSX.Element {
     },
     error: {
       label: translate('views.emailVerification.error.cta'),
-      path: '/preferences?tab=account',
+      path: '/?preferences=open&section=account&subsection=account',
     },
   };
 
@@ -71,8 +74,11 @@ export default function VerifyEmailView(): JSX.Element {
 
         {status !== 'loading' && (
           <Link
-            className="flex h-10 items-center justify-center rounded-lg bg-primary px-5 font-medium text-white no-underline hover:text-white"
+            className="flex h-10 cursor-pointer items-center justify-center rounded-lg bg-primary px-5 font-medium text-white no-underline hover:text-white"
             to={cta[status].path}
+            onClick={() => {
+              if (status === 'error') dispatch(uiActions.setIsPreferencesDialogOpen(true));
+            }}
           >
             {cta[status].label}
           </Link>
diff --git a/src/app/database/services/database.service/LRUFilesCacheManager.ts b/src/app/database/services/database.service/LRUFilesCacheManager.ts
index 834838cc4..8b54f6ae7 100644
--- a/src/app/database/services/database.service/LRUFilesCacheManager.ts
+++ b/src/app/database/services/database.service/LRUFilesCacheManager.ts
@@ -1,33 +1,33 @@
-import { ICacheStorage, LRUCache, LRUCacheStruture } from './LRUCache';
 import databaseService, { DatabaseCollection, DriveItemBlobData, LRUCacheTypes } from '.';
+import { ICacheStorage, LRUCache, LRUCacheStruture } from './LRUCache';
 
 class LevelsBlobsCache implements ICacheStorage<DriveItemBlobData> {
   async getSize(key: string): Promise<number> {
-    const blobItem = await databaseService.get(DatabaseCollection.LevelsBlobs, parseInt(key));
+    const blobItem = await databaseService.get(DatabaseCollection.LevelsBlobs, key);
     return blobItem?.source?.size || 0;
   }
 
   get(key: string): Promise<DriveItemBlobData | undefined> {
-    const blobItem = databaseService.get(DatabaseCollection.LevelsBlobs, parseInt(key));
+    const blobItem = databaseService.get(DatabaseCollection.LevelsBlobs, key);
     return blobItem;
   }
 
   set(key: string, value: DriveItemBlobData): void {
-    databaseService.put(DatabaseCollection.LevelsBlobs, parseInt(key), value);
+    databaseService.put(DatabaseCollection.LevelsBlobs, key, value);
   }
 
   delete(key: string): void {
-    databaseService.get(DatabaseCollection.LevelsBlobs, parseInt(key)).then((databaseData) => {
+    databaseService.get(DatabaseCollection.LevelsBlobs, key).then((databaseData) => {
       if (databaseData?.preview) {
-        databaseService.put(DatabaseCollection.LevelsBlobs, parseInt(key), { ...databaseData, source: undefined });
+        databaseService.put(DatabaseCollection.LevelsBlobs, key, { ...databaseData, source: undefined });
         return;
       }
-      databaseService.delete(DatabaseCollection.LevelsBlobs, parseInt(key));
+      databaseService.delete(DatabaseCollection.LevelsBlobs, key);
     });
   }
 
   async has(key: string): Promise<boolean> {
-    const exists = !!(await databaseService.get(DatabaseCollection.LevelsBlobs, parseInt(key)))?.source;
+    const exists = !!(await databaseService.get(DatabaseCollection.LevelsBlobs, key))?.source;
     return exists;
   }
 
diff --git a/src/app/database/services/database.service/LRUFilesPreviewCacheManager.ts b/src/app/database/services/database.service/LRUFilesPreviewCacheManager.ts
index 917359ea8..03e304f82 100644
--- a/src/app/database/services/database.service/LRUFilesPreviewCacheManager.ts
+++ b/src/app/database/services/database.service/LRUFilesPreviewCacheManager.ts
@@ -1,33 +1,33 @@
-import { ICacheStorage, LRUCache, LRUCacheStruture } from './LRUCache';
 import databaseService, { DatabaseCollection, DriveItemBlobData, LRUCacheTypes } from '.';
+import { ICacheStorage, LRUCache, LRUCacheStruture } from './LRUCache';
 
 class LevelsBlobsPreviewsCache implements ICacheStorage<DriveItemBlobData> {
   async getSize(key: string): Promise<number> {
-    const blobItem = await databaseService.get(DatabaseCollection.LevelsBlobs, parseInt(key));
-    return blobItem?.preview?.size || 0;
+    const blobItem = await databaseService.get(DatabaseCollection.LevelsBlobs, key);
+    return blobItem?.preview?.size ?? 0;
   }
 
   get(key: string): Promise<DriveItemBlobData | undefined> {
-    const blobItem = databaseService.get(DatabaseCollection.LevelsBlobs, parseInt(key));
+    const blobItem = databaseService.get(DatabaseCollection.LevelsBlobs, key);
     return blobItem;
   }
 
   set(key: string, value: DriveItemBlobData): void {
-    databaseService.put(DatabaseCollection.LevelsBlobs, parseInt(key), value);
+    databaseService.put(DatabaseCollection.LevelsBlobs, key, value);
   }
 
   delete(key: string): void {
-    databaseService.get(DatabaseCollection.LevelsBlobs, parseInt(key)).then((databaseData) => {
+    databaseService.get(DatabaseCollection.LevelsBlobs, key).then((databaseData) => {
       if (databaseData?.source) {
-        databaseService.put(DatabaseCollection.LevelsBlobs, parseInt(key), { ...databaseData, preview: undefined });
+        databaseService.put(DatabaseCollection.LevelsBlobs, key, { ...databaseData, preview: undefined });
         return;
       }
-      databaseService.delete(DatabaseCollection.LevelsBlobs, parseInt(key));
+      databaseService.delete(DatabaseCollection.LevelsBlobs, key);
     });
   }
 
   async has(key: string): Promise<boolean> {
-    const exists = !!(await databaseService.get(DatabaseCollection.LevelsBlobs, parseInt(key)))?.preview;
+    const exists = !!(await databaseService.get(DatabaseCollection.LevelsBlobs, key))?.preview;
     return exists;
   }
 
diff --git a/src/app/database/services/database.service/LRUPhotosCacheManager.ts b/src/app/database/services/database.service/LRUPhotosCacheManager.ts
deleted file mode 100644
index db146b085..000000000
--- a/src/app/database/services/database.service/LRUPhotosCacheManager.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import { ICacheStorage, LRUCache, LRUCacheStruture } from './LRUCache';
-import databaseService, { DatabaseCollection, PhotosData, LRUCacheTypes } from '.';
-
-class PhotosCache implements ICacheStorage<PhotosData> {
-  async getSize(key: string): Promise<number> {
-    const blobItem = await databaseService.get(DatabaseCollection.Photos, key);
-    return blobItem?.source?.size || 0;
-  }
-
-  get(key: string): Promise<PhotosData | undefined> {
-    const blobItem = databaseService.get(DatabaseCollection.Photos, key);
-    return blobItem;
-  }
-
-  set(key: string, value: PhotosData): void {
-    databaseService.put(DatabaseCollection.Photos, key, value);
-  }
-
-  delete(key: string): void {
-    databaseService.get(DatabaseCollection.Photos, key).then((databaseData) => {
-      if (databaseData?.preview) {
-        databaseService.put(DatabaseCollection.Photos, key, { ...databaseData, source: undefined });
-        return;
-      }
-      databaseService.delete(DatabaseCollection.Photos, key);
-    });
-  }
-
-  async has(key: string): Promise<boolean> {
-    const exists = !!(await databaseService.get(DatabaseCollection.Photos, key))?.source;
-    return exists;
-  }
-
-  updateLRUState(lruState: LRUCacheStruture): void {
-    databaseService.put(DatabaseCollection.LRU_cache, LRUCacheTypes.PhotosSource, lruState);
-  }
-}
-
-const MB_400_IN_BYTES = 419430400;
-
-export class LRUPhotosCacheManager {
-  private static instance: LRUCache<PhotosData>;
-
-  public static async getInstance(): Promise<LRUCache<PhotosData>> {
-    if (!LRUPhotosCacheManager.instance) {
-      const photosCache = new PhotosCache();
-
-      const lruCacheState = await databaseService.get(DatabaseCollection.LRU_cache, LRUCacheTypes.PhotosSource);
-      if (lruCacheState) {
-        LRUPhotosCacheManager.instance = new LRUCache<PhotosData>(photosCache, MB_400_IN_BYTES, {
-          lruKeyList: lruCacheState.lruKeyList,
-          itemsListSize: lruCacheState.itemsListSize,
-        });
-      } else {
-        LRUPhotosCacheManager.instance = new LRUCache<PhotosData>(photosCache, MB_400_IN_BYTES);
-      }
-    }
-    return LRUPhotosCacheManager.instance;
-  }
-}
diff --git a/src/app/database/services/database.service/LRUPhotosPreviewCacheManager.ts b/src/app/database/services/database.service/LRUPhotosPreviewCacheManager.ts
deleted file mode 100644
index ca6ea6502..000000000
--- a/src/app/database/services/database.service/LRUPhotosPreviewCacheManager.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import { ICacheStorage, LRUCache, LRUCacheStruture } from './LRUCache';
-import databaseService, { DatabaseCollection, PhotosData, LRUCacheTypes } from '.';
-
-class PhotosPreviewsCache implements ICacheStorage<PhotosData> {
-  async getSize(key: string): Promise<number> {
-    const blobItem = await databaseService.get(DatabaseCollection.Photos, key);
-    return blobItem?.preview?.size || 0;
-  }
-
-  get(key: string): Promise<PhotosData | undefined> {
-    const blobItem = databaseService.get(DatabaseCollection.Photos, key);
-    return blobItem;
-  }
-
-  set(key: string, value: PhotosData): void {
-    databaseService.put(DatabaseCollection.Photos, key, value);
-  }
-
-  delete(key: string): void {
-    databaseService.get(DatabaseCollection.Photos, key).then((databaseData) => {
-      if (databaseData?.source) {
-        databaseService.put(DatabaseCollection.Photos, key, { ...databaseData, preview: undefined });
-        return;
-      }
-      databaseService.delete(DatabaseCollection.Photos, key);
-    });
-  }
-
-  async has(key: string): Promise<boolean> {
-    const exists = !!(await databaseService.get(DatabaseCollection.Photos, key))?.preview;
-    return exists;
-  }
-
-  updateLRUState(lruState: LRUCacheStruture): void {
-    databaseService.put(DatabaseCollection.LRU_cache, LRUCacheTypes.PhotosPreview, lruState);
-  }
-}
-
-const MB_100_IN_BYTES = 104857600;
-
-export class LRUPhotosPreviewsCacheManager {
-  private static instance: LRUCache<PhotosData>;
-
-  public static async getInstance(): Promise<LRUCache<PhotosData>> {
-    if (!LRUPhotosPreviewsCacheManager.instance) {
-      const photosPreviewCache = new PhotosPreviewsCache();
-
-      const lruCacheState = await databaseService.get(DatabaseCollection.LRU_cache, LRUCacheTypes.PhotosPreview);
-      if (lruCacheState) {
-        LRUPhotosPreviewsCacheManager.instance = new LRUCache<PhotosData>(photosPreviewCache, MB_100_IN_BYTES, {
-          lruKeyList: lruCacheState.lruKeyList,
-          itemsListSize: lruCacheState.itemsListSize,
-        });
-      } else {
-        LRUPhotosPreviewsCacheManager.instance = new LRUCache<PhotosData>(photosPreviewCache, MB_100_IN_BYTES);
-      }
-    }
-    return LRUPhotosPreviewsCacheManager.instance;
-  }
-}
diff --git a/src/app/database/services/database.service/index.ts b/src/app/database/services/database.service/index.ts
index 2afbd49d5..82cc4d054 100644
--- a/src/app/database/services/database.service/index.ts
+++ b/src/app/database/services/database.service/index.ts
@@ -1,9 +1,9 @@
 import { DBSchema } from 'idb';
 import configService from '../../../core/services/config.service';
 import { DriveItemData } from '../../../drive/types';
-import indexedDBService from './indexed-db.service';
-import { LRUCacheStruture } from './LRUCache';
 import { TaskStatus } from '../../../tasks/types';
+import { LRUCacheStruture } from './LRUCache';
+import indexedDBService from './indexed-db.service';
 
 export enum DatabaseProvider {
   IndexedDB = 'indexed-db',
@@ -12,18 +12,16 @@ export enum DatabaseProvider {
 export enum DatabaseCollection {
   Levels = 'levels',
   MoveDialogLevels = 'move_levels',
-  Photos = 'photos',
   LevelsBlobs = 'levels_blobs',
   LRU_cache = 'lru_cache',
   Account_settings = 'account_settings',
   UploadItemStatus = 'upload_item_status',
+  WorkspacesAvatarBlobs = 'workspaces_avatar_blobs',
 }
 
 export enum LRUCacheTypes {
   LevelsBlobs = 'levels_blobs',
   LevelsBlobsPreview = 'levels_blobs_preview',
-  PhotosPreview = 'photos_preview',
-  PhotosSource = 'photos_source',
 }
 
 export type DriveItemBlobData = {
@@ -34,11 +32,6 @@ export type DriveItemBlobData = {
   updatedAt?: string;
 };
 
-export type PhotosData = {
-  preview?: Blob;
-  source?: Blob;
-};
-
 export type AvatarBlobData = {
   srcURL: string;
   avatarBlob: Blob;
@@ -47,17 +40,17 @@ export type AvatarBlobData = {
 
 export interface AppDatabase extends DBSchema {
   levels: {
-    key: number;
+    key: string;
     value: DriveItemData[];
     indexes?: Record<string, IDBValidKey>;
   };
   move_levels: {
-    key: number;
+    key: string;
     value: DriveItemData[];
     indexes?: Record<string, IDBValidKey>;
   };
   levels_blobs: {
-    key: number;
+    key: string;
     value: DriveItemBlobData;
     indexes?: Record<string, IDBValidKey>;
   };
@@ -65,11 +58,6 @@ export interface AppDatabase extends DBSchema {
     key: LRUCacheTypes;
     value: LRUCacheStruture;
   };
-  photos: {
-    key: string;
-    value: PhotosData;
-    indexes?: Record<string, IDBValidKey>;
-  };
   account_settings: {
     key: string;
     value: AvatarBlobData;
@@ -78,6 +66,10 @@ export interface AppDatabase extends DBSchema {
     key: string;
     value: TaskStatus;
   };
+  workspaces_avatar_blobs: {
+    key: string;
+    value: AvatarBlobData;
+  };
 }
 
 export interface DatabaseService {
diff --git a/src/app/database/services/database.service/indexed-db.service.ts b/src/app/database/services/database.service/indexed-db.service.ts
index b0884e941..704f84424 100644
--- a/src/app/database/services/database.service/indexed-db.service.ts
+++ b/src/app/database/services/database.service/indexed-db.service.ts
@@ -6,7 +6,6 @@ const open = (name: string, version?: number): Promise<idb.IDBPDatabase<AppDatab
   return idb.openDB<AppDatabase>(name, version, {
     upgrade: (db, oldVersion) => {
       if (oldVersion === 0) db.createObjectStore('levels');
-      if (oldVersion <= 1) db.createObjectStore('photos');
       if (oldVersion <= 2) {
         const objectStore = db.createObjectStore('levels_blobs');
         objectStore.createIndex('parent_index' as never, 'parentId', { unique: false });
@@ -19,6 +18,9 @@ const open = (name: string, version?: number): Promise<idb.IDBPDatabase<AppDatab
       if (oldVersion <= 4) {
         db.createObjectStore('upload_item_status');
       }
+      if (oldVersion <= 5) {
+        db.createObjectStore('workspaces_avatar_blobs');
+      }
     },
     blocked: () => undefined,
     blocking: () => undefined,
diff --git a/src/app/database/services/database.service/mocks.ts b/src/app/database/services/database.service/mocks.ts
index 8b1746545..648a13adb 100644
--- a/src/app/database/services/database.service/mocks.ts
+++ b/src/app/database/services/database.service/mocks.ts
@@ -14,12 +14,9 @@ const folderThreeBlobItems: DriveItemBlobData[] = [
 ];
 const levels_blobs = { 1: [...folderBlobItems], 2: [...folderTwoBlobItems], 34: [...folderThreeBlobItems] };
 
-const photos = { id1: { source: {} }, id2: { source: {} } };
-
 const database = {
   [DatabaseCollection.Levels]: { ...levels_blobs },
   [DatabaseCollection.LevelsBlobs]: { ...levels_blobs },
-  [DatabaseCollection.Photos]: { ...photos },
 };
 
-export { folderBlobItems, folderTwoBlobItems, folderThreeBlobItems, levels_blobs, photos, database };
+export { folderBlobItems, folderTwoBlobItems, folderThreeBlobItems, levels_blobs, database };
diff --git a/src/app/drive/components/ClearTrashDialog/ClearTrashDialog.tsx b/src/app/drive/components/ClearTrashDialog/ClearTrashDialog.tsx
index 92e6fd2e6..cc6dcb535 100644
--- a/src/app/drive/components/ClearTrashDialog/ClearTrashDialog.tsx
+++ b/src/app/drive/components/ClearTrashDialog/ClearTrashDialog.tsx
@@ -1,13 +1,15 @@
-import { useState } from 'react';
 import errorService from 'app/core/services/error.service';
-import { uiActions } from 'app/store/slices/ui';
-import { useAppDispatch, useAppSelector } from 'app/store/hooks';
-import { RootState } from 'app/store';
-import clearTrash from '../../../../use_cases/trash/clear-trash';
+import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
 import Button from 'app/shared/components/Button/Button';
 import Modal from 'app/shared/components/Modal';
-import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
+import { RootState } from 'app/store';
+import { useAppDispatch, useAppSelector } from 'app/store/hooks';
 import { planThunks } from 'app/store/slices/plan';
+import { uiActions } from 'app/store/slices/ui';
+import { useState } from 'react';
+import { useSelector } from 'react-redux';
+import clearTrash from '../../../../use_cases/trash/clear-trash';
+import workspacesSelectors from '../../../store/slices/workspaces/workspaces.selectors';
 
 interface ClearTrashDialogProps {
   onItemsDeleted?: () => void;
@@ -19,6 +21,10 @@ const ClearTrashDialog = (props: ClearTrashDialogProps): JSX.Element => {
   const dispatch = useAppDispatch();
   const isOpen = useAppSelector((state: RootState) => state.ui.isClearTrashDialogOpen);
 
+  const workspaceSelected = useSelector(workspacesSelectors.getSelectedWorkspace);
+  const memberId = workspaceSelected?.workspaceUser?.memberId;
+  const emptyTrash = () => clearTrash(workspaceSelected?.workspace.id);
+
   const onClose = (): void => {
     dispatch(uiActions.setIsClearTrashDialogOpen(false));
   };
@@ -26,7 +32,7 @@ const ClearTrashDialog = (props: ClearTrashDialogProps): JSX.Element => {
   const onAccept = async (): Promise<void> => {
     try {
       setIsLoading(true);
-      clearTrash();
+      await emptyTrash();
 
       props.onItemsDeleted && props.onItemsDeleted();
 
@@ -34,27 +40,28 @@ const ClearTrashDialog = (props: ClearTrashDialogProps): JSX.Element => {
       onClose();
       setTimeout(() => {
         dispatch(planThunks.fetchUsageThunk());
+        if (memberId) dispatch(planThunks.fetchBusinessLimitUsageThunk());
       }, 1000);
     } catch (err: unknown) {
       const castedError = errorService.castError(err);
 
       setIsLoading(false);
 
-      console.log(castedError.message);
+      errorService.reportError(castedError);
     }
   };
 
   return (
     <Modal maxWidth="max-w-md" isOpen={isOpen} onClose={onClose}>
       <div className="flex flex-col space-y-5">
-        <p className="text-2xl font-medium text-gray-100">{translate('drive.clearTrash.title')}</p>
+        <p className="text-2xl font-medium text-gray-100">{translate('drive.clearTrash.accept')}</p>
         <p className="text-lg text-gray-80">{translate('drive.clearTrash.advice')}</p>
 
         <div className="flex flex-row items-center justify-end space-x-2">
           <Button disabled={isLoading} variant="secondary" onClick={onClose}>
             {translate('actions.cancel')}
           </Button>
-          <Button disabled={isLoading} variant="accent" onClick={onAccept}>
+          <Button loading={isLoading} variant="accent" onClick={onAccept}>
             {isLoading ? translate('drive.clearTrash.progress') : translate('drive.clearTrash.accept')}
           </Button>
         </div>
diff --git a/src/app/drive/components/CreateFolderDialog/CreateFolderDialog.tsx b/src/app/drive/components/CreateFolderDialog/CreateFolderDialog.tsx
index a5fd7cf21..fdc28ce06 100644
--- a/src/app/drive/components/CreateFolderDialog/CreateFolderDialog.tsx
+++ b/src/app/drive/components/CreateFolderDialog/CreateFolderDialog.tsx
@@ -15,8 +15,8 @@ import { fetchSortedFolderContentThunk } from 'app/store/slices/storage/storage.
 
 interface CreateFolderDialogProps {
   onFolderCreated?: () => void;
-  currentFolderId: number;
-  neededFolderId: number;
+  currentFolderId: string;
+  neededFolderId: string;
 }
 
 const CreateFolderDialog = ({ onFolderCreated, currentFolderId, neededFolderId }: CreateFolderDialogProps) => {
diff --git a/src/app/drive/components/DeleteItemsDialog/DeleteItemsDialog.tsx b/src/app/drive/components/DeleteItemsDialog/DeleteItemsDialog.tsx
index a532a3ebb..62fcb7cd1 100644
--- a/src/app/drive/components/DeleteItemsDialog/DeleteItemsDialog.tsx
+++ b/src/app/drive/components/DeleteItemsDialog/DeleteItemsDialog.tsx
@@ -22,6 +22,8 @@ const DeleteItemsDialog = (props: DeleteItemsDialogProps): JSX.Element => {
   const [isLoading, setIsLoading] = useState(false);
   const dispatch = useAppDispatch();
   const isOpen = useAppSelector((state: RootState) => state.ui.isDeleteItemsDialogOpen);
+  const { selectedWorkspace } = useAppSelector((state: RootState) => state.workspaces);
+  const memberId = selectedWorkspace?.workspaceUser?.memberId;
 
   const onClose = (): void => {
     dispatch(uiActions.setIsDeleteItemsDialogOpen(false));
@@ -41,6 +43,7 @@ const DeleteItemsDialog = (props: DeleteItemsDialogProps): JSX.Element => {
       onClose();
       setTimeout(() => {
         dispatch(planThunks.fetchUsageThunk());
+        if (memberId) dispatch(planThunks.fetchBusinessLimitUsageThunk());
       }, 1000);
     } catch (err: unknown) {
       const castedError = errorService.castError(err);
diff --git a/src/app/drive/components/DriveExplorer/DriveExplorer.tsx b/src/app/drive/components/DriveExplorer/DriveExplorer.tsx
index 790264e53..b04a1a576 100644
--- a/src/app/drive/components/DriveExplorer/DriveExplorer.tsx
+++ b/src/app/drive/components/DriveExplorer/DriveExplorer.tsx
@@ -18,7 +18,8 @@ import { Menu, Transition } from '@headlessui/react';
 import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
 import { useHotkeys } from 'react-hotkeys-hook';
 import moveItemsToTrash from 'use_cases/trash/move-items-to-trash';
-import { getTrashPaginated } from '../../../../use_cases/trash/get_trash';
+
+import { Role } from '@internxt/sdk/dist/drive/share/types';
 import BannerWrapper from '../../../banners/BannerWrapper';
 import deviceService from '../../../core/services/device.service';
 import errorService from '../../../core/services/error.service';
@@ -68,6 +69,7 @@ import WarningMessageWrapper from '../WarningMessage/WarningMessageWrapper';
 import './DriveExplorer.scss';
 import { DriveTopBarItems } from './DriveTopBarItems';
 import DriveTopBarActions from './components/DriveTopBarActions';
+import workspacesSelectors from 'app/store/slices/workspaces/workspaces.selectors';
 
 const TRASH_PAGINATION_OFFSET = 50;
 const UPLOAD_ITEMS_LIMIT = 1000;
@@ -84,7 +86,7 @@ interface DriveExplorerProps {
   onFolderCreated?: () => void;
   onDragAndDropEnd?: () => void;
   user: UserSettings | undefined;
-  currentFolderId: number;
+  currentFolderId: string;
   selectedItems: DriveItemData[];
   storageFilters: StorageFilters;
   isAuthenticated: boolean;
@@ -104,6 +106,14 @@ interface DriveExplorerProps {
   filesOnTrashLength: number;
   hasMoreFolders: boolean;
   hasMoreFiles: boolean;
+  getTrashPaginated?: (
+    limit: number,
+    offset: number | undefined,
+    type: 'files' | 'folders',
+    root: boolean,
+    folderId?: number | undefined,
+  ) => Promise<{ finished: boolean; itemsRetrieved: number }>;
+  roles: Role[];
 }
 
 const DriveExplorer = (props: DriveExplorerProps): JSX.Element => {
@@ -127,9 +137,12 @@ const DriveExplorer = (props: DriveExplorerProps): JSX.Element => {
     hasMoreFolders,
     hasMoreFiles,
     user,
+    getTrashPaginated,
+    roles,
   } = props;
   const dispatch = useAppDispatch();
   const { translate } = useTranslationContext();
+  const selectedWorkspace = useAppSelector(workspacesSelectors.getSelectedWorkspace);
 
   const hasItems = items.length > 0;
   const hasFilters = storageFilters.text.length > 0;
@@ -301,9 +314,9 @@ const DriveExplorer = (props: DriveExplorerProps): JSX.Element => {
   const onDetailsButtonClicked = useCallback(
     (item: DriveItemData | AdvancedSharedItem) => {
       if (item.isFolder) {
-        navigationService.pushFolder(item.uuid);
+        navigationService.pushFolder(item.uuid, selectedWorkspace?.workspaceUser.workspaceId);
       } else {
-        navigationService.pushFile(item.uuid);
+        navigationService.pushFile(item.uuid, selectedWorkspace?.workspaceUser.workspaceId);
       }
     },
     [dispatch],
@@ -312,19 +325,21 @@ const DriveExplorer = (props: DriveExplorerProps): JSX.Element => {
   //TODO: MOVE PAGINATED TRASH LOGIC OUT OF VIEW
   const getMoreTrashFolders = async () => {
     setIsLoadingTrashItems(true);
-    const result = await getTrashPaginated(TRASH_PAGINATION_OFFSET, folderOnTrashLength, 'folders', true);
-    const existsMoreFolders = !result.finished;
-
-    setHasMoreTrashFolders(existsMoreFolders);
+    if (getTrashPaginated) {
+      const result = await getTrashPaginated(TRASH_PAGINATION_OFFSET, folderOnTrashLength, 'folders', true);
+      const existsMoreFolders = !result.finished;
+      setHasMoreTrashFolders(existsMoreFolders);
+    }
     setIsLoadingTrashItems(false);
   };
 
   const getMoreTrashFiles = async () => {
     setIsLoadingTrashItems(true);
-    const result = await getTrashPaginated(TRASH_PAGINATION_OFFSET, filesOnTrashLength, 'files', true);
-
-    const existsMoreItems = !result.finished;
-    setHasMoreItems(existsMoreItems);
+    if (getTrashPaginated) {
+      const result = await getTrashPaginated(TRASH_PAGINATION_OFFSET, filesOnTrashLength, 'files', true);
+      const existsMoreItems = !result.finished;
+      setHasMoreItems(existsMoreItems);
+    }
     setIsLoadingTrashItems(false);
   };
 
@@ -758,6 +773,7 @@ const DriveExplorer = (props: DriveExplorerProps): JSX.Element => {
               setEditNameItem={setEditNameItem}
               hasItems={hasItems}
               driveActionsRef={divRef}
+              roles={roles}
             />
           </div>
           {isTrash && (
@@ -1045,7 +1061,7 @@ const dropTargetCollect: DropTargetCollector<
 };
 
 export default connect((state: RootState) => {
-  const currentFolderId: number = storageSelectors.currentFolderId(state);
+  const currentFolderId: string = storageSelectors.currentFolderId(state);
   const hasMoreFolders = state.storage.hasMoreDriveFolders[currentFolderId] ?? true;
   const hasMoreFiles = state.storage.hasMoreDriveFiles[currentFolderId] ?? true;
 
@@ -1063,10 +1079,11 @@ export default connect((state: RootState) => {
     namePath: state.storage.namePath,
     workspace: state.session.workspace,
     planLimit: planSelectors.planLimitToShow(state),
-    planUsage: state.plan.planUsage,
+    planUsage: planSelectors.planUsageToShow(state),
     folderOnTrashLength: state.storage.folderOnTrashLength,
     filesOnTrashLength: state.storage.filesOnTrashLength,
     hasMoreFolders,
     hasMoreFiles,
+    roles: state.shared.roles,
   };
 })(DropTarget([NativeTypes.FILE], dropTargetSpec, dropTargetCollect)(DriveExplorer));
diff --git a/src/app/drive/components/DriveExplorer/DriveExplorerGrid/DriveExplorerGrid.tsx b/src/app/drive/components/DriveExplorer/DriveExplorerGrid/DriveExplorerGrid.tsx
index 5bf7bb510..3528ee4f7 100644
--- a/src/app/drive/components/DriveExplorer/DriveExplorerGrid/DriveExplorerGrid.tsx
+++ b/src/app/drive/components/DriveExplorer/DriveExplorerGrid/DriveExplorerGrid.tsx
@@ -1,17 +1,17 @@
 import React, { FC, useEffect, useRef } from 'react';
 import { connect } from 'react-redux';
 
-import DriveExplorerGridItem from '../DriveExplorerItem/DriveExplorerGridItem/DriveExplorerGridItem';
+import { useAppDispatch } from 'app/store/hooks';
+import { fetchSortedFolderContentThunk } from 'app/store/slices/storage/storage.thunks/fetchSortedFolderContentThunk';
+import InfiniteScroll from 'react-infinite-scroll-component';
 import { DriveItemData } from '../../../types';
 import DriveGridItemSkeleton from '../../DriveGridItemSkeleton/DriveGridItemSkeleton';
-import './DriveExplorerGrid.scss';
-import InfiniteScroll from 'react-infinite-scroll-component';
 import EditItemNameDialog from '../../EditItemNameDialog/EditItemNameDialog';
-import { fetchSortedFolderContentThunk } from 'app/store/slices/storage/storage.thunks/fetchSortedFolderContentThunk';
-import { useAppDispatch } from 'app/store/hooks';
+import DriveExplorerGridItem from '../DriveExplorerItem/DriveExplorerGridItem/DriveExplorerGridItem';
+import './DriveExplorerGrid.scss';
 
 interface DriveExplorerGridProps {
-  folderId: number;
+  folderId: string;
   isLoading: boolean;
   items: DriveItemData[];
   onEndOfScroll(): void;
diff --git a/src/app/drive/components/DriveExplorer/DriveExplorerItem/hooks/useDriveItemActions.tsx b/src/app/drive/components/DriveExplorer/DriveExplorerItem/hooks/useDriveItemActions.tsx
index 1abdad3d1..1e8042d74 100644
--- a/src/app/drive/components/DriveExplorer/DriveExplorerItem/hooks/useDriveItemActions.tsx
+++ b/src/app/drive/components/DriveExplorer/DriveExplorerItem/hooks/useDriveItemActions.tsx
@@ -10,10 +10,10 @@ import { downloadThumbnail, setCurrentThumbnail } from '../../../../../drive/ser
 import { DriveItemData, DriveItemDetails } from '../../../../../drive/types';
 import shareService from '../../../../../share/services/share.service';
 import { useAppDispatch, useAppSelector } from '../../../../../store/hooks';
-import { sessionSelectors } from '../../../../../store/slices/session/session.selectors';
 import { storageActions } from '../../../../../store/slices/storage';
 import storageThunks from '../../../../../store/slices/storage/storage.thunks';
 import { uiActions } from '../../../../../store/slices/ui';
+import workspacesSelectors from 'app/store/slices/workspaces/workspaces.selectors';
 
 export interface DriveItemActions {
   nameInputRef: React.RefObject<HTMLInputElement>;
@@ -37,7 +37,8 @@ export interface DriveItemActions {
 const useDriveItemActions = (item): DriveItemActions => {
   const dispatch = useAppDispatch();
   const nameInputRef = useMemo(() => createRef<HTMLInputElement>(), []);
-  const isTeam = useAppSelector(sessionSelectors.isTeam);
+  const selectedWorkspace = useAppSelector(workspacesSelectors.getSelectedWorkspace);
+  const isWorkspace = !!selectedWorkspace;
 
   const onRenameItemButtonClicked = () => {
     dispatch(storageActions.setItemToRename(item as DriveItemData));
@@ -60,7 +61,7 @@ const useDriveItemActions = (item): DriveItemActions => {
   };
 
   const onOpenPreviewButtonClicked = () => {
-    navigationService.pushFile(item.uuid);
+    navigationService.pushFile(item.uuid, selectedWorkspace?.workspaceUser.workspaceId);
   };
 
   const onGetLinkButtonClicked = () => {
@@ -111,13 +112,13 @@ const useDriveItemActions = (item): DriveItemActions => {
 
     if (item.isFolder) {
       dispatch(storageActions.setForceLoading(true));
-      navigationService.pushFolder(item.uuid);
+      navigationService.pushFolder(item.uuid, selectedWorkspace?.workspaceUser.workspaceId);
     } else {
       if (isRecentsView) {
         dispatch(uiActions.setIsFileViewerOpen(true));
         dispatch(uiActions.setFileViewerItem(item));
       } else {
-        navigationService.pushFile(item.uuid);
+        navigationService.pushFile(item.uuid, selectedWorkspace?.workspaceUser.workspaceId);
       }
     }
   };
@@ -134,7 +135,7 @@ const useDriveItemActions = (item): DriveItemActions => {
       const newThumbnail = item.thumbnails[0];
 
       if (!thumbnailBlob) {
-        thumbnailBlob = await downloadThumbnail(newThumbnail, isTeam);
+        thumbnailBlob = await downloadThumbnail(newThumbnail, isWorkspace);
         updateDatabaseFilePreviewData({
           fileId: item.id,
           folderId: item.folderId,
diff --git a/src/app/drive/components/DriveExplorer/DriveExplorerItem/hooks/useDriveItemDragAndDrop.tsx b/src/app/drive/components/DriveExplorer/DriveExplorerItem/hooks/useDriveItemDragAndDrop.tsx
index ae7c1e496..0fc0d0cb1 100644
--- a/src/app/drive/components/DriveExplorer/DriveExplorerItem/hooks/useDriveItemDragAndDrop.tsx
+++ b/src/app/drive/components/DriveExplorer/DriveExplorerItem/hooks/useDriveItemDragAndDrop.tsx
@@ -49,6 +49,7 @@ export const useDriveItemDrop = (item: DriveItemData): DriveItemDrop => {
   const dispatch = useAppDispatch();
   const isSomeItemSelected = useAppSelector(storageSelectors.isSomeItemSelected);
   const { selectedItems } = useAppSelector((state) => state.storage);
+  const workspacesCredentials = useAppSelector((state) => state.workspaces.workspaceCredentials);
   const namePath = useAppSelector((state) => state.storage.namePath);
   const [{ isDraggingOverThisItem, canDrop }, connectDropTarget] = useDrop<
     DriveItemData | DriveItemData[],
@@ -87,10 +88,15 @@ export const useDriveItemDrop = (item: DriveItemData): DriveItemDrop => {
             return i.isFolder;
           });
 
-          const storageClient = SdkFactory.getInstance().createStorageClient();
+          const storageClient = SdkFactory.getNewApiInstance().createNewStorageClient();
 
-          dispatch(storageActions.setMoveDestinationFolderId(item.id));
-          const [folderContentPromise] = storageClient.getFolderContent(item.id);
+          dispatch(storageActions.setMoveDestinationFolderId(item.uuid));
+
+          const [folderContentPromise] = storageClient.getFolderContentByUuid(
+            item.uuid,
+            false,
+            workspacesCredentials?.tokenHeader,
+          );
           const { children: foldersInDestinationFolder, files: filesInDestinationFolder } = await folderContentPromise;
           const foldersInDestinationFolderParsed = foldersInDestinationFolder.map((folder) => ({
             ...folder,
@@ -108,12 +114,13 @@ export const useDriveItemDrop = (item: DriveItemData): DriveItemDrop => {
           );
           const unrepeatedItems: DriveItemData[] = [...unrepeatedFiles, ...unrepeatedFolders] as DriveItemData[];
 
-          if (unrepeatedItems.length === itemsToMove.length) dispatch(storageActions.setMoveDestinationFolderId(null));
+          if (unrepeatedItems.length === itemsToMove.length)
+            dispatch(storageActions.setMoveDestinationFolderId(item.uuid));
 
           dispatch(
             storageThunks.moveItemsThunk({
               items: unrepeatedItems,
-              destinationFolderId: item.id,
+              destinationFolderId: item.uuid,
             }),
           );
         } else if (droppedType === NativeTypes.FILE) {
@@ -122,12 +129,12 @@ export const useDriveItemDrop = (item: DriveItemData): DriveItemDrop => {
           transformDraggedItems(droppedData.items, folderPath).then(async ({ rootList, files }) => {
             if (files.length) {
               // Only files
-              await dispatch(storageThunks.uploadItemsThunk({ files, parentFolderId: item.id }));
+              await dispatch(storageThunks.uploadItemsThunk({ files, parentFolderId: item.uuid }));
             }
             if (rootList.length) {
               // Directory tree
               for (const root of rootList) {
-                const currentFolderId = item.id;
+                const currentFolderId = item.uuid;
 
                 await dispatch(storageThunks.uploadFolderThunk({ root, currentFolderId }));
               }
diff --git a/src/app/drive/components/DriveExplorer/DriveExplorerItem/hooks/useDriveStoreProps.tsx b/src/app/drive/components/DriveExplorer/DriveExplorerItem/hooks/useDriveStoreProps.tsx
index f8e8ef0fc..3f0520b07 100644
--- a/src/app/drive/components/DriveExplorer/DriveExplorerItem/hooks/useDriveStoreProps.tsx
+++ b/src/app/drive/components/DriveExplorer/DriveExplorerItem/hooks/useDriveStoreProps.tsx
@@ -8,7 +8,7 @@ interface DriveItemStoreProps {
   isSomeItemSelected: boolean;
   selectedItems: DriveItemData[];
   namePath: FolderPath[];
-  currentFolderId: number;
+  currentFolderId: string;
   isItemSelected: (item: DriveItemData) => boolean;
   workspace: Workspace;
   isSidenavCollapsed: boolean;
diff --git a/src/app/drive/components/DriveExplorer/DriveExplorerList/DriveExplorerList.tsx b/src/app/drive/components/DriveExplorer/DriveExplorerList/DriveExplorerList.tsx
index 1eba34b91..37baeb3a6 100644
--- a/src/app/drive/components/DriveExplorer/DriveExplorerList/DriveExplorerList.tsx
+++ b/src/app/drive/components/DriveExplorer/DriveExplorerList/DriveExplorerList.tsx
@@ -2,13 +2,15 @@ import { useAppSelector } from 'app/store/hooks';
 import storageSelectors from 'app/store/slices/storage/storage.selectors';
 import { fetchSortedFolderContentThunk } from 'app/store/slices/storage/storage.thunks/fetchSortedFolderContentThunk';
 import React, { memo, useCallback, useEffect, useState } from 'react';
-import { connect } from 'react-redux';
+import { connect, useSelector } from 'react-redux';
 
-import { ListShareLinksItem } from '@internxt/sdk/dist/drive/share/types';
+import { ListShareLinksItem, Role } from '@internxt/sdk/dist/drive/share/types';
 import navigationService from 'app/core/services/navigation.service';
 import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
 import moveItemsToTrash from '../../../../../use_cases/trash/move-items-to-trash';
+import workspacesService from '../../../../core/services/workspace.service';
 import { OrderDirection, OrderSettings } from '../../../../core/types';
+import notificationsService, { ToastType } from '../../../../notifications/services/notifications.service';
 import shareService from '../../../../share/services/share.service';
 import List from '../../../../shared/components/List';
 import { AppDispatch, RootState } from '../../../../store';
@@ -16,9 +18,11 @@ import { sharedThunks } from '../../../../store/slices/sharedLinks';
 import { storageActions } from '../../../../store/slices/storage';
 import storageThunks from '../../../../store/slices/storage/storage.thunks';
 import { uiActions } from '../../../../store/slices/ui';
+import workspacesSelectors from '../../../../store/slices/workspaces/workspaces.selectors';
 import { DriveItemData, DriveItemDetails } from '../../../types';
 import EditItemNameDialog from '../../EditItemNameDialog/EditItemNameDialog';
 import DriveExplorerListItem from '../DriveExplorerItem/DriveExplorerListItem/DriveExplorerListItem';
+import { shareItemWithTeam } from '../utils';
 import {
   contextMenuDriveFolderNotSharedLink,
   contextMenuDriveFolderShared,
@@ -28,10 +32,12 @@ import {
   contextMenuSelectedItems,
   contextMenuTrashFolder,
   contextMenuTrashItems,
+  contextMenuWorkspaceFile,
+  contextMenuWorkspaceFolder,
 } from './DriveItemContextMenu';
 
 interface DriveExplorerListProps {
-  folderId: number;
+  folderId: string;
   isLoading: boolean;
   forceLoading: boolean;
   items: DriveItemData[];
@@ -46,6 +52,7 @@ interface DriveExplorerListProps {
   title: JSX.Element | string;
   onOpenStopSharingAndMoveToTrashDialog: () => void;
   showStopSharingConfirmation: boolean;
+  roles: Role[];
 }
 
 type ObjectWithId = { id: string | number };
@@ -87,7 +94,7 @@ const resetDriveOrder = ({
   dispatch;
   orderType: string;
   direction: string;
-  currentFolderId: number;
+  currentFolderId: string;
 }) => {
   dispatch(storageActions.setDriveItemsSort(orderType));
   dispatch(storageActions.setDriveItemsOrder(direction));
@@ -98,8 +105,13 @@ const resetDriveOrder = ({
 };
 
 const DriveExplorerList: React.FC<DriveExplorerListProps> = memo((props) => {
+  const { dispatch, isLoading, order, hasMoreItems, onEndOfScroll, forceLoading, roles } = props;
+  const selectedWorkspace = useSelector(workspacesSelectors.getSelectedWorkspace);
   const [isAllSelectedEnabled, setIsAllSelectedEnabled] = useState(false);
   const [editNameItem, setEditNameItem] = useState<DriveItemData | null>(null);
+
+  const workspaceSelected = useSelector(workspacesSelectors.getSelectedWorkspace);
+  const isWorkspaceSelected = !!workspaceSelected;
   const isSelectedMultipleItemsAndNotTrash = props.selectedItems.length > 1 && !props.isTrash;
   const isSelectedSharedItem =
     props.selectedItems.length === 1 &&
@@ -147,8 +159,6 @@ const DriveExplorerList: React.FC<DriveExplorerListProps> = memo((props) => {
     dispatch(storageActions.selectItems(updatedSelectedItems));
   };
 
-  const { dispatch, isLoading, order, hasMoreItems, onEndOfScroll, forceLoading } = props;
-
   const currentFolderId = useAppSelector(storageSelectors.currentFolderId);
   const isRecents = props.title === translate('views.recents.head');
   const isTrash = props.title === translate('trash.trash');
@@ -213,7 +223,7 @@ const DriveExplorerList: React.FC<DriveExplorerListProps> = memo((props) => {
   const openPreview = useCallback(
     (item: ContextMenuDriveItem) => {
       const driveItem = item as DriveItemData;
-      navigationService.pushFile(driveItem.uuid);
+      navigationService.pushFile(driveItem.uuid, selectedWorkspace?.workspaceUser.workspaceId);
     },
     [dispatch, uiActions],
   );
@@ -234,7 +244,7 @@ const DriveExplorerList: React.FC<DriveExplorerListProps> = memo((props) => {
   const getLink = useCallback(
     (item: ContextMenuDriveItem) => {
       const driveItem = item as DriveItemData;
-      shareService.getPublicShareLink(driveItem.uuid as string, driveItem.isFolder ? 'folder' : 'file');
+      shareService.getPublicShareLink(driveItem.uuid, driveItem.isFolder ? 'folder' : 'file');
     },
     [dispatch, sharedThunks],
   );
@@ -242,7 +252,7 @@ const DriveExplorerList: React.FC<DriveExplorerListProps> = memo((props) => {
   const copyLink = useCallback(
     (item: ContextMenuDriveItem) => {
       const driveItem = item as DriveItemData;
-      shareService.getPublicShareLink(driveItem.uuid as string, driveItem.isFolder ? 'folder' : 'file');
+      shareService.getPublicShareLink(driveItem.uuid, driveItem.isFolder ? 'folder' : 'file');
     },
     [dispatch, sharedThunks],
   );
@@ -280,14 +290,173 @@ const DriveExplorerList: React.FC<DriveExplorerListProps> = memo((props) => {
     [isSelectedSharedItem, props.onOpenStopSharingAndMoveToTrashDialog, moveItemsToTrash],
   );
 
-  const skinSkeleton = [
-    <div className="flex flex-row items-center space-x-4">
-      <div className="h-8 w-8 rounded-md bg-gray-5" />
-    </div>,
-    <div className="h-4 w-64 rounded bg-gray-5" />,
-    <div className="ml-3 h-4 w-24 rounded bg-gray-5" />,
-    <div className="ml-4 h-4 w-20 rounded bg-gray-5" />,
-  ];
+  const selectedItemsContextMenu = contextMenuSelectedItems({
+    selectedItems: props.selectedItems,
+    moveItems: () => {
+      dispatch(storageActions.setItemsToMove(props.selectedItems));
+      dispatch(uiActions.setIsMoveItemsDialogOpen(true));
+    },
+    downloadItems: () => {
+      dispatch(storageThunks.downloadItemsThunk(props.selectedItems));
+    },
+    moveToTrash: () => {
+      isSelectedSharedItems ? props.onOpenStopSharingAndMoveToTrashDialog() : moveItemsToTrash(props.selectedItems);
+    },
+  });
+
+  const multipleSelectedTrashItemsContextMenu = contextMenuMultipleSelectedTrashItems({
+    restoreItem: () => {
+      dispatch(storageActions.setItemsToMove(props.selectedItems));
+      dispatch(uiActions.setIsMoveItemsDialogOpen(true));
+    },
+    deletePermanently: () => {
+      dispatch(storageActions.setItemsToDelete(props.selectedItems));
+      dispatch(uiActions.setIsDeleteItemsDialogOpen(true));
+    },
+  });
+
+  const folderSharedTrashMenu = contextMenuTrashFolder({
+    restoreItem: restoreItem,
+    deletePermanently: deletePermanently,
+  });
+
+  const fileSharedTrashMenu = contextMenuTrashItems({
+    openPreview: openPreview,
+    restoreItem: restoreItem,
+    deletePermanently: deletePermanently,
+  });
+
+  const selectedSharedFolderMenu = contextMenuDriveFolderShared({
+    copyLink: copyLink,
+    openShareAccessSettings: (item) => {
+      openLinkSettings(item);
+    },
+    showDetails,
+    renameItem: renameItem,
+    moveItem: moveItem,
+    downloadItem: downloadItem,
+    moveToTrash: props.onOpenStopSharingAndMoveToTrashDialog,
+  });
+
+  const selectedSharedFileMenu = contextMenuDriveItemShared({
+    openPreview: openPreview,
+    showDetails,
+    copyLink: copyLink,
+    openShareAccessSettings: (item) => {
+      openLinkSettings(item);
+    },
+    renameItem: renameItem,
+    moveItem: moveItem,
+    downloadItem: downloadItem,
+    moveToTrash: props.onOpenStopSharingAndMoveToTrashDialog,
+  });
+
+  const selectedFolderMenu = contextMenuDriveFolderNotSharedLink({
+    shareLink: openLinkSettings,
+    showDetails,
+    getLink: getLink,
+    renameItem: renameItem,
+    moveItem: moveItem,
+    downloadItem: downloadItem,
+    moveToTrash: moveToTrash,
+  });
+
+  const selectedFileMenu = contextMenuDriveNotSharedLink({
+    shareLink: openLinkSettings,
+    openPreview: openPreview,
+    showDetails,
+    getLink: getLink,
+    renameItem: renameItem,
+    moveItem: moveItem,
+    downloadItem: downloadItem,
+    moveToTrash: moveToTrash,
+  });
+
+  const shareWithTeam = useCallback(
+    async (item: ContextMenuDriveItem) => {
+      const driveItem = item as DriveItemData;
+      const editorRole = roles.find((role) => role.name === 'EDITOR');
+      if (selectedWorkspace && editorRole) {
+        const isSharedSuccessfully = await shareItemWithTeam(driveItem, selectedWorkspace, editorRole);
+        if (isSharedSuccessfully) {
+          notificationsService.show({
+            text: translate('workspaces.messages.sharedSuccess'),
+            type: ToastType.Success,
+          });
+          return;
+        }
+      }
+
+      notificationsService.show({
+        text: translate('modals.shareModal.errors.copy-to-clipboard'),
+        type: ToastType.Error,
+      });
+    },
+    [dispatch, workspacesService, selectedWorkspace, roles, notificationsService],
+  );
+
+  const workspaceItemMenu = contextMenuWorkspaceFile({
+    shareLink: openLinkSettings,
+    shareWithTeam: shareWithTeam,
+    openPreview: openPreview,
+    showDetails,
+    getLink: getLink,
+    renameItem: renameItem,
+    moveItem: moveItem,
+    downloadItem: downloadItem,
+    moveToTrash: moveToTrash,
+  });
+
+  const workspaceFolderMenu = contextMenuWorkspaceFolder({
+    shareLink: openLinkSettings,
+    shareWithTeam: shareWithTeam,
+    showDetails,
+    getLink: getLink,
+    renameItem: renameItem,
+    moveItem: moveItem,
+    downloadItem: downloadItem,
+    moveToTrash: moveToTrash,
+  });
+
+  const getContextMenu = () => {
+    if (isSelectedMultipleItemsAndNotTrash) {
+      return selectedItemsContextMenu;
+    }
+
+    if (props.isTrash) {
+      if (props.selectedItems.length > 1) {
+        return multipleSelectedTrashItemsContextMenu;
+      }
+
+      if (props.selectedItems[0]?.isFolder) {
+        return folderSharedTrashMenu;
+      }
+
+      return fileSharedTrashMenu;
+    }
+
+    if (isSelectedSharedItem) {
+      if (props.selectedItems[0]?.isFolder) {
+        return selectedSharedFolderMenu;
+      }
+
+      return selectedSharedFileMenu;
+    }
+
+    if (isWorkspaceSelected) {
+      if (props.selectedItems[0]?.isFolder) {
+        return workspaceFolderMenu;
+      }
+      return workspaceItemMenu;
+    }
+
+    if (props.selectedItems[0]?.isFolder) {
+      return selectedFolderMenu;
+    }
+    return selectedFileMenu;
+  };
+
+  const menu = getContextMenu();
 
   return (
     <div className="flex h-full grow flex-col">
@@ -342,97 +511,13 @@ const DriveExplorerList: React.FC<DriveExplorerListProps> = memo((props) => {
           onNextPage={onEndOfScroll}
           onEnterPressed={(driveItem) => {
             if (driveItem.isFolder) {
-              navigationService.pushFolder(driveItem.uuid);
+              navigationService.pushFolder(driveItem.uuid, selectedWorkspace?.workspaceUser.workspaceId);
             } else {
-              navigationService.pushFile(driveItem.uuid);
+              navigationService.pushFile(driveItem.uuid, selectedWorkspace?.workspaceUser.workspaceId);
             }
           }}
           hasMoreItems={hasMoreItems}
-          menu={
-            isSelectedMultipleItemsAndNotTrash
-              ? contextMenuSelectedItems({
-                  selectedItems: props.selectedItems,
-                  moveItems: () => {
-                    dispatch(storageActions.setItemsToMove(props.selectedItems));
-                    dispatch(uiActions.setIsMoveItemsDialogOpen(true));
-                  },
-                  downloadItems: () => {
-                    dispatch(storageThunks.downloadItemsThunk(props.selectedItems));
-                  },
-                  moveToTrash: () => {
-                    isSelectedSharedItems
-                      ? props.onOpenStopSharingAndMoveToTrashDialog()
-                      : moveItemsToTrash(props.selectedItems);
-                  },
-                })
-              : props.isTrash
-              ? props.selectedItems.length > 1
-                ? contextMenuMultipleSelectedTrashItems({
-                    restoreItem: () => {
-                      dispatch(storageActions.setItemsToMove(props.selectedItems));
-                      dispatch(uiActions.setIsMoveItemsDialogOpen(true));
-                    },
-                    deletePermanently: () => {
-                      dispatch(storageActions.setItemsToDelete(props.selectedItems));
-                      dispatch(uiActions.setIsDeleteItemsDialogOpen(true));
-                    },
-                  })
-                : props.selectedItems[0]?.isFolder
-                ? contextMenuTrashFolder({
-                    restoreItem: restoreItem,
-                    deletePermanently: deletePermanently,
-                  })
-                : contextMenuTrashItems({
-                    openPreview: openPreview,
-                    restoreItem: restoreItem,
-                    deletePermanently: deletePermanently,
-                  })
-              : isSelectedSharedItem
-              ? props.selectedItems[0]?.isFolder
-                ? contextMenuDriveFolderShared({
-                    copyLink: copyLink,
-                    openShareAccessSettings: (item) => {
-                      openLinkSettings(item);
-                    },
-                    showDetails,
-                    renameItem: renameItem,
-                    moveItem: moveItem,
-                    downloadItem: downloadItem,
-                    moveToTrash: props.onOpenStopSharingAndMoveToTrashDialog,
-                  })
-                : contextMenuDriveItemShared({
-                    openPreview: openPreview,
-                    showDetails,
-                    copyLink: copyLink,
-                    openShareAccessSettings: (item) => {
-                      openLinkSettings(item);
-                    },
-                    renameItem: renameItem,
-                    moveItem: moveItem,
-                    downloadItem: downloadItem,
-                    moveToTrash: props.onOpenStopSharingAndMoveToTrashDialog,
-                  })
-              : props.selectedItems[0]?.isFolder
-              ? contextMenuDriveFolderNotSharedLink({
-                  shareLink: openLinkSettings,
-                  showDetails,
-                  getLink: getLink,
-                  renameItem: renameItem,
-                  moveItem: moveItem,
-                  downloadItem: downloadItem,
-                  moveToTrash: moveToTrash,
-                })
-              : contextMenuDriveNotSharedLink({
-                  shareLink: openLinkSettings,
-                  openPreview: openPreview,
-                  showDetails,
-                  getLink: getLink,
-                  renameItem: renameItem,
-                  moveItem: moveItem,
-                  downloadItem: downloadItem,
-                  moveToTrash: moveToTrash,
-                })
-          }
+          menu={menu}
           selectedItems={props.selectedItems}
           keyboardShortcuts={['unselectAll', 'selectAll', 'multiselect']}
           keyBoardShortcutActions={{
@@ -464,6 +549,7 @@ export default connect((state: RootState) => ({
   selectedItems: state.storage.selectedItems,
   order: state.storage.order,
   forceLoading: state.storage.forceLoading,
+  roles: state.shared.roles,
   disableKeyboardShortcuts:
     state.ui.isShareDialogOpen ||
     state.ui.isSurveyDialogOpen ||
@@ -473,5 +559,16 @@ export default connect((state: RootState) => ({
     state.ui.isCreateFolderDialogOpen ||
     state.ui.isNameCollisionDialogOpen ||
     state.ui.isReachedPlanLimitDialogOpen ||
-    state.ui.isItemDetailsDialogOpen,
+    state.ui.isItemDetailsDialogOpen ||
+    state.ui.isPreferencesDialogOpen,
 }))(DriveExplorerList);
+
+const skinSkeleton = [
+  <div className="mr-3 flex w-full flex-row items-center space-x-4">
+    <div className="h-8 w-8 rounded-md bg-gray-5" />
+    <div className="h-4 w-full rounded bg-gray-5" />
+  </div>,
+  <div className="h-4 w-64 rounded bg-gray-5" />,
+  <div className="ml-3 h-4 w-24 rounded bg-gray-5" />,
+  <div className="ml-4 h-4 w-20 rounded bg-gray-5" />,
+];
diff --git a/src/app/drive/components/DriveExplorer/DriveExplorerList/DriveItemContextMenu.tsx b/src/app/drive/components/DriveExplorer/DriveExplorerList/DriveItemContextMenu.tsx
index 7d35a51ee..04e0f9dc3 100644
--- a/src/app/drive/components/DriveExplorer/DriveExplorerList/DriveItemContextMenu.tsx
+++ b/src/app/drive/components/DriveExplorer/DriveExplorerList/DriveItemContextMenu.tsx
@@ -1,5 +1,4 @@
 import { ListShareLinksItem } from '@internxt/sdk/dist/drive/share/types';
-import { t } from 'i18next';
 import {
   Backspace,
   ClockCounterClockwise,
@@ -8,16 +7,16 @@ import {
   Icon,
   Info,
   Link,
-  LinkBreak,
   PencilSimple,
   Trash,
   Users,
 } from '@phosphor-icons/react';
+import { ReactComponent as MoveActionIcon } from 'assets/icons/move.svg';
+import { t } from 'i18next';
 import { Device } from '../../../../backups/types';
-import { ListItemMenu } from '../../../../shared/components/List/ListItem';
 import { DriveFolderData, DriveItemData } from '../../../../drive/types';
 import { AdvancedSharedItem } from '../../../../share/types';
-import { ReactComponent as MoveActionIcon } from 'assets/icons/move.svg';
+import { ListItemMenu } from '../../../../shared/components/List/ListItem';
 
 const getOpenPreviewMenuItem = (openPreview: (target) => void) => ({
   name: t('drive.dropdown.openPreview'),
@@ -37,6 +36,15 @@ const shareLinkMenuItem = (shareLink: (target) => void) => ({
   },
 });
 
+const shareWithTeamMenuItem = (shareWithTeam: (target) => void) => ({
+  name: t('drive.dropdown.shareTeam'),
+  icon: Users,
+  action: shareWithTeam,
+  disabled: () => {
+    return false;
+  },
+});
+
 const manageLinkAccessMenuItem = (manageAccess: (target) => void) => ({
   name: t('drive.dropdown.manageLinkAccess'),
   icon: Users,
@@ -434,20 +442,87 @@ const contextMenuMultipleSharedViewAFS = ({
   moveToTrash && getMoveToTrashMenuItem(moveToTrash),
 ];
 
+const contextMenuWorkspaceFolder = ({
+  shareLink,
+  getLink,
+  shareWithTeam,
+  showDetails,
+  renameItem,
+  moveItem,
+  downloadItem,
+  moveToTrash,
+}: {
+  shareLink: (item: DriveItemData) => void;
+  getLink: (item: DriveItemData) => void;
+  shareWithTeam: (item: DriveItemData) => Promise<void>;
+  showDetails: (item: DriveItemData) => void;
+  renameItem: (item: DriveItemData) => void;
+  moveItem: (item: DriveItemData) => void;
+  downloadItem: (item: DriveItemData) => void;
+  moveToTrash: (item: DriveItemData) => void;
+}): ListItemMenu<DriveItemData> => [
+  shareLinkMenuItem(shareLink),
+  getCopyLinkMenuItem(getLink),
+  shareWithTeamMenuItem(shareWithTeam),
+  { name: '', action: () => false, separator: true },
+  showDetailsMenuItem(showDetails),
+  getRenameMenuItem(renameItem),
+  getMoveItemMenuItem(moveItem),
+  getDownloadMenuItem(downloadItem),
+  { name: '', action: () => false, separator: true },
+  getMoveToTrashMenuItem(moveToTrash),
+];
+
+const contextMenuWorkspaceFile = ({
+  shareLink,
+  shareWithTeam,
+  openPreview,
+  showDetails,
+  getLink,
+  renameItem,
+  moveItem,
+  downloadItem,
+  moveToTrash,
+}: {
+  shareLink: (item: DriveItemData) => void;
+  shareWithTeam: (item: DriveItemData) => Promise<void>;
+  openPreview?: (item: DriveItemData) => void;
+  showDetails: (item: DriveItemData) => void;
+  getLink: (item: DriveItemData) => void;
+  renameItem: (item: DriveItemData) => void;
+  moveItem: (item: DriveItemData) => void;
+  downloadItem: (item: DriveItemData) => void;
+  moveToTrash: (item: DriveItemData) => void;
+}): ListItemMenu<DriveItemData> => [
+  shareLinkMenuItem(shareLink),
+  getCopyLinkMenuItem(getLink),
+  shareWithTeamMenuItem(shareWithTeam),
+  { name: '', action: () => false, separator: true },
+  openPreview && getOpenPreviewMenuItem(openPreview),
+  showDetailsMenuItem(showDetails),
+  getRenameMenuItem(renameItem),
+  getMoveItemMenuItem(moveItem),
+  getDownloadMenuItem(downloadItem),
+  { name: '', action: () => false, separator: true },
+  getMoveToTrashMenuItem(moveToTrash),
+];
+
 export {
+  contextMenuBackupItems,
   contextMenuDriveFolderNotSharedLink,
-  contextMenuDriveNotSharedLink,
-  contextMenuSelectedItems,
-  contextMenuDriveItemShared,
   contextMenuDriveFolderShared,
-  contextMenuTrashItems,
-  contextMenuTrashFolder,
-  contextMenuMultipleSelectedTrashItems,
-  contextMenuSelectedBackupItems,
-  contextMenuBackupItems,
+  contextMenuDriveFolderSharedAFS,
+  contextMenuDriveItemShared,
+  contextMenuDriveItemSharedAFS,
   contextMenuDriveItemSharedsView,
+  contextMenuDriveNotSharedLink,
+  contextMenuMultipleSelectedTrashItems,
   contextMenuMultipleSharedView,
-  contextMenuDriveItemSharedAFS,
-  contextMenuDriveFolderSharedAFS,
   contextMenuMultipleSharedViewAFS,
+  contextMenuSelectedBackupItems,
+  contextMenuSelectedItems,
+  contextMenuTrashFolder,
+  contextMenuTrashItems,
+  contextMenuWorkspaceFile,
+  contextMenuWorkspaceFolder,
 };
diff --git a/src/app/drive/components/DriveExplorer/components/DriveTopBarActions.tsx b/src/app/drive/components/DriveExplorer/components/DriveTopBarActions.tsx
index 8866431b7..da2c9db06 100644
--- a/src/app/drive/components/DriveExplorer/components/DriveTopBarActions.tsx
+++ b/src/app/drive/components/DriveExplorer/components/DriveTopBarActions.tsx
@@ -1,3 +1,4 @@
+import { Role } from '@internxt/sdk/dist/drive/share/types';
 import {
   ClockCounterClockwise,
   DotsThreeVertical,
@@ -9,11 +10,13 @@ import {
   Users,
 } from '@phosphor-icons/react';
 import { ReactComponent as MoveActionIcon } from 'assets/icons/move.svg';
+import { useSelector } from 'react-redux';
 import moveItemsToTrash from 'use_cases/trash/move-items-to-trash';
 import errorService from '../../../../core/services/error.service';
 import navigationService from '../../../../core/services/navigation.service';
 import { DriveItemData, DriveItemDetails, FileViewMode } from '../../../../drive/types';
 import { useTranslationContext } from '../../../../i18n/provider/TranslationProvider';
+import notificationsService, { ToastType } from '../../../../notifications/services/notifications.service';
 import shareService from '../../../../share/services/share.service';
 import Button from '../../../../shared/components/Button/Button';
 import Dropdown from '../../../../shared/components/Dropdown';
@@ -28,7 +31,11 @@ import {
   contextMenuDriveFolderShared,
   contextMenuDriveItemShared,
   contextMenuDriveNotSharedLink,
+  contextMenuWorkspaceFile,
+  contextMenuWorkspaceFolder,
 } from '../DriveExplorerList/DriveItemContextMenu';
+import workspacesSelectors from 'app/store/slices/workspaces/workspaces.selectors';
+import { shareItemWithTeam } from '../utils';
 
 const DriveTopBarActions = ({
   selectedItems,
@@ -38,16 +45,20 @@ const DriveTopBarActions = ({
   isTrash,
   hasItems,
   driveActionsRef,
+  roles,
 }: {
   selectedItems: DriveItemData[];
-  currentFolderId: number;
+  currentFolderId: string;
   setEditNameItem: (item: DriveItemData) => void;
   hasAnyItemSelected: boolean;
   isTrash: boolean;
   hasItems: boolean;
   driveActionsRef?: React.MutableRefObject<HTMLDivElement | null>;
+  roles: Role[];
 }) => {
   const dispatch = useAppDispatch();
+  const selectedWorkspace = useSelector(workspacesSelectors.getSelectedWorkspace);
+  const isWorkspaceSelected = !!selectedWorkspace;
 
   const { translate } = useTranslationContext();
   const { dirtyName } = useDriveItemStoreProps();
@@ -145,7 +156,7 @@ const DriveTopBarActions = ({
   };
 
   const onOpenPreviewButtonClicked = (): void => {
-    navigationService.pushFile(selectedItems[0].uuid);
+    navigationService.pushFile(selectedItems[0].uuid, selectedWorkspace?.workspaceUser.workspaceId);
   };
 
   const onRecoverButtonClicked = (): void => {
@@ -162,7 +173,57 @@ const DriveTopBarActions = ({
     }
   };
 
+  const shareWithTeam = async (driveItem: DriveItemData) => {
+    const editorRole = roles.find((role) => role.name === 'EDITOR');
+    if (selectedWorkspace && editorRole) {
+      const isSharedSuccessfully = await shareItemWithTeam(driveItem, selectedWorkspace, editorRole);
+      if (isSharedSuccessfully) {
+        notificationsService.show({
+          text: translate('workspaces.messages.sharedSuccess'),
+          type: ToastType.Success,
+        });
+        return;
+      }
+    }
+
+    notificationsService.show({
+      text: translate('modals.shareModal.errors.copy-to-clipboard'),
+      type: ToastType.Error,
+    });
+  };
+
+  const workspaceItemMenu = contextMenuWorkspaceFile({
+    shareLink: onOpenShareSettingsButtonClicked,
+    shareWithTeam,
+    openPreview: onOpenPreviewButtonClicked,
+    showDetails: onShowDetailsButtonClicked,
+    getLink: onSelectedOneItemShare,
+    renameItem: onSelectedOneItemRename,
+    moveItem: onMoveItemButtonClicked,
+    downloadItem: onDownloadButtonClicked,
+    moveToTrash: onBulkDeleteButtonClicked,
+  });
+
+  const workspaceFolderMenu = contextMenuWorkspaceFolder({
+    shareLink: onOpenShareSettingsButtonClicked,
+    shareWithTeam,
+    showDetails: onShowDetailsButtonClicked,
+    getLink: onSelectedOneItemShare,
+    renameItem: onSelectedOneItemRename,
+    moveItem: onMoveItemButtonClicked,
+    downloadItem: onDownloadButtonClicked,
+    moveToTrash: onBulkDeleteButtonClicked,
+  });
+
   const dropdownActions = () => {
+    if (isWorkspaceSelected) {
+      if (selectedItems[0].isFolder) {
+        return workspaceFolderMenu;
+      } else {
+        return workspaceItemMenu;
+      }
+    }
+
     if (selectedItems[0].sharings && selectedItems[0].sharings?.length > 0) {
       return selectedItems[0].isFolder
         ? contextMenuDriveFolderShared({
diff --git a/src/app/drive/components/DriveExplorer/utils.ts b/src/app/drive/components/DriveExplorer/utils.ts
new file mode 100644
index 000000000..516295f4d
--- /dev/null
+++ b/src/app/drive/components/DriveExplorer/utils.ts
@@ -0,0 +1,40 @@
+import { Role } from '@internxt/sdk/dist/drive/share/types';
+import { WorkspaceData } from '@internxt/sdk/dist/workspaces';
+import errorService from '../../../core/services/error.service';
+import workspacesService from '../../../core/services/workspace.service';
+import { DriveItemData } from '../../types';
+
+/**
+ * Share an item with a team in the selected workspace.
+ *
+ * @param {DriveItemData} driveItem - The item to be shared.
+ * @param {WorkspaceData} selectedWorkspace - The workspace where the item will be shared.
+ * @param {Role} role - The role assigned for sharing.
+ * @return {Promise<boolean>} A boolean indicating the success of sharing the item.
+ */
+export const shareItemWithTeam = async (
+  driveItem: DriveItemData,
+  selectedWorkspace: WorkspaceData,
+  role: Role,
+): Promise<boolean> => {
+  try {
+    await workspacesService.shareItemWithTeam({
+      workspaceId: selectedWorkspace?.workspace?.id,
+      itemId: driveItem.uuid,
+      itemType: driveItem.isFolder ? 'folder' : 'file',
+      teamUUID: selectedWorkspace?.workspace.defaultTeamId,
+      // ADDED EDITOR ROLE BY DEFAULT
+      roleId: role?.id,
+    });
+    return true;
+  } catch (error) {
+    errorService.reportError(error, {
+      extra: {
+        workspaceData: selectedWorkspace,
+        itemUUID: driveItem.uuid,
+        roleId: role?.id,
+      },
+    });
+    return false;
+  }
+};
diff --git a/src/app/drive/components/FileViewer/FileViewer.tsx b/src/app/drive/components/FileViewer/FileViewer.tsx
index ff546ea11..04547ad21 100644
--- a/src/app/drive/components/FileViewer/FileViewer.tsx
+++ b/src/app/drive/components/FileViewer/FileViewer.tsx
@@ -1,32 +1,31 @@
-import { Suspense, Fragment, useState, useEffect } from 'react';
 import { Dialog, Transition } from '@headlessui/react';
-import viewers from './viewers';
-
 import UilMultiply from '@iconscout/react-unicons/icons/uil-multiply';
-import { DriveFileData, DriveItemData } from '../../../drive/types';
-import { useAppDispatch, useAppSelector } from '../../../store/hooks';
-import { FileExtensionGroup } from '../../../drive/types/file-types';
-import iconService from '../../../drive/services/icon.service';
-import { useTranslationContext } from '../../../i18n/provider/TranslationProvider';
 import { CaretLeft, CaretRight } from '@phosphor-icons/react';
-import TopBarActions from './components/TopBarActions';
+import { isLargeFile } from 'app/core/services/media.service';
+import iconService from 'app/drive/services/icon.service';
+import { DriveFileData, DriveItemData } from 'app/drive/types';
+import { FileExtensionGroup } from 'app/drive/types/file-types';
+import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
+import ShareItemDialog from 'app/share/components/ShareItemDialog/ShareItemDialog';
+import { ListItemMenu } from 'app/shared/components/List/ListItem';
+import { RootState } from 'app/store';
+import { useAppDispatch, useAppSelector } from 'app/store/hooks';
+import { uiActions } from 'app/store/slices/ui';
+import { Fragment, Suspense, useEffect, useState } from 'react';
 import { useHotkeys } from 'react-hotkeys-hook';
-import ShareItemDialog from '../../../share/components/ShareItemDialog/ShareItemDialog';
-import { RootState } from '../../../store';
-import { uiActions } from '../../../store/slices/ui';
-import { setItemsToMove, storageActions } from '../../../store/slices/storage';
-import { isLargeFile } from '../../../core/services/media.service';
 import { TrackingPlan } from '../../../analytics/TrackingPlan';
 import {
-  trackFilePreviewed,
-  trackFilePreviewOpened,
   trackFilePreviewClicked,
+  trackFilePreviewOpened,
+  trackFilePreviewed,
 } from '../../../analytics/services/analytics.service';
-import { ListItemMenu } from '../../../shared/components/List/ListItem';
+import { PreviewFileItem } from '../../../share/types';
+import { setItemsToMove, storageActions } from '../../../store/slices/storage';
 import { TopBarActionsMenu } from './FileViewerWrapper';
 import { NoPreviewIsAvailableComponent } from './components/NoPreviewIsAvailableComponent';
-import { PreviewFileItem } from 'app/share/types';
+import TopBarActions from './components/TopBarActions';
 import { checkIfExtensionIsAllowed, getIsTypeAllowedAndFileExtensionGroupValues } from './utils/fileViewerUtils';
+import viewers from './viewers';
 
 const ESC_KEY_KEYBOARD_CODE = 27;
 interface FileViewerProps {
diff --git a/src/app/drive/components/FileViewer/FileViewerWrapper.tsx b/src/app/drive/components/FileViewer/FileViewerWrapper.tsx
index 6dddb2b1f..646ad1d09 100644
--- a/src/app/drive/components/FileViewer/FileViewerWrapper.tsx
+++ b/src/app/drive/components/FileViewer/FileViewerWrapper.tsx
@@ -5,6 +5,7 @@ import { DriveFileData, DriveItemData } from '../../types';
 import { Thumbnail } from '@internxt/sdk/dist/drive/storage/types';
 import { getAppConfig } from 'app/core/services/config.service';
 import localStorageService from 'app/core/services/local-storage.service';
+import navigationService from 'app/core/services/navigation.service';
 import { ListItemMenu } from 'app/shared/components/List/ListItem';
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import errorService from '../../../core/services/error.service';
@@ -20,8 +21,8 @@ import {
 } from '../../../drive/services/thumbnail.service';
 import { AdvancedSharedItem, PreviewFileItem, UserRoles } from '../../../share/types';
 import { RootState } from '../../../store';
-import { sessionSelectors } from '../../../store/slices/session/session.selectors';
 import { uiActions } from '../../../store/slices/ui';
+import workspacesSelectors from '../../../store/slices/workspaces/workspaces.selectors';
 import { getDatabaseFilePreviewData, updateDatabaseFilePreviewData } from '../../services/database.service';
 import downloadService from '../../services/download.service';
 import useDriveItemActions from '../DriveExplorer/DriveExplorerItem/hooks/useDriveItemActions';
@@ -57,7 +58,7 @@ const FileViewerWrapper = ({
   sharedKeyboardShortcuts,
 }: FileViewerWrapperProps): JSX.Element => {
   const dispatch = useAppDispatch();
-  const isTeam = useAppSelector(sessionSelectors.isTeam);
+  const isWorkspace = !!useAppSelector(workspacesSelectors.getSelectedWorkspace);
   const dirtyName = useAppSelector((state: RootState) => state.ui.currentEditingNameDirty);
   const isAuthenticated = useAppSelector((state) => state.user.isAuthenticated);
   const currentUserRole = useAppSelector((state: RootState) => state.shared.currentSharingRole);
@@ -65,8 +66,11 @@ const FileViewerWrapper = ({
   const [isDownloadStarted, setIsDownloadStarted] = useState(false);
   const [updateProgress, setUpdateProgress] = useState(0);
   const [currentFile, setCurrentFile] = useState<PreviewFileItem>(file);
+
   const [blob, setBlob] = useState<Blob | null>(null);
+
   const user = localStorageService.getUser();
+  const userEmail = user?.email;
 
   const path = getAppConfig().views.find((view) => view.path === location.pathname);
   const pathId = path?.id as pathProps;
@@ -78,15 +82,18 @@ const FileViewerWrapper = ({
 
   useEffect(() => {
     setBlob(null);
-
+    dispatch(uiActions.setFileViewerItem(currentFile));
     if (currentFile && !updateProgress && !isDownloadStarted) {
       setIsDownloadStarted(true);
       fileContentManager
         .download()
-        .then((blob) => {
-          setBlob(blob);
+        .then((downloadedFile) => {
+          setBlob(downloadedFile.blob);
           setUpdateProgress(0);
           setIsDownloadStarted(false);
+          if (downloadedFile.shouldHandleFileThumbnail) {
+            handleFileThumbnail(currentFile, downloadedFile.blob).catch(errorService.reportError);
+          }
         })
         .catch((error) => {
           if (error.name === 'AbortError') {
@@ -102,8 +109,7 @@ const FileViewerWrapper = ({
 
   useEffect(() => {
     setBlob(null);
-
-    if (dirtyName) {
+    if (dirtyName && dirtyName !== '') {
       setCurrentFile?.({
         ...currentFile,
         plainName: dirtyName,
@@ -135,14 +141,18 @@ const FileViewerWrapper = ({
   const driveItemsSort = useAppSelector((state) => state.storage.driveItemsSort);
 
   // Get all files in the current folder, sort the files and find the current file to display the file
-  const currentItemsFolder = useAppSelector((state) => state.storage.levels[file?.folderId || '']);
+  const currentItemsFolder = useAppSelector((state) => state.storage.levels[file?.folderUuid || '']);
   const folderFiles = useMemo(() => currentItemsFolder?.filter((item) => !item.isFolder), [currentItemsFolder]);
 
   const sortFolderFiles = useMemo(() => {
     if (folderFiles) {
       return folderFiles.sort((a, b) => {
-        if (driveItemsOrder === OrderDirection.Asc) return a[driveItemsSort] > b[driveItemsSort];
-        else if (driveItemsOrder === OrderDirection.Desc) return a[driveItemsSort] < b[driveItemsSort];
+        if (driveItemsOrder === OrderDirection.Asc) {
+          return a[driveItemsSort] > b[driveItemsSort] ? 1 : -1;
+        } else if (driveItemsOrder === OrderDirection.Desc) {
+          return a[driveItemsSort] < b[driveItemsSort] ? 1 : -1;
+        }
+        return 0;
       });
     }
     return [];
@@ -176,7 +186,7 @@ const FileViewerWrapper = ({
       { ...currentFile, bucketId: currentFile.bucket },
       {
         updateProgressCallback: (progress) => handleProgress(progress, currentFile.type.toLowerCase()),
-        isTeam,
+        isWorkspace,
         abortController,
       },
       currentFile.credentials,
@@ -229,7 +239,7 @@ const FileViewerWrapper = ({
       size: driveFile.size,
       type: driveFile.type,
       content: fileObject,
-      parentFolderId: driveFile.folderId,
+      parentFolderId: driveFile.folderUuid,
     };
 
     const thumbnailGenerated = await getThumbnailFrom(fileUpload);
@@ -247,7 +257,7 @@ const FileViewerWrapper = ({
         content: thumbnailGenerated.file,
       };
 
-      const thumbnailUploaded = await uploadThumbnail(user?.email as string, thumbnailToUpload, false, () => {});
+      const thumbnailUploaded = await uploadThumbnail(userEmail as string, thumbnailToUpload, false, () => {});
 
       setCurrentThumbnail(thumbnailGenerated.file, thumbnailUploaded, driveFile as DriveItemData, dispatch);
 
@@ -262,7 +272,7 @@ const FileViewerWrapper = ({
     }
   };
 
-  const fileContentManager = getFileContentManager(currentFile, downloadFile, handleFileThumbnail);
+  const fileContentManager = getFileContentManager(currentFile, downloadFile);
 
   const handlersForSpecialItems = {
     handleUpdateProgress: handleProgress,
diff --git a/src/app/drive/components/FileViewer/utils/fileViewerWrapperUtils.ts b/src/app/drive/components/FileViewer/utils/fileViewerWrapperUtils.ts
index f5b1ec539..58894d12e 100644
--- a/src/app/drive/components/FileViewer/utils/fileViewerWrapperUtils.ts
+++ b/src/app/drive/components/FileViewer/utils/fileViewerWrapperUtils.ts
@@ -17,6 +17,11 @@ import {
   contextMenuTrashItems,
 } from '../../DriveExplorer/DriveExplorerList/DriveItemContextMenu';
 
+interface DownloadedBlobData {
+  blob: Blob;
+  shouldHandleFileThumbnail: boolean;
+}
+
 export type TopBarActionsMenu = ListItemMenu<DriveItemData> | ListItemMenu<AdvancedSharedItem>;
 
 type PathProps = 'drive' | 'trash' | 'shared' | 'recents';
@@ -47,7 +52,7 @@ const topDropdownBarActionsMenu = ({
   const isSharedView = pathId === 'shared';
   const isTrashView = pathId === 'trash';
 
-  const isSharedItem = (currentFile.sharings && currentFile.sharings?.length > 0) ?? false;
+  const isSharedItem = (currentFile?.sharings && currentFile.sharings?.length > 0) ?? false;
 
   // TODO: QUICK FIX TO THE RELEASE
   // Check why the user field is networkUser in some cases instead of user
@@ -146,25 +151,27 @@ const topDropdownBarActionsMenu = ({
   return contextMenuActions();
 };
 
-function getFileContentManager(currentFile, downloadFile, handleFileThumbnail) {
+function getFileContentManager(currentFile, downloadFile) {
   const abortController = new AbortController();
 
   return {
-    download: async (): Promise<Blob> => {
-      const shouldFileBeCached = canFileBeCached(currentFile);
+    download: async (): Promise<DownloadedBlobData> => {
+      let fileContent: Blob;
 
       const fileSource = await getDatabaseFileSourceData({ fileId: currentFile.id });
+
+      const shouldFileBeCached = canFileBeCached(currentFile);
       const isCached = !!fileSource;
-      let fileContent: Blob;
+      const isCacheExpired = !fileSource?.updatedAt
+        ? true
+        : dateService.isDateOneBefore({
+            dateOne: fileSource?.updatedAt,
+            dateTwo: currentFile?.updatedAt,
+          });
 
-      if (isCached) {
-        const isCacheExpired = !fileSource?.updatedAt
-          ? true
-          : dateService.isDateOneBefore({
-              dateOne: fileSource?.updatedAt,
-              dateTwo: currentFile?.updatedAt,
-            });
+      const shouldHandleFileThumbnail = !isCached || isCacheExpired;
 
+      if (isCached) {
         if (isCacheExpired) {
           fileContent = await downloadFile(currentFile, abortController);
           await updateDatabaseFileSourceData({
@@ -173,7 +180,6 @@ function getFileContentManager(currentFile, downloadFile, handleFileThumbnail) {
             fileId: currentFile.id,
             updatedAt: currentFile.updatedAt,
           });
-          await handleFileThumbnail(currentFile, fileSource.source);
         } else {
           fileContent = fileSource.source as Blob;
         }
@@ -187,10 +193,9 @@ function getFileContentManager(currentFile, downloadFile, handleFileThumbnail) {
             updatedAt: currentFile.updatedAt,
           });
         }
-        await handleFileThumbnail(currentFile, fileContent);
       }
 
-      return fileContent;
+      return { blob: fileContent, shouldHandleFileThumbnail };
     },
     abort: () => {
       abortController.abort();
diff --git a/src/app/drive/components/FileViewer/viewers/FileImageViewer/FileImageViewer.tsx b/src/app/drive/components/FileViewer/viewers/FileImageViewer/FileImageViewer.tsx
index 3f7332407..f5a75b4ec 100644
--- a/src/app/drive/components/FileViewer/viewers/FileImageViewer/FileImageViewer.tsx
+++ b/src/app/drive/components/FileViewer/viewers/FileImageViewer/FileImageViewer.tsx
@@ -28,9 +28,9 @@ const FileImageViewer = ({
           const convertedBlob = await heic2any({ blob: blob });
           updatedFile.type = 'png';
 
-          await handlersForSpecialItems?.handleUpdateThumbnail(updatedFile, convertedBlob as Blob);
-
           setImageBlob(convertedBlob as Blob);
+
+          await handlersForSpecialItems?.handleUpdateThumbnail(updatedFile, convertedBlob as Blob);
         } else {
           setImageBlob(blob);
         }
diff --git a/src/app/drive/components/MoveItemsDialog/MoveItemsDialog.tsx b/src/app/drive/components/MoveItemsDialog/MoveItemsDialog.tsx
index 08ddfdc6f..eee2038bc 100644
--- a/src/app/drive/components/MoveItemsDialog/MoveItemsDialog.tsx
+++ b/src/app/drive/components/MoveItemsDialog/MoveItemsDialog.tsx
@@ -9,18 +9,17 @@ import BreadcrumbsMoveItemsDialogView from 'app/shared/components/Breadcrumbs/Co
 import Button from 'app/shared/components/Button/Button';
 import Modal from 'app/shared/components/Modal';
 import Spinner from 'app/shared/components/Spinner/Spinner';
-import { RootState } from 'app/store';
+import { RootState, store } from 'app/store';
 import { useAppDispatch, useAppSelector } from 'app/store/hooks';
 import { setItemsToMove, storageActions } from 'app/store/slices/storage';
 import storageSelectors from 'app/store/slices/storage/storage.selectors';
+import storageThunks from 'app/store/slices/storage/storage.thunks';
 import { fetchDialogContentThunk } from 'app/store/slices/storage/storage.thunks/fetchDialogContentThunk';
 import { getAncestorsAndSetNamePath } from 'app/store/slices/storage/storage.thunks/goToFolderThunk';
 import { uiActions } from 'app/store/slices/ui';
 import folderImage from 'assets/icons/light/folder.svg';
-import { TFunction } from 'i18next';
 import { useEffect, useState } from 'react';
 import { useSelector } from 'react-redux';
-import moveItems from '../../../../../src/use_cases/trash/recover-items-from-trash';
 import { DriveItemData, FolderPathDialog } from '../../types';
 import CreateFolderDialog from '../CreateFolderDialog/CreateFolderDialog';
 
@@ -28,15 +27,14 @@ interface MoveItemsDialogProps {
   onItemsMoved?: () => void;
   isTrash?: boolean;
   items: DriveItemData[];
-  parentFolderId?: number;
 }
 
 const MoveItemsDialog = (props: MoveItemsDialogProps): JSX.Element => {
   const { translate } = useTranslationContext();
   const itemsToMove: DriveItemData[] = useSelector((state: RootState) => state.storage.itemsToMove);
   const [isLoading, setIsLoading] = useState(false);
-  const [destinationId, setDestinationId] = useState(0);
-  const [currentFolderId, setCurrentFolderId] = useState(0);
+  const [destinationId, setDestinationId] = useState('');
+  const [currentFolderId, setCurrentFolderId] = useState('');
   const [shownFolders, setShownFolders] = useState(props.items);
   const [currentFolderName, setCurrentFolderName] = useState('');
   const [selectedFolderName, setSelectedFolderName] = useState('');
@@ -45,8 +43,8 @@ const MoveItemsDialog = (props: MoveItemsDialogProps): JSX.Element => {
   const dispatch = useAppDispatch();
   const isOpen = useAppSelector((state: RootState) => state.ui.isMoveItemsDialogOpen);
   const currentPath = useAppSelector((state: RootState) => state.storage.namePath);
-  const rootFolderID: number = useSelector((state: RootState) => storageSelectors.rootFolderId(state));
-  const itemParentId = itemsToMove[0]?.parentId ?? itemsToMove[0]?.folderId;
+  const rootFolderID: string = useSelector((state: RootState) => storageSelectors.rootFolderId(state));
+  const itemParentId = itemsToMove[0]?.folderUuid ?? itemsToMove[0]?.folderUuid;
   const isDriveAndCurrentFolder = !props.isTrash && itemParentId === destinationId;
 
   const onCreateFolderButtonClicked = () => {
@@ -56,11 +54,11 @@ const MoveItemsDialog = (props: MoveItemsDialogProps): JSX.Element => {
   useEffect(() => {
     if (isOpen) {
       setCurrentNamePaths([]);
-      onShowFolderContentClicked(props.parentFolderId ?? rootFolderID, 'Drive');
+      onShowFolderContentClicked(rootFolderID, 'Drive');
     }
   }, [isOpen]);
 
-  const onShowFolderContentClicked = (folderId: number, name: string): void => {
+  const onShowFolderContentClicked = (folderId: string, name: string): void => {
     setIsLoading(true);
     dispatch(fetchDialogContentThunk(folderId))
       .unwrap()
@@ -70,23 +68,23 @@ const MoveItemsDialog = (props: MoveItemsDialogProps): JSX.Element => {
       .finally(() => setIsLoading(false));
   };
 
-  const handleDialogBreadcrumbs = (folderId: number, name: string) => {
+  const handleDialogBreadcrumbs = (folderId: string, name: string) => {
     let auxCurrentPaths: FolderPathDialog[] = [...currentNamePaths];
     const currentIndex = auxCurrentPaths.findIndex((i) => {
-      return i.id === folderId;
+      return i.uuid === folderId;
     });
     if (currentIndex > -1) {
       auxCurrentPaths = auxCurrentPaths.slice(0, currentIndex + 1);
-      dispatch(storageActions.popNamePathDialogUpTo({ id: folderId, name: name }));
+      dispatch(storageActions.popNamePathDialogUpTo({ uuid: folderId, name: name }));
     } else {
-      auxCurrentPaths.push({ id: folderId, name: name });
-      dispatch(storageActions.pushNamePathDialog({ id: folderId, name: name }));
+      auxCurrentPaths.push({ uuid: folderId, name: name });
+      dispatch(storageActions.pushNamePathDialog({ uuid: folderId, name: name }));
     }
 
     setCurrentNamePaths(auxCurrentPaths);
   };
 
-  const retrieveMoveDialogItems = (folderId: number, name: string) => {
+  const retrieveMoveDialogItems = (folderId: string, name: string) => {
     databaseService.get(DatabaseCollection.MoveDialogLevels, folderId).then((items) => {
       setCurrentFolderId(folderId);
       setCurrentFolderName(name);
@@ -112,7 +110,7 @@ const MoveItemsDialog = (props: MoveItemsDialogProps): JSX.Element => {
     });
   };
 
-  const onFolderClicked = (folderId: number, name?: string): void => {
+  const onFolderClicked = (folderId: string, name?: string): void => {
     if (destinationId != folderId) {
       setDestinationId(folderId);
     } else {
@@ -164,7 +162,12 @@ const MoveItemsDialog = (props: MoveItemsDialogProps): JSX.Element => {
           destinationFolderId = currentFolderId;
         }
 
-        await moveItems(itemsToMove, destinationFolderId, translate as TFunction, props.isTrash);
+        await dispatch(
+          storageThunks.moveItemsThunk({
+            items: itemsToMove,
+            destinationFolderId: destinationFolderId,
+          }),
+        );
       }
 
       props.onItemsMoved?.();
@@ -172,6 +175,7 @@ const MoveItemsDialog = (props: MoveItemsDialogProps): JSX.Element => {
       setIsLoading(false);
       onClose();
       !props.isTrash && setDriveBreadcrumb(itemsToMove);
+      store.dispatch(storageActions.popItemsToDelete(itemsToMove));
     } catch (err: unknown) {
       const castedError = errorService.castError(err);
       errorService.reportError(castedError);
@@ -222,12 +226,12 @@ const MoveItemsDialog = (props: MoveItemsDialogProps): JSX.Element => {
                   return (
                     <div
                       className={`cursor-pointer ${
-                        destinationId === folder.id
+                        destinationId === folder.uuid
                           ? 'bg-primary/10 text-primary dark:bg-primary/20'
                           : 'hover:bg-gray-1 dark:hover:bg-gray-5'
                       } flex h-12 items-center space-x-4 px-4`}
-                      onDoubleClick={() => onShowFolderContentClicked(folder.id, folder.name)}
-                      onClick={() => onFolderClicked(folder.id, folder.name)}
+                      onDoubleClick={() => onShowFolderContentClicked(folder.uuid, folder.name)}
+                      onClick={() => onFolderClicked(folder.uuid, folder.name)}
                       key={folder.id}
                     >
                       <img className="flex h-8 w-8" alt="Folder icon" src={folderImage} />
@@ -235,7 +239,7 @@ const MoveItemsDialog = (props: MoveItemsDialogProps): JSX.Element => {
                         {folder.name}
                       </span>
                       <CaretRight
-                        onClick={() => onShowFolderContentClicked(folder.id, folder.name)}
+                        onClick={() => onShowFolderContentClicked(folder.uuid, folder.name)}
                         className="h-6 w-6"
                       />
                     </div>
diff --git a/src/app/drive/components/NameCollisionDialog/NameCollisionContainer.tsx b/src/app/drive/components/NameCollisionDialog/NameCollisionContainer.tsx
index 762b5d71c..9982ddaea 100644
--- a/src/app/drive/components/NameCollisionDialog/NameCollisionContainer.tsx
+++ b/src/app/drive/components/NameCollisionDialog/NameCollisionContainer.tsx
@@ -13,8 +13,8 @@ import { uiActions } from '../../../store/slices/ui';
 import { DriveItemData } from '../../types';
 
 type NameCollisionContainerProps = {
-  currentFolderId: number;
-  moveDestinationFolderId: number | null;
+  currentFolderId: string;
+  moveDestinationFolderId: string | null;
   filesToRename: (File | DriveItemData)[];
   driveFilesToRename: DriveItemData[];
   foldersToRename: (IRoot | DriveItemData)[];
@@ -41,6 +41,7 @@ const NameCollisionContainer: FC<NameCollisionContainerProps> = ({
     () => moveDestinationFolderId ?? currentFolderId,
     [moveDestinationFolderId, currentFolderId],
   );
+
   const handleNewItems = (files: (File | DriveItemData)[], folders: (IRoot | DriveItemData)[]) => [
     ...files,
     ...folders,
@@ -98,7 +99,7 @@ const NameCollisionContainer: FC<NameCollisionContainerProps> = ({
     dispatch(
       storageThunks.moveItemsThunk({
         items: itemsToMove,
-        destinationFolderId: moveDestinationFolderId as number,
+        destinationFolderId: moveDestinationFolderId as string,
       }),
     );
   };
@@ -108,7 +109,7 @@ const NameCollisionContainer: FC<NameCollisionContainerProps> = ({
     dispatch(
       storageThunks.moveItemsThunk({
         items: itemsToUpload,
-        destinationFolderId: moveDestinationFolderId as number,
+        destinationFolderId: moveDestinationFolderId as string,
       }),
     );
   };
@@ -251,7 +252,7 @@ const NameCollisionContainer: FC<NameCollisionContainerProps> = ({
   );
 };
 export default connect((state: RootState) => {
-  const currentFolderId: number = storageSelectors.currentFolderId(state);
+  const currentFolderId: string = storageSelectors.currentFolderId(state);
 
   return {
     currentFolderId,
diff --git a/src/app/drive/components/NameCollisionDialog/index.tsx b/src/app/drive/components/NameCollisionDialog/index.tsx
index f0df52076..6c44af509 100644
--- a/src/app/drive/components/NameCollisionDialog/index.tsx
+++ b/src/app/drive/components/NameCollisionDialog/index.tsx
@@ -104,11 +104,7 @@ const NameCollisionDialog: FC<NameCollisionDialogProps> = ({
           <RadioGroup.Label className="sr-only">Select an option</RadioGroup.Label>
           <div className="flex flex-col items-start space-y-3">
             {options.map((option) => (
-              <RadioGroup.Option
-                value={option}
-                className="rounded-md outline-none ring-2 ring-primary/0 ring-offset-2 focus-visible:ring-primary/50"
-                key={option.operation}
-              >
+              <RadioGroup.Option value={option} className="rounded-md outline-none" key={option.operation}>
                 <div className="group flex cursor-pointer flex-row items-center space-x-1.5">
                   <div
                     className={`flex h-5 w-5 flex-col items-center justify-center rounded-full ${
diff --git a/src/app/drive/components/PlanUsage/PlanUsage.tsx b/src/app/drive/components/PlanUsage/PlanUsage.tsx
index 0c24c33da..1d9b72a0e 100644
--- a/src/app/drive/components/PlanUsage/PlanUsage.tsx
+++ b/src/app/drive/components/PlanUsage/PlanUsage.tsx
@@ -1,6 +1,3 @@
-import { useSelector } from 'react-redux';
-import { RootState } from 'app/store';
-import { PlanState } from 'app/store/slices/plan';
 import limitService from 'app/drive/services/limit.service';
 import { bytesToString } from 'app/drive/services/size.service';
 import usageService from 'app/drive/services/usage.service';
@@ -12,17 +9,17 @@ export default function PlanUsage({
   limit,
   usage,
   isLoading,
+  subscriptionType,
   className = '',
 }: {
   limit: number;
   usage: number;
   isLoading: boolean;
+  subscriptionType?: string;
   className?: string;
 }): JSX.Element {
   const { translate } = useTranslationContext();
   const usagePercent = usageService.getUsagePercent(usage, limit);
-  const plan = useSelector<RootState, PlanState>((state) => state.plan);
-  const subscriptionType = plan.subscription?.type;
 
   const isLimitReached = usage >= limit;
   const componentColor = isLimitReached ? 'bg-red' : 'bg-primary';
diff --git a/src/app/drive/components/ShareDialog/ShareDialog.tsx b/src/app/drive/components/ShareDialog/ShareDialog.tsx
index 63c35c535..211da12d8 100644
--- a/src/app/drive/components/ShareDialog/ShareDialog.tsx
+++ b/src/app/drive/components/ShareDialog/ShareDialog.tsx
@@ -1,13 +1,6 @@
-import { MouseEvent, useCallback, useEffect, useRef, useState } from 'react';
 import { Popover } from '@headlessui/react';
-import { connect } from 'react-redux';
-import { useAppDispatch, useAppSelector } from 'app/store/hooks';
-import { RootState } from 'app/store';
-import { uiActions } from 'app/store/slices/ui';
-import Button from 'app/shared/components/Button/Button';
-import Modal from 'app/shared/components/Modal';
-import ShareInviteDialog from '../ShareInviteDialog/ShareInviteDialog';
-import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
+import { SharingMeta } from '@internxt/sdk/dist/drive/share/types';
+import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
 import {
   ArrowLeft,
   CaretDown,
@@ -20,30 +13,38 @@ import {
   Users,
   X,
 } from '@phosphor-icons/react';
+import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
+import { SharePasswordDisableDialog } from 'app/share/components/SharePasswordDisableDialog/SharePasswordDisableDialog';
+import { SharePasswordInputDialog } from 'app/share/components/SharePasswordInputDialog/SharePasswordInputDialog';
+import { MAX_SHARED_NAME_LENGTH } from 'app/share/views/SharedLinksView/SharedView';
 import Avatar from 'app/shared/components/Avatar';
+import Button from 'app/shared/components/Button/Button';
+import Modal from 'app/shared/components/Modal';
 import Spinner from 'app/shared/components/Spinner/Spinner';
-import { sharedThunks } from '../../../store/slices/sharedLinks';
-import './ShareDialog.scss';
-import shareService, { getSharingRoles } from '../../../share/services/share.service';
-import errorService from '../../../core/services/error.service';
-import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
-import notificationsService, { ToastType } from '../../../notifications/services/notifications.service';
+import { DELAY_SHOW_MS } from 'app/shared/components/Tooltip/Tooltip';
+import BaseCheckbox from 'app/shared/components/forms/BaseCheckbox/BaseCheckbox';
+import { RootState } from 'app/store';
+import { useAppDispatch, useAppSelector } from 'app/store/hooks';
 import { Role } from 'app/store/slices/sharedLinks/types';
+import { uiActions } from 'app/store/slices/ui';
 import copy from 'copy-to-clipboard';
-import { AdvancedSharedItem } from '../../../share/types';
-import { DriveItemData } from '../../types';
+import { MouseEvent, useCallback, useEffect, useRef, useState } from 'react';
+import { connect } from 'react-redux';
+import { Tooltip } from 'react-tooltip';
 import { TrackingPlan } from '../../../analytics/TrackingPlan';
 import { trackPublicShared } from '../../../analytics/services/analytics.service';
+import errorService from '../../../core/services/error.service';
 import localStorageService from '../../../core/services/local-storage.service';
-import BaseCheckbox from 'app/shared/components/forms/BaseCheckbox/BaseCheckbox';
-import { SharePasswordDisableDialog } from 'app/share/components/SharePasswordDisableDialog/SharePasswordDisableDialog';
-import { SharingMeta } from '@internxt/sdk/dist/drive/share/types';
-import { SharePasswordInputDialog } from 'app/share/components/SharePasswordInputDialog/SharePasswordInputDialog';
-import { Tooltip } from 'react-tooltip';
-import { DELAY_SHOW_MS } from 'app/shared/components/Tooltip/Tooltip';
-import StopSharingItemDialog from '../StopSharingItemDialog/StopSharingItemDialog';
-import { MAX_SHARED_NAME_LENGTH } from 'app/share/views/SharedLinksView/SharedView';
+import notificationsService, { ToastType } from '../../../notifications/services/notifications.service';
+import shareService, { getSharingRoles } from '../../../share/services/share.service';
+import { AdvancedSharedItem } from '../../../share/types';
 import { isUserItemOwner } from '../../../share/views/SharedLinksView/sharedViewUtils';
+import { sharedThunks } from '../../../store/slices/sharedLinks';
+import workspacesSelectors from '../../../store/slices/workspaces/workspaces.selectors';
+import { DriveItemData } from '../../types';
+import ShareInviteDialog from '../ShareInviteDialog/ShareInviteDialog';
+import StopSharingItemDialog from '../StopSharingItemDialog/StopSharingItemDialog';
+import './ShareDialog.scss';
 
 type AccessMode = 'public' | 'restricted';
 type UserRole = 'owner' | 'editor' | 'reader';
@@ -129,6 +130,7 @@ const ShareDialog = (props: ShareDialogProps): JSX.Element => {
   const { translate } = useTranslationContext();
   const dispatch = useAppDispatch();
   const isOpen = useAppSelector((state: RootState) => state.ui.isShareDialogOpen);
+  const isWorkspace = !!useAppSelector(workspacesSelectors.getSelectedWorkspace);
   const isToastNotificationOpen = useAppSelector((state: RootState) => state.ui.isToastNotificationOpen);
   const itemToShare = useAppSelector((state) => state.storage.itemToShare);
   const { onCloseDialog } = props;
@@ -217,7 +219,7 @@ const ShareDialog = (props: ShareDialogProps): JSX.Element => {
     try {
       const invitedUsersList = await shareService.getUsersOfSharedFolder({
         itemType: itemToShare.item.isFolder ? 'folder' : 'file',
-        folderId: itemToShare.item.uuid as string,
+        folderId: itemToShare.item.uuid,
       });
 
       const invitedUsersListParsed = invitedUsersList['users'].map((user) => ({
@@ -233,7 +235,6 @@ const ShareDialog = (props: ShareDialogProps): JSX.Element => {
         const onwerData = getLocalUserData();
         setInvitedUsers([{ ...onwerData, roleName: 'owner' }]);
       }
-      errorService.reportError(error);
     }
   }, [itemToShare, roles]);
 
@@ -567,7 +568,7 @@ const ShareDialog = (props: ShareDialogProps): JSX.Element => {
                     </div>
                   </Button>
                 )}
-                {currentUserFolderRole !== 'reader' ? (
+                {currentUserFolderRole !== 'reader' && !isWorkspace ? (
                   <Button variant="secondary" onClick={onInviteUser}>
                     <UserPlus size={24} />
                     <span>{translate('modals.shareModal.list.invite')}</span>
@@ -703,29 +704,31 @@ const ShareDialog = (props: ShareDialogProps): JSX.Element => {
                             </div>
                           </button>
                           {/* Restricted */}
-                          <button
-                            className="flex h-16 w-full cursor-pointer items-center justify-start space-x-3 rounded-lg px-3 hover:bg-gray-5 dark:hover:bg-gray-10"
-                            onClick={() => changeAccess('restricted')}
-                          >
-                            <Users size={32} weight="light" />
-                            <div className="flex flex-1 flex-col items-start">
-                              <p className="text-base font-medium leading-none">
-                                {translate('modals.shareModal.general.accessOptions.restricted.title')}
-                              </p>
-                              <p className="text-left text-sm leading-tight text-gray-60">
-                                {translate('modals.shareModal.general.accessOptions.restricted.subtitle')}
-                              </p>
-                            </div>
-                            <div className="flex h-full w-5 items-center justify-center">
-                              {accessMode === 'restricted' ? (
-                                isLoading ? (
-                                  <Spinner className="h-5 w-5" />
-                                ) : (
-                                  <Check size={20} />
-                                )
-                              ) : null}
-                            </div>
-                          </button>
+                          {!isWorkspace && (
+                            <button
+                              className="flex h-16 w-full cursor-pointer items-center justify-start space-x-3 rounded-lg px-3 hover:bg-gray-5 dark:hover:bg-gray-10"
+                              onClick={() => changeAccess('restricted')}
+                            >
+                              <Users size={32} weight="light" />
+                              <div className="flex flex-1 flex-col items-start">
+                                <p className="text-base font-medium leading-none">
+                                  {translate('modals.shareModal.general.accessOptions.restricted.title')}
+                                </p>
+                                <p className="text-left text-sm leading-tight text-gray-60">
+                                  {translate('modals.shareModal.general.accessOptions.restricted.subtitle')}
+                                </p>
+                              </div>
+                              <div className="flex h-full w-5 items-center justify-center">
+                                {accessMode === 'restricted' ? (
+                                  isLoading ? (
+                                    <Spinner className="h-5 w-5" />
+                                  ) : (
+                                    <Check size={20} />
+                                  )
+                                ) : null}
+                              </div>
+                            </button>
+                          )}
                           {/* Stop sharing */}
                           {(currentUserFolderRole === 'owner' || isUserOwner || props?.isDriveItem) && (
                             <button
diff --git a/src/app/drive/components/ShareInviteDialog/ShareInviteDialog.tsx b/src/app/drive/components/ShareInviteDialog/ShareInviteDialog.tsx
index cf4afc9aa..e4ba3be49 100644
--- a/src/app/drive/components/ShareInviteDialog/ShareInviteDialog.tsx
+++ b/src/app/drive/components/ShareInviteDialog/ShareInviteDialog.tsx
@@ -2,13 +2,13 @@ import { Listbox } from '@headlessui/react';
 import isValidEmail from '@internxt/lib/dist/src/auth/isValidEmail';
 import { CaretDown, Check } from '@phosphor-icons/react';
 import { AsyncThunkAction } from '@reduxjs/toolkit';
-import errorService from 'app/core/services/error.service';
 import { useEffect, useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { useDispatch } from 'react-redux';
 import { TrackingPlan } from '../../../analytics/TrackingPlan';
 import { trackRestrictedShared } from '../../../analytics/services/analytics.service';
 import userService from '../../../auth/services/user.service';
+import errorService from '../../../core/services/error.service';
 import { HTTP_CODES } from '../../../core/services/http.service';
 import AppError, { IFormValues } from '../../../core/types';
 import { useTranslationContext } from '../../../i18n/provider/TranslationProvider';
@@ -233,7 +233,7 @@ const ShareInviteDialog = (props: ShareInviteDialogProps): JSX.Element => {
                 >
                   <div className="flex items-center">
                     <Avatar src="" fullName={`${user.email}`} diameter={40} />
-                    <p className="ml-2.5">{user.email}</p>
+                    <p className="ml-2.5 break-all">{user.email}</p>
                   </div>
                   <Listbox value={user.userRole} onChange={(selectedValue) => onEditRole(selectedValue, user)}>
                     <div className="relative">
diff --git a/src/app/drive/components/WarningMessage/WarningMessageWrapper.tsx b/src/app/drive/components/WarningMessage/WarningMessageWrapper.tsx
index 78eac8703..3991ce1c2 100644
--- a/src/app/drive/components/WarningMessage/WarningMessageWrapper.tsx
+++ b/src/app/drive/components/WarningMessage/WarningMessageWrapper.tsx
@@ -28,7 +28,7 @@ const WarningMessageWrapper = ({
 };
 
 export default connect((state: RootState) => ({
-  planUsage: state.plan.planUsage,
+  planUsage: planSelectors.planUsageToShow(state),
   planLimit: planSelectors.planLimitToShow(state),
   isLoadingPlanLimit: state.plan.isLoadingPlanLimit,
   isLoadingPlanUsage: state.plan.isLoadingPlanUsage,
diff --git a/src/app/drive/services/database.service.test.ts b/src/app/drive/services/database.service.test.ts
index 979f807c5..a9c7dd017 100644
--- a/src/app/drive/services/database.service.test.ts
+++ b/src/app/drive/services/database.service.test.ts
@@ -1,7 +1,6 @@
 import databaseService, { AppDatabase, DatabaseCollection } from '../../database/services/database.service';
 import { DriveItemData } from '../types';
-import { levels_blobs, photos } from '../../database/services/database.service/mocks';
-import { deleteDatabasePhotos } from './database.service';
+import { levels_blobs } from '../../database/services/database.service/mocks';
 
 describe('databaseService', () => {
   const get = (database) => (databaseKey: DatabaseCollection, itemKey: number | string) =>
@@ -18,26 +17,5 @@ describe('databaseService', () => {
       return Promise.resolve();
     };
 
-  const delte = (database) => (collectionName: DatabaseCollection, key: AppDatabase[DatabaseCollection]['key']) => {
-    delete database[collectionName][key];
-    return Promise.resolve();
-  };
-
-  it('should correctly delete the photos from database.', async () => {
-    const photosId = ['id1', 'id34'];
-    const database = {
-      [DatabaseCollection.Levels]: { ...levels_blobs },
-      [DatabaseCollection.LevelsBlobs]: { ...levels_blobs },
-      [DatabaseCollection.Photos]: { ...photos },
-    };
-    jest.spyOn(databaseService, 'get').mockImplementation(get(database));
-    jest.spyOn(databaseService, 'put').mockImplementation(put(database));
-    jest.spyOn(databaseService, 'delete').mockImplementation(delte(database));
-
-    await deleteDatabasePhotos(photosId);
-
-    expect(databaseService.delete).toHaveBeenCalledWith(DatabaseCollection.Photos, 'id1');
-    expect(databaseService.delete).toHaveBeenCalledWith(DatabaseCollection.Photos, 'id34');
-    expect(database.photos).toEqual({ id2: { source: {} } });
-  });
+  it('just mocks the test', () => {});
 });
diff --git a/src/app/drive/services/database.service.ts b/src/app/drive/services/database.service.ts
index d4eb6998c..9e2c7e592 100644
--- a/src/app/drive/services/database.service.ts
+++ b/src/app/drive/services/database.service.ts
@@ -2,12 +2,9 @@ import databaseService, {
   AvatarBlobData,
   DatabaseCollection,
   DriveItemBlobData,
-  PhotosData,
 } from '../../database/services/database.service';
 import { LRUFilesCacheManager } from '../../database/services/database.service/LRUFilesCacheManager';
 import { LRUFilesPreviewCacheManager } from '../../database/services/database.service/LRUFilesPreviewCacheManager';
-import { LRUPhotosCacheManager } from '../../database/services/database.service/LRUPhotosCacheManager';
-import { LRUPhotosPreviewsCacheManager } from '../../database/services/database.service/LRUPhotosPreviewCacheManager';
 import { DriveFileData, DriveFolderData, DriveItemData } from '../types';
 
 const updateDatabaseProfileAvatar = async ({
@@ -18,20 +15,39 @@ const updateDatabaseProfileAvatar = async ({
   uuid: string;
   sourceURL: string;
   avatarBlob: Blob;
-}): Promise<void> => {
+}): Promise<void> =>
   databaseService.put(DatabaseCollection.Account_settings, 'profile_avatar', {
     srcURL: sourceURL,
     avatarBlob,
     uuid,
   });
-};
 
 const getDatabaseProfileAvatar = async (): Promise<AvatarBlobData | undefined> =>
   databaseService.get(DatabaseCollection.Account_settings, 'profile_avatar');
 
-const deleteDatabaseProfileAvatar = async (): Promise<void> => {
+const deleteDatabaseProfileAvatar = async (): Promise<void> =>
   databaseService.delete(DatabaseCollection.Account_settings, 'profile_avatar');
-};
+
+const updateDatabaseWorkspaceAvatar = async ({
+  uuid,
+  sourceURL,
+  avatarBlob,
+}: {
+  uuid: string;
+  sourceURL: string;
+  avatarBlob: Blob;
+}): Promise<void> =>
+  databaseService.put(DatabaseCollection.WorkspacesAvatarBlobs, uuid, {
+    srcURL: sourceURL,
+    avatarBlob,
+    uuid,
+  });
+
+const getDatabaseWorkspaceAvatar = async (uuid: string): Promise<AvatarBlobData | undefined> =>
+  databaseService.get(DatabaseCollection.WorkspacesAvatarBlobs, uuid);
+
+const deleteDatabaseWorkspaceAvatar = async (uuid: string): Promise<void> =>
+  databaseService.delete(DatabaseCollection.WorkspacesAvatarBlobs, uuid);
 
 const updateDatabaseFilePreviewData = async ({
   fileId,
@@ -45,7 +61,8 @@ const updateDatabaseFilePreviewData = async ({
   updatedAt: string;
 }): Promise<void> => {
   const lruFilesPreviewCacheManager = await LRUFilesPreviewCacheManager.getInstance();
-  const fileData = await databaseService.get(DatabaseCollection.LevelsBlobs, fileId);
+  // CHECK IF THAT THE PREVIEW KEY IS THE ID HAS ANY UNEXPECTED EFFECT INSTEAD OF BE THE FILE UUID
+  const fileData = await databaseService.get(DatabaseCollection.LevelsBlobs, fileId?.toString());
 
   lruFilesPreviewCacheManager?.set(
     fileId.toString(),
@@ -66,56 +83,6 @@ const getDatabaseFilePreviewData = async ({ fileId }: { fileId: number }): Promi
   return lruFilesPreviewCacheManager?.get(fileId.toString());
 };
 
-const updateDatabasePhotosPreviewData = async ({
-  photoId,
-  preview,
-}: {
-  photoId: string;
-  preview: Blob;
-}): Promise<void> => {
-  const lruPhotosPreviewCacheManager = await LRUPhotosPreviewsCacheManager.getInstance();
-  const photoData = await databaseService.get(DatabaseCollection.Photos, photoId);
-
-  lruPhotosPreviewCacheManager?.set(
-    photoId,
-    {
-      ...photoData,
-      preview: preview,
-    },
-    preview.size,
-  );
-};
-
-const getDatabasePhotosPreviewData = async ({ photoId }: { photoId: string }): Promise<PhotosData | undefined> => {
-  const lruPhotosPreviewCacheManager = await LRUPhotosPreviewsCacheManager.getInstance();
-  return lruPhotosPreviewCacheManager.get(photoId);
-};
-
-const updateDatabasePhotosSourceData = async ({
-  photoId,
-  source,
-}: {
-  photoId: string;
-  source: Blob;
-}): Promise<void> => {
-  const lruPhotosCacheManager = await LRUPhotosCacheManager.getInstance();
-  const photoData = await databaseService.get(DatabaseCollection.Photos, photoId);
-
-  lruPhotosCacheManager?.set(
-    photoId,
-    {
-      ...photoData,
-      source: source,
-    },
-    source.size,
-  );
-};
-
-const getDatabasePhotosSourceData = async ({ photoId }: { photoId: string }): Promise<PhotosData | undefined> => {
-  const lruPhotosCacheManager = await LRUPhotosCacheManager.getInstance();
-  return lruPhotosCacheManager?.get(photoId);
-};
-
 const getDatabaseFileSourceData = async ({ fileId }: { fileId: number }): Promise<DriveItemBlobData | undefined> => {
   const lruFilesCacheManager = await LRUFilesCacheManager.getInstance();
   return lruFilesCacheManager?.get(fileId?.toString());
@@ -133,7 +100,9 @@ const updateDatabaseFileSourceData = async ({
   updatedAt: string;
 }): Promise<void> => {
   const lruFilesCacheManager = await LRUFilesCacheManager.getInstance();
-  const fileData = await databaseService.get(DatabaseCollection.LevelsBlobs, fileId);
+  // CHECK IF THAT THE PREVIEW KEY IS THE ID HAS ANY UNEXPECTED EFFECT INSTEAD OF BE THE FILE UUID
+
+  const fileData = await databaseService.get(DatabaseCollection.LevelsBlobs, fileId?.toString());
 
   lruFilesCacheManager?.set(
     fileId.toString(),
@@ -148,10 +117,6 @@ const updateDatabaseFileSourceData = async ({
   );
 };
 
-const deleteDatabasePhotos = async (photosId: string[]): Promise<void> => {
-  photosId.forEach(async (photoId) => await databaseService.delete(DatabaseCollection.Photos, photoId));
-};
-
 const deleteDatabaseItems = async (items: DriveItemData[]): Promise<void> => {
   const lruFilesCacheManager = await LRUFilesCacheManager.getInstance();
 
@@ -166,7 +131,7 @@ const deleteDatabaseItems = async (items: DriveItemData[]): Promise<void> => {
 
   if (foldersInFolder.length) {
     await foldersInFolder.forEach(async (folder) => {
-      const folderItems = await databaseService.get(DatabaseCollection.Levels, folder?.id as number);
+      const folderItems = await databaseService.get(DatabaseCollection.Levels, folder?.uuid);
 
       if (folderItems) {
         deleteDatabaseItems(folderItems as DriveItemData[]);
@@ -186,16 +151,14 @@ const canFileBeCached = (file: DriveFileData): boolean => {
 export {
   canFileBeCached,
   deleteDatabaseItems,
-  deleteDatabasePhotos,
   deleteDatabaseProfileAvatar,
+  deleteDatabaseWorkspaceAvatar,
   getDatabaseFilePreviewData,
   getDatabaseFileSourceData,
-  getDatabasePhotosPreviewData,
-  getDatabasePhotosSourceData,
   getDatabaseProfileAvatar,
+  getDatabaseWorkspaceAvatar,
   updateDatabaseFilePreviewData,
   updateDatabaseFileSourceData,
-  updateDatabasePhotosPreviewData,
-  updateDatabasePhotosSourceData,
   updateDatabaseProfileAvatar,
+  updateDatabaseWorkspaceAvatar,
 };
diff --git a/src/app/drive/services/download.service/downloadFile.ts b/src/app/drive/services/download.service/downloadFile.ts
index eeeac91cb..0e60e9a58 100644
--- a/src/app/drive/services/download.service/downloadFile.ts
+++ b/src/app/drive/services/download.service/downloadFile.ts
@@ -1,13 +1,13 @@
 import streamSaver from 'streamsaver';
 
-import analyticsService from 'app/analytics/services/analytics.service';
 import { TrackingPlan } from 'app/analytics/TrackingPlan';
-import { DriveFileData } from '../../types';
-import downloadFileFromBlob from './downloadFileFromBlob';
-import fetchFileStream from './fetchFileStream';
+import analyticsService from 'app/analytics/services/analytics.service';
 import { loadWritableStreamPonyfill } from 'app/network/download';
 import { isFirefox } from 'react-device-detect';
 import { ConnectionLostError } from '../../../network/requests';
+import { DriveFileData } from '../../types';
+import downloadFileFromBlob from './downloadFileFromBlob';
+import fetchFileStream from './fetchFileStream';
 import fetchFileStreamWithCreds from './fetchFileStreamWithCreds';
 
 interface BlobWritable {
@@ -80,7 +80,7 @@ async function pipe(readable: ReadableStream, writable: BlobWritable): Promise<v
 
 export default async function downloadFile(
   itemData: DriveFileData,
-  isTeam: boolean,
+  isWorkspace: boolean,
   updateProgressCallback: (progress: number) => void,
   abortController?: AbortController,
   sharingOptions?: { credentials: { user: string; pass: string }; mnemonic: string },
@@ -122,7 +122,10 @@ export default async function downloadFile(
   analyticsService.trackFileDownloadStarted(trackingDownloadProperties);
 
   const fileStreamPromise = !sharingOptions
-    ? fetchFileStream({ ...itemData, bucketId: itemData.bucket }, { isTeam, updateProgressCallback, abortController })
+    ? fetchFileStream(
+        { ...itemData, bucketId: itemData.bucket },
+        { isWorkspace, updateProgressCallback, abortController },
+      )
     : fetchFileStreamWithCreds(
         { ...itemData, bucketId: itemData.bucket },
         {
diff --git a/src/app/drive/services/download.service/downloadFolder/downloadFolderUsingBlobs.ts b/src/app/drive/services/download.service/downloadFolder/downloadFolderUsingBlobs.ts
index 87581711d..47f2d15f1 100644
--- a/src/app/drive/services/download.service/downloadFolder/downloadFolderUsingBlobs.ts
+++ b/src/app/drive/services/download.service/downloadFolder/downloadFolderUsingBlobs.ts
@@ -1,8 +1,9 @@
-import JSZip from 'jszip';
-import fileDownload from 'js-file-download';
 import { items } from '@internxt/lib';
+import fileDownload from 'js-file-download';
+import JSZip from 'jszip';
 
-import { DriveFolderData, FolderTree } from '../../../types';
+import { FolderTree } from '@internxt/sdk/dist/drive/storage/types';
+import { DriveFolderData } from '../../../types';
 import folderService from '../../folder.service';
 import fetchFileBlob from '../fetchFileBlob';
 
@@ -16,13 +17,15 @@ export default async function downloadFolderUsingBlobs({
   folder,
   decryptedCallback,
   updateProgressCallback,
+  isWorkspace,
 }: {
   folder: DriveFolderData;
   decryptedCallback?: () => void;
   updateProgressCallback?: (progress: number) => void;
+  isWorkspace: boolean;
 }): Promise<void> {
   const zip = new JSZip();
-  const { tree, folderDecryptedNames, fileDecryptedNames, size } = await folderService.fetchFolderTree(folder.id);
+  const { tree, folderDecryptedNames, fileDecryptedNames, size } = await folderService.fetchFolderTree(folder.uuid);
   let downloadedSize = 0;
 
   decryptedCallback?.();
@@ -54,6 +57,7 @@ export default async function downloadFolderUsingBlobs({
 
             (updateProgressCallback || (() => undefined))(totalProgress);
           },
+          isWorkspace,
         },
       );
       const fileBlob = await fileBlobPromise;
diff --git a/src/app/drive/services/download.service/downloadFolder/downloadFolderUsingFileSystemAccessAPI.ts b/src/app/drive/services/download.service/downloadFolder/downloadFolderUsingFileSystemAccessAPI.ts
index 8cc3d623f..b3396fd28 100644
--- a/src/app/drive/services/download.service/downloadFolder/downloadFolderUsingFileSystemAccessAPI.ts
+++ b/src/app/drive/services/download.service/downloadFolder/downloadFolderUsingFileSystemAccessAPI.ts
@@ -1,8 +1,9 @@
 import { items } from '@internxt/lib';
 
-import { FlatFolderZip } from 'app/core/services/zipFolder.service';
+import { FolderTree } from '@internxt/sdk/dist/drive/storage/types';
+import { FlatFolderZip } from 'app/core/services/zip.service';
 import network from 'app/network';
-import { DriveFolderData, FolderTree } from '../../../types';
+import { DriveFolderData } from '../../../types';
 import folderService from '../../folder.service';
 import { getEnvironmentConfig } from '../../network.service';
 
@@ -10,20 +11,20 @@ import { getEnvironmentConfig } from '../../network.service';
  * @description Downloads a folder using File System Access API
  * TODO: Load levels paginated instead of loading the entire tree at once.
  * @param folderData
- * @param isTeam
+ * @param isWorkspace
  */
 export default function downloadFolderUsingFileSystemAccessAPI({
   folder,
   updateProgressCallback,
-  isTeam,
+  isWorkspace,
   abortController,
 }: {
   folder: DriveFolderData;
   updateProgressCallback?: (progress: number) => void;
-  isTeam: boolean;
+  isWorkspace: boolean;
   abortController?: AbortController;
 }): Promise<void> {
-  const { bridgeUser, bridgePass, encryptionKey } = getEnvironmentConfig(isTeam);
+  const { bridgeUser, bridgePass, encryptionKey } = getEnvironmentConfig(isWorkspace);
 
   return downloadFolder(
     folder,
@@ -42,7 +43,7 @@ async function downloadFolder(
 ) {
   const { abortController, updateProgress } = opts;
   const { bridgeUser, bridgePass, encryptionKey } = environment;
-  const { tree, folderDecryptedNames, fileDecryptedNames, size } = await folderService.fetchFolderTree(folder.id);
+  const { tree, folderDecryptedNames, fileDecryptedNames, size } = await folderService.fetchFolderTree(folder.uuid);
   const pendingFolders: { path: string; data: FolderTree }[] = [{ path: '', data: tree }];
 
   const zip = new FlatFolderZip(folder.name, {
diff --git a/src/app/drive/services/download.service/downloadFolder/downloadFolderUsingStreamSaver.ts b/src/app/drive/services/download.service/downloadFolder/downloadFolderUsingStreamSaver.ts
index 2d97918b4..e90bc523a 100644
--- a/src/app/drive/services/download.service/downloadFolder/downloadFolderUsingStreamSaver.ts
+++ b/src/app/drive/services/download.service/downloadFolder/downloadFolderUsingStreamSaver.ts
@@ -1,14 +1,15 @@
-import JSZip from 'jszip';
-import { items } from '@internxt/lib';
-import streamSaver from 'streamsaver';
 import { ActionState } from '@internxt/inxt-js/build/api/ActionState';
+import { items } from '@internxt/lib';
+import JSZip from 'jszip';
 import internal from 'stream';
+import streamSaver from 'streamsaver';
 
+import { FolderTree } from '@internxt/sdk/dist/drive/storage/types';
 import errorService from 'app/core/services/error.service';
-import { getEnvironmentConfig, Network } from '../../network.service';
-import { DriveFileData, DriveFolderData, FolderTree } from '../../../types';
-import folderService from '../../folder.service';
 import { t } from 'i18next';
+import { DriveFileData, DriveFolderData } from '../../../types';
+import folderService from '../../folder.service';
+import { getEnvironmentConfig, Network } from '../../network.service';
 
 /**
  * @description Downloads a folder using StreamSaver.js
@@ -23,20 +24,20 @@ export default async function downloadFolderUsingStreamSaver({
   decryptedCallback,
   updateProgressCallback,
   errorCallback,
-  isTeam,
+  isWorkspace,
 }: {
   folder: DriveFolderData;
   decryptedCallback?: () => void;
   updateProgressCallback?: (progress: number) => void;
   errorCallback?: (err: Error) => void;
-  isTeam: boolean;
+  isWorkspace: boolean;
 }): Promise<[Promise<void>, () => void]> {
   const downloadingSize: Record<number, number> = {};
   const fileStreams: { file: DriveFileData; stream: internal.Readable }[] = [];
   const actionStates: ActionState[] = [];
-  const { bridgeUser, bridgePass, encryptionKey } = getEnvironmentConfig(isTeam);
+  const { bridgeUser, bridgePass, encryptionKey } = getEnvironmentConfig(isWorkspace);
   const network = new Network(bridgeUser, bridgePass, encryptionKey);
-  const { tree, folderDecryptedNames, fileDecryptedNames, size } = await folderService.fetchFolderTree(folder.id);
+  const { tree, folderDecryptedNames, fileDecryptedNames, size } = await folderService.fetchFolderTree(folder.uuid);
   const zip = new JSZip();
   const isBrave = !!(navigator.brave && (await navigator.brave.isBrave()));
 
diff --git a/src/app/drive/services/download.service/downloadFolder/downloadSharedFolderUsingBlobs.ts b/src/app/drive/services/download.service/downloadFolder/downloadSharedFolderUsingBlobs.ts
deleted file mode 100644
index 9de1200a9..000000000
--- a/src/app/drive/services/download.service/downloadFolder/downloadSharedFolderUsingBlobs.ts
+++ /dev/null
@@ -1,124 +0,0 @@
-import { items } from '@internxt/lib';
-import errorService from 'app/core/services/error.service';
-import { getSharedDirectoryFiles, getSharedDirectoryFolders } from 'app/share/services/share.service';
-import fileDownload from 'js-file-download';
-import JSZip from 'jszip';
-
-import { Network } from '../../network.service';
-
-interface FolderPackage {
-  folderId: number;
-  parentId: number;
-  name: string;
-  pack: JSZip;
-}
-
-export async function downloadSharedFolderUsingBlobs(
-  sharedFolderMeta: { name: string; id: number; token: string; code: string; size: number; password?: string },
-  bucket: string,
-  bucketToken: string,
-  options: {
-    foldersLimit: number;
-    filesLimit: number;
-    progressCallback: (progress: number) => void;
-  },
-): Promise<void> {
-  const downloadingSize: Record<number, number> = {};
-  const network = new Network('NONE', 'NONE', 'NONE');
-  const zip = new JSZip();
-
-  const progressIntervalId = setInterval(() => {
-    const totalDownloadedSize = Object.values(downloadingSize).reduce((t, x) => t + x, 0);
-    const totalProgress = totalDownloadedSize / sharedFolderMeta.size - 0.01;
-
-    (options.progressCallback || (() => undefined))(totalProgress >= 0 ? totalProgress : 0);
-  }, 1000);
-
-  const rootFolder: FolderPackage = {
-    folderId: sharedFolderMeta.id,
-    parentId: sharedFolderMeta.id,
-    pack: zip,
-    name: sharedFolderMeta.name,
-  };
-  const pendingFolders: FolderPackage[] = [rootFolder];
-
-  try {
-    // * Renames files iterating over folders
-    do {
-      const folderToDownload = pendingFolders.shift() as FolderPackage;
-      const currentFolderZip = folderToDownload.pack?.folder(folderToDownload.name) || zip;
-
-      let filesDownloadNotFinished = false;
-      let filesOffset = 0;
-
-      while (!filesDownloadNotFinished) {
-        const { files, last } = await getSharedDirectoryFiles({
-          token: sharedFolderMeta.token,
-          directoryId: folderToDownload.folderId,
-          parentId: folderToDownload.parentId,
-          offset: filesOffset,
-          limit: options.foldersLimit,
-          code: sharedFolderMeta.code,
-        });
-
-        filesOffset += options.filesLimit;
-        filesDownloadNotFinished = last;
-
-        // * Downloads current folder files
-        for (const file of files) {
-          const displayFilename = items.getItemDisplayName({
-            name: file.name,
-            type: file.type,
-          });
-          const [fileStreamPromise] = network.downloadFile(bucket, file.id, {
-            fileEncryptionKey: Buffer.from(file.encryptionKey, 'hex'),
-            fileToken: bucketToken,
-            progressCallback: (fileProgress) => {
-              downloadingSize[file.id] = file.size * fileProgress;
-            },
-          });
-          const fileBlob = await fileStreamPromise;
-          currentFolderZip?.file(displayFilename, fileBlob);
-        }
-      }
-
-      let foldersOffset = 0;
-      let completed = false;
-      while (!completed) {
-        const { folders, last } = await getSharedDirectoryFolders({
-          token: sharedFolderMeta.token,
-          directoryId: folderToDownload.folderId,
-          parentId: folderToDownload.parentId,
-          offset: foldersOffset,
-          limit: options.foldersLimit,
-          password: sharedFolderMeta.password,
-        });
-
-        folders.map(async ({ id, name }) => {
-          pendingFolders.push({
-            folderId: id,
-            parentId: folderToDownload.folderId,
-            name: name,
-            pack: currentFolderZip,
-          });
-        });
-
-        completed = last;
-        foldersOffset += options.foldersLimit;
-      }
-    } while (pendingFolders.length > 0);
-  } catch (err) {
-    throw errorService.castError(err);
-  } finally {
-    clearInterval(progressIntervalId);
-  }
-
-  return zip
-    .generateAsync({
-      type: 'blob',
-    })
-    .then((content) => {
-      options.progressCallback(1);
-      fileDownload(content, `${sharedFolderMeta.name}.zip`, 'application/zip');
-    });
-}
diff --git a/src/app/drive/services/download.service/downloadFolder/downloadSharedFolderUsingFileSystemAPI.ts b/src/app/drive/services/download.service/downloadFolder/downloadSharedFolderUsingFileSystemAPI.ts
deleted file mode 100644
index d5f8c3a08..000000000
--- a/src/app/drive/services/download.service/downloadFolder/downloadSharedFolderUsingFileSystemAPI.ts
+++ /dev/null
@@ -1,137 +0,0 @@
-import { SharedDirectoryFolder } from '@internxt/sdk/dist/drive/share/types';
-import errorService from 'app/core/services/error.service';
-import { DownloadableFile, DownloadableFolder, FolderLevel } from '../downloader';
-import { SharedDirectoryFolderIterator, SharedFolderFilesIterator } from '../../../../share/services/folder.service';
-import { Iterator } from 'app/core/collections';
-import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
-import { t } from 'i18next';
-
-interface FolderRef {
-  name: string;
-  folderId: number;
-  parentId: number;
-  handle: FileSystemDirectoryHandle;
-}
-
-export async function downloadSharedFolderUsingFileSystemAPI(
-  sharedFolderMeta: {
-    name: string;
-    id: number;
-    token: string;
-    code: string;
-    password?: string;
-  },
-  bucket: string,
-  bucketToken: string,
-  options: {
-    foldersLimit: number;
-    filesLimit: number;
-    progressCallback: (downloadedBytes: number) => void;
-  },
-): Promise<void> {
-  const downloads: { [key: SharedDirectoryFolder['id']]: number } = {};
-  const isBrave = !!(navigator.brave && (await navigator.brave.isBrave()));
-
-  if (isBrave) {
-    throw new Error(t('error.browserNotSupported', { userAgent: 'Brave' }) as string);
-  }
-
-  const getTotalDownloadedBytes = () => {
-    return Object.values(downloads).reduce((translate, x) => translate + x, 0);
-  };
-
-  const progressIntervalId = setInterval(() => {
-    (options.progressCallback || (() => undefined))(getTotalDownloadedBytes());
-  }, 1000);
-
-  try {
-    const fsDirectoryHandle = await window.showDirectoryPicker({ startIn: 'downloads' });
-
-    const sharedFolderDirectoryHandle = await fsDirectoryHandle.getDirectoryHandle(sharedFolderMeta.name, {
-      create: true,
-    });
-
-    const rootFolder: FolderRef = {
-      name: sharedFolderMeta.name,
-      folderId: sharedFolderMeta.id,
-      parentId: sharedFolderMeta.id,
-      handle: sharedFolderDirectoryHandle,
-    };
-    const pendingFolders: FolderRef[] = [rootFolder];
-
-    do {
-      const folderToDownload = pendingFolders.shift() as FolderRef;
-
-      const sharedDirectoryFilesIterator: Iterator<DownloadableFile> = new SharedFolderFilesIterator(
-        {
-          token: sharedFolderMeta.token,
-          directoryId: folderToDownload.folderId,
-          parentId: folderToDownload.parentId,
-          code: sharedFolderMeta.code,
-          password: sharedFolderMeta.password,
-        },
-        options.filesLimit,
-      );
-
-      const sharedDirectoryFoldersIterator: Iterator<DownloadableFolder> = new SharedDirectoryFolderIterator(
-        {
-          token: sharedFolderMeta.token,
-          directoryId: folderToDownload.folderId,
-          parentId: folderToDownload.parentId,
-          password: sharedFolderMeta.password,
-        },
-        options.foldersLimit,
-      );
-
-      const folderLevel = new FolderLevel(
-        sharedDirectoryFoldersIterator,
-        sharedDirectoryFilesIterator,
-        bucket,
-        bucketToken,
-      );
-
-      const directory = folderToDownload.handle;
-
-      await folderLevel.download({
-        onFileRetrieved: async ({ name, id, stream }, onFileDownloaded) => {
-          try {
-            const downloadedFileHandle = await directory.getFileHandle(name, { create: true });
-            const downloadedFileWritable = await downloadedFileHandle.createWritable({ keepExistingData: false });
-
-            downloads[id] = 0;
-
-            const progressStream = new TransformStream({
-              transform(chunk, controller) {
-                downloads[id] += chunk.length;
-                controller.enqueue(chunk);
-              },
-            });
-
-            await stream.pipeThrough(progressStream).pipeTo(downloadedFileWritable);
-            onFileDownloaded(null);
-          } catch (err) {
-            onFileDownloaded(err as Error);
-          }
-        },
-        onFolderRetrieved: async ({ name, id }, onFolderDownloaded) => {
-          try {
-            pendingFolders.push({
-              folderId: id,
-              parentId: folderToDownload.folderId,
-              handle: await directory.getDirectoryHandle(name, { create: true }),
-              name,
-            });
-            onFolderDownloaded(null);
-          } catch (err) {
-            onFolderDownloaded(err as Error);
-          }
-        },
-      });
-    } while (pendingFolders.length > 0);
-  } catch (err) {
-    throw errorService.castError(err);
-  } finally {
-    clearInterval(progressIntervalId);
-    options.progressCallback(getTotalDownloadedBytes());
-  }
-}
diff --git a/src/app/drive/services/download.service/downloadFolder/downloadSharedFolderUsingReadableStream.ts b/src/app/drive/services/download.service/downloadFolder/downloadSharedFolderUsingReadableStream.ts
deleted file mode 100644
index 56ca4fdfe..000000000
--- a/src/app/drive/services/download.service/downloadFolder/downloadSharedFolderUsingReadableStream.ts
+++ /dev/null
@@ -1,187 +0,0 @@
-import { EventEmitter } from 'events';
-import { createWriteStream } from 'streamsaver';
-
-import errorService from 'app/core/services/error.service';
-import { DownloadableFile, DownloadableFolder, FolderLevel } from '../downloader';
-import { SharedDirectoryFolderIterator, SharedFolderFilesIterator } from '../../../../share/services/folder.service';
-import createZipReadable from './zipStream';
-import { Iterator } from 'app/core/collections';
-
-interface FolderRef {
-  name: string;
-  folderId: number;
-  parentId: number;
-}
-
-type FileType = 'file';
-type FolderType = 'folder';
-type Downloadable<T> = {
-  name: string;
-  stream: T extends FileType ? ReadableStream : undefined;
-};
-type Downloadables = Record<string, Downloadable<FileType | FolderType>>;
-
-export async function downloadSharedFolderUsingReadableStream(
-  sharedFolderMeta: {
-    name: string;
-    id: number;
-    token: string;
-    code: string;
-    password?: string;
-  },
-  bucket: string,
-  bucketToken: string,
-  options: {
-    foldersLimit: number;
-    filesLimit: number;
-    progressCallback: (downloadedBytes: number) => void;
-  },
-): Promise<void> {
-  let downloadedBytes = 0;
-
-  const progressIntervalId = setInterval(() => {
-    options.progressCallback(downloadedBytes);
-  }, 1000);
-
-  const rootFolder: FolderRef = {
-    name: sharedFolderMeta.name,
-    folderId: sharedFolderMeta.id,
-    parentId: sharedFolderMeta.id,
-  };
-
-  const eventBus = new EventEmitter();
-  const downloadables: Downloadables = {};
-
-  const readableZipStream = createZipReadable({
-    start(ctrl) {
-      ctrl.enqueue({ name: rootFolder.name, directory: true });
-    },
-    async pull(ctrl: {
-      enqueue: (content: {
-        name: string;
-        stream?: () => ReadableStream<Uint8Array> | undefined;
-        directory?: boolean;
-      }) => void;
-      close: () => void;
-    }) {
-      eventBus.emit('task-processed');
-
-      return new Promise((resolve: (fileOrFolderId: number | null, type: 'file' | 'folder') => void, reject) => {
-        eventBus
-          .once('file-ready', (fileId: number) => resolve(fileId, 'file'))
-          .once('folder-ready', (folderId: number) => resolve(folderId, 'folder'))
-          .once('end', () => resolve(null, 'file'))
-          .once('error', reject);
-      }).then((fileOrFolderId) => {
-        if (!fileOrFolderId) {
-          return ctrl.close();
-        }
-        const fileOrFolder = downloadables[fileOrFolderId];
-
-        if (fileOrFolder.stream) {
-          ctrl.enqueue({
-            name: fileOrFolder.name,
-            stream: () => fileOrFolder.stream,
-          });
-        } else {
-          ctrl.enqueue({ name: fileOrFolder.name, directory: true });
-        }
-      });
-    },
-  });
-
-  const passThrough = new ReadableStream({
-    async start(controller) {
-      let ended = false;
-      const reader = readableZipStream.getReader();
-
-      while (!ended) {
-        const { value, done } = await reader.read();
-
-        if (!done) {
-          downloadedBytes += (value as Uint8Array).length;
-          controller.enqueue(value);
-        } else {
-          ended = true;
-        }
-      }
-
-      await reader.closed;
-      controller.close();
-    },
-  });
-
-  const abortable = new AbortController();
-  let error: Error | null = null;
-
-  try {
-    const zipDownloadPromise = passThrough.pipeTo(createWriteStream(rootFolder.name + '.zip'), {
-      signal: abortable.signal,
-    });
-    const pendingFolders: FolderRef[] = [rootFolder];
-
-    do {
-      const folderToDownload = pendingFolders.shift() as FolderRef;
-
-      const sharedDirectoryFilesIterator: Iterator<DownloadableFile> = new SharedFolderFilesIterator(
-        {
-          token: sharedFolderMeta.token,
-          directoryId: folderToDownload.folderId,
-          parentId: folderToDownload.parentId,
-          code: sharedFolderMeta.code,
-          password: sharedFolderMeta.password,
-        },
-        options.filesLimit,
-      );
-
-      const sharedDirectoryFoldersIterator: Iterator<DownloadableFolder> = new SharedDirectoryFolderIterator(
-        {
-          token: sharedFolderMeta.token,
-          directoryId: folderToDownload.folderId,
-          parentId: folderToDownload.parentId,
-          password: sharedFolderMeta.password,
-        },
-        options.foldersLimit,
-      );
-
-      const folderLevel = new FolderLevel(
-        sharedDirectoryFoldersIterator,
-        sharedDirectoryFilesIterator,
-        bucket,
-        bucketToken,
-      );
-
-      await folderLevel
-        .download({
-          onFileRetrieved: ({ name, id, stream }, onFileDownloaded) => {
-            const fullPath = folderToDownload.name + '/' + name;
-
-            downloadables[id] = { name: fullPath, stream };
-            eventBus.once('task-processed', onFileDownloaded);
-            eventBus.emit('file-ready', id);
-          },
-          onFolderRetrieved: ({ name, id }, onFolderDownloaded) => {
-            const fullPath = folderToDownload.name + '/' + name;
-
-            downloadables[id] = { name: fullPath, stream: undefined };
-            eventBus.once('task-processed', onFolderDownloaded);
-            eventBus.emit('folder-ready', id);
-            pendingFolders.push({ folderId: id, parentId: folderToDownload.folderId, name: fullPath });
-          },
-        })
-        .catch((err) => {
-          error = err;
-          abortable.abort();
-        });
-    } while (pendingFolders.length > 0);
-
-    eventBus.emit('end');
-
-    await zipDownloadPromise;
-    options.progressCallback(downloadedBytes);
-  } catch (err) {
-    throw errorService.castError(error ?? err);
-  } finally {
-    clearInterval(progressIntervalId);
-  }
-}
diff --git a/src/app/drive/services/download.service/downloadFolder/downloadSharedFolderUsingStreamSaver.ts b/src/app/drive/services/download.service/downloadFolder/downloadSharedFolderUsingStreamSaver.ts
deleted file mode 100644
index 4120086fc..000000000
--- a/src/app/drive/services/download.service/downloadFolder/downloadSharedFolderUsingStreamSaver.ts
+++ /dev/null
@@ -1,159 +0,0 @@
-import errorService from 'app/core/services/error.service';
-import { getSharedDirectoryFiles, getSharedDirectoryFolders } from 'app/share/services/share.service';
-import JSZip from 'jszip';
-import { Readable } from 'stream';
-import streamSaver from 'streamsaver';
-import { items } from '@internxt/lib';
-
-import { Network } from '../../network.service';
-import { t } from 'i18next';
-
-interface FolderPackage {
-  folderId: number;
-  parentId: number;
-  name: string;
-  pack: JSZip;
-}
-
-export async function downloadSharedFolderUsingStreamSaver(
-  sharedFolderMeta: {
-    name: string;
-    id: number;
-    token: string;
-    code: string;
-    size: number;
-    password?: string;
-  },
-  bucket: string,
-  bucketToken: string,
-  options: {
-    foldersLimit: number;
-    filesLimit: number;
-    progressCallback: (progress: number) => void;
-  },
-): Promise<void> {
-  const downloadingSize: Record<number, number> = {};
-  const network = new Network('NONE', 'NONE', 'NONE');
-  const zip = new JSZip();
-  const isBrave = !!(navigator.brave && (await navigator.brave.isBrave()));
-
-  if (isBrave) {
-    throw new Error(t('error.browserNotSupported', { userAgent: 'Brave' }) as string);
-  }
-
-  const writableStream = streamSaver.createWriteStream(`${sharedFolderMeta.name}.zip`, {});
-  const writer = writableStream.getWriter();
-  const onUnload = () => {
-    writer.abort();
-  };
-
-  const rootFolder: FolderPackage = {
-    name: sharedFolderMeta.name,
-    folderId: sharedFolderMeta.id,
-    parentId: sharedFolderMeta.id,
-    pack: zip,
-  };
-  const pendingFolders: FolderPackage[] = [rootFolder];
-
-  try {
-    // * Renames files iterating over folders
-    do {
-      const folderToDownload = pendingFolders.shift() as FolderPackage;
-      const currentFolderZip = folderToDownload.pack?.folder(folderToDownload.name) || zip;
-
-      let filesDownloadNotFinished = false;
-      let filesOffset = 0;
-
-      while (!filesDownloadNotFinished) {
-        const { files, last } = await getSharedDirectoryFiles({
-          token: sharedFolderMeta.token,
-          directoryId: folderToDownload.folderId,
-          parentId: folderToDownload.parentId,
-          offset: filesOffset,
-          limit: options.foldersLimit,
-          code: sharedFolderMeta.code,
-        });
-
-        filesOffset += options.filesLimit;
-        filesDownloadNotFinished = last;
-
-        // * Downloads current folder files
-        for (const file of files) {
-          const displayFilename = items.getItemDisplayName({
-            name: file.name,
-            type: file.type,
-          });
-          const [fileStreamPromise] = network.getFileDownloadStream(bucket, file.id, {
-            fileEncryptionKey: Buffer.from(file.encryptionKey, 'hex'),
-            fileToken: bucketToken,
-            progressCallback: (fileProgress) => {
-              downloadingSize[file.id] = file.size * fileProgress;
-              const totalDownloadedSize = Object.values(downloadingSize).reduce((translate, x) => translate + x, 0);
-              const totalProgress = totalDownloadedSize / sharedFolderMeta.size;
-
-              (options.progressCallback || (() => undefined))(totalProgress);
-            },
-          });
-          const fileStream = await fileStreamPromise;
-
-          currentFolderZip?.file(displayFilename, fileStream, { compression: 'DEFLATE' });
-        }
-      }
-
-      let foldersOffset = 0;
-      let completed = false;
-      while (!completed) {
-        const { folders, last } = await getSharedDirectoryFolders({
-          token: sharedFolderMeta.token,
-          directoryId: folderToDownload.folderId,
-          parentId: folderToDownload.parentId,
-          offset: foldersOffset,
-          limit: options.foldersLimit,
-          password: sharedFolderMeta.password,
-        });
-
-        folders.map(async ({ id, name }) => {
-          pendingFolders.push({
-            folderId: id,
-            parentId: folderToDownload.folderId,
-            name: name,
-            pack: currentFolderZip,
-          });
-        });
-
-        completed = last;
-        foldersOffset += options.foldersLimit;
-      }
-    } while (pendingFolders.length > 0);
-
-    window.addEventListener('unload', onUnload);
-
-    return new Promise<void>((resolve, reject) => {
-      const folderStream = zip.generateInternalStream({
-        type: 'uint8array',
-        streamFiles: true,
-        compression: 'DEFLATE',
-      }) as Readable;
-      folderStream
-        ?.on('data', (chunk: Buffer) => {
-          writer.write(chunk);
-        })
-        .on('end', () => {
-          writer.close();
-          window.removeEventListener('unload', onUnload);
-          resolve();
-        })
-        .on('error', (err) => {
-          reject(err);
-        });
-
-      folderStream.resume();
-    });
-  } catch (err) {
-    const castedError = errorService.castError(err);
-
-    writer.abort();
-
-    throw castedError;
-  }
-}
diff --git a/src/app/drive/services/download.service/downloadFolder/zipStream.ts b/src/app/drive/services/download.service/downloadFolder/zipStream.ts
deleted file mode 100644
index d770dc30b..000000000
--- a/src/app/drive/services/download.service/downloadFolder/zipStream.ts
+++ /dev/null
@@ -1,254 +0,0 @@
-interface FileLike {
-  name: string,
-  lastModified?: Date,
-  directory?: boolean,
-  comment?: string
-}
-
-interface ZipObject {
-  level: number;
-  ctrl: ReadableStreamController<unknown>;
-  directory: boolean;
-  nameBuf: Uint8Array;
-  comment: Uint8Array;
-  compressedLength: number;
-  uncompressedLength: number;
-  writeHeader: () => void;
-  writeFooter: () => void;
-  offset?: number;
-  header?: {
-    array: Uint8Array;
-    view: DataView;
-  };
-  crc?: Crc32;
-  fileLike: FileLike;
-}
-
-class Crc32 {
-  private crc: number;
-  private table: number[];
-
-  constructor() {
-    this.crc = -1;
-
-    let i: number;
-    let j: number;
-    let t: number;
-
-    const table: number[] = [];
-
-    for (i = 0; i < 256; i++) {
-      t = i;
-      for (j = 0; j < 8; j++) {
-        t = (t & 1)
-          ? (t >>> 1) ^ 0xEDB88320
-          : t >>> 1;
-      }
-      table[i] = t;
-    }
-
-    this.table = table;
-  }
-
-  append(data) {
-    let crc = this.crc | 0; const table = this.table;
-    for (let offset = 0, len = data.length | 0; offset < len; offset++) {
-      crc = (crc >>> 8) ^ table[(crc ^ data[offset]) & 0xFF];
-    }
-    this.crc = crc;
-  }
-
-  get() {
-    return ~this.crc;
-  }
-}
-
-const getDataHelper = (byteLength) => {
-  const uint8 = new Uint8Array(byteLength);
-
-  return {
-    array: uint8,
-    view: new DataView(uint8.buffer)
-  };
-};
-
-const pump = zipObj => zipObj.reader.read().then(chunk => {
-  if (chunk.done) return zipObj.writeFooter();
-  const outputData = chunk.value;
-  zipObj.crc.append(outputData);
-  zipObj.uncompressedLength += outputData.length;
-  zipObj.compressedLength += outputData.length;
-  zipObj.ctrl.enqueue(outputData);
-});
-
-/**
- * [createWriter description]
- * @param  {Object} underlyingSource [description]
- * @return {Boolean}                  [description]
- */
-export default function createZipReadable(underlyingSource: {
-  start: (writer: {
-    enqueue: (fileLike: FileLike) => void
-    close: () => void
-  }) => void | undefined,
-  pull?: (writer: {
-    enqueue: (fileLike: FileLike) => void
-    close: () => void
-  }) => void
-}): ReadableStream<Uint8Array> {
-  const files: Record<string, ZipObject> = Object.create(null);
-  const filenames: string[] = [];
-  const encoder = new TextEncoder();
-  let offset = 0;
-  let activeZipIndex = 0;
-  let ctrl: ReadableStreamController<Uint8Array>;
-  let activeZipObject, closed;
-
-  function next() {
-    activeZipIndex++;
-    activeZipObject = files[filenames[activeZipIndex]];
-    if (activeZipObject) processNextChunk();
-    else if (closed) closeZip();
-  }
-
-  const zipWriter = {
-    enqueue(fileLike: FileLike) {
-      if (closed) {
-        // eslint-disable-next-line max-len
-        throw new TypeError('Cannot enqueue a chunk into a readable stream that is closed or has been requested to be closed');
-      }
-
-      let name = fileLike.name.trim();
-      const date = new Date(typeof fileLike.lastModified === 'undefined' ? Date.now() : fileLike.lastModified);
-
-      if (fileLike.directory && !name.endsWith('/')) name += '/';
-      if (files[name]) throw new Error('File already exists.');
-
-      const nameBuf = encoder.encode(name);
-      filenames.push(name);
-
-      const zipObject = files[name] = {
-        level: 0,
-        ctrl,
-        crc: new Crc32(),
-        directory: !!fileLike.directory,
-        nameBuf,
-        comment: encoder.encode(fileLike.comment || ''),
-        compressedLength: 0,
-        uncompressedLength: 0,
-        header: {
-          array: new Uint8Array(),
-          view: new DataView(new ArrayBuffer(0))
-        },
-        offset: 0,
-        writeHeader() {
-          const header = getDataHelper(26);
-          const data = getDataHelper(30 + nameBuf.length);
-
-          zipObject.offset = offset;
-          zipObject.header = header;
-
-          if (zipObject.level !== 0 && !zipObject.directory) {
-            header.view.setUint16(4, 0x0800);
-          }
-          header.view.setUint32(0, 0x14000808);
-          header.view.setUint16(6, (((date.getHours() << 6) | date.getMinutes()) << 5) | date.getSeconds() / 2, true);
-          header.view.setUint16(8, (
-            (((date.getFullYear() - 1980) << 4) | (date.getMonth() + 1)) << 5) | date.getDate(),
-            true
-          );
-          header.view.setUint16(22, nameBuf.length, true);
-          data.view.setUint32(0, 0x504b0304);
-          data.array.set(header.array, 4);
-          data.array.set(nameBuf, 30);
-          offset += data.array.length;
-          ctrl.enqueue(data.array);
-        },
-        writeFooter() {
-          const footer = getDataHelper(16);
-          footer.view.setUint32(0, 0x504b0708);
-
-          if (zipObject.crc) {
-            zipObject.header.view.setUint32(10, zipObject.crc.get(), true);
-            zipObject.header.view.setUint32(14, zipObject.compressedLength, true);
-            zipObject.header.view.setUint32(18, zipObject.uncompressedLength, true);
-            footer.view.setUint32(4, zipObject.crc.get(), true);
-            footer.view.setUint32(8, zipObject.compressedLength, true);
-            footer.view.setUint32(12, zipObject.uncompressedLength, true);
-          }
-
-          ctrl.enqueue(footer.array);
-          offset += zipObject.compressedLength + 16;
-          next();
-        },
-        fileLike
-      };
-
-      if (!activeZipObject) {
-        activeZipObject = zipObject;
-        processNextChunk();
-      }
-    },
-    close() {
-      if (closed) throw new TypeError('Cannot close a readable stream that has already been requested to be closed');
-      if (!activeZipObject) closeZip();
-      closed = true;
-    }
-  };
-
-  function closeZip() {
-    let length = 0;
-    let index = 0;
-    let indexFilename, file;
-    for (indexFilename = 0; indexFilename < filenames.length; indexFilename++) {
-      file = files[filenames[indexFilename]];
-      length += 46 + file.nameBuf.length + file.comment.length;
-    }
-    const data = getDataHelper(length + 22);
-    for (indexFilename = 0; indexFilename < filenames.length; indexFilename++) {
-      file = files[filenames[indexFilename]];
-      data.view.setUint32(index, 0x504b0102);
-      data.view.setUint16(index + 4, 0x1400);
-      data.array.set(file.header.array, index + 6);
-      data.view.setUint16(index + 32, file.comment.length, true);
-      if (file.directory) {
-        data.view.setUint8(index + 38, 0x10);
-      }
-      data.view.setUint32(index + 42, file.offset, true);
-      data.array.set(file.nameBuf, index + 46);
-      data.array.set(file.comment, index + 46 + file.nameBuf.length);
-      index += 46 + file.nameBuf.length + file.comment.length;
-    }
-    data.view.setUint32(index, 0x504b0506);
-    data.view.setUint16(index + 8, filenames.length, true);
-    data.view.setUint16(index + 10, filenames.length, true);
-    data.view.setUint32(index + 12, length, true);
-    data.view.setUint32(index + 16, offset, true);
-    ctrl.enqueue(data.array);
-    ctrl.close();
-  }
-
-  function processNextChunk() {
-    if (!activeZipObject) return;
-    if (activeZipObject.directory) return activeZipObject.writeFooter(activeZipObject.writeHeader());
-    if (activeZipObject.reader) return pump(activeZipObject);
-    if (activeZipObject.fileLike.stream) {
-      activeZipObject.crc = new Crc32();
-      activeZipObject.reader = activeZipObject.fileLike.stream().getReader();
-      activeZipObject.writeHeader();
-    } else next();
-  }
-
-  return new ReadableStream({
-    start: c => {
-      ctrl = c;
-      underlyingSource.start && Promise.resolve(underlyingSource.start(zipWriter));
-    },
-    pull() {
-      return processNextChunk() || (
-        underlyingSource.pull &&
-        Promise.resolve(underlyingSource.pull(zipWriter))
-      );
-    }
-  });
-}
diff --git a/src/app/drive/services/download.service/fetchFileBlob.ts b/src/app/drive/services/download.service/fetchFileBlob.ts
index 786409a1a..8f691678b 100644
--- a/src/app/drive/services/download.service/fetchFileBlob.ts
+++ b/src/app/drive/services/download.service/fetchFileBlob.ts
@@ -1,10 +1,10 @@
 import { binaryStreamToBlob } from '../../../core/services/stream.service';
-import { getEnvironmentConfig } from '../network.service';
 import { Downloadable, downloadFile, NetworkCredentials } from '../../../network/download';
+import { getEnvironmentConfig } from '../network.service';
 
 type FetchFileBlobOptions = {
   updateProgressCallback: (progress: number) => void;
-  isTeam?: boolean;
+  isWorkspace: boolean;
   abortController?: AbortController;
 };
 
@@ -14,7 +14,7 @@ export default async function fetchFileBlob(
   credentials?: NetworkCredentials,
   mnemonic?: string,
 ): Promise<Blob> {
-  const { bridgeUser, bridgePass, encryptionKey } = getEnvironmentConfig(!!options.isTeam);
+  const { bridgeUser, bridgePass, encryptionKey } = getEnvironmentConfig(!!options.isWorkspace);
 
   const creds = credentials ? credentials : { pass: bridgePass, user: bridgeUser };
 
diff --git a/src/app/drive/services/download.service/fetchFileStream.ts b/src/app/drive/services/download.service/fetchFileStream.ts
index c6079040a..2befabda9 100644
--- a/src/app/drive/services/download.service/fetchFileStream.ts
+++ b/src/app/drive/services/download.service/fetchFileStream.ts
@@ -1,31 +1,31 @@
+import { Downloadable, downloadFile } from 'app/network/download';
 import { getEnvironmentConfig } from '../network.service';
-import { downloadFile, Downloadable } from 'app/network/download';
 
 type FetchFileStreamOptions = {
   updateProgressCallback: (progress: number) => void;
-  isTeam?: boolean,
-  abortController?: AbortController
+  isWorkspace?: boolean;
+  abortController?: AbortController;
 };
 
 export default function fetchFileStream(
   item: Downloadable,
   options: FetchFileStreamOptions,
 ): Promise<ReadableStream<Uint8Array>> {
-  const { bridgeUser, bridgePass, encryptionKey } = getEnvironmentConfig(!!options.isTeam);
+  const { bridgeUser, bridgePass, encryptionKey } = getEnvironmentConfig(!!options.isWorkspace);
 
   return downloadFile({
     bucketId: item.bucketId,
     fileId: item.fileId,
     creds: {
       pass: bridgePass,
-      user: bridgeUser
+      user: bridgeUser,
     },
     mnemonic: encryptionKey,
     options: {
       notifyProgress: (totalBytes: number, downloadedBytes: number) => {
         options.updateProgressCallback(downloadedBytes / totalBytes);
       },
-      abortController: options.abortController
-    }
+      abortController: options.abortController,
+    },
   });
 }
diff --git a/src/app/drive/services/download.service/index.ts b/src/app/drive/services/download.service/index.ts
index 15a503c85..cbdcbd623 100644
--- a/src/app/drive/services/download.service/index.ts
+++ b/src/app/drive/services/download.service/index.ts
@@ -1,8 +1,8 @@
-import fetchFileBlob from './fetchFileBlob';
-import downloadFileFromBlob from './downloadFileFromBlob';
-import downloadFile from './downloadFile';
 import downloadBackup from './downloadBackup';
+import downloadFile from './downloadFile';
+import downloadFileFromBlob from './downloadFileFromBlob';
 import downloadFolder from './downloadFolder';
+import fetchFileBlob from './fetchFileBlob';
 
 const downloadService = {
   fetchFileBlob,
diff --git a/src/app/drive/services/file.service/index.ts b/src/app/drive/services/file.service/index.ts
index 59212e649..970cd21bc 100644
--- a/src/app/drive/services/file.service/index.ts
+++ b/src/app/drive/services/file.service/index.ts
@@ -1,31 +1,25 @@
-import { DriveFileData, DriveFileMetadataPayload, DriveItemData } from '../../types';
+import { StorageTypes } from '@internxt/sdk/dist/drive';
+import { FileMeta } from '@internxt/sdk/dist/drive/storage/types';
+import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
+import { t } from 'i18next';
+import * as uuid from 'uuid';
 import analyticsService from '../../../analytics/services/analytics.service';
+import { SdkFactory } from '../../../core/factory/sdk';
 import errorService from '../../../core/services/error.service';
 import localStorageService from '../../../core/services/local-storage.service';
 import { DevicePlatform } from '../../../core/types';
-import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
+import { DriveFileData, DriveFileMetadataPayload, DriveItemData } from '../../types';
 import uploadFile from './uploadFile';
-import * as uuid from 'uuid';
-import { StorageTypes } from '@internxt/sdk/dist/drive';
-import { SdkFactory } from '../../../core/factory/sdk';
-import { t } from 'i18next';
-import { FileMeta } from '@internxt/sdk/dist/drive/storage/types';
 
 export function updateMetaData(
   fileId: string,
   metadata: DriveFileMetadataPayload,
-  bucketId: string,
   resourcesToken?: string,
 ): Promise<void> {
-  const storageClient = SdkFactory.getInstance().createStorageClient();
-  const payload: StorageTypes.UpdateFilePayload = {
-    fileId: fileId,
-    metadata: metadata,
-    bucketId: bucketId,
-    destinationPath: uuid.v4(),
-  };
+  const storageClient = SdkFactory.getNewApiInstance().createNewStorageClient();
+  const payload = { fileUuid: fileId, name: metadata.itemName };
 
-  return storageClient.updateFile(payload, resourcesToken).then(() => {
+  return storageClient.updateFileNameWithUUID(payload, resourcesToken).then(() => {
     const user = localStorageService.getUser() as UserSettings;
     analyticsService.trackFileRename({
       file_id: fileId,
@@ -67,6 +61,32 @@ export async function moveFile(
     });
 }
 
+export async function moveFileByUuid(fileUuid: string, destinationFolderUuid: string): Promise<StorageTypes.FileMeta> {
+  const storageClient = SdkFactory.getNewApiInstance().createNewStorageClient();
+  const payload: StorageTypes.MoveFileUuidPayload = {
+    fileUuid: fileUuid,
+    destinationFolderUuid: destinationFolderUuid,
+  };
+  return storageClient
+    .moveFileByUuid(payload)
+    .then((response) => {
+      const user = localStorageService.getUser() as UserSettings;
+      analyticsService.trackMoveItem('file', {
+        uuid: fileUuid,
+        email: user.email,
+        platform: DevicePlatform.Web,
+      });
+      return response;
+    })
+    .catch((error) => {
+      const castedError = errorService.castError(error);
+      if (castedError.status) {
+        castedError.message = t(`tasks.move-file.errors.${castedError.status}`);
+      }
+      throw castedError;
+    });
+}
+
 export function deleteFile(fileData: DriveFileData): Promise<void> {
   const storageClient = SdkFactory.getInstance().createStorageClient();
 
@@ -95,9 +115,9 @@ async function fetchDeleted(): Promise<DriveFileData[]> {
   });
 }
 
-export function getFile(uuid: string): Promise<FileMeta> {
+export function getFile(uuid: string, workspacesToken?: string): Promise<FileMeta> {
   const storageClient = SdkFactory.getNewApiInstance().createNewStorageClient();
-  const [responsePromise] = storageClient.getFile(uuid);
+  const [responsePromise] = storageClient.getFile(uuid, workspacesToken);
 
   return responsePromise;
 }
@@ -105,6 +125,7 @@ export function getFile(uuid: string): Promise<FileMeta> {
 const fileService = {
   updateMetaData,
   moveFile,
+  moveFileByUuid,
   fetchRecents,
   uploadFile,
   fetchDeleted,
diff --git a/src/app/drive/services/file.service/uploadFile.ts b/src/app/drive/services/file.service/uploadFile.ts
index 6adf97381..255c34e8b 100644
--- a/src/app/drive/services/file.service/uploadFile.ts
+++ b/src/app/drive/services/file.service/uploadFile.ts
@@ -1,16 +1,16 @@
 import { StorageTypes } from '@internxt/sdk/dist/drive';
+import { Network } from 'app/drive/services/network.service';
 import { DriveFileData } from 'app/drive/types';
-import analyticsService from '../../../analytics/services/analytics.service';
 import { TrackingPlan } from '../../../analytics/TrackingPlan';
-import { AppView } from '../../../core/types';
+import analyticsService from '../../../analytics/services/analytics.service';
+import { SdkFactory } from '../../../core/factory/sdk';
+import errorService from '../../../core/services/error.service';
 import localStorageService from '../../../core/services/local-storage.service';
 import navigationService from '../../../core/services/navigation.service';
-import { getEnvironmentConfig } from '../network.service';
-import { encryptFilename } from '../../../crypto/services/utils';
-import errorService from '../../../core/services/error.service';
-import { SdkFactory } from '../../../core/factory/sdk';
-import { Network } from 'app/drive/services/network.service';
+import workspacesService from '../../../core/services/workspace.service';
+import { AppView } from '../../../core/types';
 import notificationsService, { ToastType } from '../../../notifications/services/notifications.service';
+import { getEnvironmentConfig } from '../network.service';
 import { generateThumbnailFromFile } from '../thumbnail.service';
 
 export interface FileToUpload {
@@ -18,7 +18,7 @@ export interface FileToUpload {
   size: number;
   type: string;
   content: File;
-  parentFolderId: number;
+  parentFolderId: string;
 }
 
 export interface FileUploadOptions {
@@ -31,6 +31,10 @@ export interface FileUploadOptions {
     bridgePass: string;
     encryptionKey: string;
     bucketId: string;
+    // to manage B2B workspaces
+    resourcesToken: string;
+    workspaceId?: string;
+    workspacesToken?: string;
   };
   abortCallback?: (abort?: () => void) => void;
 }
@@ -106,21 +110,59 @@ export async function uploadFile(
 
     const fileId = await promise;
 
-    const name = encryptFilename(file.name, file.parentFolderId);
-
-    const storageClient = SdkFactory.getInstance().createStorageClient();
-    const fileEntry: StorageTypes.FileEntry = {
-      id: fileId,
-      type: file.type,
-      size: file.size,
-      name: name,
-      plain_name: file.name,
-      bucket: bucketId,
-      folder_id: file.parentFolderId,
-      encrypt_version: StorageTypes.EncryptionVersion.Aes03,
-    };
+    const workspaceId = options?.ownerUserAuthenticationData?.workspaceId;
+    const workspacesToken = options?.ownerUserAuthenticationData?.workspacesToken;
+    const resourcesToken = options?.ownerUserAuthenticationData?.resourcesToken;
+
+    const isWorkspacesUpload = workspaceId && workspacesToken;
+    let response;
+
+    if (isWorkspacesUpload) {
+      // TEMPORARY: For backward compatibility with id
+      // REMOVE THIS WHEN BACKEND IMPLEMENT ENCRYPTION FOR NAME IN CREATE FILE ENTRY ENPDOINT
+      // const folderMeta = await newStorageService.getFolderMeta(file.parentFolderId, workspacesToken, resourcesToken);
+      // const name = encryptFilename(file.name, folderMeta.id);
+
+      const dateISO = '2023-05-30T12:34:56.789Z';
+      const date = new Date(dateISO);
+      const workspaceFileEntry = {
+        name: file.name,
+        bucket: bucketId,
+        fileId: fileId,
+        encryptVersion: StorageTypes.EncryptionVersion.Aes03,
+        folderUuid: file.parentFolderId,
+        size: file.size,
+        plainName: file.name,
+        type: file.type,
+        modificationTime: date.toISOString(),
+        date: date.toISOString(),
+      };
 
-    let response = await storageClient.createFileEntry(fileEntry, options.ownerUserAuthenticationData?.token);
+      response = await workspacesService.createFileEntry(workspaceFileEntry, workspaceId, resourcesToken);
+    } else {
+      // TEMPORARY: For backward compatibility with id
+      // REMOVE THIS WHEN BACKEND IMPLEMENT ENCRYPTION FOR NAME IN CREATE FILE ENTRY ENPDOINT
+      // const folderMeta = await newStorageService.getFolderMeta(
+      //   file.parentFolderId,
+      //   undefined,
+      //   options.ownerUserAuthenticationData?.token,
+      // );
+      // const name = encryptFilename(file.name, folderMeta.id);
+
+      const storageClient = SdkFactory.getNewApiInstance().createNewStorageClient();
+      const fileEntry: StorageTypes.FileEntryByUuid = {
+        id: fileId,
+        type: file.type,
+        size: file.size,
+        name: file.name,
+        plain_name: file.name,
+        bucket: bucketId,
+        folder_id: file.parentFolderId,
+        encrypt_version: StorageTypes.EncryptionVersion.Aes03,
+      };
+
+      response = await storageClient.createFileEntryByUuid(fileEntry, options.ownerUserAuthenticationData?.token);
+    }
     if (!response.thumbnails) {
       response = {
         ...response,
diff --git a/src/app/drive/services/filesZip.service.ts b/src/app/drive/services/filesZip.service.ts
index d2fb19574..4fa3b388c 100644
--- a/src/app/drive/services/filesZip.service.ts
+++ b/src/app/drive/services/filesZip.service.ts
@@ -1,5 +1,6 @@
 import { SharedFiles } from '@internxt/sdk/dist/drive/share/types';
 import { Iterator } from 'app/core/collections';
+import { binaryStreamToBlob } from '../../core/services/stream.service';
 import { FlatFolderZip } from '../../core/services/zip.service';
 import { DriveFileData } from '../types';
 
@@ -16,7 +17,7 @@ async function addFilesToZip<T extends File>(
 
   const addFileToZip = async (file: T) => {
     const fileStream = await downloadFile(file);
-    zip.addFile(path + '/' + file.name + (file.type ? '.' + file.type : ''), fileStream);
+    zip.addFile(path + '/' + (file.plainName ?? file.name) + (file.type ? '.' + file.type : ''), fileStream);
   };
 
   let pack;
@@ -28,8 +29,40 @@ async function addFilesToZip<T extends File>(
     moreFiles = !pack.done;
     allFiles.push(...files);
 
-    for (const file of files) {
-      await addFileToZip(file);
+    const filesSortedBySizeAsc = files.sort((fA, fB) => parseInt(fA.size) - parseInt(fB.size));
+    const maxCacheSizeUsed = 50 * 1024 * 1024;
+
+    for (const filesChunk of getFilesChunksUntilMaxCacheSize<T>(maxCacheSizeUsed, filesSortedBySizeAsc)) {
+      const fileTooBigToBufferize = filesChunk.length === 1;
+
+      if (fileTooBigToBufferize) {
+        const [file] = filesChunk;
+        await addFileToZip(file);
+      } else {
+        const downloadPromises: Promise<{
+          name: string;
+          type: string;
+          blob: Blob;
+        }>[] = [];
+
+        for (const file of filesChunk) {
+          const downloadPromise = downloadFile(file).then(async (fileStream) => {
+            const fileBlob = await binaryStreamToBlob(fileStream, file.type || '');
+            return { name: file.plainName ?? file.name, type: file.type, blob: fileBlob };
+          });
+
+          downloadPromises.push(downloadPromise);
+        }
+
+        const downloadedFiles = await Promise.all(downloadPromises);
+
+        for (const downloadedFile of downloadedFiles) {
+          if (downloadedFile) {
+            const { name, type, blob } = downloadedFile;
+            zip.addFile(path + '/' + (name + (type ? '.' + type : '')), (blob as Blob).stream());
+          }
+        }
+      }
     }
   }
   return { files: allFiles, token: pack?.token ?? '' };
@@ -55,4 +88,26 @@ async function addAllSharedFilesToZip(
   return { files, token: token ?? '' };
 }
 
+function* getFilesChunksUntilMaxCacheSize<T extends File>(maxCacheSizeUsed: number, files: T[]): Generator<T[]> {
+  let accumulatedSize = 0;
+  let chunk: T[] = [];
+
+  for (const file of files) {
+    const fileSize = parseInt(file.size as string);
+
+    if (accumulatedSize + fileSize <= maxCacheSizeUsed && chunk.length < 6) {
+      chunk.push(file);
+      accumulatedSize += fileSize;
+    } else {
+      yield chunk;
+      chunk = [file];
+      accumulatedSize = fileSize;
+    }
+  }
+
+  if (chunk.length > 0) {
+    yield chunk;
+  }
+}
+
 export { addAllFilesToZip, addAllSharedFilesToZip };
diff --git a/src/app/drive/services/folder.service.ts b/src/app/drive/services/folder.service.ts
index 5805dbc91..123dddc0b 100644
--- a/src/app/drive/services/folder.service.ts
+++ b/src/app/drive/services/folder.service.ts
@@ -1,6 +1,7 @@
 import { aes } from '@internxt/lib';
 import { StorageTypes } from '@internxt/sdk/dist/drive';
 import { SharedFiles, SharedFolders } from '@internxt/sdk/dist/drive/share/types';
+import { FolderTree } from '@internxt/sdk/dist/drive/storage/types';
 import { RequestCanceler } from '@internxt/sdk/dist/shared/http/types';
 import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
 import { Iterator } from 'app/core/collections';
@@ -16,11 +17,13 @@ import { SdkFactory } from '../../core/factory/sdk';
 import errorService from '../../core/services/error.service';
 import httpService from '../../core/services/http.service';
 import localStorageService from '../../core/services/local-storage.service';
+import workspacesService from '../../core/services/workspace.service';
 import { DevicePlatform } from '../../core/types';
-import { DriveFileData, DriveFolderData, DriveFolderMetadataPayload, DriveItemData, FolderTree } from '../types';
+import { DriveFileData, DriveFolderData, DriveFolderMetadataPayload, DriveItemData } from '../types';
 import { updateDatabaseFileSourceData } from './database.service';
 import { addAllFilesToZip, addAllSharedFilesToZip } from './filesZip.service';
 import { addAllFoldersToZip, addAllSharedFoldersToZip } from './foldersZip.service';
+import newStorageService from './new-storage.service';
 
 export interface IFolders {
   bucket: string;
@@ -82,6 +85,7 @@ export interface DownloadFolderAsZipOptions {
   };
   mnemonic?: string;
   isPublicShare?: boolean;
+  workspaceId?: string;
 }
 
 export function createFolder(
@@ -111,17 +115,46 @@ export function createFolder(
   return [finalPromise, requestCanceler];
 }
 
-export async function updateMetaData(folderId: number, metadata: DriveFolderMetadataPayload): Promise<void> {
-  const storageClient = SdkFactory.getInstance().createStorageClient();
-  const payload: StorageTypes.UpdateFolderMetadataPayload = {
-    folderId: folderId,
-    changes: metadata,
+export function createFolderByUuid(
+  parentFolderUuid: string,
+  plainName: string,
+): [Promise<StorageTypes.CreateFolderResponse>, RequestCanceler] {
+  const payload: StorageTypes.CreateFolderByUuidPayload = {
+    plainName: plainName,
+    parentFolderUuid: parentFolderUuid,
+  };
+  const storageClient = SdkFactory.getNewApiInstance().createNewStorageClient();
+  const [promise, requestCanceler] = storageClient.createFolderByUuid(payload);
+
+  const finalPromise = promise
+    .then((response) => {
+      const user = localStorageService.getUser() as UserSettings;
+      analyticsService.trackFolderCreated({
+        email: user.email,
+        platform: DevicePlatform.Web,
+      });
+      return response;
+    })
+    .catch((error) => {
+      throw errorService.castError(error);
+    });
+
+  return [finalPromise, requestCanceler];
+}
+
+export async function updateMetaData(folderUuid: string, metadata: DriveFolderMetadataPayload): Promise<void> {
+  const storageClient = SdkFactory.getNewApiInstance().createNewStorageClient();
+
+  const payload = {
+    folderUuid,
+    name: metadata.itemName,
   };
-  return storageClient.updateFolder(payload).then(() => {
+
+  return storageClient.updateFolderNameWithUUID(payload).then(() => {
     const user: UserSettings = localStorageService.getUser() as UserSettings;
     analyticsService.trackFolderRename({
       email: user.email,
-      fileId: folderId,
+      fileId: folderUuid,
       platform: DevicePlatform.Web,
     });
   });
@@ -157,19 +190,40 @@ interface GetDirectoryFoldersResponse {
 class DirectoryFolderIterator implements Iterator<DriveFolderData> {
   private offset: number;
   private limit: number;
-  private readonly queryValues: { directoryId: number };
+  private readonly queryValues: { directoryId: number; workspaceId?: string; directoryUUID: string };
 
-  constructor(queryValues: { directoryId: number }, limit?: number, offset?: number) {
+  constructor(
+    queryValues: { directoryId: number; workspaceId?: string; directoryUUID: string },
+    limit?: number,
+    offset?: number,
+  ) {
     this.limit = limit ?? 5;
     this.offset = offset ?? 0;
     this.queryValues = queryValues;
   }
 
   async next() {
-    const { directoryId } = this.queryValues;
-    const { folders, last } = await httpService.get<GetDirectoryFoldersResponse>(
-      `/storage/v2/folders/${directoryId}/folders?limit=${this.limit}&offset=${this.offset}`,
-    );
+    const { directoryId, workspaceId, directoryUUID } = this.queryValues;
+
+    let folders;
+    let last;
+    if (workspaceId) {
+      const [foldersPromise] = workspacesService.getWorkspaceFolders(
+        workspaceId,
+        directoryUUID,
+        this.offset,
+        this.limit,
+      );
+      folders = (await foldersPromise).result;
+      const isLast = folders.length <= this.limit;
+      last = isLast;
+    } else {
+      const { folders: storageFolders, last: storageLast } = await httpService.get<GetDirectoryFoldersResponse>(
+        `/storage/v2/folders/${directoryId}/folders?limit=${this.limit}&offset=${this.offset}`,
+      );
+      folders = storageFolders;
+      last = storageLast;
+    }
 
     this.offset += this.limit;
 
@@ -185,19 +239,36 @@ interface GetDirectoryFilesResponse {
 class DirectoryFilesIterator implements Iterator<DriveFileData> {
   private offset: number;
   private limit: number;
-  private readonly queryValues: { directoryId: number };
+  private readonly queryValues: { directoryId: number; workspaceId?: string; directoryUUID: string };
 
-  constructor(queryValues: { directoryId: number }, limit?: number, offset?: number) {
+  constructor(
+    queryValues: { directoryId: number; workspaceId?: string; directoryUUID: string },
+    limit?: number,
+    offset?: number,
+  ) {
     this.limit = limit ?? 5;
     this.offset = offset ?? 0;
     this.queryValues = queryValues;
   }
 
   async next() {
-    const { directoryId } = this.queryValues;
-    const { files, last } = await httpService.get<GetDirectoryFilesResponse>(
-      `/storage/v2/folders/${directoryId}/files?limit=${this.limit}&offset=${this.offset}`,
-    );
+    const { directoryId, workspaceId, directoryUUID } = this.queryValues;
+
+    let files;
+    let last;
+    if (workspaceId) {
+      const [filesPromise] = workspacesService.getWorkspaceFiles(workspaceId, directoryUUID, this.offset, this.limit);
+      files = (await filesPromise).result;
+
+      const isLast = files.length <= this.limit;
+      last = isLast;
+    } else {
+      const { files: storageFiles, last: storageLast } = await httpService.get<GetDirectoryFilesResponse>(
+        `/storage/v2/folders/${directoryId}/files?limit=${this.limit}&offset=${this.offset}`,
+      );
+      files = storageFiles;
+      last = storageLast;
+    }
 
     this.offset += this.limit;
 
@@ -205,12 +276,20 @@ class DirectoryFilesIterator implements Iterator<DriveFileData> {
   }
 }
 
-export const createFoldersIterator = (directoryId: number): Iterator<DriveFolderData> => {
-  return new DirectoryFolderIterator({ directoryId }, 20, 0);
+export const createFoldersIterator = (
+  directoryId: number,
+  directoryUUID: string,
+  workspaceId?: string,
+): Iterator<DriveFolderData> => {
+  return new DirectoryFolderIterator({ directoryId, workspaceId, directoryUUID }, 20, 0);
 };
 
-export const createFilesIterator = (directoryId: number): Iterator<DriveFileData> => {
-  return new DirectoryFilesIterator({ directoryId }, 20, 0);
+export const createFilesIterator = (
+  directoryId: number,
+  directoryUUID: string,
+  workspaceId?: string,
+): Iterator<DriveFileData> => {
+  return new DirectoryFilesIterator({ directoryId, workspaceId, directoryUUID }, 20, 0);
 };
 
 interface FolderRef {
@@ -233,7 +312,15 @@ async function downloadSharedFolderAsZip(
   const pendingFolders: FolderRef[] = [rootFolder];
   let totalSize = 0;
   let totalSizeIsReady = false;
-  const zip = options?.destination || new FlatFolderZip(rootFolder.name, {});
+  const zip =
+    options?.destination ||
+    new FlatFolderZip(rootFolder.name, {
+      progress: (loadedBytes: number) => {
+        if (totalSizeIsReady) {
+          updateProgress(loadedBytes / totalSize);
+        }
+      },
+    });
 
   const user = localStorageService.getUser();
 
@@ -264,7 +351,7 @@ async function downloadSharedFolderAsZip(
         folderToDownload.name,
         async (file) => {
           const lruFilesCacheManager = await LRUFilesCacheManager.getInstance();
-          const cachedFile = await lruFilesCacheManager.get(file.id.toString());
+          const cachedFile = await lruFilesCacheManager.get(file.uuid?.toString());
           const isCachedFileOlder = checkIfCachedSourceIsOlder({ cachedFile, file });
 
           if (cachedFile?.source && !isCachedFileOlder) {
@@ -356,16 +443,17 @@ async function downloadSharedFolderAsZip(
 async function downloadFolderAsZip(
   folderId: DriveFolderData['id'],
   folderName: DriveFolderData['name'],
-  foldersIterator: (directoryId: number) => Iterator<DriveFolderData>,
-  filesIterator: (directoryId: number) => Iterator<DriveFileData>,
+  folderUUID: DriveFolderData['uuid'],
+  foldersIterator: (directoryId: number, directoryUUID: string, workspaceId?: string) => Iterator<DriveFolderData>,
+  filesIterator: (directoryId: number, directoryUUID: string, workspaceId?: string) => Iterator<DriveFileData>,
   updateProgress: (progress: number) => void,
   options?: DownloadFolderAsZipOptions,
 ): Promise<void> {
-  const rootFolder: FolderRef = { folderId: folderId, name: folderName };
+  const rootFolder: FolderRef = { folderId: folderId, name: folderName, folderUuid: folderUUID };
   const pendingFolders: FolderRef[] = [rootFolder];
   let totalSize = 0;
   const zip = options?.destination || new FlatFolderZip(folderName, {});
-
+  const workspaceId = options?.workspaceId;
   const user = localStorageService.getUser();
 
   if (!user) {
@@ -392,7 +480,7 @@ async function downloadFolderAsZip(
         folderToDownload.name,
         async (file) => {
           const lruFilesCacheManager = await LRUFilesCacheManager.getInstance();
-          const cachedFile = await lruFilesCacheManager.get(file.id.toString());
+          const cachedFile = await lruFilesCacheManager.get(file.uuid?.toString());
           const isCachedFileOlder = checkIfCachedSourceIsOlder({ cachedFile, file });
 
           if (cachedFile?.source && !isCachedFileOlder) {
@@ -425,7 +513,7 @@ async function downloadFolderAsZip(
           });
           analyticsService.trackFileDownloadCompleted(trackingDownloadProperties);
 
-          const sourceBlob = await binaryStreamToBlob(downloadedFileStream);
+          const sourceBlob = await binaryStreamToBlob(downloadedFileStream, file.type || '');
           await updateDatabaseFileSourceData({
             folderId: file.folderId,
             sourceBlob,
@@ -435,19 +523,24 @@ async function downloadFolderAsZip(
 
           return sourceBlob.stream();
         },
-        filesIterator(folderToDownload.folderId),
+        filesIterator(folderToDownload.folderId, folderToDownload.folderUuid as string, workspaceId),
         zip,
       );
 
       totalSize += files.reduce((a, f) => f.size + a, 0);
 
-      const folders = await addAllFoldersToZip(folderToDownload.name, foldersIterator(folderToDownload.folderId), zip);
+      const folders = await addAllFoldersToZip(
+        folderToDownload.name,
+        foldersIterator(folderToDownload.folderId, folderToDownload.folderUuid as string, workspaceId),
+        zip,
+      );
 
       pendingFolders.push(
         ...folders.map((f) => {
           return {
-            name: folderToDownload.name + '/' + f.name,
+            name: folderToDownload.name + '/' + (f.plainName ?? f.name),
             folderId: f.id,
+            folderUuid: f.uuid,
           };
         }),
       );
@@ -470,18 +563,21 @@ async function downloadFolderAsZip(
   }
 }
 
-async function fetchFolderTree(folderId: number): Promise<{
+// NEED TO REVIEW THIS FUNCTION BEFORE MERGE, FOR NOW IS NOT WORKING WITH WORKSPACES FILES
+async function fetchFolderTree(folderUUID: string): Promise<{
   tree: FolderTree;
   folderDecryptedNames: Record<number, string>;
   fileDecryptedNames: Record<number, string>;
   size: number;
 }> {
-  const { tree, size } = await httpService.get<{ tree: FolderTree; size: number }>(`/storage/tree/${folderId}`);
+  // const { tree, size } = await httpService.get<{ tree: FolderTree; size: number }>(`/storage/tree/${folderId}`);
+  const { tree } = await newStorageService.getFolderTree(folderUUID);
+  const size = tree.size;
   const folderDecryptedNames: Record<number, string> = {};
   const fileDecryptedNames: Record<number, string> = {};
 
   // ! Decrypts folders and files names
-  const pendingFolders: FolderTree[] = [tree];
+  const pendingFolders = [tree];
   while (pendingFolders.length > 0) {
     const currentTree = pendingFolders[0];
     const { folders, files } = {
@@ -489,10 +585,7 @@ async function fetchFolderTree(folderId: number): Promise<{
       files: currentTree.files,
     };
 
-    folderDecryptedNames[currentTree.id] = aes.decrypt(
-      currentTree.name,
-      `${process.env.REACT_APP_CRYPTO_SECRET2}-${currentTree.parentId}`,
-    );
+    folderDecryptedNames[currentTree.id] = currentTree.plainName;
 
     for (const file of files) {
       fileDecryptedNames[file.id] = aes.decrypt(file.name, `${process.env.REACT_APP_CRYPTO_SECRET2}-${file.folderId}`);
@@ -534,10 +627,42 @@ export async function moveFolder(folderId: number, destination: number): Promise
     });
 }
 
+export async function moveFolderByUuid(
+  folderUuid: string,
+  destinationFolderUuid: string,
+): Promise<StorageTypes.FolderMeta> {
+  const storageClient = SdkFactory.getNewApiInstance().createNewStorageClient();
+  const payload: StorageTypes.MoveFolderUuidPayload = {
+    folderUuid: folderUuid,
+    destinationFolderUuid: destinationFolderUuid,
+  };
+
+  return storageClient
+    .moveFolderByUuid(payload)
+    .then((response) => {
+      const user = localStorageService.getUser() as UserSettings;
+      analyticsService.trackMoveItem('folder', {
+        uuid: response.uuid,
+        email: user.email,
+        platform: DevicePlatform.Web,
+      });
+      return response;
+    })
+    .catch((err) => {
+      const castedError = errorService.castError(err);
+      if (castedError.status) {
+        castedError.message = t(`tasks.move-folder.errors.${castedError.status}`);
+      }
+      throw castedError;
+    });
+}
+
 const folderService = {
   createFolder,
+  createFolderByUuid,
   updateMetaData,
   moveFolder,
+  moveFolderByUuid,
   fetchFolderTree,
   downloadFolderAsZip,
   addAllFoldersToZip,
diff --git a/src/app/drive/services/folder.service/index.ts b/src/app/drive/services/folder.service/index.ts
index 9a72687b1..66827d609 100644
--- a/src/app/drive/services/folder.service/index.ts
+++ b/src/app/drive/services/folder.service/index.ts
@@ -1,9 +1,8 @@
-import { aes } from '@internxt/lib';
 import analyticsService from '../../../analytics/services/analytics.service';
 import errorService from '../../../core/services/error.service';
 import httpService from '../../../core/services/http.service';
 import { DevicePlatform } from '../../../core/types';
-import { DriveFileData, DriveFolderData, DriveFolderMetadataPayload, DriveItemData, FolderTree } from '../../types';
+import { DriveFileData, DriveFolderData, DriveItemData } from '../../types';
 
 import { StorageTypes } from '@internxt/sdk/dist/drive';
 import { RequestCanceler } from '@internxt/sdk/dist/shared/http/types';
@@ -94,22 +93,6 @@ export function createFolder(
   return [finalPromise, requestCanceler];
 }
 
-export async function updateMetaData(folderId: number, metadata: DriveFolderMetadataPayload): Promise<void> {
-  const storageClient = SdkFactory.getInstance().createStorageClient();
-  const payload: StorageTypes.UpdateFolderMetadataPayload = {
-    folderId: folderId,
-    changes: metadata,
-  };
-  return storageClient.updateFolder(payload).then(() => {
-    const user: UserSettings = localStorageService.getUser() as UserSettings;
-    analyticsService.trackFolderRename({
-      email: user.email,
-      fileId: folderId,
-      platform: DevicePlatform.Web,
-    });
-  });
-}
-
 export function deleteFolder(folderData: DriveFolderData): Promise<void> {
   const storageClient = SdkFactory.getInstance().createStorageClient();
   return storageClient.deleteFolder(folderData.id).then(() => {
@@ -321,43 +304,6 @@ async function downloadFolderAsZip(
   }
 }
 
-async function fetchFolderTree(folderId: number): Promise<{
-  tree: FolderTree;
-  folderDecryptedNames: Record<number, string>;
-  fileDecryptedNames: Record<number, string>;
-  size: number;
-}> {
-  const { tree, size } = await httpService.get<{ tree: FolderTree; size: number }>(`/storage/tree/${folderId}`);
-  const folderDecryptedNames: Record<number, string> = {};
-  const fileDecryptedNames: Record<number, string> = {};
-
-  // ! Decrypts folders and files names
-  const pendingFolders: FolderTree[] = [tree];
-  while (pendingFolders.length > 0) {
-    const currentTree = pendingFolders[0];
-    const { folders, files } = {
-      folders: currentTree.children,
-      files: currentTree.files,
-    };
-
-    folderDecryptedNames[currentTree.id] = aes.decrypt(
-      currentTree.name,
-      `${process.env.REACT_APP_CRYPTO_SECRET2}-${currentTree.parentId}`,
-    );
-
-    for (const file of files) {
-      fileDecryptedNames[file.id] = aes.decrypt(file.name, `${process.env.REACT_APP_CRYPTO_SECRET2}-${file.folderId}`);
-    }
-
-    pendingFolders.shift();
-
-    // * Adds current folder folders to pending
-    pendingFolders.push(...folders);
-  }
-
-  return { tree, folderDecryptedNames, fileDecryptedNames, size };
-}
-
 export async function moveFolder(folderId: number, destination: number): Promise<StorageTypes.MoveFolderResponse> {
   const storageClient = SdkFactory.getInstance().createStorageClient();
   const payload: StorageTypes.MoveFolderPayload = {
@@ -387,10 +333,8 @@ export async function moveFolder(folderId: number, destination: number): Promise
 
 const folderService = {
   createFolder,
-  updateMetaData,
   deleteFolder,
   moveFolder,
-  fetchFolderTree,
   downloadFolderAsZip,
 };
 
diff --git a/src/app/drive/services/folder.service/uploadFolderInput.service.ts b/src/app/drive/services/folder.service/uploadFolderInput.service.ts
index f78b09a03..e03bcfbb5 100644
--- a/src/app/drive/services/folder.service/uploadFolderInput.service.ts
+++ b/src/app/drive/services/folder.service/uploadFolderInput.service.ts
@@ -1,63 +1,63 @@
 import { IRoot } from 'app/store/slices/storage/storage.thunks/uploadFolderThunk';
 
-
 export const transformInputFilesToJSON = (files: File[]): JSON => {
-    const result = {} as JSON;
-    for (const file of files) {
-        file.webkitRelativePath.split('/').reduce(
-            (previousValue, currentValue, currentIndex, arrayPaths) => {
-                if (currentIndex === arrayPaths.length - 1) {
-                    previousValue[currentValue] = file;
-                }
-                return previousValue[currentValue] = previousValue[currentValue] || {};
-            }
-            , result);
-    }
-    return result;
+  const result = {} as JSON;
+  for (const file of files) {
+    file.webkitRelativePath.split('/').reduce((previousValue, currentValue, currentIndex, arrayPaths) => {
+      if (currentIndex === arrayPaths.length - 1) {
+        previousValue[currentValue] = file;
+      }
+      return (previousValue[currentValue] = previousValue[currentValue] || {});
+    }, result);
+  }
+  return result;
 };
 
-export const transformJsonFilesToItems = (jsonObject: JSON, currentFolderId: number): { rootList: Array<IRoot>; rootFiles: Array<File> } => {
-    const rootList = [] as IRoot[];
-    const rootFiles = [] as File[];
+export const transformJsonFilesToItems = (
+  jsonObject: JSON,
+  currentFolderId: string,
+): { rootList: Array<IRoot>; rootFiles: Array<File> } => {
+  const rootList = [] as IRoot[];
+  const rootFiles = [] as File[];
 
-    for (const [key, value] of Object.entries(jsonObject)) {
-        if (value instanceof File) {
-            rootFiles.push(value);
-        } else {
-            rootList.push({
-                name: key,
-                folderId: currentFolderId,
-                fullPathEdited: '/' + key,
-                childrenFiles: getChildrenFiles(value),
-                childrenFolders: getChildrenFolders(value),
-            });
-        }
+  for (const [key, value] of Object.entries(jsonObject)) {
+    if (value instanceof File) {
+      rootFiles.push(value);
+    } else {
+      rootList.push({
+        name: key,
+        folderId: currentFolderId,
+        fullPathEdited: '/' + key,
+        childrenFiles: getChildrenFiles(value),
+        childrenFolders: getChildrenFolders(value),
+      });
     }
-    return { rootList, rootFiles };
+  }
+  return { rootList, rootFiles };
 };
 
 const getChildrenFiles = (jsonObject: JSON): File[] => {
-    const childrenFiles = [] as File[];
-    for (const [key, value] of Object.entries(jsonObject)) {
-        if (value instanceof File) {
-            childrenFiles.push(value);
-        }
+  const childrenFiles = [] as File[];
+  for (const [key, value] of Object.entries(jsonObject)) {
+    if (value instanceof File) {
+      childrenFiles.push(value);
     }
-    return childrenFiles;
+  }
+  return childrenFiles;
 };
 
 const getChildrenFolders = (jsonObject: JSON): IRoot[] => {
-    const childrenFolders = [] as IRoot[];
-    for (const [key, value] of Object.entries(jsonObject)) {
-        if (!(value instanceof File)) {
-            childrenFolders.push({
-                name: key,
-                folderId: null,
-                fullPathEdited: '/' + key,
-                childrenFiles: getChildrenFiles(value),
-                childrenFolders: getChildrenFolders(value),
-            });
-        }
+  const childrenFolders = [] as IRoot[];
+  for (const [key, value] of Object.entries(jsonObject)) {
+    if (!(value instanceof File)) {
+      childrenFolders.push({
+        name: key,
+        folderId: null,
+        fullPathEdited: '/' + key,
+        childrenFiles: getChildrenFiles(value),
+        childrenFolders: getChildrenFolders(value),
+      });
     }
-    return childrenFolders;
+  }
+  return childrenFolders;
 };
diff --git a/src/app/drive/services/foldersZip.service.ts b/src/app/drive/services/foldersZip.service.ts
index 4d6fdd0c1..724051155 100644
--- a/src/app/drive/services/foldersZip.service.ts
+++ b/src/app/drive/services/foldersZip.service.ts
@@ -12,7 +12,7 @@ async function addAllFoldersToZip(
   const allFolders: DriveFolderData[] = [];
 
   const addFolderToZip = (folder: DriveFolderData) => {
-    zip.addFolder(path + '/' + folder.name);
+    zip.addFolder(path + '/' + (folder.plainName ?? folder.name));
   };
 
   let pack;
diff --git a/src/app/drive/services/limit.service.ts b/src/app/drive/services/limit.service.ts
index 4df32310e..a8c17e55c 100644
--- a/src/app/drive/services/limit.service.ts
+++ b/src/app/drive/services/limit.service.ts
@@ -5,10 +5,9 @@ export const INFINITE_LIMIT = 108851651149824;
 
 async function fetchLimit(): Promise<number> {
   const storageClient = SdkFactory.getInstance().createStorageClient();
-  return storageClient.spaceLimit()
-    .then(response => {
-      return response.maxSpaceBytes;
-    });
+  return storageClient.spaceLimit().then((response) => {
+    return response.maxSpaceBytes;
+  });
 }
 
 const formatLimit = (limit: number): string => {
diff --git a/src/app/drive/services/network.service/index.ts b/src/app/drive/services/network.service/index.ts
index 6fab8b5c7..65d3db55d 100644
--- a/src/app/drive/services/network.service/index.ts
+++ b/src/app/drive/services/network.service/index.ts
@@ -1,11 +1,10 @@
 import { Environment } from '@internxt/inxt-js';
 import { ActionState, FileInfo } from '@internxt/inxt-js/build/api';
-import { Readable } from 'stream';
-import localStorageService from '../../../core/services/local-storage.service';
 import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
-import { TeamsSettings } from '../../../teams/types';
 import { Abortable } from 'app/network/Abortable';
+import { Readable } from 'stream';
 import { createUploadWebWorker } from '../../../../WebWorker';
+import localStorageService from '../../../core/services/local-storage.service';
 import { createWorkerMessageHandlerPromise } from '../worker.service/uploadWorkerUtils';
 
 export const MAX_ALLOWED_UPLOAD_SIZE = 20 * 1024 * 1024 * 1024;
@@ -207,20 +206,23 @@ export class Network {
   }
 }
 
+// MIRAR DE AÑADIR AQUI EL WORKSPACE TOKEN
 /**
  * Returns required config to upload files to the Internxt Network
  * @param isTeam Flag to indicate if is a team or not
  * @returns
  */
-export function getEnvironmentConfig(isTeam?: boolean): EnvironmentConfig {
-  if (isTeam) {
-    const team = localStorageService.getTeams() as TeamsSettings;
+export function getEnvironmentConfig(isWorkspace?: boolean): EnvironmentConfig {
+  const workspaceCredentials = localStorageService.getWorkspaceCredentials();
+  const workspace = localStorageService.getB2BWorkspace();
 
+  if (isWorkspace && workspaceCredentials && workspace) {
     return {
-      bridgeUser: team.bridge_user,
-      bridgePass: team.bridge_password,
-      encryptionKey: team.bridge_mnemonic,
-      bucketId: team.bucket,
+      bridgeUser: workspaceCredentials?.credentials?.networkUser,
+      bridgePass: workspaceCredentials?.credentials?.networkPass,
+      // decrypted mnemonic
+      encryptionKey: workspace.workspaceUser.key,
+      bucketId: workspaceCredentials?.bucket,
       useProxy: process.env.REACT_APP_DONT_USE_PROXY !== 'true',
     };
   }
diff --git a/src/app/drive/services/new-storage.service.ts b/src/app/drive/services/new-storage.service.ts
index daeb7d73e..8b335d367 100644
--- a/src/app/drive/services/new-storage.service.ts
+++ b/src/app/drive/services/new-storage.service.ts
@@ -1,4 +1,4 @@
-import { DriveFileData, FolderAncestor, FolderMeta } from '@internxt/sdk/dist/drive/storage/types';
+import { DriveFileData, FolderAncestor, FolderMeta, FolderTreeResponse } from '@internxt/sdk/dist/drive/storage/types';
 import { SdkFactory } from '../../core/factory/sdk';
 
 export async function searchItemsByName(name: string): Promise<DriveFileData[]> {
@@ -13,15 +13,21 @@ export async function getFolderAncestors(uuid: string): Promise<FolderAncestor[]
   return storageClient.getFolderAncestors(uuid);
 }
 
-export async function getFolderMeta(uuid: string): Promise<FolderMeta> {
+export async function getFolderMeta(uuid: string, workspaceId?: string, resourcesToken?: string): Promise<FolderMeta> {
   const storageClient = SdkFactory.getNewApiInstance().createNewStorageClient();
-  return storageClient.getFolderMeta(uuid);
+  return storageClient.getFolderMeta(uuid, workspaceId, resourcesToken);
+}
+
+export async function getFolderTree(uuid: string): Promise<FolderTreeResponse> {
+  const storageClient = SdkFactory.getNewApiInstance().createNewStorageClient();
+  return storageClient.getFolderTree(uuid);
 }
 
 const newStorageService = {
   searchItemsByName,
   getFolderAncestors,
   getFolderMeta,
+  getFolderTree,
 };
 
 export default newStorageService;
diff --git a/src/app/drive/services/plan.service.ts b/src/app/drive/services/plan.service.ts
index 424dd7d40..b0e7cd87c 100644
--- a/src/app/drive/services/plan.service.ts
+++ b/src/app/drive/services/plan.service.ts
@@ -1,6 +1,6 @@
+import { StoragePlan } from '@internxt/sdk/dist/drive/payments/types';
 import httpService from '../../core/services/http.service';
 import { Workspace } from '../../core/types';
-import { StoragePlan } from '../types';
 
 const fetchIndividualPlan = async (): Promise<StoragePlan | null> => {
   const response = await httpService.get<StoragePlan | null>('/plan/individual', {
diff --git a/src/app/drive/services/storage.service/index.ts b/src/app/drive/services/storage.service/index.ts
index 5c44347b3..78c704690 100644
--- a/src/app/drive/services/storage.service/index.ts
+++ b/src/app/drive/services/storage.service/index.ts
@@ -1,11 +1,12 @@
+import { DriveFileData } from '@internxt/sdk/dist/drive/storage/types';
+import { DriveFolderData, DriveItemData } from '../../types';
 import fileService from '../file.service';
 import folderService from '../folder.service';
-import { DriveFileData, DriveFolderData, DriveItemData } from '../../types';
 
-export function moveItem(item: DriveItemData, destinationFolderId: number, bucketId: string): Promise<void> {
+export function moveItem(item: DriveItemData, destinationFolderId: string): Promise<void> {
   return item.isFolder
-    ? folderService.moveFolder((item as DriveFolderData).id, destinationFolderId).then()
-    : fileService.moveFile((item as DriveFileData).fileId, destinationFolderId, bucketId).then();
+    ? folderService.moveFolderByUuid((item as DriveFolderData).uuid, destinationFolderId).then()
+    : fileService.moveFileByUuid((item as DriveFileData).uuid, destinationFolderId).then();
 }
 
 const storageService = {
diff --git a/src/app/drive/services/thumbnail.service.ts b/src/app/drive/services/thumbnail.service.ts
index 0e8b8129d..e724fc224 100644
--- a/src/app/drive/services/thumbnail.service.ts
+++ b/src/app/drive/services/thumbnail.service.ts
@@ -206,14 +206,15 @@ export const generateThumbnailFromFile = async (
   return null;
 };
 
-export const downloadThumbnail = async (thumbnailToDownload: Thumbnail, isTeam: boolean): Promise<Blob> => {
+export const downloadThumbnail = async (thumbnailToDownload: Thumbnail, isWorkspace: boolean): Promise<Blob> => {
   const updateProgressCallback = () => {
     return;
   };
   const abortController = new AbortController();
+  // TODO: CHECK WHY WITH THUMBNAILS NOT HAS TO USE WORKSPACE CREDENTIALS
   return await fetchFileBlob(
     { fileId: thumbnailToDownload.bucket_file, bucketId: thumbnailToDownload.bucket_id } as Downloadable,
-    { isTeam, updateProgressCallback, abortController },
+    { isWorkspace: false, updateProgressCallback, abortController },
   );
 };
 
@@ -228,8 +229,8 @@ export const setCurrentThumbnail = (
 
   dispatch(
     storageActions.patchItem({
-      id: item.id,
-      folderId: item.isFolder ? item.parentId : item.folderId,
+      uuid: item.uuid,
+      folderId: item.isFolder ? item.parentUuid : item.folderUuid,
       isFolder: item.isFolder,
       patch: {
         currentThumbnail: currentThumbnail,
@@ -241,8 +242,8 @@ export const setCurrentThumbnail = (
 export const setThumbnails = (thumbnails: Thumbnail[], item: DriveItemData, dispatch: AppDispatch): void => {
   dispatch(
     storageActions.patchItem({
-      id: item.id,
-      folderId: item.isFolder ? item.parentId : item.folderId,
+      uuid: item.uuid,
+      folderId: item.isFolder ? item.parentUuid : item.folderUuid,
       isFolder: item.isFolder,
       patch: {
         thumbnails: thumbnails,
diff --git a/src/app/drive/services/usage.service.ts b/src/app/drive/services/usage.service.ts
index bcb4a8d61..e4fd5b598 100644
--- a/src/app/drive/services/usage.service.ts
+++ b/src/app/drive/services/usage.service.ts
@@ -10,30 +10,16 @@ export interface UsageDetailsProps {
 
 export async function fetchUsage(): Promise<UsageResponse> {
   const storageClient = SdkFactory.getInstance().createStorageClient();
-  const photosClient = await SdkFactory.getInstance().createPhotosClient();
-
-  let photosUsage = 0;
   const driveUsage = await storageClient.spaceUsage();
 
-  try {
-    const { usage } = await photosClient.photos.getUsage();
-    photosUsage = usage;
-  } catch (error) {
-    errorService.reportError(error);
-  }
-
-  driveUsage.total += photosUsage;
-
   return driveUsage;
 }
 
 async function getUsageDetails(): Promise<UsageDetailsProps> {
   const storageClient = SdkFactory.getInstance().createStorageClient();
-  const photosClient = await SdkFactory.getInstance().createPhotosClient();
 
   let drive = 0;
   let backups = 0;
-  let photos = 0;
 
   try {
     const { drive: storageDrive, backups: storageBackups } = await storageClient.spaceUsage();
@@ -43,16 +29,9 @@ async function getUsageDetails(): Promise<UsageDetailsProps> {
     errorService.reportError(error);
   }
 
-  try {
-    const { usage } = await photosClient.photos.getUsage();
-    photos = usage;
-  } catch (error) {
-    errorService.reportError(error);
-  }
-
   return {
     drive,
-    photos,
+    photos: 0,
     backups,
   };
 }
diff --git a/src/app/drive/services/worker.service/uploadWorkerUtils.ts b/src/app/drive/services/worker.service/uploadWorkerUtils.ts
index 9090b2351..8972e26c8 100644
--- a/src/app/drive/services/worker.service/uploadWorkerUtils.ts
+++ b/src/app/drive/services/worker.service/uploadWorkerUtils.ts
@@ -106,7 +106,7 @@ const handleMessage = (msgData, params, resolve, reject, worker, continueUploadO
   }
 
   const messageHandler = messageResultHandlers[msgData.result];
-  console.log('[MAIN_THREAD]: Received message from worker', msgData);
+
   if (messageHandler) {
     messageHandler({ msgData, resolve, reject, worker, continueUploadOptions });
     return;
diff --git a/src/app/drive/types/index.ts b/src/app/drive/types/index.ts
index 8350f49cd..6e4ac4b7b 100644
--- a/src/app/drive/types/index.ts
+++ b/src/app/drive/types/index.ts
@@ -1,8 +1,8 @@
-import { SVGProps } from 'react';
-import { AppSumoDetails } from '@internxt/sdk/dist/shared/types/appsumo';
-import { RenewalPeriod } from '../../payment/types';
+import { RenewalPeriod } from '@internxt/sdk/dist/drive/payments/types';
 import { ShareLink } from '@internxt/sdk/dist/drive/share/types';
+import { AppSumoDetails } from '@internxt/sdk/dist/shared/types/appsumo';
 import { AdvancedSharedItem } from 'app/share/types';
+import { SVGProps } from 'react';
 
 export interface DriveFolderData {
   id: number;
@@ -19,17 +19,18 @@ export interface DriveFolderData {
   plain_name: string;
   plainName?: string | null;
   parentId: number;
+  parentUuid: string;
   parent_id: number | null;
   updatedAt: string;
   userId: number;
   user_id: number;
   shares?: Array<ShareLink>;
   sharings?: { type: string; id: string }[];
-  uuid?: string;
+  uuid: string;
 }
 
 export interface DriveFolderMetadataPayload {
-  itemName?: string;
+  itemName: string;
   color?: string;
   icon?: string;
 }
@@ -44,7 +45,7 @@ export interface DriveFileData {
   fileId: string;
   folderId: number;
   folder_id: number;
-  folderUuid?: string;
+  folderUuid: string;
   id: number;
   name: string;
   plain_name: string | null;
@@ -57,7 +58,7 @@ export interface DriveFileData {
   currentThumbnail: Thumbnail | null;
   shares?: Array<ShareLink>;
   sharings?: { type: string; id: string }[];
-  uuid?: string;
+  uuid: string;
 }
 
 interface Thumbnail {
@@ -81,7 +82,7 @@ export enum ThumbnailConfig {
 }
 
 export interface DriveFileMetadataPayload {
-  itemName?: string;
+  itemName: string;
 }
 
 export type DriveItemData = DriveFileData & DriveFolderData;
@@ -102,21 +103,6 @@ export interface FileInfoMenuItem {
   features: { label: string; value: string }[];
 }
 
-export interface FolderTree {
-  id: number;
-  bucket: string | null;
-  children: FolderTree[];
-  encrypt_version: string;
-  files: DriveFileData[];
-  name: string;
-  parentId: number;
-  parent_id: number;
-  userId: number;
-  user_id: number;
-  createdAt: string;
-  updatedAt: string;
-}
-
 export type StoragePlan = {
   planId: string;
   productId: string;
@@ -136,13 +122,12 @@ export type StoragePlan = {
 
 export interface FolderPath {
   name: string;
-  id: number;
-  uuid?: string;
+  uuid: string;
 }
 
 export interface FolderPathDialog {
   name: string;
-  id: number;
+  uuid: string;
 }
 
 export enum FileViewMode {
@@ -156,8 +141,8 @@ export enum DownloadFolderMethod {
 }
 
 export enum FreeStoragePlan {
-  simpleName = '2GB',
-  storageLimit = 2147483648,
+  simpleName = '1GB',
+  storageLimit = 1073741824,
 }
 
 export type DriveItemDetails = (DriveItemData | AdvancedSharedItem) & {
diff --git a/src/app/drive/views/DriveView/DriveView.tsx b/src/app/drive/views/DriveView/DriveView.tsx
index ff37a7937..0faea48be 100644
--- a/src/app/drive/views/DriveView/DriveView.tsx
+++ b/src/app/drive/views/DriveView/DriveView.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react';
-import { connect } from 'react-redux';
+import { connect, useSelector } from 'react-redux';
 
 import errorService from 'app/core/services/error.service';
 import navigationService from 'app/core/services/navigation.service';
@@ -13,8 +13,13 @@ import storageThunks from 'app/store/slices/storage/storage.thunks';
 import { uiActions } from 'app/store/slices/ui';
 import { Helmet } from 'react-helmet-async';
 import useDriveNavigation from '../../../routes/hooks/Drive/useDrive';
+import { useAppSelector } from '../../../store/hooks';
+import workspacesSelectors from '../../../store/slices/workspaces/workspaces.selectors';
 import DriveExplorer from '../../components/DriveExplorer/DriveExplorer';
 import { DriveItemData, FolderPath } from '../../types';
+import { workspacesActions } from 'app/store/slices/workspaces/workspacesStore';
+import localStorageService, { STORAGE_KEYS } from 'app/core/services/local-storage.service';
+import workspacesService from 'app/core/services/workspace.service';
 
 export interface DriveViewProps {
   namePath: FolderPath[];
@@ -26,7 +31,13 @@ export interface DriveViewProps {
 const DriveView = (props: DriveViewProps) => {
   const { dispatch, namePath, items, isLoading } = props;
   const [title, setTitle] = useState('Internxt Drive');
-  const { isFileView, isFolderView, itemUuid } = useDriveNavigation();
+  const { isFileView, isFolderView, itemUuid, workspaceUuid } = useDriveNavigation();
+  const credentials = useAppSelector(workspacesSelectors.getWorkspaceCredentials);
+  const fileViewer = useAppSelector((state: RootState) => state.ui.fileViewerItem);
+  const workspaces = useSelector((state: RootState) => state.workspaces.workspaces);
+  const [tokenHeader, setTokenHeader] = useState<string>('');
+  const selectedWorkspace = useSelector((state: RootState) => state.workspaces.selectedWorkspace);
+  const isSelectedWorkspace = selectedWorkspace?.workspace.id === workspaceUuid;
 
   useEffect(() => {
     dispatch(uiActions.setIsGlobalSearch(false));
@@ -34,26 +45,65 @@ const DriveView = (props: DriveViewProps) => {
     dispatch(storageActions.clearSelectedItems());
   }, []);
 
+  useEffect(() => {
+    if (fileViewer) {
+      setTitle(`${fileViewer?.plainName ?? fileViewer?.name} - Internxt Drive`);
+    }
+  }, [fileViewer]);
+
   useEffect(() => {
     dispatch(uiActions.setIsFileViewerOpen(false));
+    if (!workspaceUuid && isSelectedWorkspace) {
+      setPersonalWithUrl();
+    }
 
-    if (isFolderView && itemUuid) {
+    if (isFolderView && itemUuid && workspaceUuid && !isSelectedWorkspace) {
+      setWorkspaceWithUrl(workspaceUuid);
+    } else if (isFolderView && itemUuid && !workspaceUuid) {
+      setPersonalWithUrl();
       goFolder(itemUuid);
+    } else if (isFolderView && itemUuid) {
+      goFolder(itemUuid, tokenHeader);
     }
 
-    if (isFileView && itemUuid) {
+    if (isFileView && itemUuid && workspaceUuid && !isSelectedWorkspace) {
+      setWorkspaceWithUrl(workspaceUuid);
+    } else if (isFileView && itemUuid && !workspaceUuid) {
+      setPersonalWithUrl();
       showFile(itemUuid);
+    } else if (isFileView && itemUuid) {
+      showFile(itemUuid, tokenHeader);
+    }
+  }, [isFileView, isFolderView, itemUuid, credentials, workspaceUuid]);
+
+  const setWorkspaceWithUrl = async (workspaceId: string) => {
+    try {
+      const credentials = await workspacesService.getWorkspaceCredentials(workspaceId);
+      const workspace = workspaces.find((workspace) => workspace.workspace.id === workspaceUuid);
+      dispatch(workspacesActions.setCredentials(credentials));
+      localStorageService.set(STORAGE_KEYS.WORKSPACE_CREDENTIALS, JSON.stringify(credentials));
+      dispatch(workspacesActions.setSelectedWorkspace(workspace ?? null));
+      localStorageService.set(STORAGE_KEYS.B2B_WORKSPACE, JSON.stringify(workspace));
+      setTokenHeader(credentials.tokenHeader);
+    } catch (error) {
+      errorService.reportError(error);
     }
-  }, [isFileView, isFolderView, itemUuid]);
+  };
+
+  const setPersonalWithUrl = () => {
+    dispatch(workspacesActions.setCredentials(null));
+    dispatch(workspacesActions.setSelectedWorkspace(null));
+    localStorageService.set(STORAGE_KEYS.WORKSPACE_CREDENTIALS, 'null');
+    localStorageService.set(STORAGE_KEYS.B2B_WORKSPACE, 'null');
+  };
 
-  const goFolder = async (folderUuid: string) => {
+  const goFolder = async (folderUuid: string, workspacesToken?: string) => {
     try {
-      const folderMeta = await newStorageService.getFolderMeta(folderUuid);
+      const folderMeta = await newStorageService.getFolderMeta(folderUuid, workspacesToken);
 
       dispatch(
         storageThunks.goToFolderThunk({
           name: folderMeta.plainName,
-          id: folderMeta.id,
           uuid: folderMeta.uuid,
         }),
       );
@@ -66,9 +116,9 @@ const DriveView = (props: DriveViewProps) => {
     }
   };
 
-  const showFile = async (fileUUID: string) => {
+  const showFile = async (fileUUID: string, workspacesToken?: string) => {
     try {
-      const fileMeta = await fileService.getFile(fileUUID);
+      const fileMeta = await fileService.getFile(fileUUID, workspacesToken);
       dispatch(uiActions.setIsFileViewerOpen(true));
       dispatch(uiActions.setFileViewerItem(fileMeta));
       fileMeta.plainName && setTitle(`${fileMeta.plainName}.${fileMeta.type} - Internxt Drive`);
@@ -102,5 +152,6 @@ export default connect((state: RootState) => {
     isLoading: state.storage.loadingFolders[currentFolderId] ?? true,
     currentFolderId,
     items: sortedItems,
+    selectedWorkpace: state.workspaces.selectedWorkspace,
   };
 })(DriveView);
diff --git a/src/app/drive/views/TrashView/TrashView.tsx b/src/app/drive/views/TrashView/TrashView.tsx
index ac24b46ff..a617a1a2f 100644
--- a/src/app/drive/views/TrashView/TrashView.tsx
+++ b/src/app/drive/views/TrashView/TrashView.tsx
@@ -1,13 +1,15 @@
 import { useEffect } from 'react';
-import { connect } from 'react-redux';
 import { Helmet } from 'react-helmet-async';
+import { connect, useSelector } from 'react-redux';
 
 import DriveExplorer from 'app/drive/components/DriveExplorer/DriveExplorer';
 import { DriveItemData } from 'app/drive/types';
+import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
 import { AppDispatch, RootState } from 'app/store';
 import { storageActions } from 'app/store/slices/storage';
+import { getTrashPaginated, getWorkspaceTrashPaginated } from '../../../../use_cases/trash/get_trash';
 import storageThunks from '../../../store/slices/storage/storage.thunks';
-import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
+import workspacesSelectors from '../../../store/slices/workspaces/workspaces.selectors';
 
 export interface TrashViewProps {
   isLoadingItemsOnTrash: boolean;
@@ -16,21 +18,29 @@ export interface TrashViewProps {
 }
 
 const TrashView = (props: TrashViewProps) => {
+  const { items, isLoadingItemsOnTrash } = props;
   const { translate } = useTranslationContext();
 
+  const workspaceSelected = useSelector(workspacesSelectors.getSelectedWorkspace);
+  const getTrash = workspaceSelected ? getWorkspaceTrashPaginated : getTrashPaginated;
+
   useEffect(() => {
     const { dispatch } = props;
     dispatch(storageThunks.resetNamePathThunk());
     dispatch(storageActions.clearSelectedItems());
   }, []);
 
-  const { items, isLoadingItemsOnTrash } = props;
   return (
     <>
       <Helmet>
         <title>{translate('sideNav.trash')} - Internxt Drive</title>
       </Helmet>
-      <DriveExplorer title={translate('trash.trash')} isLoading={isLoadingItemsOnTrash} items={items} />
+      <DriveExplorer
+        title={translate('trash.trash')}
+        isLoading={isLoadingItemsOnTrash}
+        items={items}
+        getTrashPaginated={getTrash}
+      />
     </>
   );
 };
@@ -38,6 +48,6 @@ const TrashView = (props: TrashViewProps) => {
 export default connect((state: RootState) => {
   return {
     isLoadingDeleted: state.storage.isLoadingDeleted,
-    items: state.storage.itemsOnTrash, //storageSelectors.filteredItems(state)(state.storage.itemsOnTrash), //.itemsOnTrash),
+    items: state.storage.itemsOnTrash,
   };
 })(TrashView);
diff --git a/src/app/i18n/locales/de.json b/src/app/i18n/locales/de.json
index 58e965972..53929a89e 100644
--- a/src/app/i18n/locales/de.json
+++ b/src/app/i18n/locales/de.json
@@ -4,19 +4,31 @@
     "logOut": "Log-out"
   },
   "featuresBanner": {
-    "label": "Sparen Sie 75%",
-    "title": "Schützen Sie Ihre Daten vor der dunklen Seite",
-    "cta": "Plan auswählen",
+    "label": {
+      "upTo": "BIS ZU ",
+      "discount": "80% RABATT"
+    },
+    "title": "Genießen Sie die Sommerangebote von Internxt",
+    "subtitle": {
+      "line1": "Der kostenlose Plan von Internxt wird am 1. Juli auf 1 GB reduziert.",
+      "line2": {
+        "normal1": "Umgehen Sie dieses Downgrade mit dem Code ",
+        "blue": "FREEVIP",
+        "normal2": " um 90% Rabatt auf jeden Premium-Plan zu erhalten."
+      }
+    },
+    "cta": "Plan wählen",
     "guarantee": "30-tägige Geld-zurück-Garantie",
     "lastCta": "*Angebot gilt für kostenlose Konten oder Neukunden",
     "features": [
-      "Sparen Sie bei Internxt-Plänen",
-      "Sicherer und geschützter Cloud-Speicher",
+      "Sparen Sie bei allen Internxt-Plänen",
+      "Sichere und geschützte Cloud-Speicherung",
       "Open Source und transparent",
       "Ende-zu-Ende-verschlüsselte Übertragungen",
       "Kein unbefugter Zugriff",
-      "Angebot endet am 20. Mai"
-    ]
+      "Das Angebot endet am 19. August"
+    ],
+    "copied": "In die Zwischenablage kopiert"
   },
   "valentinesBanner": {
     "title": "Liebe ohne grenzen!",
@@ -37,7 +49,8 @@
     "it": "Italiano (Italienisch)",
     "zh": "简体中文 (Chinesisch)",
     "ru": "Русский (Russisch)",
-    "de": "Deutsch (Deutsch)"
+    "de": "Deutsch (Deutsch)",
+    "zh-tw": "臺灣 (Taiwanisch)"
   },
   "theme": {
     "title": "Erscheinung",
@@ -236,8 +249,8 @@
       "title": "Konto",
       "avatar": {
         "title": "Avatar hochladen",
-        "removePhoto": "Foto löschen",
-        "updatePhoto": "Neues Foto hochladen",
+        "removePhoto": "Löschen",
+        "updatePhoto": "Foto hochladen",
         "dragNDrop": "Wähle ein Bild aus oder lege es ab",
         "success": "Avatar wurde erfolgreich aktualisiert",
         "error": "Beim Hochladen deines Avatars ist etwas passiert",
@@ -315,10 +328,10 @@
             "cta": "Support-Center öffnen"
           },
           "deleteAccount": {
-            "head": "Lösche Konto",
-            "description": "Durch das Löschen deines Kontos löscht Internxt deine Dateien und Daten für immer. Sobald diese Aktion eingeleitet wurde, kann sie nicht mehr rückgängig gemacht werden.",
-            "isSubscribed": "Bitte kündige zuerst dein Abonnement",
-            "confirmationEmail": "Bestätigungs-E-Mail wurde gesendet"
+            "head": "Konto löschen",
+            "description": "Alle Ihre persönlichen Daten und alles, was Sie bei Internxt hochgeladen haben, werden für immer gelöscht. Sobald Sie Ihr Konto gelöscht haben, gibt es kein Zurück mehr. Bitte seien Sie sicher.",
+            "isSubscribed": "Bitte kündigen Sie zuerst Ihr Abonnement",
+            "confirmationEmail": "Bestätigungs-E-Mail gesendet"
           }
         },
         "billing": {
@@ -356,7 +369,9 @@
           },
           "invoices": {
             "head": "Rechnungen",
-            "billingDate": "Rechnungsdatum",
+            "billingDate": "Datum",
+            "storage": "Speicher",
+            "ammount": "Betrag",
             "empty": {
               "title": "Du hast einen kostenlosen Plan",
               "subtitle": "Ausgestellte Rechnungen werden hier automatisch angezeigt, wenn du ein kostenpflichtiges Abonnement hast."
@@ -434,7 +449,7 @@
             },
             "button": {
               "back": "Behalte den aktuellen Plan",
-              "continue": "Plan ändern"
+              "continue": "Weiter"
             }
           }
         },
@@ -471,20 +486,20 @@
           },
           "changePassword": {
             "title": "Passwort ändern",
-            "description": "Merke dir unbedingt dein neues Passwort. Wenn du es verlierst, kannst du nicht mehr auf alle Dateien zugreifen. Wir empfehlen dringend, einen Passwort-Manager zu verwenden.",
+            "description": "Wir speichern keine Passwörter. Wenn Sie Ihr Passwort verlieren, haben Sie keinen Zugang mehr zu Ihrem Internxt-Konto.",
             "button": "Passwort ändern"
           },
           "2FA": {
-            "title": "Zwei-Faktor-Authentifizierung (2FA)",
+            "title": "Zwei-Faktor-Authentifizierung",
             "titleDisable": "Zwei-Faktor-Authentifizierung deaktivieren",
-            "description": "Zwei-Faktor-Authentifizierung bietet eine zusätzliche Sicherheitsebene, indem beim Anmelden eine zusätzliche Verifizierung erforderlich ist. Zusätzlich zu deinem Internxt-Passwort benötigst du auch einen eindeutig generierten Code, der an die E-Mail-Adresse gesendet wird, mit der du dein Konto registriert haben.",
-            "button": "Aktiviere 2FA",
+            "description": "Fügen Sie eine zusätzliche Sicherheitsebene hinzu, indem Sie bei der Anmeldung einen zusätzlichen Verifizierungscode verlangen.",
+            "button": "Aktivieren",
             "enabled": "Aktiviert",
-            "disabled": "Deaktiviert",
+            "disabled": "Deaktivieren",
             "modal": {
               "title": "Zwei-Faktor-Authentifizierung",
               "stepsLabel": "{{current}} von {{total}}",
-              "button": "Aktiviere 2FA",
+              "button": "Aktivieren",
               "2FALabelCode": "Zwei-Faktor-Authentifizierung Code",
               "or": "Oder",
               "steps": {
@@ -517,7 +532,7 @@
           },
           "backupKey": {
             "title": "Backup Schlüssel",
-            "description": "Wenn du dein Passwort vergessen hast, kannst du einen eindeutigen Sicherungsschlüssel verwenden, um dein Konto wiederherzustellen. Gib diesen Code niemals an Dritte weiter.",
+            "description": "Mit dem Backup-Schlüssel können Sie Ihr Konto wiederherstellen, falls Sie Ihr Passwort vergessen haben. Geben Sie ihn niemals weiter.",
             "button": "Exportiere Backup Schlüssel",
             "success": "Sicherungsschlüssel erfolgreich heruntergeladen",
             "error": "Wir konnten deinen Backup-Schlüssel nicht generieren"
@@ -547,6 +562,52 @@
     "redirectToApp": {
       "message": "Danke",
       "goToApp": "Gehe zurück zur App"
+    },
+    "preferences": {
+      "workspace": {
+        "overview": {
+          "edit": "Profil bearbeiten",
+          "address": "Adresse",
+          "phone": "Telefon",
+          "owner": "Inhaber",
+          "workspaceOverview": "Übersicht des Arbeitsbereichs",
+          "members": "Mitglieder",
+          "teams": "Teams",
+          "billed": "Abgerechnet am {{renewDate}}",
+          "spaceUsed": "Verwendeter Speicher ({{percentageUsed}}%)",
+          "totalSpace": "Gesamtspeicher",
+          "editOverviewDetails": {
+            "title": "Profil Details",
+            "cancelButton": "Abbrechen",
+            "saveButton": "Änderungen speichern"
+          },
+          "errors": {
+            "minNameLength": "Der Firmenname muss mindestens 3 Zeichen lang sein"
+          }
+        },
+        "billing": {
+          "editBilling": "Zahlung bearbeiten",
+          "billingDetails": "Zahlungsdetails",
+          "updatedBillingDetails": "Angaben erfolgreich aktualisiert",
+          "errorUpdatingBillingDetails": "Beim Aktualisieren Ihrer Angaben ist ein Fehler aufgetreten. Bitte versuchen Sie es in ein paar Minuten erneut"
+        }
+      }
+    },
+    "emailVerification": {
+      "success": {
+        "title": "E-Mail erfolgreich verifiziert",
+        "subtitle": "Du kannst diesen Tab jetzt schließen",
+        "cta": "Öffne Internxt Drive"
+      },
+      "error": {
+        "title": "Etwas ist schief gelaufen",
+        "subtitle": "Überprüfe, ob der Link korrekt ist, oder fordere erneut eine E-Mail-Verifizierung in Einstellungen > Konto an",
+        "cta": "Zum Konto gehen"
+      },
+      "message": {
+        "emailNotVerifiedPartOne": "Deine E-Mail wurde noch nicht verifiziert. Bitte überprüfe dein Postfach oder ",
+        "emailNotVerifiedPartTwo": "sende die Verifizierung erneut"
+      }
     }
   },
   "contextMenu": {
@@ -1073,7 +1134,7 @@
     "twoFactorAuthDisabled": "Deine Zwei-Faktor-Authentifizierung wurde deaktiviert!",
     "joinedToTheTeam": "Du bist dem Team erfolgreich beigetreten",
     "done": "Erledigt",
-    "inviteAFriend": "Eine Einladung wurde an geschickt {{email}}",
+    "inviteAFriend": "Einladung an {{email}} gesendet",
     "subscribeToNewsletter": "{{email}} Newsletter erfolgreich abonniert"
   },
   "shareItemDialog": {
@@ -1176,6 +1237,7 @@
       "openPreview": "Öffne Vorschau",
       "details": "Einzelheiten",
       "shareLink": "Teilen",
+      "shareTeam": "Mit Team teilen",
       "getLink": "Erhalte Link",
       "rename": "Umbenennen",
       "download": "Herunterladen",
@@ -1300,5 +1362,253 @@
       "title": "Bestand niet gevonden",
       "description": "Controleer of de URL correct is en of het bestand niet verplaatst of verwijderd is."
     }
+  },
+  "preferences": {
+    "title": "Voreinstellungen",
+    "general": {
+      "title": "Allgemein"
+    },
+    "workspace": {
+      "title": "Arbeitsbereich",
+      "overview": {
+        "title": "Übersicht"
+      },
+      "members": {
+        "title": "Mitglieder",
+        "members": "Mitglieder",
+        "guests": "Gäste",
+        "search": "Mitglieder suchen",
+        "invite": "Einladen",
+        "inviteDialog": {
+          "title": "Zum Arbeitsbereich einladen",
+          "inputDescription": "Drücken Sie Enter, Leerzeichen oder Komma, um E-Mails zu trennen",
+          "remove": "Entfernen",
+          "inviteUsersDescription": "Benutzer ohne ein Internxt-Konto erhalten eine E-Mail, um sich anzumelden, bevor sie dem Arbeitsbereich beitreten können.",
+          "enterUserEmail": "Geben Sie die E-Mail-Adresse des Benutzers ein, den Sie einladen möchten",
+          "addMessage": "Nachricht hinzufügen",
+          "invite": "Einladen"
+        },
+        "invitationFlow": {
+          "acceptedSuccessfully": "Einladung zum Arbeitsbereich erfolgreich angenommen",
+          "declinedSuccessfully": "Einladung zum Arbeitsbereich erfolgreich abgelehnt",
+          "invitationSent": "Einladung erfolgreich gesendet",
+          "error": {
+            "errorInviting": "Fehler beim Senden der Einladung an {{email}}",
+            "acceptedError": "Fehler beim Akzeptieren der Einladung zum Arbeitsbereich",
+            "declinedError": "Fehler beim Ablehnen der Einladung zum Arbeitsbereich"
+          }
+        },
+        "list": {
+          "user": "Benutzer",
+          "usage": "Nutzung",
+          "storage": "Speicher"
+        },
+        "role": {
+          "owner": "Eigentümer",
+          "manager": "Manager",
+          "member": "Mitglied",
+          "deactivated": "Deaktiviert"
+        },
+        "deactivationModal": {
+          "title": "Mitglied deaktivieren",
+          "description": "{{name}} verliert den Zugriff auf den Arbeitsbereich. Alle ihre Dateien und Ordner bleiben unverändert.",
+          "deactivate": "Deaktivieren",
+          "deactivating": "Deaktivierung läuft"
+        },
+        "reactivationModal": {
+          "title": "Mitglied reaktivieren",
+          "description": "{{name}} wird wieder Zugriff auf den Arbeitsbereich erhalten.",
+          "reactivate": "Reaktivieren",
+          "reactivating": "Reaktivieren"
+        },
+        "changePasswordModal": {
+          "title": "Passwortänderung anfordern",
+          "description": "Der Benutzer erhält eine Empfehlung, sein persönliches Kontopasswort zu aktualisieren. Verwenden Sie diese Funktion, wenn Sie glauben, dass sein Passwort möglicherweise kompromittiert wurde.",
+          "inputPlaceholder": "Geben Sie Ihren Nachrichtentext ein (optional)",
+          "actionButton": "Anfrage senden"
+        },
+        "tabs": {
+          "activity": {
+            "name": "Aktivität",
+            "empty": "Keine Aktivität",
+            "disabilitedOwner": {
+              "title": "Erste Schritte mit Activity",
+              "subtitle": "Klare Nutzungseinblicke für Datei- und Kontoverwaltung mit Aktivitätsprotokollierung",
+              "action": "Aktivitätsaufzeichnung aktivieren"
+            },
+            "disabilitedMember": {
+              "title": "Aktivität ist deaktiviert",
+              "subtitle": "Kontaktieren Sie den Besitzer des Arbeitsbereichs, um Aktivitätsprotokolle für die Datei- und Kontoverwaltung zu aktivieren"
+            },
+            "roles": {
+              "title": "Rollen",
+              "member": "Mitglied",
+              "manager": "Manager",
+              "owner": "Owner"
+            },
+            "filter": {
+              "button": "Filter",
+              "title": "Filter",
+              "clear": "Löschen",
+              "dateRange": {
+                "title": "Datumsbereich",
+                "7days": "Letzte 7 Tage",
+                "30days": "Letzte 30 Tage",
+                "90days": "Letzte 90 Tage"
+              }
+            }
+          },
+          "teams": {
+            "title": "Teams",
+            "role": "Rolle",
+            "emptyTeamsOwner": {
+              "title": "Erste Schritte mit Teams",
+              "subtitle": "Verwalten Sie Arbeitsbereich-Mitglieder schneller, indem Sie sie in Teams gruppieren",
+              "action": "Ein Team erstellen"
+            },
+            "emptyTeamsMember": {
+              "title": "Noch keine Teams erstellt",
+              "subtitle": "Arbeitsbereichseigentümer können Mitglieder schneller verwalten, indem sie sie in Teams gruppieren"
+            },
+            "emptyTeams": {
+              "title": "Kein Mitglied in einem Team"
+            }
+          }
+        },
+        "actions": {
+          "deactivate": "Mitglied deaktivieren",
+          "reactivate": "Mitglied reaktivieren",
+          "passwordChange": "Passwortänderung anfordern"
+        }
+      },
+      "teams": {
+        "title": "Teams"
+      },
+      "billing": {
+        "title": "Billing",
+        "nextBillingDate": "Nächstes Abrechnungsdatum",
+        "planLimit": "Abgerechnet für {{planLimit}} plan",
+        "subscription": "Abonnement",
+        "lifetimeSubscription": {
+          "planType": "Lebenslang",
+          "text": "Keine kommenden Rechnungen"
+        },
+        "freeSubscription": {
+          "planType": "Kostenlos",
+          "action": "Upgrade",
+          "actionDescription": "Erhöhen Sie Ihren Speicherplatz und erhalten Sie mehr Funktionen"
+        },
+        "paymentMethod": {
+          "title": "Zahlungsmethode",
+          "editButton": "Zahlungsmethode bearbeiten",
+          "freePlanTitle": "Sie haben einen kostenlosen {{planLimit}} Plan",
+          "addButton": "Zahlungsmethode hinzufügen",
+          "empty": "Keine Zahlungsmethode zugeordnet"
+        },
+        "cancelSubscription": {
+          "title": "Abonnement kündigen",
+          "text": "Ihr Plan wird auf die kostenlose Stufe herabgestuft.",
+          "button": "Abonnement kündigen"
+        },
+        "empty": {
+          "text": "Keine früheren Rechnungen"
+        }
+      }
+    },
+    "account": {
+      "title": "Konto",
+      "inviteFriend": "Freund einladen",
+      "seeInvitations": "Einladungen ansehen",
+      "sendInvitationDescription": "Verbreiten Sie die Nachricht und erhalten Sie 1 GB pro eingeladenem Freund kostenlos. Sie können insgesamt bis zu 4 GB erhalten.",
+      "sendInvitation": "Einladung senden",
+      "enterFriendEmail": "Freundes-E-Mail eingeben",
+      "extraStorage": "Zusätzlicher Speicher",
+      "invitedFriends": "Eingeladene Freunde",
+      "friendsInvited": "Freunde eingeladen",
+      "acceptedRequests": "Akzeptierte Anfragen",
+      "user": "Benutzer",
+      "status": "Status",
+      "accepted": "Akzeptiert",
+      "pending": "Ausstehend",
+      "noInvitations": "Noch keine Einladungen verschickt",
+      "upgrade": "Upgrade",
+      "levelUpStorage": "Erhöhe deinen Speicherplatz und erhalte viele andere Vorteile",
+      "upgradeNow": "Jetzt upgraden",
+      "emptyTrash": "Papierkorb leeren",
+      "emptryTrashDescription": "Elemente im Papierkorb werden nach 15 Tagen endgültig gelöscht",
+      "plans": {
+        "title": "Tarife",
+        "current": "Aktuell",
+        "upgrade": "Upgrade",
+        "downgrade": "Downgrade",
+        "free": "Erhalten Sie bis zu 10 GB kostenlos",
+        "manageBilling": "Abrechnung verwalten",
+        "freeForever": "Für immer kostenlos",
+        "year": "Jahr",
+        "month": "Monat",
+        "lifetime": "Lifetime",
+        "planFeaturesList": {
+          "title": "Pläne-Details",
+          "storage": " Speicherplatz",
+          "featureOne": "Verschlüsseltes Teilen von Dateien und Ordnern.",
+          "featureTwo": "Passwortgeschütztes Teilen von Dateien.",
+          "featureThree": "Zugriff auf Ihre Dateien von jedem Gerät.",
+          "featureFour": "Hochladen von Dateien bis zu 20 GB.",
+          "featureFive": "Zwei-Faktor-Authentifizierung (2FA).",
+          "featureSix": "Premium-Kundensupport.",
+          "featureSeven": "30-Tage Geld-zurück-Garantie."
+        },
+        "businessPlanFeaturesList": {
+          "title": "Pläne-Details",
+          "storage": " Speicherplatz",
+          "featureOne": "Verschlüsseltes Teilen von Dateien und Ordnern.",
+          "featureTwo": "Erstellen und Verwalten von Benutzern und Teams.",
+          "featureThree": "Ab 3 Benutzern und bis zu 100.",
+          "featureFour": "DSGVO-konform.",
+          "featureFive": "Hochladen von Dateien bis zu 20 GB.",
+          "featureSix": "Verwalten von Kontoabrechnungen und Zahlungen.",
+          "featureSeven": "Premium-Kundensupport."
+        },
+        "user": "benutzer"
+      },
+      "billing": {
+        "title": "Billing"
+      },
+      "security": {
+        "title": "Sicherheit"
+      }
+    },
+    "navBarSections": {
+      "general": "Allgemein",
+      "workspace": "Arbeitsbereich",
+      "overview": "Übersicht",
+      "members": "Mitglieder",
+      "teams": "Teams",
+      "billing": "Abrechnung",
+      "account": "Konto",
+      "plans": "Pläne",
+      "security": "Sicherheit"
+    }
+  },
+  "workspaces": {
+    "workspaces": "Arbeitsbereiche",
+    "workspace": "Arbeitsbereich",
+    "createWorkspace": "Arbeitsbereich erstellen",
+    "workspaceTypes": {
+      "personal": "Persönlicher Arbeitsbereich",
+      "business": "Geschäftsarbeitsbereich"
+    },
+    "pending": "Ausstehende Einladungen",
+    "messages": {
+      "sharedSuccess": "Element erfolgreich mit dem Team geteilt"
+    },
+    "pendingInvitations": {
+      "empty": "Keine Einladungen übrig",
+      "title": "Ausstehende Einladungen",
+      "accept": "Akzeptieren",
+      "deny": "Ablehnen",
+      "invitedOn": "Einladung gesendet ",
+      "todayAt": "heute um "
+    }
   }
 }
diff --git a/src/app/i18n/locales/en.json b/src/app/i18n/locales/en.json
index 804b82da5..910fc7ce6 100644
--- a/src/app/i18n/locales/en.json
+++ b/src/app/i18n/locales/en.json
@@ -4,19 +4,31 @@
     "logOut": "Log Out"
   },
   "featuresBanner": {
-    "label": "Save 75%",
-    "title": "Protect your data from the dark side",
+    "label": {
+      "upTo": "UP TO ",
+      "discount": "80% OFF"
+    },
+    "title": "Soak up Internxt's summer deals",
+    "subtitle": {
+      "line1": "Internxt's free plan will be reduced to 1GB on July 1st.",
+      "line2": {
+        "normal1": "Bypass this downgrade using code  ",
+        "blue": "FREEVIP",
+        "normal2": " to get 90% off any premium plan."
+      }
+    },
     "cta": "Choose plan",
     "guarantee": "30-day money-back guarantee",
     "lastCta": "*Offer is for free accounts or new customers",
     "features": [
-      "Save on Internxt plans",
+      "Save on all Internxt plans",
       "Safe and secure cloud storage",
       "Open source and transparent",
       "End-to-end encrypted transfers",
       "No unauthorized access",
-      "Offer ends May 20"
-    ]
+      "Offer ends August 19th"
+    ],
+    "copied": "Copied to clipboard"
   },
   "valentinesBanner": {
     "title": "Love without limits!",
@@ -58,7 +70,8 @@
     "it": "Italiano (Italian)",
     "zh": "简体中文 (Chinese)",
     "ru": "Русский (Russian)",
-    "de": "Deutsch (German)"
+    "de": "Deutsch (German)",
+    "zh-tw": "臺灣 (Taiwan)"
   },
   "theme": {
     "title": "Appearance",
@@ -248,7 +261,6 @@
   },
   "sideNav": {
     "drive": "Drive",
-    "photos": "Photos",
     "backups": "Backups",
     "shared": "Shared",
     "recents": "Recents",
@@ -268,18 +280,12 @@
         "dragNDrop": "Drag and drop here or click on upload button"
       }
     },
-    "photos": {
-      "empty": {
-        "title": "Your photo gallery is empty",
-        "description": "Use the Internxt mobile app to sync all your photos from your device"
-      }
-    },
     "account": {
       "title": "Account",
       "avatar": {
         "title": "Upload avatar",
-        "removePhoto": "Delete photo",
-        "updatePhoto": "Upload new photo",
+        "removePhoto": "Remove",
+        "updatePhoto": "Upload photo",
         "dragNDrop": "Select or drop a picture",
         "success": "Avatar has been successfully updated",
         "error": "Something happened while uploading your avatar",
@@ -299,7 +305,6 @@
           "usage": "Used {{totalUsed}} of {{totalSpace}}",
           "view": {
             "backups": "Backups",
-            "photos": "Photos",
             "trash": "Trash",
             "free": {
               "planName": "Free plan",
@@ -359,9 +364,9 @@
           },
           "deleteAccount": {
             "head": "Delete account",
-            "description": "By deleting your account, Internxt will permanently delete your files and data forever. Once initiated, this action cannot be undone.",
+            "description": "All your personal data and everything you uploaded to Internxt will be erased forever. Once you delete your account, there is no going back. Please be certain.",
             "isSubscribed": "Please, cancel your subscription first",
-            "confirmationEmail": "Confirmation email has been sent"
+            "confirmationEmail": "Confirmation email sent"
           }
         },
         "billing": {
@@ -410,7 +415,9 @@
           },
           "invoices": {
             "head": "Invoices",
-            "billingDate": "Billing date",
+            "billingDate": "Date",
+            "storage": "Storage",
+            "ammount": "Ammount",
             "plan": "Plan",
             "empty": {
               "title": "You are in free plan",
@@ -489,7 +496,7 @@
             },
             "button": {
               "back": "Keep current plan",
-              "continue": "Change plan"
+              "continue": "Continue"
             }
           }
         },
@@ -526,21 +533,21 @@
           },
           "changePassword": {
             "title": "Change password",
-            "description": "Be sure to remember your new password. If you lose it, you will be unable to access all of your files. We highly recommend using a password manager.",
+            "description": "We don’t store passwords, if you lose your password, you’ll lose access to your Internxt Account.",
             "button": "Change password"
           },
           "2FA": {
-            "title": "Two-factor authentication (2FA)",
+            "title": "Two-factor authentication",
             "titleDisable": "Disable Two-Factor Authentication",
-            "description": "Two-factor authentication provides an extra layer of security by requiring an additional verification when logging in. In addition to your Internxt password, you will also need a unique generated code sent to the email you used to register your account.",
-            "button": "Enable 2FA",
-            "disable": "Disable 2FA",
+            "description": "Add an extra layer of security by requiring an extra verification code when you log in.",
+            "button": "Enable",
+            "disable": "Disable",
             "enabled": "Enabled",
             "disabled": "Disabled",
             "modal": {
               "title": "Two Factor Authentication",
               "stepsLabel": "{{current}} of {{total}}",
-              "button": "Enable 2FA",
+              "button": "Enable",
               "2FALabelCode": "Two-Factor Authentication code",
               "or": "OR",
               "steps": {
@@ -573,7 +580,7 @@
           },
           "backupKey": {
             "title": "Backup key",
-            "description": "If you forget your password, you may use a unique backup key to recover your account. Never share this code with anyone.",
+            "description": "The backup key enables account recovery in the event you forget your password. Never share it.",
             "button": "Export backup key",
             "success": "Backup key downloaded successfully",
             "error": "We could not generate your backup key"
@@ -610,6 +617,10 @@
         "title": "Something went wrong",
         "subtitle": "Check if the link is correct or request email verification again in Settings > Account",
         "cta": "Go to Account"
+      },
+      "message": {
+        "emailNotVerifiedPartOne": "Your email is not verified yet, please check your inbox or ",
+        "emailNotVerifiedPartTwo": "resend verification"
       }
     },
     "emailChange": {
@@ -639,6 +650,36 @@
     "redirectToApp": {
       "message": "Thank you",
       "goToApp": "Go back to app"
+    },
+    "preferences": {
+      "workspace": {
+        "overview": {
+          "edit": "Edit profile",
+          "address": "Address",
+          "phone": "Phone",
+          "owner": "Owner",
+          "workspaceOverview": "Workspace overview",
+          "members": "Members",
+          "teams": "Teams",
+          "billed": "Billed on {{renewDate}}",
+          "spaceUsed": "Space used ({{percentageUsed}}%)",
+          "totalSpace": "Total space",
+          "editOverviewDetails": {
+            "title": "Profile Details",
+            "cancelButton": "Cancel",
+            "saveButton": "Save Changes"
+          },
+          "errors": {
+            "minNameLength": "The company name must have at least 3 characters"
+          }
+        },
+        "billing": {
+          "editBilling": "Edit Billing",
+          "billingDetails": "Billing details",
+          "updatedBillingDetails": "Details updated successfully",
+          "errorUpdatingBillingDetails": "There was an error updating your details. Please try again in a few minutes"
+        }
+      }
     }
   },
   "contextMenu": {
@@ -818,32 +859,6 @@
       "sharedWith": "Shared with you ",
       "todayAt": "today at "
     },
-    "deletePhotosModal": {
-      "multiToolBar": "items selected",
-      "singleToolBar": "item selected",
-      "multiTitle": "Delete {{item}} selected items?",
-      "singleTitle": "Delete {{item}} selected item?",
-      "subtitle": "You can't undo this action",
-      "buttons": {
-        "cancel": "Cancel",
-        "delete": "Delete"
-      }
-    },
-    "sharePhotosModal": {
-      "singleTitle": "Share {{item}} photo",
-      "multiTitle": "Share {{item}} photos",
-      "options": "Link options",
-      "limit": "Limit number of time users can open this link",
-      "openCount": "Open count limit",
-      "times": "times",
-      "change": "Change",
-      "buttons": {
-        "cancel": "Cancel",
-        "create": "Create link",
-        "creating": "Creating link...",
-        "copyLink": "Copy link"
-      }
-    },
     "friendsInvitedModal": {
       "title": "Friends invited",
       "email": "Email",
@@ -856,8 +871,8 @@
       "resendError": "Error while resending email: {{reason}}"
     },
     "deleteAccountModal": {
-      "title": "Are you sure?",
-      "subtitle": "All your files will be gone forever and you will lose access to your Internxt account.",
+      "title": "Delete account",
+      "subtitle": "By deleting your account, Internxt will permanently delete your files and data forever. Once initiated, this action cannot be undone.",
       "cancel": "Cancel",
       "confirm": "Confirm"
     },
@@ -936,7 +951,6 @@
     "emptyPassword": "Previous password must not be empty",
     "errorMovingToTrash": "An error occurred while moving the items to trash.",
     "errorDeletingFromTrash": "An error occurred while deleting the items from trash.",
-    "braveNotSupportMultiplePhotosDowload": "Brave doesn't support multiple photo downloads.",
     "maxSizeUploadLimitError": "File too large (greater than 20GB)",
     "connectionLostError": "Internet connection lost",
     "errorLoadingTrashItems": "Error loading trash items"
@@ -1083,15 +1097,6 @@
       },
       "errors": {}
     },
-    "download-photos": {
-      "status": {
-        "pending": "Downloading {{progress}}%",
-        "success": "Downloaded",
-        "error": "Error during download",
-        "cancelled": "Download cancelled"
-      },
-      "errors": {}
-    },
     "download-backup": {
       "status": {
         "pending": "Pending to download",
@@ -1182,7 +1187,7 @@
     "twoFactorAuthDisabled": "Your Two-Factor Authentication has been disabled",
     "joinedToTheTeam": "You have successfully joined to the team",
     "done": "Done",
-    "inviteAFriend": "An invitation has been sent to {{email}}",
+    "inviteAFriend": "Invitation sent to {{email}}",
     "subscribeToNewsletter": "{{email}} successfully subscribed to newsletter"
   },
   "shareItemDialog": {
@@ -1290,6 +1295,7 @@
       "openPreview": "Open preview",
       "details": "Details",
       "shareLink": "Share",
+      "shareTeam": "Share with team",
       "manageLinkAccess": "Manage access",
       "getLink": "Get link",
       "rename": "Rename",
@@ -1415,5 +1421,253 @@
       "title": "File not found",
       "description": "Make sure that the URL is correct and the file hasn’t been moved or deleted."
     }
+  },
+  "preferences": {
+    "title": "Preferences",
+    "general": {
+      "title": "General"
+    },
+    "workspace": {
+      "title": "Workspace",
+      "overview": {
+        "title": "Overview"
+      },
+      "members": {
+        "title": "Members",
+        "members": "Members",
+        "guests": "Guests",
+        "search": "Search members",
+        "invite": "Invite",
+        "inviteDialog": {
+          "title": "Invite to workspace",
+          "inputDescription": "Press enter, space or comma to separate emails",
+          "remove": "Remove",
+          "inviteUsersDescription": "Users without an Internxt account will receive an email to sign up before joining the workspace.",
+          "enterUserEmail": "Enter user email to invite",
+          "addMessage": "Add message",
+          "invite": "Invite"
+        },
+        "invitationFlow": {
+          "acceptedSuccessfully": "Workspace invitation successfully accepted",
+          "declinedSuccessfully": "Workspace invitation successfully declined",
+          "invitationSent": "Invitation sent successfully",
+          "error": {
+            "errorInviting": "Error sending invitation to {{email}}",
+            "acceptedError": "Error accepting invitation to workspace",
+            "declinedError": "Error declining invitation to workspace"
+          }
+        },
+        "list": {
+          "user": "User",
+          "usage": "Usage",
+          "storage": "Storage"
+        },
+        "role": {
+          "owner": "Owner",
+          "manager": "Manager",
+          "member": "Member",
+          "deactivated": "Deactivated"
+        },
+        "deactivationModal": {
+          "title": "Deactivate member",
+          "description": "{{name}} will lose access to the Workspace. All their files and folders will stay the same.",
+          "deactivate": "Deactivate",
+          "deactivating": "Deactivating"
+        },
+        "reactivationModal": {
+          "title": "Reactivate member",
+          "description": "{{name}} will recovery access to the Workspace.",
+          "reactivate": "Reactivate",
+          "reactivating": "Reactivating"
+        },
+        "changePasswordModal": {
+          "title": "Request password change",
+          "description": "User will receive a recommendation to update their personal account password. Use this function in case you believe their password may have been breached.",
+          "inputPlaceholder": "Enter your message text (optional)",
+          "actionButton": "Send request"
+        },
+        "tabs": {
+          "activity": {
+            "name": "Activity",
+            "empty": "No activity",
+            "disabilitedOwner": {
+              "title": "Get started with Activity",
+              "subtitle": "Clear use insights for file and account management with activity log recording",
+              "action": "Enable Activity"
+            },
+            "disabilitedMember": {
+              "title": "Activity is disabled",
+              "subtitle": "Contact the workspace owner to enable Activity Logs for file and account management"
+            },
+            "roles": {
+              "title": "Roles",
+              "member": "Member",
+              "manager": "Manager",
+              "owner": "Owner"
+            },
+            "filter": {
+              "button": "Filter",
+              "title": "Filters",
+              "clear": "Clear",
+              "dateRange": {
+                "title": "Date range",
+                "7days": "Last 7 days",
+                "30days": "Last 30 days",
+                "90days": "Last 90 days"
+              }
+            }
+          },
+          "teams": {
+            "title": "Teams",
+            "role": "Role",
+            "emptyTeamsOwner": {
+              "title": "Get started with teams",
+              "subtitle": "Manage workspace members faster by grouping them into teams",
+              "action": "Create a team"
+            },
+            "emptyTeamsMember": {
+              "title": "No teams created yet",
+              "subtitle": "Workspace owner can manage members faster by grouping them into teams"
+            },
+            "emptyTeams": {
+              "title": "Not a member of any team"
+            }
+          }
+        },
+        "actions": {
+          "deactivate": "Deactivate member",
+          "reactivate": "Reactivate member",
+          "passwordChange": "Request password change"
+        }
+      },
+      "teams": {
+        "title": "Teams"
+      },
+      "billing": {
+        "title": "Billing",
+        "nextBillingDate": "Next billing date",
+        "planLimit": "Billed for {{planLimit}} plan",
+        "subscription": "Subscription",
+        "lifetimeSubscription": {
+          "planType": "Lifetime",
+          "text": "No upcoming billings"
+        },
+        "freeSubscription": {
+          "planType": "Free",
+          "action": "Upgrade",
+          "actionDescription": "Increase your storage space and get more features"
+        },
+        "paymentMethod": {
+          "title": "Payment Method",
+          "editButton": "Edit payment method",
+          "freePlanTitle": "You are on a free {{planLimit}} plan",
+          "addButton": "Add payment method",
+          "empty": "No payment method associated"
+        },
+        "cancelSubscription": {
+          "title": "Cancel subscription",
+          "text": "Your Plan will be downgraded to the free tier.",
+          "button": "Cancel subscription"
+        },
+        "empty": {
+          "text": "No previous invoices"
+        }
+      }
+    },
+    "account": {
+      "title": "Account",
+      "inviteFriend": "Invite a friend",
+      "seeInvitations": "See Invitations",
+      "sendInvitationDescription": "Spread the word and get 1 GB per friend invited for free. You can get up to {{N}}GB in total.",
+      "sendInvitation": "Send invitation",
+      "enterFriendEmail": "Enter friend email",
+      "extraStorage": "Extra storage",
+      "invitedFriends": "Invited friends",
+      "friendsInvited": "Friends invited",
+      "acceptedRequests": "Accepted requests",
+      "user": "User",
+      "status": "Status",
+      "accepted": "Accepted",
+      "pending": "Pending",
+      "noInvitations": "No invitations sent yet",
+      "upgrade": "Upgrade",
+      "levelUpStorage": "Level up your storage space and get many other benefits",
+      "upgradeNow": "Upgrade now",
+      "emptyTrash": "Empty trash",
+      "emptryTrashDescription": "Items in trash will be deleted permanently after 15 days",
+      "plans": {
+        "title": "Plans",
+        "current": "Current",
+        "upgrade": "Upgrade",
+        "downgrade": "Downgrade",
+        "free": "Get up to 10 GB for free",
+        "manageBilling": "Manage billing",
+        "freeForever": "Free forever",
+        "year": "Year",
+        "month": "Month",
+        "lifetime": "Lifetime",
+        "planFeaturesList": {
+          "title": "Plan details",
+          "storage": " of storage",
+          "featureOne": "Encrypted file and folder sharing.",
+          "featureTwo": "Password-protected file sharing.",
+          "featureThree": "Access your files from any device.",
+          "featureFour": "Upload files up to 20GB.",
+          "featureFive": "Two-factor authentication (2FA).",
+          "featureSix": "Premium customer support.",
+          "featureSeven": "30-day money-back guarantee."
+        },
+        "businessPlanFeaturesList": {
+          "title": "Plan details",
+          "storage": " of storage",
+          "featureOne": "Encrypted file and folder sharing.",
+          "featureTwo": "Create and manage users & teams.",
+          "featureThree": "Starting at 3 users and up to 100.",
+          "featureFour": "GDPR compliant.",
+          "featureFive": "Upload files of up to 20GB.",
+          "featureSix": "Manage account billing & payments.",
+          "featureSeven": "Premium customer support."
+        },
+        "user": "user"
+      },
+      "billing": {
+        "title": "Billing"
+      },
+      "security": {
+        "title": "Security"
+      }
+    },
+    "navBarSections": {
+      "general": "General",
+      "workspace": "Workspace",
+      "overview": "Overview",
+      "members": "Members",
+      "teams": "Teams",
+      "billing": "Billing",
+      "account": "Account",
+      "plans": "Plans",
+      "security": "Security"
+    }
+  },
+  "workspaces": {
+    "workspaces": "Workspaces",
+    "workspace": "Workspace",
+    "createWorkspace": "Create workspace",
+    "workspaceTypes": {
+      "personal": "Personal Workspace",
+      "business": "Business Workspace"
+    },
+    "pending": "Pending Invitations",
+    "messages": {
+      "sharedSuccess": "Item shared successfully with the team"
+    },
+    "pendingInvitations": {
+      "empty": "No invitations left",
+      "title": "Pending invitations",
+      "accept": "Accept",
+      "deny": "Decline",
+      "invitedOn": "Invitation sent ",
+      "todayAt": "today at "
+    }
   }
 }
diff --git a/src/app/i18n/locales/es.json b/src/app/i18n/locales/es.json
index 01658f89d..4310526fc 100644
--- a/src/app/i18n/locales/es.json
+++ b/src/app/i18n/locales/es.json
@@ -4,19 +4,31 @@
     "logOut": "Cerrar sesión"
   },
   "featuresBanner": {
-    "label": "Ahorra un 75%",
-    "title": "Protege tus datos del lado oscuro",
+    "label": {
+      "upTo": "",
+      "discount": "80% DE DESCUENTO"
+    },
+    "title": "Aprovecha las ofertas de verano de Internxt",
+    "subtitle": {
+      "line1": "A partir del 1 de julio, el plan gratuito de Internxt se reducirá a 1GB. No te quedes sin espacio. ",
+      "line2": {
+        "normal1": "Usa el código ",
+        "blue": "FREEVIP",
+        "normal2": " y obtén un 90% de descuento en cualquier plan premium."
+      }
+    },
     "cta": "Elegir plan",
     "guarantee": "Garantía de devolución del dinero de 30 días",
-    "lastCta": "*La oferta es para cuentas gratuitas o nuevos clientes",
+    "lastCta": "*Oferta válida para cuentas gratuitas o nuevos usuarios",
     "features": [
-      "Ahorra en los planes de Internxt",
+      "Ahorra en todos los planes de Internxt",
       "Almacenamiento en la nube seguro y protegido",
       "Código abierto y transparente",
       "Transferencias cifradas de extremo a extremo",
       "Sin acceso no autorizado",
-      "La oferta termina el 20 de mayo"
-    ]
+      "La oferta termina el 19 de agosto"
+    ],
+    "copied": "Copiado al portapapeles"
   },
   "valentinesBanner": {
     "title": "¡Amor sin limites!",
@@ -37,7 +49,8 @@
     "it": "Italiano (Italiano)",
     "zh": "简体中文 (Chino)",
     "ru": "Русский (Ruso)",
-    "de": "Deutsch (Alemán)"
+    "de": "Deutsch (Alemán)",
+    "zh-tw": "臺灣 (Taiwanés)"
   },
   "theme": {
     "title": "Apariencia",
@@ -46,7 +59,6 @@
     "system": "Sistema",
     "starwars": "Star Wars"
   },
-
   "auth": {
     "email": "Correo electrónico",
     "password": "Contraseña",
@@ -232,7 +244,6 @@
   },
   "sideNav": {
     "drive": "Drive",
-    "photos": "Photos",
     "backups": "Backups",
     "shared": "Compartido",
     "recents": "Recientes",
@@ -252,18 +263,12 @@
         "dragNDrop": "Arrastra un archivo o haz clic en el botón para subir un archivo"
       }
     },
-    "photos": {
-      "empty": {
-        "title": "Tu galería está vacía",
-        "description": "Usa la app móvil de Internxt para sincronizar tus fotos"
-      }
-    },
     "account": {
       "title": "Cuenta",
       "avatar": {
         "title": "Subir imagen",
-        "removePhoto": "Eliminar imagen",
-        "updatePhoto": "Subir nueva foto",
+        "removePhoto": "Eliminar",
+        "updatePhoto": "Subir foto",
         "dragNDrop": "Selecciona o arrastra una imagen",
         "success": "Imagen actualizada correctamente",
         "error": "Algo salió mal actualizando la imagen",
@@ -283,7 +288,6 @@
           "usage": "{{totalUsed}} de {{totalSpace}} usado",
           "view": {
             "backups": "Copias de seguridad",
-            "photos": "Photos",
             "trash": "Papelera",
             "free": {
               "planName": "Plan gratuito",
@@ -342,9 +346,9 @@
           },
           "deleteAccount": {
             "head": "Eliminar cuenta",
-            "description": "Si eliminas tu cuenta, tus datos se eliminarán para siempre. Esta acción no se puede deshacer.",
-            "isSubscribed": "Por favor, cancela tu suscripción primero",
-            "confirmationEmail": "Correo de confirmación enviado"
+            "description": "Todos tus datos personales y todo lo que hayas subido a Internxt serán borrados para siempre. Una vez que elimines tu cuenta, no hay vuelta atrás. Por favor, asegúrate.",
+            "isSubscribed": "Por favor, cancele su suscripción primero",
+            "confirmationEmail": "Correo electrónico de confirmación enviado"
           }
         },
         "billing": {
@@ -393,7 +397,9 @@
           },
           "invoices": {
             "head": "Facturas",
-            "billingDate": "Fecha de facturación",
+            "billingDate": "Fecha",
+            "storage": "Almacenamiento",
+            "ammount": "Cantidad",
             "plan": "Plan",
             "empty": {
               "title": "Estás en el plan gratuito",
@@ -472,7 +478,7 @@
             },
             "button": {
               "back": "Mantener plan actual",
-              "continue": "Cambiar de plan"
+              "continue": "Continuar"
             }
           }
         },
@@ -509,21 +515,21 @@
           },
           "changePassword": {
             "title": "Cambiar contraseña",
-            "description": "Recuerda no olvidar la contraseña, si no perderás acceso a todos tus archivos. Recomendamos utilizar un administrador de contraseñas.",
+            "description": "No almacenamos contraseñas, si pierdes tu contraseña, perderás el acceso a tu Cuenta Internxt.",
             "button": "Cambiar contraseña"
           },
           "2FA": {
-            "title": "Autenticación en dos pasos (2FA)",
+            "title": "Autenticación en dos pasos",
             "titleDisable": "Desactivar autenticación en dos pasos",
-            "description": "La autenticación en dos pasos proporciona una capa de seguridad adicional, ya que requiere verificación al iniciar sesión. Además de tu contraseña, necesitarás un código generado.",
+            "description": "Añade una capa extra de seguridad requiriendo un código de verificación adicional al iniciar sesión.",
             "button": "Activar",
-            "disable": "Deshabilitar 2FA",
+            "disable": "Deshabilitar",
             "enabled": "Activado",
             "disabled": "Desactivado",
             "modal": {
               "title": "Autenticación en dos pasos",
               "stepsLabel": "{{current}} de {{total}}",
-              "button": "Activar 2FA",
+              "button": "Activar",
               "2FALabelCode": "Código de autenticación",
               "or": "O",
               "steps": {
@@ -556,7 +562,7 @@
           },
           "backupKey": {
             "title": "Clave de recuperación",
-            "description": "En caso de que olvides tu contraseña, puedes usar tu clave de recuperación para recuperar tu cuenta. Nunca compartas esta clave con nadie.",
+            "description": "La clave de seguridad permite recuperar la cuenta en caso de que olvides la contraseña. No la compartas nunca.",
             "button": "Exportar clave",
             "success": "Clave de copia de seguridad descargada",
             "error": "No hemos podido generar tu clave de seguridad"
@@ -593,6 +599,10 @@
         "title": "Algo salió mal",
         "subtitle": "Comprueba si el enlace es correcto o vuelve a solicitar la verificación del correo electrónico en Configuración > Cuenta",
         "cta": "Ir a Cuenta"
+      },
+      "message": {
+        "emailNotVerifiedPartOne": "Tu correo electrónico aún no está verificado. Por favor, revisa tu bandeja de entrada o ",
+        "emailNotVerifiedPartTwo": "reenvía la verificación"
       }
     },
     "emailChange": {
@@ -622,6 +632,36 @@
     "redirectToApp": {
       "message": "Gracias!",
       "goToApp": "Volver a la aplicación"
+    },
+    "preferences": {
+      "workspace": {
+        "overview": {
+          "edit": "Editar perfil",
+          "address": "Dirección",
+          "phone": "Teléfono",
+          "owner": "Propietario",
+          "workspaceOverview": "Resumen del espacio de trabajo",
+          "members": "Miembros",
+          "teams": "Equipos",
+          "billed": "Facturado el {{renewDate}}",
+          "spaceUsed": "Espacio utilizado ({{percentageUsed}}%)",
+          "totalSpace": "Espacio total",
+          "editOverviewDetails": {
+            "title": "Detalles del perfil",
+            "cancelButton": "Cancelar",
+            "saveButton": "Guardar cambios"
+          },
+          "errors": {
+            "minNameLength": "El nombre de la empresa debe tener al menos 3 caracteres"
+          }
+        },
+        "billing": {
+          "editBilling": "Editar facturación",
+          "billingDetails": "Detalles de facturación",
+          "updatedBillingDetails": "Los datos se han actualizado correctamente",
+          "errorUpdatingBillingDetails": "Se ha producido un error al actualizar los datos. Vuelve a intentarlo en unos minutos"
+        }
+      }
     }
   },
   "contextMenu": {
@@ -796,32 +836,6 @@
       "sharedWith": "Compartido contigo ",
       "todayAt": "hoy a las "
     },
-    "deletePhotosModal": {
-      "multiToolBar": "archivos seleccionados",
-      "singleToolBar": "archivo seleccionado",
-      "singleTitle": "Eliminar {{item}} archivo seleccionado?",
-      "multiTitle": "Eliminar los {{item}} archivos seleccionados?",
-      "subtitle": "Esta acción no se puede deshacer",
-      "buttons": {
-        "cancel": "Cancelar",
-        "delete": "Eliminar"
-      }
-    },
-    "sharePhotosModal": {
-      "singleTitle": "Compartir {{item}} foto",
-      "multiTitle": "Compartir {{item}} fotos",
-      "options": "Opciones del enlace",
-      "limit": "Limita el número de veces que se puede abrir el enlace",
-      "openCount": "Límite de apertura",
-      "times": "veces",
-      "change": "Cambiar",
-      "buttons": {
-        "cancel": "Cancelar",
-        "create": "Crear enlace",
-        "creating": "Creando enlace...",
-        "copyLink": "Copiar enlace"
-      }
-    },
     "friendsInvitedModal": {
       "title": "Invitaciones enviadas",
       "email": "Correo electrónico",
@@ -914,7 +928,6 @@
     "emptyPassword": "La contraseña no puede estar vacía.",
     "errorMovingToTrash": "Ha ocurrido un error mientras se movian los items a la basura.",
     "errorDeletingFromTrash": "Ha ocurrido un error mientras se eliminaban los items de la basura.",
-    "braveNotSupportMultiplePhotosDowload": "Brave no admite la descarga multiple de fotos.",
     "maxSizeUploadLimitError": "File too large (greater than 20GB)",
     "connectionLostError": "Conexión a internet perdida",
     "errorLoadingTrashItems": "Error al cargar items de la papelera"
@@ -1062,15 +1075,6 @@
       },
       "errors": {}
     },
-    "download-photos": {
-      "status": {
-        "pending": "Descargando {{progress}}%",
-        "success": "descargado",
-        "error": "Error durante la descarga",
-        "cancelled": "Descara cancelada"
-      },
-      "errors": {}
-    },
     "download-backup": {
       "status": {
         "pending": "Descarga pendiente",
@@ -1193,7 +1197,7 @@
     "twoFactorAuthDisabled": "Su autenticación de dos factores ha sido desactivada.",
     "joinedToTheTeam": "You have successfully joined to the team",
     "done": "Hecho",
-    "inviteAFriend": "Una invitación ha sido enviada a {{email}}",
+    "inviteAFriend": "Invitación enviada a {{email}}",
     "subscribeToNewsletter": "{{email}} suscrito con éxito a la newsletter"
   },
   "actions": {
@@ -1268,6 +1272,7 @@
     "dropdown": {
       "openPreview": "Abrir previsualización",
       "shareLink": "Compartir",
+      "shareTeam": "Compartir con el equipo",
       "getLink": "Copiar enlace",
       "details": "Detalles",
       "rename": "Renombrar",
@@ -1393,5 +1398,253 @@
       "title": "Archivo no encontrado",
       "description": "Asegúrese de que la URL es correcta y de que el archivo no se ha movido ni eliminado."
     }
+  },
+  "preferences": {
+    "title": "Preferencias",
+    "general": {
+      "title": "General"
+    },
+    "workspace": {
+      "title": "Espacio de trabajo",
+      "overview": {
+        "title": "Global"
+      },
+      "members": {
+        "title": "Miembros",
+        "members": "Miembros",
+        "guests": "Invitados",
+        "search": "Buscar miembros",
+        "invite": "Invitar",
+        "inviteDialog": {
+          "title": "Invitar al espacio de trabajo",
+          "inputDescription": "Presiona enter, espacio o coma para separar correos electrónicos",
+          "remove": "Eliminar",
+          "inviteUsersDescription": "Los usuarios sin una cuenta de Internxt recibirán un correo electrónico para registrarse antes de unirse al espacio de trabajo.",
+          "enterUserEmail": "Ingrese el correo electrónico del usuario para invitar",
+          "addMessage": "Agregar mensaje",
+          "invite": "Invitar"
+        },
+        "invitationFlow": {
+          "acceptedSuccessfully": "Invitación al espacio de trabajo aceptada exitosamente",
+          "declinedSuccessfully": "Invitación al espacio de trabajo rechazada exitosamente",
+          "invitationSent": "Invitación enviada exitosamente",
+          "error": {
+            "errorInviting": "Error al enviar la invitación a {{email}}",
+            "acceptedError": "Error al aceptar la invitación al espacio de trabajo",
+            "declinedError": "Error al rechazar la invitación al espacio de trabajo"
+          }
+        },
+        "list": {
+          "user": "Usuario",
+          "usage": "Uso",
+          "storage": "Almacenamiento"
+        },
+        "role": {
+          "owner": "Propietario",
+          "manager": "Manager",
+          "member": "Miembro",
+          "deactivated": "Desactivado"
+        },
+        "deactivationModal": {
+          "title": "Desactivar miembro",
+          "description": "{{name}} perderá acceso al espacio de trabajo. Todos sus archivos y carpetas permanecerán iguales.",
+          "deactivate": "Desactivar",
+          "deactivating": "Desactivando"
+        },
+        "reactivationModal": {
+          "title": "Reactivar miembro",
+          "description": "{{name}} recuperará acceso al espacio de trabajo.",
+          "reactivate": "Reactivar",
+          "reactivating": "Reactivando"
+        },
+        "changePasswordModal": {
+          "title": "Solicitar cambio de contraseña",
+          "description": "El usuario recibirá una recomendación para actualizar la contraseña de su cuenta personal. Utilice esta función si cree que su contraseña podría haber sido comprometida.",
+          "inputPlaceholder": "Ingrese el texto de su mensaje (opcional)",
+          "actionButton": "Enviar solicitud"
+        },
+        "tabs": {
+          "activity": {
+            "name": "Actividad",
+            "empty": "Sin actividad",
+            "disabilitedOwner": {
+              "title": "Comenzar con la actividad",
+              "subtitle": "Registros de la activdad claros, para la gestión de archivos y cuentas",
+              "action": "Activar Actividad"
+            },
+            "disabilitedMember": {
+              "title": "La actividad está deshabilitada",
+              "subtitle": "Póngase en contacto con el propietario del espacio de trabajo para habilitar los registros de actividad"
+            },
+            "roles": {
+              "title": "Roles",
+              "member": "Miembro",
+              "manager": "Gestor",
+              "owner": "Propiestario"
+            },
+            "filter": {
+              "button": "Filtrar",
+              "title": "Filtros",
+              "clear": "Limpiar",
+              "dateRange": {
+                "title": "Intervalo de fechas",
+                "7days": "Últimos 7 días",
+                "30days": "Últimos 30 días",
+                "90days": "Últimos 90 días"
+              }
+            }
+          },
+          "teams": {
+            "title": "Equipos",
+            "role": "Rol",
+            "emptyTeamsOwner": {
+              "title": "Empezar a trabajar con equipos",
+              "subtitle": "Gestiona más rápido a los miembros del espacio de trabajo agrupándolos en equipos",
+              "action": "Crear un equipo"
+            },
+            "emptyTeamsMember": {
+              "title": "No hay equipos creados aún",
+              "subtitle": "El propietario del espacio de trabajo puede gestionar a los miembros más rápidamente agrupándolos en equipos"
+            },
+            "emptyTeams": {
+              "title": "No es miembro de ningún equipo"
+            }
+          }
+        },
+        "actions": {
+          "deactivate": "Desactivar miembro",
+          "reactivate": "Reactivar miembro",
+          "passwordChange": "Solicitar cambio de contraseña"
+        }
+      },
+      "teams": {
+        "title": "Equipos"
+      },
+      "billing": {
+        "title": "Facturación",
+        "nextBillingDate": "Próxima fecha de facturación",
+        "planLimit": "Facturado por plan de {{planLimit}}",
+        "subscription": "Suscripción",
+        "lifetimeSubscription": {
+          "planType": "De por vida",
+          "text": "Sin facturas pendientes"
+        },
+        "freeSubscription": {
+          "planType": "Gratis",
+          "action": "Actualizar",
+          "actionDescription": "Aumente su espacio de almacenamiento y obtenga más funciones"
+        },
+        "paymentMethod": {
+          "title": "Método de pago",
+          "editButton": "Editar método de pago",
+          "freePlanTitle": "Estás en un plan gratuito de {{planLimit}}",
+          "addButton": "Añadir método de pago",
+          "empty": "Ningún método de pago asociado"
+        },
+        "cancelSubscription": {
+          "title": "Cancelar suscripción",
+          "text": "Tu suscripción pasará al plan gratuito.",
+          "button": "Cancelar suscripción"
+        },
+        "empty": {
+          "text": "Sin facturas anteriores"
+        }
+      }
+    },
+    "account": {
+      "title": "Cuenta",
+      "inviteFriend": "Invitar a un amigo",
+      "seeInvitations": "Ver Invitaciones",
+      "sendInvitationDescription": "Corre la voz y obtén 1 GB por cada amigo invitado gratis. Puedes obtener hasta {{N}}GB en total.",
+      "sendInvitation": "Enviar invitación",
+      "enterFriendEmail": "Introduce el correo electrónico del amigo",
+      "extraStorage": "Almacenamiento adicional",
+      "invitedFriends": "Amigos invitados",
+      "friendsInvited": "Amigos invitados",
+      "acceptedRequests": "Solicitudes aceptadas",
+      "user": "Usuario",
+      "status": "Estado",
+      "accepted": "Aceptado",
+      "pending": "Pendiente",
+      "noInvitations": "Todavía no se han enviado invitaciones",
+      "upgrade": "Mejorar",
+      "levelUpStorage": "Aumenta tu espacio de almacenamiento y obtén muchos otros beneficios",
+      "upgradeNow": "Mejorar ahora",
+      "emptyTrash": "Vaciar la papelera",
+      "emptryTrashDescription": "Los elementos en la papelera serán eliminados permanentemente después de 15 días",
+      "plans": {
+        "title": "Planes",
+        "current": "Actual",
+        "upgrade": "Incrementar",
+        "downgrade": "Degradar",
+        "free": "Obtenga hasta 10 GB gratis",
+        "manageBilling": "Gestionar facturación",
+        "freeForever": "Gratis para siempre",
+        "year": "Año",
+        "month": "Mes",
+        "lifetime": "Lifetime",
+        "planFeaturesList": {
+          "title": "Detalles del plan",
+          "storage": " de almacenamiento",
+          "featureOne": "Compartir archivos y carpetas cifrados.",
+          "featureTwo": "Compartir archivos con contraseña.",
+          "featureThree": "Accede a tus archivos desde cualquier dispositivo.",
+          "featureFour": "Sube archivos de hasta 20 GB.",
+          "featureFive": "Autenticación de dos factores (2FA).",
+          "featureSix": "Soporte al cliente premium.",
+          "featureSeven": "Garantía de devolución de dinero de 30 días."
+        },
+        "businessPlanFeaturesList": {
+          "title": "Detalles del plan",
+          "storage": " de almacenamiento",
+          "featureOne": "Compartir archivos y carpetas cifrados.",
+          "featureTwo": "Crear y gestionar usuarios y equipos.",
+          "featureThree": "Desde 3 usuarios y hasta 100.",
+          "featureFour": "Cumplimiento con el GDPR.",
+          "featureFive": "Sube archivos de hasta 20 GB.",
+          "featureSix": "Gestionar la facturación y los pagos de la cuenta.",
+          "featureSeven": "Soporte al cliente premium."
+        },
+        "user": "usuario"
+      },
+      "billing": {
+        "title": "Facturación"
+      },
+      "security": {
+        "title": "Seguridad"
+      }
+    },
+    "navBarSections": {
+      "general": "General",
+      "workspace": "Espacio de trabajo",
+      "overview": "Resumen",
+      "members": "Miembros",
+      "teams": "Equipos",
+      "billing": "Facturación",
+      "account": "Cuenta",
+      "plans": "Planes",
+      "security": "Seguridad"
+    }
+  },
+  "workspaces": {
+    "workspaces": "Espacios de trabajo",
+    "workspace": "Espacio de trabajo",
+    "createWorkspace": "Crear espacio de trabajo",
+    "workspaceTypes": {
+      "personal": "Espacio de trabajo personal",
+      "business": "Espacio de trabajo empresarial"
+    },
+    "pending": "Invitaciones pendientes",
+    "messages": {
+      "sharedSuccess": "Elemento compartido exitosamente con el equipo"
+    },
+    "pendingInvitations": {
+      "empty": "No quedan invitaciones",
+      "title": "Invitaciones pendientes",
+      "accept": "Aceptar",
+      "deny": "Rechazar",
+      "invitedOn": "Invitación enviada ",
+      "todayAt": "hoy a las "
+    }
   }
 }
diff --git a/src/app/i18n/locales/fr.json b/src/app/i18n/locales/fr.json
index 705bb9eb8..e44ae4769 100644
--- a/src/app/i18n/locales/fr.json
+++ b/src/app/i18n/locales/fr.json
@@ -4,19 +4,31 @@
     "logOut": "Déconnexion"
   },
   "featuresBanner": {
-    "label": "Économisez 75%",
-    "title": "Protégez vos données du côté obscur",
-    "cta": "Choisir un plan",
+    "label": {
+      "upTo": "",
+      "discount": "80% DE RÉDUCTION"
+    },
+    "title": "Profitez des offres d'été d'Internxt",
+    "subtitle": {
+      "line1": "Le plan gratuit d'Internxt sera réduit à 1 Go le 1er juillet.",
+      "line2": {
+        "normal1": "Évitez cette dégradation en utilisant le code ",
+        "blue": "FREEVIP",
+        "normal2": " pour obtenir 90% de réduction sur n'importe quel plan premium."
+      }
+    },
+    "cta": "Choisissez un plan",
     "guarantee": "Garantie de remboursement de 30 jours",
     "lastCta": "*L'offre est valable pour les comptes gratuits ou les nouveaux clients",
     "features": [
-      "Économisez sur les plans Internxt",
+      "Économisez sur tous les plans Internxt",
       "Stockage cloud sûr et sécurisé",
       "Open source et transparent",
       "Transferts chiffrés de bout en bout",
       "Aucun accès non autorisé",
-      "L'offre se termine le 20 mai"
-    ]
+      "L'offre se termine le 19 août"
+    ],
+    "copied": "Copié dans le presse-papiers"
   },
   "valentinesBanner": {
     "title": "L'amour sans limites !",
@@ -37,7 +49,8 @@
     "it": "Italiano (Italien)",
     "zh": "简体中文 (Chinois)",
     "ru": "Русский (Russe)",
-    "de": "Deutsch (Allemand)"
+    "de": "Deutsch (Allemand)",
+    "zh-tw": "臺灣 (Taïwanais)"
   },
   "theme": {
     "title": "Apparence",
@@ -179,12 +192,12 @@
     "renewalPeriod": {
       "monthly": "mensuel",
       "annually": "annuel",
-      "lifetime": "plan à vie"
+      "lifetime": "lifetime"
     },
     "renewal": {
       "monthly": "Mensuel",
       "annually": "Annuel",
-      "lifetime": "Plan à vie"
+      "lifetime": "Lifetime"
     },
     "workspaces": {
       "personal": "Individuel",
@@ -231,7 +244,6 @@
   },
   "sideNav": {
     "drive": "Drive",
-    "photos": "Photos",
     "backups": "Sauvegardes",
     "shared": "Partagé",
     "recents": "Récent",
@@ -251,18 +263,12 @@
         "dragNDrop": "Glisser-déposer ici ou cliquer sur le bouton de téléchargement"
       }
     },
-    "photos": {
-      "empty": {
-        "title": "Votre galerie est vide",
-        "description": "Utilisez l'app mobile Internxt pour synchroniser vos photos."
-      }
-    },
     "account": {
       "title": "Compte",
       "avatar": {
         "title": "Télécharger une photo",
-        "removePhoto": "Supprimer une photo",
-        "updatePhoto": "Charger une nouvelle photo",
+        "removePhoto": "Supprimer",
+        "updatePhoto": "Charger photo",
         "dragNDrop": "Sélectionner ou faire glisser une photo",
         "success": "Avatar a été mis à jour avec succès",
         "error": "Quelque chose s'est produit lors du téléchargement de votre avatar",
@@ -282,7 +288,6 @@
           "usage": "{{totalUsed}} de {{totalSpace}} utilisés",
           "view": {
             "backups": "Sauvegarde",
-            "photos": "Photos",
             "trash": "Corbeille",
             "free": {
               "planName": "Plan gratuit",
@@ -342,9 +347,9 @@
           },
           "deleteAccount": {
             "head": "Supprimer le compte",
-            "description": "Si vous supprimez votre compte, vos données seront supprimées à jamais. Cette action ne peut être annulée.",
+            "description": "Toutes vos données personnelles et tout ce que vous avez téléchargé sur Internxt seront effacés pour toujours. Une fois que vous aurez supprimé votre compte, il n'y aura pas de retour en arrière. Veuillez être certain.",
             "isSubscribed": "Veuillez d'abord annuler votre abonnement",
-            "confirmationEmail": "L'email de confirmation a été envoyé"
+            "confirmationEmail": "E-mail de confirmation envoyé"
           }
         },
         "billing": {
@@ -367,7 +372,9 @@
           },
           "invoices": {
             "head": "Factures",
-            "billingDate": "Date de facturation",
+            "billingDate": "Date",
+            "storage": "Stockage",
+            "ammount": "Montant",
             "plan": "Plan",
             "empty": {
               "title": "Vous êtes sur le plan gratuit",
@@ -460,21 +467,21 @@
           },
           "changePassword": {
             "title": "Modifier le mot de passe",
-            "description": "N'oubliez pas que si vous oubliez votre mot de passe, vous perdrez l'accès à tous vos fichiers. Nous vous recommandons d'utiliser un gestionnaire de mots de passe.",
+            "description": "Nous ne conservons pas les mots de passe. Si vous perdez votre mot de passe, vous n'aurez plus accès à votre compte Internxt.",
             "button": "Modifier le mot de passe"
           },
           "2FA": {
-            "title": "Authentification à deux facteurs (2FA)",
+            "title": "Authentification à deux facteurs",
             "titleDisable": "Disable Two-Factor Authentication",
-            "description": "L'authentification à deux facteurs offre une sécurité supplémentaire en exigeant une vérification pour la connexion. En plus de votre mot de passe, vous aurez besoin d'un code généré.",
-            "button": "Activer 2FA",
-            "disable": "Désactiver 2FA",
+            "description": "Ajouter une couche supplémentaire de sécurité en demandant un code de vérification supplémentaire lorsque vous vous connectez.",
+            "button": "Activer",
+            "disable": "Désactiver",
             "enabled": "Enabled",
             "disabled": "Disabled",
             "modal": {
               "title": "Authentification en deux étapes",
               "stepsLabel": "{{current}} de {{total}}",
-              "button": "Activer 2FA",
+              "button": "Activer",
               "2FALabelCode": "Two-Factor Authentication code",
               "or": "OU",
               "steps": {
@@ -507,7 +514,7 @@
           },
           "backupKey": {
             "title": "Clé de récupération",
-            "description": "En cas d'oubli de votre mot de passe, vous pouvez utiliser votre clé de récupération pour récupérer votre compte. Ne jamais partager ce code avec qui que ce soit.",
+            "description": "La clé de sauvegarde permet de récupérer le compte en cas d'oubli du mot de passe. Ne le partagez jamais.",
             "button": "Exporter le mot de passe",
             "success": "Clé de sauvegarde téléchargée avec succès",
             "error": "Nous n'avons pas pu générer votre clé de sauvegarde"
@@ -544,6 +551,10 @@
         "title": " Quelque chose s'est mal passé ",
         "subtitle": " Vérifiez si le lien est correct ou redemandez la vérification de l'email dans Paramètres > Compte ",
         "cta": "Aller au Compte"
+      },
+      "message": {
+        "emailNotVerifiedPartOne": "Votre e-mail n'est pas encore vérifié. Veuillez vérifier votre boîte de réception ou ",
+        "emailNotVerifiedPartTwo": "renvoyer la vérification"
       }
     },
     "emailChange": {
@@ -573,6 +584,36 @@
     "redirectToApp": {
       "message": "Merci",
       "goToApp": "Retourner à l'application"
+    },
+    "preferences": {
+      "workspace": {
+        "overview": {
+          "edit": "Modifier le profil",
+          "address": "Adresse",
+          "phone": "Téléphone",
+          "owner": "Propriétaire",
+          "workspaceOverview": "Vue d'ensemble de l'espace de travail",
+          "members": "Membres",
+          "teams": "Équipes",
+          "billed": "Facturé le {{renewDate}}",
+          "spaceUsed": "Espace utilisé ({{percentageUsed}}%)",
+          "totalSpace": "Espace total",
+          "editOverviewDetails": {
+            "title": "Détails du profil",
+            "cancelButton": "Annuler",
+            "saveButton": "Enregistrer les modifications"
+          },
+          "errors": {
+            "minNameLength": "Le nom de l'entreprise doit comporter au moins 3 caractères"
+          }
+        },
+        "billing": {
+          "editBilling": "Modifier la facturation",
+          "billingDetails": "Détails de facturation",
+          "updatedBillingDetails": "Détails mis à jour avec succès",
+          "errorUpdatingBillingDetails": "Une erreur s'est produite lors de la mise à jour de vos informations. Veuillez réessayer dans quelques minutes"
+        }
+      }
     }
   },
   "contextMenu": {
@@ -751,32 +792,6 @@
       "sharedWith": "Partagé avec vous ",
       "todayAt": "aujourd'hui à "
     },
-    "deletePhotosModal": {
-      "multiToolBar": "items selected",
-      "singleToolBar": "item selected",
-      "multiTitle": "Supprimer les {{item}} fichiers sélectionnés ?",
-      "singleTitle": "Supprimer {{item}} fichier sélectionné?",
-      "subtitle": "Cette action ne peut pas être annulée",
-      "buttons": {
-        "cancel": "Annuler",
-        "delete": "Supprimer"
-      }
-    },
-    "sharePhotosModal": {
-      "singleTitle": "Partager {{item}} photo",
-      "multiTitle": "Partager {{item}} photos",
-      "options": "Options du lien",
-      "limit": "Limiter le nombre de fois que le lien peut être ouvert.",
-      "openCount": "Limiter l'ouverture à",
-      "times": "fois",
-      "change": "Modifier",
-      "buttons": {
-        "cancel": "Annuler",
-        "create": "Créer un lien",
-        "creating": "En cours de création...",
-        "copyLink": "Copier le lien"
-      }
-    },
     "friendsInvitedModal": {
       "title": "Amis invités",
       "email": "Email",
@@ -868,7 +883,6 @@
     "incorrectPassword": "Le mot de passe actuel que vous avez introduit ne correspond pas. Veuillez vous assurer qu'il est correct.",
     "emptyPassword": "Le mot de passe précédent ne doit pas être vide",
     "errorMovingToTrash": "Error lors du déplacement des éléments.",
-    "braveNotSupportMultiplePhotosDowload": "Brave ne prend pas en charge le téléchargement de plusieurs photos.",
     "maxSizeUploadLimitError": "Fichier trop volumineux (plus de 20GB)",
     "connectionLostError": "Lost Internet connection",
     "errorLoadingTrashItems": "Erreur de chargement des éléments de la corbeille"
@@ -1015,15 +1029,6 @@
       },
       "errors": {}
     },
-    "download-photos": {
-      "status": {
-        "pending": "Téléchargement de {{progress}}%",
-        "success": "Téléchargé",
-        "error": "Erreur pendant le téléchargement",
-        "cancelled": "Téléchargement annulé"
-      },
-      "errors": {}
-    },
     "download-backup": {
       "status": {
         "pending": "En attente de téléchargement",
@@ -1114,7 +1119,7 @@
     "twoFactorAuthDisabled": "Votre authentification à deux facteurs a été désactivée",
     "joinedToTheTeam": "Vous avez rejoint l'équipe avec succès",
     "done": "Terminé",
-    "inviteAFriend": "Une invitation a été envoyée à {{email}}",
+    "inviteAFriend": "Invitation envoyée à {{email}}",
     "subscribeToNewsletter": "{{email}} s'est abonné avec succès à la newsletter"
   },
   "shareItemDialog": {
@@ -1219,6 +1224,7 @@
       "getLink": "Copier le lien",
       "details": "Détails",
       "shareLink": "Partager",
+      "shareTeam": "Partager avec l'équipe",
       "rename": "Renommer",
       "manageLinkAccess": "Gestion de l'accès",
       "manageAccess": "Gestion de l'accès",
@@ -1342,5 +1348,253 @@
       "title": "Fichier non trouvé",
       "description": "Assurez-vous que l'URL est correcte et que le fichier n'a pas été déplacé ou supprimé."
     }
+  },
+  "preferences": {
+    "title": "Préférences",
+    "general": {
+      "title": "Général"
+    },
+    "workspace": {
+      "title": "Espace de travail",
+      "overview": {
+        "title": "D'ensemble"
+      },
+      "members": {
+        "title": "Membres",
+        "members": "Membres",
+        "guests": "Invités",
+        "search": "Rechercher des membres",
+        "invite": "Inviter",
+        "inviteDialog": {
+          "title": "Inviter au lieu de travail",
+          "inputDescription": "Appuyez sur Entrée, Espace ou Virgule pour séparer les emails",
+          "remove": "Supprimer",
+          "inviteUsersDescription": "Les utilisateurs sans compte Internxt recevront un email pour s'inscrire avant de rejoindre le lieu de travail.",
+          "enterUserEmail": "Entrer l'email de l'utilisateur à inviter",
+          "addMessage": "Ajouter un message",
+          "invite": "Inviter"
+        },
+        "invitationFlow": {
+          "acceptedSuccessfully": "Invitation à l'espace de travail acceptée avec succès",
+          "declinedSuccessfully": "Invitation à l'espace de travail refusée avec succès",
+          "invitationSent": "Invitation envoyée avec succès",
+          "error": {
+            "errorInviting": "Erreur lors de l'envoi de l'invitation à {{email}}",
+            "acceptedError": "Erreur lors de l'acceptation de l'invitation à l'espace de travail",
+            "declinedError": "Erreur lors du refus de l'invitation à l'espace de travail"
+          }
+        },
+        "list": {
+          "user": "Utilisateur",
+          "usage": "Utilisation",
+          "storage": "Stockage"
+        },
+        "role": {
+          "owner": "Propriétaire",
+          "manager": "Gestionnaire",
+          "member": "Membre",
+          "deactivated": "Désactivé"
+        },
+        "deactivationModal": {
+          "title": "Désactiver le membre",
+          "description": "{{name}} perdra l'accès à l'espace de travail. Tous leurs fichiers et dossiers resteront inchangés.",
+          "deactivate": "Désactiver",
+          "deactivating": "Désactivation en cours"
+        },
+        "reactivationModal": {
+          "title": "Réactiver le membre",
+          "description": "{{name}} retrouvera l'accès à l'espace de travail.",
+          "reactivate": "Réactiver",
+          "reactivating": "Réactivation"
+        },
+        "changePasswordModal": {
+          "title": "Demander un changement de mot de passe",
+          "description": "L'utilisateur recevra une recommandation pour mettre à jour le mot de passe de son compte personnel. Utilisez cette fonction si vous pensez que son mot de passe pourrait avoir été compromis.",
+          "inputPlaceholder": "Saisissez le texte de votre message (optionnel)",
+          "actionButton": "Envoyer la demande"
+        },
+        "tabs": {
+          "activity": {
+            "name": "Activité",
+            "empty": "Pas d'activité",
+            "disabilitedOwner": {
+              "title": "Démarrer avec Activity",
+              "subtitle": "Des perspectives d'utilisation claires pour la gestion des fichiers et des comptes avec l'enregistrement des journaux d'activité",
+              "action": "Activer l'activité"
+            },
+            "disabilitedMember": {
+              "title": "L'activité est désactivée",
+              "subtitle": "Contactez le propriétaire de l'espace de travail pour activer les journaux d'activité pour la gestion des fichiers et des comptes"
+            },
+            "roles": {
+              "title": "Rôles",
+              "member": "Membre",
+              "manager": "Manager",
+              "owner": "Propriétaire"
+            },
+            "filter": {
+              "button": "Filtre",
+              "title": "Filtres",
+              "clear": "Clear",
+              "dateRange": {
+                "title": "Date range",
+                "7days": "7 derniers jours",
+                "30days": "30 derniers jours",
+                "90days": "90 derniers jours"
+              }
+            }
+          },
+          "teams": {
+            "title": "Équipes",
+            "role": "Rôle",
+            "emptyTeamsOwner": {
+              "title": "Commencer avec les équipes",
+              "subtitle": "Gérer plus rapidement les membres de l'espace de travail en les regroupant en équipes",
+              "action": "Créer une équipe"
+            },
+            "emptyTeamsMember": {
+              "title": "Aucune équipe n'a encore été créée",
+              "subtitle": "Le propriétaire de l'espace de travail peut gérer les membres plus rapidement en les regroupant en équipes"
+            },
+            "emptyTeams": {
+              "title": "N'est membre d'aucune équipe"
+            }
+          }
+        },
+        "actions": {
+          "deactivate": "Désactiver le membre",
+          "reactivate": "Réactiver le membre",
+          "passwordChange": "Demande de changement de mot de passe"
+        }
+      },
+      "teams": {
+        "title": "Équipes"
+      },
+      "billing": {
+        "title": "Billing",
+        "nextBillingDate": "Prochaine date de facturation",
+        "planLimit": "Facturé pour un forfait de {{planLimit}}",
+        "subscription": "Abonnement",
+        "lifetimeSubscription": {
+          "planType": "Durée de vie",
+          "text": "Pas de facturation à venir"
+        },
+        "freeSubscription": {
+          "planType": "Gratuit",
+          "action": "Mise à niveau",
+          "actionDescription": "Augmentez votre espace de stockage et bénéficiez de plus de fonctionnalités"
+        },
+        "paymentMethod": {
+          "title": "Mode de paiement",
+          "editButton": "Modifier le mode de paiement",
+          "freePlanTitle": "Vous êtes sur un plan gratuit de {{planLimit}}",
+          "addButton": "Ajouter une méthode de paiement",
+          "empty": "Aucun mode de paiement associé"
+        },
+        "cancelSubscription": {
+          "title": "Annuler l'abonnement",
+          "text": "Votre plan sera rétrogradé au niveau gratuit.",
+          "button": "Annuler l'abonnement"
+        },
+        "empty": {
+          "text": "Pas de factures antérieures"
+        }
+      }
+    },
+    "account": {
+      "title": "Account",
+      "inviteFriend": "Inviter un ami",
+      "seeInvitations": "Voir les invitations",
+      "sendInvitationDescription": "Faites passer le mot et obtenez 1 Go par ami invité gratuitement. Vous pouvez obtenir jusqu'à {{N}}GB au total.",
+      "sendInvitation": "Envoyer une invitation",
+      "enterFriendEmail": "Entrer l'e-mail de l'ami",
+      "extraStorage": "Espace de stockage supplémentaire",
+      "invitedFriends": "Amis invités",
+      "friendsInvited": "Amis invités",
+      "acceptedRequests": "Demandes acceptées",
+      "user": "Utilisateur",
+      "status": "Statut",
+      "accepted": "Accepté",
+      "pending": "En attente",
+      "noInvitations": "Aucune invitation envoyée pour le moment",
+      "upgrade": "Mise à niveau",
+      "levelUpStorage": "Améliorez votre espace de stockage et bénéficiez de nombreux autres avantages",
+      "upgradeNow": "Mettre à niveau maintenant",
+      "emptyTrash": "Vider la corbeille",
+      "emptryTrashDescription": "Les éléments dans la corbeille seront supprimés définitivement après 15 jours",
+      "plans": {
+        "title": "Plans",
+        "current": "Actuel",
+        "upgrade": "Mettre à niveau",
+        "downgrade": "Rétrograder",
+        "free": "Obtenez jusqu'à 10 Go gratuitement",
+        "manageBilling": "Gérer la facturation",
+        "freeForever": "Gratuit pour toujours",
+        "year": "An",
+        "month": "Mois",
+        "lifetime": "Lifetime",
+        "planFeaturesList": {
+          "title": "Détails du plan",
+          "storage": " de stockage",
+          "featureOne": "Partage de fichiers et dossiers chiffrés.",
+          "featureTwo": "Partage de fichiers protégé par mot de passe.",
+          "featureThree": "Accédez à vos fichiers depuis n'importe quel appareil.",
+          "featureFour": "Téléchargez des fichiers jusqu'à 20 Go.",
+          "featureFive": "Authentification à deux facteurs (2FA).",
+          "featureSix": "Support client premium.",
+          "featureSeven": "Garantie de remboursement de 30 jours."
+        },
+        "businessPlanFeaturesList": {
+          "title": "Détails du plan",
+          "storage": " de stockage",
+          "featureOne": "Partage de fichiers et dossiers chiffrés.",
+          "featureTwo": "Créer et gérer des utilisateurs et des équipes.",
+          "featureThree": "À partir de 3 utilisateurs et jusqu'à 100.",
+          "featureFour": "Conformité au RGPD.",
+          "featureFive": "Téléchargez des fichiers jusqu'à 20 Go.",
+          "featureSix": "Gérer la facturation et les paiements du compte.",
+          "featureSeven": "Support client premium."
+        },
+        "user": "utilisateur"
+      },
+      "billing": {
+        "title": "Billing"
+      },
+      "security": {
+        "title": "Sécurité"
+      }
+    },
+    "navBarSections": {
+      "general": "Général",
+      "workspace": "Espace de travail",
+      "overview": "Aperçu",
+      "members": "Membres",
+      "teams": "Équipes",
+      "billing": "Facturation",
+      "account": "Compte",
+      "plans": "Plans",
+      "security": "Sécurité"
+    }
+  },
+  "workspaces": {
+    "workspaces": "Espaces de travail",
+    "workspace": "Espace de travail",
+    "createWorkspace": "Créer un espace de travail",
+    "workspaceTypes": {
+      "personal": "Espace de travail personnel",
+      "business": "Espace de travail professionnel"
+    },
+    "pending": "Invitations en attente",
+    "messages": {
+      "sharedSuccess": "Élément partagé avec succès avec l'équipe"
+    },
+    "pendingInvitations": {
+      "empty": "Aucune invitation restante",
+      "title": "Invitations en attente",
+      "accept": "Accepter",
+      "deny": "Refuser",
+      "invitedOn": "Invitation envoyée ",
+      "todayAt": "aujourd'hui à "
+    }
   }
 }
diff --git a/src/app/i18n/locales/index.ts b/src/app/i18n/locales/index.ts
index 552e6249f..053516a4b 100644
--- a/src/app/i18n/locales/index.ts
+++ b/src/app/i18n/locales/index.ts
@@ -6,6 +6,7 @@ import zh from './zh.json';
 import it from './it.json';
 import ru from './ru.json';
 import de from './de.json';
+import tw from './tw.json';
 
 const locales = {
   [Locale.English]: en,
@@ -15,6 +16,7 @@ const locales = {
   [Locale.Italian]: it,
   [Locale.Russian]: ru,
   [Locale.German]: de,
+  [Locale.Taiwanese]: tw,
 };
 
 export default locales;
diff --git a/src/app/i18n/locales/it.json b/src/app/i18n/locales/it.json
index cbdf5aaec..2aebeed63 100644
--- a/src/app/i18n/locales/it.json
+++ b/src/app/i18n/locales/it.json
@@ -9,19 +9,31 @@
     "cta": "Get the deal"
   },
   "featuresBanner": {
-    "label": "Risparmia il 75%",
-    "title": "Proteggi i tuoi dati dal lato oscuro",
-    "cta": "Scegli un piano",
-    "guarantee": "Garanzia di rimborso entro 30 giorni",
-    "lastCta": "*L'offerta è valida solo per gli account gratuiti o i nuovi clienti",
+    "label": {
+      "upTo": "FINO A ",
+      "discount": "80% DI SCONTO"
+    },
+    "title": "Approfitta delle offerte estive di Internxt",
+    "subtitle": {
+      "line1": "Il piano gratuito di Internxt sarà ridotto a 1GB il 1 luglio.",
+      "line2": {
+        "normal1": "Evita questo downgrade usando il codice ",
+        "blue": "FREEVIP",
+        "normal2": " per ottenere il 90% di sconto su qualsiasi piano premium."
+      }
+    },
+    "cta": "Scegli il piano",
+    "guarantee": "Garanzia di rimborso di 30 giorni",
+    "lastCta": "*L'offerta è per account gratuiti o nuovi clienti",
     "features": [
-      "Risparmia sui piani di Internxt",
+      "Risparmia su tutti i piani Internxt",
       "Archiviazione cloud sicura e protetta",
       "Open source e trasparente",
-      "Trasferimenti crittografati di estremità in estremità",
+      "Trasferimenti crittografati end-to-end",
       "Nessun accesso non autorizzato",
-      "L'offerta termina il 20 maggio"
-    ]
+      "L'offerta termina il 19 agosto"
+    ],
+    "copied": "Copiato negli appunti"
   },
   "banner": {
     "label": "Proteggi i tuoi file per sempre",
@@ -58,7 +70,8 @@
     "it": "Italiano (Italiano)",
     "zh": "简体中文 (Cinese)",
     "ru": "Русский (Russo)",
-    "de": "Deutsch (Tedesco)"
+    "de": "Deutsch (Tedesco)",
+    "zh-tw": "臺灣 (Taiwanese)"
   },
   "theme": {
     "title": "Aspetto",
@@ -196,12 +209,12 @@
     "renewalPeriod": {
       "monthly": "mensile",
       "annually": "annuale",
-      "lifetime": "a vita"
+      "lifetime": "lifetime"
     },
     "renewal": {
       "monthly": "Mensile",
       "annually": "Annuale",
-      "lifetime": "A vita"
+      "lifetime": "Lifetime"
     },
     "workspaces": {
       "personal": "Individuals",
@@ -248,7 +261,6 @@
   },
   "sideNav": {
     "drive": "Drive",
-    "photos": "Photos",
     "backups": "Backup",
     "shared": "Condiviso",
     "recents": "Recenti",
@@ -268,18 +280,12 @@
         "dragNDrop": "Trascinare e rilasciare qui o fare clic sul pulsante di caricamento"
       }
     },
-    "photos": {
-      "empty": {
-        "title": "La tua galleria è vuota",
-        "description": "Usa l'app mobile Internxt per sincronizzare le tue foto"
-      }
-    },
     "account": {
       "title": "Account",
       "avatar": {
         "title": "Carica avatar",
-        "removePhoto": "Elimina foto",
-        "updatePhoto": "Carica nuova immagine",
+        "removePhoto": "Elimina",
+        "updatePhoto": "Carica immagine",
         "dragNDrop": "Seleziona o trascina un'immagine",
         "success": "L'avatar è stato aggiornato correttamente",
         "error": "È successo qualcosa durante il caricamento del tuo avatar",
@@ -299,7 +305,6 @@
           "usage": "Usati {{totalUsed}} di {{totalSpace}}",
           "view": {
             "backups": "Backups",
-            "photos": "Photos",
             "trash": "Cestino",
             "free": {
               "planName": "Piano gratuito",
@@ -358,10 +363,10 @@
             "cta": "Apri il Centro di supporto"
           },
           "deleteAccount": {
-            "head": "Elimina l'account",
-            "description": "Se elimini il tuo account, i tuoi dati verranno cancellati per sempre. Questa azione non può essere annullata.",
-            "isSubscribed": "Annullare prima l'abbonamento",
-            "confirmationEmail": "L'e-mail di conferma è stata inviata"
+            "head": "Elimina account",
+            "description": "Tutti i tuoi dati personali e tutto ciò che hai caricato su Internxt verranno cancellati per sempre. Una volta che elimini il tuo account, non c'è più possibilità di tornare indietro. Per favore, assicurati.",
+            "isSubscribed": "Si prega di cancellare prima la sottoscrizione",
+            "confirmationEmail": "Email di conferma inviata"
           }
         },
         "billing": {
@@ -404,7 +409,9 @@
           "invoices": {
             "head": "Fatture",
             "plan": "Piano",
-            "billingDate": "Data Fattura",
+            "billingDate": "Data",
+            "storage": "Archiviazione",
+            "ammount": "Importo",
             "empty": {
               "title": "Hai un piano gratuito",
               "subtitle": "Qui appariranno automaticamente le fatture emesse quando viene effettuato un pagamento."
@@ -482,7 +489,7 @@
             },
             "button": {
               "back": "Mantieni il piano attuale",
-              "continue": "Cambia piano"
+              "continue": "Continua"
             }
           }
         },
@@ -519,21 +526,21 @@
           },
           "changePassword": {
             "title": "Modifica la password",
-            "description": "Ricorda che se dimentichi la password, perderai l'accesso a tutti i tuoi file. Ti consigliamo di utilizzare un gestore di password.",
+            "description": "Non memorizziamo le password; se perdete la password, perderete l'accesso al vostro account Internxt.",
             "button": "Modifica la password"
           },
           "2FA": {
-            "title": "Autenticazione a due fattori (2FA)",
+            "title": "Autenticazione a due fattori",
             "titleDisable": "Disattivare l'autenticazione a due fattori",
-            "description": "L'autenticazione a due fattori fornisce un maggiore livello di sicurezza, richiedendo un’ulteriore verifica al momento dell'accesso. Oltre alla tua password, avrai bisogno di inserire un codice usa-e-getta generato al momento.",
-            "button": "Attiva la 2FA",
-            "disable": "Disabilitare 2FA",
+            "description": "Aggiungi un ulteriore livello di sicurezza richiedendo un ulteriore codice di verifica al momento dell'accesso.",
+            "button": "Abilita",
+            "disable": "Disabilitare",
             "enabled": "Abilitato",
             "disabled": "Disabilitato",
             "modal": {
               "title": "Autenticazione a due fattori",
               "stepsLabel": "{{current}} di {{total}}",
-              "button": "Attiva la 2FA",
+              "button": "Abilita",
               "2FALabelCode": "Codice di Autenticazione in due passaggi",
               "or": "O",
               "steps": {
@@ -566,7 +573,7 @@
           },
           "backupKey": {
             "title": "Recovery Key",
-            "description": "Se si dimentica la password, è possibile utilizzare una chiave di backup unica per recuperare il proprio account. Non condividete mai questo codice con nessuno.",
+            "description": "La chiave di backup consente di recuperare l'account nel caso in cui si dimentichi la password. Non condividetela mai.",
             "button": "Esporta la password",
             "success": "Recovery key scaricata correttamente",
             "error": "Non è stato possibile generare la chiave di backup"
@@ -603,6 +610,10 @@
         "title": "Qualcosa è andato storto",
         "subtitle": "Controlla se il link è corretto o richiedi nuovamente la verifica dell'email in Impostazioni > Account",
         "cta": "Vai all'account"
+      },
+      "message": {
+        "emailNotVerifiedPartOne": "La tua email non è ancora verificata. Controlla la tua casella di posta o ",
+        "emailNotVerifiedPartTwo": "reinvia la verifica"
       }
     },
     "emailChange": {
@@ -632,6 +643,36 @@
     "redirectToApp": {
       "message": "Thank you",
       "goToApp": "Go back to app"
+    },
+    "preferences": {
+      "workspace": {
+        "overview": {
+          "edit": "Modifica profilo",
+          "address": "Indirizzo",
+          "phone": "Telefono",
+          "owner": "Proprietario",
+          "workspaceOverview": "Panoramica dello spazio di lavoro",
+          "members": "Membri",
+          "teams": "Team",
+          "billed": "Fatturato il {{renewDate}}",
+          "spaceUsed": "Spazio utilizzato ({{percentageUsed}}%)",
+          "totalSpace": "Spazio totale",
+          "editOverviewDetails": {
+            "title": "Dettagli del profilo",
+            "cancelButton": "Annulla",
+            "saveButton": "Salva modifiche"
+          },
+          "errors": {
+            "minNameLength": "Il nome dell'azienda deve contenere almeno 3 caratteri"
+          }
+        },
+        "billing": {
+          "editBilling": "Modifica fatturazione",
+          "billingDetails": "Dettagli della fatturazione",
+          "updatedBillingDetails": "Dettagli aggiornati con successo",
+          "errorUpdatingBillingDetails": "Si è verificato un errore durante l'aggiornamento dei tuoi dettagli. Riprova tra qualche minuto"
+        }
+      }
     }
   },
   "contextMenu": {
@@ -810,32 +851,6 @@
       "sharedWith": "Condiviso con te ",
       "todayAt": "oggi alle "
     },
-    "deletePhotosModal": {
-      "multiToolBar": "file selezionati",
-      "singleToolBar": "file selezionati",
-      "multiTitle": "Eliminare i {{item}} file selezionati?",
-      "singleTitle": "Eliminare i {{item}} file selezionati?",
-      "subtitle": "Non è possibile annullare l'azione",
-      "buttons": {
-        "cancel": "Annulla",
-        "delete": "Elimina"
-      }
-    },
-    "sharePhotosModal": {
-      "singleTitle": "Condividi {{item}} foto",
-      "multiTitle": "Condividi {{item}} foto",
-      "options": "Opzioni link",
-      "limit": "Limita il numero di volte che il link può essere aperto",
-      "openCount": "Limite apertura",
-      "times": "volte",
-      "change": "Modifica",
-      "buttons": {
-        "cancel": "Annulla",
-        "create": "Creazione collegamento",
-        "creating": "Creare un collegamento...",
-        "copyLink": "Copia link"
-      }
-    },
     "friendsInvitedModal": {
       "title": "Amici invitati",
       "email": "E-mail",
@@ -928,7 +943,6 @@
     "emptyPassword": "La password precedente non deve essere vuota",
     "errorMovingToTrash": "Si è verificato un errore durante lo spostamento degli elementi nel cestino.",
     "errorDeletingFromTrash": "Si è verificato un errore durante l'eliminazione degli elementi dal cestino.",
-    "braveNotSupportMultiplePhotosDowload": "Brave non supporta il download di più foto.",
     "maxSizeUploadLimitError": "File troppo grande (superiore a 20GB)",
     "connectionLostError": "Connessione Internet persa",
     "errorLoadingTrashItems": "Errore nel caricamento degli elementi del cestino"
@@ -1075,15 +1089,6 @@
       },
       "errors": {}
     },
-    "download-photos": {
-      "status": {
-        "pending": "Download di {{progress}}%",
-        "success": "Scaricato",
-        "error": "Error during download",
-        "cancelled": "Download annullato"
-      },
-      "errors": {}
-    },
     "download-backup": {
       "status": {
         "pending": "In attesa di download",
@@ -1174,7 +1179,7 @@
     "twoFactorAuthDisabled": "L'autenticazione a due fattori è stata disattivata",
     "joinedToTheTeam": "Ti sei unito al team con successo",
     "done": "Fatto",
-    "inviteAFriend": "È stato inviato un invito a {{email}}",
+    "inviteAFriend": "Invitation envoyée à {{email}}",
     "subscribeToNewsletter": "{{email}} si è iscritto con successo alla newsletter"
   },
   "shareItemDialog": {
@@ -1277,6 +1282,7 @@
     "dropdown": {
       "openPreview": "Anteprima aperta",
       "shareLink": "Condividi",
+      "shareTeam": "Condividi con il team",
       "getLink": "Ottenere link",
       "rename": "Rinomina",
       "download": "Scarica",
@@ -1402,5 +1408,253 @@
       "title": "File non trovato",
       "description": "Assicuratevi che l'URL sia corretto e che il file non sia stato spostato o cancellato."
     }
+  },
+  "preferences": {
+    "title": "Preferenze",
+    "general": {
+      "title": "Generale"
+    },
+    "workspace": {
+      "title": "Spazio di lavoro",
+      "overview": {
+        "title": "Panoramica"
+      },
+      "members": {
+        "title": "Membri",
+        "members": "Membri",
+        "guests": "Ospiti",
+        "search": "Cerca membri",
+        "invite": "Invita",
+        "inviteDialog": {
+          "title": "Invita allo spazio di lavoro",
+          "inputDescription": "Premi Invio, Spazio o Virgola per separare gli indirizzi email",
+          "remove": "Rimuovi",
+          "inviteUsersDescription": "Gli utenti senza un account Internxt riceveranno un'email per registrarsi prima di unirsi allo spazio di lavoro.",
+          "enterUserEmail": "Inserisci l'email dell'utente da invitare",
+          "addMessage": "Aggiungi messaggio",
+          "invite": "Invita"
+        },
+        "invitationFlow": {
+          "acceptedSuccessfully": "Invito allo spazio di lavoro accettato con successo",
+          "declinedSuccessfully": "Invito allo spazio di lavoro rifiutato con successo",
+          "invitationSent": "Invito inviato con successo",
+          "error": {
+            "errorInviting": "Errore nell'invio dell'invito a {{email}}",
+            "acceptedError": "Errore nell'accettare l'invito allo spazio di lavoro",
+            "declinedError": "Errore nel rifiutare l'invito allo spazio di lavoro"
+          }
+        },
+        "list": {
+          "user": "Utente",
+          "usage": "Utilizzo",
+          "storage": "Archiviazione"
+        },
+        "role": {
+          "owner": "Proprietario",
+          "manager": "Manager",
+          "member": "Membro",
+          "deactivated": "Disattivato"
+        },
+        "deactivationModal": {
+          "title": "Disattiva membro",
+          "description": "{{name}} perderà l'accesso allo spazio di lavoro. Tutti i loro file e cartelle rimarranno gli stessi.",
+          "deactivate": "Disattiva",
+          "deactivating": "Disattivazione in corso"
+        },
+        "reactivationModal": {
+          "title": "Riattiva membro",
+          "description": "{{name}} riacquisterà l'accesso allo spazio di lavoro.",
+          "reactivate": "Riattiva",
+          "reactivating": "Riattivazione"
+        },
+        "changePasswordModal": {
+          "title": "Richiedi cambio password",
+          "description": "L'utente riceverà una raccomandazione per aggiornare la password del proprio account personale. Utilizza questa funzione se ritieni che la sua password possa essere stata compromessa.",
+          "inputPlaceholder": "Inserisci il testo del messaggio (opzionale)",
+          "actionButton": "Invia richiesta"
+        },
+        "tabs": {
+          "activity": {
+            "name": "Attività",
+            "empty": "Nessuna attività",
+            "disabilitedOwner": {
+              "title": "Iniziare con l'attività",
+              "subtitle": "Chiari approfondimenti sull'uso per la gestione di file e account con la registrazione dei registri di attività",
+              "action": "Abilita attività"
+            },
+            "disabilitedMember": {
+              "title": "L'attività è disabilitata",
+              "subtitle": "Contattare il proprietario dell'area di lavoro per abilitare i registri delle attività per la gestione dei file e degli account"
+            },
+            "roles": {
+              "title": "Ruoli",
+              "member": "Membro",
+              "manager": "Manager",
+              "owner": "Proprietario"
+            },
+            "filter": {
+              "button": "Filtro",
+              "title": "Filtri",
+              "clear": "Clear",
+              "dateRange": {
+                "title": "Intervallo di date",
+                "7days": "Ultimi 7 giorni",
+                "30days": "Ultimi 30 giorni",
+                "90days": "Ultimi 90 giorni"
+              }
+            }
+          },
+          "teams": {
+            "title": "Squadre",
+            "role": "Role",
+            "emptyTeamsOwner": {
+              "title": "Iniziare con i team",
+              "subtitle": "Gestisci più velocemente i membri dello spazio di lavoro raggruppandoli in team",
+              "action": "Crea un team"
+            },
+            "emptyTeamsMember": {
+              "title": "Nessuna squadra ancora creata",
+              "subtitle": "Il proprietario dello spazio di lavoro può gestire i membri più velocemente raggruppandoli in team"
+            },
+            "emptyTeams": {
+              "title": "Non è membro di alcun team"
+            }
+          }
+        },
+        "actions": {
+          "deactivate": "Disattiva membro",
+          "reactivate": "Riattiva membro",
+          "passwordChange": "Richiedi la modifica della password"
+        }
+      },
+      "teams": {
+        "title": "Squadre"
+      },
+      "billing": {
+        "title": "Fatturazione",
+        "nextBillingDate": "Prossima data di fatturazione",
+        "planLimit": "Fatturato per un piano da {{planLimit}}",
+        "subscription": "Abbonamento",
+        "lifetimeSubscription": {
+          "planType": "Durata della vita",
+          "text": "Nessuna fatturazione imminente"
+        },
+        "freeSubscription": {
+          "planType": "Gratuito",
+          "action": "Aggiornamento",
+          "actionDescription": "Aumenta lo spazio di archiviazione e ottieni più funzioni"
+        },
+        "paymentMethod": {
+          "title": "Metodo di pagamento",
+          "editButton": "Modifica metodo di pagamento",
+          "freePlanTitle": "Sei su un piano gratuito di {{planLimit}}",
+          "addButton": "Aggiungi metodo di pagamento",
+          "empty": "Nessun metodo di pagamento associato"
+        },
+        "cancelSubscription": {
+          "title": "Annullamento dell'abbonamento",
+          "text": "Il vostro piano sarà declassato al livello gratuito.",
+          "button": "Annullamento dell'abbonamento"
+        },
+        "empty": {
+          "text": "Nessuna fattura precedente"
+        }
+      }
+    },
+    "account": {
+      "title": "Conto",
+      "inviteFriend": "Invita un amico",
+      "seeInvitations": "Vedi Inviti",
+      "sendInvitationDescription": "Diffondi la voce e ottieni 1 GB per ogni amico invitato gratuitamente. Puoi ottenere fino a {{N}}GB in totale.",
+      "sendInvitation": "Invia invito",
+      "enterFriendEmail": "Inserisci l'email dell'amico",
+      "extraStorage": "Spazio di archiviazione extra",
+      "invitedFriends": "Amici invitati",
+      "friendsInvited": "Amici invitati",
+      "acceptedRequests": "Richieste accettate",
+      "user": "Utente",
+      "status": "Stato",
+      "accepted": "Accettato",
+      "pending": "In attesa",
+      "noInvitations": "Nessuna invito inviato ancora",
+      "upgrade": "Aggiornare",
+      "levelUpStorage": "Aumenta il tuo spazio di archiviazione e ottieni molti altri vantaggi",
+      "upgradeNow": "Aggiorna ora",
+      "emptyTrash": "Svuota cestino",
+      "emptryTrashDescription": "Gli elementi nel cestino verranno eliminati definitivamente dopo 15 giorni",
+      "plans": {
+        "title": "Piani",
+        "current": "Corrente",
+        "upgrade": "Aggiornamento",
+        "downgrade": "Retrocessione",
+        "free": "Ottieni fino a 10 GB gratis",
+        "manageBilling": "Gestisci la fatturazione",
+        "freeForever": "Gratuito per sempre",
+        "year": "Anno",
+        "month": "Mese",
+        "lifetime": "Lifetime",
+        "planFeaturesList": {
+          "title": "Dettagli del piano",
+          "storage": " di spazio di archiviazione",
+          "featureOne": "Condivisione di file e cartelle crittografati.",
+          "featureTwo": "Condivisione di file protetta da password.",
+          "featureThree": "Accedi ai tuoi file da qualsiasi dispositivo.",
+          "featureFour": "Carica file fino a 20 GB.",
+          "featureFive": "Autenticazione a due fattori (2FA).",
+          "featureSix": "Supporto clienti premium.",
+          "featureSeven": "Garanzia di rimborso di 30 giorni."
+        },
+        "businessPlanFeaturesList": {
+          "title": "Dettagli del piano",
+          "storage": " di spazio di archiviazione",
+          "featureOne": "Condivisione di file e cartelle crittografati.",
+          "featureTwo": "Crea e gestisci utenti e team.",
+          "featureThree": "A partire da 3 utenti e fino a 100.",
+          "featureFour": "Conformità GDPR.",
+          "featureFive": "Carica file fino a 20 GB.",
+          "featureSix": "Gestisci la fatturazione e i pagamenti dell'account.",
+          "featureSeven": "Supporto clienti premium."
+        },
+        "user": "utente"
+      },
+      "billing": {
+        "title": "Fatturazione"
+      },
+      "security": {
+        "title": "Security"
+      }
+    },
+    "navBarSections": {
+      "general": "Generale",
+      "workspace": "Spazio di lavoro",
+      "overview": "Panoramica",
+      "members": "Membri",
+      "teams": "Team",
+      "billing": "Fatturazione",
+      "account": "Account",
+      "plans": "Piani",
+      "security": "Sicurezza"
+    }
+  },
+  "workspaces": {
+    "workspaces": "Spazi di lavoro",
+    "workspace": "Spazio di lavoro",
+    "createWorkspace": "Crea spazio di lavoro",
+    "workspaceTypes": {
+      "personal": "Spazio di lavoro personale",
+      "business": "Spazio di lavoro aziendale"
+    },
+    "pending": "Inviti in sospeso",
+    "messages": {
+      "sharedSuccess": "Elemento condiviso con successo con il team"
+    },
+    "pendingInvitations": {
+      "empty": "Nessun invito rimasto",
+      "title": "Inviti in sospeso",
+      "accept": "Accetta",
+      "deny": "Rifiuta",
+      "invitedOn": "Invito inviato ",
+      "todayAt": "oggi alle "
+    }
   }
 }
diff --git a/src/app/i18n/locales/ru.json b/src/app/i18n/locales/ru.json
index 0af25187b..16bacf173 100644
--- a/src/app/i18n/locales/ru.json
+++ b/src/app/i18n/locales/ru.json
@@ -9,19 +9,31 @@
     "cta": "Получить скидку"
   },
   "featuresBanner": {
-    "label": "Сэкономьте 75%",
-    "title": "Защитите свои данные от темной стороны",
+    "label": {
+      "upTo": "ДО ",
+      "discount": "СКИДКА 80%"
+    },
+    "title": "Летнее предложение от Internxt",
+    "subtitle": {
+      "line1": "Бесплатный план Internxt будет сокращен до 1 ГБ 1 июля.",
+      "line2": {
+        "normal1": "Избегите этого понижения, используя код ",
+        "blue": "FREEVIP",
+        "normal2": " чтобы получить скидку 90% на любой премиум-план."
+      }
+    },
     "cta": "Выберите план",
-    "guarantee": "Гарантия возврата денег в течение 30 дней",
-    "lastCta": "*Предложение действует только для бесплатных аккаунтов или новых клиентов",
+    "guarantee": "30-дневная гарантия возврата денег",
+    "lastCta": "*Предложение действительно для бесплатных аккаунтов или новых клиентов",
     "features": [
-      "Экономьте на планах Internxt",
-      "Безопасное и надежное облачное хранилище",
-      "Открытый и прозрачный исходный код",
-      "Шифрованные передачи от конца к концу",
+      "Экономьте на всех планах Internxt",
+      "Безопасное и защищенное облачное хранилище",
+      "Открытый исходный код и прозрачность",
+      "Шифрование передачи данных от конца до конца",
       "Нет несанкционированного доступа",
-      "Предложение заканчивается 20 мая"
-    ]
+      "Предложение действует до 19 августа"
+    ],
+    "copied": "Скопировано в буфер обмена"
   },
   "banner": {
     "label": "Защитите свои файлы навсегда",
@@ -37,7 +49,8 @@
     "it": "Italiano (Итальянский)",
     "zh": "简体中文 (Китайский)",
     "ru": "Русский (Русский)",
-    "de": "Deutsch (Немецкий)"
+    "de": "Deutsch (Немецкий)",
+    "zh-tw": "臺灣 (Тайваньский)"
   },
   "theme": {
     "title": "Внешний вид",
@@ -46,7 +59,6 @@
     "system": "Система",
     "starwars": "Star Wars"
   },
-
   "auth": {
     "email": "Email",
     "password": "Password",
@@ -180,12 +192,12 @@
     "renewalPeriod": {
       "monthly": "ежемесячно",
       "annually": "ежегодно",
-      "lifetime": "Пожизненно"
+      "lifetime": "Lifetime"
     },
     "renewal": {
       "monthly": "Ежемесячно",
       "annually": "Ежегодно",
-      "lifetime": "Пожизненно"
+      "lifetime": "Lifetime"
     },
     "workspaces": {
       "personal": "Индивидуальные",
@@ -232,7 +244,6 @@
   },
   "sideNav": {
     "drive": "Drive",
-    "photos": "Photos",
     "backups": "Резервные копии",
     "shared": "Общий",
     "recents": "Недавние",
@@ -252,18 +263,12 @@
         "dragNDrop": "Перетащите сюда или нажмите на кнопку загрузки."
       }
     },
-    "photos": {
-      "empty": {
-        "title": "Фотогалерея пуста",
-        "description": "Используйте мобильное приложение Internxt для синхронизации фотографий с вашего устройства."
-      }
-    },
     "account": {
       "title": "Аккаунт",
       "avatar": {
         "title": "Загрузить фото профиля",
-        "removePhoto": "Удалить фото",
-        "updatePhoto": "Загрузить новую фотографию",
+        "removePhoto": "Удалить",
+        "updatePhoto": "Загрузить фотографию",
         "dragNDrop": "Выбрать или перетащить фотографию",
         "success": "Фото профиля успешно обновлено",
         "error": "Возникла проблема при загрузке фото профиля",
@@ -283,7 +288,6 @@
           "usage": "Использовано {{totalUsed}} из {{totalSpace}}",
           "view": {
             "backups": "Резервные копии",
-            "photos": "Фотографии",
             "мусор": "Корзина",
             "free": {
               "planName": "Бесплатный план",
@@ -343,9 +347,9 @@
           },
           "deleteAccount": {
             "head": "Удалить аккаунт",
-            "description": "Удалив ваш аккаунт, Internxt навсегда удалит ваши файлы и данные. Это действие невозможно отменить",
+            "description": "Все ваши личные данные и все, что вы загрузили в Internxt, будут удалены навсегда. После удаления вашей учетной записи вернуться нельзя. Пожалуйста, будьте уверены.",
             "isSubscribed": "Пожалуйста, сначала отмените подписку",
-            "confirmationEmail": "Подтверждающее письмо было отправлено"
+            "confirmationEmail": "Письмо с подтверждением отправлено"
           }
         },
         "billing": {
@@ -387,7 +391,9 @@
           },
           "invoices": {
             "head": "Счета",
-            "billingDate": "Дата выставления счета",
+            "billingDate": "Дата",
+            "storage": "Хранение",
+            "ammount": "Сумма",
             "empty": {
               "title": "Вы используете бесплатный тарифный план",
               "subtitle": "Выставленные счета будут появляться здесь автоматически, если у вас платный план."
@@ -465,7 +471,7 @@
             },
             "button": {
               "back": "Сохранить текущий план",
-              "continue": "Изменить план"
+              "continue": "Продолжить"
             }
           }
         },
@@ -502,20 +508,20 @@
           },
           "changePassword": {
             "title": "Изменить пароль",
-            "description": "Обязательно запомните новый пароль. Если вы забудете его, вы потеряете доступ к своим файлам. Мы настоятельно рекомендуем использовать менеджер паролей.",
+            "description": "Мы не храним пароли, и если вы потеряете свой пароль, вы потеряете доступ к своему аккаунту Internxt.",
             "button": "Изменить пароль"
           },
           "2FA": {
-            "title": "Двухфакторная аутентификация (2FA)",
+            "title": "Двухфакторная аутентификация",
             "titleDisable": "Отключить двухфакторную аутентификацию",
-            "description": "Двухфакторная аутентификация обеспечивает дополнительный уровень безопасности, требуя дополнительной проверки при входе в систему. Помимо пароля Internxt, вам также потребуется уникальный сгенерированный код, отправленный на электронную почту, которую вы использовали для регистрации аккаунта.",
-            "button": "Включить двухфакторную аутентификацию",
+            "description": "Добавьте дополнительный уровень безопасности, требуя дополнительный проверочный код при входе в систему.",
+            "button": "Включить",
             "enabled": "Включена",
             "disabled": "Отключена",
             "modal": {
               "title": "Двухфакторная аутентификация",
               "stepsLabel": "{{current}} из {{total}}",
-              "button": "Включить двухфакторную аутентификацию",
+              "button": "Включить",
               "2FALabelCode": "Код двухфакторной аутентификации",
               "or": "ИЛИ",
               "steps": {
@@ -548,7 +554,7 @@
           },
           "backupKey": {
             "title": "Резервный ключ",
-            "description": "Если вы забудете пароль, вы можете использовать уникальный резервный ключ для восстановления своей учетной записи. Никому не сообщайте этот код.",
+            "description": "Резервный ключ позволяет восстановить учетную запись в случае, если вы забыли пароль. Никогда не передавайте его.",
             "button": "Экспорт резервного ключа",
             "success": "Резервный ключ успешно загружен",
             "error": "Нам не удалось сгенерировать ваш резервный ключ"
@@ -585,6 +591,10 @@
         "title": "Что-то пошло не так",
         "subtitle": "Проверьте правильность ссылки или повторно запросите проверку электронной почты в Настройки > Аккаунт",
         "cta": "Перейти в аккаунт"
+      },
+      "message": {
+        "emailNotVerifiedPartOne": "Ваш адрес электронной почты еще не подтвержден. Пожалуйста, проверьте ваш почтовый ящик или ",
+        "emailNotVerifiedPartTwo": "отправьте подтверждение повторно"
       }
     },
     "emailChange": {
@@ -614,6 +624,36 @@
     "redirectToApp": {
       "message": "Спасибо",
       "goToApp": "Вернуться в приложение"
+    },
+    "preferences": {
+      "workspace": {
+        "overview": {
+          "edit": "Редактировать профиль",
+          "address": "Адрес",
+          "phone": "Телефон",
+          "owner": "Владелец",
+          "workspaceOverview": "Обзор рабочего пространства",
+          "members": "Участники",
+          "teams": "Команды",
+          "billed": "Оплачено по {{renewDate}}",
+          "spaceUsed": "Использованное пространство ({{percentageUsed}}%)",
+          "totalSpace": "Общее пространство",
+          "editOverviewDetails": {
+            "title": "Детали профиля",
+            "cancelButton": "Отмена",
+            "saveButton": "Сохранить изменения"
+          },
+          "errors": {
+            "minNameLength": "Название компании должно содержать не менее 3 символов"
+          }
+        },
+        "billing": {
+          "editBilling": "Изменить оплату",
+          "billingDetails": "Детали оплаты",
+          "updatedBillingDetails": "Данные успешно обновлены",
+          "errorUpdatingBillingDetails": "Произошла ошибка при обновлении ваших данных. Повторите попытку через несколько минут"
+        }
+      }
     }
   },
   "contextMenu": {
@@ -792,32 +832,6 @@
       "sharedWith": "Доступно для вас ",
       "todayAt": "сегодня в "
     },
-    "deletePhotosModal": {
-      "multiToolBar": "выбранные файлы",
-      "singleToolBar": "выбранный файл",
-      "multiTitle": "Удалить {{item}} выбранные файлы?",
-      "singleTitle": "Удалить {{item}} выбранный файл?",
-      "subtitle": "Это действие нельзя отменить",
-      "buttons": {
-        "cancel": "Отмена",
-        "deleted": "Удалить"
-      }
-    },
-    "sharePhotosModal": {
-      "singleTitle": "Поделиться {{item}} фотографией",
-      "multiTitle": "Поделиться {{item}} фотографиями",
-      "options": "Параметры ссылки",
-      "limit": "Ограничить, какое количество раз пользователи могут открывать ссылку",
-      "openCount": "Ограничение количества открытий",
-      "times": "раз",
-      "change": "Изменить",
-      "buttons": {
-        "отмена": "Отменить",
-        "создать": "Генерировать ссылку",
-        "create": "Генерация ссылки...",
-        "copyLink": "Копировать ссылку"
-      }
-    },
     "friendsInvitedModal": {
       "title": "Приглашенные друзья",
       "email": "Электронная почта",
@@ -909,7 +923,6 @@
     "emptyPassword": "Предыдущий пароль не должен быть пустым",
     "errorMovingToTrash": "При перемещении элементов в корзину произошла ошибка.",
     "errorDeletingFromTrash": "При удалении элементов из корзины произошла ошибка.",
-    "braveNotSupportMultiplePhotosDowload": "Brave не поддерживает загрузку нескольких фотографий.",
     "maxSizeUploadLimitError": "Слишком большой файл (более 20 ГБ)",
     "connectionLostError": "Потеряно подключение к Интернету",
     "errorLoadingTrashItems": "Ошибка при загрузке элементов корзины"
@@ -1056,15 +1069,6 @@
       },
       "errors": {}
     },
-    "download-photos": {
-      "status": {
-        "pending": "Загрузка {{progress}}%",
-        "success": "Загружено",
-        "error": "Ошибка во время загрузки",
-        "cancelled": "Загрузка отменена"
-      },
-      "errors": {}
-    },
     "download-backup": {
       "status": {
         "pending": "Ожидает загрузки",
@@ -1155,7 +1159,7 @@
     "twoFactorAuthDisabled": "Двухфакторная аутентификация отключена",
     "joinedToTheTeam": "Вы успешно присоединились к команде",
     "done": "Готово",
-    "inviteAFriend": "Приглашение было отправлено на {{email}}",
+    "inviteAFriend": "Приглашение отправлено на {{email}}",
     "subscribeToNewsletter": "{{email}} успешно подписан на рассылку"
   },
   "shareItemDialog": {
@@ -1257,9 +1261,11 @@
     },
     "dropdown": {
       "openPreview": "Открыть предварительный просмотр",
+      "details": "Подробности",
+      "shareLink": "Поделиться",
+      "shareTeam": "Поделиться с командой",
       "getLink": "Получить ссылку",
       "rename": "Переименовать",
-      "details": "Подробности",
       "manageLinkAccess": "Управление доступом",
       "manageAccess": "Управление доступом",
       "download": "Загрузить",
@@ -1382,5 +1388,253 @@
       "title": "Файл не найден",
       "description": "Убедитесь, что URL-адрес указан правильно и файл не был перемещен или удален."
     }
+  },
+  "preferences": {
+    "title": "предпочтения",
+    "general": {
+      "title": "Общие"
+    },
+    "workspace": {
+      "title": "Workspace",
+      "overview": {
+        "title": "Обзор"
+      },
+      "members": {
+        "title": "Участники",
+        "members": "Участники",
+        "guests": "Гости",
+        "search": "Поиск участников",
+        "invite": "Пригласить",
+        "inviteDialog": {
+          "title": "Пригласить в рабочее пространство",
+          "inputDescription": "Нажмите Enter, пробел или запятую для разделения адресов электронной почты",
+          "remove": "Удалить",
+          "inviteUsersDescription": "Пользователи без учетной записи Internxt получат электронное письмо с приглашением зарегистрироваться перед присоединением к рабочему пространству.",
+          "enterUserEmail": "Введите адрес электронной почты пользователя для приглашения",
+          "addMessage": "Добавить сообщение",
+          "invite": "Пригласить"
+        },
+        "invitationFlow": {
+          "acceptedSuccessfully": "Приглашение в рабочее пространство успешно принято",
+          "declinedSuccessfully": "Приглашение в рабочее пространство успешно отклонено",
+          "invitationSent": "Приглашение успешно отправлено",
+          "error": {
+            "errorInviting": "Ошибка при отправке приглашения на {{email}}",
+            "acceptedError": "Ошибка при принятии приглашения в рабочее пространство",
+            "declinedError": "Ошибка при отклонении приглашения в рабочее пространство"
+          }
+        },
+        "list": {
+          "user": "Пользователь",
+          "usage": "Использование",
+          "storage": "Хранилище"
+        },
+        "role": {
+          "owner": "Владелец",
+          "manager": "Менеджер",
+          "member": "Участник",
+          "deactivated": "Деактивирован"
+        },
+        "deactivationModal": {
+          "title": "Деактивировать участника",
+          "description": "{{name}} потеряет доступ к Рабочему пространству. Все их файлы и папки останутся неизменными.",
+          "deactivate": "Деактивировать",
+          "deactivating": "Деактивация"
+        },
+        "reactivationModal": {
+          "title": "Активировать участника",
+          "description": "{{name}} восстановит доступ к рабочему пространству.",
+          "reactivate": "Активировать",
+          "reactivating": "Активирую"
+        },
+        "changePasswordModal": {
+          "title": "Запрос на изменение пароля",
+          "description": "Пользователь получит рекомендацию обновить пароль своей личной учетной записи. Используйте эту функцию, если считаете, что его пароль мог быть скомпрометирован.",
+          "inputPlaceholder": "Введите текст вашего сообщения (необязательно)",
+          "actionButton": "Отправить запрос"
+        },
+        "tabs": {
+          "activity": {
+            "name": "Деятельность",
+            "empty": "Нет активности",
+            "disabilitedOwner": {
+              "title": "Начните работать с Активити",
+              "subtitle": "Понятное использование для управления файлами и учетными записями с помощью записи журнала активности",
+              "action": "Включить активность"
+            },
+            "disabilitedMember": {
+              "title": "Активность отключена",
+              "subtitle": "Свяжитесь с владельцем рабочего пространства, чтобы включить журналы активности для управления файлами и учетными записями"
+            },
+            "roles": {
+              "title": "Роли",
+              "member": "Член",
+              "manager": "Менеджер",
+              "owner": "Владелец"
+            },
+            "filter": {
+              "button": "Фильтр",
+              "title": "Фильтры",
+              "clear": "Очистить",
+              "dateRange": {
+                "title": "Диапазон дат",
+                "7days": "Последние 7 дней",
+                "30days": "Последние 30 дней",
+                "90days": "Последние 90 дней"
+              }
+            }
+          },
+          "teams": {
+            "title": "Команды",
+            "role": "роль",
+            "emptyTeamsOwner": {
+              "title": "Начните работать с командами",
+              "subtitle": "Управляйте участниками рабочего пространства быстрее, объединяя их в команды",
+              "action": "Создать команду"
+            },
+            "emptyTeamsMember": {
+              "title": "Команды еще не созданы",
+              "subtitle": "Владелец рабочего пространства может быстрее управлять участниками, объединяя их в команды"
+            },
+            "emptyTeams": {
+              "title": "Не является членом какой-либо команды"
+            }
+          }
+        },
+        "actions": {
+          "deactivate": "Деактивировать участника",
+          "reactivate": "Активировать участника",
+          "passwordChange": "Запросить смену пароля"
+        }
+      },
+      "teams": {
+        "title": "Команды"
+      },
+      "billing": {
+        "title": "Биллинг",
+        "nextBillingDate": "Следующая дата выставления счета",
+        "planLimit": "Выставлен счет за план {{planLimit}}",
+        "subscription": "Подписка",
+        "lifetimeSubscription": {
+          "planType": "Пожизненная",
+          "text": "Никаких предстоящих счетов"
+        },
+        "freeSubscription": {
+          "planType": "Бесплатно",
+          "action": "Обновление",
+          "actionDescription": "Увеличьте объем памяти и получите больше возможностей"
+        },
+        "paymentMethod": {
+          "title": "Способ оплаты",
+          "editButton": "Редактировать способ оплаты",
+          "freePlanTitle": "Вы находитесь на бесплатном тарифном плане {{planLimit}}",
+          "addButton": "Добавить способ оплаты",
+          "empty": "Ни один способ оплаты не связан"
+        },
+        "cancelSubscription": {
+          "title": "Отменить подписку",
+          "text": "Ваш план будет понижен до бесплатного уровня.",
+          "button": "Отменить подписку"
+        },
+        "empty": {
+          "text": "Отсутствие предыдущих счетов-фактур"
+        }
+      }
+    },
+    "account": {
+      "title": "аккаунт",
+      "inviteFriend": "Пригласить друга",
+      "seeInvitations": "Просмотреть приглашения",
+      "sendInvitationDescription": "Расскажите друзьям и получите 1 ГБ за каждого приглашенного друга бесплатно. Вы можете получить до {{N}}GB в общей сложности.",
+      "sendInvitation": "Отправить приглашение",
+      "enterFriendEmail": "Введите электронную почту друга",
+      "extraStorage": "Дополнительное хранилище",
+      "invitedFriends": "Приглашенные друзья",
+      "friendsInvited": "Приглашенные друзья",
+      "acceptedRequests": "Принятые запросы",
+      "user": "Пользователь",
+      "status": "Статус",
+      "accepted": "Принят",
+      "pending": "В ожидании",
+      "noInvitations": "Пока нет отправленных приглашений",
+      "upgrade": "Улучшить",
+      "levelUpStorage": "Увеличьте свое пространство хранения и получите множество других преимуществ",
+      "upgradeNow": "Обновить сейчас",
+      "emptyTrash": "Очистить корзину",
+      "emptryTrashDescription": "Элементы в корзине будут удалены навсегда через 15 дней",
+      "plans": {
+        "title": "Тарифы",
+        "current": "Текущий",
+        "upgrade": "Повысить",
+        "downgrade": "Понизить",
+        "free": "Получите бесплатно до 10 ГБ",
+        "manageBilling": "Управление платежами",
+        "freeForever": "Бесплатно навсегда",
+        "year": "Год",
+        "month": "Месяц",
+        "lifetime": "Lifetime",
+        "planFeaturesList": {
+          "title": "Детали плана",
+          "storage": " хранилища",
+          "featureOne": "Шифрованное совместное использование файлов и папок.",
+          "featureTwo": "Совместное использование файлов с защитой паролем.",
+          "featureThree": "Доступ к файлам с любого устройства.",
+          "featureFour": "Загрузка файлов до 20 ГБ.",
+          "featureFive": "Двухфакторная аутентификация (2FA).",
+          "featureSix": "Премиум поддержка клиентов.",
+          "featureSeven": "30-дневная гарантия возврата денег."
+        },
+        "businessPlanFeaturesList": {
+          "title": "Детали плана",
+          "storage": " хранилища",
+          "featureOne": "Шифрованное совместное использование файлов и папок.",
+          "featureTwo": "Создание и управление пользователями и командами.",
+          "featureThree": "От 3 до 100 пользователей.",
+          "featureFour": "Соответствие GDPR.",
+          "featureFive": "Загрузка файлов до 20 ГБ.",
+          "featureSix": "Управление оплатой и счетами.",
+          "featureSeven": "Премиум поддержка клиентов."
+        },
+        "user": "пользователь"
+      },
+      "billing": {
+        "title": "Биллинг"
+      },
+      "security": {
+        "title": "Безопасность"
+      }
+    },
+    "navBarSections": {
+      "general": "Общее",
+      "workspace": "Рабочее пространство",
+      "overview": "Обзор",
+      "members": "Участники",
+      "teams": "Команды",
+      "billing": "Оплата",
+      "account": "Аккаунт",
+      "plans": "Планы",
+      "security": "Безопасность"
+    }
+  },
+  "workspaces": {
+    "workspaces": "Рабочие пространства",
+    "workspace": "Рабочее пространство",
+    "createWorkspace": "Создать рабочее пространство",
+    "workspaceTypes": {
+      "personal": "Персональное рабочее пространство",
+      "business": "Бизнес-рабочее пространство"
+    },
+    "pending": "Ожидающие приглашения",
+    "messages": {
+      "sharedSuccess": "Элемент успешно поделился с командой"
+    },
+    "pendingInvitations": {
+      "empty": "Нет оставшихся приглашений",
+      "title": "Ожидающие приглашения",
+      "accept": "Принять",
+      "deny": "Отклонить",
+      "invitedOn": "Приглашение отправлено ",
+      "todayAt": "сегодня в "
+    }
   }
 }
diff --git a/src/app/i18n/locales/tw.json b/src/app/i18n/locales/tw.json
new file mode 100644
index 000000000..2e8c5193e
--- /dev/null
+++ b/src/app/i18n/locales/tw.json
@@ -0,0 +1,1630 @@
+{
+  "mobileView": {
+    "title": "在應用程式中管理你的文件、帳戶和訂閱",
+    "logOut": "登出"
+  },
+  "featuresBanner": {
+    "label": {
+      "upTo": "高達 ",
+      "discount": "80% 折扣"
+    },
+    "title": "享受 Internxt 的夏季優惠",
+    "subtitle": {
+      "line1": "Internxt 的免費計劃將於 7 月 1 日減少到 1GB。",
+      "line2": {
+        "normal1": "使用代碼 ",
+        "blue": "FREEVIP",
+        "normal2": " 來繞過此降級，享受任何高級計劃 90% 的折扣。"
+      }
+    },
+    "cta": "選擇計劃",
+    "guarantee": "30天退款保證",
+    "lastCta": "*優惠僅限於免費帳戶或新客戶",
+    "features": [
+      "所有 Internxt 計劃均可享受優惠",
+      "安全可靠的雲存儲",
+      "開源和透明",
+      "端到端加密傳輸",
+      "無未經授權的訪問",
+      "優惠截止至8月19日"
+    ],
+    "copied": "已複製到剪貼板"
+  },
+  "valentinesBanner": {
+    "title": "愛無極限！",
+    "subtitle": "使用代碼 VDAY 獲得我們 2TB 方案九折優惠",
+    "cta": "獲得優惠"
+  },
+  "banner": {
+    "label": "永久保護你的文件",
+    "title": "使用 Internxt 獲得安全、私人雲端存儲的終身訪問權！",
+    "cta": "選擇你的方案",
+    "guarantee": "30 天退款保證"
+  },
+  "notFound": {
+    "header": "錯誤 404",
+    "title": "此處無任何內容...",
+    "description": "找不到您要尋找的頁面。",
+    "card1": {
+      "title": "返回主頁",
+      "description": "返回 Internxt Drive。"
+    },
+    "card2": {
+      "title": "訪問幫助中心",
+      "description": "排除常見問題並瀏覽我們的常見問題解答。"
+    },
+    "card3": {
+      "title": "聯繫支援",
+      "description": "聯繫我們的支援團隊：hello@internxt.com。"
+    }
+  },
+  "linkExpired": {
+    "title": "鏈接已過期或已刪除",
+    "description": "您訪問的鏈接或邀請已過期或已被刪除"
+  },
+  "lang": {
+    "title": "語言",
+    "en": "English (英文)",
+    "es": "Español (西班牙文)",
+    "fr": "Français (法文)",
+    "it": "Italiano (義大利文)",
+    "zh": "简体中文 （中国)",
+    "ru": "Русский (俄文)",
+    "de": "Deutsch (德文)",
+    "tw": "繁體中文 （台灣)"
+  },
+  "theme": {
+    "title": "外觀",
+    "light": "淺色",
+    "dark": "深色",
+    "system": "系統",
+    "starwars": "星際大戰"
+  },
+  "auth": {
+    "email": "電子郵件",
+    "password": "密碼",
+    "terms1": "通過創建帳戶，",
+    "terms2": "您接受條款和條件",
+    "decrypting": "解密中...",
+    "login": {
+      "title": "登錄",
+      "forgotPwd": "忘記密碼？",
+      "dontHaveAccount": "沒有帳戶？",
+      "createAccount": "創建帳戶",
+      "2FA": "雙重身份驗證代碼",
+      "twoFactorAuthenticationCode": "雙重身份驗證代碼"
+    },
+    "signup": {
+      "title": "創建帳戶",
+      "haveAccount": "已有帳戶？",
+      "login": "登錄",
+      "encrypting": "加密中",
+      "info": {
+        "normalText": "Internxt 不存儲密碼。",
+        "boldText": "如果您忘記密碼，可以下載備份密鑰以重新獲取文件訪問權限。",
+        "cta": "了解更多"
+      }
+    },
+    "downloadBackupKey": {
+      "title": "備份金鑰",
+      "description": "備份金鑰可以在您忘記密碼的情況下恢復帳戶。切勿分享它。",
+      "downloadCta": "下載備份金鑰",
+      "settingsTab": "您可以在設置 > 安全中訪問您的備份金鑰",
+      "skip": "跳過"
+    },
+    "forgotPassword": {
+      "title": "帳戶恢復",
+      "continue": "繼續",
+      "sending": "發送中...",
+      "notFound": "找不到電子郵件地址，請再試一次",
+      "password": "記得您的密碼嗎？",
+      "login": "登錄",
+      "successTitle": "檢查您的收件箱",
+      "successDescription": "我們已向您發送了一個一次性鏈接來恢復您的帳戶密碼",
+      "invalidEmail": "無效的電子郵件地址"
+    },
+    "recoverAccount": {
+      "title": "帳戶恢復",
+      "subtitle": "您有備份金鑰嗎？",
+      "info": "備份金鑰是什麼樣子的？",
+      "info1": "備份金鑰文件名為 'INTERNXT-BACKUP-KEY.txt'",
+      "info2": "備份金鑰長度為 24 個詞",
+      "haveKeyButton": "是的，我有備份金鑰",
+      "notKeyButton": "不，我沒有備份金鑰",
+      "backupKey": {
+        "title": "驗證備份金鑰",
+        "alert": "如果您上傳了錯誤的備份金鑰，您的數據將會被損壞，請確保您的備份金鑰是正確的。",
+        "button": "上傳備份金鑰"
+      },
+      "changePassword": {
+        "title": "更改密碼",
+        "newPassword": "新密碼",
+        "repeatNewPassword": "重複新密碼",
+        "notMatch": "密碼不匹配",
+        "submitButton": "更改密碼",
+        "notPasswordStrength": "密碼必須包含一個數字",
+        "shortPasswordStrength": "密碼必須至少有 8 個字符",
+        "warningPasswordStrength": "密碼強度弱",
+        "successPasswordStrength": "密碼強度高",
+        "serverError": "更改密碼時發生錯誤",
+        "tokenError": "驗證備份金鑰時發生錯誤",
+        "backupKeyError": "上傳的備份金鑰無效",
+        "emailSent": {
+          "title": "密碼已更改",
+          "description": "您的所有數據已重新加密，並且您的所有活動會話已登出。",
+          "redirect": "正在重定向到 Internxt Drive",
+          "button": "前往 Internxt Drive"
+        }
+      }
+    },
+    "restartAccount": {
+      "title": "重新啟動帳戶",
+      "description": "由於我們的端到端加密和零知識政策，如果沒有您的密碼或備份金鑰，您將無法訪問您的數據。",
+      "alert1": "通過重新啟動您的帳戶，您理解所有文件、照片和備份將被永久刪除。",
+      "button": "發送帳戶重啟驗證",
+      "successDescription": "您的帳戶和密碼已重置",
+      "error": "重新啟動帳戶時出現錯誤"
+    },
+    "universalLinkSuccess": {
+      "loginAs": "以...登錄",
+      "openDesktopApp": "打開桌面應用",
+      "anotherAccount": "使用其他帳戶？",
+      "login": "登錄"
+    }
+  },
+  "general": {
+    "new": "新的",
+    "of": "的",
+    "terms": "條款和條件",
+    "contactSupport": "聯絡支持",
+    "help": "需要幫助嗎？",
+    "searchBar": {
+      "oldSearchBarPlaceholder": "搜尋此資料夾",
+      "placeholder": "在 Drive 中搜尋",
+      "filters": {
+        "folder": "資料夾",
+        "pdf": "PDF",
+        "image": "圖片",
+        "video": "視頻",
+        "audio": "音頻",
+        "clear": "清除"
+      },
+      "emptyState": {
+        "title": "尋找檔案和資料夾",
+        "subtitle": "按名稱和類型搜尋"
+      },
+      "notFoundState": {
+        "title": "未找到結果",
+        "subtitle": "沒有與搜尋匹配的檔案或資料夾"
+      }
+    },
+    "stage": {
+      "development": "開發",
+      "production": "生產"
+    },
+    "loading": {
+      "default": "加載中...",
+      "redirecting": "重定向中..."
+    },
+    "renewalPeriod": {
+      "monthly": "每月",
+      "annually": "每年",
+      "lifetime": "終身"
+    },
+    "renewal": {
+      "monthly": "每月",
+      "annually": "每年",
+      "lifetime": "終身"
+    },
+    "workspaces": {
+      "personal": "個人",
+      "business": "商業"
+    },
+    "time": {
+      "month": "月"
+    },
+    "billing": {
+      "billedEachPeriod": "{{price}} {{period}} 計費",
+      "oneTimePayment": "一次性付款"
+    },
+    "files": "檔案",
+    "file": "檔案",
+    "folder": "資料夾",
+    "reloadPageMessage": "您所做的更改可能尚未保存。"
+  },
+  "shareLayout": {
+    "title": "我們是 INTERNXT",
+    "subtitle": "具有無與倫比隱私的安全雲端儲存",
+    "labels": {
+      "privacy": "設計隱私",
+      "open-source": "開源和透明",
+      "military-grade": "軍事級加密",
+      "zero-knowledge": "零知識技術"
+    },
+    "tryInternxt": "試用 Internxt",
+    "topBar": {
+      "drive": "前往 Internxt Drive",
+      "downloadApp": "下載桌面應用程式",
+      "logout": "登出",
+      "login": "登入",
+      "createAccount": "建立帳戶",
+      "getStarted": "開始使用"
+    }
+  },
+  "shareItemPwdView": {
+    "title": "此連結受密碼保護",
+    "putPwd": "請輸入提供的密碼",
+    "putPwd1": "由發送者提供以進行訪問。",
+    "password": "密碼",
+    "pwdLayout": "密碼",
+    "access": "訪問"
+  },
+  "sideNav": {
+    "drive": "雲端硬碟",
+    "backups": "備份",
+    "shared": "共享",
+    "recents": "最近",
+    "trash": "垃圾桶",
+    "desktop": "桌面"
+  },
+  "views": {
+    "recents": {
+      "head": "Recents",
+      "empty": {
+        "title": "沒有可用的最近檔案",
+        "description": "新上傳和最近開啟的檔案將自動顯示在這裡",
+        "folderEmpty": "此資料夾為空",
+        "folderEmptySubtitle": "拖放檔案或選擇單個檔案進行上傳",
+        "uploadFiles": "上傳檔案",
+        "noResults": "沒有找到匹配的結果",
+        "dragNDrop": "拖放至此或點擊上傳按鈕"
+      }
+    },
+    "account": {
+      "title": "帳戶",
+      "avatar": {
+        "title": "上傳頭像",
+        "removePhoto": "刪除照片",
+        "updatePhoto": "上傳新照片",
+        "dragNDrop": "選擇或拖放圖片",
+        "success": "頭像已成功更新",
+        "error": "上傳頭像時發生錯誤",
+        "removed": "頭像成功刪除",
+        "underLimitSize": "請選擇大小在 10MB 以下的圖片"
+      },
+      "popover": {
+        "downloadApp": "下載應用程式",
+        "settings": "設定",
+        "logout": "登出",
+        "spaceUsed": "已使用 {{space}}% 的空間"
+      },
+      "tabs": {
+        "account": {
+          "label": "帳戶",
+          "title": "個人",
+          "usage": "已使用 {{totalUsed}} / {{totalSpace}}",
+          "view": {
+            "backups": "備份",
+            "trash": "垃圾桶",
+            "free": {
+              "planName": "免費計劃",
+              "button": "升級"
+            },
+            "lifetime": {
+              "planName": "終身"
+            },
+            "subscription": {
+              "planName": "訂閱",
+              "button": "更改",
+              "yearly": "年",
+              "monthly": "月"
+            }
+          },
+          "accountDetails": {
+            "head": "帳戶詳情",
+            "name": "名字",
+            "lastname": "姓氏",
+            "card": {
+              "name": "名字",
+              "lastname": "姓氏",
+              "edit": "編輯",
+              "email": "電子郵件",
+              "resendEmail": "重新發送驗證郵件"
+            },
+            "verify": {
+              "verify": "驗證您的電子郵件",
+              "verified": "已驗證電子郵件",
+              "description": "檢查您的收件箱"
+            },
+            "editProfile": {
+              "title": "編輯帳戶詳情",
+              "name": "名字",
+              "lastname": "姓氏",
+              "updatedProfile": "帳戶詳情已成功更新",
+              "errorUpdatingProfile": "無法更新您的帳戶詳情"
+            },
+            "changeEmail": {
+              "title": "更改電子郵件",
+              "email": "電子郵件",
+              "newEmail": "新電子郵件",
+              "password": "密碼",
+              "errorSameEmail": "新電子郵件應與當前電子郵件不同",
+              "errorPassword": "密碼錯誤，請再試一次",
+              "sendVerification": "發送驗證",
+              "sendingVerification": "正在發送驗證",
+              "sucessSendingVerification": "驗證郵件已發送至 {{email}}",
+              "errorSendingVerification": "發送驗證時出錯",
+              "confirm": "確認"
+            }
+          },
+          "support": {
+            "title": "支援",
+            "description": "瀏覽有用的文章或獲得我們團隊的協助。",
+            "cta": "打開支持中心"
+          },
+          "deleteAccount": {
+            "head": "刪除帳戶",
+            "description": "刪除帳戶後，Internxt 會永久刪除您的檔案和數據。此操作一旦開始，無法撤銷。",
+            "isSubscribed": "請先取消您的訂閱",
+            "confirmationEmail": "確認郵件已發送"
+          }
+        },
+        "billing": {
+          "label": "帳單",
+          "currentPlan": "當前計劃",
+          "subsRenew": "訂閱將在 {{daysUntilRenewal}} 天後續訂",
+          "cancelSubscriptionModal": {
+            "title": "取消訂閱",
+            "description": "您即將取消您的 {{currentPlanName}} Internxt 計劃。取消後，您將降級為免費 Internxt {{freePlanName}} 計劃。請確認以繼續。",
+            "keepSubscription": "保留訂閱",
+            "continue": "繼續",
+            "cancelSubscription": "取消訂閱",
+            "infoBox": {
+              "titleCurrent": "當前",
+              "titleNew": "新的",
+              "year": "年",
+              "month": "月",
+              "free": "免費",
+              "reachedFreeLimit": "您已超過 {{freePlanName}}",
+              "reachedFreeLimitDescription": "由於您當前使用 {{currentUsage}}，您的 Internxt Drive 將停止同步文件，並且您將無法添加新文件"
+            },
+            "giveUsFeedback": "請告訴我們為什麼您想要取消您的 {{currentPlanName}} Internxt 計劃並降級為免費計劃？",
+            "feedback": {
+              "placeholder": "給我們一些反饋"
+            },
+            "coupon": {
+              "title": "3 個月",
+              "subtitle": "免費",
+              "text1": "通過保留您的",
+              "text2": "訂閱，您將獲得接下來 3 個月的免費使用權。這是一個一次性優惠。",
+              "continue": "獲得 3 個月免費"
+            }
+          },
+          "billed": "已收費 {{interval}} {{renewDate}}",
+          "paymentMethod": {
+            "head": "付款方式",
+            "empty": {
+              "title": "您目前使用的是免費計劃",
+              "subtitle": "當您擁有付費訂閱計劃時，信用卡信息將自動顯示在這裡。"
+            },
+            "title": "添加新的付款方式",
+            "contactUs": {
+              "description": "聯繫我們以更新您的付款方式",
+              "contact": "聯絡"
+            }
+          },
+          "invoices": {
+            "head": "發票",
+            "billingDate": "賬單日期",
+            "plan": "計劃",
+            "empty": {
+              "title": "您目前使用的是免費計劃",
+              "subtitle": "當您擁有付費訂閱計劃時，已開具的發票將自動顯示在這裡。"
+            },
+            "download": "下載發票"
+          }
+        },
+        "info": {
+          "title": "個人",
+          "description": "檢查您的存儲使用情況和帳戶詳情",
+          "advice1": {
+            "title": "哪些數據可以編輯？",
+            "description": "出於嚴格的安全原因並保護您的數據，我們不允許修改用戶帳戶的數據，例如電子郵件。"
+          },
+          "advice2": {
+            "title": "安全帳戶",
+            "description": "您的文件在離開您的設備前就已加密，因此只有您能訪問您的文件，沒有任何隱藏或作弊，這就是 Internxt 的隱私保護。"
+          }
+        },
+        "plans": {
+          "label": "計劃",
+          "title": "計劃",
+          "description": "了解 Internxt 提供的不同存儲和解決方案選項",
+          "changeWorkspace": {
+            "personal": "切換到個人計劃",
+            "business": "切換到商業計劃"
+          },
+          "viewAllFeatures": "查看所有功能",
+          "card": {
+            "annually": "{{amount}} 每年收費",
+            "monthly": "{{amount}} 每月",
+            "lifetime": "{{amount}}",
+            "oneTimePayment": "一次性付款"
+          },
+          "features": {
+            "title": "所有計劃包含的功能",
+            "sections": {
+              "section1": {
+                "title": "滿意保證",
+                "point1": "所有訂閱均享有30天退款保證。",
+                "point2": "隨時取消，無任何隱藏條款。",
+                "point3": "高級支持。"
+              },
+              "section2": {
+                "title": "默認安全",
+                "point1": "軍用級加密以確保您的隱私。",
+                "point2": "加密文件存儲和共享。",
+                "point3": "零知識雲存儲。"
+              },
+              "section3": {
+                "title": "無限訪問和同步",
+                "point1": "從所有設備訪問您的文件、照片和備份。",
+                "point2": "無限帶寬同步。",
+                "point3": "備份電腦上的任何文件夾。"
+              }
+            }
+          },
+          "dialog": "更改計劃",
+          "subtitle1": "您即將將您的 Internxt 計劃從 ",
+          "subtitle2": " 更改為 ",
+          "subtitle3": "。請確認您的選擇以繼續。",
+          "plan": {
+            "current": "當前",
+            "new": "新的",
+            "interval": "月"
+          },
+          "alert": {
+            "title": "您已超過 ",
+            "text1": "由於您正在使用 ",
+            "text2": "，您的 Internxt Drive 將停止同步您的文件，並且您將無法添加新文件"
+          },
+          "message": {
+            "text": "您現在將被收費，並在每個付款期內收費，直到進行進一步更改。"
+          },
+          "button": {
+            "back": "保持當前計劃",
+            "continue": "更改計劃"
+          }
+        }
+      },
+      "password": {
+        "title": "密碼",
+        "description": "更改您的密碼",
+        "advice1": {
+          "title": "更改密碼",
+          "description": "更改您的密碼將使您從所有設備上登出。再次登錄時需要使用新密碼。"
+        },
+        "advice2": {
+          "title": "如何確保您的密碼安全？",
+          "description": ""
+        },
+        "advice3": {
+          "title": "新的加密密鑰",
+          "description": "通過更改您的密碼，所有文件將使用您的舊密碼解密，然後使用您的新密碼重新加密，因此您不會失去對它們的訪問權限！此操作無法撤銷。"
+        },
+        "advice4": {
+          "title": "哪些數據可以編輯？",
+          "description": "出於嚴格的安全原因並保護您的數據，我們不允許修改用戶帳戶的數據，例如電子郵件。"
+        },
+        "security": {
+          "label": "安全",
+          "lock": {
+            "title": "請輸入您的密碼以繼續",
+            "description": "出於安全原因，您必須輸入您的密碼才能對此頁面進行任何更改。",
+            "inputLabel": "密碼",
+            "errors": {
+              "incorrect": "密碼錯誤，請再試一次",
+              "notVerified": "我們無法驗證您的密碼"
+            }
+          },
+          "changePassword": {
+            "title": "更改密碼",
+            "description": "請務必記住您的新密碼。如果您遺失了它，將無法訪問所有文件。我們強烈建議使用密碼管理器。",
+            "button": "更改密碼"
+          },
+          "2FA": {
+            "title": "雙重身份驗證 (2FA)",
+            "titleDisable": "禁用雙重身份驗證",
+            "description": "雙重身份驗證通過在登錄時要求額外的驗證來提供額外的安全層。除了您的 Internxt 密碼外，您還需要輸入發送到您註冊帳戶時所用電子郵件的唯一生成碼。",
+            "button": "啟用 2FA",
+            "disable": "禁用 2FA",
+            "enabled": "已啟用",
+            "disabled": "已禁用",
+            "modal": {
+              "title": "雙重身份驗證",
+              "stepsLabel": "{{current}} / {{total}} 步",
+              "button": "啟用 2FA",
+              "2FALabelCode": "雙重身份驗證碼",
+              "or": "或",
+              "steps": {
+                "download": {
+                  "title": "下載 Authy",
+                  "description": "我們推薦使用 Authy，但您可以選擇任何其他 2FA 應用來設置雙重身份驗證過程。"
+                },
+                "qr": {
+                  "title": "使用 2FA 應用掃描 QR 碼",
+                  "description": "如果無法掃描 QR 碼，請將此代碼插入應用中。"
+                },
+                "backup-key": {
+                  "title": "保存備份金鑰",
+                  "description": "複製此代碼並保管好它，如果您丟失設備，將需要它來恢復您的帳戶。"
+                },
+                "enable": {
+                  "title": "確認啟用 2FA",
+                  "description": "雙重身份驗證碼"
+                },
+                "disable": {
+                  "title": "禁用雙重身份驗證",
+                  "description": "要禁用雙重身份驗證，請將應用生成的代碼輸入下方。"
+                }
+              },
+              "errors": {
+                "incorrect": "代碼不正確，請再試一次",
+                "notVerified": "我們無法驗證您的代碼"
+              }
+            }
+          },
+          "backupKey": {
+            "title": "備份金鑰",
+            "description": "如果您忘記密碼，可以使用唯一的備份金鑰來恢復帳戶。切勿與他人共享此代碼。",
+            "button": "導出備份金鑰",
+            "success": "備份金鑰下載成功",
+            "error": "我們無法生成您的備份金鑰"
+          },
+          "faq": {
+            "title": "您有漏掉的問題嗎？",
+            "faq1": {
+              "title": "為什麼我忘記密碼就會失去所有文件？",
+              "description": "您的密碼是訪問帳戶的唯一方式。Internxt 團隊絕對無法訪問您的帳戶，因此無法更改您的密碼。這是為了防止任何未經授權的訪問到您的帳戶和個人信息。<br/><br/>如果您創建了備份金鑰，即使沒有密碼，您也可以恢復帳戶。您可以通過訪問“設置”中的“安全”標籤來導出唯一的備份金鑰的副本。您的備份金鑰可以用於選擇“忘記密碼”並按照隨後電子郵件中的說明恢復您的帳戶。"
+            },
+            "faq2": {
+              "title": "我如何保證我的憑據安全？",
+              "description": "我們建議您使用可信的密碼管理器來存儲您的密碼。不僅是存儲 Internxt 的憑據，還有保護您的其他在線帳戶安全。"
+            },
+            "faq3": {
+              "title": "我可以用備份金鑰恢復我的帳戶嗎？",
+              "description": "如果您仍然擁有唯一的加密金鑰，您可以在沒有密碼的情況下恢復您的數據。請按照點擊“忘記密碼”後您將收到的電子郵件中列出的步驟進行操作。"
+            },
+            "faq4": {
+              "title": "如果我更改密碼，會失去所有文件嗎？",
+              "description": "不會。由於您已經登錄帳戶，您可以更改密碼而不會丟失任何東西。請務必選擇一個在任何數據洩露中都沒有出現過的強密碼。"
+            }
+          }
+        }
+      }
+    },
+    "emailVerification": {
+      "success": {
+        "title": "電子郵件驗證成功",
+        "subtitle": "您現在可以關閉此標籤頁",
+        "cta": "打開 Internxt Drive"
+      },
+      "error": {
+        "title": "發生錯誤",
+        "subtitle": "檢查鏈接是否正確或在設置 > 帳戶中再次請求電子郵件驗證",
+        "cta": "轉到帳戶"
+      }
+    },
+    "emailChange": {
+      "password": "密碼",
+      "auth": {
+        "title": "驗證電子郵件變更",
+        "subtitle": "您的帳戶電子郵件將更改為 {{email}}",
+        "wrongPassword": "密碼錯誤，請再試一次",
+        "cta": "繼續"
+      },
+      "success": {
+        "title": "電子郵件更改成功",
+        "subtitle": "您現在可以關閉此標籤頁",
+        "cta": "打開 Internxt Drive"
+      },
+      "error": {
+        "title": "發生錯誤",
+        "subtitle": "檢查鏈接是否正確或在設置 > 帳戶中再次請求電子郵件變更",
+        "cta": "轉到帳戶"
+      },
+      "expired": {
+        "title": "驗證鏈接已過期",
+        "subtitle": "您可以在設置 > 帳戶中再次請求電子郵件變更",
+        "cta": "轉到帳戶"
+      }
+    },
+    "redirectToApp": {
+      "message": "謝謝",
+      "goToApp": "返回應用"
+    }
+  },
+  "contextMenu": {
+    "itemsSelected": "已選擇項目"
+  },
+  "modals": {
+    "renameItemDialog": {
+      "title": "重命名",
+      "label": "名稱"
+    },
+    "renameModal": {
+      "title": "項目已存在",
+      "titleMultipleItems": "多個項目已存在",
+      "description": "{{itemName}} 已存在於此位置。您要替換它還是保留兩者？",
+      "multipleDescription": "此位置已存在多個元素。您要替換它們還是保留全部？",
+      "replaceItem": "替換當前項目",
+      "keepBoth": "保留兩者",
+      "upload": "上傳",
+      "move": "移動"
+    },
+    "removeSharedLinkModal": {
+      "title": "刪除連結",
+      "multiSharedDescription": "具有此連結的用戶將失去對共享內容的訪問權限",
+      "singleSharedDescription": "具有此連結的用戶將失去對共享內容的訪問權限",
+      "cancel": "取消",
+      "deleteLinks": "刪除連結",
+      "deleteLink": "刪除連結"
+    },
+    "newFolderModal": {
+      "title": "新建文件夾",
+      "label": "名稱",
+      "placeholder": "無標題文件夾",
+      "untitled": "無標題文件夾"
+    },
+    "itemDetailsModal": {
+      "title": "詳細信息",
+      "fileCta": "打開預覽",
+      "folderCta": "打開文件夾",
+      "itemDetails": {
+        "name": "名稱",
+        "type": "類型",
+        "uploaded": "上傳時間",
+        "uploadedBy": "上傳者",
+        "shared": "已共享",
+        "size": "大小",
+        "modified": "修改時間",
+        "location": "位置"
+      }
+    },
+    "shareModal": {
+      "title": "分享“{{name}}”",
+      "list": {
+        "peopleWithAccess": "具有訪問權限的人",
+        "invite": "邀請",
+        "userItem": {
+          "roles": {
+            "owner": "擁有者",
+            "editor": "編輯者",
+            "reader": "查看者"
+          },
+          "remove": "移除"
+        }
+      },
+      "errors": {
+        "updatingRole": "無法更新角色，請稍後再試。",
+        "copy-to-clipboard": "共享項目時發生錯誤，請稍後再試。",
+        "update-sharing-access": "無法更新訪問模式，請稍後再試"
+      },
+      "general": {
+        "generalAccess": "一般訪問權限",
+        "accessOptions": {
+          "public": {
+            "title": "公開",
+            "subtitle": "任何人都可以使用鏈接訪問"
+          },
+          "restricted": {
+            "title": "受限",
+            "subtitle": "僅添加的人可以訪問"
+          },
+          "stopSharing": "停止分享"
+        },
+        "copyLink": "複製鏈接"
+      },
+      "requests": {
+        "title": "訪問請求",
+        "button": "請求",
+        "empty": "沒有剩餘的請求",
+        "actions": {
+          "accept": "接受",
+          "deny": "拒絕",
+          "roles": {
+            "editor": "編輯者",
+            "reader": "查看者"
+          }
+        }
+      },
+      "stopSharing": {
+        "title": "停止分享？",
+        "subtitle": "將無法再訪問“{{name}}”",
+        "cancel": "取消",
+        "confirm": "停止分享",
+        "notification": {
+          "success": "不再分享“{{name}}”",
+          "error": "無法停止分享，請重試"
+        }
+      },
+      "stopSharingAndMoveToTrash": {
+        "title": "移動到垃圾桶？",
+        "subtitle": "具有連結或被邀請的用戶將不再能夠訪問“{{name}}”",
+        "multipleItemsSubtitle": "具有連結或被邀請的用戶將不再能夠訪問這些共享的項目",
+        "cancel": "取消",
+        "confirm": "移動到垃圾桶",
+        "notification": {
+          "success": "不再分享“{{name}}”",
+          "successForMultipleItems": "不再分享這些項目",
+          "error": "無法移動到垃圾桶，請重試"
+        }
+      },
+      "removeUser": {
+        "notification": {
+          "success": "已移除使用者“{{name}}”",
+          "error": "無法移除使用者“{{name}}”，請重試"
+        }
+      },
+      "invite": {
+        "title": "邀請人員",
+        "textarea": "輸入您的消息文字（選填）",
+        "notifyUsers": "通知用戶",
+        "instructions": "按 Enter 或空格鍵分隔郵件地址",
+        "email": "輸入電子郵件",
+        "invite": "邀請",
+        "editor": "編輯者",
+        "reader": "查看者",
+        "listUsers": "要邀請的用戶",
+        "successSentInvitation": "成功與{{email}}分享",
+        "acceptedSuccessfully": "成功接受共享文件夾邀請",
+        "declinedSuccessfully": "成功拒絕共享文件夾邀請",
+        "inviteNewUsersBody": "沒有Internxt帳戶的人將收到一封註冊邀請郵件。",
+        "inviteNewUsersTitle": "邀請新用戶？",
+        "accept": "接受",
+        "cancel": "取消",
+        "error": {
+          "errorInviting": "向{{email}}發送邀請時出錯",
+          "acceptedError": "接受共享文件夾邀請時出錯",
+          "declinedError": "拒絕共享文件夾邀請時出錯"
+        }
+      },
+      "requestAccess": {
+        "title": "您沒有訪問權限",
+        "description": "請向擁有者申請訪問權限或切換到具有訪問權限的帳戶。",
+        "textarea": "消息（選填）",
+        "requestButton": "請求訪問權限",
+        "logged": "已登錄為",
+        "change": "更改",
+        "requestSent": "請求已發送",
+        "confirmation": "如果文件/文件夾與您共享，您將收到一封電子郵件"
+      },
+      "protectSharingModal": {
+        "protectTooltipText": "僅對沒有查看者或編輯者訪問權限的用戶需要密碼。",
+        "protect": "使用密碼保護",
+        "disablePasswordTitle": "禁用密碼保護？",
+        "disablePasswordBody": "禁用後，具有連結的用戶將能夠訪問內容。",
+        "editPasswordTitle": "編輯密碼",
+        "buttons": {
+          "cancel": "取消",
+          "save": "保存",
+          "disable": "禁用",
+          "changePassword": "更改密碼"
+        }
+      }
+    },
+    "sharedInvitationsModal": {
+      "empty": "沒有剩餘的邀請",
+      "title": "待處理的邀請",
+      "accept": "接受",
+      "deny": "拒絕",
+      "sharedWith": "與您共享",
+      "todayAt": "今天在"
+    },
+    "friendsInvitedModal": {
+      "title": "已邀請的朋友",
+      "email": "電子郵件",
+      "total": "總計",
+      "pending": "待處理",
+      "accepted": "已接受",
+      "empty": "您尚未邀請任何人",
+      "resend": "重新發送邀請",
+      "resentInvitation": "邀請已成功重新發送",
+      "resendError": "重新發送電子郵件時出錯：{{reason}}"
+    },
+    "deleteAccountModal": {
+      "title": "您確定嗎？",
+      "subtitle": "您的所有文件將永遠消失，您將無法訪問您的Internxt帳戶。",
+      "cancel": "取消",
+      "confirm": "確認"
+    },
+    "changePasswordModal": {
+      "title": "更改密碼",
+      "newPassword": "新密碼",
+      "confirmPassword": "確認新密碼",
+      "strongPassword": "密碼強度高",
+      "errors": {
+        "longPassword": "密碼最多可包含50個字符",
+        "shortPassword": "密碼必須至少包含8個字符",
+        "notComplex": "密碼不夠複雜",
+        "weakPassword": "密碼較弱",
+        "doesntMatch": "密碼確認不符合密碼"
+      }
+    },
+    "deleteBackupModal": {
+      "title": "您確定嗎？",
+      "subtitle": "您的備份將被刪除。",
+      "primaryAction": "確認",
+      "secondaryAction": "取消"
+    },
+    "2FAAuthenticationModal": {}
+  },
+  "form": {
+    "fields": {
+      "email": {
+        "placeholder": "電子郵件地址"
+      }
+    }
+  },
+  "error": {
+    "wrongPassword": "密碼錯誤，請重試或聯繫鏈接所有者",
+    "genericError": "發生錯誤：{{reason}}",
+    "serverError": "內部服務器錯誤。請稍後再試",
+    "deleteTeamMember": "刪除團隊成員時出錯",
+    "changingName": "更改名稱時出錯",
+    "fileAlreadyExists": "具有相同名稱的文件已存在",
+    "folderAlreadyExists": "已存在具有相同名稱的文件夾",
+    "folderCannotBeEmpty": "文件夾名稱不能為空",
+    "creatingFolder": "創建文件夾時出錯",
+    "sendReferralInvitation": "無法發送邀請電子郵件",
+    "sendClaimEmail": "無法發送索賠郵件",
+    "anyReferralCredit": "您的帳戶沒有任何信用額",
+    "backupKeyDontMatch": "插入的備份密鑰與您的唯一備份密鑰不匹配",
+    "shareLinkMissingBucket": "由於缺少存儲桶，無法生成共享鏈接",
+    "unavailableLink": "無法使用的鏈接",
+    "invalidActivationCode": "您的激活碼無效。也許您之前已使用過此鏈接，您的帳戶已經激活",
+    "redirectToStripe": "重定向到Stripe失敗。請與我們聯繫。原因：{{reason}}",
+    "deactivatingAccount": "停用帳戶時出錯。請與我們聯繫。",
+    "fetchingFolderContent": "獲取文件夾內容時出錯",
+    "uploadingFolder": "上傳文件夾時出錯",
+    "uploadingFile": "上傳文件時出錯：{{reason}}",
+    "uploadingItems": "部分元素無法上傳",
+    "downloadingFile": "下載文件時出錯：{{message}}",
+    "downloadingFolder": "下載文件夾時出錯：{{message}}",
+    "downloadingItems": "部分元素無法下載",
+    "movingItemInsideItself": "您不能將文件夾移動到其內部",
+    "movingItem": "移動項目時出錯",
+    "renamingItem": "重命名項目時出錯",
+    "linkExpired": "此安全鏈接已過期",
+    "teamInvitation": "無法發送邀請郵件",
+    "storageIsFull": "您的存儲空間已滿",
+    "storageIsFullDescription": "您無法上傳、同步或備份文件。",
+    "noSpaceAvailable": "您已達到當前計劃的限制，同步已停止。立即升級以保持文件的安全同步。",
+    "sharedFolderTooBig": "Internxt Drive不支持共享超過1GB的文件夾。",
+    "titleSharedFolderTooBig": "不支持的操作",
+    "workingOnIt": "我們正在努力為您帶來更好的體驗。",
+    "noFilePreview": "無法預覽文件",
+    "browserNotSupported": "瀏覽器不受支持（{{userAgent}}）",
+    "inviteAFriend": "發送邀請給朋友時出錯：{{message}}",
+    "inviteAFriendEmpty": "發送邀請時出錯：您必須指定電子郵件",
+    "subscribeToNewsletter": "訂閱通訊時出錯：{{message}}",
+    "lastPasswordError": "您輸入的最後一個密碼似乎無效。請重試，如果問題仍然存在，請聯繫我們的支持。",
+    "incorrectPassword": "您輸入的當前密碼不正確。請確保它是正確的。",
+    "emptyPassword": "以前的密碼不能為空",
+    "errorMovingToTrash": "將項目移動到垃圾桶時出錯。",
+    "errorDeletingFromTrash": "從垃圾桶中刪除項目時出錯。",
+    "maxSizeUploadLimitError": "文件過大（大於20GB）",
+    "connectionLostError": "網絡連接已丟失",
+    "errorLoadingTrashItems": "加載垃圾桶項目時出錯"
+  },
+  "backups": {
+    "backups-from": "來自{{deviceName}}的備份",
+    "your-devices": "您的設備",
+    "back-to-devices": "返回到設備",
+    "empty": {
+      "title": "沒有可用的備份",
+      "subtitle": "在Internxt桌面應用程序上設置和管理您的備份",
+      "downloadApp": "下載桌面應用程序"
+    },
+    "devices-list": {
+      "columns": {
+        "name": "名稱",
+        "last-update": "最後更新",
+        "size": "大小"
+      }
+    },
+    "backups-list": {
+      "columns": {
+        "name": "名稱",
+        "last-update": "最後更新",
+        "size": "大小",
+        "actions": "操作"
+      }
+    },
+    "dropdown": {
+      "download": "下載",
+      "delete": "永久刪除"
+    }
+  },
+  "shared": {
+    "errors": {
+      "notSharedFolder": "此文件夾未與您共享",
+      "folderNotExists": "此文件夾不存在",
+      "generic": "無法訪問文件夾"
+    }
+  },
+  "shared-links": {
+    "shared-links": "已分享",
+    "view": "次查看",
+    "list": {
+      "name": "名稱",
+      "link-content": "鏈接內容",
+      "shared": "已分享",
+      "created": "創建時間",
+      "size": "大小",
+      "owner": "擁有者"
+    },
+    "empty-state": {
+      "title": "尚未與您分享任何內容",
+      "subtitle": "其他人與您共享的文件夾將顯示在這裡"
+    },
+    "item-menu": {
+      "copy-link": "複製鏈接",
+      "link-settings": "分享設置",
+      "delete-link": "刪除鏈接",
+      "delete-links": "刪除鏈接"
+    },
+    "link-settings": {
+      "share-settings": "分享設置",
+      "views": "查看次數",
+      "options": "選項",
+      "copy-link": "複製鏈接",
+      "save": "保存",
+      "saving": "正在保存",
+      "save-close": "保存並關閉",
+      "close": "關閉"
+    },
+    "toast": {
+      "copy-to-clipboard": "鏈接已複製到剪貼板",
+      "link-updated": "鏈接設置已更新",
+      "link-deleted": "鏈接已刪除",
+      "links-deleted": "鏈接已刪除",
+      "error-deleting-links": "刪除鏈接時出錯"
+    }
+  },
+  "trash": {
+    "trash": "垃圾桶",
+    "clearTrash": "垃圾桶已清空",
+    "list": {
+      "name": "名稱",
+      "size": "大小",
+      "moved-to-trash": "已移至垃圾桶"
+    },
+    "empty-state": {
+      "title": "雲端垃圾桶為空",
+      "subtitle": "已刪除的檔案和資料夾將顯示於此"
+    },
+    "item-menu": {
+      "restore": "還原",
+      "delete-permanently": "永久刪除"
+    }
+  },
+  "tasks": {
+    "messages": {
+      "allProcessesHaveFinished": "所有進程已完成",
+      "processing": "處理中 {{pending}} 個，共 {{finished}} 個"
+    },
+    "waiting": "等待中",
+    "paused": "已暫停",
+    "create-folder": {
+      "status": {
+        "pending": "等待創建資料夾",
+        "in-process": "創建資料夾中",
+        "success": "資料夾已創建",
+        "error": "資料夾創建過程中出錯",
+        "cancelled": "取消資料夾創建"
+      },
+      "errors": {}
+    },
+    "upload-file": {
+      "status": {
+        "pending": "等待上傳",
+        "encrypting": "加密檔案中",
+        "in-process": "{{progress}}% 正在上傳檔案",
+        "success": "檔案上傳成功",
+        "error": "上傳過程中出錯",
+        "cancelled": "取消上傳"
+      },
+      "errors": {}
+    },
+    "upload-folder": {
+      "status": {
+        "pending": "等待上傳",
+        "encrypting": "加密檔案中",
+        "in-process": "{{progress}}% 正在上傳資料夾",
+        "success": "資料夾上傳成功",
+        "error": "上傳過程中出錯",
+        "cancelled": "取消上傳"
+      },
+      "errors": {}
+    },
+    "download-file": {
+      "status": {
+        "pending": "等待下載",
+        "decrypting": "解密檔案中",
+        "in-process": "{{progress}}% 正在下載檔案",
+        "success": "檔案下載成功",
+        "error": "下載失敗，點擊 ↻ 重試",
+        "cancelled": "取消下載"
+      },
+      "errors": {}
+    },
+    "download-backup": {
+      "status": {
+        "pending": "等待下載",
+        "decrypting": "解密備份中",
+        "in-process": "{{progress}}% 正在下載備份",
+        "success": "備份下載成功",
+        "error": "下載過程中出錯",
+        "cancelled": "取消下載"
+      },
+      "errors": {}
+    },
+    "download-folder": {
+      "status": {
+        "pending": "等待下載",
+        "decrypting": "解密檔案中",
+        "in-process": "{{progress}}% 正在下載資料夾",
+        "in-process-without-progress": "正在下載資料夾",
+        "success": "資料夾下載成功",
+        "error": "下載失敗，點擊 ↻ 重試",
+        "cancelled": "取消下載"
+      },
+      "errors": {}
+    },
+    "move-file": {
+      "status": {
+        "pending": "等待移動",
+        "in-process": "檔案移動中",
+        "success": "檔案移動成功",
+        "error": "移動過程中出錯",
+        "cancelled": "取消移動"
+      },
+      "errors": {
+        "409": "目的地資料夾已存在同名檔案"
+      }
+    },
+    "move-folder": {
+      "status": {
+        "pending": "等待移動",
+        "in-process": "正在移動資料夾",
+        "success": "資料夾移動成功",
+        "error": "移動過程中出錯",
+        "cancelled": "取消移動"
+      },
+      "errors": {
+        "409": "目的地資料夾中已存在同名資料夾"
+      }
+    },
+    "rename-file": {
+      "status": {
+        "pending": "等待重新改名",
+        "in-process": "正在重新命名檔案",
+        "success": "檔案重新命名成功",
+        "error": "重新命名過程中出錯",
+        "cancelled": "取消重新改名"
+      },
+      "errors": {}
+    },
+    "rename-folder": {
+      "status": {
+        "pending": "等待重新改名",
+        "in-process": "正在重新命名資料夾",
+        "success": "資料夾重新命名成功",
+        "error": "重新命名過程中出錯",
+        "cancelled": "取消重新改名"
+      },
+      "errors": {}
+    },
+    "subtitles": {
+      "upload-failed": "上傳失敗"
+    },
+    "generalErrorMessages": {
+      "retryUploadFailed": "重試上傳時出現問題。請重新上傳",
+      "retryDownloadFailed": "重試下載時出現問題。請重新下載",
+      "openUploadedFileFailed": "打開檔案時出現問題",
+      "openUploadedFolderFailed": "打開資料夾時出現問題"
+    }
+  },
+  "success": {
+    "passwordChanged": "密碼已成功更改",
+    "teamInvitationSent": "邀請郵件已發送至{{email}}",
+    "referralInvitationSent": "邀請郵件已發送至{{email}}",
+    "deletedTeamMember": "{{resource}} 已成功刪除",
+    "accountDeactivationEmailSent": "已發送停用帳戶郵件！",
+    "claimEmailSent": "索取郵件已發送！",
+    "teamsSubscriptionRedeemed": "您的團隊已準備就緒！請重新登錄以開始使用 Teams",
+    "linkCopied": "鏈接已複製！",
+    "twoFactorAuthActivated": "您的雙因素身份驗證已啟用！",
+    "twoFactorAuthDisabled": "您的雙因素身份驗證已停用",
+    "joinedToTheTeam": "您已成功加入團隊",
+    "done": "完成",
+    "inviteAFriend": "已發送邀請至{{email}}",
+    "subscribeToNewsletter": "{{email}} 成功訂閱電子報"
+  },
+  "shareItemDialog": {
+    "title": "鏈接設置",
+    "access": "訪問權限",
+    "protect": "設置密碼保護",
+    "addSecurePassword": "設置密碼以保護此鏈接",
+    "password": "密碼",
+    "views": "查看次數",
+    "noViewsYet": "尚未有查看次數",
+    "dateCreated": "創建日期",
+    "buttons": {
+      "copyLink": "複製鏈接",
+      "linkCopied": "鏈接已複製",
+      "cancel": "取消",
+      "save": "保存"
+    }
+  },
+  "notificationMessages": {
+    "copyLink": "已複製共享鏈接到剪貼板",
+    "linkUpdated": "鏈接已更新",
+    "itemsMovedToTrash": "{{item}} 已移到垃圾桶",
+    "restoreItems": "{{itemsToRecover}} 成功還原",
+    "moveItems": "{{itemsToMove}} 成功移動",
+    "itemDeleted": "{{item}} 已刪除",
+    "itemsDeleted": "文件已刪除",
+    "emailNotEmpty": "電子郵件不能為空",
+    "verificationEmail": "驗證郵件已發送",
+    "successCancelSubscription": "您的訂閱已取消",
+    "errorCancelSubscription": "取消訂閱時出現問題",
+    "successApplyCoupon": "免費使用3個月的優惠碼已應用",
+    "errorApplyCoupon": "應用折扣時出現錯誤",
+    "alreadyAppliedCoupon": "優惠碼已經應用"
+  },
+  "actions": {
+    "undo": "撤銷",
+    "upload": {
+      "new": "新建",
+      "folder": "新建資料夾",
+      "uploadFiles": "上傳檔案",
+      "uploadFolder": "上傳資料夾"
+    },
+    "change": "更改",
+    "delete": "刪除",
+    "download": "下載",
+    "downloading": "下載中",
+    "downloaded": "已下載",
+    "view": "預覽",
+    "accessFile": "訪問檔案",
+    "upgradeNow": "立即升級",
+    "purchasePlan": "立即升級",
+    "upgrade": "升級",
+    "buyStorage": "立即升級",
+    "deleteAccount": "永久刪除帳戶",
+    "changePassword": "更改密碼",
+    "buy": "購買",
+    "cancel": "取消",
+    "create": "創建",
+    "sendInvitation": "發送邀請",
+    "subscribe": "訂閱",
+    "moreInfo": "更多信息",
+    "dismiss": "忽略",
+    "save": "保存",
+    "saving": "正在保存",
+    "share": "分享",
+    "back": "返回",
+    "edit": "編輯",
+    "submit": "提交",
+    "access": "訪問",
+    "previous": "上一步",
+    "next": "下一步",
+    "disable": "停用",
+    "move": "移動",
+    "moving": "正在移動...",
+    "navigating": "正在導航...",
+    "restoreHere": "還原至此",
+    "rename": "重新命名",
+    "restore": "還原",
+    "copyLink": "複製鏈接",
+    "report": "檢舉濫用",
+    "yes": "是",
+    "no": "否",
+    "more": "更多"
+  },
+  "drive": {
+    "usage": "使用量",
+    "currentPlan": "當前計劃",
+    "loadingFile": "正在加載預覽",
+    "previewNoAvailable": "無法預覽",
+    "pdfPage": "{{page}} / {{pages}} 頁",
+    "list": {
+      "columns": {
+        "type": "類型",
+        "name": "名稱",
+        "modified": "修改日期",
+        "size": "大小",
+        "actions": "操作"
+      }
+    },
+    "viewMode": {
+      "gridMode": "網格視圖",
+      "listMode": "列表視圖"
+    },
+    "dropdown": {
+      "openPreview": "打開預覽",
+      "details": "詳細信息",
+      "shareLink": "分享",
+      "manageLinkAccess": "管理訪問權限",
+      "getLink": "獲取鏈接",
+      "rename": "重新命名",
+      "share": "分享",
+      "manageAccess": "管理訪問權限",
+      "download": "下載",
+      "moveToTrash": "移到垃圾桶",
+      "copyLink": "複製鏈接",
+      "linkSettings": "鏈接設置",
+      "deleteLink": "刪除鏈接",
+      "restore": "還原",
+      "deletePermanently": "永久刪除",
+      "move": "移動",
+      "delete": "刪除"
+    },
+    "deleteItems": {
+      "title": "永久刪除？",
+      "advice": "此操作無法撤銷。",
+      "accept": "刪除",
+      "progress": "正在刪除..."
+    },
+    "clearTrash": {
+      "title": "清空 Drive 垃圾桶？",
+      "advice": "Drive 垃圾桶中的所有項目都將被永久刪除。此操作無法撤銷。",
+      "accept": "清空垃圾桶",
+      "progress": "正在清空垃圾桶..."
+    },
+    "uploadItems": {
+      "title": "最大檔案上傳數量",
+      "advice": "最多可一次上傳 1000 個檔案。",
+      "close": "關閉"
+    },
+    "movingToTrash": "正在將項目移到垃圾桶",
+    "deletingItems": "正在從垃圾桶刪除項目"
+  },
+  "appSumo": {
+    "tiers": {
+      "internxt_tier1": "AppSumo 終身版 第 1 層",
+      "internxt_tier2": "AppSumo 終身版 第 2 層",
+      "internxt_tier3": "AppSumo 終身版 第 3 層",
+      "internxt_tier4": "AppSumo 終身版 第 4 層",
+      "internxt_tier5": "AppSumo 終身版 第 5 層",
+      "unlimited": "終身無限會員"
+    },
+    "members": {
+      "internxt_tier1": "團隊成員：1 人",
+      "internxt_tier2": "團隊成員：5 人",
+      "internxt_tier3": "團隊成員：10 人",
+      "internxt_tier4": "團隊成員：25 人",
+      "internxt_tier5": "團隊成員：100 人",
+      "unlimited": "團隊成員：{{total}}"
+    },
+    "plans": {
+      "advice": "您將被重定向到您的 AppSumo 帳戶"
+    }
+  },
+  "inviteAFriend": {
+    "title": "邀請好友",
+    "descriptionWidget": "通過邀請您的朋友（每位透過您的邀請註冊的用戶可獲得 1GB 額外免費存儲空間，最多可達 {{N}}GB）獲得最高 {{N}}GB 的額外免費存儲空間",
+    "description": "每邀請一位朋友，您可以獲得 1GB 的免費存儲空間。您最多可以獲得 {{N}}GB。",
+    "label": "朋友的電子郵件地址",
+    "placeholder": "輸入朋友的電子郵件",
+    "actions": {
+      "sendInvitation": "發送邀請",
+      "seeInvitations": "查看所有邀請"
+    },
+    "errors": {
+      "dailyEmailLimit": "您已達到每日 10 次邀請的限制"
+    }
+  },
+  "newsletter": {
+    "dialog": {
+      "title": "訂閱我們的通訊",
+      "message": "在您的郵件收件箱中即可獲得最新消息和更新"
+    }
+  },
+  "referrals": {
+    "items": {
+      "create-account": "創建帳戶",
+      "install-mobile-app": "安裝移動應用程序並上傳文件",
+      "share-file": "通過鏈接分享文件",
+      "subscribe-to-newsletter": "訂閱通訊",
+      "install-desktop-app": "安裝桌面應用程序並上傳文件",
+      "invite-friends": "邀請 {{completedSteps}}/{{steps}} 位朋友",
+      "invite-2-friends": "邀請 {{completedSteps}}/{{steps}} 位朋友",
+      "complete-survey": "完成調查"
+    },
+    "rewards": {
+      "title": "免費獲得 {{creditSum}}",
+      "progress": "已解鎖 {{currentCredit}}",
+      "limit": "（共 {{creditSum}}）"
+    }
+  },
+  "errors": {
+    "downloadingDesktopApp": "下載桌面應用程序時發生錯誤"
+  },
+  "tutorial": {
+    "signUpTutorial": {
+      "stepOne": {
+        "title": "充分利用 Internxt Drive",
+        "description": "下載桌面應用程序以同步和備份所有文件夾和文件。"
+      },
+      "stepTwo": {
+        "title": "讓我們開始吧...",
+        "description": "點擊上傳按鈕上傳您的第一個文件。"
+      }
+    }
+  },
+  "blockedAccount": {
+    "title": "驗證您的身份",
+    "text1": "嘗試了太多次失敗的登錄。",
+    "text2": "出於安全原因，我們向您的地址 {{email}} 發送了一封電子郵件，請按照電子郵件中的步驟確認您的身份並登錄",
+    "forgotPassword": "我忘記了我的密碼",
+    "text3": "沒有收到任何郵件嗎？",
+    "resend": "重新發送"
+  },
+  "itemNotFound": {
+    "folder": {
+      "title": "找不到文件夾",
+      "description": "請確保 URL 正確且文件夾未被移動或刪除。"
+    },
+    "file": {
+      "title": "找不到文件",
+      "description": "請確保 URL 正確且文件未被移動或刪除。"
+    }
+  },
+  "preferences": {
+    "title": "偏好",
+    "general": {
+      "title": "一般"
+    },
+    "workspace": {
+      "title": "工作區",
+      "overview": {
+        "title": "概覽"
+      },
+      "members": {
+        "title": "成員",
+        "members": "成員",
+        "guests": "訪客",
+        "search": "搜尋成員",
+        "invite": "邀請",
+        "inviteDialog": {
+          "title": "邀請加入工作區",
+          "inputDescription": "按Enter、空格或逗號分隔電子郵件",
+          "remove": "移除",
+          "inviteUsersDescription": "沒有Internxt帳戶的用戶將收到註冊電子郵件，然後才能加入工作區。",
+          "enterUserEmail": "輸入要邀請的用戶電子郵件",
+          "addMessage": "添加訊息",
+          "invite": "邀請"
+        },
+        "invitationFlow": {
+          "acceptedSuccessfully": "工作區邀請已成功接受",
+          "declinedSuccessfully": "工作區邀請已成功拒絕",
+          "invitationSent": "邀請已成功發送",
+          "error": {
+            "errorInviting": "發送邀請至{{email}}時出錯",
+            "acceptedError": "接受工作區邀請時出錯",
+            "declinedError": "拒絕工作區邀請時出錯"
+          }
+        },
+        "list": {
+          "user": "用戶",
+          "usage": "使用情況",
+          "storage": "存儲"
+        },
+        "role": {
+          "owner": "擁有者",
+          "manager": "經理",
+          "member": "成員",
+          "deactivated": "已停用"
+        },
+        "deactivationModal": {
+          "title": "停用成員",
+          "description": "{{name}} 將失去對工作區的訪問權限。所有文件和資料夾將保持不變。",
+          "deactivate": "停用",
+          "deactivating": "正在停用"
+        },
+        "reactivationModal": {
+          "title": "重新啟用成員",
+          "description": "{{name}} 將恢復對工作區的訪問權限。",
+          "reactivate": "重新啟用",
+          "reactivating": "正在重新啟用"
+        },
+        "changePasswordModal": {
+          "title": "要求更改密碼",
+          "description": "用戶將收到更新個人帳戶密碼的建議。如果您認為其密碼可能已被洩露，請使用此功能。",
+          "inputPlaceholder": "輸入您的訊息文本（可選）",
+          "actionButton": "發送請求"
+        },
+        "tabs": {
+          "activity": {
+            "name": "活動",
+            "empty": "沒有活動",
+            "disabilitedOwner": {
+              "title": "開始使用活動",
+              "subtitle": "通過活動日誌記錄，清晰使用見解以進行文件和帳戶管理",
+              "action": "啟用活動"
+            },
+            "disabilitedMember": {
+              "title": "活動已禁用",
+              "subtitle": "聯繫工作區擁有者以啟用活動日誌以進行文件和帳戶管理"
+            },
+            "roles": {
+              "title": "角色",
+              "member": "成員",
+              "manager": "經理",
+              "owner": "擁有者"
+            },
+            "filter": {
+              "button": "篩選",
+              "title": "篩選條件",
+              "clear": "清除",
+              "dateRange": {
+                "title": "日期範圍",
+                "7days": "最近7天",
+                "30days": "最近30天",
+                "90days": "最近90天"
+              }
+            }
+          },
+          "teams": {
+            "title": "團隊",
+            "role": "角色",
+            "emptyTeamsOwner": {
+              "title": "開始使用團隊",
+              "subtitle": "通過將成員分組到團隊中來更快地管理工作區成員",
+              "action": "創建一個團隊"
+            },
+            "emptyTeamsMember": {
+              "title": "尚未創建團隊",
+              "subtitle": "工作區擁有者可以通過將成員分組到團隊中來更快地管理成員"
+            },
+            "emptyTeams": {
+              "title": "不是任何團隊的成員"
+            }
+          }
+        },
+        "actions": {
+          "deactivate": "停用成員",
+          "reactivate": "重新啟用成員",
+          "passwordChange": "要求更改密碼"
+        }
+      },
+      "teams": {
+        "title": "團隊"
+      },
+      "billing": {
+        "title": "計費",
+        "nextBillingDate": "下次計費日期",
+        "planLimit": "計費計劃：{{planLimit}}",
+        "subscription": "訂閱",
+        "lifetimeSubscription": {
+          "planType": "終身",
+          "text": "沒有即將到來的賬單"
+        },
+        "freeSubscription": {
+          "planType": "免費",
+          "action": "升級",
+          "actionDescription": "增加您的存儲空間並獲得更多功能"
+        },
+        "paymentMethod": {
+          "title": "付款方式",
+          "editButton": "編輯付款方式",
+          "freePlanTitle": "您在免費 {{planLimit}} 計劃上",
+          "addButton": "添加付款方式",
+          "empty": "沒有關聯的付款方式"
+        },
+        "cancelSubscription": {
+          "title": "取消訂閱",
+          "text": "您的計劃將降級到免費等級。",
+          "button": "取消訂閱"
+        }
+      }
+    },
+    "account": {
+      "title": "帳戶",
+      "inviteFriend": "邀請朋友",
+      "seeInvitations": "查看邀請",
+      "sendInvitationDescription": "傳播消息並免費獲得每位朋友邀請1 GB。您最多可以獲得 {{N}}GB。",
+      "sendInvitation": "發送邀請",
+      "enterFriendEmail": "輸入朋友的電子郵件",
+      "extraStorage": "額外存儲",
+      "invitedFriends": "邀請的朋友",
+      "friendsInvited": "已邀請朋友",
+      "acceptedRequests": "已接受的請求",
+      "user": "用戶",
+      "status": "狀態",
+      "accepted": "已接受",
+      "pending": "待定",
+      "noInvitations": "尚未發送邀請",
+      "upgrade": "升級",
+      "levelUpStorage": "提升您的存儲空間並獲得許多其他好處",
+      "upgradeNow": "立即升級",
+      "emptyTrash": "清空垃圾桶",
+      "emptryTrashDescription": "垃圾桶中的項目將在15天後永久刪除",
+      "plans": {
+        "title": "計劃",
+        "current": "當前",
+        "upgrade": "升級",
+        "downgrade": "降級",
+        "free": "免費獲得最多10 GB",
+        "manageBilling": "管理計費",
+        "freeForever": "永久免費",
+        "year": "年",
+        "month": "月",
+        "lifetime": "終身",
+        "planFeaturesList": {
+          "title": "計劃詳情",
+          "storage": " 的儲存空間",
+          "featureOne": "加密文件和文件夾共享。",
+          "featureTwo": "密碼保護的文件共享。",
+          "featureThree": "從任何設備訪問您的文件。",
+          "featureFour": "上傳文件最大可達20GB。",
+          "featureFive": "雙重身份驗證 (2FA)。",
+          "featureSix": "高級客戶支持。",
+          "featureSeven": "30天退款保證。"
+        },
+        "businessPlanFeaturesList": {
+          "title": "計劃詳情",
+          "storage": " 的儲存空間",
+          "featureOne": "加密文件和文件夾共享。",
+          "featureTwo": "創建和管理用戶及團隊。",
+          "featureThree": "從3名用戶起至多100名用戶。",
+          "featureFour": "符合GDPR規範。",
+          "featureFive": "上傳文件最大可達20GB。",
+          "featureSix": "管理帳戶帳單和付款。",
+          "featureSeven": "高級客戶支持。"
+        },
+        "user": "用戶"
+      },
+      "billing": {
+        "title": "計費"
+      },
+      "security": {
+        "title": "安全"
+      }
+    },
+    "navBarSections": {
+      "general": "一般",
+      "workspace": "工作區",
+      "overview": "概覽",
+      "members": "成員",
+      "teams": "團隊",
+      "billing": "計費",
+      "account": "帳戶",
+      "plans": "計劃",
+      "security": "安全"
+    }
+  },
+  "workspaces": {
+    "workspaces": "工作區",
+    "workspace": "工作區",
+    "createWorkspace": "創建工作區",
+    "workspaceTypes": {
+      "personal": "個人工作區",
+      "business": "商務工作區"
+    },
+    "messages": {
+      "sharedSuccess": "項目成功與團隊共享"
+    },
+    "pendingInvitations": {
+      "empty": "沒有剩餘的邀請",
+      "title": "待處理的邀請",
+      "accept": "接受",
+      "deny": "拒絕",
+      "invitedOn": "邀請發送 ",
+      "todayAt": "今天在 "
+    }
+  }
+}
diff --git a/src/app/i18n/locales/zh.json b/src/app/i18n/locales/zh.json
index 7f52fe700..2edaef8bf 100644
--- a/src/app/i18n/locales/zh.json
+++ b/src/app/i18n/locales/zh.json
@@ -4,19 +4,31 @@
     "logOut": "登出"
   },
   "featuresBanner": {
-    "label": "75%节省",
-    "title": "保护您的数据免受黑暗面的侵害",
-    "cta": "选择方案",
+    "label": {
+      "upTo": "高达 ",
+      "discount": "80% 折扣"
+    },
+    "title": "享受 Internxt 的夏季优惠",
+    "subtitle": {
+      "line1": "Internxt 的免费计划将于 7 月 1 日减少到 1GB。",
+      "line2": {
+        "normal1": "使用代码 ",
+        "blue": "FREEVIP",
+        "normal2": " 绕过此降级，享受任何高级计划 90% 的折扣。"
+      }
+    },
+    "cta": "选择计划",
     "guarantee": "30天退款保证",
-    "lastCta": "*此优惠仅适用于免费帐户或新客户",
+    "lastCta": "*优惠适用于免费账户或新客户",
     "features": [
-      "在Internxt计划上节省",
+      "所有 Internxt 计划均可享受优惠",
       "安全可靠的云存储",
       "开源和透明",
       "端到端加密传输",
-      "无未经授权的访问",
-      "优惠截止日期为5月20日"
-    ]
+      "无未授权访问",
+      "优惠截止至8月19日"
+    ],
+    "copied": "已复制到剪贴板"
   },
   "valentinesBanner": {
     "title": "爱无极限！",
@@ -58,7 +70,8 @@
     "it": "Italiano (意大利语)",
     "zh": "简体中文 (简体中文)",
     "ru": "Русский (俄语)",
-    "de": "Deutsch (德国)"
+    "de": "Deutsch (德国)",
+    "zh-tw": "臺灣 (臺灣人)"
   },
   "theme": {
     "title": "外观",
@@ -196,12 +209,12 @@
     "renewalPeriod": {
       "monthly": "月度",
       "annually": "年度",
-      "lifetime": "终身"
+      "lifetime": "Lifetime"
     },
     "renewal": {
       "monthly": "月度",
       "annually": "年度",
-      "lifetime": "终身"
+      "lifetime": "Lifetime"
     },
     "workspaces": {
       "personal": "个人",
@@ -248,7 +261,6 @@
   },
   "sideNav": {
     "drive": "云盘",
-    "photos": "照片",
     "backups": "备份",
     "shared": "共享的",
     "recents": "最近",
@@ -268,18 +280,12 @@
         "dragNDrop": "拖放到此处或单击上传按钮"
       }
     },
-    "photos": {
-      "empty": {
-        "title": "您的相册是空的",
-        "description": "使用Internxt移动应用程序来同步你的照片"
-      }
-    },
     "account": {
       "title": "资料",
       "avatar": {
         "title": "上传新图片",
-        "removePhoto": "删除照片",
-        "updatePhoto": "上传图片",
+        "removePhoto": "删除",
+        "updatePhoto": "上传照片",
         "dragNDrop": "选择或拖动一个图片",
         "success": "头像已成功更新",
         "error": "上传您的头像时出现问题",
@@ -299,7 +305,6 @@
           "usage": "已使用 {{totalUsed}} / {{totalSpace}}",
           "view": {
             "backups": "备份",
-            "photos": "照片",
             "trash": "垃圾箱",
             "free": {
               "planName": "免费计划",
@@ -359,8 +364,8 @@
           },
           "deleteAccount": {
             "head": "删除账户",
-            "description": "如果你删除你的帐户，你的数据将被永远删除。这一操作不能被撤销",
-            "isSubscribed": "请先取消订阅",
+            "description": "您的所有个人数据和您上传到Internxt的所有内容都将永远删除。一旦您删除了您的账户，就无法回头。请务必确认。",
+            "isSubscribed": "请先取消您的订阅",
             "confirmationEmail": "确认邮件已发送"
           }
         },
@@ -410,7 +415,9 @@
           },
           "invoices": {
             "head": "发票",
-            "billingDate": "账单 日期",
+            "billingDate": "日期",
+            "storage": "存储",
+            "ammount": "金额",
             "plan": "计划",
             "empty": {
               "title": "您目前在免费计划中",
@@ -489,7 +496,7 @@
             },
             "button": {
               "back": "保留当前计划",
-              "continue": "更改计划"
+              "continue": "继续"
             }
           }
         },
@@ -526,21 +533,21 @@
           },
           "changePassword": {
             "title": "修改密码",
-            "description": "记住，如果你忘记了你的密码，你将失去对所有文件的访问权限。我们建议使用一个密码管理器。",
+            "description": "我们不存储密码，如果您丢失了密码，您将无法访问您的 Internxt 账户。",
             "button": "修改密码"
           },
           "2FA": {
-            "title": "双因素认证(2FA)",
+            "title": "双因素认证",
             "titleDisable": "禁用双因素身份验证",
-            "description": "双因素认证提供了一个额外的安全性，在登录时需要验证。除了你的密码外，你还需要一个生成的代码。",
-            "button": "激活 2FA",
-            "disable": "禁用双因素认证",
-            "enabled": "已启用",
+            "description": "在登录时要求输入额外的验证码，从而增加一层额外的安全性。",
+            "button": "激活",
+            "disable": "禁用",
+            "enabled": "启用",
             "disabled": "已禁用",
             "modal": {
               "title": "两步验证",
               "stepsLabel": "第 {{current}}/{{total}}步",
-              "button": "激活 2FA",
+              "button": "启用",
               "2FALabelCode": "双因素身份验证代码",
               "or": "或",
               "steps": {
@@ -573,7 +580,7 @@
           },
           "backupKey": {
             "title": "恢复密钥",
-            "description": "如果您忘记了密码，您可以使用唯一的备份密钥来恢复您的账户。 请永远不要与任何人分享此代码。",
+            "description": "备份密钥可在您忘记密码时恢复账户。切勿共享。",
             "button": "导出密码",
             "success": "备份密钥下载成功",
             "error": "我们无法生成您的备份密钥"
@@ -610,6 +617,10 @@
         "title": "出错了",
         "subtitle": "检查链接是否正确或在设置>账户中再次请求电子邮件验证",
         "cta": "转到账户"
+      },
+      "message": {
+        "emailNotVerifiedPartOne": "您的电子邮件尚未验证。请检查您的收件箱或 ",
+        "emailNotVerifiedPartTwo": "重新发送验证"
       }
     },
     "emailChange": {
@@ -639,6 +650,36 @@
     "redirectToApp": {
       "message": "谢谢您",
       "goToApp": "回到 app"
+    },
+    "preferences": {
+      "workspace": {
+        "overview": {
+          "edit": "编辑个人资料",
+          "address": "地址",
+          "phone": "电话",
+          "owner": "所有者",
+          "workspaceOverview": "工作区概览",
+          "members": "成员",
+          "teams": "团队",
+          "billed": "{{renewDate}} 结算",
+          "spaceUsed": "已使用空间 ({{percentageUsed}}%)",
+          "totalSpace": "总空间",
+          "editOverviewDetails": {
+            "title": "个人资料详情",
+            "cancelButton": "取消",
+            "saveButton": "保存更改"
+          },
+          "errors": {
+            "minNameLength": "公司名称必须至少有3个字符"
+          }
+        },
+        "billing": {
+          "editBilling": "编辑账单",
+          "billingDetails": "账单详情",
+          "updatedBillingDetails": "詳細資訊更新成功",
+          "errorUpdatingBillingDetails": "更新您的詳細資訊時出錯。請在幾分鐘後再試一次"
+        }
+      }
     }
   },
   "contextMenu": {
@@ -817,32 +858,6 @@
       "sharedWith": "与您共享 ",
       "todayAt": "今天在 "
     },
-    "deletePhotosModal": {
-      "multiToolBar": "个文件 已选择 ",
-      "singleToolBar": "个文件 已选择 ",
-      "multiTitle": "要删除已选择的 {{item}} 个文件吗?",
-      "singleTitle": "要删除已选择的 {{item}} 个文件吗？",
-      "subtitle": "此操作不能被撤销",
-      "buttons": {
-        "cancel": "取消",
-        "delete": "删除"
-      }
-    },
-    "sharePhotosModal": {
-      "singleTitle": "分享 {{item}} 张照片",
-      "multiTitle": "分享 {{item}} 张照片",
-      "options": "链接选项",
-      "limit": "限制链接的打开次数",
-      "openCount": "限制打开 ",
-      "times": "次",
-      "change": "更改",
-      "buttons": {
-        "cancel": "取消",
-        "create": "创建链接",
-        "creating": "正在创建链接...",
-        "copyLink": "复制链接"
-      }
-    },
     "friendsInvitedModal": {
       "title": "被邀请的朋友",
       "email": "电子邮件",
@@ -935,7 +950,6 @@
     "emptyPassword": "之前的密码不能为空",
     "errorMovingToTrash": "将项目移至垃圾箱时出错。",
     "errorDeletingFromTrash": "从垃圾箱中删除项目时出错。",
-    "braveNotSupportMultiplePhotosDowload": "Brave 浏览器不支持多张照片下载。",
     "maxSizeUploadLimitError": "文件太大（大于20GB）",
     "connectionLostError": "互联网连接丢失",
     "errorLoadingTrashItems": "加载垃圾箱内的项目时出错"
@@ -1082,15 +1096,6 @@
       },
       "errors": {}
     },
-    "download-photos": {
-      "status": {
-        "pending": "正在下载 {{progress}}%",
-        "success": "已下载",
-        "error": "下载时出错",
-        "cancelled": "下载已取消"
-      },
-      "errors": {}
-    },
     "download-backup": {
       "status": {
         "pending": "等待下载",
@@ -1181,7 +1186,7 @@
     "twoFactorAuthDisabled": "您的双因素身份验证已被禁用",
     "joinedToTheTeam": "您已成功加入团队",
     "done": "完成",
-    "inviteAFriend": "邀请已发送至 {{email}}",
+    "inviteAFriend": "已发送邀请至{{email}}",
     "subscribeToNewsletter": "{{email}} 成功订阅电子报"
   },
   "shareItemDialog": {
@@ -1288,6 +1293,7 @@
     "dropdown": {
       "openPreview": "打开预览",
       "shareLink": "分享",
+      "shareTeam": "与团队分享",
       "manageLinkAccess": "管理访问权限",
       "getLink": "获取链接",
       "rename": "重命名",
@@ -1414,5 +1420,253 @@
       "title": "未找到文件",
       "description": "确保 URL 正确且文件未被移动或删除"
     }
+  },
+  "preferences": {
+    "title": "首选项",
+    "general": {
+      "title": "常规"
+    },
+    "workspace": {
+      "title": "工作区",
+      "overview": {
+        "title": "概述"
+      },
+      "members": {
+        "title": "成员",
+        "members": "成员",
+        "guests": "访客",
+        "search": "搜索成员",
+        "invite": "邀请",
+        "inviteDialog": {
+          "title": "邀请加入工作区",
+          "inputDescription": "按Enter、空格或逗号分隔电子邮件地址",
+          "remove": "删除",
+          "inviteUsersDescription": "没有Internxt账户的用户将收到一封电子邮件，要求他们在加入工作区之前注册。",
+          "enterUserEmail": "输入要邀请的用户电子邮件",
+          "addMessage": "添加消息",
+          "invite": "邀请"
+        },
+        "invitationFlow": {
+          "acceptedSuccessfully": "成功接受工作区邀请",
+          "declinedSuccessfully": "成功拒绝工作区邀请",
+          "invitationSent": "邀请成功发送",
+          "error": {
+            "errorInviting": "发送邀请至 {{email}} 时出错",
+            "acceptedError": "接受工作区邀请时出错",
+            "declinedError": "拒绝工作区邀请时出错"
+          }
+        },
+        "list": {
+          "user": "用户",
+          "usage": "使用情况",
+          "storage": "存储"
+        },
+        "role": {
+          "owner": "所有者",
+          "manager": "管理员",
+          "member": "成员",
+          "deactivated": "已停用"
+        },
+        "deactivationModal": {
+          "title": "停用成员",
+          "description": "{{name}} 将失去对工作区的访问权限。所有他们的文件和文件夹将保持不变。",
+          "deactivate": "停用",
+          "deactivating": "正在停用"
+        },
+        "reactivationModal": {
+          "title": "重新激活成员",
+          "description": "{{name}} 将恢复对工作区的访问权限。",
+          "reactivate": "重新激活",
+          "reactivating": "重新激活中"
+        },
+        "changePasswordModal": {
+          "title": "请求更改密码",
+          "description": "用户将收到一个建议更新其个人帐户密码的通知。如果您认为他们的密码可能已被泄露，请使用此功能。",
+          "inputPlaceholder": "输入您的消息文本（可选）",
+          "actionButton": "发送请求"
+        },
+        "tabs": {
+          "activity": {
+            "name": "活动",
+            "empty": "无活动",
+            "disabilitedOwner": {
+              "title": "开始使用活动",
+              "subtitle": "通过活动日志记录，清晰了解文件和账户管理的使用情况",
+              "action": "启用活动"
+            },
+            "disabilitedMember": {
+              "title": "活动已禁用",
+              "subtitle": "联系工作区所有者以启用活动日志，进行文件和账户管理"
+            },
+            "roles": {
+              "title": "角色",
+              "member": "成员",
+              "manager": "经理",
+              "owner": "所有者"
+            },
+            "filter": {
+              "button": "过滤器",
+              "title": "过滤器",
+              "clear": "清除",
+              "dateRange": {
+                "title": "日期范围",
+                "7days": "最近 7 天",
+                "30days": "最近 30 天",
+                "90days": "最近 90 天"
+              }
+            }
+          },
+          "teams": {
+            "title": "团队",
+            "role": "角色",
+            "emptyTeamsOwner": {
+              "title": "开始使用团队",
+              "subtitle": "通过将工作区成员分组为团队，更快地管理工作区成员",
+              "action": "创建团队"
+            },
+            "emptyTeamsMember": {
+              "title": "尚未创建团队",
+              "subtitle": "工作区所有者可通过将成员分组为团队来更快地管理成员"
+            },
+            "emptyTeams": {
+              "title": "不属于任何团队"
+            }
+          }
+        },
+        "actions": {
+          "deactivate": "停用会员",
+          "reactivate": "重新激活成员",
+          "passwordChange": "请求更改密码"
+        }
+      },
+      "teams": {
+        "title": "团队"
+      },
+      "billing": {
+        "title": "计费",
+        "nextBillingDate": "下一次账单日期",
+        "planLimit": "以 {{planLimit}} 计划计费",
+        "subscription": "订阅",
+        "lifetimeSubscription": {
+          "planType": "终生",
+          "text": "无预定账单"
+        },
+        "freeSubscription": {
+          "planType": "免费",
+          "action": "升级",
+          "actionDescription": "增加存储空间，获得更多功能"
+        },
+        "paymentMethod": {
+          "title": "付款方式",
+          "editButton": "编辑付款方式",
+          "freePlanTitle": "您使用的是免费 {{planLimit}} 计划",
+          "addButton": "添加付款方式",
+          "empty": "未关联付款方式"
+        },
+        "cancelSubscription": {
+          "title": "取消订阅",
+          "text": "您的计划将降级为免费级别",
+          "button": "取消订购"
+        },
+        "empty": {
+          "text": "以前没有发票"
+        }
+      }
+    },
+    "account": {
+      "title": "账户",
+      "inviteFriend": "邀请朋友",
+      "seeInvitations": "查看邀请",
+      "sendInvitationDescription": "传播消息，每邀请一个朋友获得1 GB免费存储空间。您最多可以获得{{N}}GB。",
+      "sendInvitation": "发送邀请",
+      "enterFriendEmail": "输入朋友的电子邮件",
+      "extraStorage": "额外存储空间",
+      "invitedFriends": "受邀朋友",
+      "friendsInvited": "受邀朋友",
+      "acceptedRequests": "已接受请求",
+      "user": "用户",
+      "status": "状态",
+      "accepted": "已接受",
+      "pending": "待定",
+      "noInvitations": "目前还没有发送邀请",
+      "upgrade": "升级",
+      "levelUpStorage": "升级您的存储空间，并获得许多其他好处",
+      "upgradeNow": "立即升级",
+      "emptyTrash": "清空回收站",
+      "emptryTrashDescription": "回收站中的项目将在15天后被永久删除",
+      "plans": {
+        "title": "计划",
+        "current": "当前",
+        "upgrade": "升级",
+        "downgrade": "降级",
+        "free": "免费获得高达10 GB的空间",
+        "manageBilling": "管理账单",
+        "freeForever": "永久免费",
+        "year": "年",
+        "month": "月",
+        "lifetime": "Lifetime",
+        "planFeaturesList": {
+          "title": "计划详情",
+          "storage": " 的存储空间",
+          "featureOne": "加密文件和文件夹共享。",
+          "featureTwo": "密码保护的文件共享。",
+          "featureThree": "从任何设备访问您的文件。",
+          "featureFour": "上传文件最大可达20GB。",
+          "featureFive": "双重身份验证 (2FA)。",
+          "featureSix": "高级客户支持。",
+          "featureSeven": "30天退款保证。"
+        },
+        "businessPlanFeaturesList": {
+          "title": "计划详情",
+          "storage": " 的存储空间",
+          "featureOne": "加密文件和文件夹共享。",
+          "featureTwo": "创建和管理用户及团队。",
+          "featureThree": "从3名用户起至多100名用户。",
+          "featureFour": "符合GDPR规范。",
+          "featureFive": "上传文件最大可达20GB。",
+          "featureSix": "管理账户账单和付款。",
+          "featureSeven": "高级客户支持。"
+        },
+        "user": "用户"
+      },
+      "billing": {
+        "title": "计费"
+      },
+      "security": {
+        "title": "安全"
+      }
+    },
+    "navBarSections": {
+      "general": "常规",
+      "workspace": "工作区",
+      "overview": "概览",
+      "members": "成员",
+      "teams": "团队",
+      "billing": "账单",
+      "account": "账户",
+      "plans": "计划",
+      "security": "安全"
+    }
+  },
+  "workspaces": {
+    "workspaces": "工作区",
+    "workspace": "工作区",
+    "createWorkspace": "创建工作区",
+    "workspaceTypes": {
+      "personal": "个人工作区",
+      "business": "商务工作区"
+    },
+    "pending": "待发邀请",
+    "messages": {
+      "sharedSuccess": "项目成功与团队共享"
+    },
+    "pendingInvitations": {
+      "empty": "没有剩余的邀请",
+      "title": "待处理的邀请",
+      "accept": "接受",
+      "deny": "拒绝",
+      "invitedOn": "邀请发送 ",
+      "todayAt": "今天在 "
+    }
   }
 }
diff --git a/src/app/i18n/services/i18n.service.ts b/src/app/i18n/services/i18n.service.ts
index 96b4b252b..11a86c89e 100644
--- a/src/app/i18n/services/i18n.service.ts
+++ b/src/app/i18n/services/i18n.service.ts
@@ -1,8 +1,8 @@
 import { initReactI18next } from 'react-i18next';
 import i18next from 'i18next';
 import LanguageDetector from 'i18next-browser-languagedetector';
-import localStorageService from 'app/core/services/local-storage.service';
-import envService from 'app/core/services/env.service';
+
+import dayjs from 'dayjs';
 import es from 'dayjs/locale/es';
 import fr from 'dayjs/locale/fr';
 import it from 'dayjs/locale/it';
@@ -10,7 +10,10 @@ import zh from 'dayjs/locale/zh';
 import ru from 'dayjs/locale/ru';
 import de from 'dayjs/locale/de';
 import en from 'dayjs/locale/en';
-import dayjs from 'dayjs';
+import tw from 'dayjs/locale/zh-tw';
+
+import localStorageService from 'app/core/services/local-storage.service';
+import envService from 'app/core/services/env.service';
 
 const dayJsLocale = {
   es,
@@ -20,9 +23,10 @@ const dayJsLocale = {
   zh,
   ru,
   de,
+  tw,
 };
 
-const deviceLang = localStorageService.get('i18nextLng') || navigator.language.split('-')[0];
+const deviceLang = localStorageService.get('i18nextLng') ?? navigator.language.split('-')[0];
 
 dayjs.locale(dayJsLocale[deviceLang] || 'en');
 
@@ -52,6 +56,9 @@ export default i18next
       de: {
         translation: require('../locales/de.json'),
       },
+      'zh-TW': {
+        translation: require('../locales/tw.json'),
+      },
     },
     debug: !envService.isProduction(),
     fallbackLng: 'en',
diff --git a/src/app/i18n/types.ts b/src/app/i18n/types.ts
index 27f7767e4..3c49ee275 100644
--- a/src/app/i18n/types.ts
+++ b/src/app/i18n/types.ts
@@ -6,4 +6,5 @@ export enum Locale {
   Chinese = 'zh',
   Russian = 'ru',
   German = 'de',
+  Taiwanese = 'zh-tw',
 }
diff --git a/src/app/network/UploadManager.ts b/src/app/network/UploadManager.ts
index a68732945..1183fe1b0 100644
--- a/src/app/network/UploadManager.ts
+++ b/src/app/network/UploadManager.ts
@@ -24,15 +24,19 @@ enum FileSizeType {
 
 type Options = {
   isRetriedUpload?: boolean;
-  // relatedTaskId?: string;
   showNotifications?: boolean;
   showErrors?: boolean;
+  // TOOD: REMOVE DUPLICATED TYPE FileUploadOptions IN uploadFile.ts
   ownerUserAuthenticationData?: {
     token: string;
     bridgeUser: string;
     bridgePass: string;
     encryptionKey: string;
     bucketId: string;
+    // to manage B2B workspaces
+    workspaceId?: string;
+    workspacesToken?: string;
+    resourcesToken: string;
   };
   sharedItemData?: {
     isDeepFolder?: boolean;
@@ -46,7 +50,7 @@ type UploadManagerFileParams = {
   relatedTaskId?: string;
   fileType?: string;
   userEmail: string;
-  parentFolderId: number;
+  parentFolderId: string;
   onFinishUploadFile?: (driveItemData: DriveFileData, taskId: string) => void;
   abortController?: AbortController;
 };
@@ -164,7 +168,7 @@ class UploadManager {
             content: file.content,
             parentFolderId: file.parentFolderId,
           },
-          async (uploadProgress) => {
+          (uploadProgress) => {
             this.uploadsProgress[uploadId] = uploadProgress;
             const isTaskPaused = task?.status === TaskStatus.Paused;
             const isTaskCancelled = task?.status === TaskStatus.Cancelled;
diff --git a/src/app/network/download.ts b/src/app/network/download.ts
index b8b02c954..18f81139e 100644
--- a/src/app/network/download.ts
+++ b/src/app/network/download.ts
@@ -1,25 +1,12 @@
 import { Environment } from '@internxt/inxt-js';
 import { createDecipheriv, Decipher } from 'crypto';
-import * as Sentry from '@sentry/react';
 
-import { getFileInfoWithAuth, getFileInfoWithToken, getMirrors, Mirror } from './requests';
 import { buildProgressStream, joinReadableBinaryStreams } from 'app/core/services/stream.service';
 import { Abortable } from './Abortable';
-import fetchFileBlob from 'app/drive/services/download.service/fetchFileBlob';
-import localStorageService from 'app/core/services/local-storage.service';
+import { getFileInfoWithAuth, getFileInfoWithToken, getMirrors, Mirror } from './requests';
 
-import { SerializablePhoto } from 'app/store/slices/photos';
-import { getEnvironmentConfig } from 'app/drive/services/network.service';
 import { FileVersionOneError } from '@internxt/sdk/dist/network/download';
-import { ErrorWithContext } from '@internxt/sdk/dist/network/errors';
 import downloadFileV2 from './download/v2';
-import {
-  getDatabasePhotosPreviewData,
-  getDatabasePhotosSourceData,
-  updateDatabasePhotosPreviewData,
-  updateDatabasePhotosSourceData,
-} from '../drive/services/database.service';
-import errorService from '../core/services/error.service';
 
 export type DownloadProgressCallback = (totalBytes: number, downloadedBytes: number) => void;
 export type Downloadable = { fileId: string; bucketId: string };
@@ -237,129 +224,3 @@ export function downloadFileToFileSystem(
 
   return [downloadStreamPromise.then((readable) => readable.pipeTo(params.destination)), { abort: () => null }];
 }
-
-export async function getPhotoPreview(
-  {
-    photo,
-    bucketId,
-  }: {
-    photo: SerializablePhoto;
-    bucketId: string;
-  },
-  opts?: {
-    abortController: AbortController;
-  },
-): Promise<string> {
-  let previewInCache;
-  let blob: Blob;
-  try {
-    previewInCache = await getDatabasePhotosPreviewData({ photoId: photo.id });
-  } catch (err) {
-    errorService.reportError(err);
-  }
-
-  if (previewInCache && previewInCache.preview) {
-    blob = previewInCache.preview;
-  } else {
-    const { previewLink: link, previewIndex: index } = photo;
-    const mnemonic = localStorageService.getUser()?.mnemonic as string;
-    const indexBuf = Buffer.from(index, 'hex');
-    const iv = indexBuf.slice(0, 16);
-    const key = await generateFileKey(mnemonic, bucketId, indexBuf);
-    const readable = await getFileDownloadStream(
-      [link],
-      createDecipheriv('aes-256-ctr', key, iv),
-      opts?.abortController,
-    );
-
-    blob = await binaryStreamToBlob(readable);
-    try {
-      await updateDatabasePhotosPreviewData({ photoId: photo.id, preview: blob });
-    } catch (err) {
-      errorService.reportError(err);
-    }
-  }
-
-  return URL.createObjectURL(blob);
-}
-
-export async function getPhotoBlob({
-  photo,
-  bucketId,
-  abortController,
-}: {
-  photo: SerializablePhoto;
-  bucketId: string;
-  abortController?: AbortController;
-}): Promise<Blob> {
-  const previewInCache = await getDatabasePhotosSourceData({ photoId: photo.id });
-
-  if (previewInCache && previewInCache.source) {
-    return Promise.resolve(previewInCache.source);
-  }
-
-  const photoBlob = await fetchFileBlob(
-    { fileId: photo.fileId, bucketId },
-    { updateProgressCallback: () => undefined, abortController },
-  );
-
-  try {
-    await updateDatabasePhotosSourceData({ photoId: photo.id, source: photoBlob });
-  } catch (error) {
-    errorService.reportError(error);
-  }
-  return photoBlob;
-}
-
-export async function getPhotoCachedOrStream({
-  photo,
-  bucketId,
-  onProgress,
-  abortController,
-}: {
-  photo: SerializablePhoto;
-  bucketId: string;
-  onProgress?: (progress: number) => void;
-  abortController?: AbortController;
-}): Promise<Blob | ReadableStream<Uint8Array>> {
-  let previewInCache;
-
-  try {
-    previewInCache = await getDatabasePhotosSourceData({ photoId: photo.id });
-  } catch (error) {
-    errorService.reportError(error);
-  }
-
-  if (previewInCache && previewInCache.source) {
-    onProgress?.(1);
-    return Promise.resolve(previewInCache.source);
-  }
-
-  const { bridgeUser, bridgePass, encryptionKey } = getEnvironmentConfig();
-
-  const downloadedPhotoStream = await downloadFile({
-    bucketId,
-    fileId: photo.fileId,
-    creds: {
-      pass: bridgePass,
-      user: bridgeUser,
-    },
-    mnemonic: encryptionKey,
-    options: {
-      notifyProgress: (totalBytes, downloadedBytes) => onProgress && onProgress(downloadedBytes / totalBytes),
-      abortController,
-    },
-  }).catch((err: ErrorWithContext) => {
-    Sentry.captureException(err, { extra: err.context });
-
-    throw err;
-  });
-
-  const photoBlob = await binaryStreamToBlob(downloadedPhotoStream);
-  try {
-    await updateDatabasePhotosSourceData({ photoId: photo.id, source: photoBlob });
-  } catch (error) {
-    errorService.reportError(error);
-  }
-  return Promise.resolve(photoBlob);
-}
diff --git a/src/app/newSettings/PreferencesDialog.tsx b/src/app/newSettings/PreferencesDialog.tsx
new file mode 100644
index 000000000..a70e13c6a
--- /dev/null
+++ b/src/app/newSettings/PreferencesDialog.tsx
@@ -0,0 +1,113 @@
+import { RootState } from 'app/store';
+import { useEffect, useState } from 'react';
+import { Helmet } from 'react-helmet-async';
+import { useSelector } from 'react-redux';
+
+import navigationService from 'app/core/services/navigation.service';
+import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
+import Modal from 'app/shared/components/Modal';
+import { useAppDispatch } from 'app/store/hooks';
+import { uiActions } from 'app/store/slices/ui';
+import AccountSection from './Sections/Account/Account/AccountSection';
+import BillingAccountSection from './Sections/Account/Billing/BillingAccountSection';
+import PlansSection from './Sections/Account/Plans/PlansSection';
+import SecuritySection from './Sections/Account/Security/SecuritySection';
+import GeneralSection from './Sections/General/GeneralSection';
+import BillingWorkspaceSection from './Sections/Workspace/Billing/BillingWorkspaceSection';
+import MembersSection from './Sections/Workspace/Members/MembersSection';
+import OverviewSection from './Sections/Workspace/Overview/OverviewSection';
+import SectionListContainer, { sectionItems } from './containers/SectionListContainer';
+import { PreferencesDialogProps, Section, SelectSectionProps } from './types/types';
+
+const findSectionItemsBySectionAndSubsection = ({ section, subsection }: SelectSectionProps) => {
+  return sectionItems.find((item) => item.section === section && item.subsection === subsection);
+};
+
+const PreferencesDialog = (props: PreferencesDialogProps) => {
+  const { haveParamsChanged, isPreferencesDialogOpen } = props;
+  const { translate } = useTranslationContext();
+  const dispatch = useAppDispatch();
+  const selectedWorkspace = useSelector((state: RootState) => state.workspaces.selectedWorkspace);
+
+  const params = new URLSearchParams(window.location.search);
+  const currentSectionParams = params.getAll('section');
+  const currentSubsectionParams = params.getAll('subsection');
+  const [activeSection, setActiveSection] = useState<Section | undefined>({
+    section: 'General',
+    subsection: 'General',
+  });
+  const title =
+    translate(
+      `preferences.navBarSections.${activeSection?.subsection?.toLowerCase() ?? activeSection?.section.toLowerCase()}`,
+    ) ?? '';
+
+  useEffect(() => {
+    if (currentSectionParams.length > 0) {
+      const sectionParams = sectionItems.filter((section) => section.section === currentSectionParams[0]);
+      const subsectionParams = sectionParams.filter(
+        (subsection) => subsection.subsection === currentSubsectionParams[0],
+      );
+      changeSection({ section: sectionParams[0]?.section, subsection: subsectionParams[0]?.subsection });
+    } else {
+      dispatch(uiActions.setIsPreferencesDialogOpen(false));
+    }
+  }, [haveParamsChanged, isPreferencesDialogOpen]);
+
+  const changeSection = ({ section, subsection }: SelectSectionProps) => {
+    const selectedNavSection = findSectionItemsBySectionAndSubsection({ section, subsection });
+    setActiveSection(selectedNavSection);
+  };
+
+  const onClosePreferences = () => {
+    dispatch(uiActions.setIsPreferencesDialogOpen(false));
+    navigationService.closePreferencesDialog({ workspaceUuid: selectedWorkspace?.workspaceUser.workspaceId });
+  };
+
+  return (
+    <Modal
+      maxWidth="max-w-4xl"
+      className="m-0 flex h-640 overflow-hidden shadow-sm"
+      isOpen={isPreferencesDialogOpen}
+      onClose={() => onClosePreferences()}
+    >
+      <Helmet>
+        <title>{title} - Internxt Drive</title>
+      </Helmet>
+      {/* SIDEBAR MENU */}
+      <section className="w-56 shrink-0 border-r border-gray-10 px-2.5">
+        <h1 className="py-3 pl-4 text-xl font-semibold">{translate('preferences.title')}</h1>
+        <SectionListContainer activeSection={activeSection} changeSection={changeSection} />
+      </section>
+      {/* SIDEBAR MENU */}
+      <section className="w-full">
+        {activeSection?.section === 'general' && activeSection?.subsection === 'general' && (
+          <GeneralSection onClosePreferences={onClosePreferences} />
+        )}
+        {activeSection?.section === 'workspace' && activeSection?.subsection === 'overview' && (
+          <OverviewSection changeSection={changeSection} onClosePreferences={onClosePreferences} />
+        )}
+        {activeSection?.section === 'workspace' && activeSection?.subsection === 'members' && (
+          <MembersSection onClosePreferences={onClosePreferences} />
+        )}
+        {activeSection?.section === 'workspace' && activeSection?.subsection === 'billing' && (
+          <BillingWorkspaceSection onClosePreferences={onClosePreferences} changeSection={changeSection} />
+        )}
+        {activeSection?.section === 'account' && activeSection?.subsection === 'account' && (
+          <AccountSection changeSection={changeSection} onClosePreferences={onClosePreferences} />
+        )}
+        {activeSection?.section === 'account' && activeSection?.subsection === 'plans' && (
+          <PlansSection changeSection={changeSection} onClosePreferences={onClosePreferences} />
+        )}
+        {activeSection?.section === 'account' && activeSection?.subsection === 'billing' && (
+          <BillingAccountSection changeSection={changeSection} onClosePreferences={onClosePreferences} />
+        )}
+        {activeSection?.section === 'account' && activeSection?.subsection === 'security' && (
+          <SecuritySection onClosePreferences={onClosePreferences} />
+        )}
+      </section>
+      {/* ACTIVE SECTION */}
+    </Modal>
+  );
+};
+
+export default PreferencesDialog;
diff --git a/src/app/newSettings/Sections/Account/Account/AccountSection.tsx b/src/app/newSettings/Sections/Account/Account/AccountSection.tsx
new file mode 100644
index 000000000..de8abdda7
--- /dev/null
+++ b/src/app/newSettings/Sections/Account/Account/AccountSection.tsx
@@ -0,0 +1,146 @@
+import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
+import Section from 'app/newSettings/components/Section';
+import { t } from 'i18next';
+import { useEffect, useState } from 'react';
+import { useSelector } from 'react-redux';
+import { areCredentialsCorrect } from '../../../../auth/services/auth.service';
+import userService from '../../../../auth/services/user.service';
+import errorService from '../../../../core/services/error.service';
+import ClearTrashDialog from '../../../../drive/components/ClearTrashDialog/ClearTrashDialog';
+import { useTranslationContext } from '../../../../i18n/provider/TranslationProvider';
+import notificationsService, { ToastType } from '../../../../notifications/services/notifications.service';
+import Button from '../../../../shared/components/Button/Button';
+import { RootState } from '../../../../store';
+import { useAppDispatch } from '../../../../store/hooks';
+import { updateUserProfileThunk, userThunks } from '../../../../store/slices/user';
+import AccountDetailsModal from './components/AccountDetailsModal';
+import ChangeEmailModal from './components/ChangeEmailModal';
+import EmailVerificationMessageCard from './components/EmailMessageCard';
+import AccountUsageContainer from './containers/AccountUsageContainer';
+import DeleteAccountContainer from './containers/DeleteAccountContainer';
+import InviteFriendSectionContainer from './containers/InviteFriendSectionContainer';
+import InvitedFriendsContainer from './containers/InvitedFriendsContainer';
+import UserHeaderContainer from './containers/UserHeaderContainer';
+
+interface AccountSectionProps {
+  changeSection: ({ section, subsection }) => void;
+  onClosePreferences: () => void;
+}
+
+const AccountSection = ({ changeSection, onClosePreferences }: AccountSectionProps) => {
+  const dispatch = useAppDispatch();
+  const { translate } = useTranslationContext();
+  const user = useSelector<RootState, UserSettings | undefined>((state) => state.user.user);
+
+  const isFreeAccount = user?.hasReferralsProgram;
+  if (!user) throw new Error('User is not defined');
+
+  const [isDetailsModalOpen, setIsDetailsModalOpen] = useState(false);
+  const [isEmailModalOpen, setIsEmailModalOpen] = useState(false);
+  const [isSendingVerificationEmail, setIsSendingVerificationEmail] = useState(false);
+  const [isInvitationsViewVisible, setIsInvitationsViewVisible] = useState(false);
+
+  useEffect(() => {
+    dispatch(userThunks.refreshUserDataThunk());
+  }, []);
+
+  const onResendEmailVerification = async () => {
+    setIsSendingVerificationEmail(true);
+    await userService.sendVerificationEmail();
+    notificationsService.show({ text: t('notificationMessages.verificationEmail'), type: ToastType.Success });
+    setIsSendingVerificationEmail(false);
+  };
+
+  const changeUserEmail = async (newEmail) => {
+    await userService.changeEmail(newEmail);
+    notificationsService.show({
+      text: translate('views.account.tabs.account.accountDetails.changeEmail.sucessSendingVerification', {
+        email: newEmail,
+      }),
+      type: ToastType.Success,
+    });
+  };
+
+  const onChangeEmailError = (error: unknown) => {
+    notificationsService.show({
+      text: translate('views.account.tabs.account.accountDetails.changeEmail.errorSendingVerification'),
+      type: ToastType.Error,
+    });
+    errorService.reportError(error);
+  };
+
+  const updateUserProfile = async ({ name, lastname }: { name: string; lastname: string }) => {
+    await dispatch(updateUserProfileThunk({ name, lastname })).unwrap();
+    notificationsService.show({
+      text: translate('views.account.tabs.account.accountDetails.editProfile.updatedProfile'),
+      type: ToastType.Success,
+    });
+  };
+
+  return (
+    <Section
+      onBackButtonClicked={isInvitationsViewVisible ? () => setIsInvitationsViewVisible(false) : undefined}
+      title={
+        isInvitationsViewVisible
+          ? translate('preferences.account.invitedFriends')
+          : translate('preferences.account.title')
+      }
+      onClosePreferences={onClosePreferences}
+    >
+      {isInvitationsViewVisible ? (
+        <InvitedFriendsContainer />
+      ) : (
+        <>
+          <EmailVerificationMessageCard
+            isVerified={user.emailVerified}
+            disableButton={isSendingVerificationEmail}
+            onClickResendButton={onResendEmailVerification}
+          />
+          <UserHeaderContainer />
+          <div className="flex justify-center">
+            <Button variant="secondary" className="-mt-8 w-32" onClick={() => setIsDetailsModalOpen(true)}>
+              <span>{t('views.preferences.workspace.overview.edit')}</span>
+            </Button>
+          </div>
+          {isFreeAccount && (
+            <InviteFriendSectionContainer onSeeInvitationsButtonClicked={() => setIsInvitationsViewVisible(true)} />
+          )}
+          <AccountUsageContainer changeSection={changeSection} />
+          <div>
+            <div className="h-px w-full bg-gray-10" />
+          </div>
+          <DeleteAccountContainer />
+        </>
+      )}
+      <AccountDetailsModal
+        isOpen={isDetailsModalOpen}
+        onClose={() => setIsDetailsModalOpen(false)}
+        openEditEmail={() => {
+          setIsDetailsModalOpen(false);
+          setIsEmailModalOpen(true);
+        }}
+        name={user.name}
+        lastname={user.lastname}
+        email={user.email}
+        onUpdateUserProfileData={updateUserProfile}
+        onErrorUpdatingUserProfileData={() =>
+          notificationsService.show({
+            text: translate('views.account.tabs.account.accountDetails.editProfile.errorUpdatingProfile'),
+            type: ToastType.Error,
+          })
+        }
+      />
+      <ChangeEmailModal
+        isOpen={isEmailModalOpen}
+        onClose={() => setIsEmailModalOpen(false)}
+        email={user.email}
+        checkEmailCredentials={areCredentialsCorrect}
+        changeEmail={changeUserEmail}
+        onChangeEmailError={onChangeEmailError}
+      />
+      <ClearTrashDialog />
+    </Section>
+  );
+};
+
+export default AccountSection;
diff --git a/src/app/newSettings/Sections/Account/Account/components/AccountDetailsModal.tsx b/src/app/newSettings/Sections/Account/Account/components/AccountDetailsModal.tsx
new file mode 100644
index 000000000..e563dfc8a
--- /dev/null
+++ b/src/app/newSettings/Sections/Account/Account/components/AccountDetailsModal.tsx
@@ -0,0 +1,122 @@
+import { useEffect, useState } from 'react';
+import { useTranslationContext } from '../../../../../i18n/provider/TranslationProvider';
+
+import Button from '../../../../../shared/components/Button/Button';
+import Input from '../../../../../shared/components/Input';
+import Modal from '../../../../../shared/components/Modal';
+
+const AccountDetailsModal = ({
+  isOpen,
+  onClose,
+  openEditEmail,
+  name,
+  lastname,
+  email,
+  onUpdateUserProfileData,
+  onErrorUpdatingUserProfileData,
+}: {
+  isOpen: boolean;
+  onClose: () => void;
+  openEditEmail: () => void;
+  name: string;
+  lastname: string;
+  email: string;
+  onUpdateUserProfileData: ({ name, lastname }: { name: string; lastname: string }) => Promise<void>;
+  onErrorUpdatingUserProfileData: () => void;
+}) => {
+  const { translate } = useTranslationContext();
+
+  const [nameValue, setNameValue] = useState(name);
+  const [lastnameValue, setLastnameValue] = useState(lastname);
+  const emailValue = email;
+
+  const [status, setStatus] = useState<
+    { tag: 'ready' } | { tag: 'loading' } | { tag: 'error'; type: 'NAME_INVALID' | 'LASTNAME_INVALID' | 'UNKNOWN' }
+  >({ tag: 'ready' });
+
+  const nameIsInvalid = status.tag === 'error' && status.type === 'NAME_INVALID';
+  const lastnameIsInvalid = status.tag === 'error' && status.type === 'LASTNAME_INVALID';
+
+  useEffect(() => {
+    if (isOpen) {
+      setStatus({ tag: 'ready' });
+    }
+  }, [isOpen]);
+
+  const validate = (value: string) => {
+    return value.length > 0 && value.length < 20;
+  };
+
+  const onSave = async () => {
+    if (!validate(nameValue)) {
+      setStatus({ tag: 'error', type: 'NAME_INVALID' });
+    } else if (!validate(lastnameValue)) {
+      setStatus({ tag: 'error', type: 'LASTNAME_INVALID' });
+    } else {
+      try {
+        setStatus({ tag: 'loading' });
+        await onUpdateUserProfileData({ name: nameValue, lastname: lastnameValue });
+        onClose();
+      } catch {
+        setStatus({ tag: 'error', type: 'UNKNOWN' });
+        onErrorUpdatingUserProfileData();
+      }
+    }
+  };
+
+  return (
+    <Modal isOpen={isOpen} onClose={onClose}>
+      <div className="flex flex-col space-y-5">
+        <h1 className="text-2xl font-medium text-gray-80">
+          {translate('views.account.tabs.account.accountDetails.editProfile.title')}
+        </h1>
+        <div className="flex space-x-3">
+          <Input
+            disabled={status.tag === 'loading'}
+            label={translate('views.account.tabs.account.accountDetails.name')}
+            value={nameValue}
+            onChange={setNameValue}
+            accent={nameIsInvalid ? 'error' : undefined}
+            message={nameIsInvalid ? 'This name is invalid' : undefined}
+            name="firstName"
+          />
+          <Input
+            disabled={status.tag === 'loading'}
+            label={translate('views.account.tabs.account.accountDetails.lastname')}
+            value={lastnameValue}
+            onChange={setLastnameValue}
+            accent={lastnameIsInvalid ? 'error' : undefined}
+            message={lastnameIsInvalid ? 'This lastname is invalid' : undefined}
+            name="lastName"
+          />
+        </div>
+
+        <div className="flex items-end space-x-3">
+          <Input
+            disabled
+            className="flex-1"
+            label={translate('views.account.tabs.account.accountDetails.card.email')}
+            value={emailValue}
+            name="email"
+          />
+          <div className="flex h-11 items-center">
+            <Button disabled={status.tag === 'loading'} variant="secondary" onClick={openEditEmail}>
+              {translate('actions.change')}
+            </Button>
+          </div>
+        </div>
+
+        <div className="flex justify-end">
+          <Button disabled={status.tag === 'loading'} variant="secondary" onClick={onClose}>
+            {translate('actions.cancel')}
+          </Button>
+          <Button loading={status.tag === 'loading'} className="ml-2" onClick={onSave}>
+            {status.tag === 'loading' ? translate('actions.saving') : translate('actions.save')}
+          </Button>
+        </div>
+      </div>
+    </Modal>
+  );
+};
+
+export default AccountDetailsModal;
diff --git a/src/app/core/views/Preferences/tabs/Account/AvatarWrapper.tsx b/src/app/newSettings/Sections/Account/Account/components/AvatarWrapper.tsx
similarity index 100%
rename from src/app/core/views/Preferences/tabs/Account/AvatarWrapper.tsx
rename to src/app/newSettings/Sections/Account/Account/components/AvatarWrapper.tsx
diff --git a/src/app/newSettings/Sections/Account/Account/components/ChangeEmailModal.tsx b/src/app/newSettings/Sections/Account/Account/components/ChangeEmailModal.tsx
new file mode 100644
index 000000000..81c3a8710
--- /dev/null
+++ b/src/app/newSettings/Sections/Account/Account/components/ChangeEmailModal.tsx
@@ -0,0 +1,123 @@
+import { useEffect, useState } from 'react';
+import { useTranslationContext } from '../../../../../i18n/provider/TranslationProvider';
+import Button from '../../../../../shared/components/Button/Button';
+import Input from '../../../../../shared/components/Input';
+import Modal from '../../../../../shared/components/Modal';
+
+interface ChangeEmailModalProps {
+  isOpen: boolean;
+  onClose: () => void;
+  email: string;
+  checkEmailCredentials: (email: string, password: string) => Promise<boolean>;
+  changeEmail: (newEmail: string) => Promise<void>;
+  onChangeEmailError: (error: unknown) => void;
+}
+
+const ChangeEmailModal = ({
+  isOpen,
+  onClose,
+  email,
+  checkEmailCredentials,
+  changeEmail,
+  onChangeEmailError,
+}: ChangeEmailModalProps) => {
+  const { translate } = useTranslationContext();
+  const [password, setPassword] = useState<string>('');
+  const [newEmail, setNewEmail] = useState<string>('');
+
+  const [status, setStatus] = useState<
+    | { tag: 'ready' }
+    | { tag: 'loading' }
+    | { tag: 'error'; type: 'NAME_INVALID' | 'LASTNAME_INVALID' | 'PASSWORD_INVALID' | 'SAME_EMAIL' | 'UNKNOWN' }
+  >({ tag: 'ready' });
+
+  const isInvalidPasswordError = status.tag === 'error' && status.type === 'PASSWORD_INVALID';
+  const isLoadingStatus = status.tag === 'loading';
+
+  useEffect(() => {
+    if (isOpen) {
+      setStatus({ tag: 'ready' });
+    }
+  }, [isOpen]);
+
+  async function onChange(e) {
+    e.preventDefault();
+    if (email === newEmail) {
+      setStatus({ tag: 'error', type: 'SAME_EMAIL' });
+    } else {
+      try {
+        setStatus({ tag: 'loading' });
+        const correctPassword = await checkEmailCredentials(email, password);
+        if (correctPassword) {
+          await changeEmail(newEmail);
+          onClose();
+        } else {
+          setStatus({ tag: 'error', type: 'PASSWORD_INVALID' });
+        }
+      } catch (error) {
+        setStatus({ tag: 'error', type: 'UNKNOWN' });
+        onChangeEmailError(error);
+      }
+    }
+  }
+
+  return (
+    <Modal isOpen={isOpen} onClose={onClose}>
+      <form className="flex flex-col space-y-5" onSubmit={onChange}>
+        <h1 className="text-2xl font-medium text-gray-80">
+          {translate('views.account.tabs.account.accountDetails.changeEmail.title')}
+        </h1>
+
+        <div className="flex flex-col space-y-3">
+          <Input
+            disabled
+            label={translate('views.account.tabs.account.accountDetails.changeEmail.email')}
+            value={email}
+            name="email"
+          />
+          <Input
+            required
+            variant="email"
+            autoComplete="off"
+            label={translate('views.account.tabs.account.accountDetails.changeEmail.newEmail')}
+            onChange={setNewEmail}
+            accent={status.tag === 'error' && status.type === 'SAME_EMAIL' ? 'error' : undefined}
+            message={
+              status.tag === 'error' && status.type === 'SAME_EMAIL'
+                ? translate('views.account.tabs.account.accountDetails.changeEmail.errorSameEmail')
+                : undefined
+            }
+            name="newemail"
+          />
+          <Input
+            required
+            disabled={isLoadingStatus}
+            label={translate('views.account.tabs.account.accountDetails.changeEmail.password')}
+            variant="password"
+            onChange={setPassword}
+            accent={isInvalidPasswordError ? 'error' : undefined}
+            message={
+              isInvalidPasswordError
+                ? translate('views.account.tabs.account.accountDetails.changeEmail.errorPassword')
+                : undefined
+            }
+            name="password"
+          />
+        </div>
+
+        <div className="flex justify-end space-x-2">
+          <Button disabled={isLoadingStatus} variant="secondary" onClick={onClose}>
+            {translate('actions.cancel')}
+          </Button>
+          <Button loading={isLoadingStatus} type="submit">
+            {isLoadingStatus
+              ? translate('views.account.tabs.account.accountDetails.changeEmail.sendingVerification')
+              : translate('views.account.tabs.account.accountDetails.changeEmail.sendVerification')}
+          </Button>
+        </div>
+      </form>
+    </Modal>
+  );
+};
+
+export default ChangeEmailModal;
diff --git a/src/app/newSettings/Sections/Account/Account/components/EmailMessageCard.tsx b/src/app/newSettings/Sections/Account/Account/components/EmailMessageCard.tsx
new file mode 100644
index 000000000..84c06086e
--- /dev/null
+++ b/src/app/newSettings/Sections/Account/Account/components/EmailMessageCard.tsx
@@ -0,0 +1,30 @@
+import { Info } from '@phosphor-icons/react';
+import { t } from 'i18next';
+
+type EmailVerificationMessageCardProps = {
+  isVerified?: boolean;
+  disableButton?: boolean;
+  onClickResendButton: () => void;
+};
+
+const EmailVerificationMessageCard = ({
+  isVerified,
+  disableButton,
+  onClickResendButton,
+}: EmailVerificationMessageCardProps): JSX.Element => {
+  if (isVerified) return <></>;
+
+  return (
+    <div className="flex h-11 w-auto flex-row items-center rounded-lg bg-primary/10">
+      <span className="flex w-auto grow flex-row items-center px-3 py-3 text-sm font-normal text-gray-100">
+        <Info size={24} weight="fill" className="mr-2 text-primary" />
+        <span>{t('views.emailVerification.message.emailNotVerifiedPartOne')}&nbsp;</span>
+        <button onClick={onClickResendButton} disabled={disableButton} className="text-sm font-medium text-primary">
+          {t('views.emailVerification.message.emailNotVerifiedPartTwo')}
+        </button>
+      </span>
+    </div>
+  );
+};
+
+export default EmailVerificationMessageCard;
diff --git a/src/app/newSettings/Sections/Account/Account/components/TextArea.tsx b/src/app/newSettings/Sections/Account/Account/components/TextArea.tsx
new file mode 100644
index 000000000..826aa475c
--- /dev/null
+++ b/src/app/newSettings/Sections/Account/Account/components/TextArea.tsx
@@ -0,0 +1,33 @@
+interface TextAreaProps {
+  placeholder: string;
+  value: string;
+  onChangeValue: (value: string) => void;
+  disabled: boolean;
+  rows: number;
+  maxCharacters: number;
+  titleText?: string;
+}
+
+const TextArea = ({ placeholder, value, onChangeValue, disabled, rows, maxCharacters, titleText }: TextAreaProps) => {
+  return (
+    <div>
+      <span className="text-sm font-normal text-gray-80">{titleText}</span>
+      <textarea
+        placeholder={placeholder}
+        value={value}
+        onChange={(e) => onChangeValue(String(e.target.value))}
+        rows={rows}
+        disabled={disabled}
+        className="w-full resize-none rounded-md border border-gray-20 bg-transparent p-3 pl-4 text-lg font-normal text-gray-80 disabled:text-gray-40 disabled:placeholder-gray-20"
+        maxLength={maxCharacters}
+      />
+      <span className="flex w-full justify-end text-sm font-normal leading-4 text-gray-50">
+        <text>
+          {value.length}/{maxCharacters}
+        </text>
+      </span>
+    </div>
+  );
+};
+
+export default TextArea;
diff --git a/src/app/newSettings/Sections/Account/Account/components/UploadAvatarModal.tsx b/src/app/newSettings/Sections/Account/Account/components/UploadAvatarModal.tsx
new file mode 100644
index 000000000..f78354ea8
--- /dev/null
+++ b/src/app/newSettings/Sections/Account/Account/components/UploadAvatarModal.tsx
@@ -0,0 +1,155 @@
+import { Image } from '@phosphor-icons/react';
+import { Suspense, useEffect, useRef, useState } from 'react';
+import AvatarEditor from 'react-avatar-editor';
+import { useTranslationContext } from '../../../../../i18n/provider/TranslationProvider';
+import Button from '../../../../../shared/components/Button/Button';
+import Modal from '../../../../../shared/components/Modal';
+import Spinner from '../../../../../shared/components/Spinner/Spinner';
+
+interface UploadAvatarModalProps {
+  isOpen: boolean;
+  onClose: () => void;
+  onUploadAvatarClicked: ({ avatar }: { avatar: Blob }) => Promise<void>;
+  displayFileLimitMessage: () => void;
+  onSavingAvatarError: (error: unknown) => void;
+}
+const UploadAvatarModal = ({
+  isOpen,
+  onClose,
+  onUploadAvatarClicked,
+  displayFileLimitMessage,
+  onSavingAvatarError,
+}: UploadAvatarModalProps) => {
+  const { translate } = useTranslationContext();
+  const inputRef = useRef<HTMLInputElement>(null);
+  const editorRef = useRef<AvatarEditor>(null);
+  const [state, setState] = useState<
+    { tag: 'empty' } | { tag: 'editing' | 'loading' | 'error'; source: File; zoom: number }
+  >({ tag: 'empty' });
+
+  useEffect(() => {
+    if (isOpen) setState({ tag: 'empty' });
+  }, [isOpen]);
+
+  const validateFile = (file: File) => {
+    if (file.size > 1024 * 1024 * 10) {
+      displayFileLimitMessage();
+    } else {
+      setState({ tag: 'editing', source: file, zoom: 1 });
+    }
+  };
+
+  const onInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    e.preventDefault();
+    const file = e.target.files?.[0];
+
+    if (file) {
+      validateFile(file);
+    }
+  };
+
+  const onDrop = (e: React.DragEvent<HTMLDivElement>) => {
+    e.preventDefault();
+    const file = e.dataTransfer.files[0];
+
+    if (file) {
+      validateFile(file);
+    }
+  };
+
+  const onSave = async () => {
+    if (state.tag === 'empty') return;
+
+    setState({ ...state, tag: 'loading' });
+
+    try {
+      const avatarBlob = await new Promise<Blob>((resolve, reject) =>
+        editorRef.current
+          ?.getImageScaledToCanvas()
+          .toBlob((blob) => (blob ? resolve(blob) : reject(new Error('Error getting avatar image')))),
+      );
+
+      await onUploadAvatarClicked({ avatar: avatarBlob });
+
+      onClose();
+    } catch (error) {
+      onSavingAvatarError(error);
+    }
+  };
+
+  return (
+    <Modal isOpen={isOpen} onClose={onClose}>
+      <h1 className="text-2xl font-medium text-gray-80">{translate('views.account.avatar.title')}</h1>
+      <div className="mt-4">
+        {state.tag !== 'empty' ? (
+          <div>
+            <Suspense fallback={<Spinner className="mx-auto mt-4 h-10 w-10" />}>
+              <AvatarEditor
+                ref={editorRef}
+                scale={state.zoom}
+                className="mx-auto"
+                image={state.source}
+                width={320}
+                height={320}
+              />
+              <div className="mt-1 flex justify-center">
+                <input
+                  className="mx-auto"
+                  type="range"
+                  min={1}
+                  max={2}
+                  step={0.01}
+                  defaultValue={1}
+                  disabled={state.tag === 'loading'}
+                  onChange={(e) => setState({ ...state, zoom: parseFloat(e.target.value) })}
+                />
+              </div>
+            </Suspense>
+          </div>
+        ) : (
+          <>
+            <input accept="image/*" ref={inputRef} className="hidden" type="file" onChange={onInputChange} />
+            <div
+              className="flex h-32 w-full cursor-pointer items-center justify-center rounded-md border-2 border-dashed border-gray-10"
+              onClick={() => inputRef.current?.click()}
+              onDrop={onDrop}
+              onDragOver={(e) => {
+                e.stopPropagation();
+                e.preventDefault();
+                e.dataTransfer.dropEffect = 'copy';
+              }}
+              role="button"
+              tabIndex={0}
+              onKeyDown={() => inputRef.current?.click()}
+            >
+              <div className="text-gray-20 hover:text-gray-30">
+                <Image className="mx-auto" weight="light" size={80} />
+                <p className="font-medium">{translate('views.account.avatar.dragNDrop')}</p>
+              </div>
+            </div>
+          </>
+        )}
+      </div>
+      <div className="mt-6 flex justify-end">
+        <div className="flex">
+          {state.tag === 'empty' ? (
+            <Button variant="secondary" onClick={onClose}>
+              {translate('actions.cancel')}
+            </Button>
+          ) : (
+            <Button variant="secondary" onClick={() => setState({ tag: 'empty' })} disabled={state.tag === 'loading'}>
+              {translate('actions.back')}
+            </Button>
+          )}
+          {state.tag !== 'empty' && (
+            <Button loading={state.tag === 'loading'} className="ml-2" onClick={onSave}>
+              {translate('actions.save')}
+            </Button>
+          )}
+        </div>
+      </div>
+    </Modal>
+  );
+};
+
+export default UploadAvatarModal;
diff --git a/src/app/newSettings/Sections/Account/Account/components/UserHeader.tsx b/src/app/newSettings/Sections/Account/Account/components/UserHeader.tsx
new file mode 100644
index 000000000..bf01b42ee
--- /dev/null
+++ b/src/app/newSettings/Sections/Account/Account/components/UserHeader.tsx
@@ -0,0 +1,67 @@
+import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
+import { PencilSimple } from '@phosphor-icons/react';
+import { useState } from 'react';
+
+import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
+
+import Avatar from '../../../../../shared/components/Avatar';
+import Dropdown from '../../../../../shared/components/Dropdown';
+import UploadAvatarModal from './UploadAvatarModal';
+
+interface UserHeaderProps {
+  className?: string;
+  user: UserSettings;
+  avatar: Blob | null;
+  onDeleteAvatarClicked: () => void;
+  onUploadAvatarClicked: ({ avatar }: { avatar: Blob }) => Promise<void>;
+  displayFileLimitMessage: () => void;
+  onSavingAvatarError: (error: unknown) => void;
+}
+
+export default function UserHeader({
+  className = '',
+  user,
+  avatar,
+  onDeleteAvatarClicked,
+  onUploadAvatarClicked,
+  displayFileLimitMessage,
+  onSavingAvatarError,
+}: Readonly<UserHeaderProps>): JSX.Element {
+  const { translate } = useTranslationContext();
+  const [openModal, setOpenModal] = useState(false);
+  const fullName = `${user.name} ${user.lastname}`;
+
+  const dropdownOptions = [{ text: translate('views.account.avatar.updatePhoto'), onClick: () => setOpenModal(true) }];
+
+  if (user.avatar) {
+    dropdownOptions.push({ text: translate('views.account.avatar.removePhoto'), onClick: onDeleteAvatarClicked });
+  }
+
+  return (
+    <div className={`${className} flex flex-col items-center p-5`}>
+      <Dropdown
+        options={dropdownOptions}
+        classMenuItems={'-left-10 mt-0 w-max rounded-md border border-gray-10 bg-surface dark:bg-gray-5 py-1.5'}
+        openDirection={'right'}
+      >
+        <div className="relative">
+          <Avatar diameter={128} fullName={fullName} src={avatar ? URL.createObjectURL(avatar) : null} />
+          <div className="absolute bottom-0 right-0 flex h-10 w-10 items-center justify-center rounded-full border-4 border-surface bg-gray-5 text-gray-100 dark:bg-gray-10">
+            <PencilSimple size={20} />
+          </div>
+        </div>
+      </Dropdown>
+
+      <h1 className="mt-4 text-xl font-medium text-gray-80">{fullName}</h1>
+      <h2 className="leading-tight text-gray-50">{user.email}</h2>
+
+      <UploadAvatarModal
+        isOpen={openModal}
+        onClose={() => setOpenModal(false)}
+        onUploadAvatarClicked={onUploadAvatarClicked}
+        displayFileLimitMessage={displayFileLimitMessage}
+        onSavingAvatarError={onSavingAvatarError}
+      />
+    </div>
+  );
+}
diff --git a/src/app/newSettings/Sections/Account/Account/containers/AccountUsageContainer.tsx b/src/app/newSettings/Sections/Account/Account/containers/AccountUsageContainer.tsx
new file mode 100644
index 000000000..2d0cd1328
--- /dev/null
+++ b/src/app/newSettings/Sections/Account/Account/containers/AccountUsageContainer.tsx
@@ -0,0 +1,111 @@
+import { useEffect, useState } from 'react';
+
+import { RootState } from 'app/store';
+import { useAppSelector } from 'app/store/hooks';
+import { useDispatch, useSelector } from 'react-redux';
+import errorService from '../../../../../core/services/error.service';
+import navigationService from '../../../../../core/services/navigation.service';
+import usageService, { UsageDetailsProps } from '../../../../../drive/services/usage.service';
+import { useTranslationContext } from '../../../../../i18n/provider/TranslationProvider';
+import Button from '../../../../../shared/components/Button/Button';
+import Card from '../../../../../shared/components/Card';
+import Spinner from '../../../../../shared/components/Spinner/Spinner';
+import { PlanState } from '../../../../../store/slices/plan';
+import { uiActions } from '../../../../../store/slices/ui';
+import VerticalDivider from '../../../../components/VerticalDivider';
+import { getProductCaptions } from '../../../../utils/productUtils';
+import Usage from '../../../../components/Usage/Usage';
+
+const AccountUsageContainer = ({
+  className = '',
+  changeSection,
+}: Readonly<{
+  className?: string;
+  changeSection: ({ section, subsection }) => void;
+}>): JSX.Element => {
+  const { translate } = useTranslationContext();
+  const dispatch = useDispatch();
+  const [usageDetails, setUsageDetails] = useState<UsageDetailsProps | null>(null);
+
+  const plan = useSelector<RootState, PlanState>((state) => state.plan);
+  const planUsage = useAppSelector((state: RootState) => state.plan.planUsage);
+
+  const planLimitInBytes = plan.planLimit;
+  const products = getProductCaptions(usageDetails);
+  const driveProduct = products.find((product) => product.name === 'Drive');
+  const backupsProduct = products.find((product) => product.name === 'Backups');
+  const driveUsage = driveProduct ? driveProduct?.usageInBytes : 0;
+  const backupsUsage = backupsProduct ? backupsProduct?.usageInBytes : 0;
+  const selectedWorkspace = useSelector((state: RootState) => state.workspaces.selectedWorkspace);
+
+  useEffect(() => {
+    usageService
+      .getUsageDetails()
+      .then((usageDetails) => {
+        setUsageDetails(usageDetails);
+      })
+      .catch((err) => {
+        const error = errorService.castError(err);
+        errorService.reportError(error);
+      });
+  }, []);
+
+  const openTrashDialog = () => dispatch(uiActions.setIsClearTrashDialogOpen(true));
+  const navigateToPlansSubSection = () => {
+    navigationService.openPreferencesDialog({
+      section: 'account',
+      subsection: 'plans',
+      workspaceUuid: selectedWorkspace?.workspaceUser.workspaceId,
+    });
+    changeSection({ section: 'account', subsection: 'plans' });
+  };
+
+  return (
+    <Card className="space-y-6">
+      <div className={`${className} w-full space-y-6 `}>
+        {products && planUsage >= 0 && planLimitInBytes ? (
+          <>
+            <Usage
+              usedSpace={planUsage}
+              spaceLimit={planLimitInBytes}
+              driveUsage={driveUsage}
+              backupsUsage={backupsUsage}
+            />
+          </>
+        ) : (
+          <div className="flex h-36 w-full items-center justify-center">
+            <Spinner className="h-7 w-7 text-primary" />
+          </div>
+        )}
+      </div>
+
+      <Card>
+        <div className="-m-5 flex flex-row rounded-xl bg-gray-1 p-5 dark:bg-surface">
+          <div className="flex flex-col">
+            <p className="text-base font-medium text-gray-100">{translate('preferences.account.upgrade')}</p>
+            <p className="text-base font-normal text-gray-60">{translate('preferences.account.levelUpStorage')}</p>
+            <div className="mt-3">
+              <Button variant="primary" onClick={navigateToPlansSubSection}>
+                {translate('preferences.account.upgradeNow')}
+              </Button>
+            </div>
+          </div>
+          <VerticalDivider className="mx-8" />
+          <div className="flex flex-col">
+            <p className="text-base font-medium text-gray-100">{translate('preferences.account.emptyTrash')}</p>
+            <p className="text-base font-normal text-gray-60">
+              {translate('preferences.account.emptryTrashDescription')}{' '}
+            </p>
+            <div className="mt-3">
+              <Button variant="secondary" onClick={openTrashDialog}>
+                {translate('preferences.account.emptyTrash')}
+              </Button>
+            </div>
+          </div>
+        </div>
+      </Card>
+    </Card>
+  );
+};
+
+export default AccountUsageContainer;
diff --git a/src/app/newSettings/Sections/Account/Account/containers/DeleteAccountContainer.tsx b/src/app/newSettings/Sections/Account/Account/containers/DeleteAccountContainer.tsx
new file mode 100644
index 000000000..ca48c5e14
--- /dev/null
+++ b/src/app/newSettings/Sections/Account/Account/containers/DeleteAccountContainer.tsx
@@ -0,0 +1,83 @@
+import { useTranslationContext } from '../../../../../i18n/provider/TranslationProvider';
+import { useState } from 'react';
+import { useSelector } from 'react-redux';
+import authService from '../../../../../auth/services/auth.service';
+import errorService from '../../../../../core/services/error.service';
+import Section from '../../../../../newSettings/Sections/General/components/Section';
+import notificationsService, { ToastType } from '../../../../../notifications/services/notifications.service';
+import Button from '../../../../../shared/components/Button/Button';
+import Modal from '../../../../../shared/components/Modal';
+import { RootState } from '../../../../../store';
+import { PlanState } from '../../../../../store/slices/plan';
+
+const DeleteAccountContainer = (): JSX.Element => {
+  const { translate } = useTranslationContext();
+  const [isDialogOpen, setIsDialogOpen] = useState(false);
+  const [isLoading, setIsLoading] = useState(false);
+  const plan = useSelector<RootState, PlanState>((state) => state.plan);
+
+  const onClose = () => {
+    setIsDialogOpen(false);
+  };
+
+  const onClick = () => {
+    if (plan.individualSubscription?.type === 'subscription' || plan.businessSubscription?.type === 'subscription') {
+      notificationsService.show({
+        text: translate('views.account.tabs.account.deleteAccount.isSubscribed'),
+        type: ToastType.Info,
+      });
+    } else {
+      setIsDialogOpen(true);
+    }
+  };
+
+  const onConfirm = async () => {
+    try {
+      setIsLoading(true);
+      await authService.cancelAccount();
+      notificationsService.show({
+        text: translate('views.account.tabs.account.deleteAccount.confirmationEmail'),
+        type: ToastType.Success,
+      });
+      onClose();
+    } catch (err: unknown) {
+      const castedError = errorService.castError(err);
+      notificationsService.show({ text: castedError.message, type: ToastType.Error });
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
+  return (
+    <Section title={translate('views.account.tabs.account.deleteAccount.head')}>
+      <div className="max-w-sm">
+        <p className="mt-1 text-sm font-normal text-gray-60">
+          {translate('views.account.tabs.account.deleteAccount.description')}
+        </p>
+        <Button className="mt-5" variant="secondary" onClick={onClick}>
+          {translate('views.account.tabs.account.deleteAccount.head')}
+        </Button>
+      </div>
+
+      <Modal isOpen={isDialogOpen} className="max-w-sm space-y-5 p-5" onClose={onClose}>
+        <div className="flex flex-col space-y-2">
+          <p className="text-2xl font-medium text-gray-100">{translate('modals.deleteAccountModal.title')}</p>
+          <p className="text-base font-normal leading-5 text-gray-80">
+            {translate('modals.deleteAccountModal.subtitle')}
+          </p>
+        </div>
+
+        <div className="flex justify-end space-x-2">
+          <Button variant="secondary" onClick={onClose} disabled={isLoading}>
+            {translate('modals.deleteAccountModal.cancel')}
+          </Button>
+          <Button onClick={onConfirm} loading={isLoading} variant={'accent'}>
+            {translate('modals.deleteAccountModal.confirm')}
+          </Button>
+        </div>
+      </Modal>
+    </Section>
+  );
+};
+
+export default DeleteAccountContainer;
diff --git a/src/app/newSettings/Sections/Account/Account/containers/InviteFriendSectionContainer.tsx b/src/app/newSettings/Sections/Account/Account/containers/InviteFriendSectionContainer.tsx
new file mode 100644
index 000000000..1b35c2166
--- /dev/null
+++ b/src/app/newSettings/Sections/Account/Account/containers/InviteFriendSectionContainer.tsx
@@ -0,0 +1,106 @@
+import { ReferralKey } from '@internxt/sdk/dist/drive/referrals/types';
+import { Info } from '@phosphor-icons/react';
+import { useState } from 'react';
+import Section from '../../../../../newSettings/Sections/General/components/Section';
+import { useTranslationContext } from '../../../../../i18n/provider/TranslationProvider';
+import Button from '../../../../../shared/components/Button/Button';
+import Card from '../../../../../shared/components/Card';
+import Input from '../../../../../shared/components/Input';
+import { useAppSelector } from '../../../../../store/hooks';
+import VerticalDivider from '../../../../components/VerticalDivider';
+import useFriendInvites from '../../../../hooks/useInviteFriends';
+
+const DEFAULT_MAX_INVITATIONS = 5;
+
+export const ExtraStorageDiv = ({ totalGB, numberOfGBObtained }) => {
+  const { translate } = useTranslationContext();
+  return (
+    <div>
+      <div>
+        <span className="text-3xl font-medium text-gray-100">{numberOfGBObtained}</span>
+        <span className="text-xl font-medium text-gray-100">/{totalGB} GB</span>
+      </div>
+      <span className="truncate text-base font-normal text-gray-60">
+        {translate('preferences.account.extraStorage')}
+      </span>
+    </div>
+  );
+};
+
+const InviteFriendSectionContainer = ({ onSeeInvitationsButtonClicked }) => {
+  const { translate } = useTranslationContext();
+  const { invites, isLoading, inviteFriend } = useFriendInvites();
+  const [email, setEmail] = useState<string>('');
+  const [invitationStatus, setInvitationStatus] = useState<'READY' | 'LOADING' | 'CANT_INVITE_MORE'>('READY');
+
+  const referrals = useAppSelector((state) => state.referrals.list);
+  const inviteAFriendReferral = referrals.find((referral) => referral.key === ReferralKey.InviteFriends);
+  const numberOfAcceptedInvites = invites.reduce((prev, current) => prev + (current.accepted ? 1 : 0), 0);
+  const maxInvitations = inviteAFriendReferral?.steps;
+
+  return (
+    <Section title={translate('preferences.account.inviteFriend')}>
+      <Card>
+        <div className="flex flex-row">
+          {/* SEE INVITATIONS */}
+          <div className="flex w-60 flex-col justify-between space-y-4">
+            <ExtraStorageDiv numberOfGBObtained={isLoading ? '-' : numberOfAcceptedInvites} totalGB={maxInvitations} />
+            <div className="flex flex-row space-x-1">
+              {Array.from({ length: maxInvitations ?? DEFAULT_MAX_INVITATIONS }, (_, index) => (
+                <div
+                  key={index}
+                  className={`h-1 grow rounded-md ${index < numberOfAcceptedInvites ? 'bg-primary' : 'bg-gray-10'}`}
+                />
+              ))}
+            </div>
+            <div>
+              <Button variant="secondary" onClick={onSeeInvitationsButtonClicked}>
+                {translate('preferences.account.seeInvitations')}
+              </Button>
+            </div>
+          </div>
+          <VerticalDivider className="mx-2 w-36" />
+          {/* SEND INVITATION */}
+          <div className="flex flex-col justify-between">
+            <p className="text-sm font-normal leading-4 text-gray-60">
+              {translate('preferences.account.sendInvitationDescription', { N: maxInvitations })}
+            </p>
+            {invitationStatus !== 'CANT_INVITE_MORE' ? (
+              <div className="flex grow flex-col justify-end">
+                <Input
+                  placeholder={translate('preferences.account.enterFriendEmail')}
+                  disabled={invitationStatus === 'LOADING'}
+                  className="mt-4 h-10"
+                  variant="email"
+                  autoComplete="off"
+                  onChange={setEmail}
+                  value={email}
+                  name="email"
+                />
+                <div>
+                  <Button
+                    variant="primary"
+                    className="mt-2"
+                    onClick={() => inviteFriend(email, setInvitationStatus)}
+                    loading={invitationStatus === 'LOADING'}
+                  >
+                    {translate('preferences.account.sendInvitation')}
+                  </Button>
+                </div>
+              </div>
+            ) : (
+              <div className="mt-4 flex items-center ">
+                <div className="flex h-auto w-full items-center rounded-lg bg-gray-5 px-3 py-2.5 text-gray-80">
+                  <Info size={18} />
+                  <p className="ml-1.5 text-sm">{translate('inviteAFriend.errors.dailyEmailLimit')}</p>
+                </div>
+              </div>
+            )}
+          </div>
+        </div>
+      </Card>
+    </Section>
+  );
+};
+
+export default InviteFriendSectionContainer;
diff --git a/src/app/newSettings/Sections/Account/Account/containers/InvitedFriendsContainer.tsx b/src/app/newSettings/Sections/Account/Account/containers/InvitedFriendsContainer.tsx
new file mode 100644
index 000000000..29e958809
--- /dev/null
+++ b/src/app/newSettings/Sections/Account/Account/containers/InvitedFriendsContainer.tsx
@@ -0,0 +1,187 @@
+import { ReferralKey } from '@internxt/sdk/dist/drive/referrals/types';
+import { ArrowCounterClockwise, Info } from '@phosphor-icons/react';
+import { useState } from 'react';
+import userService from '../../../../../auth/services/user.service';
+import errorService from '../../../../../core/services/error.service';
+import Section from '../../../../../newSettings/Sections/General/components/Section';
+import { useTranslationContext } from '../../../../../i18n/provider/TranslationProvider';
+import notificationsService, { ToastType } from '../../../../../notifications/services/notifications.service';
+import Button from '../../../../../shared/components/Button/Button';
+import Card from '../../../../../shared/components/Card';
+import Input from '../../../../../shared/components/Input';
+import Spinner from '../../../../../shared/components/Spinner/Spinner';
+import { useAppSelector } from '../../../../../store/hooks';
+import VerticalDivider from '../../../../components/VerticalDivider';
+import useFriendInvites from '../../../../hooks/useInviteFriends';
+import { ExtraStorageDiv } from './InviteFriendSectionContainer';
+
+const InvitedFriendsContainer = () => {
+  const { translate } = useTranslationContext();
+  const { invites, isLoading, inviteFriend } = useFriendInvites();
+  const [email, setEmail] = useState<string>('');
+  const [resendingEmail, setResendingEmail] = useState<null | string>(null);
+  const [invitationStatus, setInvitationStatus] = useState<'READY' | 'LOADING' | 'CANT_INVITE_MORE'>('READY');
+
+  const referrals = useAppSelector((state) => state.referrals.list);
+  const inviteAFriendReferral = referrals.find((referral) => referral.key === ReferralKey.InviteFriends);
+  const numberOfAcceptedInvites = invites.reduce((prev, current) => prev + (current.accepted ? 1 : 0), 0);
+  const numberOfPendingInvites = invites.length - numberOfAcceptedInvites;
+  const maxInvitations = inviteAFriendReferral?.steps;
+
+  const onResend = async (email: string) => {
+    setResendingEmail(email);
+    try {
+      await userService.inviteAFriend(email);
+      notificationsService.show({
+        text: translate('success.inviteAFriend', { email }),
+        type: ToastType.Success,
+      });
+    } catch (err) {
+      const castedError = errorService.castError(err);
+      notificationsService.show({
+        text: translate('modals.friendsInvitedModal.resendError', {
+          reason: castedError.message,
+        }),
+        type: ToastType.Error,
+      });
+    } finally {
+      setResendingEmail(null);
+    }
+  };
+
+  return (
+    <Section title="" className="space-y-8">
+      <Card>
+        <div className="flex flex-col space-y-5">
+          <div className="flex flex-row">
+            {/* EXTRA STORAGE */}
+            <div className="flex flex-1 space-y-4">
+              <ExtraStorageDiv
+                numberOfGBObtained={isLoading ? '-' : numberOfAcceptedInvites}
+                totalGB={maxInvitations}
+              />
+            </div>
+            <VerticalDivider className="mx-8" />
+            {/* FRIENDS INVITED */}
+            <div className="flex flex-1 space-y-4">
+              <div>
+                <div>
+                  <span className="text-3xl font-medium text-gray-100">{isLoading ? '-' : numberOfPendingInvites}</span>
+                </div>
+                <span className=" text-base font-normal text-gray-60">
+                  {translate('preferences.account.friendsInvited')}
+                </span>
+              </div>
+            </div>
+            <VerticalDivider className="mx-8" />
+            {/* ACCEPTED REQUESTS */}
+            <div className="flex flex-1 space-y-4">
+              <div>
+                <div>
+                  <span className="text-3xl font-medium text-gray-100">
+                    {isLoading ? '-' : numberOfAcceptedInvites}
+                  </span>
+                </div>
+                <span className=" text-base font-normal text-gray-60">
+                  {translate('preferences.account.acceptedRequests')}
+                </span>
+              </div>
+            </div>
+          </div>
+
+          {/* SEND INVITATION*/}
+          <div className="flex flex-row space-x-2">
+            {invitationStatus !== 'CANT_INVITE_MORE' ? (
+              <>
+                <Input
+                  placeholder={translate('preferences.account.enterFriendEmail')}
+                  className="grow"
+                  disabled={invitationStatus === 'LOADING'}
+                  variant="email"
+                  autoComplete="off"
+                  onChange={setEmail}
+                  value={email}
+                  name="email"
+                />
+                <Button
+                  variant="primary"
+                  onClick={() => inviteFriend(email, setInvitationStatus)}
+                  loading={invitationStatus === 'LOADING'}
+                >
+                  {translate('preferences.account.sendInvitation')}
+                </Button>
+              </>
+            ) : (
+              <div className="flex h-auto w-full items-center rounded-lg bg-gray-5 px-3 py-2.5 text-gray-80">
+                <Info size={18} />
+                <p className="ml-1.5 text-sm">{translate('inviteAFriend.errors.dailyEmailLimit')}</p>
+              </div>
+            )}
+          </div>
+        </div>
+      </Card>
+
+      {/* INVITED USERS LIST  */}
+      {!isLoading && invites.length > 0 ? (
+        <div className="flex">
+          <div className="flex grow flex-col rounded-l-xl border-y border-l border-gray-10">
+            <h1 className={'flex flex-row justify-between rounded-tl-xl border-b border-gray-10 bg-gray-5 px-5 py-2'}>
+              {translate('preferences.account.user')}
+            </h1>
+            {invites.map(({ guestEmail }, i) => (
+              <div
+                key={guestEmail}
+                className={`flex flex-row justify-between border-gray-10 px-5 py-2 text-base  font-medium text-gray-100 dark:bg-gray-1 ${
+                  i === invites.length - 1 ? 'rounded-bl-xl' : ' border-b'
+                }`}
+              >
+                {guestEmail}
+              </div>
+            ))}
+          </div>
+          <div className="flex flex-col rounded-r-xl border-y border-r border-gray-10">
+            <div className="rounded-tr-xl border-b border-gray-10 bg-gray-5 py-2">
+              <h1 className={'flex w-56 flex-row justify-between rounded-tr-xl border-l border-gray-10 bg-gray-5 pl-5'}>
+                {translate('preferences.account.sendInvitation')}
+              </h1>
+            </div>
+
+            {invites.map(({ guestEmail, id, accepted }, i) => (
+              <div
+                key={guestEmail + id}
+                className={`flex w-56 flex-row items-center justify-between border-gray-10 px-5 py-2 text-base font-normal text-gray-60 dark:bg-gray-1 ${
+                  i === invites.length - 1 ? 'rounded-br-xl' : 'border-b'
+                } ${accepted ? 'text-green' : ''} `}
+              >
+                <div className="flex w-full flex-row justify-between">
+                  <text>{translate(`preferences.account.${accepted ? 'accepted' : 'pending'}`)}</text>
+                  {!accepted && (
+                    <button
+                      className="text-gray-100"
+                      disabled={resendingEmail === guestEmail}
+                      onClick={() => onResend(guestEmail)}
+                    >
+                      {resendingEmail === guestEmail ? <Spinner size={20} /> : <ArrowCounterClockwise size={20} />}
+                    </button>
+                  )}
+                </div>
+              </div>
+            ))}
+          </div>
+        </div>
+      ) : (
+        <Card>
+          <div className="flex h-40 w-full items-center justify-center">
+            {isLoading ? (
+              <Spinner className="h-8 w-8 text-gray-50" />
+            ) : (
+              <p className="text-base font-normal text-gray-50">{translate('preferences.account.noInvitations')}</p>
+            )}
+          </div>
+        </Card>
+      )}
+    </Section>
+  );
+};
+
+export default InvitedFriendsContainer;
diff --git a/src/app/newSettings/Sections/Account/Account/containers/UserHeaderContainer.tsx b/src/app/newSettings/Sections/Account/Account/containers/UserHeaderContainer.tsx
new file mode 100644
index 000000000..3f3fa3d15
--- /dev/null
+++ b/src/app/newSettings/Sections/Account/Account/containers/UserHeaderContainer.tsx
@@ -0,0 +1,54 @@
+import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
+import { useEffect, useState } from 'react';
+import { useSelector } from 'react-redux';
+import errorService from '../../../../../core/services/error.service';
+import { getDatabaseProfileAvatar } from '../../../../../drive/services/database.service';
+import { useTranslationContext } from '../../../../../i18n/provider/TranslationProvider';
+import notificationsService, { ToastType } from '../../../../../notifications/services/notifications.service';
+import { RootState } from '../../../../../store';
+import { useAppDispatch } from '../../../../../store/hooks';
+import { deleteUserAvatarThunk, updateUserAvatarThunk } from '../../../../../store/slices/user';
+import UserHeader from '../components/UserHeader';
+
+const UserHeaderContainer = () => {
+  const { translate } = useTranslationContext();
+  const dispatch = useAppDispatch();
+  const [avatarBlob, setAvatarBlob] = useState<Blob | null>(null);
+
+  const user = useSelector<RootState, UserSettings | undefined>((state) => state.user.user);
+  if (!user) throw new Error('User is not defined');
+
+  useEffect(() => {
+    getDatabaseProfileAvatar().then((avatarData) => setAvatarBlob(avatarData?.avatarBlob ?? null));
+  }, [user.avatar]);
+
+  const deleteAvatar = async () => {
+    await dispatch(deleteUserAvatarThunk()).unwrap();
+    notificationsService.show({ type: ToastType.Success, text: translate('views.account.avatar.removed') });
+  };
+
+  const uploadAvatar = async ({ avatar }: { avatar: Blob }) => {
+    try {
+      await dispatch(updateUserAvatarThunk({ avatar })).unwrap();
+      notificationsService.show({ type: ToastType.Success, text: translate('views.account.avatar.success') });
+    } catch (err) {
+      errorService.reportError(err);
+      notificationsService.show({ type: ToastType.Error, text: translate('views.account.avatar.error') });
+    }
+  };
+
+  return (
+    <UserHeader
+      user={user}
+      avatar={avatarBlob}
+      onDeleteAvatarClicked={deleteAvatar}
+      onUploadAvatarClicked={uploadAvatar}
+      displayFileLimitMessage={() =>
+        notificationsService.show({ type: ToastType.Error, text: translate('views.account.avatar.underLimitSize') })
+      }
+      onSavingAvatarError={errorService.reportError}
+    />
+  );
+};
+
+export default UserHeaderContainer;
diff --git a/src/app/newSettings/Sections/Account/Billing/BillingAccountSection.tsx b/src/app/newSettings/Sections/Account/Billing/BillingAccountSection.tsx
new file mode 100644
index 000000000..6aeb2f2f0
--- /dev/null
+++ b/src/app/newSettings/Sections/Account/Billing/BillingAccountSection.tsx
@@ -0,0 +1,83 @@
+import { t } from 'i18next';
+import { useEffect, useState } from 'react';
+import { useSelector } from 'react-redux';
+import { trackCanceledSubscription } from '../../../../analytics/services/analytics.service';
+import notificationsService, { ToastType } from '../../../../notifications/services/notifications.service';
+import paymentService from '../../../../payment/services/payment.service';
+import { RootState } from '../../../../store';
+import { useAppDispatch } from '../../../../store/hooks';
+import { PlanState, planThunks } from '../../../../store/slices/plan';
+import Section from 'app/newSettings/components/Section';
+import BillingPaymentMethodCard from '../../../components/BillingPaymentMethodCard';
+import Invoices from '../../../containers/InvoicesContainer';
+import CancelSubscription from './components/CancelSubscription';
+import BillingAccountOverview from './containers/BillingAccountOverview';
+import { UserType } from '@internxt/sdk/dist/drive/payments/types';
+import { getCurrentUsage, getPlanInfo, getPlanName } from '../Plans/utils/planUtils';
+
+interface BillingAccountSectionProps {
+  changeSection: ({ section, subsection }) => void;
+  onClosePreferences: () => void;
+}
+
+const BillingAccountSection = ({ changeSection, onClosePreferences }: BillingAccountSectionProps) => {
+  const dispatch = useAppDispatch();
+  const plan = useSelector<RootState, PlanState>((state) => state.plan);
+  const [isSubscription, setIsSubscription] = useState<boolean>(false);
+  const [cancellingSubscription, setCancellingSubscription] = useState<boolean>(false);
+  const [isCancelSubscriptionModalOpen, setIsCancelSubscriptionModalOpen] = useState<boolean>(false);
+  const [planName, setPlanName] = useState<string>('');
+  const [planInfo, setPlanInfo] = useState<string>('');
+  const [currentUsage, setCurrentUsage] = useState<number>(-1);
+
+  useEffect(() => {
+    plan.individualSubscription?.type === 'subscription' ? setIsSubscription(true) : setIsSubscription(false);
+    setPlanName(getPlanName(plan.individualPlan || plan.teamPlan, plan.planLimit));
+    setPlanInfo(getPlanInfo(plan.individualPlan || plan.teamPlan));
+    setCurrentUsage(getCurrentUsage(plan.usageDetails));
+  }, [plan.individualSubscription]);
+
+  async function cancelSubscription(feedback: string) {
+    setCancellingSubscription(true);
+    try {
+      await paymentService.cancelSubscription();
+      notificationsService.show({ text: t('notificationMessages.successCancelSubscription') });
+      setIsCancelSubscriptionModalOpen(false);
+      trackCanceledSubscription({ feedback });
+    } catch (err) {
+      console.error(err);
+      notificationsService.show({
+        text: t('notificationMessages.errorCancelSubscription'),
+        type: ToastType.Error,
+      });
+    } finally {
+      setCancellingSubscription(false);
+      setTimeout(() => {
+        dispatch(planThunks.initializeThunk()).unwrap();
+      }, 1000);
+    }
+  }
+
+  return (
+    <Section title={t('preferences.workspace.billing.title')} onClosePreferences={onClosePreferences}>
+      <BillingAccountOverview plan={plan} changeSection={changeSection} />
+      <BillingPaymentMethodCard userType={UserType.Individual} />
+      {plan.individualSubscription?.type == 'subscription' && (
+        <Invoices subscriptionId={plan.individualSubscription.subscriptionId} />
+      )}
+      {isSubscription && (
+        <CancelSubscription
+          isCancelSubscriptionModalOpen={isCancelSubscriptionModalOpen}
+          setIsCancelSubscriptionModalOpen={setIsCancelSubscriptionModalOpen}
+          cancellingSubscription={cancellingSubscription}
+          cancelSubscription={cancelSubscription}
+          planName={planName}
+          planInfo={planInfo}
+          currentUsage={currentUsage}
+        />
+      )}
+    </Section>
+  );
+};
+
+export default BillingAccountSection;
diff --git a/src/app/newSettings/Sections/Account/Billing/components/CancelSubscription.tsx b/src/app/newSettings/Sections/Account/Billing/components/CancelSubscription.tsx
new file mode 100644
index 000000000..0d3806252
--- /dev/null
+++ b/src/app/newSettings/Sections/Account/Billing/components/CancelSubscription.tsx
@@ -0,0 +1,57 @@
+import { t } from 'i18next';
+import Button from '../../../../../shared/components/Button/Button';
+import CancelSubscriptionModal from '../../../Workspace/Billing/CancelSubscriptionModal';
+import { UserType } from '@internxt/sdk/dist/drive/payments/types';
+
+interface CancelSubscriptionProps {
+  isCancelSubscriptionModalOpen: boolean;
+  setIsCancelSubscriptionModalOpen: (isCancelSubscriptionModalOpen) => void;
+  cancellingSubscription: boolean;
+  cancelSubscription: (string) => void;
+  planName: string;
+  planInfo: string;
+  currentUsage: number;
+  userType?: UserType;
+}
+
+const CancelSubscription = ({
+  isCancelSubscriptionModalOpen,
+  setIsCancelSubscriptionModalOpen,
+  cancellingSubscription,
+  cancelSubscription,
+  planName,
+  planInfo,
+  currentUsage,
+  userType = UserType.Individual,
+}: CancelSubscriptionProps) => {
+  const onCancelSubscriptionButtonClicked = () => {
+    setIsCancelSubscriptionModalOpen(true);
+  };
+  return (
+    <section className="mt-8 border-t border-gray-10 pt-8">
+      <h3 className="mb-1 text-lg font-medium text-gray-100">
+        {t('preferences.workspace.billing.cancelSubscription.title')}
+      </h3>
+      <p className="font-regular mb-3 text-sm text-gray-60">
+        {t('preferences.workspace.billing.cancelSubscription.text')}
+      </p>
+      <Button variant="secondary" onClick={onCancelSubscriptionButtonClicked}>
+        {t('preferences.workspace.billing.cancelSubscription.button')}
+      </Button>
+      <CancelSubscriptionModal
+        isOpen={isCancelSubscriptionModalOpen}
+        onClose={() => {
+          setIsCancelSubscriptionModalOpen(false);
+        }}
+        cancellingSubscription={cancellingSubscription}
+        cancelSubscription={cancelSubscription}
+        currentPlanName={planName}
+        currentPlanInfo={planInfo}
+        currentUsage={currentUsage}
+        userType={userType}
+      />
+    </section>
+  );
+};
+
+export default CancelSubscription;
diff --git a/src/app/newSettings/Sections/Account/Billing/containers/BillingAccountOverview.tsx b/src/app/newSettings/Sections/Account/Billing/containers/BillingAccountOverview.tsx
new file mode 100644
index 000000000..4b937d388
--- /dev/null
+++ b/src/app/newSettings/Sections/Account/Billing/containers/BillingAccountOverview.tsx
@@ -0,0 +1,93 @@
+import { t } from 'i18next';
+
+import { RootState } from 'app/store';
+import { useSelector } from 'react-redux';
+
+import localStorageService from 'app/core/services/local-storage.service';
+import navigationService from 'app/core/services/navigation.service';
+import { bytesToString } from '../../../../../drive/services/size.service';
+
+import Card from 'app/shared/components/Card';
+
+import Button from 'app/shared/components/Button/Button';
+import { PlanState } from 'app/store/slices/plan';
+import { getNextBillingDate, getSubscriptionData } from '../../../../utils/suscriptionUtils';
+
+interface BillingAccountOverviewProps {
+  plan: PlanState;
+  changeSection: ({ section, subsection }) => void;
+}
+
+const BillingAccountOverview = ({ plan, changeSection }: BillingAccountOverviewProps) => {
+  const local = localStorageService.get('i18nextLng') ?? navigator.language.split('-')[0];
+  const isSubscription = plan.individualSubscription?.type === 'subscription';
+  const isFreeSubscription = plan.individualSubscription?.type === 'free';
+  const isLifetimeSubscription = plan.individualSubscription?.type === 'lifetime';
+
+  const subscriptionData: { amountInterval: string; interval: 'monthly' | 'yearly'; renewDate: string } | undefined =
+    getSubscriptionData({ userSubscription: plan.individualSubscription, plan, local });
+  const nextBillingDate = getNextBillingDate(plan.individualSubscription);
+  const selectedWorkspace = useSelector((state: RootState) => state.workspaces.selectedWorkspace);
+
+  return (
+    <section className="flex flex-row">
+      <Card className="mr-3 flex basis-56">
+        <div>
+          <p className="text-3xl font-medium text-gray-100">{bytesToString(plan.planLimit, false)}</p>
+          <p className="font-regular text-base text-gray-60">
+            {isSubscription && <span>{subscriptionData?.amountInterval}</span>}
+            {isLifetimeSubscription && <span>{t('preferences.workspace.billing.lifetimeSubscription.planType')}</span>}
+            {isFreeSubscription && <span>{t('preferences.workspace.billing.freeSubscription.planType')}</span>}
+          </p>
+        </div>
+      </Card>
+      <Card className={`ml-3 basis-full ${isFreeSubscription && 'border-primary/25 !bg-primary/5 p-6'}`}>
+        {isSubscription && (
+          <div>
+            <p className="mb-0.5 text-3xl font-medium text-gray-100">{subscriptionData?.renewDate}</p>
+            <p className="font-regular text-base text-gray-60">
+              {t('preferences.workspace.billing.nextBillingDate')} ({nextBillingDate})
+            </p>
+          </div>
+        )}
+        {isLifetimeSubscription && (
+          <div className="flex h-full flex-col justify-end">
+            <hr className="mb-4 h-0.5 w-8 border-0 bg-gray-100" />
+            <p className="font-regular text-base text-gray-60">
+              {t('preferences.workspace.billing.lifetimeSubscription.text')}
+            </p>
+          </div>
+        )}
+        {isFreeSubscription && (
+          <div className="flex flex-row">
+            <div className="mr-8">
+              <p className="font-regular text-base text-gray-100">
+                {t('preferences.workspace.billing.freeSubscription.action')}
+              </p>
+              <p className="font-regular mt-1 text-sm text-gray-60">
+                {t('preferences.workspace.billing.freeSubscription.actionDescription')}
+              </p>
+            </div>
+            <div className="flex flex-col-reverse">
+              <Button
+                variant="primary"
+                onClick={() => {
+                  navigationService.openPreferencesDialog({
+                    section: 'account',
+                    subsection: 'plans',
+                    workspaceUuid: selectedWorkspace?.workspaceUser.workspaceId,
+                  });
+                  changeSection({ section: 'account', subsection: 'plans' });
+                }}
+              >
+                {t('preferences.workspace.billing.freeSubscription.action')}
+              </Button>
+            </div>
+          </div>
+        )}
+      </Card>
+    </section>
+  );
+};
+
+export default BillingAccountOverview;
diff --git a/src/app/newSettings/Sections/Account/Plans/PlansSection.tsx b/src/app/newSettings/Sections/Account/Plans/PlansSection.tsx
new file mode 100644
index 000000000..3767c9ba4
--- /dev/null
+++ b/src/app/newSettings/Sections/Account/Plans/PlansSection.tsx
@@ -0,0 +1,481 @@
+import { DisplayPrice, UserType } from '@internxt/sdk/dist/drive/payments/types';
+import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
+import { WorkspaceData } from '@internxt/sdk/dist/workspaces';
+import Section from 'app/newSettings/components/Section';
+import { useCallback, useEffect, useState } from 'react';
+import { useSelector } from 'react-redux';
+import { trackCanceledSubscription } from '../../../../analytics/services/analytics.service';
+import errorService from '../../../../core/services/error.service';
+import navigationService from '../../../../core/services/navigation.service';
+import { bytesToString } from '../../../../drive/services/size.service';
+import { FreeStoragePlan } from '../../../../drive/types';
+import { useTranslationContext } from '../../../../i18n/provider/TranslationProvider';
+import notificationsService, { ToastType } from '../../../../notifications/services/notifications.service';
+import moneyService from '../../../../payment/services/money.service';
+import paymentService from '../../../../payment/services/payment.service';
+import { RootState } from '../../../../store';
+import { useAppDispatch } from '../../../../store/hooks';
+import { PlanState, planThunks } from '../../../../store/slices/plan';
+import CancelSubscriptionModal from '../../Workspace/Billing/CancelSubscriptionModal';
+import { createCheckoutSession, fetchPlanPrices, getStripe } from './api/plansApi';
+import ChangePlanDialog from './components/ChangePlanDialog';
+import PlanCard from './components/PlanCard';
+import PlanSelectionCard from './components/PlanSelectionCard';
+import IntervalSwitch from './components/TabButton';
+import { displayAmount, getCurrentChangePlanType, getCurrentUsage, getPlanInfo, getPlanName } from './utils/planUtils';
+
+interface PlansSectionProps {
+  changeSection: ({ section, subsection }) => void;
+  onClosePreferences: () => void;
+}
+
+const PlansSection = ({ changeSection, onClosePreferences }: PlansSectionProps) => {
+  const { translate } = useTranslationContext();
+  const dispatch = useAppDispatch();
+  const FREE_PLAN_DATA = {
+    amount: 0,
+    bytes: FreeStoragePlan.storageLimit,
+    id: 'free',
+    currency: translate('preferences.account.plans.freeForever'),
+    interval: 'month',
+  } as DisplayPrice;
+
+  const selectedWorkspace = useSelector((state: RootState) => state.workspaces.selectedWorkspace);
+  const plan = useSelector<RootState, PlanState>((state) => state.plan);
+  const user = useSelector<RootState, UserSettings | undefined>((state) => state.user.user);
+  const workspaces = useSelector<RootState, WorkspaceData[]>((state) => state.workspaces.workspaces);
+  const isUserOwningWorkspace = workspaces.some((workspace) => workspace.workspace.ownerId === user?.uuid);
+
+  const { individualSubscription, businessSubscription } = plan;
+  let stripe;
+
+  if (user === undefined) throw new Error('User is not defined');
+
+  const [isLoadingCheckout, setIsLoadingCheckout] = useState(false);
+
+  const [individualPrices, setIndividualPrices] = useState<DisplayPrice[]>([]);
+  const [businessPrices, setBusinessPrices] = useState<DisplayPrice[]>([]);
+
+  const [selectedSubscription, setSelectedSubscription] = useState<UserType>(UserType.Individual);
+  const isIndividualSubscriptionSelected = selectedSubscription == UserType.Individual;
+  const isBussinessSubscriptionSelected = selectedSubscription == UserType.Business;
+
+  const defaultInterval = plan.individualPlan?.renewalPeriod === 'monthly' ? 'month' : 'year';
+  const [selectedInterval, setSelectedInterval] = useState<DisplayPrice['interval']>(defaultInterval);
+  const [isCancelSubscriptionModalOpen, setIsCancelSubscriptionModalOpen] = useState(false);
+  const [cancellingSubscription, setCancellingSubscription] = useState(false);
+
+  const [isDialogOpen, setIsDialogOpen] = useState(false);
+  const [priceSelected, setPriceSelected] = useState<DisplayPrice>(FREE_PLAN_DATA);
+  const currentChangePlanType = getCurrentChangePlanType({
+    priceSelected,
+    currentUserSubscription: isIndividualSubscriptionSelected ? individualSubscription : businessSubscription,
+    planLimit: isIndividualSubscriptionSelected ? plan.planLimit : plan.businessPlanLimit,
+    isFreePriceSelected: priceSelected?.id === 'free',
+  });
+
+  const pricesFilteredAndSorted = (userType: UserType) =>
+    userType == UserType.Individual
+      ? individualPrices?.filter((price) => price.interval === selectedInterval).sort((a, b) => a.amount - b.amount)
+      : businessPrices?.filter((price) => price.interval === selectedInterval).sort((a, b) => a.amount - b.amount);
+
+  useEffect(() => {
+    fetchDataAndSetPrices();
+
+    stripe = getStripe(stripe);
+  }, []);
+
+  const handleOnPlanSelected = (price: DisplayPrice) => {
+    const subs = isIndividualSubscriptionSelected ? individualSubscription : businessSubscription;
+    if (subs?.type === 'free' && currentChangePlanType === 'upgrade') {
+      onChangePlanClicked(price.id, price.currency);
+      return;
+    }
+
+    if (currentChangePlanType === 'manageBilling' && isIndividualSubscriptionSelected) {
+      navigationService.openPreferencesDialog({
+        section: 'account',
+        subsection: 'billing',
+        workspaceUuid: selectedWorkspace?.workspaceUser.workspaceId,
+      });
+      changeSection({ section: 'account', subsection: 'billing' });
+    } else if (currentChangePlanType === 'manageBilling' && !isIndividualSubscriptionSelected) {
+      navigationService.openPreferencesDialog({
+        section: 'workspace',
+        subsection: 'billing',
+        workspaceUuid: selectedWorkspace?.workspaceUser.workspaceId,
+      });
+      changeSection({ section: 'workspace', subsection: 'billing' });
+    } else if (currentChangePlanType === 'free') {
+      navigationService.openPreferencesDialog({
+        section: 'account',
+        subsection: 'account',
+        workspaceUuid: selectedWorkspace?.workspaceUser.workspaceId,
+      });
+      changeSection({ section: 'account', subsection: 'account' });
+    } else {
+      setPriceSelected(price);
+      setIsDialogOpen(true);
+    }
+  };
+
+  const fetchDataAndSetPrices = useCallback(async () => {
+    try {
+      const individualPrices = await fetchPlanPrices(UserType.Individual);
+      const businessPrices = await fetchPlanPrices(UserType.Business);
+
+      setIndividualPrices(individualPrices);
+      setBusinessPrices(businessPrices);
+    } catch (error) {
+      const errorCasted = errorService.castError(error);
+      errorService.reportError(errorCasted);
+    }
+  }, []);
+
+  const showCancelSubscriptionErrorNotificacion = useCallback(
+    () =>
+      notificationsService.show({
+        text: translate('notificationMessages.errorCancelSubscription'),
+        type: ToastType.Error,
+      }),
+    [translate],
+  );
+
+  const showSuccessSubscriptionNotification = useCallback(
+    () => notificationsService.show({ text: 'Subscription updated successfully', type: ToastType.Success }),
+    [translate],
+  );
+
+  const handlePaymentSuccess = () => {
+    showSuccessSubscriptionNotification();
+    dispatch(planThunks.initializeThunk()).unwrap();
+  };
+
+  const handleSubscriptionPayment = async (priceId: string) => {
+    try {
+      stripe = await getStripe(stripe);
+      const updatedSubscription = await paymentService.updateSubscriptionPrice(priceId);
+      if (updatedSubscription.request3DSecure) {
+        stripe
+          .confirmCardPayment(updatedSubscription.clientSecret)
+          .then(async (result) => {
+            if (result.error) {
+              notificationsService.show({
+                type: ToastType.Error,
+                text: result.error.message as string,
+              });
+            } else {
+              showSuccessSubscriptionNotification();
+              dispatch(planThunks.initializeThunk()).unwrap();
+            }
+          })
+          .catch((err) => {
+            const error = errorService.castError(err);
+            errorService.reportError(error);
+            showCancelSubscriptionErrorNotificacion();
+          });
+      } else {
+        handlePaymentSuccess();
+      }
+    } catch (err) {
+      const error = errorService.castError(err);
+      errorService.reportError(error);
+      showCancelSubscriptionErrorNotificacion();
+    }
+  };
+
+  const handleCheckoutSession = async ({
+    priceId,
+    currency,
+    userEmail,
+    mode,
+  }: {
+    userEmail: string;
+    priceId: string;
+    mode: string;
+    currency: string;
+  }) => {
+    try {
+      const response = await createCheckoutSession({ userEmail, priceId, currency, mode });
+      localStorage.setItem('sessionId', response.sessionId);
+      await paymentService.redirectToCheckout(response);
+    } catch (err) {
+      const error = errorService.castError(err);
+      errorService.reportError(error);
+      showCancelSubscriptionErrorNotificacion();
+    }
+  };
+
+  const handleLifetimeCheckout = async ({
+    priceId,
+    currency,
+    userEmail,
+  }: {
+    userEmail: string;
+    priceId: string;
+    currency: string;
+  }) => {
+    try {
+      const response = await createCheckoutSession({
+        userEmail,
+        priceId,
+        currency,
+        mode: 'payment',
+      });
+      localStorage.setItem('sessionId', response.sessionId);
+      await paymentService.redirectToCheckout(response).then(async (result) => {
+        await paymentService.cancelSubscription(selectedSubscription);
+        if (result.error) {
+          notificationsService.show({
+            type: ToastType.Error,
+            text: result.error.message as string,
+          });
+          return;
+        }
+
+        notificationsService.show({
+          type: ToastType.Success,
+          text: 'Payment successful',
+        });
+      });
+    } catch (err) {
+      const error = errorService.castError(err);
+      errorService.reportError(error);
+      showCancelSubscriptionErrorNotificacion();
+    }
+  };
+
+  const onChangePlanClicked = async (priceId: string, currency: string) => {
+    setIsLoadingCheckout(true);
+    const isCurrentPlanTypeSubscription = isIndividualSubscriptionSelected
+      ? individualSubscription?.type === 'subscription'
+      : businessSubscription?.type === 'subscription';
+
+    if (!isCurrentPlanTypeSubscription) {
+      const mode = selectedInterval === 'lifetime' ? 'payment' : 'subscription';
+      await handleCheckoutSession({ priceId, currency, userEmail: user.email, mode });
+      setIsDialogOpen(false);
+    } else {
+      const isLifetimeIntervalSelected = selectedInterval === 'lifetime';
+      if (isLifetimeIntervalSelected) {
+        await handleLifetimeCheckout({ priceId, currency, userEmail: user.email });
+      } else {
+        await handleSubscriptionPayment(priceId);
+        dispatch(planThunks.initializeThunk()).unwrap();
+        setIsDialogOpen(false);
+      }
+    }
+    setIsLoadingCheckout(false);
+  };
+
+  async function cancelSubscription(feedback: string) {
+    setCancellingSubscription(true);
+    try {
+      await paymentService.cancelSubscription(selectedSubscription);
+      notificationsService.show({ text: translate('notificationMessages.successCancelSubscription') });
+      setIsCancelSubscriptionModalOpen(false);
+      trackCanceledSubscription({ feedback });
+    } catch (error) {
+      errorService.reportError(error);
+      notificationsService.show({
+        text: translate('notificationMessages.errorCancelSubscription'),
+        type: ToastType.Error,
+      });
+    } finally {
+      setCancellingSubscription(false);
+      setTimeout(() => {
+        dispatch(planThunks.initializeThunk()).unwrap();
+      }, 1000);
+    }
+  }
+
+  const shouldDisplayChangePlanDialog = () =>
+    (isIndividualSubscriptionSelected &&
+      plan.individualPlan?.planId != priceSelected.id &&
+      individualPrices.find((p) => p.id == priceSelected.id)) ||
+    (!isIndividualSubscriptionSelected &&
+      plan.businessPlan?.planId != priceSelected.id &&
+      businessPrices.find((p) => p.id == priceSelected.id));
+
+  const getDefaultPlanPrice = (userType: UserType): DisplayPrice | undefined => {
+    const planId = userType === UserType.Individual ? plan.individualPlan?.planId : plan.businessPlan?.planId;
+
+    const price =
+      userType === UserType.Individual
+        ? individualPrices.find((i) => i.id == planId)
+        : businessPrices.find((i) => i.id == planId);
+    if (price) return price;
+
+    const intervalPrice =
+      userType === UserType.Individual
+        ? individualPrices.filter((p) => p.interval == selectedInterval)[0]
+        : businessPrices.filter((p) => p.interval == selectedInterval)[0];
+    if (intervalPrice) return intervalPrice;
+
+    const firstPrice = userType === UserType.Individual ? individualPrices[0] : businessPrices[0];
+    if (firstPrice) setSelectedInterval(firstPrice.interval);
+    return firstPrice;
+  };
+
+  const handleSubscriptionInterval = (userType: UserType) => {
+    if (userType !== selectedSubscription) {
+      setSelectedSubscription(userType);
+      const price = getDefaultPlanPrice(userType);
+      if (price) setPriceSelected(price);
+    }
+  };
+
+  return (
+    <Section title="Plans" onClosePreferences={onClosePreferences}>
+      {shouldDisplayChangePlanDialog() && priceSelected && (
+        <ChangePlanDialog
+          prices={isIndividualSubscriptionSelected ? individualPrices : businessPrices}
+          isDialgOpen={isDialogOpen}
+          setIsDialogOpen={setIsDialogOpen}
+          onPlanClick={onChangePlanClicked}
+          priceIdSelected={priceSelected.id}
+          subscriptionSelected={selectedSubscription}
+        />
+      )}
+      <div className="flex flex-col">
+        <div className="mb-2 flex justify-center">
+          <div className="flex flex-row rounded-lg bg-gray-5 p-0.5 text-sm">
+            <IntervalSwitch
+              active={isIndividualSubscriptionSelected}
+              text={translate('general.workspaces.personal')}
+              onClick={() => handleSubscriptionInterval(UserType.Individual)}
+            />
+            <IntervalSwitch
+              active={!isIndividualSubscriptionSelected}
+              text={translate('general.workspaces.business')}
+              onClick={() => handleSubscriptionInterval(UserType.Business)}
+            />
+          </div>
+        </div>
+        <div className="flex justify-center">
+          <div className="flex flex-row rounded-lg bg-gray-5 p-0.5 text-sm">
+            <IntervalSwitch
+              active={selectedInterval === 'month'}
+              text={translate('general.renewal.monthly')}
+              onClick={() => setSelectedInterval('month')}
+            />
+            <IntervalSwitch
+              active={selectedInterval === 'year'}
+              text={translate('general.renewal.annually')}
+              onClick={() => setSelectedInterval('year')}
+            />
+            {isIndividualSubscriptionSelected && (
+              <IntervalSwitch
+                active={selectedInterval === 'lifetime'}
+                text={translate('general.renewal.lifetime')}
+                onClick={() => setSelectedInterval('lifetime')}
+              />
+            )}
+          </div>
+        </div>
+      </div>
+      <div className="flex flex-row space-x-6">
+        <div className="flex flex-1 flex-col items-stretch space-y-2.5">
+          {isIndividualSubscriptionSelected && individualPrices && (
+            <PlanSelectionCard
+              key={FREE_PLAN_DATA.id}
+              onClick={() => setPriceSelected(FREE_PLAN_DATA)}
+              isSelected={priceSelected?.id === FREE_PLAN_DATA.id}
+              capacity={bytesToString(FREE_PLAN_DATA.bytes)}
+              currency={FREE_PLAN_DATA.currency}
+              amount={''}
+              billing={''}
+              isCurrentPlan={FREE_PLAN_DATA.id === individualSubscription?.type}
+            />
+          )}
+          {pricesFilteredAndSorted(selectedSubscription).map((plan) => (
+            <PlanSelectionCard
+              key={plan.id}
+              onClick={() => setPriceSelected(plan)}
+              isSelected={priceSelected?.id === plan.id}
+              capacity={bytesToString(plan.bytes)}
+              currency={moneyService.getCurrencySymbol(plan.currency.toUpperCase())}
+              amount={displayAmount(plan.amount, plan.interval === 'lifetime' ? 0 : 2)}
+              billing={
+                plan.interval === 'lifetime'
+                  ? translate('views.account.tabs.plans.card.oneTimePayment')
+                  : translate(`preferences.account.plans.${plan.interval}`)?.toLowerCase()
+              }
+              isCurrentPlan={
+                isIndividualSubscriptionSelected
+                  ? individualSubscription?.type === 'subscription' && individualSubscription?.priceId === plan.id
+                  : businessSubscription?.type === 'subscription' && businessSubscription?.priceId === plan.id
+              }
+              displayBillingSlash={plan.interval !== 'lifetime'}
+              isBusiness={isBussinessSubscriptionSelected}
+            />
+          ))}
+        </div>
+        {priceSelected?.id === FREE_PLAN_DATA.id ? (
+          <PlanCard
+            onClick={() => setIsCancelSubscriptionModalOpen(true)}
+            isCurrentPlan={FREE_PLAN_DATA.id === individualSubscription?.type}
+            capacity={bytesToString(priceSelected?.bytes ?? 0)}
+            currency={translate('preferences.account.plans.freeForever')}
+            price={''}
+            billing={''}
+            changePlanType={currentChangePlanType}
+            isLoading={isLoadingCheckout}
+            disableActionButton={false}
+          />
+        ) : (
+          <PlanCard
+            onClick={() => handleOnPlanSelected(priceSelected)}
+            isCurrentPlan={
+              isIndividualSubscriptionSelected
+                ? individualSubscription?.type === 'subscription' &&
+                  individualSubscription?.priceId === priceSelected.id
+                : businessSubscription?.type === 'subscription' && businessSubscription?.priceId === priceSelected.id
+            }
+            capacity={bytesToString(priceSelected?.bytes ?? 0)}
+            currency={
+              priceSelected?.currency
+                ? moneyService.getCurrencySymbol(priceSelected?.currency)
+                : translate('preferences.account.plans.freeForever')
+            }
+            price={priceSelected ? displayAmount(priceSelected.amount) : '0'}
+            billing={
+              priceSelected ? translate(`preferences.account.plans.${priceSelected.interval}`).toLowerCase() : ''
+            }
+            changePlanType={currentChangePlanType}
+            isLoading={isLoadingCheckout}
+            disableActionButton={isUserOwningWorkspace && isBussinessSubscriptionSelected}
+            isBusiness={isBussinessSubscriptionSelected}
+          />
+        )}
+      </div>
+
+      <CancelSubscriptionModal
+        isOpen={isCancelSubscriptionModalOpen}
+        onClose={() => {
+          setIsCancelSubscriptionModalOpen(false);
+        }}
+        cancellingSubscription={cancellingSubscription}
+        cancelSubscription={cancelSubscription}
+        currentPlanName={
+          isIndividualSubscriptionSelected
+            ? getPlanName(plan.individualPlan || plan.teamPlan, plan.planLimit)
+            : getPlanName(plan.businessPlan, plan.businessPlanLimit)
+        }
+        currentPlanInfo={
+          isIndividualSubscriptionSelected
+            ? getPlanInfo(plan.individualPlan || plan.teamPlan)
+            : getPlanInfo(plan.businessPlan)
+        }
+        currentUsage={
+          isIndividualSubscriptionSelected
+            ? getCurrentUsage(plan.usageDetails)
+            : getCurrentUsage(plan.businessPlanUsageDetails)
+        }
+        userType={selectedSubscription}
+      />
+    </Section>
+  );
+};
+
+export default PlansSection;
diff --git a/src/app/newSettings/Sections/Account/Plans/api/plansApi.ts b/src/app/newSettings/Sections/Account/Plans/api/plansApi.ts
new file mode 100644
index 000000000..d9084d4c7
--- /dev/null
+++ b/src/app/newSettings/Sections/Account/Plans/api/plansApi.ts
@@ -0,0 +1,72 @@
+import { Stripe, loadStripe } from '@stripe/stripe-js';
+import envService from '../../../../../core/services/env.service';
+import errorService from '../../../../../core/services/error.service';
+import paymentService from '../../../../../payment/services/payment.service';
+import { UserType } from '@internxt/sdk/dist/drive/payments/types';
+
+const COUNTRY_API = process.env.REACT_APP_COUNTRY_API_URL;
+const productValue = {
+  US: 'usd',
+  CA: 'usd',
+};
+
+const getCountry = async () =>
+  fetch(`${COUNTRY_API}`, {
+    method: 'GET',
+  });
+
+const getPlanPrices = async ({
+  currencyValue = 'eur',
+  userType = UserType.Individual,
+}: {
+  currencyValue: string;
+  userType: UserType;
+}) => paymentService.getPrices(currencyValue, userType);
+
+const fetchPlanPrices = async (userType: UserType) => {
+  try {
+    const { country } = await getCountry().then((res) => res.json());
+    const currencyValue = productValue[country] || 'eur';
+
+    return getPlanPrices({ currencyValue, userType });
+  } catch (error) {
+    const errorCasted = errorService.castError(error);
+    errorService.reportError(errorCasted);
+
+    // by default in euros
+    return getPlanPrices({ currencyValue: 'eur', userType });
+  }
+};
+
+const createCheckoutSession = async ({
+  userEmail,
+  priceId,
+  mode,
+  currency,
+}: {
+  userEmail: string;
+  priceId: string;
+  mode: string;
+  currency: string;
+}) => {
+  return paymentService.createCheckoutSession({
+    price_id: priceId,
+    success_url: `${window.location.origin}/checkout/success`,
+    cancel_url: `${window.location.origin}/checkout/cancel?price_id=${priceId}`,
+    customer_email: userEmail,
+    mode: mode,
+    currency: currency,
+  });
+};
+
+const getStripe = async (stripe): Promise<Stripe> => {
+  if (!stripe) {
+    stripe = (await loadStripe(
+      envService.isProduction() ? process.env.REACT_APP_STRIPE_PK : process.env.REACT_APP_STRIPE_TEST_PK,
+    )) as Stripe;
+  }
+
+  return stripe;
+};
+
+export { createCheckoutSession, fetchPlanPrices, getStripe };
diff --git a/src/app/newSettings/Sections/Account/Plans/components/ChangePlanDialog.tsx b/src/app/newSettings/Sections/Account/Plans/components/ChangePlanDialog.tsx
new file mode 100644
index 000000000..292e7d821
--- /dev/null
+++ b/src/app/newSettings/Sections/Account/Plans/components/ChangePlanDialog.tsx
@@ -0,0 +1,151 @@
+import { DisplayPrice, UserType } from '@internxt/sdk/dist/drive/payments/types';
+import { ArrowRight } from '@phosphor-icons/react';
+import { useSelector } from 'react-redux';
+import { bytesToString } from '../../../../../drive/services/size.service';
+import { useTranslationContext } from '../../../../../i18n/provider/TranslationProvider';
+import moneyService from '../../../../../payment/services/money.service';
+import Button from '../../../../../shared/components/Button/Button';
+import Modal from '../../../../../shared/components/Modal';
+import { RootState } from '../../../../../store';
+import { PlanState } from '../../../../../store/slices/plan';
+
+const ChangePlanDialog = ({
+  prices,
+  isDialgOpen,
+  setIsDialogOpen,
+  onPlanClick,
+  priceIdSelected,
+  subscriptionSelected,
+}: {
+  prices: DisplayPrice[];
+  isDialgOpen: boolean;
+  setIsDialogOpen: (value: boolean) => void;
+  onPlanClick: (value: string, currency: string) => void;
+  priceIdSelected: string;
+  subscriptionSelected: UserType;
+}): JSX.Element => {
+  const plan = useSelector<RootState, PlanState>((state) => state.plan);
+  const { translate } = useTranslationContext();
+  const isIndividualSubscription = subscriptionSelected == UserType.Individual;
+
+  const { planLimit, planUsage, businessPlanLimit, businessPlanUsage, individualSubscription, businessSubscription } =
+    plan;
+
+  const subscription = isIndividualSubscription ? individualSubscription : businessSubscription;
+  const selectedPlan: DisplayPrice = prices.find((price) => price.id === priceIdSelected) as DisplayPrice;
+
+  const selectedPlanSize = selectedPlan?.bytes;
+  const selectedPlanSizeString = bytesToString(selectedPlanSize);
+  const selectedPlanAmount = selectedPlan?.amount;
+  const selectedPlanInterval = selectedPlan?.interval;
+  const currentPlanSizeString = bytesToString(isIndividualSubscription ? planLimit : businessPlanLimit);
+  const currentPlanUsage = isIndividualSubscription ? planUsage : businessPlanUsage;
+  let amountMonthly: number | null = null;
+  let currentAmountMonthly: number | null = null;
+  let subscriptionCurrencySymbol: string | null = null;
+
+  if (selectedPlanInterval === 'month') {
+    amountMonthly = selectedPlanAmount;
+  } else if (selectedPlanInterval === 'year') {
+    amountMonthly = selectedPlanAmount / 12;
+  }
+
+  if (subscription?.type === 'subscription') {
+    subscriptionCurrencySymbol = moneyService.getCurrencySymbol(subscription?.currency.toUpperCase());
+    if (subscription.interval === 'month') {
+      currentAmountMonthly = subscription.amount;
+    } else if (subscription.interval === 'year') {
+      currentAmountMonthly = subscription.amount / 12;
+    }
+  }
+
+  const onClose = (): void => {
+    setIsDialogOpen(false);
+  };
+
+  const displayAmount = (value) => {
+    return (value / 100).toFixed(2);
+  };
+
+  return (
+    <Modal isOpen={isDialgOpen} onClose={onClose}>
+      <h3 className="mb-5 text-2xl font-medium">{translate('views.account.tabs.plans.dialog.title')}</h3>
+      <p className="font-regular mb-9 text-lg">
+        {translate('views.account.tabs.plans.dialog.subtitle1')}
+        <span className="font-semibold">{currentPlanSizeString}</span>
+        {translate('views.account.tabs.plans.dialog.subtitle2')}
+        <span className="font-semibold">{selectedPlanSizeString}</span>
+        {translate('views.account.tabs.plans.dialog.subtitle3')}
+      </p>
+      <div className="mb-9 flex items-center justify-center">
+        <div className="flex w-40 flex-col items-center rounded-xl border border-gray-10 p-4 shadow-soft">
+          <p className="mb-2.5 rounded-xl border border-gray-10 bg-gray-5 px-2 py-1 text-xs font-medium text-gray-80">
+            {translate('views.account.tabs.plans.dialog.plan.current')}
+          </p>
+          <p className="text-2xl font-medium text-primary">{currentPlanSizeString}</p>
+          {subscription?.type === 'subscription' ? (
+            <div>
+              <span className="text-base font-medium">{`${displayAmount(currentAmountMonthly)} ${
+                subscriptionCurrencySymbol || ''
+              }`}</span>
+              <span>/</span>
+              <span className="text-xs font-medium">{translate('views.account.tabs.plans.dialog.plan.interval')}</span>
+            </div>
+          ) : (
+            <p className="text-base font-medium capitalize">{subscription?.type}</p>
+          )}
+        </div>
+        <ArrowRight size={32} className="mx-5 font-semibold text-gray-20" />
+        <div className="flex w-40 flex-col items-center rounded-xl border border-gray-10 p-4 shadow-soft">
+          <p className="mb-2.5 rounded-xl border border-gray-10 bg-gray-5 px-2 py-1 text-xs font-medium text-gray-80">
+            {translate('views.account.tabs.plans.dialog.plan.new')}
+          </p>
+          <p className={`text-2xl font-medium ${selectedPlanSize < currentPlanUsage ? 'text-red' : 'text-primary'}`}>
+            {selectedPlanSizeString}
+          </p>
+          {selectedPlanInterval === 'lifetime' ? (
+            <div>
+              <span className="text-base font-medium">{`${displayAmount(selectedPlanAmount)} ${
+                subscriptionCurrencySymbol || ''
+              }`}</span>
+            </div>
+          ) : (
+            <div>
+              <span className="text-base font-medium">{`${displayAmount(amountMonthly)} ${
+                subscriptionCurrencySymbol || ''
+              }`}</span>
+              <span>/</span>
+              <span className="text-xs font-medium">{translate('views.account.tabs.plans.dialog.plan.interval')}</span>
+            </div>
+          )}
+        </div>
+      </div>
+      {selectedPlanSize < currentPlanUsage && (
+        <div className="mb-5 flex flex-col items-center rounded-xl border border-red/20 bg-red/10 px-4 py-5 text-red">
+          <h4 className="mb-1.5 text-center text-xl font-semibold">
+            {translate('views.account.tabs.plans.dialog.alert.title')}
+            {selectedPlanSizeString}
+          </h4>
+          <p className="font-regular text-center text-base">
+            {translate('views.account.tabs.plans.dialog.alert.text1')}
+            <span className="font-semibold">{bytesToString(currentPlanUsage)}</span>
+            {translate('views.account.tabs.plans.dialog.alert.text2')}
+          </p>
+        </div>
+      )}
+      <div className="font-regular mb-5  rounded-xl bg-gray-5 p-4 text-center text-base">
+        <p>{translate('views.account.tabs.plans.dialog.message.text')}</p>
+      </div>
+      <div className="flex w-full justify-end">
+        <Button className="mr-2" variant="secondary" onClick={onClose}>
+          {translate('views.account.tabs.plans.dialog.button.back')}
+        </Button>
+        <Button variant="primary" onClick={() => onPlanClick(priceIdSelected, selectedPlan?.currency)}>
+          {translate('views.account.tabs.plans.dialog.button.continue')}
+        </Button>
+      </div>
+    </Modal>
+  );
+};
+
+export default ChangePlanDialog;
diff --git a/src/app/newSettings/Sections/Account/Plans/components/PlanCard.tsx b/src/app/newSettings/Sections/Account/Plans/components/PlanCard.tsx
new file mode 100644
index 000000000..d4ea2a312
--- /dev/null
+++ b/src/app/newSettings/Sections/Account/Plans/components/PlanCard.tsx
@@ -0,0 +1,171 @@
+import { Check } from '@phosphor-icons/react';
+import { t } from 'i18next';
+import Button from '../../../../../shared/components/Button/Button';
+import RoleBadge from '../../../Workspace/Members/components/RoleBadge';
+
+export type ChangePlanType = 'upgrade' | 'downgrade' | 'free' | 'manageBilling';
+
+interface PlanCardProps {
+  capacity: string;
+  currency: string;
+  price: string;
+  billing: string;
+  onClick: () => void;
+  changePlanType: ChangePlanType;
+  isCurrentPlan?: boolean;
+  isLoading: boolean;
+  disableActionButton: boolean;
+  isBusiness?: boolean;
+}
+
+const PlanCard = ({
+  capacity,
+  currency,
+  price,
+  billing,
+  onClick,
+  changePlanType,
+  isCurrentPlan,
+  isLoading,
+  disableActionButton,
+  isBusiness = false,
+}: PlanCardProps) => {
+  const userText = isBusiness ? '/' + t('preferences.account.plans.user') : '';
+
+  return (
+    <div className={'flex w-80 flex-col rounded-xl border border-gray-10 bg-gray-5 p-4 '}>
+      <div className="flex flex-col space-y-3">
+        <div>
+          <div className="flex w-full flex-row justify-between">
+            <span className="text-2xl font-medium leading-7 text-gray-100">{capacity}</span>
+            {isCurrentPlan && (
+              <RoleBadge roleText={t('preferences.account.plans.current')} role={'current'} size={'small'} />
+            )}
+          </div>
+          <span className=" text-base font-normal leading-5 text-gray-60">
+            {currency + price}
+            {billing && '/' + billing + userText}
+          </span>
+        </div>
+        <ChangePlanButton
+          type={changePlanType}
+          onClick={onClick}
+          isLoading={isLoading}
+          disabled={changePlanType === 'manageBilling' ? false : disableActionButton}
+        />
+      </div>
+      <Divider />
+      <PlanDetailsList planSpace={capacity} isBusiness={isBusiness} />
+    </div>
+  );
+};
+
+const Divider = () => (
+  <div className={'flex h-auto items-center justify-center py-6'}>
+    <div className="h-px w-full bg-gray-10" />
+  </div>
+);
+
+const PlanDetailsList = ({ planSpace, isBusiness }: { planSpace: string; isBusiness: boolean }) => {
+  const planType = isBusiness ? 'businessPlanFeaturesList' : 'planFeaturesList';
+  return (
+    <div className="flex flex-col space-y-2">
+      <span className="text-sm font-semibold text-gray-100">
+        {t('preferences.account.plans.planFeaturesList.title')}
+      </span>
+      <div className="flex flex-col space-y-2">
+        <div className="flex flex-row items-center space-x-2">
+          <div>
+            <Check size={20} width={20} height={20} />
+          </div>
+          <span className="text-base font-semibold text-gray-100">
+            {planSpace}
+            <span className="text-base font-normal text-gray-100">
+              {t('preferences.account.plans.planFeaturesList.storage')}
+            </span>
+          </span>
+        </div>
+        <div className="flex flex-row items-center space-x-2">
+          <div>
+            <Check size={20} width={20} height={20} />
+          </div>
+          <span className="text-base font-normal text-gray-100">
+            {t(`preferences.account.plans.${planType}.featureOne`)}
+          </span>
+        </div>
+        <div className="flex flex-row items-center space-x-2">
+          <div>
+            <Check size={20} width={20} height={20} />
+          </div>
+          <span className="text-base font-normal text-gray-100">
+            {t(`preferences.account.plans.${planType}.featureTwo`)}
+          </span>
+        </div>
+        <div className="flex flex-row space-x-2">
+          <div className="mt-1">
+            <Check size={20} width={20} height={20} />
+          </div>
+          <span className="text-base font-normal text-gray-100">
+            {t(`preferences.account.plans.${planType}.featureThree`)}
+          </span>
+        </div>
+        <div className="flex flex-row items-center space-x-2">
+          <div>
+            <Check size={20} width={20} height={20} />
+          </div>
+          <span className="text-base font-normal text-gray-100">
+            {t(`preferences.account.plans.${planType}.featureFour`)}
+          </span>
+        </div>
+        <div className="flex flex-row space-x-2">
+          <div className="mt-1">
+            <Check size={20} width={20} height={20} />
+          </div>
+          <span className="text-base font-normal text-gray-100">
+            {t(`preferences.account.plans.${planType}.featureFive`)}
+          </span>
+        </div>
+        <div className="flex flex-row space-x-2">
+          <div className="mt-1">
+            <Check size={20} width={20} height={20} />
+          </div>
+          <span className="text-base font-normal text-gray-100">
+            {t(`preferences.account.plans.${planType}.featureSix`)}
+          </span>
+        </div>
+        <div className="flex flex-row space-x-2">
+          <div className="mt-1">
+            <Check size={20} width={20} height={20} />
+          </div>
+          <span className="text-base font-normal text-gray-100">
+            {t(`preferences.account.plans.${planType}.featureSeven`)}
+          </span>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+const ChangePlanButton = ({ type, onClick, isLoading, disabled }) => {
+  const changeButtonTypes = {
+    upgrade: (
+      <Button onClick={onClick} variant="primary" loading={isLoading} disabled={disabled}>
+        {t('preferences.account.plans.upgrade')}
+      </Button>
+    ),
+    downgrade: (
+      <Button onClick={onClick} variant="secondary" loading={isLoading} disabled={disabled}>
+        {t('preferences.account.plans.downgrade')}
+      </Button>
+    ),
+    manageBilling: (
+      <Button onClick={onClick} variant="secondary" disabled={disabled}>
+        {t('preferences.account.plans.manageBilling')}
+      </Button>
+    ),
+  };
+
+  return changeButtonTypes[type];
+};
+
+export default PlanCard;
diff --git a/src/app/newSettings/Sections/Account/Plans/components/PlanSelectionCard.tsx b/src/app/newSettings/Sections/Account/Plans/components/PlanSelectionCard.tsx
new file mode 100644
index 000000000..7d8481212
--- /dev/null
+++ b/src/app/newSettings/Sections/Account/Plans/components/PlanSelectionCard.tsx
@@ -0,0 +1,61 @@
+import { t } from 'i18next';
+import RoleBadge from '../../../Workspace/Members/components/RoleBadge';
+
+interface PlanSelectionCardProps {
+  capacity: string;
+  currency: string;
+  amount: string;
+  billing: string;
+  isSelected: boolean;
+  onClick: () => void;
+  isCurrentPlan?: boolean;
+  displayBillingSlash?: boolean;
+  isBusiness?: boolean;
+}
+
+const PlanSelectionCard = ({
+  capacity,
+  currency,
+  amount,
+  billing,
+  isSelected,
+  onClick,
+  isCurrentPlan,
+  displayBillingSlash,
+  isBusiness = false,
+}: PlanSelectionCardProps) => {
+  const selectedValidation = (isSelected && isCurrentPlan) || isSelected;
+  const isSelectedOutsideBorderStyle = selectedValidation ? 'border-transparent' : '';
+  const isSelectedInsideBorderStyle = selectedValidation
+    ? '!border-primary ring ring-primary/10 bg-primary/3 dark:bg-primary/10 dark:ring-primary/30'
+    : '';
+  let userText = isBusiness ? '/' + t('preferences.account.plans.user') : '';
+  if (isBusiness && !displayBillingSlash) {
+    userText = ' ' + t('preferences.account.plans.user');
+  }
+  const displayText = displayBillingSlash
+    ? `${amount} ${currency}/${billing}${userText}`
+    : `${amount} ${currency} ${billing}${userText}`;
+  return (
+    <div
+      className={`rounded-2xl border border-gray-10 bg-surface dark:border-highlight/10 dark:bg-highlight/5 ${
+        !isSelected && 'hover:bg-highlight/5 dark:hover:bg-highlight/10'
+      } ${isSelectedOutsideBorderStyle}`}
+    >
+      <button
+        className={`flex w-full flex-col rounded-xl border-2 border-transparent p-4 ring-offset-2 ring-offset-transparent ${isSelectedInsideBorderStyle}`}
+        onClick={onClick}
+      >
+        <div className="flex w-full flex-row justify-between">
+          <span className="text-2xl font-medium leading-7 text-gray-100">{capacity}</span>
+          {isCurrentPlan && (
+            <RoleBadge roleText={t('preferences.account.plans.current')} role={'current'} size={'small'} />
+          )}
+        </div>
+        <span className=" text-base font-normal leading-5 text-gray-60">{displayText}</span>
+      </button>
+    </div>
+  );
+};
+
+export default PlanSelectionCard;
diff --git a/src/app/newSettings/Sections/Account/Plans/components/TabButton.tsx b/src/app/newSettings/Sections/Account/Plans/components/TabButton.tsx
new file mode 100644
index 000000000..a74d4596e
--- /dev/null
+++ b/src/app/newSettings/Sections/Account/Plans/components/TabButton.tsx
@@ -0,0 +1,22 @@
+const IntervalSwitch = ({
+  text,
+  active,
+  onClick,
+}: {
+  text: string;
+  active: boolean;
+  onClick?: () => void;
+}): JSX.Element => {
+  return (
+    <button
+      className={`${
+        active ? 'bg-surface text-gray-100 shadow-sm dark:bg-gray-20' : 'text-gray-50'
+      } rounded-lg px-6 py-1.5 font-medium`}
+      onClick={onClick}
+    >
+      {text}
+    </button>
+  );
+};
+
+export default IntervalSwitch;
diff --git a/src/app/newSettings/Sections/Account/Plans/utils/planUtils.ts b/src/app/newSettings/Sections/Account/Plans/utils/planUtils.ts
new file mode 100644
index 000000000..3dbdc17a5
--- /dev/null
+++ b/src/app/newSettings/Sections/Account/Plans/utils/planUtils.ts
@@ -0,0 +1,84 @@
+import { DisplayPrice, RenewalPeriod, StoragePlan, UserSubscription } from '@internxt/sdk/dist/drive/payments/types';
+import { UsageResponse } from '@internxt/sdk/dist/drive/storage/types';
+import { bytesToString } from 'app/drive/services/size.service';
+import { t } from 'i18next';
+import { FreeStoragePlan } from '../../../../../drive/types';
+import moneyService from '../../../../../payment/services/money.service';
+import { ChangePlanType } from '../components/PlanCard';
+
+function displayAmount(value: number, decimalPoints = 2) {
+  return (value / 100).toFixed(decimalPoints);
+}
+
+const getCurrentChangePlanType = ({
+  priceSelected,
+  currentUserSubscription,
+  planLimit,
+  isFreePriceSelected,
+}: {
+  priceSelected: DisplayPrice;
+  currentUserSubscription: UserSubscription | null;
+  planLimit: number | null;
+  isFreePriceSelected: boolean;
+}): ChangePlanType => {
+  const isIntervalSelected =
+    priceSelected?.interval === 'month' || priceSelected?.interval === 'year' || priceSelected?.interval === 'lifetime';
+
+  const currentStorage = planLimit ?? 0;
+  const selectedPlanStorage = priceSelected?.bytes;
+
+  if (currentUserSubscription?.type === 'free' && isFreePriceSelected) {
+    return 'free';
+  }
+
+  if (isIntervalSelected) {
+    if (currentStorage < selectedPlanStorage) {
+      return 'upgrade';
+    }
+    if (currentStorage > selectedPlanStorage) {
+      return 'downgrade';
+    }
+    if (currentStorage === selectedPlanStorage) {
+      return 'manageBilling';
+    }
+
+    return 'free';
+  }
+
+  return 'free';
+};
+
+const getPlanName = (storagePlan: StoragePlan | null, limit?: number) => {
+  if (storagePlan?.simpleName) return storagePlan?.simpleName;
+  if (limit) return bytesToString(limit, false);
+  return FreeStoragePlan.simpleName;
+};
+const getCurrentUsage = (usage: UsageResponse | null) => {
+  return usage?.total ?? -1;
+};
+
+const getPlanInfo = (storagePlan: StoragePlan | null) => {
+  if (storagePlan) {
+    if (storagePlan.paymentInterval === RenewalPeriod.Annually) {
+      const priceTruncated = Math.trunc(storagePlan.price * 100) / 100;
+      return (
+        `${priceTruncated} ` +
+        moneyService.getCurrencySymbol(storagePlan.currency) +
+        '/' +
+        t('views.account.tabs.billing.cancelSubscriptionModal.infoBox.year')
+      );
+    } else {
+      const priceTruncated = Math.trunc(storagePlan.monthlyPrice * 100) / 100;
+      return (
+        `${priceTruncated} ` +
+        moneyService.getCurrencySymbol(storagePlan.currency) +
+        '/' +
+        t('views.account.tabs.billing.cancelSubscriptionModal.infoBox.month')
+      );
+    }
+  } else {
+    return t('views.account.tabs.billing.cancelSubscriptionModal.infoBox.free');
+  }
+};
+
+export { displayAmount, getCurrentChangePlanType, getCurrentUsage, getPlanInfo, getPlanName };
diff --git a/src/app/newSettings/Sections/Account/Security/SecuritySection.tsx b/src/app/newSettings/Sections/Account/Security/SecuritySection.tsx
new file mode 100644
index 000000000..e72a8e3b8
--- /dev/null
+++ b/src/app/newSettings/Sections/Account/Security/SecuritySection.tsx
@@ -0,0 +1,50 @@
+import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
+import { t } from 'i18next';
+import { useState } from 'react';
+import { useSelector } from 'react-redux';
+import { RootState } from '../../../../store';
+import { useAppDispatch } from '../../../../store/hooks';
+import { refreshUserThunk } from '../../../../store/slices/user';
+import ChangePassword from './components/ChangePassword';
+import EnterPassword from './components/EnterPassword';
+import ExportBackupKey from './components/ExportBackupKey';
+import FrecuentlyAskedQuestions from './components/FrecuentlyAskedQuestions';
+import TwoFactorAuthentication from './components/TwoFactorAuthentication';
+import Section from 'app/newSettings/components/Section';
+
+const SecuritySection = ({ onClosePreferences }: { onClosePreferences: () => void }) => {
+  const user = useSelector<RootState, UserSettings | undefined>((state) => state.user.user);
+  const dispatch = useAppDispatch();
+
+  const [state, setState] = useState<{ tag: 'locked' } | { tag: 'unlocked'; password: string }>({ tag: 'locked' });
+
+  return (
+    <Section title={t('preferences.account.security.title')} onClosePreferences={onClosePreferences}>
+      {state.tag === 'unlocked' ? (
+        <>
+          <div className="flex justify-between">
+            <ChangePassword
+              onPasswordChanged={(newPassword) => {
+                setState({ tag: 'unlocked', password: newPassword });
+                // timeout to prevent race condition
+                setTimeout(() => dispatch(refreshUserThunk({ forceRefresh: true })), 4000);
+              }}
+              currentPassword={state.password}
+              user={user}
+            />
+            <TwoFactorAuthentication password={state.password} />
+          </div>
+          <div className="flex justify-between">
+            <ExportBackupKey />
+          </div>
+          <hr className="h-px border-gray-10" />
+          <FrecuentlyAskedQuestions />
+        </>
+      ) : (
+        <EnterPassword onUnlock={(password) => setState({ tag: 'unlocked', password })} user={user} />
+      )}
+    </Section>
+  );
+};
+
+export default SecuritySection;
diff --git a/src/app/newSettings/Sections/Account/Security/components/ChangePassword.tsx b/src/app/newSettings/Sections/Account/Security/components/ChangePassword.tsx
new file mode 100644
index 000000000..eb20e5c00
--- /dev/null
+++ b/src/app/newSettings/Sections/Account/Security/components/ChangePassword.tsx
@@ -0,0 +1,45 @@
+import { useState } from 'react';
+import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
+import { useTranslationContext } from '../../../../../i18n/provider/TranslationProvider';
+import ChangePasswordModal from './ChangePasswordModal';
+import Section from '../../../../../newSettings/Sections/General/components/Section';
+import Card from '../../../../../shared/components/Card';
+import Button from '../../../../../shared/components/Button/Button';
+
+const ChangePassword = ({
+  currentPassword,
+  onPasswordChanged,
+  user,
+}: {
+  currentPassword: string;
+  onPasswordChanged: (newPassword: string) => void;
+  user: UserSettings | undefined;
+}): JSX.Element => {
+  const { translate } = useTranslationContext();
+  const [isModalOpen, setIsModalOpen] = useState(false);
+
+  return (
+    <Section title={translate('views.account.tabs.security.changePassword.title')} className="mr-8 basis-1/2">
+      <Card>
+        <p className="text-gray-60">{translate('views.account.tabs.security.changePassword.description')}</p>
+        <Button
+          variant="secondary"
+          className="mt-3"
+          onClick={() => setIsModalOpen(true)}
+          dataTest="change-password-button"
+        >
+          {translate('views.account.tabs.security.changePassword.button')}
+        </Button>
+      </Card>
+      <ChangePasswordModal
+        isOpen={isModalOpen}
+        onClose={() => setIsModalOpen(false)}
+        currentPassword={currentPassword}
+        onPasswordChanged={onPasswordChanged}
+        user={user}
+      />
+    </Section>
+  );
+};
+
+export default ChangePassword;
diff --git a/src/app/core/views/Preferences/tabs/Security/ChangePassword.tsx b/src/app/newSettings/Sections/Account/Security/components/ChangePasswordModal.tsx
similarity index 57%
rename from src/app/core/views/Preferences/tabs/Security/ChangePassword.tsx
rename to src/app/newSettings/Sections/Account/Security/components/ChangePasswordModal.tsx
index f6e15f55e..fa877bdc6 100644
--- a/src/app/core/views/Preferences/tabs/Security/ChangePassword.tsx
+++ b/src/app/newSettings/Sections/Account/Security/components/ChangePasswordModal.tsx
@@ -1,76 +1,43 @@
 import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
 import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
 import { useEffect, useState } from 'react';
-import { useSelector } from 'react-redux';
-import { changePassword } from '../../../../../auth/services/auth.service';
-import notificationsService, { ToastType } from '../../../../../notifications/services/notifications.service';
-import Button from '../../../../../shared/components/Button/Button';
-import Card from '../../../../../shared/components/Card';
-import Input from '../../../../../shared/components/Input';
-import Modal from '../../../../../shared/components/Modal';
-import ValidPassword from '../../../../../shared/components/ValidPassword';
-import { RootState } from '../../../../../store';
-import Section from '../../components/Section';
 
-export default function ChangePassword({
-  className = '',
-  currentPassword,
-  onPasswordChanged,
-}: {
-  className?: string;
-  currentPassword: string;
-  onPasswordChanged: (newPassword: string) => void;
-}): JSX.Element {
-  const { translate } = useTranslationContext();
-  const [isModalOpen, setIsModalOpen] = useState(false);
+import { changePassword } from 'app/auth/services/auth.service';
+import notificationsService, { ToastType } from 'app/notifications/services/notifications.service';
 
-  return (
-    <Section className={className} title={translate('views.account.tabs.security.changePassword.title')}>
-      <Card>
-        <p className="text-gray-60">{translate('views.account.tabs.security.changePassword.description')}</p>
-        <Button className="mt-3" onClick={() => setIsModalOpen(true)} dataTest="change-password-button">
-          {translate('views.account.tabs.security.changePassword.button')}
-        </Button>
-      </Card>
-      <ChangePasswordModal
-        isOpen={isModalOpen}
-        onClose={() => setIsModalOpen(false)}
-        currentPassword={currentPassword}
-        onPasswordChanged={onPasswordChanged}
-      />
-    </Section>
-  );
-}
+import Button from 'app/shared/components/Button/Button';
+import Input from 'app/shared/components/Input';
+import Modal from 'app/shared/components/Modal';
+import ValidPassword from 'app/shared/components/ValidPassword';
 
-function ChangePasswordModal({
+const ChangePasswordModal = ({
   isOpen,
   onClose,
   currentPassword,
   onPasswordChanged,
+  user,
 }: {
   isOpen: boolean;
   onClose: () => void;
   currentPassword: string;
   onPasswordChanged: (newPassword: string) => void;
-}) {
+  user: UserSettings | undefined;
+}) => {
   const { translate } = useTranslationContext();
-  const user = useSelector<RootState, UserSettings | undefined>((state) => state.user.user);
   if (!user) throw new Error('User is not defined');
   const { email } = user;
 
   const DEFAULT_PASSWORD_PAYLOAD = { valid: false, password: '' };
   const [passwordPayload, setPasswordPayload] = useState(DEFAULT_PASSWORD_PAYLOAD);
-
   const [passwordConfirmation, setPasswordConfirmation] = useState('');
+  const [isLoading, setIsLoading] = useState(false);
 
   const isConfirmationWrong = passwordPayload.password.slice(0, passwordConfirmation.length) !== passwordConfirmation;
 
-  const [isLoading, setIsLoading] = useState(false);
-
   async function handleSubmit() {
     setIsLoading(true);
     await changePassword(passwordPayload.password, currentPassword, email);
-    notificationsService.show({ text: translate('success.passwordChanged') as string, type: ToastType.Success });
+    notificationsService.show({ text: translate('success.passwordChanged'), type: ToastType.Success });
     onPasswordChanged(passwordPayload.password);
     onClose();
     setIsLoading(false);
@@ -90,7 +57,7 @@ function ChangePasswordModal({
       <ValidPassword
         username={email}
         className="mt-4"
-        label={translate('modals.changePasswordModal.newPassword') as string}
+        label={translate('modals.changePasswordModal.newPassword')}
         value={passwordPayload.password}
         onChange={setPasswordPayload}
         disabled={isLoading}
@@ -101,11 +68,9 @@ function ChangePasswordModal({
         onChange={setPasswordConfirmation}
         variant="password"
         className="mt-3"
-        label={translate('modals.changePasswordModal.confirmPassword') as string}
+        label={translate('modals.changePasswordModal.confirmPassword')}
         accent={isConfirmationWrong ? 'error' : undefined}
-        message={
-          isConfirmationWrong ? (translate('modals.changePasswordModal.errors.doesntMatch') as string) : undefined
-        }
+        message={isConfirmationWrong ? translate('modals.changePasswordModal.errors.doesntMatch') : undefined}
         disabled={isLoading}
         dataTest="new-password-confirmation"
       />
@@ -125,4 +90,6 @@ function ChangePasswordModal({
       </div>
     </Modal>
   );
-}
+};
+
+export default ChangePasswordModal;
diff --git a/src/app/core/views/Preferences/tabs/Security/Lock.tsx b/src/app/newSettings/Sections/Account/Security/components/EnterPassword.tsx
similarity index 66%
rename from src/app/core/views/Preferences/tabs/Security/Lock.tsx
rename to src/app/newSettings/Sections/Account/Security/components/EnterPassword.tsx
index fbe57a861..6421c6412 100644
--- a/src/app/core/views/Preferences/tabs/Security/Lock.tsx
+++ b/src/app/newSettings/Sections/Account/Security/components/EnterPassword.tsx
@@ -1,30 +1,28 @@
+import { useState } from 'react';
 import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
 import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
-import { useState } from 'react';
-import { useSelector } from 'react-redux';
-import { areCredentialsCorrect } from '../../../../../auth/services/auth.service';
-import Button from '../../../../../shared/components/Button/Button';
-import Card from '../../../../../shared/components/Card';
-import Input from '../../../../../shared/components/Input';
-import { RootState } from '../../../../../store';
-import Section from '../../components/Section';
+import { areCredentialsCorrect } from 'app/auth/services/auth.service';
+import errorService from 'app/core/services/error.service';
 
-export default function Lock({
-  className = '',
+import Button from 'app/shared/components/Button/Button';
+import Card from 'app/shared/components/Card';
+import Input from 'app/shared/components/Input';
+
+const EnterPassword = ({
   onUnlock,
+  user,
 }: {
-  className?: string;
   onUnlock: (password: string) => void;
-}): JSX.Element {
+  user: UserSettings | undefined;
+}): JSX.Element => {
   const { translate } = useTranslationContext();
-  const user = useSelector<RootState, UserSettings | undefined>((state) => state.user.user);
 
   const [password, setPassword] = useState('');
   const [formState, setFormState] = useState<
     { tag: 'ready' } | { tag: 'error'; errorMessage: string } | { tag: 'loading' }
   >({ tag: 'ready' });
 
-  async function onAccess(e) {
+  const onAccess = async (e) => {
     e.preventDefault();
     try {
       setFormState({ tag: 'loading' });
@@ -39,19 +37,20 @@ export default function Lock({
         setFormState({ tag: 'error', errorMessage: translate('views.account.tabs.security.lock.errors.incorrect') });
       }
     } catch (err) {
-      console.error(err);
+      const error = errorService.castError(err);
       setFormState({ tag: 'error', errorMessage: translate('views.account.tabs.security.lock.errors.notVerified') });
+      errorService.reportError(error);
     }
-  }
+  };
 
   return (
-    <Section className={className} title={translate('views.account.tabs.security.label')}>
-      <Card className="space-y-3">
+    <div className="flex w-full justify-center" title={translate('views.account.tabs.security.label')}>
+      <Card className="w-2/3 space-y-3">
         <h1 className="text-lg font-medium text-gray-80">{translate('views.account.tabs.security.lock.title')}</h1>
         <p className="text-gray-80">{translate('views.account.tabs.security.lock.description')}</p>
         <form className="flex w-full flex-col items-end space-y-4" onSubmit={onAccess}>
           <Input
-            label={translate('views.account.tabs.security.lock.inputLabel') as string}
+            label={translate('views.account.tabs.security.lock.inputLabel')}
             className="w-full"
             variant="password"
             onChange={setPassword}
@@ -60,11 +59,19 @@ export default function Lock({
             accent={formState.tag === 'error' ? 'error' : undefined}
             disabled={formState.tag === 'loading'}
           />
-          <Button loading={formState.tag === 'loading'} disabled={!password} type="submit" dataTest="access-button">
+          <Button
+            variant="secondary"
+            loading={formState.tag === 'loading'}
+            disabled={!password}
+            type="submit"
+            dataTest="access-button"
+          >
             {translate('actions.access')}
           </Button>
         </form>
       </Card>
-    </Section>
+    </div>
   );
-}
+};
+
+export default EnterPassword;
diff --git a/src/app/newSettings/Sections/Account/Security/components/ExportBackupKey.tsx b/src/app/newSettings/Sections/Account/Security/components/ExportBackupKey.tsx
new file mode 100644
index 000000000..237881dac
--- /dev/null
+++ b/src/app/newSettings/Sections/Account/Security/components/ExportBackupKey.tsx
@@ -0,0 +1,22 @@
+import { useTranslationContext } from '../../../../../i18n/provider/TranslationProvider';
+import { handleExportBackupKey } from '../../../../../utils/backupKeyUtils';
+import Button from '../../../../../shared/components/Button/Button';
+import Card from '../../../../../shared/components/Card';
+import Section from '../../../../../newSettings/Sections/General/components/Section';
+
+const ExportBackupKey = (): JSX.Element => {
+  const { translate } = useTranslationContext();
+
+  return (
+    <Section className="basis-1/2" title={translate('views.account.tabs.security.backupKey.title')}>
+      <Card className="mr-4">
+        <p className="text-gray-60">{translate('views.account.tabs.security.backupKey.description')}</p>
+        <Button variant="secondary" onClick={() => handleExportBackupKey(translate)} className="mt-3">
+          {translate('views.account.tabs.security.backupKey.button')}
+        </Button>
+      </Card>
+    </Section>
+  );
+};
+
+export default ExportBackupKey;
diff --git a/src/app/core/views/Preferences/tabs/Security/Faq.tsx b/src/app/newSettings/Sections/Account/Security/components/FrecuentlyAskedQuestions.tsx
similarity index 81%
rename from src/app/core/views/Preferences/tabs/Security/Faq.tsx
rename to src/app/newSettings/Sections/Account/Security/components/FrecuentlyAskedQuestions.tsx
index fe32529d4..5f67a2221 100644
--- a/src/app/core/views/Preferences/tabs/Security/Faq.tsx
+++ b/src/app/newSettings/Sections/Account/Security/components/FrecuentlyAskedQuestions.tsx
@@ -1,9 +1,9 @@
 import { Disclosure } from '@headlessui/react';
-import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
-import { CaretUp } from '@phosphor-icons/react';
-import Section from '../../components/Section';
+import { useTranslationContext } from '../../../../../i18n/provider/TranslationProvider';
+import { Plus } from '@phosphor-icons/react';
+import Section from '../../../../../newSettings/Sections/General/components/Section';
 
-export default function Faq({ className = '' }: { className?: string }): JSX.Element {
+const FrecuentlyAskedQuestions = () => {
   const { translate } = useTranslationContext();
 
   const questions: { title: string; body: string }[] = [
@@ -26,7 +26,7 @@ export default function Faq({ className = '' }: { className?: string }): JSX.Ele
   ];
 
   return (
-    <Section className={className} title={translate('views.account.tabs.security.faq.title')}>
+    <Section title={translate('views.account.tabs.security.faq.title')}>
       {questions.map((question, i) => (
         <Disclosure defaultOpen={i === 0} key={i}>
           {({ open }) => (
@@ -41,9 +41,9 @@ export default function Faq({ className = '' }: { className?: string }): JSX.Ele
                 }`}
               >
                 <p>{question.title}</p>
-                <CaretUp
+                <Plus
                   className={`ml-4 mt-0.5 shrink-0 text-gray-40 ${
-                    open ? '' : 'rotate-180'
+                    open ? 'rotate-45' : ''
                   } transition-transform duration-200 ease-in-out`}
                   weight="bold"
                   size={20}
@@ -61,4 +61,6 @@ export default function Faq({ className = '' }: { className?: string }): JSX.Ele
       ))}
     </Section>
   );
-}
+};
+
+export default FrecuentlyAskedQuestions;
diff --git a/src/app/newSettings/Sections/Account/Security/components/TwoFactorAuthentication.tsx b/src/app/newSettings/Sections/Account/Security/components/TwoFactorAuthentication.tsx
new file mode 100644
index 000000000..1792c7ff5
--- /dev/null
+++ b/src/app/newSettings/Sections/Account/Security/components/TwoFactorAuthentication.tsx
@@ -0,0 +1,82 @@
+import { useState, useEffect } from 'react';
+import { useTranslationContext } from '../../../../../i18n/provider/TranslationProvider';
+import { userHas2FAStored } from '../../../../../auth/services/auth.service';
+import Section from '../../../../../newSettings/Sections/General/components/Section';
+import Card from '../../../../../shared/components/Card';
+import Button from '../../../../../shared/components/Button/Button';
+import Spinner from '../../../../../shared/components/Spinner/Spinner';
+import TwoFactorAuthenticationEnableModal from './TwoFactorAuthenticationEnableModal';
+import TwoFactorAuthenticationDisableModal from './TwoFactorAuthenticationDisableModal';
+
+const TwoFactorAuthentication = ({ password }: { password: string }): JSX.Element => {
+  const [status, setStatus] = useState<'loading' | 'enabled' | 'disabled'>('loading');
+  const { translate } = useTranslationContext();
+
+  useEffect(() => {
+    userHas2FAStored().then(({ tfaEnabled }) => {
+      if (tfaEnabled) {
+        setStatus('enabled');
+      } else {
+        setStatus('disabled');
+      }
+    });
+  }, []);
+
+  const [enableModalOpen, setEnableModalOpen] = useState(false);
+  const [disableModalOpen, setDisableModalOpen] = useState(false);
+
+  return (
+    <Section className="basis-1/2" title={translate('views.account.tabs.security.2FA.title')}>
+      <Card>
+        <p className="text-gray-60">{translate('views.account.tabs.security.2FA.description')}</p>
+        <div className="mt-3">
+          {status === 'enabled' ? (
+            <div className="flex">
+              <div className="flex items-center font-medium text-green">
+                <Button className="mr-4" variant="secondary" onClick={() => setDisableModalOpen(true)}>
+                  {translate('views.account.tabs.security.2FA.disable')}
+                </Button>
+                <div className="mr-2.5 h-5 w-5 rounded-full bg-green/20 p-1">
+                  <div className="h-3 w-3 rounded-full bg-green"></div>
+                </div>
+                <p className="text-base font-medium text-green">
+                  {translate('views.account.tabs.security.2FA.enabled')}
+                </p>
+              </div>
+            </div>
+          ) : status === 'disabled' ? (
+            <div className="flex items-center">
+              <Button variant="secondary" onClick={() => setEnableModalOpen(true)} className="mr-4">
+                {translate('views.account.tabs.security.2FA.button')}
+              </Button>
+              <div className="mr-2.5 h-5 w-5 rounded-full bg-gray-10 p-1">
+                <div className="h-3 w-3 rounded-full bg-gray-40"></div>
+              </div>
+              <p className="text-base font-medium text-gray-40">
+                {translate('views.account.tabs.security.2FA.disabled')}
+              </p>
+            </div>
+          ) : (
+            <div className="flex h-10 items-center">
+              <Spinner className="block h-5 w-5 text-primary" />
+            </div>
+          )}
+        </div>
+      </Card>
+
+      <TwoFactorAuthenticationEnableModal
+        isOpen={enableModalOpen}
+        onClose={() => setEnableModalOpen(false)}
+        onEnabled={() => setStatus('enabled')}
+      />
+      <TwoFactorAuthenticationDisableModal
+        isOpen={disableModalOpen}
+        onClose={() => setDisableModalOpen(false)}
+        onDisabled={() => setStatus('disabled')}
+        password={password}
+      />
+    </Section>
+  );
+};
+
+export default TwoFactorAuthentication;
diff --git a/src/app/newSettings/Sections/Account/Security/components/TwoFactorAuthenticationDisableModal.tsx b/src/app/newSettings/Sections/Account/Security/components/TwoFactorAuthenticationDisableModal.tsx
new file mode 100644
index 000000000..7e3a7ce52
--- /dev/null
+++ b/src/app/newSettings/Sections/Account/Security/components/TwoFactorAuthenticationDisableModal.tsx
@@ -0,0 +1,77 @@
+import { useEffect, useState } from 'react';
+import { deactivate2FA, userHas2FAStored } from 'app/auth/services/auth.service';
+import Button from 'app/shared/components/Button/Button';
+import Modal from 'app/shared/components/Modal';
+import notificationsService, { ToastType } from 'app/notifications/services/notifications.service';
+import Input from 'app/shared/components/Input';
+import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
+import errorService from 'app/core/services/error.service';
+
+const TwoFactorAuthenticationDisableModal = ({
+  isOpen,
+  onClose,
+  onDisabled,
+  password,
+}: {
+  isOpen: boolean;
+  onClose: () => void;
+  onDisabled: () => void;
+  password: string;
+}): JSX.Element => {
+  const { translate } = useTranslationContext();
+  useEffect(() => {
+    if (isOpen) {
+      setStatus('ready');
+      setAuthCode('');
+    }
+  }, [isOpen]);
+
+  const [status, setStatus] = useState<'ready' | 'error' | 'loading'>('ready');
+  const [authCode, setAuthCode] = useState('');
+
+  async function handleDisable() {
+    setStatus('loading');
+    try {
+      const { encryptedSalt } = await userHas2FAStored();
+
+      await deactivate2FA(encryptedSalt, password, authCode);
+
+      notificationsService.show({ text: translate('success.twoFactorAuthDisabled'), type: ToastType.Success });
+      onDisabled();
+      onClose();
+    } catch (err) {
+      setStatus('error');
+      const castedError = errorService.castError(err);
+      notificationsService.show({ text: castedError.message || translate('error.serverError'), type: ToastType.Error });
+    }
+  }
+
+  return (
+    <Modal isOpen={isOpen} onClose={onClose}>
+      <h1 className="text-2xl font-medium text-gray-80">{translate('views.account.tabs.security.2FA.titleDisable')}</h1>
+      <Input
+        className="mt-4"
+        label={translate('views.account.tabs.security.2FA.modal.2FALabelCode') as string}
+        disabled={status === 'loading'}
+        accent={status === 'error' ? 'error' : undefined}
+        message={
+          status === 'error'
+            ? (translate('views.account.tabs.security.2FA.modal.errors.incorrect') as string)
+            : undefined
+        }
+        value={authCode}
+        onChange={setAuthCode}
+      />
+      <div className="mt-4 flex justify-end">
+        <Button onClick={onClose} variant="secondary" disabled={status === 'loading'}>
+          {translate('actions.cancel')}
+        </Button>
+        <Button className="ml-2" loading={status === 'loading'} onClick={handleDisable} disabled={authCode.length < 6}>
+          {translate('actions.disable')}
+        </Button>
+      </div>
+    </Modal>
+  );
+};
+
+export default TwoFactorAuthenticationDisableModal;
diff --git a/src/app/core/views/Preferences/tabs/Security/TwoFA.tsx b/src/app/newSettings/Sections/Account/Security/components/TwoFactorAuthenticationEnableModal.tsx
similarity index 51%
rename from src/app/core/views/Preferences/tabs/Security/TwoFA.tsx
rename to src/app/newSettings/Sections/Account/Security/components/TwoFactorAuthenticationEnableModal.tsx
index 928e2458b..da711a013 100644
--- a/src/app/core/views/Preferences/tabs/Security/TwoFA.tsx
+++ b/src/app/newSettings/Sections/Account/Security/components/TwoFactorAuthenticationEnableModal.tsx
@@ -1,84 +1,18 @@
-import { CheckCircle, Warning } from '@phosphor-icons/react';
+import { Warning } from '@phosphor-icons/react';
 import { useEffect, useState } from 'react';
-import authService, {
-  deactivate2FA,
-  generateNew2FA,
-  userHas2FAStored,
-} from '../../../../../auth/services/auth.service';
-import Button from '../../../../../shared/components/Button/Button';
-import Card from '../../../../../shared/components/Card';
-import Modal from '../../../../../shared/components/Modal';
-import Spinner from '../../../../../shared/components/Spinner/Spinner';
-import Section from '../../components/Section';
-import appStoreIcon from '../../../../../../assets/icons/app-store.svg';
-import playStoreIcon from '../../../../../../assets/icons/play-store.svg';
-import useEffectAsync from '../../../../hooks/useEffectAsync';
-import Copyable from '../../../../../shared/components/Copyable';
-import notificationsService, { ToastType } from '../../../../../notifications/services/notifications.service';
-import Input from '../../../../../shared/components/Input';
-import errorService from '../../../../services/error.service';
+import authService, { generateNew2FA } from 'app/auth/services/auth.service';
+import Button from 'app/shared/components/Button/Button';
+import Modal from 'app/shared/components/Modal';
+import Spinner from 'app/shared/components/Spinner/Spinner';
+import appStoreIcon from 'app/../assets/icons/app-store.svg';
+import playStoreIcon from 'app/../assets/icons/play-store.svg';
+import useEffectAsync from 'app/core/hooks/useEffectAsync';
+import Copyable from 'app/shared/components/Copyable';
+import notificationsService, { ToastType } from 'app/notifications/services/notifications.service';
+import Input from 'app/shared/components/Input';
 import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
 
-export default function TwoFA({ className = '', password }: { className?: string; password: string }): JSX.Element {
-  const [status, setStatus] = useState<'loading' | 'enabled' | 'disabled'>('loading');
-  const { translate } = useTranslationContext();
-
-  useEffect(() => {
-    userHas2FAStored().then(({ tfaEnabled }) => {
-      if (tfaEnabled) {
-        setStatus('enabled');
-      } else {
-        setStatus('disabled');
-      }
-    });
-  }, []);
-
-  const [enableModalOpen, setEnableModalOpen] = useState(false);
-
-  const [disableModalOpen, setDisableModalOpen] = useState(false);
-
-  return (
-    <Section className={className} title={translate('views.account.tabs.security.2FA.title')}>
-      <Card>
-        <p className="text-gray-60">{translate('views.account.tabs.security.2FA.description')}</p>
-        <div className="mt-3">
-          {status === 'enabled' ? (
-            <div className="flex">
-              <div className="flex items-center font-medium text-green">
-                <CheckCircle size={20} weight="fill" />
-                <p className="ml-1">{translate('views.account.tabs.security.2FA.enabled')}</p>
-                <Button className="ml-4" variant="secondary" onClick={() => setDisableModalOpen(true)}>
-                  {translate('views.account.tabs.security.2FA.disable')}
-                </Button>
-              </div>
-            </div>
-          ) : status === 'disabled' ? (
-            <Button onClick={() => setEnableModalOpen(true)}>
-              {translate('views.account.tabs.security.2FA.button')}
-            </Button>
-          ) : (
-            <div className="flex h-10 items-center">
-              <Spinner className="block h-5 w-5 text-primary" />
-            </div>
-          )}
-        </div>
-      </Card>
-      <EnableModal
-        isOpen={enableModalOpen}
-        onClose={() => setEnableModalOpen(false)}
-        onEnabled={() => setStatus('enabled')}
-      />
-      <DisableModal
-        isOpen={disableModalOpen}
-        onClose={() => setDisableModalOpen(false)}
-        onDisabled={() => setStatus('disabled')}
-        password={password}
-      />
-    </Section>
-  );
-}
-
-function EnableModal({
+const TwoFactorAuthenticationEnableModal = ({
   isOpen,
   onClose,
   onEnabled,
@@ -86,7 +20,7 @@ function EnableModal({
   isOpen: boolean;
   onClose: () => void;
   onEnabled: () => void;
-}): JSX.Element {
+}): JSX.Element => {
   const { translate } = useTranslationContext();
   useEffect(() => {
     if (isOpen) {
@@ -233,72 +167,6 @@ function EnableModal({
       </div>
     </Modal>
   );
-}
-
-function DisableModal({
-  isOpen,
-  onClose,
-  onDisabled,
-  password,
-}: {
-  isOpen: boolean;
-  onClose: () => void;
-  onDisabled: () => void;
-  password: string;
-}): JSX.Element {
-  const { translate } = useTranslationContext();
-  useEffect(() => {
-    if (isOpen) {
-      setStatus('ready');
-      setAuthCode('');
-    }
-  }, [isOpen]);
-
-  const [status, setStatus] = useState<'ready' | 'error' | 'loading'>('ready');
-  const [authCode, setAuthCode] = useState('');
-
-  async function handleDisable() {
-    setStatus('loading');
-    try {
-      const { encryptedSalt } = await userHas2FAStored();
-
-      await deactivate2FA(encryptedSalt, password, authCode);
+};
 
-      notificationsService.show({ text: translate('success.twoFactorAuthDisabled'), type: ToastType.Success });
-      onDisabled();
-      onClose();
-    } catch (err) {
-      setStatus('error');
-      const castedError = errorService.castError(err);
-
-      notificationsService.show({ text: castedError.message || translate('error.serverError'), type: ToastType.Error });
-    }
-  }
-
-  return (
-    <Modal isOpen={isOpen} onClose={onClose}>
-      <h1 className="text-2xl font-medium text-gray-80">{translate('views.account.tabs.security.2FA.titleDisable')}</h1>
-      <Input
-        className="mt-4"
-        label={translate('views.account.tabs.security.2FA.modal.2FALabelCode') as string}
-        disabled={status === 'loading'}
-        accent={status === 'error' ? 'error' : undefined}
-        message={
-          status === 'error'
-            ? (translate('views.account.tabs.security.2FA.modal.errors.incorrect') as string)
-            : undefined
-        }
-        value={authCode}
-        onChange={setAuthCode}
-      />
-      <div className="mt-4 flex justify-end">
-        <Button onClick={onClose} variant="secondary" disabled={status === 'loading'}>
-          {translate('actions.cancel')}
-        </Button>
-        <Button className="ml-2" loading={status === 'loading'} onClick={handleDisable} disabled={authCode.length < 6}>
-          {translate('actions.disable')}
-        </Button>
-      </div>
-    </Modal>
-  );
-}
+export default TwoFactorAuthenticationEnableModal;
diff --git a/src/app/newSettings/Sections/General/GeneralSection.tsx b/src/app/newSettings/Sections/General/GeneralSection.tsx
new file mode 100644
index 000000000..45a37ee22
--- /dev/null
+++ b/src/app/newSettings/Sections/General/GeneralSection.tsx
@@ -0,0 +1,16 @@
+import Appearance from './components/Appearance';
+import ContactSupport from './components/ContactSupport';
+import Language from './components/Language';
+import Section from 'app/newSettings/components/Section';
+
+const GeneralSection = ({ onClosePreferences }: { onClosePreferences: () => void }) => {
+  return (
+    <Section title="General" className="" onClosePreferences={onClosePreferences}>
+      <Appearance />
+      <Language />
+      <ContactSupport />
+    </Section>
+  );
+};
+
+export default GeneralSection;
diff --git a/src/app/newSettings/Sections/General/components/Appearance.tsx b/src/app/newSettings/Sections/General/components/Appearance.tsx
new file mode 100644
index 000000000..348181071
--- /dev/null
+++ b/src/app/newSettings/Sections/General/components/Appearance.tsx
@@ -0,0 +1,87 @@
+import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
+
+import { useThemeContext } from '../../../../theme/ThemeProvider';
+import Section from './Section';
+
+import appearance_dark from 'assets/dark.svg';
+import appearance_light from 'assets/light.svg';
+import appearance_system from 'assets/system.svg';
+import { useEffect, useState } from 'react';
+import { useSelector } from 'react-redux';
+import errorService from '../../../../core/services/error.service';
+import { isStarWarsThemeAvailable } from '../../../../payment/utils/checkStarWarsCode';
+import { RootState } from '../../../../store';
+
+function ThemeButton({ theme, toggleTheme, isSelected, img }) {
+  const { translate } = useTranslationContext();
+
+  return (
+    <button
+      className={'mr-4 flex w-36 flex-col space-y-1 rounded-xl'}
+      onClick={() => {
+        toggleTheme(theme);
+      }}
+    >
+      <div
+        className={`box-border overflow-hidden rounded-xl ${
+          isSelected
+            ? 'border-2 border-primary outline outline-4 outline-primary/10 drop-shadow'
+            : 'border-2 border-transparent'
+        }`}
+      >
+        <img src={img} alt={theme} />
+      </div>
+
+      <span className={`text-sm font-medium ${!isSelected ? 'text-gray-50' : ''}`}>{translate(`theme.${theme}`)}</span>
+    </button>
+  );
+}
+const themes = [
+  { theme: 'system', img: appearance_system },
+  { theme: 'light', img: appearance_light },
+  { theme: 'dark', img: appearance_dark },
+];
+
+const Appearance = () => {
+  const { translate } = useTranslationContext();
+  const { currentTheme, toggleTheme } = useThemeContext();
+  const plan = useSelector((state: RootState) => state.plan);
+
+  const [appearances, setAppearances] = useState(themes);
+
+  // CHECK IF THIS WORKS BEFORE MERGE
+  useEffect(() => {
+    isStarWarsThemeAvailable(plan)
+      .then((isStarWarsThemeAvailable) => {
+        if (
+          !appearances.some((appearance) => appearance.theme === 'starwars' && appearance.img === appearance_dark) &&
+          isStarWarsThemeAvailable
+        ) {
+          // TODO: add img of starwars
+          setAppearances([...appearances, { theme: 'starwars', img: appearance_dark }]);
+        }
+      })
+      .catch((err) => {
+        const error = err as Error;
+        errorService.reportError(error);
+      });
+  }, []);
+
+  return (
+    <Section className="" title={translate('theme.title')}>
+      <div className="flex flex-row">
+        {appearances.map((themeInfo) => (
+          <ThemeButton
+            key={themeInfo.theme}
+            theme={themeInfo.theme}
+            toggleTheme={toggleTheme}
+            isSelected={currentTheme === themeInfo.theme}
+            img={themeInfo.img}
+          />
+        ))}
+      </div>
+    </Section>
+  );
+};
+
+export default Appearance;
diff --git a/src/app/newSettings/Sections/General/components/ContactSupport.tsx b/src/app/newSettings/Sections/General/components/ContactSupport.tsx
new file mode 100644
index 000000000..a306976b0
--- /dev/null
+++ b/src/app/newSettings/Sections/General/components/ContactSupport.tsx
@@ -0,0 +1,24 @@
+import { useChat } from 'react-live-chat-loader';
+import { useTranslationContext } from '../../../../i18n/provider/TranslationProvider';
+import Button from '../../../../shared/components/Button/Button';
+import Section from './Section';
+
+const ContactSupport = () => {
+  const { translate } = useTranslationContext();
+  const [, loadChat] = useChat();
+
+  const onClick = () => {
+    loadChat({ open: true });
+  };
+
+  return (
+    <Section title={translate('views.account.tabs.account.support.title')}>
+      <p className="text-gray-80">{translate('views.account.tabs.account.support.description')}</p>
+      <Button className="mt-5" variant="secondary" onClick={onClick}>
+        {translate('views.account.tabs.account.support.cta')}
+      </Button>
+    </Section>
+  );
+};
+
+export default ContactSupport;
diff --git a/src/app/core/views/Preferences/tabs/Account/components/ItemsDropdown.tsx b/src/app/newSettings/Sections/General/components/ItemsDropdown.tsx
similarity index 99%
rename from src/app/core/views/Preferences/tabs/Account/components/ItemsDropdown.tsx
rename to src/app/newSettings/Sections/General/components/ItemsDropdown.tsx
index c6eb859d6..f5ab9b93f 100644
--- a/src/app/core/views/Preferences/tabs/Account/components/ItemsDropdown.tsx
+++ b/src/app/newSettings/Sections/General/components/ItemsDropdown.tsx
@@ -1,5 +1,4 @@
 import { ReactNode } from 'react';
-
 import { Menu, Transition } from '@headlessui/react';
 
 const ItemsDropdown = ({ title, menuItems }: { title: JSX.Element; menuItems: ReactNode[] }) => {
diff --git a/src/app/core/views/Preferences/tabs/Account/Language.tsx b/src/app/newSettings/Sections/General/components/Language.tsx
similarity index 55%
rename from src/app/core/views/Preferences/tabs/Account/Language.tsx
rename to src/app/newSettings/Sections/General/components/Language.tsx
index a81018421..2893b114c 100644
--- a/src/app/core/views/Preferences/tabs/Account/Language.tsx
+++ b/src/app/newSettings/Sections/General/components/Language.tsx
@@ -1,25 +1,29 @@
-import React, { useEffect } from 'react';
-import i18next from 'i18next';
-import Section from '../../components/Section';
-import Card from 'app/shared/components/Card';
 import { CaretDown } from '@phosphor-icons/react';
-import localStorageService from 'app/core/services/local-storage.service';
-import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
-
 import dayjs from 'dayjs';
-import ItemsDropdown from './components/ItemsDropdown';
-import MenuItem from './components/MenuItem';
+import i18next from 'i18next';
+import React, { useEffect } from 'react';
+import localStorageService from '../../../../core/services/local-storage.service';
+import { useTranslationContext } from '../../../../i18n/provider/TranslationProvider';
+import Card from '../../../../shared/components/Card';
+import ItemsDropdown from './ItemsDropdown';
+import MenuItem from './MenuItem';
+import Section from './Section';
 
 const localStorageLanguage = localStorageService.get('i18nextLng');
 
-const languages = ['en', 'es', 'fr', 'it', 'zh', 'ru', 'de'];
+const languages = ['en', 'es', 'fr', 'it', 'zh', 'ru', 'de', 'zh-tw'];
+
+const sanitizeLanguage = (language: string): string => {
+  return language.toLowerCase().includes('en') ? 'en' : language;
+};
 
 export default function Language(): JSX.Element {
   const { translate } = useTranslationContext();
   const [lang, setLang] = React.useState<string>();
 
-  function changeLang(lang: string = localStorageLanguage || i18next.language) {
-    setLang(lang);
+  function changeLang(lang: string = localStorageLanguage ?? i18next.language) {
+    const sanitizedLang = sanitizeLanguage(lang);
+    setLang(sanitizedLang);
   }
 
   useEffect(() => {
@@ -33,14 +37,15 @@ export default function Language(): JSX.Element {
   useEffect(() => {
     changeLang(i18next.language);
   }, [lang]);
+
   return (
     <Section className="" title={translate('lang.title')}>
-      <Card>
+      <Card className="w-fit py-3 dark:bg-gray-5">
         <ItemsDropdown
           title={
-            <div className="flex w-full flex-row justify-between">
-              <p>{translate(`lang.${lang}`)}</p>
-              <CaretDown size={20} />
+            <div className="flex flex-row items-center justify-between space-x-2">
+              <p className="text-base font-medium leading-5">{translate(`lang.${lang}`)}</p>
+              <CaretDown size={10} />
             </div>
           }
           menuItems={languages.map((lang) => (
diff --git a/src/app/core/views/Preferences/tabs/Account/components/MenuItem.tsx b/src/app/newSettings/Sections/General/components/MenuItem.tsx
similarity index 89%
rename from src/app/core/views/Preferences/tabs/Account/components/MenuItem.tsx
rename to src/app/newSettings/Sections/General/components/MenuItem.tsx
index 43cbb9b03..5968b45a0 100644
--- a/src/app/core/views/Preferences/tabs/Account/components/MenuItem.tsx
+++ b/src/app/newSettings/Sections/General/components/MenuItem.tsx
@@ -1,6 +1,6 @@
 import { ReactNode, forwardRef } from 'react';
 
-const MenuItem = forwardRef(({ children, onClick }: { children: ReactNode; onClick: () => void }) => {
+const MenuItem = forwardRef(({ children, onClick }: { children: ReactNode; onClick: () => void }, ref) => {
   return (
     <button
       onKeyDown={() => {}}
diff --git a/src/app/newSettings/Sections/General/components/Section.tsx b/src/app/newSettings/Sections/General/components/Section.tsx
new file mode 100644
index 000000000..bd3c98c32
--- /dev/null
+++ b/src/app/newSettings/Sections/General/components/Section.tsx
@@ -0,0 +1,30 @@
+import { CaretLeft } from '@phosphor-icons/react';
+import { ReactNode } from 'react';
+
+export default function Section({
+  className = '',
+  children,
+  title,
+  onBackButtonClicked,
+}: {
+  className?: string;
+  children: ReactNode;
+  title: string;
+  onBackButtonClicked?: () => void;
+}): JSX.Element {
+  return (
+    <div className={`${className} space-y-2`}>
+      <div className="flex flex-row space-x-4 ">
+        {onBackButtonClicked && (
+          <button onClick={onBackButtonClicked}>
+            <div className="text-gray-100">
+              <CaretLeft size={22} />
+            </div>
+          </button>
+        )}
+        <span className="text-lg font-medium text-gray-100">{title}</span>
+      </div>
+      {children}
+    </div>
+  );
+}
diff --git a/src/app/newSettings/Sections/Workspace/Billing/BillingDetailsCard.tsx b/src/app/newSettings/Sections/Workspace/Billing/BillingDetailsCard.tsx
new file mode 100644
index 000000000..1fc2b6ba3
--- /dev/null
+++ b/src/app/newSettings/Sections/Workspace/Billing/BillingDetailsCard.tsx
@@ -0,0 +1,34 @@
+import { t } from 'i18next';
+
+import Button from 'app/shared/components/Button/Button';
+import Card from 'app/shared/components/Card';
+import { BillingDetailsCardProps } from '../../../types/types';
+import Detail from './Detail';
+
+const BillingDetailsCard = ({ address, phone, isOwner, onEditButtonClick }: BillingDetailsCardProps) => {
+  if (!isOwner) return null;
+
+  return (
+    <div className="space-y-3">
+      <div className="flex w-full flex-row items-center justify-between ">
+        <span className="text-xl font-medium">{t('views.preferences.workspace.billing.billingDetails')}</span>
+        <Button variant="secondary" onClick={onEditButtonClick}>
+          <span>{t('views.preferences.workspace.billing.editBilling')}</span>
+        </Button>
+      </div>
+      <Card>
+        <div className="flex flex-row  space-x-10">
+          <div className="flex h-full w-full min-w-0 grow flex-col ">
+            <Detail label={t('views.preferences.workspace.overview.address')} value={address} />
+          </div>
+
+          <div className="flex w-full min-w-0 grow flex-col space-y-2 ">
+            <Detail label={t('views.preferences.workspace.overview.phone')} value={phone} />
+          </div>
+        </div>
+      </Card>
+    </div>
+  );
+};
+
+export default BillingDetailsCard;
diff --git a/src/app/newSettings/Sections/Workspace/Billing/BillingWorkspaceSection.tsx b/src/app/newSettings/Sections/Workspace/Billing/BillingWorkspaceSection.tsx
new file mode 100644
index 000000000..880c6f31c
--- /dev/null
+++ b/src/app/newSettings/Sections/Workspace/Billing/BillingWorkspaceSection.tsx
@@ -0,0 +1,132 @@
+import { t } from 'i18next';
+import { useEffect, useState } from 'react';
+import { useSelector } from 'react-redux';
+
+import { RootState } from 'app/store';
+import { PlanState, planThunks } from 'app/store/slices/plan';
+
+import { CustomerBillingInfo, UserType } from '@internxt/sdk/dist/drive/payments/types';
+import { trackCanceledSubscription } from 'app/analytics/services/analytics.service';
+import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
+import Section from 'app/newSettings/components/Section';
+import notificationsService, { ToastType } from 'app/notifications/services/notifications.service';
+import paymentService from 'app/payment/services/payment.service';
+import { useAppDispatch } from 'app/store/hooks';
+import { WorkspacesState, workspaceThunks } from 'app/store/slices/workspaces/workspacesStore';
+import BillingPaymentMethodCard from '../../../components/BillingPaymentMethodCard';
+import Invoices from '../../../containers/InvoicesContainer';
+import CancelSubscription from '../../Account/Billing/components/CancelSubscription';
+import { getPlanInfo, getPlanName } from '../../Account/Plans/utils/planUtils';
+import BillingDetailsCard from './BillingDetailsCard';
+import EditBillingDetailsModal from './components/EditBillingDetailsModal';
+import BillingWorkspaceOverview from './containers/BillingWorkspaceOverview';
+import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
+
+interface BillingWorkspaceSectionProps {
+  changeSection: ({ section, subsection }) => void;
+  onClosePreferences: () => void;
+}
+
+const BillingWorkspaceSection = ({ onClosePreferences }: BillingWorkspaceSectionProps) => {
+  const dispatch = useAppDispatch();
+  const { translate } = useTranslationContext();
+  const plan = useSelector<RootState, PlanState>((state) => state.plan);
+  const user = useSelector((state: RootState) => state.user.user) as UserSettings;
+  const { selectedWorkspace } = useSelector<RootState, WorkspacesState>((state) => state.workspaces);
+  const workspaceId = selectedWorkspace?.workspace.id;
+  const isOwner = user.uuid === selectedWorkspace?.workspace.ownerId;
+
+  const [isSubscription, setIsSubscription] = useState<boolean>(false);
+  const [cancellingSubscription, setCancellingSubscription] = useState<boolean>(false);
+  const [isCancelSubscriptionModalOpen, setIsCancelSubscriptionModalOpen] = useState<boolean>(false);
+  const [planName, setPlanName] = useState<string>('');
+  const [planInfo, setPlanInfo] = useState<string>('');
+  const [currentUsage, setCurrentUsage] = useState<number>(-1);
+
+  const [isEditingBillingDetails, setIsEditingBillingDetails] = useState(false);
+  const [isSavingBillingDetails, setIsSavingBillingDetails] = useState(false);
+  const [billingDetails, setBillingDetails] = useState<CustomerBillingInfo>({
+    address: selectedWorkspace?.workspace.address || '',
+    phoneNumber: selectedWorkspace?.workspace.phoneNumber || '',
+  });
+
+  useEffect(() => {
+    plan.businessSubscription?.type === 'subscription' ? setIsSubscription(true) : setIsSubscription(false);
+    setPlanName(getPlanName(plan.businessPlan, plan.businessPlanLimit));
+    setPlanInfo(getPlanInfo(plan.businessPlan));
+    setCurrentUsage(plan.businessPlanUsageDetails?.total ?? -1);
+  }, [plan.businessSubscription]);
+
+  async function cancelSubscription(feedback: string) {
+    setCancellingSubscription(true);
+    try {
+      await paymentService.cancelSubscription(UserType.Business);
+      notificationsService.show({ text: translate('notificationMessages.successCancelSubscription'), duration: 8000 });
+      setIsCancelSubscriptionModalOpen(false);
+      trackCanceledSubscription({ feedback });
+      dispatch(workspaceThunks.setSelectedWorkspace({ workspaceId: null }));
+      setTimeout(() => {
+        dispatch(workspaceThunks.fetchWorkspaces());
+        dispatch(workspaceThunks.checkAndSetLocalWorkspace());
+        dispatch(planThunks.initializeThunk());
+      }, 3000);
+    } catch (err) {
+      console.error(err);
+      notificationsService.show({
+        text: translate('notificationMessages.errorCancelSubscription'),
+        type: ToastType.Error,
+      });
+    }
+  }
+
+  const onSaveBillingDetails = (newBillingDetails: CustomerBillingInfo) => {
+    if (workspaceId) {
+      setIsSavingBillingDetails(true);
+      dispatch(workspaceThunks.editWorkspace({ workspaceId, details: newBillingDetails })).then((data) => {
+        const isUpdateSuccessful = data.payload;
+        if (isUpdateSuccessful) {
+          setBillingDetails(newBillingDetails);
+        }
+      });
+      setIsSavingBillingDetails(false);
+      setIsEditingBillingDetails(false);
+    }
+  };
+
+  return (
+    <Section title={t('preferences.workspace.billing.title')} onClosePreferences={onClosePreferences}>
+      <BillingWorkspaceOverview plan={plan} />
+      <BillingDetailsCard
+        address={billingDetails.address || ''}
+        phone={billingDetails.phoneNumber || ''}
+        isOwner={isOwner}
+        onEditButtonClick={() => setIsEditingBillingDetails(true)}
+      />
+      <EditBillingDetailsModal
+        isOpen={isEditingBillingDetails}
+        onClose={() => setIsEditingBillingDetails(false)}
+        billingDetails={billingDetails}
+        onSave={onSaveBillingDetails}
+        isLoading={isSavingBillingDetails}
+      />
+      <BillingPaymentMethodCard userType={UserType.Business} />
+      {plan.businessSubscription?.type == 'subscription' && (
+        <Invoices subscriptionId={plan.businessSubscription.subscriptionId} />
+      )}
+      {isSubscription && (
+        <CancelSubscription
+          isCancelSubscriptionModalOpen={isCancelSubscriptionModalOpen}
+          setIsCancelSubscriptionModalOpen={setIsCancelSubscriptionModalOpen}
+          cancellingSubscription={cancellingSubscription}
+          cancelSubscription={cancelSubscription}
+          planName={planName}
+          planInfo={planInfo}
+          currentUsage={currentUsage}
+          userType={UserType.Business}
+        />
+      )}
+    </Section>
+  );
+};
+
+export default BillingWorkspaceSection;
diff --git a/src/app/core/views/Preferences/tabs/Billing/CancelSubscriptionModal.tsx b/src/app/newSettings/Sections/Workspace/Billing/CancelSubscriptionModal.tsx
similarity index 85%
rename from src/app/core/views/Preferences/tabs/Billing/CancelSubscriptionModal.tsx
rename to src/app/newSettings/Sections/Workspace/Billing/CancelSubscriptionModal.tsx
index bd5c9c396..6f71613fe 100644
--- a/src/app/core/views/Preferences/tabs/Billing/CancelSubscriptionModal.tsx
+++ b/src/app/newSettings/Sections/Workspace/Billing/CancelSubscriptionModal.tsx
@@ -1,15 +1,16 @@
-import { Dispatch, SetStateAction, useEffect, useState } from 'react';
+import { UserType } from '@internxt/sdk/dist/drive/payments/types';
 import { ArrowRight } from '@phosphor-icons/react';
-import { useTranslationContext } from '../../../../../i18n/provider/TranslationProvider';
-import Button from '../../../../../shared/components/Button/Button';
-import Modal from '../../../../../shared/components/Modal';
-import { FreeStoragePlan } from '../../../../../drive/types';
-import sizeService from '../../../../../drive/services/size.service';
-import paymentService from 'app/payment/services/payment.service';
-import notificationsService, { ToastType } from '../../../../../notifications/services/notifications.service';
-import { useAppDispatch } from '../../../../../store/hooks';
-import { planThunks } from '../../../../../store/slices/plan';
-import analyticsService from 'app/analytics/services/analytics.service';
+import { Dispatch, SetStateAction, useEffect, useState } from 'react';
+import analyticsService from '../../../../analytics/services/analytics.service';
+import sizeService from '../../../../drive/services/size.service';
+import { FreeStoragePlan } from '../../../../drive/types';
+import { useTranslationContext } from '../../../../i18n/provider/TranslationProvider';
+import notificationsService, { ToastType } from '../../../../notifications/services/notifications.service';
+import paymentService from '../../../../payment/services/payment.service';
+import Button from '../../../../shared/components/Button/Button';
+import Modal from '../../../../shared/components/Modal';
+import { useAppDispatch } from '../../../../store/hooks';
+import { planThunks } from '../../../../store/slices/plan';
 
 const CancelSubscriptionModal = ({
   isOpen,
@@ -19,6 +20,7 @@ const CancelSubscriptionModal = ({
   currentUsage,
   cancellingSubscription,
   cancelSubscription,
+  userType = UserType.Individual,
 }: {
   isOpen: boolean;
   onClose: () => void;
@@ -26,30 +28,33 @@ const CancelSubscriptionModal = ({
   currentPlanInfo: string;
   currentUsage: number;
   cancellingSubscription: boolean;
+  userType: UserType;
   cancelSubscription: (feedback: string) => void;
 }): JSX.Element => {
+  const isIndividual = userType === UserType.Individual;
   const { translate } = useTranslationContext();
-  const [step, setStep] = useState<1 | 2 | 3>(2);
+  const [step, setStep] = useState<1 | 2 | 3>(!isIndividual ? 3 : 2);
   const [couponAvailable, setCouponAvailable] = useState(false);
   const dispatch = useAppDispatch();
 
   useEffect(() => {
-    paymentService
-      .requestPreventCancellation()
-      .then((response) => {
-        setCouponAvailable(response.elegible);
-      })
-      .catch((error) => {
-        console.error(error);
-        notificationsService.show({
-          text: translate('notificationMessages.errorApplyCoupon'),
-          type: ToastType.Error,
+    if (userType === UserType.Individual && isOpen)
+      paymentService
+        .requestPreventCancellation()
+        .then((response) => {
+          setCouponAvailable(response.elegible);
+        })
+        .catch((error) => {
+          console.error(error);
+          notificationsService.show({
+            text: translate('notificationMessages.errorApplyCoupon'),
+            type: ToastType.Error,
+          });
         });
-      });
-  }, []);
+  }, [isOpen]);
 
   useEffect(() => {
-    if (couponAvailable) {
+    if (couponAvailable && isOpen) {
       setStep(1);
       analyticsService.page('Cancelation incentive');
     }
@@ -87,12 +92,14 @@ const CancelSubscriptionModal = ({
           <h1 className="text-2xl font-medium text-gray-80">
             {translate('views.account.tabs.billing.cancelSubscriptionModal.title')}
           </h1>
-          <h2 className="text-base font-light text-gray-50">{step - 1} of 2</h2>
+          {isIndividual && <h2 className="text-base font-light text-gray-50">{step - 1} of 2</h2>}
         </>
       )}
-      {step === 1 && <Step1 currentPlanName={currentPlanName} applyCoupon={applyCoupon} setStep={setStep} />}
+      {isIndividual && step === 1 && (
+        <Step1 currentPlanName={currentPlanName} applyCoupon={applyCoupon} setStep={setStep} />
+      )}
 
-      {step === 2 && (
+      {isIndividual && step === 2 && (
         <Step2
           currentPlanName={currentPlanName}
           onClose={onClose}
diff --git a/src/app/newSettings/Sections/Workspace/Billing/Detail.tsx b/src/app/newSettings/Sections/Workspace/Billing/Detail.tsx
new file mode 100644
index 000000000..d8925ed7b
--- /dev/null
+++ b/src/app/newSettings/Sections/Workspace/Billing/Detail.tsx
@@ -0,0 +1,17 @@
+const Detail = ({
+  className = '',
+  label,
+  value,
+}: {
+  className?: string;
+  label: string;
+  value: string;
+}): JSX.Element => {
+  return (
+    <div className={`${className} min-w-0 text-gray-80`}>
+      <h1 className="truncate text-sm font-medium">{label}</h1>
+      <h2 className="line-clamp-3 text-sm font-normal">{value}</h2>
+    </div>
+  );
+};
+export default Detail;
diff --git a/src/app/newSettings/Sections/Workspace/Billing/components/EditBillingDetailsModal.tsx b/src/app/newSettings/Sections/Workspace/Billing/components/EditBillingDetailsModal.tsx
new file mode 100644
index 000000000..c9ac25de1
--- /dev/null
+++ b/src/app/newSettings/Sections/Workspace/Billing/components/EditBillingDetailsModal.tsx
@@ -0,0 +1,85 @@
+import { t } from 'i18next';
+import { useState } from 'react';
+
+import { CustomerBillingInfo } from '@internxt/sdk/dist/drive/payments/types';
+import Button from 'app/shared/components/Button/Button';
+import Modal from 'app/shared/components/Modal';
+
+import { PhoneInput } from 'react-international-phone';
+import 'react-international-phone/style.css';
+
+import DetailsInput from '../../../../components/DetailsInput';
+const EditBillingDetailsModal = ({
+  isOpen,
+  onClose,
+  billingDetails,
+  onSave,
+  isLoading,
+}: {
+  isOpen: boolean;
+  onClose: () => void;
+  billingDetails: CustomerBillingInfo;
+  onSave: (billinDetails: CustomerBillingInfo) => void;
+  isLoading?: boolean;
+}) => {
+  const MAX_INPUT_LENGHT = 50;
+  const { address, phoneNumber } = billingDetails;
+  const [editedAddress, setEditedAddress] = useState(address || '');
+
+  const [editedPhone, setEditedPhone] = useState(phoneNumber || '');
+
+  return (
+    <Modal isOpen={isOpen} onClose={onClose}>
+      <div className="flex flex-col space-y-5">
+        <h1 className=" text-2xl font-medium leading-7">Billing Details</h1>
+        <div className="flex grow flex-col space-y-4">
+          <DetailsInput
+            label="Address"
+            textValue={editedAddress}
+            onChangeTextValue={setEditedAddress}
+            maxLength={MAX_INPUT_LENGHT}
+            disabled={isLoading}
+            hideMaxLength
+          />
+          <div>
+            <span className={'text-sm text-gray-80'}>Phone</span>
+            <PhoneInput
+              value={editedPhone}
+              onChange={setEditedPhone}
+              inputClassName="!inxt-input !h-10 w-full !rounded-r-md !border !border-gray-20 !bg-transparent !py-1 !px-4 !text-lg !font-normal !text-gray-80 !placeholder-gray-30 !outline-none !ring-primary !ring-opacity-10 !hover:border-gray-30 !focus:border-primary !focus:ring-3 !disabled:border-gray-10 !disabled:text-gray-40 !disabled:placeholder-gray-20 !dark:ring-opacity-20"
+              countrySelectorStyleProps={{
+                buttonClassName:
+                  '!h-10 !bg-transparent !px-2 !py-1 !rounded-l-md !border !border-gray-20 !focus:border-primary !focus-visible:border-primary',
+              }}
+              disabled={isLoading}
+              defaultCountry="es"
+              forceDialCode
+            />
+          </div>
+        </div>
+
+        <div className="flex w-full flex-row justify-end space-x-2">
+          <Button disabled={isLoading} variant="secondary" onClick={onClose}>
+            {t('views.preferences.workspace.overview.editOverviewDetails.cancelButton')}
+          </Button>
+          <Button
+            loading={isLoading}
+            variant="primary"
+            onClick={() =>
+              onSave({
+                address: editedAddress,
+
+                phoneNumber: editedPhone,
+              })
+            }
+            disabled={!editedAddress || !editedPhone}
+          >
+            {t('views.preferences.workspace.overview.editOverviewDetails.saveButton')}
+          </Button>
+        </div>
+      </div>
+    </Modal>
+  );
+};
+
+export default EditBillingDetailsModal;
diff --git a/src/app/newSettings/Sections/Workspace/Billing/components/EditPaymentMethodForm.tsx b/src/app/newSettings/Sections/Workspace/Billing/components/EditPaymentMethodForm.tsx
new file mode 100644
index 000000000..9f1b86279
--- /dev/null
+++ b/src/app/newSettings/Sections/Workspace/Billing/components/EditPaymentMethodForm.tsx
@@ -0,0 +1,47 @@
+import { useState } from 'react';
+import { t } from 'i18next';
+
+import { PaymentElement, useElements, useStripe } from '@stripe/react-stripe-js';
+
+import Button from 'app/shared/components/Button/Button';
+
+interface EditPaymentMethodFormProps {
+  setIsEditPaymentMethodModalOpen: (isEditPaymentMethodModalOpen: boolean) => void;
+}
+
+const EditPaymentMethodForm = ({ setIsEditPaymentMethodModalOpen }: EditPaymentMethodFormProps) => {
+  const [error, setError] = useState<null | string>(null);
+
+  const stripe = useStripe();
+  const elements = useElements();
+  async function handleSubmit() {
+    if (!stripe || !elements) return;
+
+    const result = await stripe.confirmSetup({
+      elements,
+      confirmParams: { return_url: window.location.href },
+    });
+
+    if (result.error.message) {
+      setError(result.error.message);
+    } else {
+      setError('Something went wrong while trying to change your payment method');
+    }
+  }
+  return (
+    <>
+      <PaymentElement className="mt-5" />
+      {error && <p className="mt-2 text-sm text-red">{error}</p>}
+      <div className="mt-3 flex items-center justify-end">
+        <Button variant="secondary" onClick={() => setIsEditPaymentMethodModalOpen(false)}>
+          {t('actions.cancel')}
+        </Button>
+        <Button onClick={handleSubmit} className="ml-2">
+          {t('actions.save')}
+        </Button>
+      </div>
+    </>
+  );
+};
+
+export default EditPaymentMethodForm;
diff --git a/src/app/newSettings/Sections/Workspace/Billing/components/EditPaymentMethodModal.tsx b/src/app/newSettings/Sections/Workspace/Billing/components/EditPaymentMethodModal.tsx
new file mode 100644
index 000000000..8d9e595ba
--- /dev/null
+++ b/src/app/newSettings/Sections/Workspace/Billing/components/EditPaymentMethodModal.tsx
@@ -0,0 +1,51 @@
+import { useState } from 'react';
+import { t } from 'i18next';
+
+import { Elements } from '@stripe/react-stripe-js';
+
+import paymentService from 'app/payment/services/payment.service';
+import useEffectAsync from 'app/core/hooks/useEffectAsync';
+
+import Modal from 'app/shared/components/Modal';
+import Spinner from 'app/shared/components/Spinner/Spinner';
+import EditPaymentMethodForm from './EditPaymentMethodForm';
+import { UserType } from '@internxt/sdk/dist/drive/payments/types';
+
+interface EditPaymentMethodModalProps {
+  isEditPaymentMethodModalOpen: boolean;
+  setIsEditPaymentMethodModalOpen: (isEditPaymentMethodModalOpen) => void;
+  userType: UserType;
+}
+
+const EditPaymentMethodModal = ({
+  isEditPaymentMethodModalOpen,
+  setIsEditPaymentMethodModalOpen,
+  userType = UserType.Individual,
+}: EditPaymentMethodModalProps) => {
+  const [setupIntentSecret, setSetupIntentSecret] = useState<null | string>(null);
+
+  useEffectAsync(async () => {
+    if (isEditPaymentMethodModalOpen) {
+      setSetupIntentSecret(null);
+
+      const { clientSecret } = await paymentService.createSetupIntent(userType);
+
+      setSetupIntentSecret(clientSecret);
+    }
+  }, [isEditPaymentMethodModalOpen]);
+
+  return (
+    <Modal isOpen={isEditPaymentMethodModalOpen} onClose={() => setIsEditPaymentMethodModalOpen(false)}>
+      <h1 className="text-2xl font-medium text-gray-80">{t('views.account.tabs.billing.paymentMethod.title')}</h1>
+      {setupIntentSecret ? (
+        <Elements stripe={paymentService.getStripe()} options={{ clientSecret: setupIntentSecret }}>
+          <EditPaymentMethodForm setIsEditPaymentMethodModalOpen={setIsEditPaymentMethodModalOpen} />
+        </Elements>
+      ) : (
+        <Spinner className="h-8 w-8 text-gray-80" />
+      )}
+    </Modal>
+  );
+};
+
+export default EditPaymentMethodModal;
diff --git a/src/app/newSettings/Sections/Workspace/Billing/containers/BillingWorkspaceOverview.tsx b/src/app/newSettings/Sections/Workspace/Billing/containers/BillingWorkspaceOverview.tsx
new file mode 100644
index 000000000..7cc090915
--- /dev/null
+++ b/src/app/newSettings/Sections/Workspace/Billing/containers/BillingWorkspaceOverview.tsx
@@ -0,0 +1,61 @@
+import { t } from 'i18next';
+
+import localStorageService from 'app/core/services/local-storage.service';
+import { bytesToString } from '../../../../../drive/services/size.service';
+
+import Card from 'app/shared/components/Card';
+
+import { PlanState } from 'app/store/slices/plan';
+import { getNextBillingDate, getSubscriptionData } from '../../../../utils/suscriptionUtils';
+import { UserType } from '@internxt/sdk/dist/drive/payments/types';
+
+interface BillingWorkspaceOverviewProps {
+  plan: PlanState;
+}
+
+const BillingWorkspaceOverview = ({ plan }: BillingWorkspaceOverviewProps) => {
+  const local = localStorageService.get('i18nextLng') ?? navigator.language.split('-')[0];
+  const isFreeSuscription = plan.businessSubscription?.type === 'free';
+
+  const subscriptionData: { amountInterval: string; interval: 'monthly' | 'yearly'; renewDate: string } | undefined =
+    getSubscriptionData({ userSubscription: plan.businessSubscription, plan, local, userType: UserType.Business });
+  const nextBillingDate = getNextBillingDate(plan.businessSubscription);
+  const [integerPart, decimalPart] = subscriptionData?.amountInterval?.split('.') ?? [];
+
+  return (
+    <section className="flex flex-row">
+      {!isFreeSuscription ? (
+        <>
+          <Card className="mr-3 basis-1/2">
+            <div>
+              <p className="mb-0.5 text-3xl font-medium text-gray-100">{subscriptionData?.renewDate}</p>
+              <p className="font-regular text-base text-gray-60">
+                {t('preferences.workspace.billing.nextBillingDate')} ({nextBillingDate})
+              </p>
+            </div>
+          </Card>
+          <Card className="ml-3 basis-1/2">
+            <div>
+              <p className="text-xl font-medium text-gray-100">
+                <span className="text-3xl">{integerPart}</span>.{decimalPart}
+              </p>
+              <p className="font-regular text-base text-gray-60">
+                {t('preferences.workspace.billing.planLimit', { planLimit: bytesToString(plan.businessPlanLimit) })}
+              </p>
+            </div>
+          </Card>
+        </>
+      ) : (
+        <Card className="w-full text-center">
+          <h1 className="font-medium text-gray-60">
+            {t('preferences.workspace.billing.paymentMethod.freePlanTitle', {
+              planLimit: bytesToString(plan.businessPlanLimit),
+            })}
+          </h1>
+        </Card>
+      )}
+    </section>
+  );
+};
+
+export default BillingWorkspaceOverview;
diff --git a/src/app/newSettings/Sections/Workspace/Members/InviteDialog.tsx b/src/app/newSettings/Sections/Workspace/Members/InviteDialog.tsx
new file mode 100644
index 000000000..ca8863f1c
--- /dev/null
+++ b/src/app/newSettings/Sections/Workspace/Members/InviteDialog.tsx
@@ -0,0 +1,169 @@
+import { KeyboardEvent, useState } from 'react';
+import isValidEmail from '@internxt/lib/dist/src/auth/isValidEmail';
+import { UserPlus, X } from '@phosphor-icons/react';
+import { useForm } from 'react-hook-form';
+import { IFormValues } from '../../../../core/types';
+import { useTranslationContext } from '../../../../i18n/provider/TranslationProvider';
+import Button from '../../../../shared/components/Button/Button';
+import Card from '../../../../shared/components/Card';
+import Input from '../../../../shared/components/Input';
+import Modal from '../../../../shared/components/Modal';
+import BaseCheckbox from '../../../../shared/components/forms/BaseCheckbox/BaseCheckbox';
+import TextArea from '../../Account/Account/components/TextArea';
+import UserCard from './components/UserCard';
+
+interface UserInviteDialogProps {
+  isOpen: boolean;
+  onClose: () => void;
+  processInvitation: (emailList: string[], messageText: string) => Promise<void>;
+}
+
+type UsersToInvite = {
+  id: string;
+  name: string;
+  lastname: string;
+  email: string;
+  avatar: null | string;
+};
+
+const UserInviteDialog = ({ isOpen, onClose, processInvitation }: UserInviteDialogProps): JSX.Element => {
+  const { handleSubmit } = useForm<IFormValues>({ mode: 'onChange' });
+  const { translate } = useTranslationContext();
+  const [isLoading, setIsLoading] = useState(false);
+  const [email, setEmail] = useState('');
+  const [emailAccent, setEmailAccent] = useState<string>('');
+  const [isAddMessageSelected, setIsAddMessageSelected] = useState<boolean>(false);
+  const [messageText, setMessageText] = useState('');
+  const [usersToInvite, setUsersToInvite] = useState<UsersToInvite[]>([]);
+  const existsUsersToInvite = usersToInvite.length > 0;
+
+  const onRemoveUser = (email: string) => {
+    const newUsersToInvite = usersToInvite.filter((user) => user.email !== email);
+    setUsersToInvite(newUsersToInvite);
+  };
+
+  const onAddUsers = async () => {
+    const isDuplicated = usersToInvite.find((user) => user.email === email);
+    const isValid = isValidEmail(email);
+
+    if (isDuplicated || !isValid) {
+      setEmailAccent('error');
+      return;
+    }
+
+    // MOCKED
+    setUsersToInvite([...usersToInvite, { name: email, email, lastname: '', avatar: null, id: email }]);
+    setEmailAccent('');
+    setEmail('');
+  };
+
+  const onInviteUser = async () => {
+    setIsLoading(true);
+
+    const emailList = usersToInvite.map((user) => user.email);
+    await processInvitation(emailList, messageText);
+
+    setUsersToInvite([]);
+    setIsLoading(false);
+  };
+
+  const handleKeyDown = (event: KeyboardEvent<HTMLInputElement>) => {
+    const keyPressed = event.key;
+    if (keyPressed === ' ' || keyPressed === ',') {
+      event.preventDefault();
+      onAddUsers();
+    }
+  };
+
+  return (
+    <Modal isOpen={isOpen} onClose={onClose}>
+      {/* HEADER */}
+      <div className="-mx-5 flex flex-row items-center justify-between border-b border-gray-10 px-5 pb-5">
+        <span
+          className="max-w-full overflow-hidden text-ellipsis whitespace-nowrap text-xl font-medium"
+          title={translate('preferences.workspace.members.inviteDialog.title')}
+        >
+          {translate('preferences.workspace.members.inviteDialog.title')}
+        </span>
+        <div className="flex h-9 w-9 cursor-pointer items-center justify-center rounded-md bg-black/0 transition-all duration-200 ease-in-out hover:bg-black/4 active:bg-black/8">
+          <X onClick={() => (isLoading ? null : onClose())} size={22} />
+        </div>
+      </div>
+      {/* BODY */}
+      <div className="mt-5 ">
+        <form className="flex w-full" onSubmit={handleSubmit(onAddUsers)}>
+          <div className="w-full">
+            <Input
+              className="mr-2 w-full"
+              required
+              disabled={isLoading}
+              variant="email"
+              onChange={(e) => setEmail(e)}
+              accent={emailAccent === 'error' ? 'error' : undefined}
+              name="email"
+              value={email}
+              onKeyDown={handleKeyDown}
+            />
+            <span className="text-xs font-normal text-gray-60">
+              {translate('preferences.workspace.members.inviteDialog.inputDescription')}
+            </span>
+          </div>
+        </form>
+        {usersToInvite.map(({ id, name, lastname, email: userEmail }) => (
+          <div key={id} className="flex flex-row justify-between py-2">
+            <UserCard name={name} lastname={lastname} email={userEmail} avatarsrc={''} />
+            <Button variant="secondary" className="h-8" disabled={isLoading} onClick={() => onRemoveUser(userEmail)}>
+              {translate('preferences.workspace.members.inviteDialog.remove')}
+            </Button>
+          </div>
+        ))}
+        <Card className="mt-6 dark:bg-gray-5">
+          <div className="flex w-full items-center justify-center">
+            {usersToInvite.length ? (
+              <div className="flex w-full items-center space-x-3">
+                <div className="flex h-9 w-9 items-center justify-center rounded-full bg-gray-10 dark:bg-gray-30">
+                  <UserPlus size={20} width={36} />
+                </div>
+                <p className="text-left text-sm font-normal text-gray-100">
+                  {translate('preferences.workspace.members.inviteDialog.inviteUsersDescription')}
+                </p>
+              </div>
+            ) : (
+              <p className="text-center text-sm font-normal text-gray-100">
+                {translate('preferences.workspace.members.inviteDialog.enterUserEmail')}
+              </p>
+            )}
+          </div>
+        </Card>
+        {isAddMessageSelected && (
+          <div className="mt-6">
+            <TextArea
+              placeholder="Enter your message text (optional)"
+              value={messageText}
+              onChangeValue={setMessageText}
+              disabled={isLoading}
+              rows={3}
+              maxCharacters={250}
+            />
+          </div>
+        )}
+        <div className={`${isAddMessageSelected ? 'mt-2' : 'mt-8'} flex w-full flex-row items-center justify-between`}>
+          <button
+            className={`flex items-center ${!isLoading ? 'cursor-pointer' : ''}`}
+            onClick={() => !isLoading && setIsAddMessageSelected(!isAddMessageSelected)}
+          >
+            <BaseCheckbox checked={isAddMessageSelected} />
+            <p className="ml-2 text-base font-medium">
+              {translate('preferences.workspace.members.inviteDialog.addMessage')}
+            </p>
+          </button>
+          <Button variant="primary" disabled={!existsUsersToInvite} onClick={onInviteUser} loading={isLoading}>
+            {translate('preferences.workspace.members.inviteDialog.invite')}
+          </Button>
+        </div>
+      </div>
+    </Modal>
+  );
+};
+
+export default UserInviteDialog;
diff --git a/src/app/newSettings/Sections/Workspace/Members/MembersSection.tsx b/src/app/newSettings/Sections/Workspace/Members/MembersSection.tsx
new file mode 100644
index 000000000..6364b1f25
--- /dev/null
+++ b/src/app/newSettings/Sections/Workspace/Members/MembersSection.tsx
@@ -0,0 +1,237 @@
+import { WorkspaceUser } from '@internxt/sdk/dist/workspaces';
+import Section from 'app/newSettings/components/Section';
+import { useEffect, useState } from 'react';
+import errorService from '../../../../core/services/error.service';
+import workspacesService from '../../../../core/services/workspace.service';
+import { bytesToString } from '../../../../drive/services/size.service';
+import { useTranslationContext } from '../../../../i18n/provider/TranslationProvider';
+import UsageBar from '../../../../newSettings/components/Usage/UsageBar';
+import { getMemberRole, searchMembers } from '../../../../newSettings/utils/membersUtils';
+import Button from '../../../../shared/components/Button/Button';
+import Card from '../../../../shared/components/Card';
+import Input from '../../../../shared/components/Input';
+import { RootState } from '../../../../store';
+import { useAppSelector } from '../../../../store/hooks';
+import workspacesSelectors from '../../../../store/slices/workspaces/workspaces.selectors';
+import UserCard from './components/UserCard';
+import InviteDialogContainer from './containers/InviteDialogContainer';
+import MemberDetailsContainer from './containers/MemberDetailsContainer';
+
+const PENDING_INVITATIONS_LIMIT = 25;
+const PENDING_INVITATIONS_OFFSET = 0;
+
+const MembersSection = ({ onClosePreferences }: { onClosePreferences: () => void }) => {
+  const { translate } = useTranslationContext();
+  const selectedWorkspace = useAppSelector((state: RootState) => state.workspaces.selectedWorkspace);
+  const isCurrentUserWorkspaceOwner = useAppSelector(workspacesSelectors.isWorkspaceOwner);
+  const [searchedMemberName, setSearchedMemberName] = useState('');
+  const [hoverItemIndex, setHoverItemIndex] = useState<number | null>(null);
+  const [isInviteDialogOpen, setIsInviteDialogOpen] = useState(false);
+  const [selectedMember, setSelectedMember] = useState<WorkspaceUser | null>(null);
+  const [members, setMembers] = useState<WorkspaceUser[] | null>(null);
+  const [displayedMembers, setDisplayedMembers] = useState(members);
+  const [isCurrentMemberOwner, setIsCurrentMemberOwner] = useState<boolean>(false);
+  const [guestUsers, setGuestUsers] = useState<number>(0);
+
+  useEffect(() => {
+    const selectedWorkspaceId = selectedWorkspace?.workspace.id;
+    selectedWorkspaceId && getWorkspacesMembers(selectedWorkspaceId);
+    getWorkspacePendingInvitations(selectedWorkspace?.workspaceUser.workspaceId);
+  }, []);
+
+  useEffect(() => {
+    displayedMembers && getCurrentMember(selectedWorkspace?.workspaceUser.memberId);
+  }, [displayedMembers]);
+
+  useEffect(() => {
+    const newMembers = searchMembers(members, searchedMemberName);
+    setDisplayedMembers(newMembers);
+  }, [searchedMemberName]);
+
+  const getWorkspacePendingInvitations = async (workspaceId) => {
+    try {
+      const workspaceGuestsUsers = await workspacesService.getWorkspacePendingInvitations(
+        workspaceId,
+        PENDING_INVITATIONS_LIMIT,
+        PENDING_INVITATIONS_OFFSET,
+      );
+      const workspaceGuestsUsersLength = workspaceGuestsUsers.length;
+      setGuestUsers(workspaceGuestsUsersLength);
+    } catch (error) {
+      errorService.reportError(error);
+    }
+  };
+
+  const getWorkspacesMembers = async (selectedWorkspaceId: string) => {
+    try {
+      const members = await workspacesService.getWorkspacesMembers(selectedWorkspaceId);
+      setMembers([...members.activatedUsers, ...members.disabledUsers]);
+      setDisplayedMembers([...members.activatedUsers, ...members.disabledUsers]);
+    } catch (error) {
+      errorService.reportError(error);
+    }
+  };
+
+  const getCurrentMember = (workspaceMemberId) => {
+    const workspaceCurrentMember = displayedMembers?.find((member) => member.memberId === workspaceMemberId);
+    workspaceCurrentMember?.isOwner && setIsCurrentMemberOwner(true);
+  };
+
+  return (
+    <Section
+      title={
+        selectedMember
+          ? selectedMember.member.name + ' ' + selectedMember.member.lastname
+          : translate('preferences.workspace.members.members')
+      }
+      onBackButtonClicked={selectedMember ? () => setSelectedMember(null) : undefined}
+      onClosePreferences={onClosePreferences}
+    >
+      {selectedMember ? (
+        <MemberDetailsContainer
+          member={selectedMember}
+          getWorkspacesMembers={getWorkspacesMembers}
+          isOwner={isCurrentUserWorkspaceOwner}
+        />
+      ) : (
+        <>
+          {/* MEMBERS AND GUESTS CARDS */}
+          <div className="fles-row flex w-full justify-between space-x-6">
+            <Card className="w-full">
+              <div className="flex grow flex-col">
+                <span className="text-xl font-medium text-gray-100">{members?.length}</span>
+                {translate('preferences.workspace.members.members')}
+                <span className="text-base font-normal text-gray-60"></span>
+              </div>
+            </Card>
+            <Card className="w-full">
+              <div className="flex grow flex-col">
+                <span className="text-xl font-medium text-gray-100">{guestUsers}</span>
+                <span className="text-base font-normal text-gray-60">
+                  {translate('preferences.workspace.members.guests')}
+                </span>
+              </div>
+            </Card>
+          </div>
+          {/* MEMBERS LIST */}
+          <div className="flex flex-col space-y-3">
+            <div className="flex flex-row justify-between">
+              <Input
+                placeholder={translate('preferences.workspace.members.search')}
+                variant="email"
+                autoComplete="off"
+                onChange={setSearchedMemberName}
+                value={searchedMemberName}
+                name="memberName"
+              />
+              {isCurrentMemberOwner && (
+                <Button variant="primary" onClick={() => setIsInviteDialogOpen(true)}>
+                  {translate('preferences.workspace.members.invite')}
+                </Button>
+              )}
+            </div>
+            <div className="flex">
+              {/* LEFT COLUMN */}
+              <div className="flex grow flex-col">
+                <div className="flex grow flex-col">
+                  <span
+                    className={
+                      'flex h-12 flex-row items-center justify-between rounded-tl-xl border-b border-l border-t border-gray-10 bg-gray-5 px-5 py-2 '
+                    }
+                  >
+                    {translate('preferences.workspace.members.list.user')}
+                  </span>
+                </div>
+                {displayedMembers?.map((member, i) => {
+                  const role = getMemberRole(member);
+                  const { id, name, lastname, email } = member.member;
+                  return (
+                    <button
+                      key={id}
+                      className={`flex h-14 flex-row justify-between border-l border-gray-10 px-5 py-2 text-base  font-medium text-gray-100 dark:bg-gray-1 ${
+                        members && i === members.length - 1 ? 'rounded-bl-xl border-b' : ' border-b'
+                      }
+              ${hoverItemIndex === id ? 'bg-gray-5 dark:bg-gray-5' : 'bg-surface'}`}
+                      onMouseEnter={() => setHoverItemIndex(id)}
+                      onMouseLeave={() => setHoverItemIndex(null)}
+                      onClick={() => setSelectedMember(member)}
+                    >
+                      <UserCard name={name} lastname={lastname} role={role} email={email} avatarsrc={''} />
+                    </button>
+                  );
+                })}
+              </div>
+              {/* CENTER COLUMN */}
+              <div className="flex grow flex-col">
+                <div className="flex h-12 items-center border-b border-t border-gray-10 bg-gray-5 py-2">
+                  <span
+                    className={
+                      'flex w-full items-center justify-between border-l border-r border-gray-10 bg-gray-5 pl-5 pr-1 '
+                    }
+                  >
+                    {translate('preferences.workspace.members.list.usage')}
+                  </span>
+                </div>
+                {displayedMembers?.map((member, i) => {
+                  const { spaceLimit, usedSpace, backupsUsage, driveUsage } = member;
+                  const { id } = member.member;
+                  const usedSpaceBytes = bytesToString(Number(usedSpace));
+                  return (
+                    <button
+                      key={id}
+                      className={`justify-betweendw flex h-14 items-center border-gray-10 px-5 py-2 text-base font-normal text-gray-60 dark:bg-gray-1 ${
+                        members && i === members.length - 1 ? 'border-b' : ' border-b'
+                      } ${hoverItemIndex === id ? 'bg-gray-5 dark:bg-gray-5' : 'bg-surface'}`}
+                      onMouseEnter={() => setHoverItemIndex(id)}
+                      onMouseLeave={() => setHoverItemIndex(null)}
+                      onClick={() => setSelectedMember(member)}
+                    >
+                      <div className="flex w-full items-center justify-between">
+                        <UsageBar
+                          backupsUsage={backupsUsage}
+                          driveUsage={driveUsage}
+                          spaceLimit={spaceLimit}
+                          height={'h-4'}
+                        />
+                        <span className="ml-4">{usedSpaceBytes ?? '0Bytes'}</span>
+                      </div>
+                    </button>
+                  );
+                })}
+              </div>
+              {/* RIGHT COLUMN */}
+              <div className="flex w-28 flex-col rounded-tr-xl">
+                <div>
+                  <div className="flex h-12 items-center truncate rounded-tr-xl border-b border-t border-gray-10 bg-gray-5 p-5">
+                    <span className={'truncate rounded-tr-xl'}>
+                      {translate('preferences.workspace.members.list.storage')}
+                    </span>
+                  </div>
+                </div>
+                {displayedMembers?.map((member, i) => {
+                  const { spaceLimit } = member;
+                  const { id } = member.member;
+                  return (
+                    <button
+                      key={id}
+                      className={`flex h-14 flex-row items-center justify-between border-r border-gray-10 py-2 pl-5 text-base font-normal text-gray-60 dark:bg-gray-1 ${
+                        members && i === members.length - 1 ? 'rounded-br-xl border-b' : 'border-b'
+                      } ${hoverItemIndex === id ? 'bg-gray-5 dark:bg-gray-5' : ''}`}
+                      onMouseEnter={() => setHoverItemIndex(id)}
+                      onMouseLeave={() => setHoverItemIndex(null)}
+                    >
+                      <span className=" text-base font-medium leading-5">{bytesToString(Number(spaceLimit))}</span>
+                    </button>
+                  );
+                })}
+              </div>
+            </div>
+          </div>
+          <InviteDialogContainer isOpen={isInviteDialogOpen} onClose={() => setIsInviteDialogOpen(false)} />
+        </>
+      )}
+    </Section>
+  );
+};
+
+export default MembersSection;
diff --git a/src/app/newSettings/Sections/Workspace/Members/components/ActionModal.tsx b/src/app/newSettings/Sections/Workspace/Members/components/ActionModal.tsx
new file mode 100644
index 000000000..252de430a
--- /dev/null
+++ b/src/app/newSettings/Sections/Workspace/Members/components/ActionModal.tsx
@@ -0,0 +1,49 @@
+import Button from '../../../../../shared/components/Button/Button';
+import Modal from '../../../../../shared/components/Modal';
+
+// TODO: MOVE TO COMPONENTS LIBRARY
+const ActionModal = ({
+  isOpen,
+  onClose,
+  onActionButtonClicked,
+  isLoading,
+  modalTexts,
+  actionButtonVariant = 'accent',
+  children,
+  modalWitdhClassname,
+}: {
+  isOpen: boolean;
+  onActionButtonClicked: () => void;
+  onClose: () => void;
+  isLoading: boolean;
+  actionButtonVariant?: 'primary' | 'accent' | 'secondary' | 'tertiary';
+  modalTexts: {
+    title: string;
+    description: string;
+    cancelButtonText: string;
+    actionButtonText: string;
+    actionLoadingButtonText: string;
+  };
+  children?: JSX.Element;
+  modalWitdhClassname?: string;
+}) => {
+  return (
+    <Modal isOpen={isOpen} className="p-5" width={modalWitdhClassname ?? 'w-96'} onClose={onClose}>
+      <div className="flexflex-col space-y-5">
+        <h1 className="text-2xl font-medium text-gray-80">{modalTexts.title}</h1>
+        <p className=" text-base font-normal text-gray-80">{modalTexts.description}</p>
+        {children}
+        <div className="flex justify-end">
+          <Button disabled={isLoading} variant="secondary" onClick={onClose}>
+            {modalTexts.cancelButtonText}
+          </Button>
+          <Button loading={isLoading} variant={actionButtonVariant} className="ml-2" onClick={onActionButtonClicked}>
+            {isLoading ? modalTexts.actionLoadingButtonText : modalTexts.actionButtonText}
+          </Button>
+        </div>
+      </div>
+    </Modal>
+  );
+};
+
+export default ActionModal;
diff --git a/src/app/newSettings/Sections/Workspace/Members/components/ActivityFilters.tsx b/src/app/newSettings/Sections/Workspace/Members/components/ActivityFilters.tsx
new file mode 100644
index 000000000..95d2a319e
--- /dev/null
+++ b/src/app/newSettings/Sections/Workspace/Members/components/ActivityFilters.tsx
@@ -0,0 +1,126 @@
+import { useState, useRef, useEffect } from 'react';
+import { t } from 'i18next';
+import { FunnelSimple } from '@phosphor-icons/react';
+
+import Button from 'app/shared/components/Button/Button';
+import BaseCheckbox from 'app/shared/components/forms/BaseCheckbox/BaseCheckbox';
+import RadioButton from 'app/shared/components/forms/RadioButton/RadioButton';
+
+interface ActivityFiltersProps {
+  isSelectedRoles: string[];
+  setIsSelectedRoles: (selectedRoles) => void;
+}
+
+const ActivityFilters = ({ isSelectedRoles, setIsSelectedRoles }: ActivityFiltersProps) => {
+  const roles = [
+    { type: 'member', name: t('preferences.workspace.members.tabs.activity.roles.member') },
+    { type: 'manager', name: t('preferences.workspace.members.tabs.activity.roles.manager') },
+    { type: 'owner', name: t('preferences.workspace.members.tabs.activity.roles.owner') },
+  ];
+
+  const dateRange = [
+    { days: '7', name: t('preferences.workspace.members.tabs.activity.filter.dateRange.7days') },
+    { days: '30', name: t('preferences.workspace.members.tabs.activity.filter.dateRange.30days') },
+    { days: '90', name: t('preferences.workspace.members.tabs.activity.filter.dateRange.90days') },
+  ];
+
+  const [isOpen, setIsOpen] = useState<boolean>(false);
+  const [isFiltersModified, setIsFiltersModified] = useState<boolean>(false);
+  const [rangeSelected, setRangeSelected] = useState<string>('7');
+  const filterDropdownRef = useRef<HTMLDivElement>(null);
+
+  useEffect(() => {
+    document.addEventListener('mousedown', handleOutsideClick);
+    return () => {
+      document.removeEventListener('mousedown', handleOutsideClick);
+    };
+  });
+
+  const handleOutsideClick = (e) => {
+    if (filterDropdownRef.current && !filterDropdownRef.current.contains(e.target)) {
+      setIsOpen(false);
+    }
+  };
+
+  const onFilteredRoles = (roleType) => {
+    const newSelectedRoles = [...isSelectedRoles];
+    const roleIndex = newSelectedRoles.indexOf(roleType);
+    const isSelected = newSelectedRoles.includes(roleType);
+
+    isSelected ? newSelectedRoles.splice(roleIndex, 1) : newSelectedRoles.push(roleType);
+    newSelectedRoles.length === 3 ? setIsFiltersModified(false) : setIsFiltersModified(true);
+    setIsSelectedRoles(newSelectedRoles);
+  };
+
+  return (
+    <div className="relative" ref={filterDropdownRef}>
+      <Button variant="secondary" onClick={() => setIsOpen(!isOpen)}>
+        {t('preferences.workspace.members.tabs.activity.filter.button')}
+        <FunnelSimple size={24} className="ml-2" />
+        {isFiltersModified && (
+          <div className="fixed absolute right-5 top-0 mt-2.5 h-2 w-2 rounded-full border border-surface bg-primary"></div>
+        )}
+      </Button>
+      <div
+        className={`fixed absolute right-0 mt-1 w-64 overflow-hidden rounded-lg border border-gray-10 bg-surface shadow-xl transition-all duration-300 ease-in-out dark:bg-gray-5 ${
+          isOpen ? 'block opacity-100' : 'hidden opacity-0'
+        }`}
+      >
+        <div className="flex items-center justify-between border-b border-gray-10 p-3">
+          <p className="text-lg font-medium text-gray-100">
+            {t('preferences.workspace.members.tabs.activity.filter.title')}
+          </p>
+          <Button
+            variant="secondary"
+            disabled={!isFiltersModified}
+            onClick={() => {
+              setIsSelectedRoles(['member', 'manager', 'owner']);
+              setIsFiltersModified(false);
+            }}
+          >
+            {t('preferences.workspace.members.tabs.activity.filter.clear')}
+          </Button>
+        </div>
+        <div className="px-4 pt-5 text-gray-100">
+          <div className="mb-2 flex items-center">
+            <h5 className="text-xs font-medium ">{t('preferences.workspace.members.tabs.activity.roles.title')}</h5>
+            {isFiltersModified && <div className="ml-1 h-2 w-2 rounded-full border border-surface bg-primary"></div>}
+          </div>
+          <div className="flex flex-col">
+            {roles.map((role) => {
+              const isSelected = isSelectedRoles.includes(role.type);
+
+              return (
+                <div key={role.name} className="flex items-center py-1.5">
+                  <BaseCheckbox checked={isSelected} onClick={() => onFilteredRoles(role.type)} />
+                  <p className="font-regular ml-2 text-base">{role.name}</p>
+                </div>
+              );
+            })}
+          </div>
+        </div>
+        <div className="px-4 pt-5 text-gray-100">
+          <div className="mb-2 flex items-center">
+            <h5 className="text-xs font-medium ">
+              {t('preferences.workspace.members.tabs.activity.filter.dateRange.title')}
+            </h5>
+          </div>
+          <div className="mb-3 flex flex-col">
+            {dateRange.map((date) => {
+              const isSelected = rangeSelected === date.days;
+
+              return (
+                <div className="flex items-center py-1.5" key={date.days}>
+                  <RadioButton checked={isSelected} onClick={() => setRangeSelected(date.days)} />
+                  <p className="font-regular ml-2 text-base">{date.name}</p>
+                </div>
+              );
+            })}
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default ActivityFilters;
diff --git a/src/app/newSettings/Sections/Workspace/Members/components/ActivityTab.tsx b/src/app/newSettings/Sections/Workspace/Members/components/ActivityTab.tsx
new file mode 100644
index 000000000..9240ae58d
--- /dev/null
+++ b/src/app/newSettings/Sections/Workspace/Members/components/ActivityTab.tsx
@@ -0,0 +1,88 @@
+import { useState } from 'react';
+import { t } from 'i18next';
+import { ActivityTabProps } from '../../../../types/types';
+
+import EmptyTab from 'app/newSettings/components/EmptyTab';
+
+import membersActivity from 'assets/icons/empty/members-activity.svg';
+import ActivityFilters from './ActivityFilters';
+
+const ActivityTab = ({ role, isActivityEnabled, activity }: ActivityTabProps): JSX.Element => {
+  const isOwner = role === 'owner';
+  const [isSelectedRoles, setIsSelectedRoles] = useState<string[]>(['member', 'manager', 'owner']);
+
+  const enableActivity = () => {};
+
+  return (
+    <>
+      {!isActivityEnabled && isOwner && (
+        <EmptyTab
+          icon={membersActivity}
+          title={t('preferences.workspace.members.tabs.activity.disabilitedOwner.title')}
+          subtitle={t('preferences.workspace.members.tabs.activity.disabilitedOwner.subtitle')}
+          action={{
+            text: t('preferences.workspace.members.tabs.activity.disabilitedOwner.action'),
+            onClick: enableActivity,
+          }}
+        />
+      )}
+
+      {!isActivityEnabled && !isOwner && (
+        <EmptyTab
+          icon={membersActivity}
+          title={t('preferences.workspace.members.tabs.activity.disabilitedMember.title')}
+          subtitle={t('preferences.workspace.members.tabs.activity.disabilitedMember.subtitle')}
+        />
+      )}
+
+      {isActivityEnabled && (
+        <section>
+          <div className="mb-3 flex items-center justify-between">
+            <h3 className="text-xl font-medium text-gray-100">
+              {t('preferences.workspace.members.tabs.activity.name')}
+            </h3>
+            <ActivityFilters isSelectedRoles={isSelectedRoles} setIsSelectedRoles={setIsSelectedRoles} />
+          </div>
+          <div className="flex h-full w-full flex-col rounded-xl border border-gray-10 p-6 shadow-sm">
+            {activity.map((day) => {
+              const records = day.records;
+              const lastRecord = records.slice(-1);
+
+              return (
+                <div key={day.date}>
+                  <p className="mb-px w-fit rounded-md bg-gray-5 px-3 py-1.5 text-sm font-medium text-gray-100">
+                    {day.date}
+                  </p>
+                  {records.length > 0 ? (
+                    records.map((record) => {
+                      return (
+                        <div
+                          key={record.description}
+                          className={`flex justify-between py-3 ${
+                            lastRecord[0]?.title !== record.title && 'border-b border-gray-10'
+                          }`}
+                        >
+                          <div>
+                            <p className="font-regular mb-0.5 text-base text-gray-100">{record.title}</p>
+                            <p className="font-regular text-sm text-gray-60">{record.description}</p>
+                          </div>
+                          <p className="font-regular text-base text-gray-50">{record.time}</p>
+                        </div>
+                      );
+                    })
+                  ) : (
+                    <div className="font-regular mb-2.5 pb-6 pt-3 text-base text-gray-40">
+                      {t('preferences.workspace.members.tabs.activity.empty')}
+                    </div>
+                  )}
+                </div>
+              );
+            })}
+          </div>
+        </section>
+      )}
+    </>
+  );
+};
+
+export default ActivityTab;
diff --git a/src/app/newSettings/Sections/Workspace/Members/components/DeactivateModal.tsx b/src/app/newSettings/Sections/Workspace/Members/components/DeactivateModal.tsx
new file mode 100644
index 000000000..a7fc74896
--- /dev/null
+++ b/src/app/newSettings/Sections/Workspace/Members/components/DeactivateModal.tsx
@@ -0,0 +1,37 @@
+import { useTranslationContext } from '../../../../../i18n/provider/TranslationProvider';
+
+import ActionModal from './ActionModal';
+
+const DeactivateMemberModal = ({
+  isOpen,
+  onClose,
+  name,
+  onDeactivate,
+  isLoading,
+}: {
+  name: string;
+  isOpen: boolean;
+  onDeactivate: () => void;
+  onClose: () => void;
+  isLoading: boolean;
+}) => {
+  const { translate } = useTranslationContext();
+
+  return (
+    <ActionModal
+      isOpen={isOpen}
+      onClose={onClose}
+      onActionButtonClicked={onDeactivate}
+      isLoading={isLoading}
+      modalTexts={{
+        title: translate('preferences.workspace.members.deactivationModal.title'),
+        description: translate('preferences.workspace.members.deactivationModal.description', { name }),
+        cancelButtonText: translate('actions.cancel'),
+        actionButtonText: translate('preferences.workspace.members.deactivationModal.deactivate'),
+        actionLoadingButtonText: translate('preferences.workspace.members.deactivationModal.deactivating'),
+      }}
+    />
+  );
+};
+
+export default DeactivateMemberModal;
diff --git a/src/app/newSettings/Sections/Workspace/Members/components/ReactivateModal.tsx b/src/app/newSettings/Sections/Workspace/Members/components/ReactivateModal.tsx
new file mode 100644
index 000000000..488035342
--- /dev/null
+++ b/src/app/newSettings/Sections/Workspace/Members/components/ReactivateModal.tsx
@@ -0,0 +1,38 @@
+import { useTranslationContext } from '../../../../../i18n/provider/TranslationProvider';
+
+import ActionModal from './ActionModal';
+
+const ReactivateMemberModal = ({
+  isOpen,
+  onClose,
+  name,
+  onReactivate,
+  isLoading,
+}: {
+  name: string;
+  isOpen: boolean;
+  onReactivate: () => void;
+  onClose: () => void;
+  isLoading: boolean;
+}) => {
+  const { translate } = useTranslationContext();
+
+  return (
+    <ActionModal
+      isOpen={isOpen}
+      onClose={onClose}
+      onActionButtonClicked={onReactivate}
+      isLoading={isLoading}
+      actionButtonVariant="primary"
+      modalTexts={{
+        title: translate('preferences.workspace.members.reactivationModal.title'),
+        description: translate('preferences.workspace.members.reactivationModal.description', { name }),
+        cancelButtonText: translate('actions.cancel'),
+        actionButtonText: translate('preferences.workspace.members.reactivationModal.reactivate'),
+        actionLoadingButtonText: translate('preferences.workspace.members.reactivationModal.reactivating'),
+      }}
+    />
+  );
+};
+
+export default ReactivateMemberModal;
diff --git a/src/app/newSettings/Sections/Workspace/Members/components/RequestPasswordModal.tsx b/src/app/newSettings/Sections/Workspace/Members/components/RequestPasswordModal.tsx
new file mode 100644
index 000000000..26b4595b3
--- /dev/null
+++ b/src/app/newSettings/Sections/Workspace/Members/components/RequestPasswordModal.tsx
@@ -0,0 +1,56 @@
+import { useEffect, useState } from 'react';
+import { useTranslationContext } from '../../../../../i18n/provider/TranslationProvider';
+import TextArea from '../../../Account/Account/components/TextArea';
+
+import ActionModal from './ActionModal';
+
+const RequestPasswordChangeModal = ({
+  isOpen,
+  onClose,
+  onSendRequest,
+  isLoading,
+  modalWitdhClassname,
+}: {
+  isOpen: boolean;
+  onSendRequest: () => void;
+  onClose: () => void;
+  isLoading: boolean;
+  modalWitdhClassname: string;
+}) => {
+  const { translate } = useTranslationContext();
+  const [message, setMessage] = useState('');
+
+  useEffect(() => {
+    setMessage('');
+  }, [isOpen]);
+
+  return (
+    <ActionModal
+      isOpen={isOpen}
+      onClose={onClose}
+      isLoading={isLoading}
+      actionButtonVariant="primary"
+      onActionButtonClicked={onSendRequest}
+      modalWitdhClassname={modalWitdhClassname}
+      modalTexts={{
+        title: translate('preferences.workspace.members.changePasswordModal.title'),
+        description: translate('preferences.workspace.members.changePasswordModal.description'),
+        cancelButtonText: translate('actions.cancel'),
+        actionButtonText: translate('preferences.workspace.members.changePasswordModal.actionButton'),
+        actionLoadingButtonText: translate('preferences.workspace.members.changePasswordModal.actionButton'),
+      }}
+    >
+      <TextArea
+        titleText="Message"
+        placeholder={translate('preferences.workspace.members.changePasswordModal.inputPlaceholder')}
+        value={message}
+        onChangeValue={setMessage}
+        disabled={isLoading}
+        rows={3}
+        maxCharacters={250}
+      />
+    </ActionModal>
+  );
+};
+
+export default RequestPasswordChangeModal;
diff --git a/src/app/newSettings/Sections/Workspace/Members/components/RoleBadge.tsx b/src/app/newSettings/Sections/Workspace/Members/components/RoleBadge.tsx
new file mode 100644
index 000000000..e05d0af50
--- /dev/null
+++ b/src/app/newSettings/Sections/Workspace/Members/components/RoleBadge.tsx
@@ -0,0 +1,40 @@
+import { MemberRole } from '../../../../types/types';
+
+type RoleProps = {
+  role?: MemberRole;
+  roleText: string;
+  size: string;
+};
+
+const RoleBadge = ({ role, roleText, size }: RoleProps) => {
+  if (!role) return <></>;
+
+  const roleColorMapping = {
+    owner: 'bg-indigo',
+    manager: 'bg-primary/15 dark:bg-primary/50',
+    member: 'bg-gray-10 dark:bg-gray-20',
+    deactivated: 'bg-red/15 dark:bg-red/50',
+    current: 'bg-primary/15 dark:bg-primary/50',
+  };
+
+  const roleTextColorMapping = {
+    owner: 'text-white',
+    manager: 'text-primary dark:text-white',
+    member: 'text-gray-60 dark:text-white',
+    deactivated: 'text-red dark:text-white',
+    current: 'text-primary dark:text-white',
+  };
+
+  const sizeMapping = {
+    small: 'text-xs h-5 px-1.5',
+    medium: 'text-sm h-7 px-2',
+  };
+
+  return (
+    <div className={`flex w-fit items-center justify-center rounded-md ${roleColorMapping[role]} ${sizeMapping[size]}`}>
+      <span className={`${roleTextColorMapping[role]} text-center font-medium`}>{roleText}</span>
+    </div>
+  );
+};
+
+export default RoleBadge;
diff --git a/src/app/newSettings/Sections/Workspace/Members/components/TeamsTab.tsx b/src/app/newSettings/Sections/Workspace/Members/components/TeamsTab.tsx
new file mode 100644
index 000000000..c24544c8b
--- /dev/null
+++ b/src/app/newSettings/Sections/Workspace/Members/components/TeamsTab.tsx
@@ -0,0 +1,77 @@
+import { t } from 'i18next';
+import { TeamsTabProps } from '../../../../types/types';
+import EmptyTab from 'app/newSettings/components/EmptyTab';
+import RoleBadge from './RoleBadge';
+
+import membersTeams from 'assets/icons/empty/members-teams.svg';
+
+const TeamsTab = ({ role, teams, isTeams }: TeamsTabProps): JSX.Element => {
+  const isOwner = role === 'owner';
+  const isUserTeams = teams.length > 0;
+
+  const createTeam = () => {};
+
+  return (
+    <div>
+      {isOwner && !isTeams && (
+        <EmptyTab
+          icon={membersTeams}
+          title={t('preferences.workspace.members.tabs.teams.emptyTeamsOwner.title')}
+          subtitle={t('preferences.workspace.members.tabs.teams.emptyTeamsOwner.subtitle')}
+          action={{
+            text: t('preferences.workspace.members.tabs.teams.emptyTeamsOwner.action'),
+            onClick: createTeam,
+          }}
+        />
+      )}
+
+      {!isOwner && !isTeams && (
+        <EmptyTab
+          icon={membersTeams}
+          title={t('preferences.workspace.members.tabs.teams.emptyTeamsMember.title')}
+          subtitle={t('preferences.workspace.members.tabs.teams.emptyTeamsMember.subtitle')}
+        />
+      )}
+
+      {isUserTeams && isTeams && (
+        <>
+          <div className="flex h-12 w-full items-center rounded-t-xl border border-gray-10 bg-gray-1 text-base font-medium text-gray-100">
+            <p className="w-3/5 border-r border-gray-10 pl-5">{t('preferences.workspace.members.tabs.teams.title')}</p>
+            <p className="pl-5">{t('preferences.workspace.members.tabs.teams.role')}</p>
+          </div>
+          {teams.map((team) => {
+            const isLastTeam = teams.length === teams.indexOf(team) + 1;
+
+            return (
+              <div
+                key={team.team}
+                className={`flex h-12 w-full items-center border-b border-l border-r border-gray-5 text-base font-medium text-gray-100 ${
+                  isLastTeam && 'rounded-b-xl'
+                }`}
+              >
+                <p className="w-3/5 pl-5">{team.team}</p>
+                <p className="pl-5">
+                  <RoleBadge
+                    role={team.role}
+                    roleText={t(`preferences.workspace.members.role.${team.role}`)}
+                    size={'medium'}
+                  />
+                </p>
+              </div>
+            );
+          })}
+        </>
+      )}
+
+      {!isUserTeams && isTeams && (
+        <section className="flex h-40 w-full flex-col items-center justify-center rounded-xl border border-gray-10 bg-gray-1 py-10">
+          <p className="font-regular text-center text-base text-gray-50">
+            {t('preferences.workspace.members.tabs.teams.emptyTeams.title')}
+          </p>
+        </section>
+      )}
+    </div>
+  );
+};
+
+export default TeamsTab;
diff --git a/src/app/newSettings/Sections/Workspace/Members/components/UserCard.tsx b/src/app/newSettings/Sections/Workspace/Members/components/UserCard.tsx
new file mode 100644
index 000000000..c7d67679e
--- /dev/null
+++ b/src/app/newSettings/Sections/Workspace/Members/components/UserCard.tsx
@@ -0,0 +1,46 @@
+import { useTranslationContext } from '../../../../../i18n/provider/TranslationProvider';
+import Avatar from '../../../../../shared/components/Avatar';
+import { MemberRole } from '../../../../types/types';
+import RoleBadge from './RoleBadge';
+
+interface UserProps {
+  name: string;
+  lastname: string;
+  role?: MemberRole;
+  email: string;
+  avatarsrc: string | null;
+  styleOptions?: {
+    avatarDiameter?: number;
+    nameStyle: string;
+    emailStyle: string;
+    rolePosition: 'row' | 'column';
+  };
+}
+
+const UserCard = ({ name, lastname, role, email, avatarsrc, styleOptions }: UserProps) => {
+  const { translate } = useTranslationContext();
+  const rolePosition = styleOptions?.rolePosition ?? 'row';
+  return (
+    <div className="flex flex-row space-x-2">
+      <Avatar src={avatarsrc} fullName={`${name} ${lastname}`} diameter={styleOptions?.avatarDiameter ?? 36} />
+      <div className="flex flex-col">
+        {rolePosition === 'column' && (
+          <RoleBadge role={role} roleText={translate(`preferences.workspace.members.role.${role}`)} size={'small'} />
+        )}
+        <div className="flex flex-row justify-between space-x-2">
+          <span className={styleOptions?.nameStyle ?? 'break-all text-base font-medium leading-5 text-gray-100'}>
+            {name} {lastname}
+          </span>
+          {rolePosition === 'row' && (
+            <RoleBadge role={role} roleText={translate(`preferences.workspace.members.role.${role}`)} size={'small'} />
+          )}
+        </div>
+        <span className={styleOptions?.emailStyle ?? 'break-all text-left text-sm font-normal leading-4 text-gray-50'}>
+          {email}
+        </span>
+      </div>
+    </div>
+  );
+};
+
+export default UserCard;
diff --git a/src/app/newSettings/Sections/Workspace/Members/containers/InviteDialogContainer.tsx b/src/app/newSettings/Sections/Workspace/Members/containers/InviteDialogContainer.tsx
new file mode 100644
index 000000000..c0e6a90f0
--- /dev/null
+++ b/src/app/newSettings/Sections/Workspace/Members/containers/InviteDialogContainer.tsx
@@ -0,0 +1,91 @@
+import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
+import { t } from 'i18next';
+import { useSelector } from 'react-redux';
+import userService from '../../../../../auth/services/user.service';
+import errorService from '../../../../../core/services/error.service';
+import navigationService from '../../../../../core/services/navigation.service';
+import workspacesService from '../../../../../core/services/workspace.service';
+import { AppView } from '../../../../../core/types';
+import { encryptMessageWithPublicKey } from '../../../../../crypto/services/pgp.service';
+import notificationsService, { ToastType } from '../../../../../notifications/services/notifications.service';
+import { RootState } from '../../../../../store';
+import UserInviteDialog from '../InviteDialog';
+
+const InviteDialogContainer = ({ isOpen, onClose }) => {
+  const selectedWorkspace = useSelector((state: RootState) => state.workspaces.selectedWorkspace);
+  const user = useSelector((state: RootState) => state.user.user);
+
+  const processWorkspaceInvitation = async (emailList: string[], messageText: string) => {
+    if (selectedWorkspace && user) {
+      const invitePromises = emailList.map((email) => {
+        return processInvitation(user, email, selectedWorkspace.workspace.id, messageText);
+      });
+
+      await Promise.all(invitePromises);
+    }
+  };
+
+  return <UserInviteDialog isOpen={isOpen} onClose={onClose} processInvitation={processWorkspaceInvitation} />;
+};
+
+const processInvitation = async (
+  user: UserSettings | null,
+  email: string,
+  workspaceId: string,
+  messageText: string,
+) => {
+  try {
+    if (!user) {
+      navigationService.push(AppView.Login);
+      return;
+    }
+    const { mnemonic } = user;
+    let publicKey;
+    try {
+      const publicKeyResponse = await userService.getPublicKeyByEmail(email);
+      publicKey = publicKeyResponse.publicKey;
+    } catch (err) {
+      console.log(err);
+    }
+    const isNewUser = !publicKey;
+
+    if (isNewUser) {
+      const preCreatedUserResponse = await userService.preCreateUser(email);
+      publicKey = preCreatedUserResponse.publicKey;
+    }
+
+    const encryptedMnemonic = await encryptMessageWithPublicKey({
+      message: mnemonic,
+      publicKeyInBase64: publicKey,
+    });
+
+    const encryptedMnemonicInBase64 = btoa(encryptedMnemonic as string);
+
+    // TODO: CHECK WHEN BACKEND ADD DEFUALT WORKSPACE LIMIT FOR MVP
+    await workspacesService.inviteUserToTeam({
+      workspaceId: workspaceId,
+      invitedUserEmail: email,
+      spaceLimitBytes: 52428800,
+      encryptedMnemonicInBase64: encryptedMnemonicInBase64,
+      encryptionAlgorithm: 'aes-256-gcm',
+      message: messageText,
+    });
+
+    notificationsService.show({
+      text: t('preferences.workspace.members.invitationFlow.invitationSent'),
+      type: ToastType.Success,
+    });
+  } catch (err) {
+    const castedError = errorService.castError(err);
+    errorService.reportError(err, { extra: { thunk: 'inviteToWorkspace', email: email } });
+    if (castedError.message === 'unauthenticated') {
+      return navigationService.push(AppView.Login);
+    }
+    notificationsService.show({
+      text: castedError.message,
+      type: ToastType.Error,
+    });
+  }
+};
+
+export default InviteDialogContainer;
diff --git a/src/app/newSettings/Sections/Workspace/Members/containers/MemberDetailsContainer.tsx b/src/app/newSettings/Sections/Workspace/Members/containers/MemberDetailsContainer.tsx
new file mode 100644
index 000000000..db3f5dbda
--- /dev/null
+++ b/src/app/newSettings/Sections/Workspace/Members/containers/MemberDetailsContainer.tsx
@@ -0,0 +1,223 @@
+import { WorkspaceUser } from '@internxt/sdk/dist/workspaces';
+import { DotsThreeVertical } from '@phosphor-icons/react';
+import errorService from 'app/core/services/error.service';
+import workspacesService from 'app/core/services/workspace.service';
+import Usage from 'app/newSettings/components/Usage/Usage';
+import { getMemberRole } from 'app/newSettings/utils/membersUtils';
+import { useEffect, useState } from 'react';
+import { useTranslationContext } from '../../../../../i18n/provider/TranslationProvider';
+import Card from '../../../../../shared/components/Card';
+import Spinner from '../../../../../shared/components/Spinner/Spinner';
+import { MemberRole, Teams, TypeTabs } from '../../../../types/types';
+import ActivityTab from '../components/ActivityTab';
+import DeactivateMemberModal from '../components/DeactivateModal';
+import ReactivateMemberModal from '../components/ReactivateModal';
+import RequestPasswordChangeModal from '../components/RequestPasswordModal';
+import TeamsTab from '../components/TeamsTab';
+import UserCard from '../components/UserCard';
+
+interface MemberDetailsContainer {
+  member: WorkspaceUser;
+  getWorkspacesMembers: (string) => void;
+  isOwner: boolean;
+}
+
+const MemberDetailsContainer = ({ member, getWorkspacesMembers, isOwner }: MemberDetailsContainer) => {
+  const { translate } = useTranslationContext();
+  const [isOptionsOpen, setIsOptionsOpen] = useState<boolean>(false);
+  const [isDeactivateModalOpen, setIsDeactivateModalOpen] = useState<boolean>(false);
+  const [isDeactivatingMember, setIsDeactivatingMember] = useState<boolean>(false);
+  const [isReactivateModalOpen, setIsReactivateModalOpen] = useState<boolean>(false);
+  const [isReactivatingMember, setIsReactivatingMember] = useState<boolean>(false);
+  const [isRequestChangePasswordModalOpen, setIsRequestChangePasswordModalOpen] = useState<boolean>(false);
+  const [isSendingPasswordRequest, setIsSendingPasswordRequest] = useState<boolean>(false);
+  const [memberRole, setMemberRole] = useState<MemberRole>('current');
+
+  useEffect(() => {
+    const memberRole = getMemberRole(member);
+    setMemberRole(memberRole);
+  }, []);
+
+  const deactivateMember = async () => {
+    try {
+      setIsDeactivatingMember(true);
+      await workspacesService.deactivateMember(member.workspaceId, member.memberId);
+      getWorkspacesMembers(member.workspaceId);
+      setMemberRole('deactivated');
+    } catch (error) {
+      errorService.reportError(error);
+    } finally {
+      setIsDeactivatingMember(false);
+      setIsDeactivateModalOpen(false);
+    }
+  };
+
+  const reactivateMember = async () => {
+    try {
+      setIsReactivatingMember(true);
+      await workspacesService.reactivateMember(member.workspaceId, member.memberId);
+      getWorkspacesMembers(member.workspaceId);
+      setMemberRole('member');
+    } catch (error) {
+      errorService.reportError(error);
+    } finally {
+      setIsReactivatingMember(false);
+      setIsReactivateModalOpen(false);
+    }
+  };
+
+  //  MOCK DATA TO BE IMPLENTED
+  const isActivityEnabled = Math.random() < 0.5;
+  const activity = [
+    {
+      date: 'Feb 13, 2024',
+      records: [],
+    },
+    {
+      date: 'Feb 12, 2024',
+      records: [
+        { title: 'Logged out', description: 'IP: 111.222.333', time: '12:35' },
+        {
+          title: 'Uploaded a file',
+          description: 'Drive/Marketing Team/January Campaign/Budget.pdf',
+          time: '12:35',
+        },
+        {
+          title: 'Created new folder',
+          description: 'Drive/Marketing Team/January Campaign',
+          time: '12:35',
+        },
+        {
+          title: 'Logged in',
+          description: 'IP: 111.222.333',
+          time: '12:35',
+        },
+      ],
+    },
+  ];
+  const teams: { isTeams: boolean; teams: Teams } = {
+    isTeams: true,
+    teams: [
+      { team: 'Deveolpment', role: 'owner' },
+      { team: 'Marketing', role: 'member' },
+    ],
+  };
+
+  const tabs: TypeTabs = [
+    {
+      name: translate('preferences.workspace.members.tabs.activity.name'),
+      tab: 'activity',
+      view: <ActivityTab role={memberRole} isActivityEnabled={isActivityEnabled} activity={activity} />,
+    },
+    {
+      name: translate('preferences.workspace.members.tabs.teams.title'),
+      tab: 'teams',
+      view: <TeamsTab role={memberRole} teams={teams.teams} isTeams={teams.isTeams} />,
+    },
+  ];
+  // const [activeTab, setActiveTab] = useState<ActiveTab>(tabs[0]);
+
+  return (
+    <div className="flex flex-col space-y-8">
+      <div className="flex flex-row  justify-between">
+        <UserCard
+          name={member.member.name}
+          lastname={member.member.lastname}
+          role={memberRole}
+          email={member.member.email}
+          avatarsrc={null}
+          styleOptions={{
+            avatarDiameter: 80,
+            nameStyle: 'text-2xl font-medium text-gray-100',
+            emailStyle: 'text-base font-normal text-gray-60',
+            rolePosition: 'column',
+          }}
+        />
+        {isOwner && !member.isOwner && (
+          <div className="relative flex items-center justify-end">
+            <button
+              className="flex h-10 w-10 items-center justify-center rounded-lg border border-gray-10 bg-gray-5 shadow-sm"
+              onClick={() => setIsOptionsOpen(!isOptionsOpen)}
+            >
+              <DotsThreeVertical size={24} />
+            </button>
+            {isOptionsOpen && (
+              <button onClick={() => setIsOptionsOpen(false)} className="absolute flex h-full w-full">
+                <div className="absolute right-0 top-16 flex flex-col items-center justify-center rounded-md border border-gray-10 bg-gray-5 shadow-sm">
+                  {/* NOT INCLUDED IN INITIAL SCOPE OF MVP */}
+                  {/* <button
+                  onClick={() => setIsRequestChangePasswordModalOpen(true)}
+                  className="flex h-10 w-full items-center justify-center rounded-t-md px-3 hover:bg-gray-20"
+                >
+                  <span className="truncate">{translate('preferences.workspace.members.actions.passwordChange')}</span>
+                </button> */}
+                  {memberRole !== 'deactivated' && (
+                    <button
+                      onClick={() => setIsDeactivateModalOpen(true)}
+                      className="flex h-10 w-full items-center justify-center rounded-b-md px-3 hover:bg-gray-20"
+                    >
+                      <span className="truncate">{translate('preferences.workspace.members.actions.deactivate')}</span>
+                    </button>
+                  )}
+                  {memberRole === 'deactivated' && (
+                    <button
+                      onClick={() => setIsReactivateModalOpen(true)}
+                      className="flex h-10 w-full items-center justify-center rounded-b-md px-3 hover:bg-gray-20"
+                    >
+                      <span className="truncate">{translate('preferences.workspace.members.actions.reactivate')}</span>
+                    </button>
+                  )}
+                </div>
+              </button>
+            )}
+          </div>
+        )}
+      </div>
+      <Card className={' w-full space-y-6 '}>
+        {member ? (
+          <Usage
+            usedSpace={member.usedSpace}
+            spaceLimit={member.spaceLimit}
+            driveUsage={member.driveUsage}
+            backupsUsage={member.backupsUsage}
+          />
+        ) : (
+          <div className="flex h-36 w-full items-center justify-center">
+            <Spinner className="h-7 w-7 text-primary" />
+          </div>
+        )}
+      </Card>
+      {/* NOT INCLUDED IN INITIAL SCOPE OF MVP */}
+      {/* <Tabs tabs={tabs} activeTab={activeTab} setActiveTab={setActiveTab} /> */}
+      <DeactivateMemberModal
+        name={member.member.name + ' ' + member.member.lastname}
+        isOpen={isDeactivateModalOpen}
+        onClose={() => setIsDeactivateModalOpen(false)}
+        onDeactivate={deactivateMember}
+        isLoading={isDeactivatingMember}
+      />
+      <ReactivateMemberModal
+        name={member.member.name + ' ' + member.member.lastname}
+        isOpen={isReactivateModalOpen}
+        onClose={() => setIsReactivateModalOpen(false)}
+        onReactivate={reactivateMember}
+        isLoading={isReactivatingMember}
+      />
+      <RequestPasswordChangeModal
+        isOpen={isRequestChangePasswordModalOpen}
+        onClose={() => setIsRequestChangePasswordModalOpen(false)}
+        onSendRequest={() => {
+          setIsSendingPasswordRequest(true);
+          setTimeout(() => {
+            setIsRequestChangePasswordModalOpen(false);
+            setIsSendingPasswordRequest(false);
+          }, 2000);
+        }}
+        isLoading={isSendingPasswordRequest}
+        modalWitdhClassname="w-120"
+      />
+    </div>
+  );
+};
+
+export default MemberDetailsContainer;
diff --git a/src/app/newSettings/Sections/Workspace/Overview/OverviewSection.tsx b/src/app/newSettings/Sections/Workspace/Overview/OverviewSection.tsx
new file mode 100644
index 000000000..180803f9c
--- /dev/null
+++ b/src/app/newSettings/Sections/Workspace/Overview/OverviewSection.tsx
@@ -0,0 +1,448 @@
+import { UserType } from '@internxt/sdk/dist/drive/payments/types';
+import { WorkspaceTeam, WorkspaceUser } from '@internxt/sdk/dist/workspaces';
+import { PencilSimple } from '@phosphor-icons/react';
+import { t } from 'i18next';
+import { useEffect, useState } from 'react';
+import { useSelector } from 'react-redux';
+import errorService from '../../../../core/services/error.service';
+import localStorageService from '../../../../core/services/local-storage.service';
+import workspacesService from '../../../../core/services/workspace.service';
+import { UsageDetailsProps } from '../../../../drive/services/usage.service';
+import Section from '../../../../newSettings/components/Section';
+import notificationsService, { ToastType } from '../../../../notifications/services/notifications.service';
+import Button from '../../../../shared/components/Button/Button';
+import Card from '../../../../shared/components/Card';
+import Dropdown from '../../../../shared/components/Dropdown';
+import Modal from '../../../../shared/components/Modal';
+import Spinner from '../../../../shared/components/Spinner/Spinner';
+import { RootState } from '../../../../store';
+import { useAppDispatch, useAppSelector } from '../../../../store/hooks';
+import { PlanState } from '../../../../store/slices/plan';
+import { workspaceThunks, workspacesActions } from '../../../../store/slices/workspaces/workspacesStore';
+import DetailsInput from '../../../components/DetailsInput';
+import UsageContainer from '../../../containers/UsageContainer';
+import { getProductCaptions } from '../../../utils/productUtils';
+import { getSubscriptionData } from '../../../utils/suscriptionUtils';
+import UploadAvatarModal from '../../Account/Account/components/UploadAvatarModal';
+import WorkspaceAvatarWrapper from './components/WorkspaceAvatarWrapper';
+
+const MIN_NAME_LENGTH = 3;
+
+interface OverviewSectionProps {
+  onClosePreferences: () => void;
+  changeSection: ({ section, subsection }) => void;
+}
+
+const OverviewSection = ({ onClosePreferences, changeSection }: OverviewSectionProps) => {
+  const dispatch = useAppDispatch();
+  const selectedWorkspace = useAppSelector((state: RootState) => state.workspaces.selectedWorkspace);
+  const currentUserId = useAppSelector((state: RootState) => state.user.user?.uuid);
+
+  if (!selectedWorkspace?.workspace.id) {
+    return null;
+  }
+
+  const workspaceId = selectedWorkspace.workspace.id;
+  const companyName = selectedWorkspace.workspace.name;
+  const description = selectedWorkspace.workspace.description;
+  const avatarSrcURL = selectedWorkspace.workspace.avatar;
+  const ownerId = selectedWorkspace.workspace.ownerId;
+  const isOwner = (currentUserId && ownerId && currentUserId === ownerId) || false;
+
+  const [isEditingDetails, setIsEditingDetails] = useState(false);
+  const [editedCompanyName, setEditedCompanyName] = useState(companyName);
+  const [aboutCompany, setAboutCompany] = useState(description);
+  const [isSavingProfileDetails, setIsSavingProfileDetails] = useState(false);
+  const [members, setMembers] = useState<WorkspaceUser[] | null>(null);
+  const [teams, setTeams] = useState<WorkspaceTeam[] | null>(null);
+
+  // PROBABLY NEED TO CHANGE WHEN IMPLEMENT API CALLS
+  const [planUsage, setPlanUsage] = useState<UsageDetailsProps | null>(null);
+  const plan = useSelector<RootState, PlanState>((state) => state.plan);
+
+  const local = localStorageService.get('i18nextLng') ?? navigator.language.split('-')[0];
+  const products = planUsage ? getProductCaptions(planUsage) : null;
+  const subscriptionData: { amountInterval: string; interval: 'monthly' | 'yearly'; renewDate: string } | undefined =
+    getSubscriptionData({ userSubscription: plan.businessSubscription, plan, local, userType: UserType.Business });
+
+  useEffect(() => {
+    if (selectedWorkspace?.workspace.id) {
+      const workspaceId = selectedWorkspace?.workspace.id;
+      const memberId = selectedWorkspace?.workspaceUser.memberId;
+
+      getWorkspacesMembers(workspaceId);
+      getWorkspacesTeams(workspaceId);
+
+      workspacesService
+        .getMemberDetails(workspaceId, memberId)
+        .then((data) => {
+          const usageDetails: UsageDetailsProps = {
+            drive: Number(data.user.driveUsage) || 0,
+            backups: Number(data.user.backupsUsage) || 0,
+            photos: 0,
+          };
+
+          setPlanUsage(usageDetails);
+        })
+        .catch((err) => {
+          const error = errorService.castError(err);
+          errorService.reportError(error);
+        });
+    }
+  }, []);
+
+  const getWorkspacesMembers = async (selectedWorkspaceId: string) => {
+    try {
+      const members = await workspacesService.getWorkspacesMembers(selectedWorkspaceId);
+      setMembers(members.activatedUsers);
+    } catch (error) {
+      errorService.reportError(error);
+    }
+  };
+
+  const getWorkspacesTeams = async (selectedWorkspaceId: string) => {
+    try {
+      const teams = await workspacesService.getWorkspaceTeams(selectedWorkspaceId);
+      setTeams(teams);
+    } catch (error) {
+      errorService.reportError(error);
+    }
+  };
+
+  const onSaveProfileDetails = async (newCompanyName: string, newAboutCompany: string) => {
+    setIsSavingProfileDetails(true);
+    if (newCompanyName.length < MIN_NAME_LENGTH) {
+      notificationsService.show({
+        type: ToastType.Error,
+        text: t('views.preferences.workspace.overview.errors.minNameLength'),
+      });
+      setIsSavingProfileDetails(false);
+      return;
+    }
+    try {
+      await workspacesService.editWorkspace(workspaceId, {
+        name: newCompanyName,
+        description: newAboutCompany,
+      });
+      setEditedCompanyName(newCompanyName);
+      setAboutCompany(newAboutCompany);
+      dispatch(
+        workspacesActions.patchWorkspace({
+          workspaceId,
+          patch: {
+            name: newCompanyName,
+            description: newAboutCompany,
+          },
+        }),
+      );
+    } catch (error) {
+      errorService.reportError(error);
+      const castedError = errorService.castError(error);
+      notificationsService.show({ type: ToastType.Error, text: castedError.message });
+    } finally {
+      setIsEditingDetails(false);
+      setIsSavingProfileDetails(false);
+    }
+  };
+
+  const uploadAvatar = async ({ avatar }: { avatar: Blob }) => {
+    try {
+      await dispatch(
+        workspaceThunks.updateWorkspaceAvatar({
+          workspaceId,
+          avatar,
+        }),
+      ).unwrap();
+      notificationsService.show({ type: ToastType.Success, text: t('views.account.avatar.success') });
+    } catch (err) {
+      errorService.reportError(err);
+      notificationsService.show({ type: ToastType.Error, text: t('views.account.avatar.error') });
+    }
+  };
+
+  const deleteAvatar = async () => {
+    if (workspaceId) {
+      await dispatch(workspaceThunks.deleteWorkspaceAvatar({ workspaceId })).unwrap();
+      notificationsService.show({ type: ToastType.Success, text: t('views.account.avatar.removed') });
+    } else {
+      errorService.reportError(new Error('Tried to delete workspace avatar without id'));
+    }
+  };
+
+  return (
+    <Section title="Overview" onClosePreferences={onClosePreferences}>
+      <WorkspaceProfileCard
+        workspaceId={workspaceId}
+        companyName={editedCompanyName}
+        description={aboutCompany}
+        avatarSrcURL={avatarSrcURL}
+        onEditButtonClick={() => setIsEditingDetails(true)}
+        isOwner={isOwner}
+        onUploadAvatarClicked={uploadAvatar}
+        onDeleteAvatarClicked={deleteAvatar}
+      />
+      <WorkspaceOverviewDetails
+        members={members?.length || 0}
+        teams={teams?.length || 0}
+        planLimit={plan.businessPlanLimit}
+        products={products}
+        isOwner={isOwner}
+        subscriptionData={subscriptionData}
+        onMembersCardClick={() => changeSection({ section: 'workspace', subsection: 'members' })}
+        // TODO: ADD NAVIGATION WHEN TEAMS HAS BEEN IMPLEMENTED
+        onTeamsCardClick={() => undefined}
+        onBillingCardClick={() => changeSection({ section: 'workspace', subsection: 'billing' })}
+      />
+      <EditWorkspaceDetailsModal
+        isOpen={isEditingDetails}
+        onClose={() => setIsEditingDetails(false)}
+        companyName={editedCompanyName}
+        aboutText={aboutCompany}
+        onSave={onSaveProfileDetails}
+        isLoading={isSavingProfileDetails}
+      />
+    </Section>
+  );
+};
+
+const EditWorkspaceDetailsModal = ({
+  isOpen,
+  onClose,
+  companyName,
+  aboutText,
+  onSave,
+  isLoading,
+}: {
+  isOpen: boolean;
+  onClose: () => void;
+  companyName: string;
+  aboutText: string;
+  onSave: (editedCompanyName: string, editedAbout: string) => void;
+  isLoading: boolean;
+}) => {
+  const MAX_NAME_LENGHT = 50;
+  const MAX_ABOUT_NAME = 150;
+  const [editedCompanyName, setEditedCompanyName] = useState(companyName);
+  const [aboutCompany, setAboutCompany] = useState(aboutText);
+
+  return (
+    <Modal isOpen={isOpen} onClose={onClose}>
+      <div className="flex flex-col space-y-5">
+        <h1 className=" text-2xl font-medium leading-7">
+          {t('views.preferences.workspace.overview.editOverviewDetails.title')}
+        </h1>
+        <div className="flex grow flex-col space-y-4">
+          <DetailsInput
+            label="Name"
+            textValue={editedCompanyName}
+            onChangeTextValue={setEditedCompanyName}
+            maxLength={MAX_NAME_LENGHT}
+            disabled={isLoading}
+          />
+          <div>
+            <textarea
+              placeholder={aboutCompany}
+              value={aboutCompany}
+              onChange={(e) => setAboutCompany(String(e.target.value))}
+              rows={3}
+              disabled={isLoading}
+              className="w-full resize-none rounded-md border border-gray-20 bg-transparent p-3 pl-4 text-lg font-normal text-gray-80 disabled:text-gray-40 disabled:placeholder-gray-20"
+              maxLength={MAX_ABOUT_NAME}
+            />
+            <span className="flex w-full justify-end text-sm font-normal leading-4 text-gray-50">
+              <text>
+                {aboutCompany.length}/{MAX_ABOUT_NAME}
+              </text>
+            </span>
+          </div>
+        </div>
+
+        <div className="flex w-full flex-row justify-end space-x-2">
+          <Button disabled={isLoading} variant="secondary" onClick={onClose}>
+            {t('views.preferences.workspace.overview.editOverviewDetails.cancelButton')}
+          </Button>
+          <Button loading={isLoading} variant="primary" onClick={() => onSave(editedCompanyName, aboutCompany)}>
+            {t('views.preferences.workspace.overview.editOverviewDetails.saveButton')}
+          </Button>
+        </div>
+      </div>
+    </Modal>
+  );
+};
+
+interface WorkspaceOverviewDetailsProps {
+  members: number;
+  teams: number;
+  planLimit: number;
+  products: Parameters<typeof UsageContainer>[0]['products'] | null;
+  isOwner: boolean;
+  subscriptionData: { amountInterval?: string; interval?: 'monthly' | 'yearly'; renewDate?: string } | undefined;
+  onMembersCardClick: () => void;
+  onTeamsCardClick: () => void;
+  onBillingCardClick: () => void;
+}
+
+const WorkspaceOverviewDetails = ({
+  members,
+  teams,
+  planLimit,
+  products,
+  isOwner,
+  subscriptionData,
+  onMembersCardClick,
+  onTeamsCardClick,
+  onBillingCardClick,
+}: WorkspaceOverviewDetailsProps) => {
+  const twoCardsClass = isOwner ? 'grow' : 'grow w-full';
+  const [integerPart, decimalPart] = subscriptionData?.amountInterval?.split('.') ?? [];
+
+  return (
+    <div className="space-y-3">
+      {isOwner && (
+        <span className="text-xl font-medium">{t('views.preferences.workspace.overview.workspaceOverview')}</span>
+      )}
+
+      <div className="space-y-6">
+        <div className="flex flex-row space-x-6">
+          <button className={`${twoCardsClass} text-left`} onClick={onMembersCardClick}>
+            <Card className={twoCardsClass}>
+              <p className="text-3xl font-medium leading-9 text-gray-100">{members}</p>
+              <h1 className="text-base font-normal leading-5">{t('views.preferences.workspace.overview.members')}</h1>
+            </Card>
+          </button>
+          <button className={`${twoCardsClass} text-left`} onClick={onTeamsCardClick}>
+            <Card className={twoCardsClass}>
+              <p className="text-3xl font-medium leading-9 text-gray-100">{teams}</p>
+              <h1 className="text-base font-normal leading-5">{t('views.preferences.workspace.overview.teams')}</h1>
+            </Card>
+          </button>
+          {isOwner && (
+            <button className="grow text-left" onClick={onBillingCardClick}>
+              <Card className="grow">
+                {subscriptionData && (
+                  <>
+                    <p className="text-3xl font-medium leading-9 text-gray-100">
+                      {integerPart}
+                      <span className="text-xl font-medium">{decimalPart && `.${decimalPart}`}</span>
+                    </p>
+                    <h1 className="text-base font-normal leading-5">
+                      {t('views.preferences.workspace.overview.billed', {
+                        renewDate: subscriptionData?.renewDate,
+                      })}
+                    </h1>
+                  </>
+                )}
+              </Card>
+            </button>
+          )}
+        </div>
+        <div className="flex flex-row">
+          <Card className="flex grow">
+            {products && planLimit ? (
+              <UsageContainer planLimitInBytes={planLimit} products={products} />
+            ) : (
+              <div className="flex h-36 w-full items-center justify-center">
+                <Spinner className="h-7 w-7 text-primary" />
+              </div>
+            )}
+          </Card>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+interface WorkspaceProfileCardProps {
+  workspaceId: string;
+  avatarSrcURL: string | null;
+  companyName: string;
+  description: string;
+  isOwner: boolean;
+  onEditButtonClick: () => void;
+  onUploadAvatarClicked: ({ avatar }: { avatar: Blob }) => Promise<void>;
+  onDeleteAvatarClicked: () => void;
+}
+
+const WorkspaceProfileCard: React.FC<WorkspaceProfileCardProps> = ({
+  workspaceId,
+  avatarSrcURL,
+  companyName,
+  description,
+  isOwner,
+  onEditButtonClick,
+  onUploadAvatarClicked,
+  onDeleteAvatarClicked,
+}) => {
+  const [openEditAvatarModal, setOpenEditAvatarModal] = useState(false);
+  const dropdownOptions = [
+    { text: t('views.account.avatar.updatePhoto'), onClick: () => setOpenEditAvatarModal(true) },
+  ];
+
+  if (avatarSrcURL) {
+    dropdownOptions.push({ text: t('views.account.avatar.removePhoto'), onClick: onDeleteAvatarClicked });
+  }
+
+  return (
+    <div className="flex w-full flex-col items-center justify-center space-y-4">
+      <div className="flex flex-col justify-center">
+        {isOwner ? (
+          <>
+            <Dropdown
+              options={isOwner ? dropdownOptions : undefined}
+              classMenuItems={'-left-6 mt-1 w-max rounded-md border border-gray-10 bg-surface dark:bg-gray-5 py-1.5'}
+              openDirection={'right'}
+            >
+              <div className="relative">
+                <WorkspaceAvatarWrapper
+                  diameter={128}
+                  workspaceId={workspaceId}
+                  fullName={companyName}
+                  avatarSrcURL={avatarSrcURL}
+                />
+                {
+                  <div className="absolute -bottom-1.5 -right-0.5 flex h-8 w-8 items-center justify-center rounded-full border-3 border-surface bg-gray-5 text-gray-60 dark:bg-gray-10">
+                    <PencilSimple size={16} />
+                  </div>
+                }
+              </div>
+            </Dropdown>
+            <UploadAvatarModal
+              isOpen={openEditAvatarModal}
+              onClose={() => setOpenEditAvatarModal(false)}
+              onUploadAvatarClicked={onUploadAvatarClicked}
+              displayFileLimitMessage={() =>
+                notificationsService.show({ type: ToastType.Error, text: t('views.account.avatar.underLimitSize') })
+              }
+              onSavingAvatarError={errorService.reportError}
+            />
+          </>
+        ) : (
+          <WorkspaceAvatarWrapper
+            diameter={128}
+            workspaceId={workspaceId}
+            fullName={companyName}
+            avatarSrcURL={avatarSrcURL}
+          />
+        )}
+      </div>
+
+      <div className={'mx-5 flex grow flex-col'}>
+        <span className={'font-semiboldleading-5 max-w-xs truncate text-center text-lg text-gray-100'}>
+          {companyName}
+        </span>
+        <span className={'line-clamp-3 max-w-xs text-center text-sm font-normal leading-4 text-gray-60'}>
+          {description}
+        </span>
+      </div>
+      {isOwner && (
+        <div className="flex flex-col justify-center">
+          <Button variant="secondary" onClick={onEditButtonClick}>
+            <span>{t('views.preferences.workspace.overview.edit')}</span>
+          </Button>
+        </div>
+      )}
+    </div>
+  );
+};
+
+export default OverviewSection;
diff --git a/src/app/newSettings/Sections/Workspace/Overview/components/UploadAvatarModal.tsx b/src/app/newSettings/Sections/Workspace/Overview/components/UploadAvatarModal.tsx
new file mode 100644
index 000000000..2729dc857
--- /dev/null
+++ b/src/app/newSettings/Sections/Workspace/Overview/components/UploadAvatarModal.tsx
@@ -0,0 +1,156 @@
+import { Image } from '@phosphor-icons/react';
+import { Suspense, useEffect, useRef, useState } from 'react';
+import AvatarEditor from 'react-avatar-editor';
+import { useTranslationContext } from '../../../../../i18n/provider/TranslationProvider';
+import Button from '../../../../../shared/components/Button/Button';
+import Modal from '../../../../../shared/components/Modal';
+import Spinner from '../../../../../shared/components/Spinner/Spinner';
+
+interface UploadAvatarModalProps {
+  isOpen: boolean;
+  onClose: () => void;
+  onUploadAvatarClicked: ({ avatar }: { avatar: Blob }) => Promise<void>;
+  displayFileLimitMessage: () => void;
+  onSavingAvatarError: (error: unknown) => void;
+}
+
+const UploadWorkspaceAvatarModal = ({
+  isOpen,
+  onClose,
+  onUploadAvatarClicked,
+  displayFileLimitMessage,
+  onSavingAvatarError,
+}: UploadAvatarModalProps) => {
+  const { translate } = useTranslationContext();
+  const inputRef = useRef<HTMLInputElement>(null);
+  const editorRef = useRef<AvatarEditor>(null);
+  const [state, setState] = useState<
+    { tag: 'empty' } | { tag: 'editing' | 'loading' | 'error'; source: File; zoom: number }
+  >({ tag: 'empty' });
+
+  useEffect(() => {
+    if (isOpen) setState({ tag: 'empty' });
+  }, [isOpen]);
+
+  const validateFile = (file: File) => {
+    if (file.size > 1024 * 1024 * 10) {
+      displayFileLimitMessage();
+    } else {
+      setState({ tag: 'editing', source: file, zoom: 1 });
+    }
+  };
+
+  const onInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    e.preventDefault();
+    const file = e.target.files?.[0];
+
+    if (file) {
+      validateFile(file);
+    }
+  };
+
+  const onDrop = (e: React.DragEvent<HTMLDivElement>) => {
+    e.preventDefault();
+    const file = e.dataTransfer.files[0];
+
+    if (file) {
+      validateFile(file);
+    }
+  };
+
+  const onSave = async () => {
+    if (state.tag === 'empty') return;
+
+    setState({ ...state, tag: 'loading' });
+
+    try {
+      const avatarBlob = await new Promise<Blob>((resolve, reject) =>
+        editorRef.current
+          ?.getImageScaledToCanvas()
+          .toBlob((blob) => (blob ? resolve(blob) : reject(new Error('Error getting avatar image')))),
+      );
+
+      await onUploadAvatarClicked({ avatar: avatarBlob });
+
+      onClose();
+    } catch (error) {
+      onSavingAvatarError(error);
+    }
+  };
+
+  return (
+    <Modal isOpen={isOpen} onClose={onClose}>
+      <h1 className="text-2xl font-medium text-gray-80">{translate('views.account.avatar.title')}</h1>
+      <div className="mt-4">
+        {state.tag !== 'empty' ? (
+          <div>
+            <Suspense fallback={<Spinner className="mx-auto mt-4 h-10 w-10" />}>
+              <AvatarEditor
+                ref={editorRef}
+                scale={state.zoom}
+                className="mx-auto"
+                image={state.source}
+                width={320}
+                height={320}
+              />
+              <div className="mt-1 flex justify-center">
+                <input
+                  className="mx-auto"
+                  type="range"
+                  min={1}
+                  max={2}
+                  step={0.01}
+                  defaultValue={1}
+                  disabled={state.tag === 'loading'}
+                  onChange={(e) => setState({ ...state, zoom: parseFloat(e.target.value) })}
+                />
+              </div>
+            </Suspense>
+          </div>
+        ) : (
+          <>
+            <input accept="image/*" ref={inputRef} className="hidden" type="file" onChange={onInputChange} />
+            <div
+              className="flex h-32 w-full cursor-pointer items-center justify-center rounded-md border-2 border-dashed border-gray-10"
+              onClick={() => inputRef.current?.click()}
+              onDrop={onDrop}
+              onDragOver={(e) => {
+                e.stopPropagation();
+                e.preventDefault();
+                e.dataTransfer.dropEffect = 'copy';
+              }}
+              role="button"
+              tabIndex={0}
+              onKeyDown={() => inputRef.current?.click()}
+            >
+              <div className="text-gray-20 hover:text-gray-30">
+                <Image className="mx-auto" weight="light" size={80} />
+                <p className="font-medium">{translate('views.account.avatar.dragNDrop')}</p>
+              </div>
+            </div>
+          </>
+        )}
+      </div>
+      <div className="mt-6 flex justify-end">
+        <div className="flex">
+          {state.tag === 'empty' ? (
+            <Button variant="secondary" onClick={onClose}>
+              {translate('actions.cancel')}
+            </Button>
+          ) : (
+            <Button variant="secondary" onClick={() => setState({ tag: 'empty' })} disabled={state.tag === 'loading'}>
+              {translate('actions.back')}
+            </Button>
+          )}
+          {state.tag !== 'empty' && (
+            <Button loading={state.tag === 'loading'} className="ml-2" onClick={onSave}>
+              {translate('actions.save')}
+            </Button>
+          )}
+        </div>
+      </div>
+    </Modal>
+  );
+};
+
+export default UploadWorkspaceAvatarModal;
diff --git a/src/app/newSettings/Sections/Workspace/Overview/components/WorkspaceAvatarWrapper.tsx b/src/app/newSettings/Sections/Workspace/Overview/components/WorkspaceAvatarWrapper.tsx
new file mode 100644
index 000000000..7ad5610a0
--- /dev/null
+++ b/src/app/newSettings/Sections/Workspace/Overview/components/WorkspaceAvatarWrapper.tsx
@@ -0,0 +1,103 @@
+import { memo, useEffect, useState } from 'react';
+import {
+  deleteDatabaseWorkspaceAvatar,
+  getDatabaseWorkspaceAvatar,
+  updateDatabaseWorkspaceAvatar,
+} from '../../../../../drive/services/database.service';
+import Avatar from '../../../../../shared/components/Avatar';
+import * as Sentry from '@sentry/react';
+import notificationsService, { ToastType } from '../../../../../notifications/services/notifications.service';
+
+const showUpdateWorkspaceAvatarErrorToast = () =>
+  notificationsService.show({
+    text: 'Error updating workspace avatar photo',
+    type: ToastType.Error,
+  });
+
+export const saveWorkspaceAvatarToDatabase = async (workspaceId: string, url: string, avatar: Blob): Promise<void> => {
+  return await updateDatabaseWorkspaceAvatar({
+    sourceURL: url,
+    avatarBlob: avatar,
+    uuid: workspaceId,
+  });
+};
+
+export const deleteWorkspaceAvatarFromDatabase = async (workspaceId: string): Promise<void> => {
+  return await deleteDatabaseWorkspaceAvatar(workspaceId);
+};
+
+const WorkspaceAvatarWrapper = memo(
+  ({
+    workspaceId,
+    avatarSrcURL,
+    fullName,
+    diameter,
+    style,
+  }: {
+    workspaceId: string;
+    avatarSrcURL: string | null;
+    fullName: string;
+    diameter: number;
+    style?: Record<string, string | number>;
+  }): JSX.Element => {
+    const [avatarBlob, setAvatarBlob] = useState<Blob | null>(null);
+
+    useEffect(() => {
+      const handleAvatarData = async () => {
+        try {
+          if (avatarSrcURL) {
+            await handleDownload(avatarSrcURL);
+            return;
+          }
+          if (avatarSrcURL && avatarSrcURL.length > 0) deleteDatabaseWorkspaceAvatar(workspaceId);
+          setAvatarBlob(null);
+        } catch (error) {
+          Sentry.captureException(error, {
+            extra: {
+              workspaceAvatarURL: avatarSrcURL,
+            },
+          });
+          showUpdateWorkspaceAvatarErrorToast();
+          setAvatarBlob(null);
+        }
+      };
+
+      handleAvatarData();
+    }, [avatarSrcURL]);
+
+    const downloadAndSaveAvatar = async (url: string) => {
+      const response = await fetch(url);
+      const data = await response.blob();
+      setAvatarBlob(data);
+      await saveWorkspaceAvatarToDatabase(workspaceId, url, data);
+    };
+
+    const handleDownload = async (url: string) => {
+      const databaseAvatarData = await getDatabaseWorkspaceAvatar(workspaceId).catch();
+
+      if (!databaseAvatarData) {
+        downloadAndSaveAvatar(url);
+        return;
+      }
+
+      const existsNewAvatar = databaseAvatarData.srcURL !== url;
+
+      if (existsNewAvatar) {
+        return downloadAndSaveAvatar(url);
+      }
+
+      setAvatarBlob(databaseAvatarData.avatarBlob);
+    };
+
+    return (
+      <Avatar
+        diameter={diameter}
+        fullName={fullName}
+        src={avatarBlob ? URL.createObjectURL(avatarBlob) : null}
+        style={style}
+      />
+    );
+  },
+);
+
+export default WorkspaceAvatarWrapper;
diff --git a/src/app/newSettings/components/BillingPaymentMethodCard.tsx b/src/app/newSettings/components/BillingPaymentMethodCard.tsx
new file mode 100644
index 000000000..d91e9cdcd
--- /dev/null
+++ b/src/app/newSettings/components/BillingPaymentMethodCard.tsx
@@ -0,0 +1,122 @@
+import { PaymentMethod, UserType } from '@internxt/sdk/dist/drive/payments/types';
+import Button from 'app/shared/components/Button/Button';
+import Card from 'app/shared/components/Card';
+import Spinner from 'app/shared/components/Spinner/Spinner';
+import { t } from 'i18next';
+import { useEffect, useState } from 'react';
+
+import amexIcon from '../../../assets/icons/card-brands/amex.png';
+import dinersIcon from '../../../assets/icons/card-brands/diners_club.png';
+import discoverIcon from '../../../assets/icons/card-brands/discover.png';
+import jcbIcon from '../../../assets/icons/card-brands/jcb.png';
+import mastercardIcon from '../../../assets/icons/card-brands/mastercard.png';
+import unionpayIcon from '../../../assets/icons/card-brands/unionpay.png';
+import unknownIcon from '../../../assets/icons/card-brands/unknown.png';
+import visaIcon from '../../../assets/icons/card-brands/visa.png';
+import EditPaymentMethodModal from '../Sections/Workspace/Billing/components/EditPaymentMethodModal';
+import { useDefaultPaymentMethod } from '../hooks/useDefaultPaymentMethod';
+import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
+import { RootState } from 'app/store';
+import { useSelector } from 'react-redux';
+
+const BillingPaymentMethodCard = ({ userType }: { userType: UserType }) => {
+  const user = useSelector((state: RootState) => state.user.user) as UserSettings;
+  const userFullName = user.name && user.lastname ? `${user.name} ${user.lastname}` : user.name || user.lastname;
+  const [isEditPaymentMethodModalOpen, setIsEditPaymentMethodModalOpen] = useState<boolean>(false);
+  const [isPaymentMethod, setIsPaimentMethod] = useState<boolean>(false);
+  const defaultPaymentMethod = useDefaultPaymentMethod(userFullName, userType);
+
+  useEffect(() => {
+    (defaultPaymentMethod.tag === 'ready' && defaultPaymentMethod.card) ||
+    (defaultPaymentMethod.tag === 'ready' && defaultPaymentMethod.type)
+      ? setIsPaimentMethod(true)
+      : setIsPaimentMethod(false);
+  }, [defaultPaymentMethod]);
+
+  const cardBrands: Record<PaymentMethod['card']['brand'], string> = {
+    visa: visaIcon,
+    amex: amexIcon,
+    diners: dinersIcon,
+    discover: discoverIcon,
+    jcb: jcbIcon,
+    mastercard: mastercardIcon,
+    unionpay: unionpayIcon,
+    unknown: unknownIcon,
+  };
+
+  const paymentsTypes = {
+    paypal: 'PayPal',
+    sepa_debit: 'SEPA Direct Debit',
+  };
+
+  const onEditPaymentMethodButtonClicked = () => {
+    setIsEditPaymentMethodModalOpen(true);
+  };
+
+  return (
+    <section className="space-y-3">
+      <div className="flex w-full flex-row items-center justify-between ">
+        <span className="text-xl font-medium">{t('preferences.workspace.billing.paymentMethod.title')}</span>
+
+        <Button variant="secondary" onClick={onEditPaymentMethodButtonClicked}>
+          {isPaymentMethod ? (
+            <span>{t('preferences.workspace.billing.paymentMethod.editButton')}</span>
+          ) : (
+            <span>{t('preferences.workspace.billing.paymentMethod.addButton')}</span>
+          )}
+        </Button>
+      </div>
+      <Card className={`${defaultPaymentMethod.tag === 'empty' && 'h-20'}`}>
+        {isPaymentMethod ? (
+          <div className="flex">
+            {defaultPaymentMethod.card ? (
+              <>
+                <img className="h-11 rounded-md" src={cardBrands[defaultPaymentMethod.card.brand]} />
+                <div className="ml-4 flex-1">
+                  <div className="flex flex-col">
+                    <p className="text-base font-medium text-gray-100">{defaultPaymentMethod.name}</p>
+                    <div className="font-regular flex flex-row text-base text-gray-60">
+                      <p>&#x25CF;&#x25CF;&#x25CF;&#x25CF;</p>
+                      <p className="ml-1.5 mr-2.5">{defaultPaymentMethod.card.last4}</p>
+                      <p>{`${defaultPaymentMethod.card.exp_month}/${defaultPaymentMethod.card.exp_year}`}</p>
+                    </div>
+                  </div>
+                </div>
+              </>
+            ) : (
+              defaultPaymentMethod.type && (
+                <>
+                  <div className="ml-4 flex-1">
+                    <div className="flex items-center text-gray-100">
+                      <p className="text-base font-medium leading-tight">{paymentsTypes[defaultPaymentMethod.type]}</p>
+                    </div>
+                    <p className="text-sm text-gray-50">
+                      {t('views.account.tabs.billing.paymentMethod.contactUs.description')}
+                    </p>
+                  </div>
+                </>
+              )
+            )}
+          </div>
+        ) : defaultPaymentMethod.tag === 'loading' ? (
+          <div className="flex h-10 items-center justify-center">
+            <Spinner className="h-5 w-5" />
+          </div>
+        ) : (
+          <div className="flex h-full items-center justify-center text-center">
+            <p className="font-regular text-base text-gray-60">
+              {t('preferences.workspace.billing.paymentMethod.empty')}
+            </p>
+          </div>
+        )}
+      </Card>
+      <EditPaymentMethodModal
+        isEditPaymentMethodModalOpen={isEditPaymentMethodModalOpen}
+        setIsEditPaymentMethodModalOpen={setIsEditPaymentMethodModalOpen}
+        userType={userType}
+      />
+    </section>
+  );
+};
+
+export default BillingPaymentMethodCard;
diff --git a/src/app/newSettings/components/DetailsInput.tsx b/src/app/newSettings/components/DetailsInput.tsx
new file mode 100644
index 000000000..9577b7008
--- /dev/null
+++ b/src/app/newSettings/components/DetailsInput.tsx
@@ -0,0 +1,40 @@
+import Input from '../../shared/components/Input';
+
+const DetailsInput = ({
+  label,
+  textValue,
+  onChangeTextValue,
+  maxLength,
+  disabled,
+  hideMaxLength,
+}: {
+  label: string;
+  textValue: string;
+  onChangeTextValue: (text: string) => void;
+  maxLength?: number;
+  hideMaxLength?: boolean;
+  disabled?: boolean;
+}) => {
+  return (
+    <div className="space-y-1">
+      <Input
+        label={label}
+        placeholder={textValue}
+        value={textValue}
+        disabled={disabled}
+        className="w-full"
+        onChange={onChangeTextValue}
+        maxLength={maxLength}
+      />
+      {!hideMaxLength && maxLength && (
+        <span className="flex w-full justify-end text-sm font-normal leading-4 text-gray-50">
+          <text>
+            {textValue.length}/{maxLength}
+          </text>
+        </span>
+      )}
+    </div>
+  );
+};
+
+export default DetailsInput;
diff --git a/src/app/newSettings/components/EmptyTab.tsx b/src/app/newSettings/components/EmptyTab.tsx
new file mode 100644
index 000000000..d2f10e5d9
--- /dev/null
+++ b/src/app/newSettings/components/EmptyTab.tsx
@@ -0,0 +1,25 @@
+interface EmptyTabsProps {
+  icon: string;
+  title: string;
+  subtitle: string;
+  action?: {
+    text: string;
+    onClick: () => void;
+  };
+}
+const EmptyTab = ({ icon, title, subtitle, action }: EmptyTabsProps): JSX.Element => {
+  return (
+    <section className="flex h-full w-full flex-col items-center justify-center rounded-xl border border-gray-10 bg-gray-1 py-10">
+      <img className="mb-3" alt={title} src={icon} />
+      <p className="mb-1 text-base font-medium text-gray-100">{title}</p>
+      <p className="font-regular w-80 text-center text-sm text-gray-60">{subtitle}</p>
+      {action && (
+        <button className="mt-3 text-base font-medium text-primary" onClick={action.onClick}>
+          {action.text}
+        </button>
+      )}
+    </section>
+  );
+};
+
+export default EmptyTab;
diff --git a/src/app/newSettings/components/Invoices/InvoicesList.tsx b/src/app/newSettings/components/Invoices/InvoicesList.tsx
new file mode 100644
index 000000000..c4402ebf3
--- /dev/null
+++ b/src/app/newSettings/components/Invoices/InvoicesList.tsx
@@ -0,0 +1,160 @@
+import { Invoice } from '@internxt/sdk/dist/drive/payments/types';
+import { DownloadSimple } from '@phosphor-icons/react';
+import { useState } from 'react';
+import dateService from '../../../core/services/date.service';
+import { bytesToString } from '../../../drive/services/size.service';
+import { useTranslationContext } from '../../../i18n/provider/TranslationProvider';
+import Spinner from '../../../shared/components/Spinner/Spinner';
+import moneyService from 'app/payment/services/money.service';
+
+const InvoicesList = ({ invoices, state }: { invoices: Invoice[]; state: 'loading' | 'empty' | 'ready' }) => {
+  const [hoverItemIndex, setHoverItemIndex] = useState<string | null>(null);
+  const { translate } = useTranslationContext();
+  const isLastInvoice = (i: number) => {
+    return invoices && i === invoices.length - 1;
+  };
+
+  if (state === 'loading') {
+    return (
+      <div className="mb-5 flex h-10 items-center justify-center">
+        <Spinner className="h-6 w-6" />
+      </div>
+    );
+  }
+
+  return state === 'empty' ? (
+    <Empty />
+  ) : (
+    <div className="flex">
+      <InvoiceDateColumn
+        invoices={invoices}
+        isLastInvoice={isLastInvoice}
+        translate={translate}
+        setHoverItemIndex={setHoverItemIndex}
+        hoverItemIndex={hoverItemIndex}
+      />
+      <InvoiceStorageColumn
+        invoices={invoices}
+        isLastInvoice={isLastInvoice}
+        translate={translate}
+        setHoverItemIndex={setHoverItemIndex}
+        hoverItemIndex={hoverItemIndex}
+      />
+      <InvoiceAmmountColumn
+        invoices={invoices}
+        isLastInvoice={isLastInvoice}
+        translate={translate}
+        setHoverItemIndex={setHoverItemIndex}
+        hoverItemIndex={hoverItemIndex}
+      />
+    </div>
+  );
+};
+
+interface ColumnProps {
+  invoices: Invoice[];
+  isLastInvoice: (i: number) => boolean;
+  translate: (key: string) => string;
+  setHoverItemIndex: (index: string | null) => void;
+  hoverItemIndex: string | null;
+}
+const headerTextClass = 'text-base font-medium text-gray-100';
+
+const InvoiceDateColumn = ({ invoices, isLastInvoice, translate, setHoverItemIndex, hoverItemIndex }: ColumnProps) => (
+  <div className="-ml-5 -mt-5 flex grow flex-col">
+    <h1
+      className={`flex flex-row justify-between rounded-tl-xl border-b border-gray-10 bg-gray-5 px-5 py-2 ${headerTextClass}`}
+    >
+      {translate('views.account.tabs.billing.invoices.billingDate')}
+    </h1>
+    {invoices.map(({ created, id }, i) => (
+      <div
+        key={id}
+        className={`flex flex-row justify-between border-gray-10 px-5 py-2 text-base  font-medium text-gray-100 dark:bg-gray-1 ${
+          isLastInvoice(i) ? 'rounded-bl-xl' : ' border-b'
+        }
+            ${hoverItemIndex === id ? 'bg-gray-5 dark:bg-gray-5' : 'bg-surface'}`}
+        onMouseEnter={() => setHoverItemIndex(id)}
+        onMouseLeave={() => setHoverItemIndex(null)}
+      >
+        {displayDate(created)}
+      </div>
+    ))}
+  </div>
+);
+
+const InvoiceStorageColumn = ({
+  invoices,
+  isLastInvoice,
+  translate,
+  setHoverItemIndex,
+  hoverItemIndex,
+}: ColumnProps) => (
+  <div className="-mt-5 flex grow flex-col">
+    <div className="border-b border-gray-10 bg-gray-5 py-2">
+      <h1 className={`flex justify-between border-l border-r border-gray-10 bg-gray-5 pl-5 pr-1 ${headerTextClass}`}>
+        {translate('views.account.tabs.billing.invoices.storage')}
+      </h1>
+    </div>
+    {invoices.map(({ bytesInPlan, id }, i) => (
+      <div
+        key={id}
+        className={`flex justify-between border-gray-10 px-5 py-2 text-base font-normal text-gray-60 dark:bg-gray-1 ${
+          isLastInvoice(i) ? '' : ' border-b'
+        } ${hoverItemIndex === id ? 'bg-gray-5 dark:bg-gray-5' : 'bg-surface'}`}
+        onMouseEnter={() => setHoverItemIndex(id)}
+        onMouseLeave={() => setHoverItemIndex(null)}
+      >
+        {bytesToString(bytesInPlan)}
+      </div>
+    ))}
+  </div>
+);
+
+const InvoiceAmmountColumn = ({
+  invoices,
+  isLastInvoice,
+  translate,
+  setHoverItemIndex,
+  hoverItemIndex,
+}: ColumnProps) => (
+  <div className="-mr-5 -mt-5 flex flex-col rounded-tr-xl">
+    <h1
+      className={`flex w-56 flex-row justify-between rounded-tr-xl border-b border-gray-10 bg-gray-5 p-2 pl-5 ${headerTextClass}`}
+    >
+      {translate('views.account.tabs.billing.invoices.plan')}
+    </h1>
+    {invoices.map(({ pdf, id, total, currency }, i) => (
+      <div
+        key={id}
+        className={`flex w-56 flex-row items-center justify-between border-gray-10 py-2 pl-5 text-base font-normal text-gray-60 ${
+          isLastInvoice(i) ? 'rounded-br-xl' : 'border-b'
+        } ${hoverItemIndex === id ? 'bg-gray-5 dark:bg-gray-5' : ''}`}
+        onMouseEnter={() => setHoverItemIndex(id)}
+        onMouseLeave={() => setHoverItemIndex(null)}
+      >
+        {`${total / 100} ` + moneyService.getCurrencySymbol(currency.toUpperCase())}
+        <a className="px-2 text-gray-100" href={pdf} target="_blank" rel="noopener noreferrer">
+          <DownloadSimple colorRendering={'bg-gray-100'} size={20} />
+        </a>
+      </div>
+    ))}
+  </div>
+);
+
+const displayDate = (unixSeconds: number) => {
+  const date = new Date(unixSeconds * 1000);
+
+  return dateService.format(date, 'dddd, DD MMMM YYYY');
+};
+
+const Empty = () => {
+  const { translate } = useTranslationContext();
+  return (
+    <div className="flex h-full items-center justify-center text-center">
+      <p className="font-regular text-base text-gray-50">{translate('preferences.workspace.billing.empty.text')}</p>
+    </div>
+  );
+};
+
+export default InvoicesList;
diff --git a/src/app/newSettings/components/Section.tsx b/src/app/newSettings/components/Section.tsx
new file mode 100644
index 000000000..7940c4328
--- /dev/null
+++ b/src/app/newSettings/components/Section.tsx
@@ -0,0 +1,42 @@
+import { ReactNode } from 'react';
+import { CaretLeft, X } from '@phosphor-icons/react';
+
+const Section = ({
+  className = '',
+  children,
+  title,
+  onBackButtonClicked,
+  onClosePreferences,
+}: {
+  className?: string;
+  children: ReactNode;
+  title: string;
+  onBackButtonClicked?: () => void;
+  onClosePreferences: () => void;
+}): JSX.Element => {
+  return (
+    <div className={`relative w-full rounded-tr-2xl ${className}`}>
+      <div className="absolute z-50 flex w-full items-center justify-between rounded-tr-2xl p-2.5 pl-6 before:absolute before:inset-0 before:-z-1 before:bg-surface/85 before:backdrop-blur-3xl before:transition-colors">
+        <div className="flex items-center">
+          {onBackButtonClicked && (
+            <button onClick={onBackButtonClicked}>
+              <div className="mr-2.5 flex h-9 w-9 items-center justify-center rounded-lg text-gray-100 hover:bg-highlight/4 active:bg-highlight/8">
+                <CaretLeft size={22} />
+              </div>
+            </button>
+          )}
+          <h2 className="text-base font-medium text-gray-100">{title}</h2>
+        </div>
+        <button
+          className="flex h-9 w-9 items-center justify-center rounded-md hover:bg-highlight/4 active:bg-highlight/8"
+          onClick={() => onClosePreferences()}
+        >
+          <X size={22} />
+        </button>
+      </div>
+      <div className="flex max-h-640 flex-col space-y-8 overflow-y-auto p-6 pt-16">{children}</div>
+    </div>
+  );
+};
+
+export default Section;
diff --git a/src/app/newSettings/components/SectionItem.tsx b/src/app/newSettings/components/SectionItem.tsx
new file mode 100644
index 000000000..48a63f14a
--- /dev/null
+++ b/src/app/newSettings/components/SectionItem.tsx
@@ -0,0 +1,59 @@
+export interface SectionItemProps {
+  text: string;
+  isActive?: boolean;
+  isSection?: boolean;
+  isSubsection?: boolean;
+  isDisabled?: boolean;
+  onClick?: () => void;
+  notificationsNumber: number;
+}
+
+const SectionItem = ({
+  text,
+  isActive,
+  isDisabled,
+  isSection,
+  isSubsection,
+  notificationsNumber,
+  onClick,
+}: SectionItemProps) => {
+  const isClickable = !!onClick;
+  const clickableContainerClass = isClickable ? 'hover:bg-gray-1 hover:bg-gray-5' : '';
+  const activeContainerClass = isActive ? 'bg-primary' : clickableContainerClass;
+  const containerClass = isDisabled ? '' : activeContainerClass;
+  const clickableClass = isClickable ? 'hover:cursor-pointer' : '';
+  const activeTextClass = isActive ? 'text-white' : 'text-gray-80';
+  const disabledTextClass = isDisabled ? 'text-gray-40' : activeTextClass;
+  const sectionTextClass = isSection ? 'font-semibold' : '';
+  const subsectionTextClass = isSubsection ? 'px-3' : '';
+  const notificationClass = isActive ? 'bg-white' : ' bg-primary';
+  const notificationTextClass = isActive ? 'text-primary' : 'text-white';
+
+  return (
+    <div
+      className={`flex h-10 w-full items-center justify-between rounded-lg px-3 py-2
+       ${clickableClass} ${containerClass}`}
+      onClick={onClick}
+      role={isClickable ? 'button' : undefined}
+      tabIndex={isClickable ? 0 : undefined}
+      onKeyDown={(event) => {
+        if (isClickable && (event.key === 'Enter' || event.key === ' ')) {
+          onClick();
+        }
+      }}
+    >
+      <div className="flex items-center">
+        <span className={`text-base font-normal ${disabledTextClass} ${sectionTextClass} ${subsectionTextClass}`}>
+          {text}
+        </span>
+      </div>
+      {notificationsNumber > 0 && (
+        <div className={`flex h-5 min-w-[20px] items-center justify-center rounded-full px-1.5 ${notificationClass}`}>
+          <span className={`text-xs font-normal  ${notificationTextClass}`}>{notificationsNumber}</span>
+        </div>
+      )}
+    </div>
+  );
+};
+
+export default SectionItem;
diff --git a/src/app/newSettings/components/SectionList.tsx b/src/app/newSettings/components/SectionList.tsx
new file mode 100644
index 000000000..f37e76608
--- /dev/null
+++ b/src/app/newSettings/components/SectionList.tsx
@@ -0,0 +1,36 @@
+import { NavSection } from '../containers/SectionListContainer';
+import SectionItem, { SectionItemProps } from './SectionItem';
+
+interface SectionListProps {
+  sectionItems: (SectionItemProps & { section: string; subsection?: string })[];
+  activeSection?: NavSection;
+  goSection: (sectoinItemProps: { section?: string; subsection?: string }) => void;
+}
+
+const SectionList = ({ sectionItems, activeSection, goSection }: SectionListProps) => {
+  return (
+    <div className="overflow-x-auto">
+      {sectionItems.map((sectionProps) => {
+        const itemSection = sectionProps.section;
+        const itemSubsection = sectionProps.subsection;
+
+        const isActive = itemSection === activeSection?.section && itemSubsection === activeSection?.subsection;
+        const handleOnClick =
+          itemSection && itemSubsection
+            ? () => goSection({ section: itemSection, subsection: itemSubsection })
+            : undefined;
+
+        return (
+          <SectionItem
+            key={`${sectionProps.section}-${sectionProps.subsection}`}
+            onClick={handleOnClick}
+            {...sectionProps}
+            isActive={isActive}
+          />
+        );
+      })}
+    </div>
+  );
+};
+
+export default SectionList;
diff --git a/src/app/newSettings/components/Tabs.tsx b/src/app/newSettings/components/Tabs.tsx
new file mode 100644
index 000000000..b97a7494a
--- /dev/null
+++ b/src/app/newSettings/components/Tabs.tsx
@@ -0,0 +1,26 @@
+import { TabsProps } from '../types/types';
+
+const Tabs = ({ tabs, activeTab, setActiveTab }: TabsProps) => {
+  return (
+    <section className="!mt-8">
+      <div className="flex h-10 w-fit rounded-xl bg-gray-5 p-1">
+        {tabs.map((tab) => {
+          return (
+            <button
+              className={`h-8 rounded-lg bg-gray-5 px-6 text-base font-medium text-gray-50 ${
+                activeTab.tab === tab.tab && 'bg-surface !text-gray-100 dark:bg-gray-30'
+              }`}
+              onClick={() => setActiveTab(tab)}
+              key={tab.tab}
+            >
+              {tab.name}
+            </button>
+          );
+        })}
+      </div>
+      <div className="mt-8">{activeTab.view}</div>
+    </section>
+  );
+};
+
+export default Tabs;
diff --git a/src/app/newSettings/components/Usage/Usage.tsx b/src/app/newSettings/components/Usage/Usage.tsx
new file mode 100644
index 000000000..937438fa6
--- /dev/null
+++ b/src/app/newSettings/components/Usage/Usage.tsx
@@ -0,0 +1,58 @@
+import { t } from 'i18next';
+import { bytesToString } from 'app/drive/services/size.service';
+import UsageBar from 'app/newSettings/components/Usage/UsageBar';
+
+const Usage = ({
+  usedSpace,
+  spaceLimit,
+  driveUsage,
+  backupsUsage,
+}: {
+  usedSpace: string | number;
+  spaceLimit: string | number;
+  driveUsage: string | number;
+  backupsUsage: string | number;
+}) => {
+  const usedSpaceBytes = Number(usedSpace);
+  const spaceLimitBytes = Number(spaceLimit);
+  const spaceLimitString = bytesToString(spaceLimitBytes);
+  const usedSpaceString = bytesToString(usedSpaceBytes);
+  const bytesString = usedSpaceString.length ? usedSpaceString : '0 Bytes';
+  const percentageUsed =
+    usedSpaceBytes === 0 && spaceLimitBytes === 0 ? 0 : Math.round((usedSpaceBytes * 100) / spaceLimitBytes);
+
+  return (
+    <div className="flex flex-col">
+      <div className="flex flex-row">
+        <div className="flex w-full grow flex-col py-2">
+          <p className="text-3xl font-medium leading-9 text-gray-100">{bytesString}</p>
+          <h1 className="text-base font-normal leading-5 text-gray-60">
+            {t('views.preferences.workspace.overview.spaceUsed', { percentageUsed })}
+          </h1>
+        </div>
+        <div className="mx-8 border border-gray-10" />
+        <div className="flex w-full grow flex-col justify-start py-2">
+          <p className="text-3xl font-medium leading-9 text-gray-100">{spaceLimitString}</p>
+          <h1 className="text-base font-normal leading-5 text-gray-60">
+            {t('views.preferences.workspace.overview.totalSpace')}
+          </h1>
+        </div>
+      </div>
+      <div className="mt-6">
+        <UsageBar backupsUsage={backupsUsage} driveUsage={driveUsage} spaceLimit={spaceLimit} height={'h-8'} />
+      </div>
+      <div className="mt-2 mt-2.5 flex space-x-4">
+        <div className="flex items-center">
+          <div className="h-2.5 w-2.5 rounded-full bg-primary" />
+          <p className="ml-1 text-sm text-gray-80">{t('sideNav.drive')}</p>
+        </div>
+        <div className="flex items-center">
+          <div className="h-2.5 w-2.5 rounded-full bg-indigo" />
+          <p className="ml-1 text-sm text-gray-80">{t('sideNav.backups')}</p>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default Usage;
diff --git a/src/app/newSettings/components/Usage/UsageBar.tsx b/src/app/newSettings/components/Usage/UsageBar.tsx
new file mode 100644
index 000000000..dcb1a41d5
--- /dev/null
+++ b/src/app/newSettings/components/Usage/UsageBar.tsx
@@ -0,0 +1,66 @@
+import { useEffect, useRef, useState } from 'react';
+import { bytesToString } from 'app/drive/services/size.service';
+import Tooltip from 'app/shared/components/Tooltip';
+
+const UsageBar = ({
+  backupsUsage,
+  driveUsage,
+  spaceLimit,
+  height,
+}: {
+  backupsUsage: string | number;
+  driveUsage: string | number;
+  spaceLimit: string | number;
+  height: string | number;
+}) => {
+  const [barWidth, setBarWidth] = useState(0);
+  const barRef = useRef<HTMLDivElement>(null);
+  const spaceLimitBytes = Number(spaceLimit);
+  const driveUsageBytes = Number(driveUsage);
+  const backupsUsageBytes = Number(backupsUsage);
+  const percentageDriveUsed = (driveUsageBytes * 100) / spaceLimitBytes;
+  const percentageBackupUsed = (backupsUsageBytes * 100) / spaceLimitBytes;
+  const driveWidth = (barWidth * percentageDriveUsed) / 100;
+  const backupWidth = (barWidth * percentageBackupUsed) / 100;
+
+  useEffect(() => {
+    const bar = barRef.current;
+
+    if (bar) {
+      const listener = () => {
+        setBarWidth(bar.getBoundingClientRect().width);
+      };
+      bar.addEventListener('resize', listener);
+
+      listener();
+
+      return () => bar.removeEventListener('resize', listener);
+    }
+  }, []);
+
+  return (
+    <div className={`flex w-full rounded-lg border border-gray-10 bg-gray-5 ${height}`} ref={barRef}>
+      <Tooltip
+        key="Drive"
+        title="Drive"
+        subtitle={bytesToString(driveUsageBytes)}
+        popsFrom="top"
+        className="mr-0.5 rounded-l-lg bg-primary"
+      >
+        <div style={{ width: `${driveWidth > 0 && driveWidth < 5 ? 5 : driveWidth}px` }}></div>
+      </Tooltip>
+
+      <Tooltip
+        key="Backup"
+        title="Backup"
+        subtitle={bytesToString(driveUsageBytes)}
+        popsFrom="top"
+        className="rounded-r-lg bg-indigo"
+      >
+        <div style={{ width: `${backupWidth}px` }}></div>
+      </Tooltip>
+    </div>
+  );
+};
+
+export default UsageBar;
diff --git a/src/app/newSettings/components/VerticalDivider.tsx b/src/app/newSettings/components/VerticalDivider.tsx
new file mode 100644
index 000000000..bedfd92ef
--- /dev/null
+++ b/src/app/newSettings/components/VerticalDivider.tsx
@@ -0,0 +1,13 @@
+interface VerticalDividerProps {
+  className?: string;
+}
+
+const VerticalDivider = ({ className }: VerticalDividerProps): JSX.Element => {
+  return (
+    <div className={`flex h-auto items-center justify-center ${className}`}>
+      <div className="h-full w-px bg-gray-10" />
+    </div>
+  );
+};
+
+export default VerticalDivider;
diff --git a/src/app/newSettings/containers/InvoicesContainer.tsx b/src/app/newSettings/containers/InvoicesContainer.tsx
new file mode 100644
index 000000000..83c74fc85
--- /dev/null
+++ b/src/app/newSettings/containers/InvoicesContainer.tsx
@@ -0,0 +1,34 @@
+import { Invoice } from '@internxt/sdk/dist/drive/payments/types';
+import { useTranslationContext } from '../../i18n/provider/TranslationProvider';
+import { useEffect, useState } from 'react';
+import Section from '../Sections/General/components/Section';
+import paymentService from '../../payment/services/payment.service';
+import Card from '../../shared/components/Card';
+import InvoicesList from '../components/Invoices/InvoicesList';
+
+const Invoices = ({ className = '', subscriptionId }: { className?: string; subscriptionId: string }): JSX.Element => {
+  const { translate } = useTranslationContext();
+  const [state, setState] = useState<{ tag: 'ready'; invoices: Invoice[] } | { tag: 'loading' | 'empty' }>({
+    tag: 'loading',
+  });
+  const isEmpty = state.tag === 'empty';
+
+  useEffect(() => {
+    paymentService
+      .getInvoices({ subscriptionId })
+      .then((invoices) => setState({ tag: 'ready', invoices }))
+      .catch(() => setState({ tag: 'empty' }));
+  }, []);
+
+  const invoices = state.tag === 'ready' ? state.invoices : [];
+
+  return (
+    <Section className={className} title={translate('views.account.tabs.billing.invoices.head')}>
+      <Card className={`${isEmpty ? 'h-40' : 'pb-0'}`}>
+        <InvoicesList invoices={invoices} state={state.tag} />
+      </Card>
+    </Section>
+  );
+};
+
+export default Invoices;
diff --git a/src/app/newSettings/containers/SectionListContainer.tsx b/src/app/newSettings/containers/SectionListContainer.tsx
new file mode 100644
index 000000000..d94745901
--- /dev/null
+++ b/src/app/newSettings/containers/SectionListContainer.tsx
@@ -0,0 +1,113 @@
+import { useSelector } from 'react-redux';
+import navigationService from '../../core/services/navigation.service';
+import { useTranslationContext } from '../../i18n/provider/TranslationProvider';
+import { RootState } from '../../store';
+import workspacesSelectors from '../../store/slices/workspaces/workspaces.selectors';
+import SectionList from '../components/SectionList';
+
+export interface NavSection {
+  section?: string;
+  subsection?: string;
+  text: string;
+  isSubsection?: boolean;
+  notificationsNumber: number;
+}
+
+export const sectionItems = [
+  {
+    section: 'general',
+    subsection: 'general',
+    notificationsNumber: 0,
+  },
+  { section: 'workspace', isSection: true, notificationsNumber: 0 },
+  {
+    section: 'workspace',
+    subsection: 'overview',
+    isSubsection: true,
+    notificationsNumber: 0,
+  },
+  {
+    section: 'workspace',
+    subsection: 'members',
+    isDisabled: false,
+    isSubsection: true,
+    notificationsNumber: 0,
+  },
+  // DISABLED FOR THE MVP
+  // {
+  //   section: 'workspace',
+  //   subsection: 'teams',
+  //   isDisabled: false,
+  //   isSubsection: true,
+  //   notificationsNumber: 0,
+  // },
+  {
+    section: 'workspace',
+    subsection: 'billing',
+    isSubsection: true,
+    notificationsNumber: 0,
+    onlyOwner: true,
+  },
+  { section: 'account', isSection: true, notificationsNumber: 0 },
+  {
+    section: 'account',
+    subsection: 'account',
+    isSubsection: true,
+    notificationsNumber: 0,
+  },
+  {
+    section: 'account',
+    subsection: 'plans',
+    isSubsection: true,
+    notificationsNumber: 0,
+  },
+  {
+    section: 'account',
+    subsection: 'billing',
+    isSubsection: true,
+    notificationsNumber: 0,
+  },
+  {
+    section: 'account',
+    subsection: 'security',
+    isSubsection: true,
+    notificationsNumber: 0,
+  },
+];
+
+const SectionListContainer = ({ activeSection, changeSection }) => {
+  const { translate } = useTranslationContext();
+  const selectedWorkspace = useSelector((state: RootState) => state.workspaces.selectedWorkspace);
+  const isOwner = useSelector(workspacesSelectors.isWorkspaceOwner);
+
+  const goSection = ({ section, subsection }: { section?: string; subsection?: string }) => {
+    if (section && subsection) {
+      navigationService.openPreferencesDialog({
+        section: section,
+        subsection: subsection,
+        workspaceUuid: selectedWorkspace?.workspaceUser.workspaceId,
+      });
+      changeSection({ section, subsection });
+    }
+  };
+
+  const filteredSectionItems = sectionItems.filter((sectionItem) => {
+    if (sectionItem.section === 'workspace' && !selectedWorkspace) {
+      return false;
+    }
+    if (sectionItem.onlyOwner && !isOwner) {
+      return false;
+    }
+
+    return true;
+  });
+
+  const sectionsItemsWithText = filteredSectionItems.map((sectionItem) => ({
+    ...sectionItem,
+    text: translate(`preferences.navBarSections.${sectionItem.subsection ?? sectionItem?.section}`),
+  }));
+
+  return <SectionList sectionItems={sectionsItemsWithText} activeSection={activeSection} goSection={goSection} />;
+};
+
+export default SectionListContainer;
diff --git a/src/app/newSettings/containers/UsageContainer.tsx b/src/app/newSettings/containers/UsageContainer.tsx
new file mode 100644
index 000000000..47eb7a666
--- /dev/null
+++ b/src/app/newSettings/containers/UsageContainer.tsx
@@ -0,0 +1,41 @@
+import { RootState } from 'app/store';
+import { useAppSelector } from 'app/store/hooks';
+import { DriveProduct } from '../types/types';
+import Usage from '../components/Usage/Usage';
+import Spinner from 'app/shared/components/Spinner/Spinner';
+
+const UsageContainer = ({
+  className = '',
+  planLimitInBytes,
+  products,
+}: Readonly<{
+  className?: string;
+  planLimitInBytes: number;
+  products: DriveProduct[];
+}>): JSX.Element => {
+  const planUsage = useAppSelector((state: RootState) => state.plan.planUsage);
+
+  const driveProduct = products.find((product) => product.name === 'Drive');
+  const backupsProduct = products.find((product) => product.name === 'Backups');
+  const driveUsage = driveProduct ? driveProduct?.usageInBytes : 0;
+  const backupsUsage = backupsProduct ? backupsProduct?.usageInBytes : 0;
+
+  return (
+    <div className={`${className} w-full space-y-6 `}>
+      {products && planUsage >= 0 && planLimitInBytes ? (
+        <Usage
+          usedSpace={planUsage}
+          spaceLimit={planLimitInBytes}
+          driveUsage={driveUsage}
+          backupsUsage={backupsUsage}
+        />
+      ) : (
+        <div className="flex h-36 w-full items-center justify-center">
+          <Spinner className="h-7 w-7 text-primary" />
+        </div>
+      )}
+    </div>
+  );
+};
+
+export default UsageContainer;
diff --git a/src/app/newSettings/hooks/useDefaultPaymentMethod.tsx b/src/app/newSettings/hooks/useDefaultPaymentMethod.tsx
new file mode 100644
index 000000000..1733157be
--- /dev/null
+++ b/src/app/newSettings/hooks/useDefaultPaymentMethod.tsx
@@ -0,0 +1,37 @@
+import { useEffect, useState } from 'react';
+
+import { PaymentMethod, UserType } from '@internxt/sdk/dist/drive/payments/types';
+import { Source } from '@stripe/stripe-js';
+
+import paymentService from 'app/payment/services/payment.service';
+
+interface DefaultPaymentMethodProps {
+  tag: 'ready' | 'loading' | 'empty';
+  card?: PaymentMethod['card'];
+  type?: Source.Type;
+  name?: string;
+}
+
+export const useDefaultPaymentMethod = (userFullName: string, userType?: UserType) => {
+  const [defaultPaymentMethod, setDefaultPaymentMethod] = useState<DefaultPaymentMethodProps>({
+    tag: 'loading',
+  });
+
+  useEffect(() => {
+    paymentService
+      .getDefaultPaymentMethod(userType || UserType.Individual)
+      .then((data: PaymentMethod | Source) => {
+        const billingDetailsName = (data as PaymentMethod).billing_details?.name;
+        const cardName = billingDetailsName || userFullName;
+        if (data.card) {
+          setDefaultPaymentMethod({ tag: 'ready', card: data.card as PaymentMethod['card'], name: cardName });
+        } else if ('type' in data) {
+          setDefaultPaymentMethod({ tag: 'ready', type: data.type, name: cardName });
+        } else {
+          setDefaultPaymentMethod({ tag: 'empty' });
+        }
+      })
+      .catch(() => setDefaultPaymentMethod({ tag: 'empty' }));
+  }, []);
+  return defaultPaymentMethod;
+};
diff --git a/src/app/newSettings/hooks/useInviteFriends.ts b/src/app/newSettings/hooks/useInviteFriends.ts
new file mode 100644
index 000000000..d76646f02
--- /dev/null
+++ b/src/app/newSettings/hooks/useInviteFriends.ts
@@ -0,0 +1,48 @@
+import { FriendInvite } from '@internxt/sdk/dist/drive/users/types';
+import { useEffect, useState } from 'react';
+
+import userService from '../../auth/services/user.service';
+import errorService from '../../core/services/error.service';
+import { useTranslationContext } from '../../i18n/provider/TranslationProvider';
+import notificationsService, { ToastType } from '../../notifications/services/notifications.service';
+
+export const useFriendInvites = () => {
+  const { translate } = useTranslationContext();
+  const [invites, setInvites] = useState<FriendInvite[]>([]);
+  const [isLoading, setIsLoading] = useState(false);
+
+  useEffect(() => {
+    setIsLoading(true);
+    userService.getFriendInvites().then((invites) => {
+      setInvites(invites);
+      setIsLoading(false);
+    });
+  }, []);
+
+  const inviteFriend = async (
+    email: string,
+    setInvitationStatus: (status: 'READY' | 'LOADING' | 'CANT_INVITE_MORE') => void,
+  ) => {
+    try {
+      setInvitationStatus('LOADING');
+      await userService.inviteAFriend(email);
+      notificationsService.show({ text: translate('success.inviteAFriend', { email }), type: ToastType.Success });
+      setInvitationStatus('READY');
+    } catch (err) {
+      const castedError = errorService.castError(err);
+      if (castedError.message !== 'Mail invitation daily limit reached') {
+        notificationsService.show({
+          text: translate('error.inviteAFriendEmpty'),
+          type: ToastType.Error,
+        });
+        setInvitationStatus('READY');
+      } else {
+        setInvitationStatus('CANT_INVITE_MORE');
+      }
+    }
+  };
+
+  return { invites, isLoading, inviteFriend };
+};
+
+export default useFriendInvites;
diff --git a/src/app/newSettings/hooks/usePreferencesParamsChange.tsx b/src/app/newSettings/hooks/usePreferencesParamsChange.tsx
new file mode 100644
index 000000000..0a9b7bdba
--- /dev/null
+++ b/src/app/newSettings/hooks/usePreferencesParamsChange.tsx
@@ -0,0 +1,34 @@
+import { useState, useEffect } from 'react';
+import { useAppDispatch, useAppSelector } from '../../store/hooks';
+import { uiActions } from '../../store/slices/ui';
+import { RootState } from '../../store';
+
+export const usePreferencesParamsChange = () => {
+  const dispatch = useAppDispatch();
+  const params = new URLSearchParams(window.location.search);
+  const isOpenParams = params.get('preferences') === 'open';
+  const isOpenDialog = useAppSelector((state: RootState) => state.ui.isPreferencesDialogOpen);
+
+  const [haveParamsChanged, setHaveParamsChanged] = useState(false);
+
+  useEffect(() => {
+    window.onpopstate = () => {
+      setHaveParamsChanged(true);
+    };
+  }, []);
+
+  useEffect(() => {
+    setHaveParamsChanged(true);
+  });
+
+  useEffect(() => {
+    if (isOpenParams) {
+      dispatch(uiActions.setIsPreferencesDialogOpen(true));
+    } else if (isOpenDialog) {
+      dispatch(uiActions.setIsPreferencesDialogOpen(false));
+    }
+    setHaveParamsChanged(false);
+  }, [haveParamsChanged]);
+
+  return haveParamsChanged;
+};
diff --git a/src/app/newSettings/types/types.tsx b/src/app/newSettings/types/types.tsx
new file mode 100644
index 000000000..9d031ea22
--- /dev/null
+++ b/src/app/newSettings/types/types.tsx
@@ -0,0 +1,92 @@
+import { ReactNode } from 'react';
+export interface SelectSectionProps {
+  section: string;
+  subsection?: string;
+  workspaceUuid?: string;
+}
+
+export interface PreferencesDialogProps {
+  haveParamsChanged: boolean;
+  isPreferencesDialogOpen: boolean;
+}
+
+export interface Section {
+  section: string;
+  subsection?: string;
+}
+
+export interface BillingDetailsCardProps {
+  address: string;
+  phone: string;
+  owner?: string;
+  isOwner?: boolean;
+  onEditButtonClick: () => void;
+}
+
+export interface TabsProps {
+  tabs: TypeTabs;
+  activeTab: ActiveTab;
+  setActiveTab: (activeTab) => void;
+}
+
+export interface ActivityTabProps {
+  role: MemberRole;
+  isActivityEnabled: boolean;
+  activity: Activity;
+}
+
+export interface TeamsTabProps {
+  role: string;
+  teams: Teams;
+  isTeams: boolean;
+}
+export interface ActivityFiltersProps {
+  selectedRoles: string[];
+  setIsSelectedRoles: (selectedRoles) => void;
+}
+
+export type DriveProduct = {
+  name: string;
+  usageInBytes: number;
+  color: 'red' | 'orange' | 'yellow' | 'green' | 'pink' | 'indigo' | 'primary' | 'gray';
+};
+
+export type Sections = Section[];
+
+export type MemberRole = 'owner' | 'manager' | 'member' | 'deactivated' | 'current';
+
+export type Member = {
+  id: string;
+  name: string;
+  lastname: string;
+  email: string;
+  role: MemberRole;
+  storage: number;
+  products: DriveProduct[];
+  isActivityEnabled: boolean;
+  activity: Activity;
+  isTeams: boolean;
+  teams: Teams;
+};
+
+export type Teams = {
+  team: string;
+  role: MemberRole;
+}[];
+
+export type ActiveTab = {
+  name: string;
+  tab: string;
+  view: ReactNode;
+};
+
+export type TypeTabs = ActiveTab[];
+
+export type Activity = {
+  date: string;
+  records: {
+    title: string;
+    description: string;
+    time: string;
+  }[];
+}[];
diff --git a/src/app/newSettings/utils/membersUtils.ts b/src/app/newSettings/utils/membersUtils.ts
new file mode 100644
index 000000000..116661030
--- /dev/null
+++ b/src/app/newSettings/utils/membersUtils.ts
@@ -0,0 +1,29 @@
+import { WorkspaceUser } from '@internxt/sdk/dist/workspaces';
+
+const searchMembers = (membersList: WorkspaceUser[] | null, searchString: string) => {
+  const escapedSearchString = searchString.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+  const regex = new RegExp(escapedSearchString, 'i');
+
+  const resultados = membersList?.filter((obj) => {
+    const fullName = obj.member.name + ' ' + obj.member.lastname;
+    return regex.test(fullName);
+  });
+
+  return resultados || [];
+};
+
+const getMemberRole = (member: WorkspaceUser) => {
+  let role;
+  const isOwner = member.isOwner;
+  const isManager = member.isManager;
+  const isDeactivated = member.deactivated;
+
+  isOwner && isManager && (role = 'owner');
+  !isOwner && isManager && (role = 'manager');
+  isDeactivated && (role = 'deactivated');
+  !isOwner && !isManager && !isDeactivated && (role = 'member');
+
+  return role;
+};
+
+export { getMemberRole, searchMembers };
diff --git a/src/app/newSettings/utils/productUtils.ts b/src/app/newSettings/utils/productUtils.ts
new file mode 100644
index 000000000..149a64575
--- /dev/null
+++ b/src/app/newSettings/utils/productUtils.ts
@@ -0,0 +1,21 @@
+import { t } from 'i18next';
+import { UsageDetailsProps } from '../../drive/services/usage.service';
+import UsageDetails from '../../shared/components/UsageDetails';
+
+const getProductCaptions = (usageDetails: UsageDetailsProps | null) => {
+  const products: Parameters<typeof UsageDetails>[0]['products'] | null = [
+    {
+      name: t('sideNav.drive'),
+      usageInBytes: usageDetails?.drive ?? 0,
+      color: 'primary',
+    },
+    {
+      name: t('views.account.tabs.account.view.backups'),
+      usageInBytes: usageDetails?.backups ?? 0,
+      color: 'indigo',
+    },
+  ];
+  return products;
+};
+
+export { getProductCaptions };
diff --git a/src/app/newSettings/utils/suscriptionUtils.ts b/src/app/newSettings/utils/suscriptionUtils.ts
new file mode 100644
index 000000000..42e4d6768
--- /dev/null
+++ b/src/app/newSettings/utils/suscriptionUtils.ts
@@ -0,0 +1,64 @@
+import { StoragePlan, UserSubscription, UserType } from '@internxt/sdk/dist/drive/payments/types';
+import dateService from 'app/core/services/date.service';
+import { t } from 'i18next';
+import moneyService from '../../payment/services/money.service';
+import { RenewalPeriod } from '../../payment/types';
+import { PlanState } from '../../store/slices/plan';
+
+const formatPlanPaymentInterval = (storagePlan: StoragePlan | null) => {
+  if (storagePlan) {
+    const isAnuallyPaymentInterval = storagePlan.paymentInterval === RenewalPeriod.Annually;
+    const price = isAnuallyPaymentInterval ? storagePlan.price : storagePlan.monthlyPrice;
+    const renewalPeriod = isAnuallyPaymentInterval ? 'year' : 'month';
+    const priceTruncated = Math.trunc(price * 100) / 100;
+
+    return (
+      `${priceTruncated} ` +
+      moneyService.getCurrencySymbol(storagePlan.currency) +
+      '/' +
+      t(`views.account.tabs.billing.cancelSubscriptionModal.infoBox.${renewalPeriod}`)
+    );
+  } else {
+    return t('views.account.tabs.billing.cancelSubscriptionModal.infoBox.free');
+  }
+};
+
+const getSubscriptionData = ({
+  userSubscription,
+  plan,
+  local,
+  userType = UserType.Individual,
+}: {
+  userSubscription: UserSubscription | null;
+  plan: PlanState;
+  local: string;
+  userType?: UserType;
+}): { amountInterval: string; interval: 'monthly' | 'yearly'; renewDate: string } | undefined => {
+  if (userSubscription?.type === 'subscription') {
+    const nextPayment = new Date(userSubscription.nextPayment * 1000);
+    const renewDate = new Intl.DateTimeFormat(local, {
+      month: 'long',
+      day: 'numeric',
+    }).format(nextPayment);
+    const interval = userSubscription.interval === 'month' ? 'monthly' : 'yearly';
+
+    const amountInterval = formatPlanPaymentInterval(
+      userType == UserType.Business ? plan.businessPlan : plan.individualPlan ?? plan.teamPlan,
+    );
+
+    return { amountInterval, interval, renewDate };
+  }
+
+  return undefined;
+};
+
+const getNextBillingDate = (userSubscription: UserSubscription | null) => {
+  let nextBillingDate;
+  if (userSubscription?.type === 'subscription') {
+    const nextPayment = new Date(userSubscription.nextPayment * 1000);
+    nextBillingDate = dateService.format(nextPayment, 'DD/MM/YY');
+  }
+  return nextBillingDate;
+};
+
+export { formatPlanPaymentInterval, getNextBillingDate, getSubscriptionData };
diff --git a/src/app/notifications/components/NotificationToast/NotificationToast.tsx b/src/app/notifications/components/NotificationToast/NotificationToast.tsx
index aaa41b578..7f0ea0135 100644
--- a/src/app/notifications/components/NotificationToast/NotificationToast.tsx
+++ b/src/app/notifications/components/NotificationToast/NotificationToast.tsx
@@ -1,11 +1,11 @@
+import { useEffect } from 'react';
+import { useDispatch } from 'react-redux';
+import { NavLink } from 'react-router-dom';
+import { uiActions } from 'app/store/slices/ui';
 import { Transition } from '@headlessui/react';
 import { CheckCircle, Info, Warning, WarningOctagon, X } from '@phosphor-icons/react';
-import { NavLink } from 'react-router-dom';
 import Spinner from '../../../shared/components/Spinner/Spinner';
 import { ToastShowProps, ToastType } from '../../services/notifications.service';
-import { useDispatch } from 'react-redux';
-import { uiActions } from '../../../store/slices/ui';
-import { useEffect } from 'react';
 
 const NotificationToast = ({
   text,
@@ -20,12 +20,8 @@ const NotificationToast = ({
   let IconColor: string | undefined;
 
   useEffect(() => {
-    dispatch(uiActions.setIsToastNotificacionOpen(true));
-
-    return () => {
-      dispatch(uiActions.setIsToastNotificacionOpen(false));
-    };
-  }, []);
+    visible && dispatch(uiActions.setIsToastNotificacionOpen(visible));
+  }, [visible]);
 
   switch (type) {
     case ToastType.Success:
@@ -85,7 +81,12 @@ const NotificationToast = ({
           ))}
 
         {closable && (
-          <button onClick={onClose} className="ml-3 text-gray-40">
+          <button
+            onClick={() => {
+              onClose();
+            }}
+            className="ml-3 text-gray-40"
+          >
             <X size={20} />
           </button>
         )}
diff --git a/src/app/payment/services/payment.service.ts b/src/app/payment/services/payment.service.ts
index 0aec00fba..d260ae8c9 100644
--- a/src/app/payment/services/payment.service.ts
+++ b/src/app/payment/services/payment.service.ts
@@ -5,7 +5,10 @@ import {
   Invoice,
   PaymentMethod,
   RedeemCodePayload,
+  UserType,
+  InvoicePayload,
   UserSubscription,
+  CustomerBillingInfo,
 } from '@internxt/sdk/dist/drive/payments/types';
 import { RedirectToCheckoutServerOptions, Source, Stripe, StripeError } from '@stripe/stripe-js';
 import { loadStripe } from '@stripe/stripe-js/pure';
@@ -53,19 +56,19 @@ const paymentService = {
     return paymentsClient.createSession(payload);
   },
 
-  async createSetupIntent(): Promise<{ clientSecret: string }> {
+  async createSetupIntent(userType?: UserType): Promise<{ clientSecret: string }> {
     const paymentsClient = await SdkFactory.getInstance().createPaymentsClient();
-    return paymentsClient.getSetupIntent();
+    return paymentsClient.getSetupIntent(userType);
   },
 
-  async getDefaultPaymentMethod(): Promise<PaymentMethod | Source> {
+  async getDefaultPaymentMethod(userType?: UserType): Promise<PaymentMethod | Source> {
     const paymentsClient = await SdkFactory.getInstance().createPaymentsClient();
-    return paymentsClient.getDefaultPaymentMethod();
+    return paymentsClient.getDefaultPaymentMethod(userType);
   },
 
-  async getInvoices(): Promise<Invoice[]> {
+  async getInvoices(payload: InvoicePayload): Promise<Invoice[]> {
     const paymentsClient = await SdkFactory.getInstance().createPaymentsClient();
-    return paymentsClient.getInvoices({});
+    return paymentsClient.getInvoices(payload);
   },
 
   async redirectToCheckout(options: RedirectToCheckoutServerOptions): Promise<{ error: StripeError }> {
@@ -74,14 +77,14 @@ const paymentService = {
     return stripe.redirectToCheckout(options);
   },
 
-  async getUserSubscription(): Promise<UserSubscription> {
+  async getUserSubscription(userType?: UserType): Promise<UserSubscription> {
     const paymentsClient = await SdkFactory.getInstance().createPaymentsClient();
-    return paymentsClient.getUserSubscription();
+    return paymentsClient.getUserSubscription(userType);
   },
 
-  async getPrices(currency?: string): Promise<DisplayPrice[]> {
+  async getPrices(currency?: string, userType?: UserType): Promise<DisplayPrice[]> {
     const paymentsClient = await SdkFactory.getInstance().createPaymentsClient();
-    return paymentsClient.getPrices(currency);
+    return paymentsClient.getPrices(currency, userType);
   },
 
   async isCouponUsedByUser(couponCode: string): Promise<{
@@ -119,10 +122,10 @@ const paymentService = {
     return paymentsClient.updateSubscriptionPrice(priceId, coupon);
   },
 
-  async cancelSubscription(): Promise<void> {
+  async cancelSubscription(userType?: UserType): Promise<void> {
     const paymentsClient = await SdkFactory.getInstance().createPaymentsClient();
 
-    return paymentsClient.cancelSubscription();
+    return paymentsClient.cancelSubscription(userType);
   },
 
   async createCheckoutSession(
@@ -133,6 +136,11 @@ const paymentService = {
     return paymentsClient.createCheckoutSession(payload);
   },
 
+  async updateCustomerBillingInfo(payload: CustomerBillingInfo): Promise<void> {
+    const paymentsClient = await SdkFactory.getInstance().createPaymentsClient();
+    return paymentsClient.updateCustomerBillingInfo(payload);
+  },
+
   // TODO: refactor as individual
   async handlePaymentTeams(priceId: string, quantity: number, mode: StripeSessionMode): Promise<void> {
     const mnemonicTeam = generateMnemonic(256);
diff --git a/src/app/payment/utils/checkStarWarsCode.ts b/src/app/payment/utils/checkStarWarsCode.ts
index 7191843a9..ff534a229 100644
--- a/src/app/payment/utils/checkStarWarsCode.ts
+++ b/src/app/payment/utils/checkStarWarsCode.ts
@@ -26,11 +26,11 @@ export const isStarWarsThemeAvailable = async (plan: PlanState, onSuccess?: () =
 
   if (starWarsInLocalStorage === 'true') return true;
 
-  const { subscription } = plan;
+  const { individualSubscription, businessSubscription } = plan;
 
   try {
     // Check if user used the coupon code
-    if (subscription?.type === 'subscription') {
+    if (individualSubscription?.type === 'subscription' || businessSubscription?.type === 'subscription') {
       const coupon = await fetchCouponCode('STAR_WARS_SUBSCRIPTION');
       const couponUsedResult = await paymentService.isCouponUsedByUser(coupon);
 
@@ -41,7 +41,7 @@ export const isStarWarsThemeAvailable = async (plan: PlanState, onSuccess?: () =
       }
 
       return false;
-    } else if (subscription?.type === 'lifetime') {
+    } else if (individualSubscription?.type === 'lifetime' || businessSubscription?.type === 'lifetime') {
       const [twoTB, fiveTB, tenTB] = await Promise.all([
         fetchCouponCode(LifetimeCoupons['2TB']),
         fetchCouponCode(LifetimeCoupons['5TB']),
diff --git a/src/app/payment/views/CheckoutView/CheckoutPlanView.tsx b/src/app/payment/views/CheckoutView/CheckoutPlanView.tsx
index 473dea4cf..f0dce6986 100644
--- a/src/app/payment/views/CheckoutView/CheckoutPlanView.tsx
+++ b/src/app/payment/views/CheckoutView/CheckoutPlanView.tsx
@@ -9,6 +9,7 @@ import navigationService from 'app/core/services/navigation.service';
 import { AppView } from 'app/core/types';
 import { useEffect } from 'react';
 import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
+import { UserType } from '@internxt/sdk/dist/drive/payments/types';
 
 interface CheckoutOptions {
   price_id: string;
@@ -30,7 +31,9 @@ export default function CheckoutPlanView(): JSX.Element {
   if (user === undefined) {
     navigationService.push(AppView.Login);
   }
-  const { subscription } = plan;
+  const { individualSubscription, businessSubscription } = plan;
+  const workspace = useSelector((state: RootState) => state.workspaces.selectedWorkspace);
+  const subscription = !workspace ? individualSubscription : businessSubscription;
 
   useEffect(() => {
     if (subscription) {
@@ -108,8 +111,13 @@ export default function CheckoutPlanView(): JSX.Element {
       } else {
         try {
           const couponCode = coupon === 'null' ? undefined : coupon;
-          const updatedSubscription = await paymentService.updateSubscriptionPrice(planId, couponCode);
-          dispatch(planActions.setSubscription(updatedSubscription.userSubscription));
+          const { userSubscription } = await paymentService.updateSubscriptionPrice(planId, couponCode);
+          if (userSubscription && userSubscription.type === 'subscription') {
+            if (userSubscription.userType == UserType.Individual)
+              dispatch(planActions.setSubscriptionIndividual(userSubscription));
+            if (userSubscription.userType == UserType.Business)
+              dispatch(planActions.setSubscriptionBusiness(userSubscription));
+          }
           navigationService.push(AppView.Preferences);
         } catch (err) {
           console.error(err);
diff --git a/src/app/photos/components/PhotoThumbnail.tsx b/src/app/photos/components/PhotoThumbnail.tsx
deleted file mode 100644
index 581254888..000000000
--- a/src/app/photos/components/PhotoThumbnail.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import { Check } from '@phosphor-icons/react';
-
-export default function PhotoThumbnail({
-  className = '',
-  src,
-  selected,
-  onSelect,
-  onClick,
-  photoId,
-}: {
-  className?: string;
-  src?: string;
-  selected: boolean;
-  onSelect?: () => void;
-  onClick?: () => void;
-  photoId?: string;
-}): JSX.Element {
-  return (
-    <div
-      className={`${className} group relative ${src ? 'cursor-pointer' : ''} ${
-        selected && 'p-1.5'
-      } transition-all duration-100 ease-in-out`}
-      style={{ aspectRatio: '1/1' }}
-      data-test={'photos-item-' + photoId}
-    >
-      {src ? (
-        <img
-          onClick={onClick}
-          className={`h-full w-full object-cover ${
-            selected && 'rounded-lg brightness-80'
-          } transition-all duration-100 ease-in-out`}
-          src={src}
-          draggable="false"
-        />
-      ) : (
-        <div className="relative h-full w-full overflow-hidden bg-gray-5">
-          <div
-            className="absolute inset-0 h-full w-full -translate-x-full bg-gradient-to-r from-gray-5 via-white to-gray-5 opacity-40"
-            style={{ animation: 'shimmer 1s infinite' }}
-          />
-        </div>
-      )}
-      <div
-        onClick={onSelect}
-        className={`${
-          src
-            ? selected
-              ? 'flex bg-primary active:bg-primary-dark'
-              : 'hidden bg-white/25 active:bg-white/50 group-hover:flex'
-            : 'hidden'
-        } absolute left-3 top-3 box-content h-6 w-6 items-center justify-center rounded-full border-2 border-white shadow-photo-select`}
-        data-test={'photos-item-selector-' + photoId}
-      >
-        <Check className={selected ? 'block' : 'hidden'} color="white" weight="bold" size={18} />
-      </div>
-    </div>
-  );
-}
diff --git a/src/app/photos/components/Preview.tsx b/src/app/photos/components/Preview.tsx
deleted file mode 100644
index 875cd55d4..000000000
--- a/src/app/photos/components/Preview.tsx
+++ /dev/null
@@ -1,301 +0,0 @@
-import { Transition } from '@headlessui/react';
-import { PhotosItemType } from '@internxt/sdk/dist/photos';
-import { CaretLeft, DownloadSimple, Share, X } from '@phosphor-icons/react';
-import * as Sentry from '@sentry/react';
-import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
-import { getPhotoBlob, getPhotoPreview } from 'app/network/download';
-import { Fragment, useEffect, useState } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-import useIdle from '../../core/hooks/useIdle';
-import { RootState } from '../../store';
-import { PhotosState, photosSlice } from '../../store/slices/photos';
-
-export default function Preview({
-  onDownloadClick,
-  onDeleteClick,
-  onShareClick,
-  onClose,
-}: {
-  onDownloadClick?: () => void;
-  onShareClick?: () => void;
-  onDeleteClick?: () => void;
-  onClose: () => void;
-}): JSX.Element {
-  const { translate } = useTranslationContext();
-  const MS_TO_BE_IDLE = 5000;
-  const isIdle = useIdle(MS_TO_BE_IDLE);
-
-  const dispatch = useDispatch();
-  const photosState = useSelector<RootState, PhotosState>((state) => state.photos);
-  const { previewIndex, items } = photosState;
-  const bucketId = useSelector<RootState, string | undefined>((state) => state.photos.bucketId);
-
-  const [thumbnailSrc, setThumbnailSrc] = useState<string | null>(null);
-
-  useEffect(() => {
-    if (previewIndex === null) return;
-    setThumbnailSrc(null);
-    const photo = items[previewIndex];
-    const photoBucketId = photo.networkBucketId ? photo.networkBucketId : bucketId;
-    if (!photoBucketId) return;
-
-    getPhotoPreview({
-      photo,
-      bucketId: photoBucketId,
-    })
-      .then(setThumbnailSrc)
-      .catch((err) => {
-        Sentry.captureException(err, {
-          extra: {
-            photoId: photo.id,
-            bucketId: photoBucketId,
-          },
-        });
-      });
-  }, [previewIndex, items]);
-
-  const [src, setSrc] = useState<string | null>(null);
-  const [itemType, setItemType] = useState<PhotosItemType>(PhotosItemType.PHOTO);
-
-  useEffect(() => {
-    if (previewIndex === null) return;
-
-    setSrc(null);
-
-    const abortController = new AbortController();
-    const photo = items[previewIndex];
-    const photoBucketId = photo.networkBucketId ? photo.networkBucketId : bucketId;
-    if (!photoBucketId) return;
-
-    getPhotoBlob({ photo, bucketId: photoBucketId, abortController })
-      .then((blob) => {
-        setItemType(photo.itemType);
-        return setSrc(URL.createObjectURL(blob));
-      })
-      .catch((err) => {
-        if (abortController.signal.aborted) {
-          return;
-        }
-
-        Sentry.captureException(err, {
-          extra: {
-            photoId: photo.id,
-            bucketId: photoBucketId,
-          },
-        });
-      });
-
-    return () => {
-      abortController.abort();
-    };
-  }, [previewIndex, items]);
-
-  const canGoRight = previewIndex !== null && previewIndex < photosState.items.length - 1;
-  const canGoLeft = previewIndex !== null && previewIndex > 0;
-
-  function goRight() {
-    if (previewIndex !== null) dispatch(photosSlice.actions.setPreviewIndex(previewIndex + 1));
-  }
-  function goLeft() {
-    if (previewIndex !== null) dispatch(photosSlice.actions.setPreviewIndex(previewIndex - 1));
-  }
-
-  useEffect(() => {
-    const listener = (event) => {
-      if (previewIndex !== null) {
-        const { code } = event;
-        if (code === 'ArrowLeft' && canGoLeft) {
-          goLeft();
-        } else if (code === 'ArrowRight' && canGoRight) {
-          goRight();
-        } else if (code === 'Escape') {
-          onClose();
-        }
-      }
-    };
-    document.addEventListener('keydown', listener);
-    return () => document.removeEventListener('keydown', listener);
-  }, [previewIndex, onClose]);
-
-  return (
-    <Transition
-      as={Fragment}
-      show={photosState.previewIndex !== null}
-      enter="origin-center overflow-hidden transition-all duration-100 ease-out"
-      enterFrom="opacity-0 scale-95"
-      enterTo="opacity-100 scale-100"
-      leave="origin-center overflow-hidden transition-all duration-100 ease-in"
-      leaveFrom="opacity-100 scale-100"
-      leaveTo="opacity-0 scale-95"
-    >
-      <div className="absolute inset-0 isolate z-50" data-test="photos-preview">
-        <Transition.Child
-          as={Fragment}
-          enter="transition-all duration-200 ease-out"
-          enterFrom="opacity-0"
-          enterTo="opacity-100"
-          leave="transition-all duration-100 ease-in"
-          leaveFrom="opacity-100"
-          leaveTo="opacity-0"
-        >
-          <div className="absolute inset-0 h-screen w-screen bg-black" />
-        </Transition.Child>
-        <Toolbar
-          onDeleteClick={onDeleteClick}
-          onDownloadClick={onDownloadClick}
-          onExit={onClose}
-          onShareClick={onShareClick}
-          isIdle={isIdle}
-        />
-        {src ? (
-          <Transition.Child
-            as={Fragment}
-            enter="transition-all will-change duration-50 ease-out"
-            enterFrom="opacity-0"
-            enterTo="opacity-100"
-          >
-            {itemType === PhotosItemType.VIDEO ? (
-              <video className="will-change absolute inset-0 h-full w-full object-contain" controls src={src} />
-            ) : (
-              <img className="will-change absolute inset-0 h-full w-full object-contain" draggable="false" src={src} />
-            )}
-          </Transition.Child>
-        ) : (
-          <div className="absolute left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2">
-            {thumbnailSrc && <img className="h-64 w-64 rounded-xl object-cover" src={thumbnailSrc} />}
-            <div className="mt-4 flex items-center justify-center text-lg font-medium text-gray-20">
-              <Spinner />
-              <p className="ml-3">{translate('general.loading.default')}</p>
-            </div>
-          </div>
-        )}
-        <Arrows
-          className="absolute top-1/2 -translate-y-1/2"
-          hideLeft={!canGoLeft}
-          hideRight={!canGoRight}
-          onClickLeft={goLeft}
-          onClickRight={goRight}
-          isIdle={isIdle}
-        />
-      </div>
-    </Transition>
-  );
-}
-
-function Toolbar({
-  onDownloadClick,
-  onDeleteClick,
-  onShareClick,
-  onExit,
-  isIdle,
-}: {
-  onDownloadClick?: () => void;
-  onShareClick?: () => void;
-  onDeleteClick?: () => void;
-  onExit?: () => void;
-  isIdle: boolean;
-}) {
-  return (
-    <Transition
-      enter="ease-out duration-10"
-      enterFrom="opacity-0"
-      enterTo="opacity-100"
-      leave="ease-in duration-200"
-      leaveFrom="opacity-100"
-      leaveTo="opacity-0"
-      show={!isIdle}
-    >
-      <div className="absolute top-0 z-10 flex h-32 w-full items-start justify-between bg-gradient-to-b from-black/75 to-transparent p-5">
-        <TopIcon Target={X} onClick={onExit} />
-        <div className="flex">
-          <TopIcon Target={DownloadSimple} onClick={onDownloadClick} />
-          <TopIcon Target={Share} onClick={onShareClick} />
-        </div>
-      </div>
-    </Transition>
-  );
-}
-
-function TopIcon({ Target, onClick }: { Target: typeof DownloadSimple; onClick?: () => void }) {
-  return (
-    <div
-      className={`${
-        onClick ? 'cursor-pointer text-white hover:opacity-75' : 'text-gray-40'
-      } flex h-10 w-10 items-center justify-center rounded-lg `}
-      onClick={onClick}
-    >
-      <Target size={24} />
-    </div>
-  );
-}
-
-function Spinner() {
-  return (
-    <svg
-      className="animate-spin"
-      xmlns="http://www.w3.org/2000/svg"
-      width="14"
-      height="14"
-      fill="none"
-      viewBox="0 0 14 14"
-    >
-      <path stroke="#D1D1D7" strokeWidth="2.333" d="M7 12.834A5.833 5.833 0 107 1.167a5.833 5.833 0 000 11.667z"></path>
-      <path
-        fill="#000"
-        d="M2.333 7A4.667 4.667 0 017 2.333V0a7 7 0 00-7 7h2.333zM3.5 10.086A4.644 4.644 0 012.333 7H0a6.98 6.98 0 001.75 4.63l1.75-1.544z"
-      ></path>
-    </svg>
-  );
-}
-
-function Arrows({
-  onClickLeft,
-  onClickRight,
-  hideLeft,
-  hideRight,
-  className,
-  isIdle,
-}: {
-  className: string;
-  onClickLeft: () => void;
-  onClickRight: () => void;
-  hideLeft: boolean;
-  hideRight: boolean;
-  isIdle: boolean;
-}) {
-  return (
-    <Transition
-      enter="ease-out duration-10"
-      enterFrom="opacity-0"
-      enterTo="opacity-100"
-      leave="ease-in duration-200"
-      leaveFrom="opacity-100"
-      leaveTo="opacity-0"
-      show={!isIdle}
-    >
-      <div className={`${className} flex w-full justify-between px-10`}>
-        {hideLeft ? <div /> : <Arrow pointsTo="left" onClick={onClickLeft} />}
-        {hideRight ? <div /> : <Arrow pointsTo="right" onClick={onClickRight} />}
-      </div>
-    </Transition>
-  );
-}
-
-function Arrow({
-  className = '',
-  pointsTo,
-  onClick,
-}: {
-  className?: string;
-  pointsTo: 'left' | 'right';
-  onClick: () => void;
-}) {
-  return (
-    <div
-      className={`${className} flex h-16 w-16 cursor-pointer items-center justify-center rounded-full bg-black/50 text-white backdrop-blur`}
-      onClick={onClick}
-    >
-      <CaretLeft size={40} className={pointsTo === 'right' ? ' rotate-180' : ''} />
-    </div>
-  );
-}
diff --git a/src/app/photos/components/ShareDialog.tsx b/src/app/photos/components/ShareDialog.tsx
deleted file mode 100644
index 0f31589e1..000000000
--- a/src/app/photos/components/ShareDialog.tsx
+++ /dev/null
@@ -1,176 +0,0 @@
-import { PhotoId } from '@internxt/sdk/dist/photos';
-import { Copy, Link, XCircle } from '@phosphor-icons/react';
-import { useEffect, useState } from 'react';
-import { useSelector } from 'react-redux';
-import { SdkFactory } from '../../core/factory/sdk';
-import notificationsService, { ToastType } from '../../notifications/services/notifications.service';
-import { RootState } from '../../store';
-import crypto from 'crypto';
-import { useAppSelector } from '../../store/hooks';
-import { aes } from '@internxt/lib';
-import { Network } from '../../drive/services/network.service';
-import { Transition } from '@headlessui/react';
-import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
-import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
-import Button from 'app/shared/components/Button/Button';
-
-export default function ShareDialog({
-  onClose,
-  photos,
-  isOpen,
-  zIndex,
-}: {
-  onClose: () => void;
-  photos: PhotoId[];
-  isOpen: boolean;
-  zIndex?: number;
-}): JSX.Element {
-  const { translate } = useTranslationContext();
-
-  useEffect(() => {
-    if (!isOpen) return;
-
-    const listener = (e) => {
-      if (e.code === 'Escape') {
-        onClose();
-      }
-    };
-
-    document.addEventListener('keydown', listener);
-    return () => document.removeEventListener('keydown', listener);
-  }, [isOpen]);
-
-  const numberOfSelectedItems = photos.length;
-
-  const DEFAULT_VIEWS = 10;
-  const DEFAULT_STATUS = { tag: 'ready' } as const;
-
-  const [views, setViews] = useState(DEFAULT_VIEWS);
-  const [status, setStatus] = useState<{ tag: 'ready' } | { tag: 'loading' } | { tag: 'done'; link: string }>(
-    DEFAULT_STATUS,
-  );
-
-  function goBackToStart() {
-    setViews(DEFAULT_VIEWS);
-    setStatus(DEFAULT_STATUS);
-  }
-
-  useEffect(() => {
-    if (isOpen) {
-      goBackToStart();
-    }
-  }, [isOpen]);
-
-  const bucket = useSelector<RootState, string | undefined>((state) => state.photos.bucketId);
-  const { mnemonic, email, userId } = useAppSelector((state) => state.user.user) as UserSettings;
-
-  async function onCreateShare() {
-    if (bucket) {
-      setStatus({ tag: 'loading' });
-
-      const network = new Network(email, userId, mnemonic);
-      const token = await network.createFileToken(bucket, '', 'PULL');
-
-      const { shares } = await SdkFactory.getInstance().createPhotosClient();
-
-      const code = crypto.randomBytes(32).toString('hex');
-      const encryptedMnemonic = aes.encrypt(mnemonic, code);
-      const share = await shares.createShare({ bucket, encryptedMnemonic, photoIds: photos, token, views });
-
-      const link = `${window.location.origin}/sh/photos/${share.id}/${code}`;
-
-      setStatus({ tag: 'done', link });
-    }
-  }
-
-  function onCopy() {
-    if (status.tag === 'done') {
-      navigator.clipboard.writeText(status.link);
-      notificationsService.show({ text: translate('success.linkCopied'), type: ToastType.Success });
-      onClose();
-    }
-  }
-
-  return (
-    <Transition show={isOpen}>
-      <Transition.Child
-        enter="ease-out duration-150"
-        enterFrom="opacity-0"
-        enterTo="opacity-100"
-        leave="ease-in duration-100"
-        leaveFrom="opacity-100"
-        leaveTo="opacity-0"
-        style={{
-          zIndex,
-        }}
-        className={'absolute inset-0 bg-black/40'}
-        onClick={onClose}
-      ></Transition.Child>
-      <Transition.Child
-        enter="ease-out duration-150"
-        enterFrom="opacity-0 scale-95"
-        enterTo="opacity-100 scale-100"
-        leave="ease-in duration-100"
-        leaveFrom="opacity-100 scale-100"
-        leaveTo="opacity-0 scale-95"
-        style={{
-          zIndex,
-        }}
-        className="absolute left-1/2 top-1/2 z-[100] w-96 -translate-x-1/2 -translate-y-1/2 rounded-2xl bg-surface p-3 text-center dark:bg-gray-1"
-      >
-        <XCircle
-          className="absolute right-2 top-2 cursor-pointer text-gray-20"
-          onClick={onClose}
-          weight="fill"
-          size={24}
-        />
-        <h1 className="mt-4 text-xl font-semibold text-gray-100">
-          {numberOfSelectedItems > 1
-            ? translate('modals.sharePhotosModal.multiTitle', { item: numberOfSelectedItems })
-            : translate('modals.sharePhotosModal.singleTitle', { item: numberOfSelectedItems })}
-        </h1>
-        <p className="ml-5 mt-3 text-left font-medium text-gray-80">{translate('modals.sharePhotosModal.options')}</p>
-        <div className="mt-1 rounded-lg bg-gray-5 p-4 text-left">
-          <div className="flex font-medium text-gray-100">
-            <p>{translate('modals.sharePhotosModal.openCount')}</p>
-            <input
-              disabled={status.tag !== 'ready'}
-              className="mx-2 inline-block w-12 rounded-md border border-transparent bg-surface px-1 font-medium text-gray-100 outline-none focus:border-primary-dark focus:ring-2 focus:ring-primary focus:ring-primary/10 disabled:bg-gray-10 dark:bg-gray-20"
-              style={{ textAlign: 'right' }}
-              type="number"
-              value={views}
-              onChange={(e) => setViews(parseInt(e.target.value))}
-            />
-            <p>{translate('modals.sharePhotosModal.times')}</p>
-            {status.tag === 'done' && (
-              <button className="ml-4 text-sm font-medium text-primary" onClick={goBackToStart}>
-                {translate('modals.sharePhotosModal.change')}
-              </button>
-            )}
-          </div>
-          <p className="text-sm text-gray-40">{translate('modals.sharePhotosModal.limit')}</p>
-        </div>
-        <div className="mt-3 flex h-10 space-x-2">
-          {status.tag === 'ready' ? (
-            <>
-              <Button variant="secondary" className="flex-1" onClick={onClose}>
-                {translate('modals.sharePhotosModal.buttons.cancel')}
-              </Button>
-              <Button variant="primary" className="flex-1" onClick={onCreateShare}>
-                <p>{translate('modals.sharePhotosModal.buttons.create')}</p> <Link size={20} />
-              </Button>
-            </>
-          ) : status.tag === 'loading' ? (
-            <Button variant="secondary" disabled className="flex-1">
-              {translate('modals.sharePhotosModal.buttons.creating')}
-            </Button>
-          ) : (
-            <Button variant="primary" className="flex-1" onClick={onCopy}>
-              <p>{translate('modals.sharePhotosModal.buttons.copyLink')}</p> <Copy size={20} />
-            </Button>
-          )}
-        </div>
-      </Transition.Child>
-    </Transition>
-  );
-}
diff --git a/src/app/photos/components/Skeleton.tsx b/src/app/photos/components/Skeleton.tsx
deleted file mode 100644
index 0b64fc849..000000000
--- a/src/app/photos/components/Skeleton.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import PhotoThumbnail from './PhotoThumbnail';
-
-export default function Skeleton({ className = '' }: { className?: string }): JSX.Element {
-  return (
-    <div
-      className={`${className} grid gap-1 px-5`}
-      style={{ gridTemplateColumns: 'repeat(auto-fill, minmax(160px, 1fr))' }}
-    >
-      {new Array(150).fill(0).map((_, i) => (
-        <PhotoThumbnail selected={false} key={i} />
-      ))}
-    </div>
-  );
-}
diff --git a/src/app/photos/components/Toolbar.tsx b/src/app/photos/components/Toolbar.tsx
deleted file mode 100644
index 9d1719025..000000000
--- a/src/app/photos/components/Toolbar.tsx
+++ /dev/null
@@ -1,86 +0,0 @@
-import { DownloadSimple, Share, X } from '@phosphor-icons/react';
-import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
-import { HTMLAttributes } from 'react';
-import { PlacesType } from 'react-tooltip';
-import TooltipElement from '../../shared/components/Tooltip/Tooltip';
-
-const createToolTipsProps = (id: string, content: string, place: PlacesType): HTMLAttributes<HTMLElement> => ({
-  'data-tooltip-id': id,
-  'data-tooltip-content': content,
-  'data-tooltip-place': place,
-});
-
-export default function Toolbar({
-  className = '',
-  onDeleteClick,
-  onDownloadClick,
-  onShareClick,
-  onUnselectClick,
-  numberOfSelectedItems,
-}: {
-  className?: string;
-  onDownloadClick?: () => void;
-  onShareClick?: () => void;
-  onDeleteClick?: () => void;
-  onUnselectClick?: () => void;
-  numberOfSelectedItems: number;
-}): JSX.Element {
-  const { translate } = useTranslationContext();
-
-  return (
-    <div className={`${className} flex w-full items-center justify-between space-x-1 px-5 py-2`}>
-      <div className={`flex items-center ${numberOfSelectedItems === 0 ? 'opacity-0' : ''}`}>
-        <Icon Target={X} onClick={onUnselectClick} dataTest="photos-unselect-all" />
-        <p style={{ paddingTop: '1px' }} className="ml-2 font-medium text-gray-80">
-          {`${numberOfSelectedItems} ${
-            numberOfSelectedItems > 1
-              ? translate('modals.deletePhotosModal.multiToolBar')
-              : translate('modals.deletePhotosModal.singleToolBar')
-          }`}
-        </p>
-      </div>
-
-      <div className="flex">
-        <Icon
-          Target={DownloadSimple}
-          onClick={onDownloadClick}
-          dataTest="photos-download-selected"
-          toolTipProps={createToolTipsProps('photos-download-tooltip', translate('actions.download'), 'bottom')}
-        />
-        <TooltipElement id={'photos-download-tooltip'} className="z-40" />
-        <Icon
-          Target={Share}
-          onClick={onShareClick}
-          dataTest="photos-share-selected"
-          toolTipProps={createToolTipsProps('photos-share-tooltip', translate('actions.share'), 'bottom')}
-        />
-        <TooltipElement id={'photos-share-tooltip'} className="z-40" />
-      </div>
-    </div>
-  );
-}
-
-function Icon({
-  Target,
-  onClick,
-  dataTest,
-  toolTipProps,
-}: {
-  Target: typeof DownloadSimple;
-  onClick?: () => void;
-  dataTest: string;
-  toolTipProps?: HTMLAttributes<HTMLElement>;
-}) {
-  return (
-    <div
-      className={`${
-        onClick ? 'cursor-pointer text-gray-80 hover:bg-gray-5 active:bg-gray-10' : 'text-gray-40'
-      } flex h-10 w-10 items-center justify-center rounded-lg `}
-      onClick={onClick}
-      data-test={dataTest}
-      {...toolTipProps}
-    >
-      <Target size={24} />
-    </div>
-  );
-}
diff --git a/src/app/photos/views/PhotosView.tsx b/src/app/photos/views/PhotosView.tsx
deleted file mode 100644
index f3924a3b1..000000000
--- a/src/app/photos/views/PhotosView.tsx
+++ /dev/null
@@ -1,293 +0,0 @@
-import { PhotoId } from '@internxt/sdk/dist/photos';
-import { useEffect, useRef, useState } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-import { Helmet } from 'react-helmet-async';
-import Empty from '../../shared/components/Empty/Empty';
-import { getPhotoPreview } from 'app/network/download';
-import Dialog from '../../shared/components/Dialog/Dialog';
-import { RootState } from '../../store';
-import { photosSlice, PhotosState, SerializablePhoto } from '../../store/slices/photos';
-import photosThunks from '../../store/slices/photos/thunks';
-import EmptyPictureLight from '../../../assets/images/empty-photos-light.png';
-import EmptyPictureDark from '../../../assets/images/empty-photos-dark.png';
-import PhotoThumbnail from '../components/PhotoThumbnail';
-import Preview from '../components/Preview';
-import ShareDialog from '../components/ShareDialog';
-import Skeleton from '../components/Skeleton';
-import Toolbar from '../components/Toolbar';
-import * as Sentry from '@sentry/react';
-import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
-import WarningMessageWrapper from '../../drive/components/WarningMessage/WarningMessageWrapper';
-
-export default function PhotosView({ className = '' }: { className?: string }): JSX.Element {
-  const { translate } = useTranslationContext();
-  const dispatch = useDispatch();
-  const photosState = useSelector<RootState, PhotosState>((state) => state.photos);
-
-  function fetchPhotos() {
-    dispatch(photosThunks.fetchThunk());
-  }
-
-  useEffect(fetchPhotos, []);
-
-  const [deletePending, setDeletePending] = useState<null | 'selected' | 'preview'>(null);
-  const [sharePending, setSharePending] = useState<null | 'selected' | 'preview'>(null);
-
-  useEffect(() => {
-    const listener = (e) => {
-      if (e.code === 'Escape' && photosState.previewIndex === null && deletePending === null && sharePending === null) {
-        dispatch(photosSlice.actions.unselectAll());
-      }
-    };
-
-    document.addEventListener('keydown', listener);
-    return () => document.removeEventListener('keydown', listener);
-  }, [photosState.previewIndex, deletePending, sharePending]);
-
-  function onConfirmDelete() {
-    if (deletePending === 'selected') {
-      dispatch(photosThunks.deleteThunk(photosState.selectedItems));
-      dispatch(photosSlice.actions.unselectAll());
-    } else if (deletePending === 'preview' && photosState.previewIndex !== null) {
-      const { items, previewIndex } = photosState;
-      const previewIndexIsOutOfBounds = previewIndex > items.length - 2;
-      if (previewIndexIsOutOfBounds) {
-        dispatch(photosSlice.actions.setPreviewIndex(items.length - 1 > 0 ? previewIndex - 1 : null));
-      }
-
-      dispatch(photosThunks.deleteThunk([items[previewIndex].id]));
-    }
-    setDeletePending(null);
-  }
-
-  const showEmpty = !photosState.isLoading && photosState.items.length === 0;
-
-  const showSkeleton = photosState.isLoading && photosState.items.length === 0;
-
-  const numberOfSelectedItems = photosState.selectedItems.length;
-
-  const toolbarProps =
-    numberOfSelectedItems !== 0
-      ? {
-          onDeleteClick: () => setDeletePending('selected'),
-          onShareClick: () => setSharePending('selected'),
-          onDownloadClick: () => {
-            const photos = photosState.selectedItems.map(
-              (id) => photosState.items.find((item) => item.id === id) as SerializablePhoto,
-            );
-            dispatch(photosThunks.downloadThunk(photos));
-            dispatch(photosSlice.actions.unselectAll());
-          },
-          onUnselectClick: () => dispatch(photosSlice.actions.unselectAll()),
-        }
-      : {};
-
-  return (
-    <>
-      <div className={`${className} flex h-full w-full flex-col overflow-y-hidden`} data-test="photos-gallery">
-        <Helmet>
-          <title>{translate('sideNav.photos')} - Internxt Drive</title>
-        </Helmet>
-        <WarningMessageWrapper />
-        {showEmpty ? (
-          <Empty
-            title={translate('views.photos.empty.title')}
-            subtitle={translate('views.photos.empty.description')}
-            icon={
-              <>
-                <img
-                  className="h-auto w-72 dark:hidden"
-                  src={EmptyPictureLight}
-                  draggable="false"
-                  alt="Photos used in the Internxt app"
-                />
-                <img
-                  className="hidden h-auto w-72 dark:flex"
-                  src={EmptyPictureDark}
-                  draggable="false"
-                  alt="Photos used in the Internxt app"
-                />
-              </>
-            }
-          />
-        ) : (
-          <>
-            <Toolbar {...toolbarProps} numberOfSelectedItems={numberOfSelectedItems} />
-            {showSkeleton ? (
-              <Skeleton />
-            ) : (
-              <Grid
-                selected={photosState.selectedItems}
-                photos={photosState.items}
-                isMorePhotos={photosState.thereIsMore}
-                onUserScrolledToTheEnd={fetchPhotos}
-              />
-            )}
-          </>
-        )}
-      </div>
-      <Preview
-        onDeleteClick={() => setDeletePending('preview')}
-        onShareClick={() => setSharePending('preview')}
-        onDownloadClick={() =>
-          photosState.previewIndex !== null &&
-          dispatch(photosThunks.downloadThunk([photosState.items[photosState.previewIndex]]))
-        }
-        onClose={() => {
-          if (photosState.previewIndex !== null && deletePending === null && sharePending === null)
-            dispatch(photosSlice.actions.setPreviewIndex(null));
-        }}
-      />
-      {/* These dialogs are duplicated to avoid flickering while using headless ui transitions */}
-      <Dialog
-        onClose={() => setDeletePending(null)}
-        onPrimaryAction={onConfirmDelete}
-        isOpen={deletePending === 'selected'}
-        title={
-          numberOfSelectedItems > 1
-            ? translate('modals.deletePhotosModal.multiTitle', { item: numberOfSelectedItems })
-            : translate('modals.deletePhotosModal.singleTitle', { item: numberOfSelectedItems })
-        }
-        subtitle={translate('modals.deletePhotosModal.subtitle')}
-        onSecondaryAction={() => setDeletePending(null)}
-        primaryAction={translate('modals.deletePhotosModal.buttons.delete')}
-        secondaryAction={translate('modals.deletePhotosModal.buttons.cancel')}
-        primaryActionColor="danger"
-      />
-      <Dialog
-        onClose={() => setDeletePending(null)}
-        onPrimaryAction={onConfirmDelete}
-        isOpen={deletePending === 'preview'}
-        title={
-          numberOfSelectedItems > 1
-            ? translate('modals.deletePhotosModal.multiTitle', { item: numberOfSelectedItems })
-            : translate('modals.deletePhotosModal.singleTitle', { item: numberOfSelectedItems })
-        }
-        subtitle={translate('modals.deletePhotosModal.subtitle')}
-        onSecondaryAction={() => setDeletePending(null)}
-        primaryAction={translate('modals.deletePhotosModal.buttons.delete')}
-        secondaryAction={translate('modals.deletePhotosModal.buttons.cancel')}
-        primaryActionColor="danger"
-      />
-      <ShareDialog
-        onClose={() => setSharePending(null)}
-        isOpen={sharePending === 'selected'}
-        photos={photosState.selectedItems}
-      />
-      <ShareDialog
-        zIndex={20}
-        onClose={() => setSharePending(null)}
-        isOpen={sharePending === 'preview'}
-        photos={photosState.previewIndex !== null ? [photosState.items[photosState.previewIndex].id] : []}
-      />
-    </>
-  );
-}
-
-function Grid({
-  photos,
-  selected,
-  isMorePhotos,
-  onUserScrolledToTheEnd,
-}: {
-  photos: SerializablePhoto[];
-  selected: PhotoId[];
-  isMorePhotos: boolean;
-  onUserScrolledToTheEnd: () => void;
-}) {
-  const dispatch = useDispatch();
-
-  const elementRef = useRef<HTMLDivElement>(null);
-
-  useEffect(() => {
-    const onScroll = (entries) => {
-      const element = entries[0];
-      if (element.isIntersecting) {
-        onUserScrolledToTheEnd();
-      }
-    };
-
-    const observer = new IntersectionObserver(onScroll, {
-      rootMargin: '200px',
-    });
-
-    elementRef.current && observer.observe(elementRef.current as Element);
-
-    return () => observer.disconnect();
-  }, [photos]);
-
-  return (
-    <div className="overflow-y-auto">
-      <div
-        className="grid gap-1 px-5"
-        style={{ gridTemplateColumns: 'repeat(auto-fill, minmax(160px, 1fr))' }}
-        data-test="photos-grid"
-      >
-        {photos.map((photo, i) => {
-          const isSelected = selected.some((el) => photo.id === el);
-          const thereAreSelected = selected.length > 0;
-          function onSelect() {
-            dispatch(photosSlice.actions.toggleSelect(photo.id));
-          }
-          return (
-            <PhotoItem
-              onClick={() => {
-                if (thereAreSelected) {
-                  onSelect();
-                } else {
-                  dispatch(photosSlice.actions.setPreviewIndex(i));
-                }
-              }}
-              onSelect={onSelect}
-              selected={isSelected}
-              photo={photo}
-              key={photo.id}
-              photoId={photo.id}
-            />
-          );
-        })}
-      </div>
-      <div className="mt-1" ref={elementRef}>
-        {isMorePhotos && <Skeleton />}
-      </div>
-    </div>
-  );
-}
-
-function PhotoItem({
-  onClick,
-  onSelect,
-  selected,
-  photo,
-  photoId,
-}: {
-  onClick: () => void;
-  onSelect: () => void;
-  selected: boolean;
-  photo: SerializablePhoto;
-  photoId: string;
-}) {
-  const [src, setSrc] = useState<string | undefined>(undefined);
-  const bucketId = useSelector<RootState, string | undefined>((state) => state.photos.bucketId);
-
-  useEffect(() => {
-    const photoBucketId = photo.networkBucketId ? photo.networkBucketId : bucketId;
-    if (photoBucketId) {
-      getPhotoPreview({
-        photo,
-        bucketId: photoBucketId,
-      })
-        .then(setSrc)
-        .catch((err) => {
-          Sentry.captureException(err, {
-            extra: {
-              photoId: photo.id,
-              bucketId: photoBucketId,
-            },
-          });
-        });
-    }
-  }, []);
-
-  return <PhotoThumbnail onClick={onClick} onSelect={onSelect} selected={selected} src={src} photoId={photoId} />;
-}
diff --git a/src/app/routes/Workspaces/WorkspacesRedirection.tsx b/src/app/routes/Workspaces/WorkspacesRedirection.tsx
new file mode 100644
index 000000000..2864d9217
--- /dev/null
+++ b/src/app/routes/Workspaces/WorkspacesRedirection.tsx
@@ -0,0 +1,24 @@
+import { useEffect } from 'react';
+import { useHistory, useParams } from 'react-router-dom';
+
+const WorkspacesRedirect = () => {
+  const params = useParams<{ invitationId: string; action?: string; email?: string }>();
+  const history = useHistory();
+
+  useEffect(() => {
+    const token = new URLSearchParams(window.location.search).get('token');
+    const invitationId = params?.invitationId;
+    const action = params?.action;
+
+    let redirectURL;
+
+    if (action) {
+      redirectURL = `/login?invitationId=${invitationId}&action=${action}&token=${token}`;
+    }
+    history.push(redirectURL);
+  }, [params, history]);
+
+  return null;
+};
+
+export default WorkspacesRedirect;
diff --git a/src/app/routes/hooks/Drive/useDrive.tsx b/src/app/routes/hooks/Drive/useDrive.tsx
index e28eaecdf..cc2ce687b 100644
--- a/src/app/routes/hooks/Drive/useDrive.tsx
+++ b/src/app/routes/hooks/Drive/useDrive.tsx
@@ -3,21 +3,25 @@ import navigationService from '../../../core/services/navigation.service';
 
 const useDriveNavigation = () => {
   const pathname = navigationService.history.location.pathname;
+  const params = new URLSearchParams(window.location.search);
   const [isFolderView, setIsFolderView] = useState(false);
   const [isFileView, setIsFileView] = useState(false);
   const [itemUuid, setItemUuid] = useState<string>();
+  const [workspaceUuid, setWorkspaceUuid] = useState<string>();
 
   useEffect(() => {
     const currentIsFolderView = navigationService.isCurrentPath('folder');
     const currentIsFileView = navigationService.isCurrentPath('file');
     const currentUuid = navigationService.getUuid();
+    const currentWorkspaceUuid = params.getAll('workspaceid');
 
     setIsFolderView(currentIsFolderView);
     setIsFileView(currentIsFileView);
     setItemUuid(currentUuid);
+    setWorkspaceUuid(currentWorkspaceUuid[0]);
   }, [pathname]);
 
-  return { isFolderView, isFileView, itemUuid };
+  return { isFolderView, isFileView, itemUuid, workspaceUuid };
 };
 
 export default useDriveNavigation;
diff --git a/src/app/routes/hooks/Login/useLoginRedirections.tsx b/src/app/routes/hooks/Login/useLoginRedirections.tsx
index ebd99fff2..26d1ebaf7 100644
--- a/src/app/routes/hooks/Login/useLoginRedirections.tsx
+++ b/src/app/routes/hooks/Login/useLoginRedirections.tsx
@@ -1,32 +1,36 @@
 import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
-import { AppView } from '../../../core/types';
 import { t } from 'i18next';
 import { useHistory } from 'react-router-dom';
+import { AppView } from '../../../core/types';
+import workspacesService from 'app/core/services/workspace.service';
 
 const useLoginRedirections = ({
   navigateTo,
   processInvitation,
+  processWorkspaceInvitation,
   showNotification,
 }: {
   navigateTo: (viewId: AppView, queryMap?: Record<string, unknown>) => void;
   processInvitation: (isDeclineAction: boolean, sharingId: string, sharingToken: string) => Promise<void>;
+  processWorkspaceInvitation: (isDeclineAction: boolean, invitationId: string, token: string) => Promise<void>;
   showNotification: ({ text, isError }: { text: string; isError: boolean }) => void;
 }) => {
   const urlParams = new URLSearchParams(window.location.search);
   const history = useHistory();
   const sharingId = urlParams.get('sharingId');
   const folderuuidToRedirect = urlParams.get('folderuuid');
+  const workspaceInvitationId = urlParams.get('invitationId');
 
-  const sharingToken = urlParams.get('token');
+  const token = urlParams.get('token');
   const sharingAction = urlParams.get('action');
   const isSharingInvitation = !!sharingId;
   const isUniversalLinkMode = urlParams.get('universalLink') === 'true';
 
   const handleShareInvitation = () => {
-    if (isSharingInvitation && sharingId && sharingToken) {
+    if (isSharingInvitation && sharingId && token) {
       const isDeclineAction = sharingAction === 'decline';
 
-      processInvitation(isDeclineAction, sharingId, sharingToken)
+      processInvitation(isDeclineAction, sharingId, token)
         .then(() => {
           navigateTo(AppView.Login);
           const notificationText = isDeclineAction
@@ -43,6 +47,34 @@ const useLoginRedirections = ({
     }
   };
 
+  const handleWorkspaceInvitation = async () => {
+    if (workspaceInvitationId && token) {
+      const isDeclineAction = sharingAction === 'decline';
+      try {
+        await workspacesService.validateWorkspaceInvitation(workspaceInvitationId);
+        processWorkspaceInvitation(isDeclineAction, workspaceInvitationId, token)
+          .then(() => {
+            navigateTo(AppView.Login);
+            const notificationText = isDeclineAction
+              ? t('preferences.workspace.members.invitationFlow.declinedSuccessfully')
+              : t('preferences.workspace.members.invitationFlow.acceptedSuccessfully');
+            showNotification({ text: notificationText, isError: false });
+          })
+          .catch(() => {
+            const notificationText = isDeclineAction
+              ? t('preferences.workspace.members.invitationFlow.error.declinedError')
+              : t('preferences.workspace.members.invitationFlow.error.acceptedError');
+            showNotification({ text: notificationText, isError: true });
+          });
+      } catch (error) {
+        showNotification({
+          text: t('linkExpired.title'),
+          isError: true,
+        });
+      }
+    }
+  };
+
   const redirectWithCredentials = (
     user: UserSettings,
     mnemonic: string,
@@ -70,7 +102,13 @@ const useLoginRedirections = ({
     }
   };
 
-  return { redirectWithCredentials, handleShareInvitation, isUniversalLinkMode, isSharingInvitation };
+  return {
+    redirectWithCredentials,
+    handleShareInvitation,
+    isUniversalLinkMode,
+    isSharingInvitation,
+    handleWorkspaceInvitation,
+  };
 };
 
 export default useLoginRedirections;
diff --git a/src/app/routes/paths.json b/src/app/routes/paths.json
index 67ec33f68..d5e06eed9 100644
--- a/src/app/routes/paths.json
+++ b/src/app/routes/paths.json
@@ -94,15 +94,6 @@
       "auth": true,
       "hideSearch": true
     },
-    {
-      "id": "photos",
-      "layout": "header-and-sidenav",
-      "path": "/photos",
-      "exact": true,
-      "auth": true,
-      "hideSearch": true
-    },
-
     {
       "id": "trash",
       "layout": "header-and-sidenav",
@@ -111,14 +102,6 @@
       "auth": true,
       "hideSearch": true
     },
-    {
-      "id": "preferences",
-      "layout": "header-and-sidenav",
-      "path": "/preferences",
-      "exact": true,
-      "auth": true,
-      "hideSearch": true
-    },
     {
       "id": "drive-items",
       "layout": "header-and-sidenav",
@@ -191,6 +174,12 @@
       "path": "/sh/file/:token/:code?",
       "exact": false
     },
+    {
+      "id": "share-token-2",
+      "layout": "share",
+      "path": "/d/file/:token/:code?",
+      "exact": false
+    },
     {
       "id": "share-folder-token",
       "layout": "share",
@@ -198,15 +187,21 @@
       "exact": false
     },
     {
-      "id": "share-guest-accept-invite",
+      "id": "share-folder-token-2",
+      "layout": "share",
+      "path": "/d/folder/:token/:code?",
+      "exact": false
+    },
+    {
+      "id": "workspace-guest-invite",
       "layout": "empty",
-      "path": "/shared-guest",
+      "path": "/workspace-guest",
       "exact": false
     },
     {
-      "id": "share-photos-token",
-      "layout": "share",
-      "path": "/sh/photos/:token([a-z0-9]{24})/:code",
+      "id": "share-guest-accept-invite",
+      "layout": "empty",
+      "path": "/shared-guest",
       "exact": false
     },
     {
diff --git a/src/app/share/services/DomainManager.ts b/src/app/share/services/DomainManager.ts
index a6f33049c..5bf2a6b57 100644
--- a/src/app/share/services/DomainManager.ts
+++ b/src/app/share/services/DomainManager.ts
@@ -25,7 +25,7 @@ class DomainManager {
       this.domains = domainsList;
     } catch (error) {
       errorService.reportError(error);
-      this.domains = [];
+      this.domains = [process.env.REACT_APP_SHARE_LINKS_DOMAIN];
     }
   }
 
diff --git a/src/app/share/services/redirections.service.ts b/src/app/share/services/redirections.service.ts
index 4eb87a788..721d64f03 100644
--- a/src/app/share/services/redirections.service.ts
+++ b/src/app/share/services/redirections.service.ts
@@ -1,9 +1,10 @@
+import { History } from 'history';
 import { t } from 'i18next';
 import navigationService from '../../core/services/navigation.service';
+import workspacesService from '../../core/services/workspace.service';
 import { AppView } from '../../core/types';
-import shareService from './share.service';
-import { History } from 'history';
 import { AdvancedSharedItem } from '../types';
+import shareService from './share.service';
 
 /**
  * Handles access to a private shared folder, fetching its content and navigating accordingly.
@@ -19,15 +20,21 @@ const handlePrivateSharedFolderAccess = async ({
   history,
   navigateToFolder,
   onError,
+  workspaceItemData,
 }: {
   folderUUID: string;
   history: History;
   navigateToFolder: (sharedFolder: AdvancedSharedItem) => void;
   onError: (errorMessage: string) => void;
+  workspaceItemData: { workspaceId?: string; teamId?: string };
 }) => {
   let statusError: null | number = null;
   try {
-    const sharedFolderData = await getPrivateSharedFolderAccessData(folderUUID);
+    const sharedFolderData = await getPrivateSharedFolderAccessData(
+      folderUUID,
+      workspaceItemData?.workspaceId,
+      workspaceItemData?.teamId,
+    );
     navigateToFolder(sharedFolderData as AdvancedSharedItem);
   } catch (error: any) {
     let errorMessage;
@@ -52,8 +59,14 @@ const handlePrivateSharedFolderAccess = async ({
   }
 };
 
-const getPrivateSharedFolderAccessData = async (folderUUID: string) => {
-  const response = await shareService.getSharedFolderContent(folderUUID, 'folders', '', 0, 0);
+const getPrivateSharedFolderAccessData = async (folderUUID: string, workspaceId?: string, teamId?: string) => {
+  let response;
+  if (workspaceId && teamId) {
+    const [promise] = workspacesService.getAllWorkspaceTeamSharedFolderFiles(workspaceId, teamId, folderUUID, 0, 0);
+    response = await promise;
+  } else {
+    response = await shareService.getSharedFolderContent(folderUUID, 'folders', '', 0, 0);
+  }
 
   // TODO: ADD TO SDK TYPES THE NECESSARY FIELDS
   const sharedFolderData = { plainName: (response as any).name, uuid: folderUUID, isFolder: true };
diff --git a/src/app/share/services/share.service.ts b/src/app/share/services/share.service.ts
index a9acad4f3..554522756 100644
--- a/src/app/share/services/share.service.ts
+++ b/src/app/share/services/share.service.ts
@@ -7,6 +7,7 @@ import {
   ListPrivateSharedFoldersResponse,
   ListSharedItemsResponse,
   PublicSharedItemInfo,
+  Role,
   ShareDomainsResponse,
   ShareFolderWithUserPayload,
   SharedFiles,
@@ -20,7 +21,6 @@ import {
 } from '@internxt/sdk/dist/drive/share/types';
 import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
 import folderService from 'app/drive/services/folder.service';
-import { Role } from 'app/store/slices/sharedLinks/types';
 import copy from 'copy-to-clipboard';
 import crypto from 'crypto';
 import { t } from 'i18next';
@@ -29,6 +29,7 @@ import { SdkFactory } from '../../core/factory/sdk';
 import errorService from '../../core/services/error.service';
 import httpService from '../../core/services/http.service';
 import localStorageService from '../../core/services/local-storage.service';
+import workspacesService from '../../core/services/workspace.service';
 import { decryptMessageWithPrivateKey } from '../../crypto/services/pgp.service';
 import notificationsService, { ToastType } from '../../notifications/services/notifications.service';
 import {
@@ -376,7 +377,7 @@ export const getPublicShareLink = async (
     const domains = domainManager.getDomainsList();
     const selectedDomain = getRandomElement(domains);
 
-    const publicShareLink = `${selectedDomain}/sh/${itemType}/${sharingId}/${plainCode}`;
+    const publicShareLink = `${selectedDomain}/d/sh/${itemType}/${sharingId}/${plainCode}`;
     // workaround to enable copy after login, because first copy always fails
     copy(publicShareLink);
     const isCopied = copy(publicShareLink);
@@ -446,23 +447,35 @@ export function getSharedDirectoryFiles(
 class DirectorySharedFolderIterator implements Iterator<SharedFolders> {
   private page: number;
   private itemsPerPage: number;
-  private readonly queryValues: { directoryId: string; resourcesToken?: string };
+  private readonly queryValues: { directoryId: string; resourcesToken?: string; workspaceId?: string; teamId?: string };
 
-  constructor(queryValues: { directoryId: string; resourcesToken?: string }, page?: number, itemsPerPage?: number) {
-    this.page = page || 0;
-    this.itemsPerPage = itemsPerPage || 5;
+  constructor(
+    queryValues: { directoryId: string; resourcesToken?: string; workspaceId?: string; teamId?: string },
+    page?: number,
+    itemsPerPage?: number,
+  ) {
+    this.page = page ?? 0;
+    this.itemsPerPage = itemsPerPage ?? 5;
     this.queryValues = queryValues;
   }
 
   async next() {
-    const { directoryId, resourcesToken } = this.queryValues;
-    const items = await getSharedFolderContent(
-      directoryId,
-      'folders',
-      resourcesToken ?? '',
-      this.page,
-      this.itemsPerPage,
-    );
+    const { directoryId, resourcesToken, workspaceId, teamId } = this.queryValues;
+    let items;
+    if (workspaceId && teamId) {
+      const [promise] = workspacesService.getAllWorkspaceTeamSharedFolderFolders(
+        workspaceId,
+        teamId,
+        directoryId,
+        this.page,
+        this.itemsPerPage,
+        resourcesToken,
+      );
+      const response = await promise;
+      items = response;
+    } else {
+      items = await getSharedFolderContent(directoryId, 'folders', resourcesToken ?? '', this.page, this.itemsPerPage);
+    }
     const folders = items.items.map((folder) => ({ ...folder, name: folder?.plainName ?? folder.name }));
     this.page += 1;
 
@@ -475,24 +488,35 @@ class DirectorySharedFolderIterator implements Iterator<SharedFolders> {
 class DirectorySharedFilesIterator implements Iterator<SharedFiles> {
   private page: number;
   private itemsPerPage: number;
-  private readonly queryValues: { directoryId: string; resourcesToken?: string };
+  private readonly queryValues: { directoryId: string; resourcesToken?: string; workspaceId?: string; teamId?: string };
 
-  constructor(queryValues: { directoryId: string; resourcesToken?: string }, page?: number, itemsPerPage?: number) {
-    this.page = page || 0;
-    this.itemsPerPage = itemsPerPage || 15;
+  constructor(
+    queryValues: { directoryId: string; resourcesToken?: string; workspaceId?: string; teamId?: string },
+    page?: number,
+    itemsPerPage?: number,
+  ) {
+    this.page = page ?? 0;
+    this.itemsPerPage = itemsPerPage ?? 15;
     this.queryValues = queryValues;
   }
 
   async next() {
-    const { directoryId, resourcesToken } = this.queryValues;
-
-    const items = await getSharedFolderContent(
-      directoryId,
-      'files',
-      resourcesToken ?? '',
-      this.page,
-      this.itemsPerPage,
-    );
+    const { directoryId, resourcesToken, workspaceId, teamId } = this.queryValues;
+    let items;
+    if (workspaceId && teamId) {
+      const [promise] = workspacesService.getAllWorkspaceTeamSharedFolderFiles(
+        workspaceId,
+        teamId,
+        directoryId,
+        this.page,
+        this.itemsPerPage,
+        resourcesToken,
+      );
+      const response = await promise;
+      items = response;
+    } else {
+      items = await getSharedFolderContent(directoryId, 'files', resourcesToken ?? '', this.page, this.itemsPerPage);
+    }
     const files = items.items.map((file) => ({ ...file, name: file?.plainName ?? file.name }));
     this.page += 1;
     const done = files.length < this.itemsPerPage;
@@ -507,8 +531,8 @@ class DirectoryPublicSharedFolderIterator implements Iterator<SharedFolders> {
   private readonly queryValues: { directoryId: string; resourcesToken?: string };
 
   constructor(queryValues: { directoryId: string; resourcesToken?: string }, page?: number, itemsPerPage?: number) {
-    this.page = page || 0;
-    this.itemsPerPage = itemsPerPage || 5;
+    this.page = page ?? 0;
+    this.itemsPerPage = itemsPerPage ?? 5;
     this.queryValues = queryValues;
   }
 
@@ -540,8 +564,8 @@ class DirectoryPublicSharedFilesIterator implements Iterator<SharedFiles> {
     page?: number,
     itemsPerPage?: number,
   ) {
-    this.page = page || 0;
-    this.itemsPerPage = itemsPerPage || 15;
+    this.page = page ?? 0;
+    this.itemsPerPage = itemsPerPage ?? 15;
     this.queryValues = queryValues;
   }
 
@@ -590,19 +614,22 @@ export const decryptMnemonic = async (encryptionKey: string): Promise<string | u
 
 export async function downloadSharedFiles({
   creds,
-  encryptionKey,
+  decryptedEncryptionKey,
   selectedItems,
   dispatch,
   token,
+  workspaceId,
+  teamId,
 }: {
   creds: { user: string; pass: string };
-  encryptionKey: string;
+  decryptedEncryptionKey: string;
   selectedItems: any[];
   dispatch: any;
   token?: string;
+  workspaceId?: string;
+  teamId?: string;
 }): Promise<void> {
-  const decryptedKey = await decryptMnemonic(encryptionKey);
-
+  const decryptedKey = decryptedEncryptionKey;
   if (selectedItems.length === 1 && !selectedItems[0].isFolder) {
     try {
       const sharingOptions = {
@@ -631,7 +658,7 @@ export async function downloadSharedFiles({
 
     const createFoldersIterator = (directoryUuid: string, resourcesToken?: string) => {
       return new DirectorySharedFolderIterator(
-        { directoryId: directoryUuid, resourcesToken: resourcesToken ?? token },
+        { directoryId: directoryUuid, resourcesToken: resourcesToken ?? token, workspaceId, teamId },
         initPage,
         itemsPerPage,
       );
@@ -639,16 +666,17 @@ export async function downloadSharedFiles({
 
     const createFilesIterator = (directoryUuid: string, resourcesToken?: string) => {
       return new DirectorySharedFilesIterator(
-        { directoryId: directoryUuid, resourcesToken: resourcesToken ?? token },
+        { directoryId: directoryUuid, resourcesToken: resourcesToken ?? token, workspaceId, teamId },
         initPage,
         itemsPerPage,
       );
     };
+
     dispatch(
       downloadItemsAsZipThunk({
         items: selectedItems,
         credentials: creds,
-        mnemonic: decryptedKey as string,
+        mnemonic: decryptedKey,
         fileIterator: createFilesIterator,
         folderIterator: createFoldersIterator,
         areSharedItems: true,
diff --git a/src/app/share/types/index.ts b/src/app/share/types/index.ts
index f1f6d7e35..ddb04c488 100644
--- a/src/app/share/types/index.ts
+++ b/src/app/share/types/index.ts
@@ -20,7 +20,7 @@ export type SharedNetworkCredentials = {
 export type PreviewFileItem = DriveFileData & {
   credentials?: NetworkCredentials;
   mnemonic?: string;
-  folderUuid?: string;
+  folderUuid: string;
 };
 
 export type OrderBy = { field: 'views' | 'createdAt'; direction: 'ASC' | 'DESC' } | undefined;
diff --git a/src/app/share/views/ShareView/SharePhotosView.tsx b/src/app/share/views/ShareView/SharePhotosView.tsx
deleted file mode 100644
index 24209aa33..000000000
--- a/src/app/share/views/ShareView/SharePhotosView.tsx
+++ /dev/null
@@ -1,275 +0,0 @@
-import { useState, useEffect } from 'react';
-import { match } from 'react-router';
-import iconService from 'app/drive/services/icon.service';
-import sizeService from 'app/drive/services/size.service';
-import { TaskProgress } from 'app/tasks/types';
-import { Link } from 'react-router-dom';
-import { useAppSelector } from '../../../store/hooks';
-import { Check, DownloadSimple } from '@phosphor-icons/react';
-import UilArrowRight from '@iconscout/react-unicons/icons/uil-arrow-right';
-import './ShareView.scss';
-import errorService from 'app/core/services/error.service';
-import Spinner from '../../../shared/components/Spinner/Spinner';
-import { GetPhotoShareResponse, PhotoId } from '@internxt/sdk/dist/photos';
-import { SdkFactory } from '../../../core/factory/sdk';
-import network from 'app/network';
-import downloadService from '../../../drive/services/download.service';
-import { loadWritableStreamPonyfill } from 'app/network/download';
-import { FlatFolderZip } from 'app/core/services/zipFolder.service';
-import { binaryStreamToBlob } from 'app/core/services/stream.service';
-import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
-import Button from 'app/shared/components/Button/Button';
-
-interface SharePhotosProps {
-  match: match<{
-    token: string;
-    code: string;
-  }>;
-}
-
-const SharePhotosView = (props: SharePhotosProps): JSX.Element => {
-  const { translate } = useTranslationContext();
-  const { token, code } = props.match.params;
-
-  const [progress, setProgress] = useState(TaskProgress.Min);
-  const [isDownloading, setIsDownloading] = useState(false);
-  const [info, setInfo] = useState<GetPhotoShareResponse | null>(null);
-  const [isError, setIsError] = useState(false);
-  const [errorMessage, setErrorMessage] = useState('');
-  const isAuthenticated = useAppSelector((state) => state.user.isAuthenticated);
-
-  let body, downloadButton;
-
-  useEffect(() => {
-    loadInfo()
-      .then(setInfo)
-      .catch((err) => {
-        setIsError(true);
-        setErrorMessage(errorService.castError(err).message);
-      });
-  }, []);
-
-  const loadInfo = async (): Promise<GetPhotoShareResponse> => {
-    // ! iOS Chrome is not supported
-    if (navigator.userAgent.match('CriOS')) {
-      throw new Error('Chrome iOS not supported. Use Safari to proceed');
-    }
-
-    const { shares } = await SdkFactory.getInstance().createPhotosClient();
-
-    return shares.getShare(token, code).catch(() => {
-      /**
-       * TODO: Check that the server returns proper error message instead
-       * of assuming that everything means that the link has expired
-       */
-      throw new Error(translate('error.linkExpired') as string);
-    });
-  };
-
-  const updateProgress = (progress: number) => {
-    setProgress(Number((progress * 100).toFixed(2)));
-  };
-
-  const download = async (): Promise<void> => {
-    setIsDownloading(true);
-    const fileToken = info?.token;
-    try {
-      if (info?.photos.length === 1) {
-        const [photo] = info.photos;
-        const readablePromise = network.downloadFile({
-          bucketId: info.bucket,
-          fileId: photo.fileId,
-          encryptionKey: Buffer.from(photo.decryptionKey, 'hex'),
-          token: fileToken,
-          options: {
-            notifyProgress: updateProgress,
-          },
-        });
-        const fileBlob = await binaryStreamToBlob(await readablePromise);
-
-        downloadService.downloadFileFromBlob(fileBlob, `${photo.name}.${photo.type}`);
-      } else if (info && info.photos.length > 1) {
-        const isBrave = !!(navigator.brave && (await navigator.brave.isBrave()));
-
-        if (isBrave) {
-          throw new Error(translate('error.browserNotSupported', { userAgent: 'Brave' }) as string);
-        }
-        const canUseReadableStreamMethod =
-          'WritableStream' in window &&
-          'ReadableStream' in window &&
-          new ReadableStream().pipeTo !== undefined &&
-          new ReadableStream().pipeThrough !== undefined &&
-          WritableStream !== undefined;
-
-        if (!canUseReadableStreamMethod) {
-          await loadWritableStreamPonyfill();
-        }
-        const folderName = `photos_${Date.now()}`;
-        const zip = new FlatFolderZip(folderName, {});
-
-        const generalProgress: Record<PhotoId, number> = {};
-
-        const updateTaskProgress = () => {
-          const totalSize = info.photos.reduce((prev, current) => prev + current.size, 0);
-          const currentSize = info.photos.reduce(
-            (prev, current) => prev + current.size * (generalProgress[current.fileId] ?? 0),
-            0,
-          );
-
-          updateProgress(currentSize / totalSize);
-        };
-
-        for (const photo of info.photos) {
-          const photoName = `${photo.name}.${photo.type}`;
-          const photoStreamPromise = network.downloadFile({
-            bucketId: info.bucket,
-            fileId: photo.fileId,
-            encryptionKey: Buffer.from(photo.decryptionKey, 'hex'),
-            token: fileToken,
-            options: {
-              notifyProgress: (progress) => {
-                generalProgress[photo.fileId] = progress;
-                updateTaskProgress();
-              },
-            },
-          });
-
-          try {
-            const photoData = await photoStreamPromise;
-            zip.addFile(photoName, photoData);
-          } catch (error) {
-            errorService.reportError(error);
-            throw new Error('Error generating zip');
-          }
-        }
-
-        zip.close();
-      }
-    } catch (err) {
-      setIsError(true);
-      setErrorMessage(errorService.castError(err).message);
-      setIsDownloading(false);
-    }
-  };
-
-  const handleLeavePage = (e) => {
-    const confirmationMessage = '';
-
-    e.returnValue = confirmationMessage; //Trident, Chrome 34+
-    return confirmationMessage; // WebKit, Chrome <34
-  };
-
-  useEffect(() => {
-    if (isDownloading && progress < 100) {
-      window.addEventListener('beforeunload', handleLeavePage);
-
-      return () => window.removeEventListener('beforeunload', handleLeavePage);
-    }
-  }, [progress]);
-
-  if (!isDownloading) {
-    downloadButton = (
-      <>
-        <DownloadSimple size={24} />
-        <span>{translate('actions.download')}</span>
-      </>
-    );
-  } else {
-    downloadButton =
-      progress < 100 ? (
-        <>
-          <div className="h-5 w-5 text-white">
-            <Spinner />
-          </div>
-          <span>{translate('actions.downloading')}</span>
-          {<span className="text-white/50">{progress}%</span>}
-        </>
-      ) : (
-        <>
-          <Check size={24} />
-          <span>{translate('actions.downloaded')}</span>
-        </>
-      );
-  }
-
-  if (isError) {
-    const ItemIconComponent = iconService.getItemIcon(false, 'default');
-
-    body = (
-      <>
-        <div className="relative h-32 w-32">
-          <ItemIconComponent className="absolute -top-2.5 left-7 rotate-10 drop-shadow-soft" />
-          <ItemIconComponent className="absolute -left-7 top-0.5 -rotate-10 drop-shadow-soft" />
-        </div>
-
-        <div className="flex flex-col items-center justify-center">
-          <span className="text-2xl font-semibold">Shared photos no longer available</span>
-          <span className="text-gray-60">{errorMessage}</span>
-        </div>
-
-        {isAuthenticated && (
-          <Link to="/" className="cursor-pointer text-gray-90 no-underline hover:text-gray-90">
-            <div
-              className="flex h-10 flex-row items-center justify-center space-x-2 rounded-lg bg-gray-5
-                          px-6 font-medium"
-            >
-              <span>Open Internxt Drive</span>
-              <UilArrowRight height="20" width="20" />
-            </div>
-          </Link>
-        )}
-      </>
-    );
-  } else if (info) {
-    const FileIcon = info.photos.length > 1 ? ImagesIcon : iconService.getItemIcon(false, 'png');
-    const title =
-      info.photos.length === 1 ? `${info.photos[0].name}.${info.photos[0].type}` : `${info.photos.length} photos`;
-    const size = info.photos.reduce((prev, current) => prev + current.size, 0);
-
-    body = (
-      <>
-        {/* File info */}
-        <div className="flex grow-0 flex-col items-center justify-center space-y-4">
-          <div className="h-32 w-32 drop-shadow-soft">
-            <FileIcon />
-          </div>
-
-          <div className="flex flex-col items-center justify-center space-y-2">
-            <div className="flex flex-col items-center justify-center text-center font-medium">
-              <abbr className="w-screen max-w-prose break-words px-10 text-xl sm:w-full" title={title}>
-                {title}
-              </abbr>
-              <span className="text-gray-60">{sizeService.bytesToString(size)}</span>
-            </div>
-          </div>
-        </div>
-
-        {/* Actions */}
-        <div className="flex flex-row items-center justify-center space-x-2">
-          <Button onClick={download} variant="primary">
-            {downloadButton}
-          </Button>
-        </div>
-      </>
-    );
-  } else {
-    body = (
-      <div className="h-8 w-8 text-gray-30">
-        <Spinner />
-      </div>
-    );
-  }
-  return body;
-};
-
-function ImagesIcon() {
-  const Icon = iconService.getItemIcon(false, 'png');
-  return (
-    <div className="relative h-32 w-32">
-      <Icon className="absolute -top-2.5 left-7 rotate-10 drop-shadow-soft" />
-      <Icon className="absolute -left-7 top-0.5 -rotate-10 drop-shadow-soft" />
-    </div>
-  );
-}
-
-export default SharePhotosView;
diff --git a/src/app/share/views/SharedGuestSignUp/ShareGuestSingUpView.tsx b/src/app/share/views/SharedGuestSignUp/ShareGuestSingUpView.tsx
index 9d0caea3c..7fefb54b0 100644
--- a/src/app/share/views/SharedGuestSignUp/ShareGuestSingUpView.tsx
+++ b/src/app/share/views/SharedGuestSignUp/ShareGuestSingUpView.tsx
@@ -1,35 +1,35 @@
-import { useState, useEffect } from 'react';
-import { SubmitHandler, useForm, useWatch } from 'react-hook-form';
-import queryString from 'query-string';
 import { auth } from '@internxt/lib';
+import testPasswordStrength from '@internxt/lib/dist/src/auth/testPasswordStrength';
+import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
 import { Info, WarningCircle } from '@phosphor-icons/react';
-import { Helmet } from 'react-helmet-async';
-import localStorageService, { STORAGE_KEYS } from 'app/core/services/local-storage.service';
-import { useAppDispatch } from 'app/store/hooks';
-import { userActions, userThunks } from 'app/store/slices/user';
-import { planThunks } from 'app/store/slices/plan';
+import PasswordInput from 'app/auth/components/PasswordInput/PasswordInput';
+import { Views } from 'app/auth/components/SignUp/SignUp';
+import { useSignUp } from 'app/auth/components/SignUp/useSignUp';
+import TextInput from 'app/auth/components/TextInput/TextInput';
+import { getNewToken } from 'app/auth/services/auth.service';
 import errorService from 'app/core/services/error.service';
+import localStorageService from 'app/core/services/local-storage.service';
 import navigationService from 'app/core/services/navigation.service';
-import { productsThunks } from 'app/store/slices/products';
 import { AppView, IFormValues } from 'app/core/types';
-import { referralsThunks } from 'app/store/slices/referrals';
-import testPasswordStrength from '@internxt/lib/dist/src/auth/testPasswordStrength';
-import PasswordStrengthIndicator from 'app/shared/components/PasswordStrengthIndicator';
-import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
-import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
-import { getNewToken } from 'app/auth/services/auth.service';
-import { MAX_PASSWORD_LENGTH } from '../../../shared/components/ValidPassword';
 import { decryptPrivateKey } from 'app/crypto/services/keys.service';
-import TextInput from 'app/auth/components/TextInput/TextInput';
-import PasswordInput from 'app/auth/components/PasswordInput/PasswordInput';
-import { useSignUp } from 'app/auth/components/SignUp/useSignUp';
+import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
 import shareService from 'app/share/services/share.service';
+import Button from 'app/shared/components/Button/Button';
+import PasswordStrengthIndicator from 'app/shared/components/PasswordStrengthIndicator';
+import ExpiredLink from 'app/shared/views/ExpiredLink/ExpiredLinkView';
+import { RootState } from 'app/store';
+import { useAppDispatch } from 'app/store/hooks';
+import { planThunks } from 'app/store/slices/plan';
+import { productsThunks } from 'app/store/slices/products';
+import { referralsThunks } from 'app/store/slices/referrals';
+import { userActions, userThunks } from 'app/store/slices/user';
 import { ReactComponent as InternxtLogo } from 'assets/icons/big-logo.svg';
+import queryString from 'query-string';
+import { useEffect, useState } from 'react';
+import { Helmet } from 'react-helmet-async';
+import { SubmitHandler, useForm, useWatch } from 'react-hook-form';
 import { useSelector } from 'react-redux';
-import { RootState } from 'app/store';
-import ExpiredLink from 'app/shared/views/ExpiredLink/ExpiredLinkView';
-import Button from 'app/shared/components/Button/Button';
-import { Views } from 'app/auth/components/SignUp/SignUp';
+import { MAX_PASSWORD_LENGTH } from '../../../shared/components/ValidPassword';
 
 function ShareGuestSingUpView(): JSX.Element {
   const { translate } = useTranslationContext();
@@ -222,93 +222,91 @@ function ShareGuestSingUpView(): JSX.Element {
             // <DownloadBackupKey onRedirect={onRedirect} />
             <></>
           ) : (
-            <>
-              <div className="flex flex-col items-start space-y-5">
-                <form className="flex w-full flex-col space-y-5" onSubmit={handleSubmit(onSubmit)}>
-                  <h1 className="text-3xl font-medium">{translate('auth.signup.title')}</h1>
-                  <div className="flex flex-col space-y-3">
-                    <label className="space-y-0.5">
-                      <TextInput
-                        placeholder={translate('auth.email')}
-                        label="email"
-                        type="email"
-                        disabled={hasEmailParam}
-                        register={register}
-                        required={true}
-                        minLength={{ value: 1, message: translate('notificationMessages.emailNotEmpty') }}
-                        error={errors.email}
+            <div className="flex flex-col items-start space-y-5">
+              <form className="flex w-full flex-col space-y-5" onSubmit={handleSubmit(onSubmit)}>
+                <h1 className="text-3xl font-medium">{translate('auth.signup.title')}</h1>
+                <div className="flex flex-col space-y-3">
+                  <label className="space-y-0.5">
+                    <TextInput
+                      placeholder={translate('auth.email')}
+                      label="email"
+                      type="email"
+                      disabled={hasEmailParam}
+                      register={register}
+                      required={true}
+                      minLength={{ value: 1, message: translate('notificationMessages.emailNotEmpty') }}
+                      error={errors.email}
+                    />
+                  </label>
+
+                  <label className="space-y-0.5">
+                    <PasswordInput
+                      className={passwordState ? passwordState.tag : ''}
+                      placeholder={translate('auth.password')}
+                      label="password"
+                      maxLength={MAX_PASSWORD_LENGTH}
+                      register={register}
+                      onFocus={() => setShowPasswordIndicator(true)}
+                      required={true}
+                      error={errors.password}
+                    />
+                    {showPasswordIndicator && passwordState && (
+                      <PasswordStrengthIndicator
+                        className="pt-1"
+                        strength={passwordState.tag}
+                        label={passwordState.label}
                       />
-                    </label>
-
-                    <label className="space-y-0.5">
-                      <PasswordInput
-                        className={passwordState ? passwordState.tag : ''}
-                        placeholder={translate('auth.password')}
-                        label="password"
-                        maxLength={MAX_PASSWORD_LENGTH}
-                        register={register}
-                        onFocus={() => setShowPasswordIndicator(true)}
-                        required={true}
-                        error={errors.password}
-                      />
-                      {showPasswordIndicator && passwordState && (
-                        <PasswordStrengthIndicator
-                          className="pt-1"
-                          strength={passwordState.tag}
-                          label={passwordState.label}
-                        />
-                      )}
-                      {bottomInfoError && (
-                        <div className="flex flex-row items-start pt-1">
-                          <div className="flex h-5 flex-row items-center">
-                            <WarningCircle weight="fill" className="mr-1 h-4 text-red" />
-                          </div>
-                          <span className="font-base w-56 text-sm text-red">{bottomInfoError}</span>
+                    )}
+                    {bottomInfoError && (
+                      <div className="flex flex-row items-start pt-1">
+                        <div className="flex h-5 flex-row items-center">
+                          <WarningCircle weight="fill" className="mr-1 h-4 text-red" />
                         </div>
-                      )}
-                    </label>
-
-                    <div className="flex space-x-2.5 rounded-lg bg-primary/10 p-3 pr-4 dark:bg-primary/20">
-                      <Info size={20} className="shrink-0 text-primary" />
-                      <p className="text-xs">
-                        {translate('auth.signup.info.normalText')}{' '}
-                        <span className="font-semibold">{translate('auth.signup.info.boldText')}</span>{' '}
-                        <span className="font-semibold text-primary underline">
-                          <a
-                            href="https://help.internxt.com/en/articles/8450457-how-do-i-create-a-backup-key"
-                            target="_blank"
-                          >
-                            {translate('auth.signup.info.cta')}
-                          </a>
-                        </span>
-                      </p>
-                    </div>
-
-                    <Button
-                      disabled={isLoading || !isValidPassword}
-                      loading={isLoading}
-                      variant="primary"
-                      className="w-full"
-                      type="submit"
-                    >
-                      {isLoading && isValid && isValidPassword
-                        ? `${translate('auth.signup.encrypting')}...`
-                        : translate('auth.signup.title')}
-                    </Button>
+                        <span className="font-base w-56 text-sm text-red">{bottomInfoError}</span>
+                      </div>
+                    )}
+                  </label>
+
+                  <div className="flex space-x-2.5 rounded-lg bg-primary/10 p-3 pr-4 dark:bg-primary/20">
+                    <Info size={20} className="shrink-0 text-primary" />
+                    <p className="text-xs">
+                      {translate('auth.signup.info.normalText')}{' '}
+                      <span className="font-semibold">{translate('auth.signup.info.boldText')}</span>{' '}
+                      <span className="font-semibold text-primary underline">
+                        <a
+                          href="https://help.internxt.com/en/articles/8450457-how-do-i-create-a-backup-key"
+                          target="_blank"
+                        >
+                          {translate('auth.signup.info.cta')}
+                        </a>
+                      </span>
+                    </p>
                   </div>
-                  <span className="mt-2 w-full text-xs text-gray-50">
-                    {translate('auth.terms1')}{' '}
-                    <a
-                      href="https://internxt.com/legal"
-                      target="_blank"
-                      className="text-xs text-gray-50 hover:text-gray-60"
-                    >
-                      {translate('auth.terms2')}
-                    </a>
-                  </span>
-                </form>
-              </div>
-            </>
+
+                  <Button
+                    disabled={isLoading || !isValidPassword}
+                    loading={isLoading}
+                    variant="primary"
+                    className="w-full"
+                    type="submit"
+                  >
+                    {isLoading && isValid && isValidPassword
+                      ? `${translate('auth.signup.encrypting')}...`
+                      : translate('auth.signup.title')}
+                  </Button>
+                </div>
+                <span className="mt-2 w-full text-xs text-gray-50">
+                  {translate('auth.terms1')}{' '}
+                  <a
+                    href="https://internxt.com/legal"
+                    target="_blank"
+                    className="text-xs text-gray-50 hover:text-gray-60"
+                  >
+                    {translate('auth.terms2')}
+                  </a>
+                </span>
+              </form>
+            </div>
           )}
         </div>
       </div>
diff --git a/src/app/share/views/SharedLinksView/SharedView.tsx b/src/app/share/views/SharedLinksView/SharedView.tsx
index 721899c6f..ee3ea452a 100644
--- a/src/app/share/views/SharedLinksView/SharedView.tsx
+++ b/src/app/share/views/SharedLinksView/SharedView.tsx
@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import { connect } from 'react-redux';
+import { connect, useSelector } from 'react-redux';
 import { useHistory } from 'react-router-dom';
 
 import { ChangeEvent, useEffect, useLayoutEffect, useRef } from 'react';
@@ -32,6 +32,7 @@ import { AdvancedSharedItem, PreviewFileItem, SharedNamePath } from '../../../sh
 import { RootState } from '../../../store';
 import { sharedActions, sharedThunks } from '../../../store/slices/sharedLinks';
 import storageThunks from '../../../store/slices/storage/storage.thunks';
+import workspacesSelectors from '../../../store/slices/workspaces/workspaces.selectors';
 import { handlePrivateSharedFolderAccess } from '../../services/redirections.service';
 import TopBarButtons from './components/TopBarButtons';
 import SharedItemListContainer from './containers/SharedItemListContainer';
@@ -120,18 +121,22 @@ function SharedView({
   const shareItems = [...shareFolders, ...shareFiles];
   const { fetchRootFolders, fetchFiles } = useFetchSharedData();
 
+  const selectedWorkspace = useSelector(workspacesSelectors.getSelectedWorkspace);
+  const workspaceId = selectedWorkspace?.workspace.id;
+  const defaultTeamId = selectedWorkspace?.workspace.defaultTeamId;
+
   useLayoutEffect(() => {
     dispatch(sharedThunks.getPendingInvitations());
 
     if (page === 0 && !folderUUID) {
-      fetchRootFolders();
+      fetchRootFolders(workspaceId, defaultTeamId);
       dispatch(storageActions.resetSharedNamePath());
     }
 
     if (folderUUID) {
       const onRedirectionToFolderError = (errorMessage: string) => {
         notificationsService.show({ text: errorMessage, type: ToastType.Error });
-        fetchRootFolders();
+        fetchRootFolders(workspaceId, defaultTeamId);
       };
 
       handlePrivateSharedFolderAccess({
@@ -139,6 +144,7 @@ function SharedView({
         navigateToFolder: handleOnItemDoubleClick,
         history,
         onError: onRedirectionToFolderError,
+        workspaceItemData: { workspaceId, teamId: defaultTeamId },
       });
     }
   }, []);
@@ -217,7 +223,7 @@ function SharedView({
   const onShowInvitationsModalClose = () => {
     resetSharedViewState();
     actionDispatch(setCurrentFolderId(''));
-    fetchRootFolders();
+    fetchRootFolders(workspaceId, defaultTeamId);
     dispatch(sharedThunks.getPendingInvitations());
     dispatch(uiActions.setIsInvitationsDialogOpen(false));
   };
@@ -251,7 +257,7 @@ function SharedView({
         actionDispatch(setHasMoreFolders(true));
         actionDispatch(setHasMoreFiles(true));
         actionDispatch(setCurrentFolderId(sharedFolderId));
-        actionDispatch(setCurrentParentFolderId(shareItem.id));
+        actionDispatch(setCurrentParentFolderId(shareItem.uuid));
         actionDispatch(setCurrentShareOwnerAvatar(shareItem?.user?.avatar ?? ''));
         actionDispatch(setSelectedItems([]));
       } else {
@@ -320,9 +326,9 @@ function SharedView({
     };
 
     try {
-      const mnemonic = await decryptMnemonic(
-        shareItem.encryptionKey ? shareItem.encryptionKey : clickedShareItemEncryptionKey,
-      );
+      const mnemonic =
+        selectedWorkspace?.workspaceUser.key ??
+        (await decryptMnemonic(shareItem.encryptionKey ? shareItem.encryptionKey : clickedShareItemEncryptionKey));
       handleOpemItemPreview(true, { ...previewItem, mnemonic });
     } catch (err) {
       const error = errorService.castError(err);
@@ -352,7 +358,7 @@ function SharedView({
 
     dispatch(
       storageActions.setItems({
-        folderId: currentParentFolderId as number,
+        folderId: currentParentFolderId as string,
         items: shareItems as unknown as DriveItemData[],
       }),
     );
@@ -382,7 +388,8 @@ function SharedView({
         token,
       };
     } else {
-      const mnemonicDecrypted = ownerEncryptionKey ? await decryptMnemonic(ownerEncryptionKey) : null;
+      const mnemonicDecrypted =
+        selectedWorkspace?.workspaceUser.key ?? (ownerEncryptionKey ? await decryptMnemonic(ownerEncryptionKey) : null);
       if (filesOwnerCredentials && mnemonicDecrypted && ownerBucket) {
         ownerUserAuthenticationData = {
           bridgeUser: filesOwnerCredentials?.networkUser,
@@ -405,7 +412,7 @@ function SharedView({
     );
 
     actionDispatch(setHasMoreFiles(true));
-    fetchFiles(true);
+    fetchFiles(true, workspaceId, defaultTeamId);
   };
 
   const handleIsItemOwnedByCurrentUser = (givenItemUserUUID?: string) => {
@@ -470,7 +477,7 @@ function SharedView({
         // This is added so that in case the element is no longer shared due
         // to changes in the share dialog it will disappear from the list.
         resetSharedViewState();
-        fetchRootFolders();
+        fetchRootFolders(workspaceId, defaultTeamId);
       }
     }, 200);
   };
@@ -507,6 +514,7 @@ function SharedView({
           numberOfPendingInvitations={pendingInvitations.length}
           onClickPendingInvitationsButton={onClickPendingInvitationsButton}
           disableUploadFileButton={isRootFolder}
+          selectedWorkspace={selectedWorkspace}
         />
       </div>
       <WarningMessageWrapper />
diff --git a/src/app/share/views/SharedLinksView/components/TopBarButtons.tsx b/src/app/share/views/SharedLinksView/components/TopBarButtons.tsx
index 1cd8d5186..48460b0ba 100644
--- a/src/app/share/views/SharedLinksView/components/TopBarButtons.tsx
+++ b/src/app/share/views/SharedLinksView/components/TopBarButtons.tsx
@@ -2,6 +2,7 @@ import { UploadSimple } from '@phosphor-icons/react';
 import Button from '../../../../shared/components/Button/Button';
 import { ChangeEvent, LegacyRef } from 'react';
 import { t } from 'i18next';
+import { WorkspaceData } from '@internxt/sdk/dist/workspaces';
 
 type TopBarButtonsProps = {
   showUploadFileButton: boolean;
@@ -11,6 +12,7 @@ type TopBarButtonsProps = {
   onClickPendingInvitationsButton: () => void;
   onUploadFileInputChanged: (e: ChangeEvent<HTMLInputElement>) => void;
   onUploadFileButtonClicked: () => void;
+  selectedWorkspace: WorkspaceData | null;
 };
 
 const TopBarButtons = ({
@@ -21,6 +23,7 @@ const TopBarButtons = ({
   numberOfPendingInvitations,
   onClickPendingInvitationsButton,
   disableUploadFileButton,
+  selectedWorkspace,
 }: TopBarButtonsProps) => {
   return (
     <div
@@ -52,7 +55,7 @@ const TopBarButtons = ({
           </div>
         </Button>
       )}
-      {numberOfPendingInvitations > 0 && (
+      {numberOfPendingInvitations > 0 && !selectedWorkspace && (
         <Button variant="secondary" onClick={onClickPendingInvitationsButton}>
           <div className="flex items-center space-x-2">
             <span>Pending Invitations</span>
diff --git a/src/app/share/views/SharedLinksView/containers/SharedItemListContainer.tsx b/src/app/share/views/SharedLinksView/containers/SharedItemListContainer.tsx
index 884602e18..c85629e0b 100644
--- a/src/app/share/views/SharedLinksView/containers/SharedItemListContainer.tsx
+++ b/src/app/share/views/SharedLinksView/containers/SharedItemListContainer.tsx
@@ -1,5 +1,5 @@
 import { useCallback } from 'react';
-import { useDispatch } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
 import { DriveItemData, DriveItemDetails } from '../../../../drive/types';
 import { storageActions } from '../../../../store/slices/storage';
 import { uiActions } from '../../../../store/slices/ui';
@@ -9,8 +9,10 @@ import { OrderField, SharedItemList } from '../components/SharedItemList';
 
 import errorService from '../../../../core/services/error.service';
 import localStorageService from '../../../../core/services/local-storage.service';
+import workspacesService from '../../../../core/services/workspace.service';
 import { OrderDirection } from '../../../../core/types';
 import { sharedThunks } from '../../../../store/slices/sharedLinks';
+import workspacesSelectors from '../../../../store/slices/workspaces/workspaces.selectors';
 import shareService, { decryptMnemonic } from '../../../services/share.service';
 import { setOrderBy, setPage, setSelectedItems } from '../context/SharedViewContext.actions';
 import { useShareViewContext } from '../context/SharedViewContextProvider';
@@ -41,7 +43,12 @@ const SharedItemListContainer = ({
   onOpenItemPreview,
 }: ShareItemListContainerProps) => {
   const dispatch = useDispatch();
+  const selectedWorkspace = useSelector(workspacesSelectors.getSelectedWorkspace);
+  const workspaceId = selectedWorkspace?.workspace.id;
+  const defaultTeamId = selectedWorkspace?.workspace.defaultTeamId;
+  const workspaceCredentials = useSelector(workspacesSelectors.getWorkspaceCredentials);
   const { state, actionDispatch } = useShareViewContext();
+
   const {
     page,
     hasMoreFiles,
@@ -88,6 +95,7 @@ const SharedItemListContainer = ({
   const downloadItem = async (shareItem: AdvancedSharedItem): Promise<void> => {
     try {
       if (shareItem.isRootLink) {
+        const encryptionKey = selectedWorkspace?.workspaceUser?.key ?? (await decryptMnemonic(shareItem.encryptionKey));
         await shareService.downloadSharedFiles({
           creds: {
             user: shareItem.credentials.networkUser,
@@ -95,18 +103,37 @@ const SharedItemListContainer = ({
           },
           dispatch,
           selectedItems,
-          encryptionKey: shareItem.encryptionKey,
+          decryptedEncryptionKey: encryptionKey as string,
+          token: undefined,
+          workspaceId,
+          teamId: defaultTeamId,
         });
       } else {
         const pageItemsNumber = 5;
-        // called to get the necessary token to download the items
-        const { token } = await shareService.getSharedFolderContent(
-          currentFolderId,
-          'files',
-          currentFolderLevelResourcesToken,
-          0,
-          pageItemsNumber,
-        );
+        let sharedToken;
+        if (workspaceCredentials && workspaceId && defaultTeamId) {
+          const [responsePromise] = workspacesService.getAllWorkspaceTeamSharedFolderFolders(
+            workspaceId,
+            defaultTeamId,
+            currentFolderId,
+            page,
+            5,
+            currentFolderLevelResourcesToken,
+          );
+          const { token } = await responsePromise;
+          sharedToken = token;
+        } else {
+          // called to get the necessary token to download the items
+          const { token } = await shareService.getSharedFolderContent(
+            currentFolderId,
+            'files',
+            currentFolderLevelResourcesToken,
+            0,
+            pageItemsNumber,
+          );
+          sharedToken = token;
+        }
+        const encryptionKey = selectedWorkspace?.workspaceUser?.key ?? (await decryptMnemonic(sharedItemEncryptionKey));
         await shareService.downloadSharedFiles({
           creds: {
             user: shareItem.credentials.networkUser,
@@ -114,8 +141,10 @@ const SharedItemListContainer = ({
           },
           dispatch,
           selectedItems,
-          encryptionKey: sharedItemEncryptionKey,
-          token,
+          decryptedEncryptionKey: encryptionKey as string,
+          token: sharedToken,
+          workspaceId,
+          teamId: defaultTeamId,
         });
       }
     } catch (err) {
@@ -144,9 +173,9 @@ const SharedItemListContainer = ({
     };
 
     try {
-      const mnemonic = await decryptMnemonic(
-        shareItem.encryptionKey ? shareItem.encryptionKey : sharedItemEncryptionKey,
-      );
+      const mnemonic =
+        selectedWorkspace?.workspaceUser.key ??
+        (await decryptMnemonic(shareItem.encryptionKey ? shareItem.encryptionKey : sharedItemEncryptionKey));
       onOpenItemPreview({ ...previewItem, mnemonic });
     } catch (err) {
       const error = errorService.castError(err);
diff --git a/src/app/share/views/SharedLinksView/context/SharedViewContext.actions.ts b/src/app/share/views/SharedLinksView/context/SharedViewContext.actions.ts
index 0cb6e23bf..456c7e557 100644
--- a/src/app/share/views/SharedLinksView/context/SharedViewContext.actions.ts
+++ b/src/app/share/views/SharedLinksView/context/SharedViewContext.actions.ts
@@ -99,7 +99,7 @@ const setCurrentFolderId = (payload: string): Action => ({
   payload,
 });
 
-const setCurrentParentFolderId = (payload?: number): Action => ({
+const setCurrentParentFolderId = (payload?: string): Action => ({
   type: ActionTypes.SET_CURRENT_PARENT_FOLDER_ID,
   payload,
 });
@@ -125,28 +125,28 @@ const setOwnerEncryptionKey = (payload: null | string): Action => ({
 });
 
 export {
-  setHasMoreFiles,
-  setHasMoreFolders,
-  setPage,
-  setIsLoading,
-  setSharedFolders,
-  setSharedFiles,
-  setOrderBy,
-  setSelectedItems,
-  setItemToView,
-  setEditNameItem,
-  setShowStopSharingConfirmation,
-  setIsFileViewerOpen,
-  setIsEditNameDialogOpen,
-  setIsDeleteDialogModalOpen,
-  setCurrentFolderLevelResourcesToken,
-  setNextFolderLevelResourcesToken,
-  setClickedShareItemUser,
   setClickedShareItemEncryptionKey,
+  setClickedShareItemUser,
   setCurrentFolderId,
+  setCurrentFolderLevelResourcesToken,
   setCurrentParentFolderId,
   setCurrentShareOwnerAvatar,
+  setEditNameItem,
   setFilesOwnerCredentials,
+  setHasMoreFiles,
+  setHasMoreFolders,
+  setIsDeleteDialogModalOpen,
+  setIsEditNameDialogOpen,
+  setIsFileViewerOpen,
+  setIsLoading,
+  setItemToView,
+  setNextFolderLevelResourcesToken,
+  setOrderBy,
   setOwnerBucket,
   setOwnerEncryptionKey,
+  setPage,
+  setSelectedItems,
+  setSharedFiles,
+  setSharedFolders,
+  setShowStopSharingConfirmation,
 };
diff --git a/src/app/share/views/SharedLinksView/context/SharedViewContext.ts b/src/app/share/views/SharedLinksView/context/SharedViewContext.ts
index 28210ccc0..02137a97a 100644
--- a/src/app/share/views/SharedLinksView/context/SharedViewContext.ts
+++ b/src/app/share/views/SharedLinksView/context/SharedViewContext.ts
@@ -1,7 +1,7 @@
 import { createContext, Dispatch } from 'react';
-import { AdvancedSharedItem, PreviewFileItem } from '../../../types';
-import { DriveItemData } from '../../../../drive/types';
 import { OrderDirection } from '../../../../core/types';
+import { DriveItemData } from '../../../../drive/types';
+import { AdvancedSharedItem, PreviewFileItem } from '../../../types';
 import { OrderField } from '../components/SharedItemList';
 
 export interface ShareViewState {
@@ -24,7 +24,7 @@ export interface ShareViewState {
   clickedShareItemUser?: AdvancedSharedItem['user'];
   clickedShareItemEncryptionKey: string;
   currentFolderId: string;
-  currentParentFolderId?: number;
+  currentParentFolderId?: string;
   currentShareOwnerAvatar: string;
   filesOwnerCredentials?: {
     networkPass: string;
@@ -54,7 +54,7 @@ export type Action =
   | { type: 'SET_CLICKED_SHARE_ITEM_USER'; payload?: AdvancedSharedItem['user'] }
   | { type: 'SET_CLICKED_SHARE_ITEM_ENCRYPTION_KEY'; payload: string }
   | { type: 'SET_CURRENT_FOLDER_ID'; payload: string }
-  | { type: 'SET_CURRENT_PARENT_FOLDER_ID'; payload?: number }
+  | { type: 'SET_CURRENT_PARENT_FOLDER_ID'; payload?: string }
   | { type: 'SET_CURRENT_SHARE_OWNER_AVATAR'; payload: string }
   | { type: 'SET_FILES_OWNER_CREDENTIALS'; payload: { networkPass: string; networkUser: string } }
   | { type: 'SET_OWNER_BUCKET'; payload: null | string }
diff --git a/src/app/share/views/SharedLinksView/hooks/useFetchSharedData.tsx b/src/app/share/views/SharedLinksView/hooks/useFetchSharedData.tsx
index 49d91cc3f..44d74fe40 100644
--- a/src/app/share/views/SharedLinksView/hooks/useFetchSharedData.tsx
+++ b/src/app/share/views/SharedLinksView/hooks/useFetchSharedData.tsx
@@ -1,33 +1,30 @@
 import { useEffect } from 'react';
+import errorService from '../../../../core/services/error.service';
 import {
   setCurrentFolderLevelResourcesToken,
   setCurrentShareOwnerAvatar,
   setFilesOwnerCredentials,
-  setHasMoreFolders,
   setHasMoreFiles,
+  setHasMoreFolders,
   setIsLoading,
   setNextFolderLevelResourcesToken,
   setOwnerBucket,
   setOwnerEncryptionKey,
   setPage,
-  setSharedFolders,
   setSharedFiles,
+  setSharedFolders,
 } from '../context/SharedViewContext.actions';
-import errorService from '../../../../core/services/error.service';
 
-import { useShareViewContext } from '../context/SharedViewContextProvider';
-import shareService from '../../../services/share.service';
-import {
-  ListAllSharedFoldersResponse,
-  ListSharedItemsResponse,
-  SharedFiles,
-  SharedFolders,
-} from '@internxt/sdk/dist/drive/share/types';
-import { AdvancedSharedItem, SharedNetworkCredentials } from '../../../types';
+import { ListSharedItemsResponse, SharedFiles, SharedFolders } from '@internxt/sdk/dist/drive/share/types';
+import { useDispatch, useSelector } from 'react-redux';
+import workspacesService from '../../../../core/services/workspace.service';
 import { getItemPlainName } from '../../../../crypto/services/utils';
 import { sharedActions } from '../../../../store/slices/sharedLinks';
-import { useDispatch } from 'react-redux';
+import workspacesSelectors from '../../../../store/slices/workspaces/workspaces.selectors';
 import { removeDuplicates } from '../../../../utils/driveItemsUtils';
+import shareService from '../../../services/share.service';
+import { AdvancedSharedItem, SharedNetworkCredentials } from '../../../types';
+import { useShareViewContext } from '../context/SharedViewContextProvider';
 
 const ITEMS_PER_PAGE = 30;
 
@@ -72,6 +69,10 @@ const addItemsToList = (
 const useFetchSharedData = () => {
   const { state, actionDispatch } = useShareViewContext();
   const dispatch = useDispatch();
+  const selectedWorkspace = useSelector(workspacesSelectors.getSelectedWorkspace);
+  const workspaceCredentials = useSelector(workspacesSelectors.getWorkspaceCredentials);
+  const workspaceId = selectedWorkspace?.workspace.id;
+  const defaultTeamId = selectedWorkspace?.workspace.defaultTeamId;
 
   const {
     page,
@@ -95,13 +96,13 @@ const useFetchSharedData = () => {
       const isRootFolder = !currentFolderId;
       try {
         if (isRootFolder && hasMoreFolders) {
-          await fetchRootFolders();
+          await fetchRootFolders(workspaceId, defaultTeamId);
         } else if (isRootFolder && !hasMoreFolders && hasMoreFiles) {
-          await fetchRootFiles();
+          await fetchRootFiles(workspaceId, defaultTeamId);
         } else if (!isRootFolder && hasMoreFolders) {
-          await fetchFolders();
+          await fetchFolders(workspaceId, defaultTeamId);
         } else if (!isRootFolder && !hasMoreFolders && hasMoreFiles) {
-          await fetchFiles();
+          await fetchFiles(false, workspaceId, defaultTeamId);
         }
       } catch (error) {
         errorService.reportError(error);
@@ -111,7 +112,7 @@ const useFetchSharedData = () => {
     }
   };
 
-  const fetchRootFolders = async () => {
+  const fetchRootFolders = async (workspaceId?: string, teamId?: string) => {
     dispatch(sharedActions.setCurrentShareId(null));
     dispatch(sharedActions.setCurrentSharingRole(null));
     actionDispatch(setIsLoading(true));
@@ -120,12 +121,20 @@ const useFetchSharedData = () => {
     actionDispatch(setCurrentShareOwnerAvatar(''));
 
     try {
-      const response: ListAllSharedFoldersResponse = await shareService.getAllSharedFolders(page, ITEMS_PER_PAGE);
+      let response;
+
+      if (workspaceId && teamId) {
+        const [promise] = workspacesService.getAllWorkspaceTeamSharedFolders(workspaceId, teamId);
+        response = await promise;
+      } else {
+        response = await shareService.getAllSharedFolders(page, ITEMS_PER_PAGE);
+      }
 
       const folders = parseSharedFolderResponseItems({
         sharedFolderResponseItems: response.folders,
         isFolder: true,
         isFromRootFolder: true,
+        credentials: workspaceCredentials?.credentials,
       });
 
       const items = addItemsToList(shareFolders, folders, page);
@@ -143,16 +152,24 @@ const useFetchSharedData = () => {
     }
   };
 
-  const fetchRootFiles = async () => {
+  const fetchRootFiles = async (workspaceId?: string, teamId?: string) => {
     actionDispatch(setIsLoading(true));
 
     try {
-      const response: ListAllSharedFoldersResponse = await shareService.getAllSharedFiles(page, ITEMS_PER_PAGE);
+      let response;
+
+      if (workspaceId && teamId) {
+        const [promise] = workspacesService.getAllWorkspaceTeamSharedFiles(workspaceId, teamId);
+        response = await promise;
+      } else {
+        response = await shareService.getAllSharedFiles(page, ITEMS_PER_PAGE);
+      }
 
       const files = parseSharedFolderResponseItems({
         sharedFolderResponseItems: response.files,
         isFolder: false,
         isFromRootFolder: true,
+        credentials: workspaceCredentials?.credentials,
       });
 
       const items = addItemsToList(shareFiles, files, page);
@@ -169,17 +186,31 @@ const useFetchSharedData = () => {
     }
   };
 
-  const fetchFolders = async () => {
+  const fetchFolders = async (workspaceId?: string, teamId?: string) => {
     if (currentFolderId && hasMoreFolders) {
       actionDispatch(setIsLoading(true));
+
       try {
-        const response: ListSharedItemsResponse & { role: string } = (await shareService.getSharedFolderContent(
-          currentFolderId,
-          'folders',
-          currentFolderLevelResourcesToken,
-          page,
-          ITEMS_PER_PAGE,
-        )) as ListSharedItemsResponse & { role: string };
+        let response;
+        if (workspaceId && teamId) {
+          const [promise] = workspacesService.getAllWorkspaceTeamSharedFolderFolders(
+            workspaceId,
+            teamId,
+            currentFolderId,
+            page,
+            ITEMS_PER_PAGE,
+            currentFolderLevelResourcesToken,
+          );
+          response = await promise;
+        } else {
+          response = (await shareService.getSharedFolderContent(
+            currentFolderId,
+            'folders',
+            currentFolderLevelResourcesToken,
+            page,
+            ITEMS_PER_PAGE,
+          )) as ListSharedItemsResponse & { role: string };
+        }
 
         const token = response.token;
         actionDispatch(setNextFolderLevelResourcesToken(token));
@@ -209,24 +240,37 @@ const useFetchSharedData = () => {
     }
   };
 
-  const fetchFiles = async (forceFetch?: boolean) => {
+  const fetchFiles = async (forceFetch: boolean, workspaceId?: string, teamId?: string) => {
     if (currentFolderId && !hasMoreFolders && (hasMoreFiles || forceFetch)) {
       actionDispatch(setIsLoading(true));
       try {
-        const response: ListSharedItemsResponse & { bucket: string; encryptionKey: string } =
-          (await shareService.getSharedFolderContent(
+        let response;
+        if (workspaceId && teamId) {
+          const [promise] = workspacesService.getAllWorkspaceTeamSharedFolderFiles(
+            workspaceId,
+            teamId,
+            currentFolderId,
+            page,
+            ITEMS_PER_PAGE,
+            currentFolderLevelResourcesToken,
+          );
+          response = await promise;
+        } else {
+          response = (await shareService.getSharedFolderContent(
             currentFolderId,
             'files',
             currentFolderLevelResourcesToken,
             page,
             ITEMS_PER_PAGE,
           )) as ListSharedItemsResponse & { bucket: string; encryptionKey: string };
+        }
 
         const token = response.token;
         actionDispatch(setNextFolderLevelResourcesToken(token));
 
-        const networkPass = response.credentials.networkPass;
-        const networkUser = response.credentials.networkUser;
+        const networkPass = response.credentials?.networkPass ?? workspaceCredentials?.credentials.networkPass;
+        const networkUser = response.credentials?.networkUser ?? workspaceCredentials?.credentials.networkUser;
+        const credentials = { networkUser, networkPass };
         actionDispatch(setFilesOwnerCredentials({ networkPass, networkUser }));
         const bucket = response.bucket;
         actionDispatch(setOwnerBucket(bucket));
@@ -235,10 +279,11 @@ const useFetchSharedData = () => {
 
         const files = parseSharedFolderResponseItems({
           sharedFolderResponseItems: response.items,
-          credentials: response.credentials,
+          credentials: credentials,
           isFolder: false,
           isFromRootFolder: false,
         });
+
         const items = addItemsToList(shareFiles, files, page);
 
         const itemsWithoutDuplicates = removeDuplicates(items);
diff --git a/src/app/shared/components/Breadcrumbs/Breadcrumbs.tsx b/src/app/shared/components/Breadcrumbs/Breadcrumbs.tsx
index fb922e685..ae1f528a0 100644
--- a/src/app/shared/components/Breadcrumbs/Breadcrumbs.tsx
+++ b/src/app/shared/components/Breadcrumbs/Breadcrumbs.tsx
@@ -33,8 +33,8 @@ export default function Breadcrumbs(props: Readonly<BreadcrumbsProps>): JSX.Elem
     };
 
     for (let i = 0; i < items.length; i++) {
-      const separatorKey = 'breadcrumbSeparator-' + items[i].id + i.toString();
-      const itemKey = 'breadcrumbItem-' + items[i].id + i.toString();
+      const separatorKey = 'breadcrumbSeparator-' + items[i].uuid + i.toString();
+      const itemKey = 'breadcrumbItem-' + items[i].uuid + i.toString();
 
       if (items.length > 3 && i !== 0 && i < items.length - 2) {
         if (i === 1) {
diff --git a/src/app/shared/components/Breadcrumbs/BreadcrumbsItem/BreadcrumbsItem.tsx b/src/app/shared/components/Breadcrumbs/BreadcrumbsItem/BreadcrumbsItem.tsx
index f313c9d6c..279a20767 100644
--- a/src/app/shared/components/Breadcrumbs/BreadcrumbsItem/BreadcrumbsItem.tsx
+++ b/src/app/shared/components/Breadcrumbs/BreadcrumbsItem/BreadcrumbsItem.tsx
@@ -27,13 +27,14 @@ interface BreadcrumbsItemProps {
 const BreadcrumbsItem = (props: BreadcrumbsItemProps): JSX.Element => {
   const dispatch = useAppDispatch();
   const namePath = useAppSelector((state) => state.storage.namePath);
+  const workspacesCredentials = useAppSelector((state) => state.workspaces.workspaceCredentials);
   const isSomeItemSelected = useAppSelector(storageSelectors.isSomeItemSelected);
   const selectedItems = useAppSelector((state) => state.storage.selectedItems);
 
   const onItemDropped = async (item, monitor: DropTargetMonitor) => {
     const droppedType = monitor.getItemType();
     const droppedData = monitor.getItem();
-    const breadcrumbIndex = namePath.findIndex((level) => level.id === props.item.id);
+    const breadcrumbIndex = namePath.findIndex((level) => level.uuid === props.item.uuid);
     const namePathDestinationArray = namePath.slice(0, breadcrumbIndex + 1).map((level) => level.name);
     namePathDestinationArray[0] = '';
     const folderPath = namePathDestinationArray.join('/');
@@ -51,9 +52,14 @@ const BreadcrumbsItem = (props: BreadcrumbsItemProps): JSX.Element => {
         return i.isFolder;
       });
 
-      dispatch(storageActions.setMoveDestinationFolderId(props.item.id));
-      const storageClient = SdkFactory.getInstance().createStorageClient();
-      const [folderContentPromise] = storageClient.getFolderContent(props.item.id);
+      dispatch(storageActions.setMoveDestinationFolderId(props.item.uuid));
+      const storageClient = SdkFactory.getNewApiInstance().createNewStorageClient();
+
+      const [folderContentPromise] = storageClient.getFolderContentByUuid(
+        props.item.uuid,
+        false,
+        workspacesCredentials?.tokenHeader,
+      );
 
       const { children: foldersInDestinationFolder, files: filesInDestinationFolder } = await folderContentPromise;
 
@@ -79,7 +85,7 @@ const BreadcrumbsItem = (props: BreadcrumbsItemProps): JSX.Element => {
       dispatch(
         storageThunks.moveItemsThunk({
           items: unrepeatedItems,
-          destinationFolderId: props.item.id,
+          destinationFolderId: props.item.uuid,
         }),
       );
     } else if (droppedType === NativeTypes.FILE) {
@@ -87,12 +93,12 @@ const BreadcrumbsItem = (props: BreadcrumbsItemProps): JSX.Element => {
         async ({ rootList, files }) => {
           if (files.length) {
             // Only files
-            await dispatch(storageThunks.uploadItemsThunk({ files, parentFolderId: props.item.id }));
+            await dispatch(storageThunks.uploadItemsThunk({ files, parentFolderId: props.item.uuid }));
           }
           if (rootList.length) {
             // Directory tree
             for (const root of rootList) {
-              await dispatch(storageThunks.uploadFolderThunk({ root, currentFolderId: props.item.id }));
+              await dispatch(storageThunks.uploadFolderThunk({ root, currentFolderId: props.item.uuid }));
             }
           }
         },
@@ -111,7 +117,7 @@ const BreadcrumbsItem = (props: BreadcrumbsItemProps): JSX.Element => {
         const droppedType = monitor.getItemType();
         const droppedDataParentId = item.parentId || item.folderId || -1;
 
-        return droppedType === NativeTypes.FILE || droppedDataParentId !== props.item.id;
+        return droppedType === NativeTypes.FILE || droppedDataParentId !== props.item.uuid;
       },
       drop: onItemDropped,
     }),
@@ -142,7 +148,7 @@ const BreadcrumbsItem = (props: BreadcrumbsItemProps): JSX.Element => {
             ? 'text-gray-80'
             : 'text-gray-50 hover:text-gray-80'
         }`}
-          key={props.item.id}
+          key={props.item.uuid}
           onClick={() => onItemClicked(props.item)}
           onKeyDown={() => {}}
           data-cy={props?.breadcrumbButtonDataCy}
diff --git a/src/app/shared/components/Breadcrumbs/Containers/BreadcrumbsBackupsView.tsx b/src/app/shared/components/Breadcrumbs/Containers/BreadcrumbsBackupsView.tsx
index 8beb3d1d6..03d5194a1 100644
--- a/src/app/shared/components/Breadcrumbs/Containers/BreadcrumbsBackupsView.tsx
+++ b/src/app/shared/components/Breadcrumbs/Containers/BreadcrumbsBackupsView.tsx
@@ -1,12 +1,12 @@
-import { Dispatch, SetStateAction } from 'react';
-import { BreadcrumbItemData } from '../types';
-import { t } from 'i18next';
-import Breadcrumbs from 'app/shared/components/Breadcrumbs/Breadcrumbs';
-import { Device } from 'app/backups/types';
 import { DriveFolderData } from '@internxt/sdk/dist/drive/storage/types';
+import { Device } from 'app/backups/types';
+import Breadcrumbs from 'app/shared/components/Breadcrumbs/Breadcrumbs';
 import { useAppDispatch, useAppSelector } from 'app/store/hooks';
 import { backupsActions } from 'app/store/slices/backups';
+import { t } from 'i18next';
+import { Dispatch, SetStateAction } from 'react';
 import BreadcrumbsMenuBackups from '../BreadcrumbsMenu/BreadcrumbsMenuBackups';
+import { BreadcrumbItemData } from '../types';
 
 interface BreadcrumbsBackupsViewProps {
   setSelectedDevices: Dispatch<SetStateAction<(Device | DriveFolderData)[]>>;
@@ -31,7 +31,7 @@ const BreadcrumbsBackupsView = ({
     const items: BreadcrumbItemData[] = [];
 
     items.push({
-      id: -1,
+      uuid: '',
       label: `${t('backups.your-devices')}`,
       icon: null,
       isFirstPath: true,
@@ -41,7 +41,7 @@ const BreadcrumbsBackupsView = ({
 
     if (currentDevice && 'mac' in currentDevice) {
       items.push({
-        id: currentDevice.id,
+        uuid: currentDevice.id.toString(),
         label: currentDevice.name,
         icon: null,
         active: false,
@@ -54,7 +54,7 @@ const BreadcrumbsBackupsView = ({
           onClick: () => goToFolder(item.id),
         };
         items.push({
-          id: item.id,
+          uuid: item.uuid,
           label: item.name,
           icon: null,
           isBackup: true,
diff --git a/src/app/shared/components/Breadcrumbs/Containers/BreadcrumbsDriveView.tsx b/src/app/shared/components/Breadcrumbs/Containers/BreadcrumbsDriveView.tsx
index f17e5357c..a8859c933 100644
--- a/src/app/shared/components/Breadcrumbs/Containers/BreadcrumbsDriveView.tsx
+++ b/src/app/shared/components/Breadcrumbs/Containers/BreadcrumbsDriveView.tsx
@@ -2,7 +2,8 @@ import navigationService from 'app/core/services/navigation.service';
 import { AppView } from 'app/core/types';
 import { FolderPath } from 'app/drive/types';
 import Breadcrumbs from 'app/shared/components/Breadcrumbs/Breadcrumbs';
-import { useAppDispatch } from 'app/store/hooks';
+import { useAppDispatch, useAppSelector } from 'app/store/hooks';
+import { RootState } from 'app/store';
 import storageThunks from 'app/store/slices/storage/storage.thunks';
 import { uiActions } from 'app/store/slices/ui';
 import { t } from 'i18next';
@@ -16,15 +17,19 @@ interface BreadcrumbsDriveViewProps {
 const BreadcrumbsDriveView = (props: BreadcrumbsDriveViewProps) => {
   const { namePath } = props;
   const dispatch = useAppDispatch();
+  const { selectedWorkspace } = useAppSelector((state: RootState) => state.workspaces);
 
   const breadcrumbDriveViewItems = (): BreadcrumbItemData[] => {
     const items: BreadcrumbItemData[] = [];
 
     if (namePath.length > 0) {
-      const firstPath = namePath[0];
+      const breadcrumbNamePath = [...namePath];
+      const parsedBreadcrumbNamePath =
+        selectedWorkspace && breadcrumbNamePath.length > 1 ? breadcrumbNamePath.slice(1) : breadcrumbNamePath;
+      const firstPath = parsedBreadcrumbNamePath[0];
 
       items.push({
-        id: firstPath.id,
+        uuid: firstPath.uuid,
         label: t('sideNav.drive'),
         icon: null,
         active: true,
@@ -36,13 +41,13 @@ const BreadcrumbsDriveView = (props: BreadcrumbsDriveViewProps) => {
         },
       });
 
-      namePath.slice(1).forEach((path: FolderPath, i: number, namePath: FolderPath[]) => {
+      parsedBreadcrumbNamePath.slice(1).forEach((path: FolderPath, i: number, namePath: FolderPath[]) => {
         items.push({
-          id: path.id,
+          uuid: path.uuid,
           label: path.name,
           icon: null,
           active: i < namePath.length - 1,
-          onClick: () => navigationService.pushFolder(path.uuid),
+          onClick: () => navigationService.pushFolder(path.uuid, selectedWorkspace?.workspaceUser.workspaceId),
         });
       });
     }
diff --git a/src/app/shared/components/Breadcrumbs/Containers/BreadcrumbsMoveItemsDialogView.tsx b/src/app/shared/components/Breadcrumbs/Containers/BreadcrumbsMoveItemsDialogView.tsx
index 03710823b..b94fcaa3c 100644
--- a/src/app/shared/components/Breadcrumbs/Containers/BreadcrumbsMoveItemsDialogView.tsx
+++ b/src/app/shared/components/Breadcrumbs/Containers/BreadcrumbsMoveItemsDialogView.tsx
@@ -5,7 +5,7 @@ import { RootState } from 'app/store';
 import Breadcrumbs from 'app/shared/components/Breadcrumbs/Breadcrumbs';
 
 interface BreadcrumbsMoveItemsDialogViewProps {
-  onShowFolderContentClicked: (folderId: number, name: string) => void;
+  onShowFolderContentClicked: (folderId: string, name: string) => void;
   currentNamePaths: FolderPathDialog[];
 }
 
@@ -19,12 +19,12 @@ const BreadcrumbsMoveItemsDialogView = (props: BreadcrumbsMoveItemsDialogViewPro
     if (currentFolderPaths.length > 0) {
       currentFolderPaths.forEach((path: FolderPathDialog, i: number, namePath: FolderPathDialog[]) => {
         items.push({
-          id: path.id,
+          uuid: path.uuid,
           label: path.name,
           icon: null,
           active: i < namePath.length - 1,
           dialog: isOpen,
-          onClick: () => onShowFolderContentClicked(path.id, path.name),
+          onClick: () => onShowFolderContentClicked(path.uuid, path.name),
         });
       });
     }
diff --git a/src/app/shared/components/Breadcrumbs/Containers/BreadcrumbsSharedView.tsx b/src/app/shared/components/Breadcrumbs/Containers/BreadcrumbsSharedView.tsx
index cf21ea279..7181829f1 100644
--- a/src/app/shared/components/Breadcrumbs/Containers/BreadcrumbsSharedView.tsx
+++ b/src/app/shared/components/Breadcrumbs/Containers/BreadcrumbsSharedView.tsx
@@ -43,9 +43,9 @@ const BreadcrumbsSharedView = ({ resetSharedItems, sharedNamePath }: Breadcrumbs
   };
   const breadcrumbShareViewItems = (): BreadcrumbItemData[] => {
     const items: BreadcrumbItemData[] = [];
-    const ROOT_FOLDER_ID = 1;
+    const ROOT_FOLDER_ID = 'ROOT_FOLDER_ID';
     items.push({
-      id: ROOT_FOLDER_ID,
+      uuid: ROOT_FOLDER_ID,
       label: t('shared-links.shared-links'),
       icon: null,
       active: true,
@@ -57,7 +57,7 @@ const BreadcrumbsSharedView = ({ resetSharedItems, sharedNamePath }: Breadcrumbs
 
     sharedNamePath.slice().forEach((path: SharedNamePath, i: number, namePath: SharedNamePath[]) => {
       items.push({
-        id: path.id,
+        uuid: path.uuid,
         label: path.name,
         icon: null,
         active: i < namePath.length - 1,
diff --git a/src/app/shared/components/Breadcrumbs/types.tsx b/src/app/shared/components/Breadcrumbs/types.tsx
index cdc0dff61..bec400202 100644
--- a/src/app/shared/components/Breadcrumbs/types.tsx
+++ b/src/app/shared/components/Breadcrumbs/types.tsx
@@ -1,5 +1,5 @@
 export interface BreadcrumbItemData {
-  id: number;
+  uuid: string;
   label: string;
   icon: JSX.Element | null;
   active: boolean;
diff --git a/src/app/shared/components/Card/index.tsx b/src/app/shared/components/Card/index.tsx
index 0102a7569..a11a20259 100644
--- a/src/app/shared/components/Card/index.tsx
+++ b/src/app/shared/components/Card/index.tsx
@@ -3,7 +3,7 @@ import { ReactNode } from 'react';
 export default function Card({ className = '', children }: { className?: string; children: ReactNode }): JSX.Element {
   return (
     <div
-      className={`${className} rounded-xl border border-gray-10 bg-surface p-5 shadow-[0_12px_20px_0_rgba(0,0,0,0.02)] dark:bg-gray-1`}
+      className={`rounded-xl border border-gray-10 bg-surface p-5 shadow-[0_12px_20px_0_rgba(0,0,0,0.02)] dark:bg-gray-1 ${className}`}
     >
       {children}
     </div>
diff --git a/src/app/shared/components/Input/index.tsx b/src/app/shared/components/Input/index.tsx
index da423f151..f36e7165c 100644
--- a/src/app/shared/components/Input/index.tsx
+++ b/src/app/shared/components/Input/index.tsx
@@ -1,5 +1,5 @@
-import { Eye, EyeSlash, MagnifyingGlass, X, WarningOctagon, Warning, CheckCircle } from '@phosphor-icons/react';
-import { useEffect, useRef, useState } from 'react';
+import { CheckCircle, Eye, EyeSlash, MagnifyingGlass, Warning, WarningOctagon, X } from '@phosphor-icons/react';
+import { KeyboardEvent, useEffect, useRef, useState } from 'react';
 
 export default function Input({
   className = '',
@@ -9,6 +9,7 @@ export default function Input({
   disabled,
   placeholder,
   value,
+  maxLength,
   onChange,
   onClear,
   message,
@@ -21,6 +22,7 @@ export default function Input({
   required = false,
   labelDataCy,
   inputDataCy,
+  onKeyDown,
 }: {
   className?: string;
   label?: string;
@@ -29,6 +31,7 @@ export default function Input({
   disabled?: boolean;
   placeholder?: string;
   value?: string;
+  maxLength?: number;
   onChange?: (v: string) => void;
   onClear?: () => void;
   onFocus?: () => void;
@@ -41,6 +44,7 @@ export default function Input({
   required?: boolean;
   labelDataCy?: string;
   inputDataCy?: string;
+  onKeyDown?: (e: KeyboardEvent<HTMLInputElement>) => void;
 }): JSX.Element {
   const inputRef = useRef<HTMLInputElement>(null);
 
@@ -92,7 +96,7 @@ export default function Input({
       <input
         ref={inputRef}
         disabled={disabled}
-        className={`inxt-input h-11 w-full rounded-md border bg-transparent text-lg font-normal text-gray-80 outline-none ring-opacity-10 focus:ring-3 disabled:text-gray-40 disabled:placeholder-gray-20 dark:ring-opacity-20 
+        className={`inxt-input h-10 w-full rounded-md border bg-transparent text-lg font-normal text-gray-80 outline-none ring-opacity-10 focus:ring-3 disabled:text-gray-40 disabled:placeholder-gray-20 dark:ring-opacity-20 
           ${borderColor} ${focusColor} ${placeholderColor} ${padding}`}
         type={variant === 'password' && !showPassword ? 'password' : variant === 'email' ? 'email' : 'text'}
         placeholder={placeholder}
@@ -107,10 +111,12 @@ export default function Input({
         }}
         autoComplete={autoComplete}
         value={value}
+        maxLength={maxLength}
         data-test={dataTest}
         data-cy={inputDataCy}
         name={name}
         required={required}
+        onKeyDown={onKeyDown ?? undefined}
       />
       {variant === 'password' && isFocused && (
         <div
diff --git a/src/app/shared/components/Modal/index.tsx b/src/app/shared/components/Modal/index.tsx
index 1a01b8409..0ed62459f 100644
--- a/src/app/shared/components/Modal/index.tsx
+++ b/src/app/shared/components/Modal/index.tsx
@@ -1,4 +1,4 @@
-import { Transition, Dialog } from '@headlessui/react';
+import { Dialog, Transition } from '@headlessui/react';
 import { Fragment, ReactNode } from 'react';
 
 export default function Modal({
@@ -7,12 +7,14 @@ export default function Modal({
   children,
   maxWidth,
   className,
+  width,
   preventClosing = false,
 }: {
   isOpen: boolean;
   onClose: () => void;
   children: ReactNode;
   maxWidth?: string;
+  width?: string;
   className?: string;
   preventClosing?: boolean;
 }): JSX.Element {
@@ -28,7 +30,7 @@ export default function Modal({
           leaveFrom="opacity-100"
           leaveTo="opacity-0"
         >
-          <div className="fixed inset-0 z-50 bg-gray-100/50 dark:bg-black/75" />
+          <div className="fixed inset-0 z-50 bg-highlight/40" />
         </Transition.Child>
         <div className="fixed inset-0 z-50">
           <div className="flex min-h-full items-center justify-center">
@@ -42,9 +44,9 @@ export default function Modal({
               leaveTo="opacity-0 scale-95"
             >
               <Dialog.Panel
-                className={`w-full text-gray-100 ${maxWidth ?? 'max-w-lg'} ${
+                className={` ${width ?? 'w-full'} text-gray-100 ${maxWidth ?? 'max-w-lg'} ${
                   className ?? 'p-5'
-                } rounded-2xl bg-surface shadow-subtle-hard transition-all duration-100 ease-out dark:bg-gray-1`}
+                } rounded-2xl bg-surface shadow-subtle-hard transition-all duration-100 ease-out`}
               >
                 {children}
               </Dialog.Panel>
diff --git a/src/app/shared/components/forms/BaseCheckbox/BaseCheckbox.tsx b/src/app/shared/components/forms/BaseCheckbox/BaseCheckbox.tsx
index 28ac63a56..fc1f4191e 100644
--- a/src/app/shared/components/forms/BaseCheckbox/BaseCheckbox.tsx
+++ b/src/app/shared/components/forms/BaseCheckbox/BaseCheckbox.tsx
@@ -1,6 +1,6 @@
+import React from 'react';
 import { ReactComponent as Check } from './Check.svg';
 import { ReactComponent as Minus } from './Minus.svg';
-import React from 'react';
 
 interface BaseCheckboxProps {
   id?: string;
diff --git a/src/app/shared/components/forms/RadioButton/RadioButton.tsx b/src/app/shared/components/forms/RadioButton/RadioButton.tsx
new file mode 100644
index 000000000..b3d273850
--- /dev/null
+++ b/src/app/shared/components/forms/RadioButton/RadioButton.tsx
@@ -0,0 +1,22 @@
+interface RadioButtonProps {
+  checked: boolean;
+  onClick: () => void;
+}
+
+const RadioButton = ({ checked, onClick }: RadioButtonProps) => {
+  return (
+    <label className="flex cursor-pointer">
+      <button
+        onClick={onClick}
+        className={`flex h-5 w-5 items-center justify-center rounded-full border border-gray-40 ${
+          checked && 'border-0 bg-primary'
+        }`}
+      >
+        {checked && <div className="h-2.5 w-2.5 rounded-full bg-white"></div>}
+      </button>
+      <input type="radio" className="h-0 w-0 appearance-none opacity-0" checked />
+    </label>
+  );
+};
+
+export default RadioButton;
diff --git a/src/app/store/index.ts b/src/app/store/index.ts
index 137af220f..9f8988a17 100644
--- a/src/app/store/index.ts
+++ b/src/app/store/index.ts
@@ -1,20 +1,20 @@
 import { configureStore } from '@reduxjs/toolkit';
 
-import userReducer from './slices/user';
-import teamReducer from './slices/team';
-import storageReducer from './slices/storage';
-import sessionReducer from './slices/session';
-import uiReducer from './slices/ui';
-import planReducer from './slices/plan';
-import productsReducer from './slices/products';
-import paymentReducer from './slices/payment';
 import backupsReducer from './slices/backups';
 import fileViewerReducer from './slices/fileViewer';
-import taskManagerReducer from './slices/taskManager';
-import referralsReducer from './slices/referrals';
 import newsletterReducer from './slices/newsletter';
-import photosReducer from './slices/photos';
+import paymentReducer from './slices/payment';
+import planReducer from './slices/plan';
+import productsReducer from './slices/products';
+import referralsReducer from './slices/referrals';
+import sessionReducer from './slices/session';
 import sharedReducer from './slices/sharedLinks';
+import storageReducer from './slices/storage';
+import taskManagerReducer from './slices/taskManager';
+import teamReducer from './slices/team';
+import uiReducer from './slices/ui';
+import userReducer from './slices/user';
+import workspacesReducer from './slices/workspaces/workspacesStore';
 
 export const store = configureStore({
   reducer: {
@@ -31,8 +31,8 @@ export const store = configureStore({
     taskManager: taskManagerReducer,
     referrals: referralsReducer,
     newsletter: newsletterReducer,
-    photos: photosReducer,
     shared: sharedReducer,
+    workspaces: workspacesReducer,
   },
 });
 
diff --git a/src/app/store/slices/photos/index.ts b/src/app/store/slices/photos/index.ts
deleted file mode 100644
index 2c536d438..000000000
--- a/src/app/store/slices/photos/index.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { PhotoId, PhotoWithDownloadLink } from '@internxt/sdk/dist/photos';
-import { createSlice, PayloadAction } from '@reduxjs/toolkit';
-import { photosExtraReducers } from './thunks';
-
-export type SerializablePhoto = Omit<PhotoWithDownloadLink, 'statusChangedAt' | 'takenAt' | 'createdAt' | 'updatedAt'>;
-export interface PhotosState {
-  isLoading: boolean;
-  skipped: number;
-  thereIsMore: boolean;
-  items: SerializablePhoto[];
-  selectedItems: PhotoId[];
-  bucketId?: string;
-  previewIndex: number | null;
-}
-
-const initialState: PhotosState = {
-  isLoading: false,
-  skipped: 0,
-  thereIsMore: true,
-  items: [],
-  selectedItems: [],
-  previewIndex: null,
-};
-
-export const photosSlice = createSlice({
-  name: 'photos',
-  initialState,
-  reducers: {
-    setIsLoading: (state: PhotosState, action: PayloadAction<boolean>) => {
-      state.isLoading = action.payload;
-    },
-    push: (state: PhotosState, action: PayloadAction<SerializablePhoto[]>) => {
-      state.items.push(...action.payload);
-    },
-    toggleSelect: (state: PhotosState, action: PayloadAction<PhotoId>) => {
-      const id = action.payload;
-      const isAlreadySelected = state.selectedItems.some((el) => el === id);
-
-      if (isAlreadySelected) {
-        state.selectedItems = state.selectedItems.filter((el) => el !== id);
-      } else {
-        state.selectedItems.push(id);
-      }
-    },
-    setThereIsMore: (state: PhotosState, action: PayloadAction<boolean>) => {
-      state.thereIsMore = action.payload;
-    },
-    setSkipped: (state: PhotosState, action: PayloadAction<number>) => {
-      state.skipped = action.payload;
-    },
-    setBucketId: (state: PhotosState, action: PayloadAction<string>) => {
-      state.bucketId = action.payload;
-    },
-    removeItems: (state: PhotosState, action: PayloadAction<PhotoId[]>) => {
-      state.items = state.items.filter((item) => !action.payload.includes(item.id));
-    },
-    unselectAll: (state: PhotosState) => {
-      state.selectedItems = [];
-    },
-    setPreviewIndex: (state: PhotosState, action: PayloadAction<PhotosState['previewIndex']>) => {
-      state.previewIndex = action.payload;
-    },
-  },
-  extraReducers: photosExtraReducers,
-});
-
-export default photosSlice.reducer;
diff --git a/src/app/store/slices/photos/thunks/delete.ts b/src/app/store/slices/photos/thunks/delete.ts
deleted file mode 100644
index 9682f3a46..000000000
--- a/src/app/store/slices/photos/thunks/delete.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { PhotoId } from '@internxt/sdk/dist/photos';
-import { createAsyncThunk } from '@reduxjs/toolkit';
-import { photosSlice } from '..';
-
-import { RootState } from '../../..';
-import { SdkFactory } from '../../../../core/factory/sdk';
-import { deleteDatabasePhotos } from '../../../../drive/services/database.service';
-
-export const deleteThunk = createAsyncThunk<void, PhotoId[], { state: RootState }>(
-  'photos/delete',
-  async (payload: PhotoId[], { dispatch, getState }) => {
-    const state = getState();
-
-    dispatch(photosSlice.actions.removeItems(payload));
-    dispatch(photosSlice.actions.setSkipped(state.photos.skipped - payload.length));
-
-    const { photos } = await SdkFactory.getInstance().createPhotosClient();
-
-    const promises = payload.map((id) => photos.deletePhotoById(id));
-
-    await Promise.all(promises);
-    await deleteDatabasePhotos(payload);
-  },
-);
diff --git a/src/app/store/slices/photos/thunks/download.ts b/src/app/store/slices/photos/thunks/download.ts
deleted file mode 100644
index 4a9800919..000000000
--- a/src/app/store/slices/photos/thunks/download.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-import { PhotoId } from '@internxt/sdk/dist/photos';
-import { createAsyncThunk } from '@reduxjs/toolkit';
-
-import { RootState } from '../../..';
-import errorService from '../../../../core/services/error.service';
-import downloadFileFromBlob from '../../../../drive/services/download.service/downloadFileFromBlob';
-import tasksService from '../../../../tasks/services/tasks.service';
-import { DownloadPhotosTask, TaskStatus, TaskType } from '../../../../tasks/types';
-import { SerializablePhoto } from '..';
-import { getPhotoBlob, getPhotoCachedOrStream } from 'app/network/download';
-import { FlatFolderZip } from 'app/core/services/zipFolder.service';
-import { t } from 'i18next';
-import notificationsService, { ToastType } from '../../../../notifications/services/notifications.service';
-
-export const downloadThunk = createAsyncThunk<void, SerializablePhoto[], { state: RootState }>(
-  'photos/delete',
-  async (payload: SerializablePhoto[], { getState }) => {
-    const state = getState();
-    const { bucketId } = state.photos;
-    if (!bucketId) return;
-
-    const abortController = new AbortController();
-
-    let taskId = '';
-    const isBrave = !!(navigator.brave && (await navigator.brave.isBrave()));
-
-    try {
-      taskId = tasksService.create({
-        action: TaskType.DownloadPhotos,
-        cancellable: true,
-        showNotification: true,
-        numberOfPhotos: payload.length,
-        stop: () => (abortController as { abort: (reason?: string) => void }).abort('Download cancelled'),
-      } as DownloadPhotosTask);
-
-      if (payload.length === 1) {
-        const [photo] = payload;
-
-        const photoBlob = await getPhotoBlob({ photo, bucketId, abortController });
-
-        if (!abortController.signal.aborted) {
-          await downloadFileFromBlob(photoBlob, `${photo.name}.${photo.type}`);
-        }
-      } else {
-        if (isBrave) {
-          notificationsService.show({ text: t('error.braveNotSupportMultiplePhotosDowload'), type: ToastType.Error });
-          throw new Error(t('error.browserNotSupported', { userAgent: 'Brave' }) as string);
-        }
-
-        const folder = new FlatFolderZip('photos', { abortController });
-        const generalProgress: Record<PhotoId, number> = {};
-
-        const updateTaskProgress = () => {
-          const totalSize = payload.reduce((prev, current) => prev + current.size, 0);
-          const currentSize = payload.reduce(
-            (prev, current) => prev + current.size * (generalProgress[current.id] ?? 0),
-            0,
-          );
-
-          tasksService.updateTask({ taskId, merge: { progress: currentSize / totalSize } });
-        };
-
-        for (const photo of payload) {
-          if (abortController.signal.aborted) break;
-
-          const photoName = `${photo.name}.${photo.type}`;
-          const photoSource = await getPhotoCachedOrStream({
-            photo,
-            bucketId,
-            onProgress: (progress) => {
-              generalProgress[photo.id] = progress;
-              updateTaskProgress();
-            },
-            abortController,
-          });
-
-          if (photoSource instanceof Blob) {
-            folder.addFile(photoName, photoSource.stream());
-          } else {
-            folder.addFile(photoName, await photoSource);
-          }
-        }
-        if (abortController.signal.aborted) {
-          throw new Error('Download aborted');
-        }
-
-        await folder.close();
-      }
-      tasksService.updateTask({ taskId, merge: { status: TaskStatus.Success } });
-    } catch (err) {
-      const error = errorService.castError(err);
-
-      if (!isBrave)
-        errorService.reportError(err, {
-          extra: {
-            payload,
-          },
-        });
-
-      if (abortController.signal.aborted) {
-        tasksService.updateTask({ taskId, merge: { status: TaskStatus.Cancelled } });
-      } else {
-        console.error(error);
-        tasksService.updateTask({ taskId, merge: { status: TaskStatus.Error } });
-      }
-    }
-  },
-);
diff --git a/src/app/store/slices/photos/thunks/fetch.ts b/src/app/store/slices/photos/thunks/fetch.ts
deleted file mode 100644
index 56ddb1714..000000000
--- a/src/app/store/slices/photos/thunks/fetch.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { PhotosSortBy, PhotoStatus, PhotoWithDownloadLink } from '@internxt/sdk/dist/photos';
-import { ActionReducerMapBuilder, createAsyncThunk } from '@reduxjs/toolkit';
-import { photosSlice, PhotosState, SerializablePhoto } from '..';
-
-import { RootState } from '../../..';
-import { SdkFactory } from '../../../../core/factory/sdk';
-
-const PAGE_SIZE = 60;
-
-export const fetchThunk = createAsyncThunk<void, void, { state: RootState }>(
-  'photos/fetch',
-  async (payload: void, { dispatch, getState }) => {
-    const state = getState();
-    if (state.photos.isLoading || !state.photos.thereIsMore) return;
-
-    dispatch(photosSlice.actions.setIsLoading(true));
-
-    const { skipped } = state.photos;
-
-    const { photos } = await SdkFactory.getInstance().createPhotosClient();
-
-    const data = await photos.getPhotosSorted(
-      { status: PhotoStatus.Exists },
-      { sortBy: PhotosSortBy.TakenAt, sortType: 'DESC' },
-      skipped,
-      PAGE_SIZE,
-      true,
-    );
-    dispatch(photosSlice.actions.setBucketId(data.bucketId));
-    const serializablePhotos = makePhotosSerializable(data.results);
-    dispatch(photosSlice.actions.push(serializablePhotos));
-
-    const thereIsMore = data.results.length === PAGE_SIZE;
-
-    if (!thereIsMore) {
-      dispatch(photosSlice.actions.setThereIsMore(false));
-    }
-
-    dispatch(photosSlice.actions.setSkipped(skipped + data.results.length));
-  },
-);
-
-export const fetchThunkExtraReducers = (builder: ActionReducerMapBuilder<PhotosState>): void => {
-  builder
-    .addCase(fetchThunk.fulfilled, (state) => {
-      state.isLoading = false;
-    })
-    .addCase(fetchThunk.rejected, (state) => {
-      state.isLoading = false;
-    });
-};
-
-function makePhotosSerializable(photos: PhotoWithDownloadLink[]): SerializablePhoto[] {
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  return photos.map(({ takenAt, statusChangedAt, createdAt, updatedAt, ...rest }) => rest);
-}
diff --git a/src/app/store/slices/photos/thunks/index.ts b/src/app/store/slices/photos/thunks/index.ts
deleted file mode 100644
index d46e8e7b8..000000000
--- a/src/app/store/slices/photos/thunks/index.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { ActionReducerMapBuilder } from '@reduxjs/toolkit';
-import { PhotosState } from '..';
-import { deleteThunk } from './delete';
-import { downloadThunk } from './download';
-
-import { fetchThunk, fetchThunkExtraReducers } from './fetch';
-
-const photosThunks = {
-  fetchThunk,
-  deleteThunk,
-  downloadThunk,
-};
-
-export const photosExtraReducers = (builder: ActionReducerMapBuilder<PhotosState>): void => {
-  fetchThunkExtraReducers(builder);
-};
-
-export default photosThunks;
diff --git a/src/app/store/slices/plan/index.ts b/src/app/store/slices/plan/index.ts
index 7b912572e..4f44aa13f 100644
--- a/src/app/store/slices/plan/index.ts
+++ b/src/app/store/slices/plan/index.ts
@@ -1,30 +1,31 @@
 import { createAsyncThunk, createSlice, PayloadAction } from '@reduxjs/toolkit';
 
-import { RootState } from '../..';
-import { StoragePlan } from 'app/drive/types';
+import { StoragePlan, UserSubscription, UserType } from '@internxt/sdk/dist/drive/payments/types';
+import { UsageResponse } from '@internxt/sdk/dist/drive/storage/types';
+import { GetMemberUsageResponse } from '@internxt/sdk/dist/workspaces';
+import workspacesService from 'app/core/services/workspace.service';
 import limitService from 'app/drive/services/limit.service';
-import planService from 'app/drive/services/plan.service';
 import usageService from 'app/drive/services/usage.service';
-import { sessionSelectors } from '../session/session.selectors';
-import { UsageResponse } from '@internxt/sdk/dist/drive/storage/types';
-import { UserSubscription } from '@internxt/sdk/dist/drive/payments/types';
+import { RootState } from '../..';
 import paymentService from '../../../payment/services/payment.service';
+import { sessionSelectors } from '../session/session.selectors';
+import { FreeStoragePlan } from 'app/drive/types';
 
 export interface PlanState {
   isLoadingPlans: boolean;
   isLoadingPlanLimit: boolean;
   isLoadingPlanUsage: boolean;
   individualPlan: StoragePlan | null;
+  businessPlan: StoragePlan | null;
   teamPlan: StoragePlan | null;
   planLimit: number;
   planUsage: number;
   usageDetails: UsageResponse | null;
-  subscription: UserSubscription | null;
-}
-
-interface FetchPlansResult {
-  individualPlan: StoragePlan | null;
-  teamPlan: StoragePlan | null;
+  individualSubscription: UserSubscription | null;
+  businessSubscription: UserSubscription | null;
+  businessPlanLimit: number;
+  businessPlanUsage: number;
+  businessPlanUsageDetails: UsageResponse | null;
 }
 
 const initialState: PlanState = {
@@ -32,11 +33,16 @@ const initialState: PlanState = {
   isLoadingPlanLimit: false,
   isLoadingPlanUsage: false,
   individualPlan: null,
+  businessPlan: null,
   teamPlan: null,
   planLimit: 0,
   planUsage: 0,
   usageDetails: null,
-  subscription: null,
+  individualSubscription: null,
+  businessSubscription: null,
+  businessPlanLimit: 0,
+  businessPlanUsage: 0,
+  businessPlanUsageDetails: null,
 };
 
 export const initializeThunk = createAsyncThunk<void, void, { state: RootState }>(
@@ -46,33 +52,17 @@ export const initializeThunk = createAsyncThunk<void, void, { state: RootState }
     const promises: Promise<void>[] = [];
 
     if (isAuthenticated) {
-      promises.push(dispatch(fetchPlans()).then());
+      promises.push(dispatch(fetchSubscriptionThunk({ userType: UserType.Individual })).then());
+      promises.push(dispatch(fetchSubscriptionThunk({ userType: UserType.Business })).then());
       promises.push(dispatch(fetchLimitThunk()).then());
       promises.push(dispatch(fetchUsageThunk()).then());
-      promises.push(dispatch(fetchSubscriptionThunk()).then());
+      promises.push(dispatch(fetchBusinessLimitUsageThunk()).then());
     }
 
     await Promise.all(promises);
   },
 );
 
-export const fetchPlans = createAsyncThunk<FetchPlansResult, void, { state: RootState }>(
-  'plan/fetchPlans',
-  async (payload: void, { getState }) => {
-    const user = getState().user.user;
-    const promises: Promise<StoragePlan | null>[] = [];
-
-    promises.push(planService.fetchIndividualPlan());
-    if (user?.teams) {
-      promises.push(planService.fetchTeamPlan());
-    }
-
-    const [individualPlan, teamPlan] = await Promise.all(promises);
-
-    return { individualPlan, teamPlan };
-  },
-);
-
 export const fetchLimitThunk = createAsyncThunk<number, void, { state: RootState }>(
   'plan/fetchLimit',
   async (payload: void, { getState }) => {
@@ -93,23 +83,43 @@ export const fetchUsageThunk = createAsyncThunk<UsageResponse | null, void, { st
     const isAuthenticated = getState().user.isAuthenticated;
 
     if (isAuthenticated) {
-      return await usageService.fetchUsage();
+      return usageService.fetchUsage();
     } else {
       return null;
     }
   },
 );
 
-export const fetchSubscriptionThunk = createAsyncThunk<UserSubscription | null, void, { state: RootState }>(
-  'plan/fetchSubscription',
+export const fetchSubscriptionThunk = createAsyncThunk<
+  UserSubscription | null,
+  { userType: UserType },
+  { state: RootState }
+>('plan/fetchSubscription', async (payload, { getState }) => {
+  const isAuthenticated = getState().user.isAuthenticated;
+
+  if (isAuthenticated) {
+    return paymentService.getUserSubscription(payload.userType);
+  } else {
+    return null;
+  }
+});
+
+export const fetchBusinessLimitUsageThunk = createAsyncThunk<GetMemberUsageResponse | null, void, { state: RootState }>(
+  'plan/fetchBusinessLimitUsage',
   async (payload: void, { getState }) => {
     const isAuthenticated = getState().user.isAuthenticated;
+    const userUuid = getState().user.user?.uuid;
 
     if (isAuthenticated) {
-      return paymentService.getUserSubscription();
-    } else {
-      return null;
+      const { selectedWorkspace } = getState().workspaces;
+
+      if (selectedWorkspace) {
+        const workspaceId = selectedWorkspace?.workspace.id;
+        if (workspaceId && userUuid) return workspacesService.getUsage(workspaceId);
+      }
     }
+
+    return null;
   },
 );
 
@@ -117,29 +127,24 @@ export const planSlice = createSlice({
   name: 'plan',
   initialState,
   reducers: {
-    setSubscription: (state: PlanState, action: PayloadAction<UserSubscription>) => {
-      state.subscription = action.payload;
+    setSubscriptionIndividual: (state: PlanState, action: PayloadAction<UserSubscription>) => {
+      state.individualSubscription = action.payload;
+    },
+    setSubscriptionBusiness: (state: PlanState, action: PayloadAction<UserSubscription>) => {
+      state.businessSubscription = action.payload;
     },
   },
   extraReducers: (builder) => {
     builder
-      .addCase(initializeThunk.pending, () => undefined)
+      .addCase(initializeThunk.pending, (state) => {
+        state.businessPlan = null;
+        state.businessPlanLimit = 0;
+        state.businessPlanUsage = 0;
+        state.businessPlanUsageDetails = null;
+      })
       .addCase(initializeThunk.fulfilled, () => undefined)
       .addCase(initializeThunk.rejected, () => undefined);
 
-    builder
-      .addCase(fetchPlans.pending, (state) => {
-        state.isLoadingPlans = true;
-      })
-      .addCase(fetchPlans.fulfilled, (state, action) => {
-        state.isLoadingPlans = false;
-        state.individualPlan = action.payload.individualPlan;
-        state.teamPlan = action.payload.teamPlan;
-      })
-      .addCase(fetchPlans.rejected, (state) => {
-        state.isLoadingPlans = false;
-      });
-
     builder
       .addCase(fetchLimitThunk.pending, (state) => {
         state.isLoadingPlanLimit = true;
@@ -169,15 +174,46 @@ export const planSlice = createSlice({
 
     builder.addCase(fetchSubscriptionThunk.fulfilled, (state, action) => {
       if (action.payload !== null) {
-        state.subscription = action.payload;
+        const isIndividualSubscription = action.meta.arg.userType == UserType.Individual;
+
+        if (isIndividualSubscription) {
+          state.individualSubscription = action.payload;
+          if (action.payload.type === 'subscription') {
+            state.individualPlan = action.payload.plan || null;
+          }
+        }
+        if (!isIndividualSubscription) {
+          state.businessSubscription = action.payload;
+          if (action.payload.type === 'subscription') {
+            state.businessPlan = action.payload.plan || null;
+          }
+        }
       }
     });
+
+    builder
+      .addCase(fetchBusinessLimitUsageThunk.pending, () => undefined)
+      .addCase(fetchBusinessLimitUsageThunk.fulfilled, (state, action) => {
+        const spaceLimit = Number(action.payload?.spaceLimit) || 0;
+        const driveUsage = Number(action.payload?.driveUsage) || 0;
+        const backupsUsage = Number(action.payload?.backupsUsage) || 0;
+
+        state.businessPlanLimit = spaceLimit;
+        state.businessPlanUsage = driveUsage + backupsUsage;
+        state.businessPlanUsageDetails = {
+          driveUsage,
+          backupsUsage,
+        } as unknown as UsageResponse;
+      })
+      .addCase(fetchBusinessLimitUsageThunk.rejected, () => undefined);
   },
 });
 
 const currentPlanSelector = (state: RootState): StoragePlan | null => {
-  const isTeam = sessionSelectors.isTeam(state);
+  const { selectedWorkspace } = state.workspaces;
+  if (selectedWorkspace) return state.plan.businessPlan;
 
+  const isTeam = sessionSelectors.isTeam(state);
   return isTeam ? state.plan.teamPlan : state.plan.individualPlan;
 };
 
@@ -189,26 +225,45 @@ export const planSelectors = {
     return currentPlan !== null && currentPlan.isLifetime;
   },
   planLimitToShow: (state: RootState): number => {
+    const { selectedWorkspace } = state.workspaces;
+    if (selectedWorkspace) {
+      const businessPlanLimit = state.plan.businessPlan ? state.plan.businessPlan.storageLimit : 0;
+      return state.plan.businessPlanLimit || businessPlanLimit;
+    }
+
     const isTeam = sessionSelectors.isTeam(state);
     const team = state.team.team;
-    const limit = isTeam ? state.plan.planLimit / (team?.total_members || 1) : state.plan.planLimit;
+    const individualPlanLimit = state.plan.individualPlan ? state.plan.individualPlan.storageLimit : 0;
+    const limit = isTeam
+      ? state.plan.planLimit / (team?.total_members || 1)
+      : state.plan.planLimit || individualPlanLimit || FreeStoragePlan.storageLimit;
 
     return limit;
   },
+  planUsageToShow: (state: RootState): number => {
+    const { selectedWorkspace } = state.workspaces;
+    if (selectedWorkspace) return state.plan.businessPlanUsage || 0;
+    return state.plan.planUsage;
+  },
   isPlanActive:
     (state: RootState) =>
     (priceId: string): boolean =>
       state.plan.individualPlan?.planId === priceId || state.plan.teamPlan?.planId === priceId,
+  subscriptionToShow: (state: RootState): UserSubscription | null => {
+    const { selectedWorkspace } = state.workspaces;
+    if (selectedWorkspace) return state.plan.businessSubscription;
+    return state.plan.individualSubscription;
+  },
 };
 
 export const planActions = planSlice.actions;
 
 export const planThunks = {
   initializeThunk,
-  fetchPlans,
   fetchLimitThunk,
   fetchUsageThunk,
   fetchSubscriptionThunk,
+  fetchBusinessLimitUsageThunk,
 };
 
 export default planSlice.reducer;
diff --git a/src/app/store/slices/referrals/index.ts b/src/app/store/slices/referrals/index.ts
index f91b95be0..764a56ebc 100644
--- a/src/app/store/slices/referrals/index.ts
+++ b/src/app/store/slices/referrals/index.ts
@@ -44,7 +44,7 @@ const refreshUserReferrals = createAsyncThunk<void, void, { state: RootState }>(
   'referrals/refreshUserReferrals',
   (payload, { dispatch }) => {
     dispatch(referralsThunks.fetchUserReferralsThunk());
-    dispatch(planThunks.fetchLimitThunk());
+    dispatch(planThunks.fetchUsageThunk());
   },
 );
 
diff --git a/src/app/store/slices/session/session.thunks/index.ts b/src/app/store/slices/session/session.thunks/index.ts
index d09b50a17..7fe8fb005 100644
--- a/src/app/store/slices/session/session.thunks/index.ts
+++ b/src/app/store/slices/session/session.thunks/index.ts
@@ -1,25 +1,29 @@
 import { ActionReducerMapBuilder, createAsyncThunk } from '@reduxjs/toolkit';
-import { sessionActions } from '..';
 import { RootState } from '../../..';
 
-import localStorageService from '../../../../core/services/local-storage.service';
-import { LocalStorageItem, Workspace } from '../../../../core/types';
-import { planThunks } from '../../plan';
+import navigationService from '../../../../core/services/navigation.service';
+import { AppView } from '../../../../core/types';
+import { storageActions, storageSelectors } from '../../storage';
+import storageThunks from '../../storage/storage.thunks';
+import { fetchPaginatedFolderContentThunk } from '../../storage/storage.thunks/fetchFolderContentThunk';
+import { uiActions } from '../../ui';
 import { SessionState } from '../session.model';
-import { sessionSelectors } from '../session.selectors';
 
 const changeWorkspaceThunk = createAsyncThunk<void, void, { state: RootState }>(
   'session/changeWorkspace',
   async (payload: void, { dispatch, getState }) => {
-    const isTeam: boolean = sessionSelectors.isTeam(getState());
-    const newWorkspace = isTeam ? Workspace.Individuals : Workspace.Business;
-
-    dispatch(sessionActions.setWorkspace(newWorkspace));
-    localStorageService.set(LocalStorageItem.Workspace, newWorkspace);
-
-    // TODO: encapsulate reset storage logic
-
-    dispatch(planThunks.initializeThunk());
+    const state = getState();
+    // const isTeam: boolean = sessionSelectors.isTeam(state);
+    // const newWorkspace = isTeam ? Workspace.Individuals : Workspace.Business;
+    // dispatch(planThunks.initializeThunk());
+
+    const rootFolderId = storageSelectors.rootFolderId(state);
+    navigationService.push(AppView.Drive);
+    dispatch(uiActions.setIsGlobalSearch(false));
+    dispatch(storageActions.resetDrivePagination());
+    dispatch(storageThunks.resetNamePathThunk());
+    dispatch(storageActions.clearSelectedItems());
+    dispatch(fetchPaginatedFolderContentThunk(rootFolderId));
   },
 );
 
diff --git a/src/app/store/slices/sharedLinks/index.ts b/src/app/store/slices/sharedLinks/index.ts
index 0a9348435..5863b07b2 100644
--- a/src/app/store/slices/sharedLinks/index.ts
+++ b/src/app/store/slices/sharedLinks/index.ts
@@ -6,7 +6,7 @@ import shareService, {
 } from 'app/share/services/share.service';
 import { RootState } from '../..';
 
-import { SharedFoldersInvitationsAsInvitedUserResponse } from '@internxt/sdk/dist/drive/share/types';
+import { Role, SharedFoldersInvitationsAsInvitedUserResponse } from '@internxt/sdk/dist/drive/share/types';
 import errorService from 'app/core/services/error.service';
 import navigationService from 'app/core/services/navigation.service';
 import { AppView } from 'app/core/types';
@@ -15,7 +15,6 @@ import { UserRoles } from 'app/share/types';
 import { t } from 'i18next';
 import userService from '../../../auth/services/user.service';
 import { encryptMessageWithPublicKey } from '../../../crypto/services/pgp.service';
-import { Role } from './types';
 
 export interface ShareLinksState {
   isLoadingRoles: boolean;
diff --git a/src/app/store/slices/storage/hooks/useReduxActions.ts b/src/app/store/slices/storage/hooks/useReduxActions.ts
index 3b32d824c..67f3c952c 100644
--- a/src/app/store/slices/storage/hooks/useReduxActions.ts
+++ b/src/app/store/slices/storage/hooks/useReduxActions.ts
@@ -34,7 +34,7 @@ export const useReduxActions = () => {
     );
   };
 
-  const uploadItem = (data: { uploadFile: File; parentFolderId: number; taskId: string; fileType: string }) => {
+  const uploadItem = (data: { uploadFile: File; parentFolderId: string; taskId: string; fileType: string }) => {
     dispatch(
       uploadItemsThunk({
         files: [data.uploadFile],
@@ -47,7 +47,7 @@ export const useReduxActions = () => {
 
   const uploadSharedItem = (data: {
     uploadFile: File;
-    parentFolderId: number;
+    parentFolderId: string;
     taskId: string;
     fileType: string;
     sharedItemAuthenticationData: SharedItemAuthenticationData;
diff --git a/src/app/store/slices/storage/index.ts b/src/app/store/slices/storage/index.ts
index 108d5df86..7e4936ecd 100644
--- a/src/app/store/slices/storage/index.ts
+++ b/src/app/store/slices/storage/index.ts
@@ -35,7 +35,7 @@ const initialState: StorageState = {
   filesOnTrashLength: 0,
   viewMode: FileViewMode.List,
   namePath: [],
-  currentPath: { id: 0, name: '' },
+  currentPath: { uuid: '', name: '' },
   filesToRename: [],
   driveFilesToRename: [],
   foldersToRename: [],
@@ -64,7 +64,7 @@ export const storageSlice = createSlice({
   name: 'storage',
   initialState,
   reducers: {
-    setIsLoadingFolder: (state: StorageState, action: PayloadAction<{ folderId: number; value: boolean }>) => {
+    setIsLoadingFolder: (state: StorageState, action: PayloadAction<{ folderId: string; value: boolean }>) => {
       state.loadingFolders[action.payload.folderId] = action.payload.value;
     },
     setForceLoading: (state: StorageState, action: PayloadAction<boolean>) => {
@@ -76,51 +76,51 @@ export const storageSlice = createSlice({
     setIsLoadingDeleted: (state: StorageState, action: PayloadAction<boolean>) => {
       state.isLoadingDeleted = action.payload;
     },
-    setItems: (state: StorageState, action: PayloadAction<{ folderId: number; items: DriveItemData[] }>) => {
+    setItems: (state: StorageState, action: PayloadAction<{ folderId: string; items: DriveItemData[] }>) => {
       state.levels[action.payload.folderId] = action.payload.items;
     },
-    setMoveDialogItems: (state: StorageState, action: PayloadAction<{ folderId: number; items: DriveItemData[] }>) => {
+    setMoveDialogItems: (state: StorageState, action: PayloadAction<{ folderId: string; items: DriveItemData[] }>) => {
       state.moveDialogLevels[action.payload.folderId] = action.payload.items;
     },
-    addItems: (state: StorageState, action: PayloadAction<{ folderId: number; items: DriveItemData[] }>) => {
+    addItems: (state: StorageState, action: PayloadAction<{ folderId: string; items: DriveItemData[] }>) => {
       const newFolderContent = (state.levels[action.payload.folderId] ?? []).concat(action.payload.items);
       const removedDuplicates = removeDuplicates(newFolderContent);
       state.levels[action.payload.folderId] = removedDuplicates;
     },
     setFolderFoldersLength: (
       state: StorageState,
-      action: PayloadAction<{ folderId: number; foldersLength: number }>,
+      action: PayloadAction<{ folderId: string; foldersLength: number }>,
     ) => {
       state.levelsFoldersLength[action.payload.folderId] = action.payload.foldersLength;
     },
-    setFolderFilesLength: (state: StorageState, action: PayloadAction<{ folderId: number; filesLength: number }>) => {
+    setFolderFilesLength: (state: StorageState, action: PayloadAction<{ folderId: string; filesLength: number }>) => {
       state.levelsFilesLength[action.payload.folderId] = action.payload.filesLength;
     },
     addFolderFoldersLength: (
       state: StorageState,
-      action: PayloadAction<{ folderId: number; foldersLength: number }>,
+      action: PayloadAction<{ folderId: string; foldersLength: number }>,
     ) => {
       const foldersLength = state.levelsFoldersLength[action.payload.folderId] ?? 0;
       state.levelsFoldersLength[action.payload.folderId] = foldersLength + action.payload.foldersLength;
     },
-    addFolderFilesLength: (state: StorageState, action: PayloadAction<{ folderId: number; filesLength: number }>) => {
+    addFolderFilesLength: (state: StorageState, action: PayloadAction<{ folderId: string; filesLength: number }>) => {
       const filesLength = state.levelsFilesLength[action.payload.folderId] ?? 0;
       state.levelsFilesLength[action.payload.folderId] = filesLength + action.payload.filesLength;
     },
-    resetLevelsFoldersLength: (state: StorageState, action: PayloadAction<{ folderId: number }>) => {
+    resetLevelsFoldersLength: (state: StorageState, action: PayloadAction<{ folderId: string }>) => {
       state.levelsFoldersLength[action.payload.folderId] = 0;
       state.levelsFilesLength[action.payload.folderId] = 0;
       state.levels[action.payload.folderId] = [];
     },
-    setHasMoreDriveFolders: (state: StorageState, action: PayloadAction<{ folderId: number; status: boolean }>) => {
+    setHasMoreDriveFolders: (state: StorageState, action: PayloadAction<{ folderId: string; status: boolean }>) => {
       state.hasMoreDriveFolders[action.payload.folderId] = action.payload.status;
     },
-    setHasMoreDriveFiles: (state: StorageState, action: PayloadAction<{ folderId: number; status: boolean }>) => {
+    setHasMoreDriveFiles: (state: StorageState, action: PayloadAction<{ folderId: string; status: boolean }>) => {
       state.hasMoreDriveFiles[action.payload.folderId] = action.payload.status;
     },
     resetDrivePagination: (state: StorageState) => {
-      state.hasMoreDriveFolders[state.currentPath.id] = true;
-      state.hasMoreDriveFiles[state.currentPath.id] = true;
+      state.hasMoreDriveFolders[state.currentPath.uuid] = true;
+      state.hasMoreDriveFiles[state.currentPath.uuid] = true;
     },
     setRecents: (state: StorageState, action: PayloadAction<DriveItemData[]>) => {
       state.recents = action.payload;
@@ -162,7 +162,7 @@ export const storageSlice = createSlice({
     setDriveFoldersToRename: (state: StorageState, action: PayloadAction<DriveItemData[]>) => {
       state.driveFoldersToRename = action.payload;
     },
-    setMoveDestinationFolderId: (state: StorageState, action: PayloadAction<number | null>) => {
+    setMoveDestinationFolderId: (state: StorageState, action: PayloadAction<string | null>) => {
       state.moveDestinationFolderId = action.payload;
     },
     setFilters: (state: StorageState, action: PayloadAction<StorageSetFiltersPayload>) => {
@@ -231,16 +231,16 @@ export const storageSlice = createSlice({
       });
     },
     popNamePathUpTo: (state: StorageState, action: PayloadAction<FolderPath>) => {
-      const folderIndex: number = state.namePath.map((path) => path.id).indexOf(action.payload.id);
+      const folderIndex: number = state.namePath.map((path) => path.uuid).indexOf(action.payload.uuid);
 
       state.namePath = state.namePath.slice(0, folderIndex + 1);
     },
     popNamePathDialogUpTo: (state: StorageState, action: PayloadAction<FolderPath>) => {
-      const folderIndex: number = state.folderPathDialog.map((path) => path.id).indexOf(action.payload.id);
+      const folderIndex: number = state.folderPathDialog.map((path) => path.uuid).indexOf(action.payload.uuid);
       state.folderPathDialog = state.folderPathDialog.slice(0, folderIndex + 1);
     },
     pushNamePath: (state: StorageState, action: PayloadAction<FolderPath>) => {
-      if (!state.namePath.map((path) => path.id).includes(action.payload.id)) {
+      if (!state.namePath.map((path) => path.uuid).includes(action.payload.uuid)) {
         state.namePath.push(action.payload);
       }
     },
@@ -248,7 +248,7 @@ export const storageSlice = createSlice({
       state.namePath = action.payload;
     },
     pushNamePathDialog: (state: StorageState, action: PayloadAction<FolderPath>) => {
-      if (!state.folderPathDialog.map((path) => path.id).includes(action.payload.id)) {
+      if (!state.folderPathDialog.map((path) => path.uuid).includes(action.payload.uuid)) {
         state.folderPathDialog.push(action.payload);
       }
     },
@@ -273,14 +273,14 @@ export const storageSlice = createSlice({
     },
     patchItem: (
       state: StorageState,
-      action: PayloadAction<{ id: number; folderId: number; isFolder: boolean; patch: DriveItemPatch }>,
+      action: PayloadAction<{ uuid: string; folderId: string; isFolder: boolean; patch: DriveItemPatch }>,
     ) => {
-      const { id, folderId, isFolder, patch } = action.payload;
-
+      const { uuid, folderId, isFolder, patch } = action.payload;
       const folderItems = [...state.levels[folderId]];
+
       if (folderItems) {
-        const item = folderItems.find((i) => i.id === id && !!i.isFolder === !!isFolder);
-        const itemIndex = folderItems.findIndex((i) => i.id === id && !!i.isFolder === !!isFolder);
+        const item = folderItems.find((i) => i.uuid === uuid && !!i.isFolder === !!isFolder);
+        const itemIndex = folderItems.findIndex((i) => i.uuid === uuid && !!i.isFolder === !!isFolder);
         const itemsToDatabase = [...folderItems];
         itemsToDatabase[itemIndex] = Object.assign({}, item, patch);
 
@@ -290,14 +290,14 @@ export const storageSlice = createSlice({
       }
 
       state.recents = state.recents.map((item) => {
-        if (item.id === id && item.isFolder === isFolder) {
+        if (item.uuid === uuid && item.isFolder === isFolder) {
           Object.assign(item, patch);
         }
         return item;
       });
 
       state.selectedItems = state.selectedItems.map((item) => {
-        if (item.id === id && item.isFolder === isFolder) {
+        if (item.uuid === uuid && item.isFolder === isFolder) {
           Object.assign(item, patch);
         }
         return item;
@@ -307,7 +307,7 @@ export const storageSlice = createSlice({
         Object.assign(state.infoItem, patch);
       } */
     },
-    clearCurrentThumbnailItems: (state: StorageState, action: PayloadAction<{ folderId: number }>) => {
+    clearCurrentThumbnailItems: (state: StorageState, action: PayloadAction<{ folderId: string }>) => {
       const { folderId } = action.payload;
 
       if (state.levels[folderId]) {
@@ -334,10 +334,10 @@ export const storageSlice = createSlice({
     },
     pushItems(
       state: StorageState,
-      action: PayloadAction<{ updateRecents?: boolean; folderIds?: number[]; items: DriveItemData | DriveItemData[] }>,
+      action: PayloadAction<{ updateRecents?: boolean; folderIds?: string[]; items: DriveItemData | DriveItemData[] }>,
     ) {
       const itemsToPush = Array.isArray(action.payload.items) ? action.payload.items : [action.payload.items];
-      const folderItems = action.payload.folderIds ?? Object.keys(state.levels).map((folderId) => parseInt(folderId));
+      const folderItems = action.payload.folderIds ?? Object.keys(state.levels).map((folderId) => folderId);
       const folderIds = Array.isArray(folderItems) ? folderItems : [folderItems];
 
       const uniqueNewItemsId = new Set(itemsToPush.map((item) => item.id));
@@ -362,9 +362,9 @@ export const storageSlice = createSlice({
     },
     popItems(
       state: StorageState,
-      action: PayloadAction<{ updateRecents?: boolean; folderIds?: number[]; items: DriveItemData | DriveItemData[] }>,
+      action: PayloadAction<{ updateRecents?: boolean; folderIds?: string[]; items: DriveItemData | DriveItemData[] }>,
     ) {
-      const folderIds = action.payload.folderIds || Object.keys(state.levels).map((folderId) => parseInt(folderId));
+      const folderIds = action.payload.folderIds || Object.keys(state.levels).map((folderId) => folderId);
       const itemsToDelete = !Array.isArray(action.payload.items) ? [action.payload.items] : action.payload.items;
 
       folderIds.forEach((folderId) => {
diff --git a/src/app/store/slices/storage/storage.model.ts b/src/app/store/slices/storage/storage.model.ts
index a5883d046..ba25a6495 100644
--- a/src/app/store/slices/storage/storage.model.ts
+++ b/src/app/store/slices/storage/storage.model.ts
@@ -12,7 +12,7 @@ export interface StorageState {
   loadingFolders: Record<number, boolean>;
   forceLoading: boolean;
   isDeletingItems: boolean;
-  levels: Record<number, DriveItemData[]>;
+  levels: Record<string, DriveItemData[]>;
   moveDialogLevels: Record<number, DriveItemData[]>;
   levelsFoldersLength: Record<number, number>;
   levelsFilesLength: Record<number, number>;
@@ -39,7 +39,7 @@ export interface StorageState {
   driveFilesToRename: DriveItemData[];
   foldersToRename: (DriveItemData | IRoot)[];
   driveFoldersToRename: DriveItemData[];
-  moveDestinationFolderId: number | null;
+  moveDestinationFolderId: string | null;
   viewMode: FileViewMode;
   namePath: FolderPath[];
   folderPathDialog: FolderPathDialog[];
diff --git a/src/app/store/slices/storage/storage.selectors.ts b/src/app/store/slices/storage/storage.selectors.ts
index be0a2cbc4..a36885de3 100644
--- a/src/app/store/slices/storage/storage.selectors.ts
+++ b/src/app/store/slices/storage/storage.selectors.ts
@@ -2,19 +2,21 @@ import { RootState } from '../..';
 import { DriveItemData } from '../../../drive/types';
 import { sessionSelectors } from '../session/session.selectors';
 
-const rootFolderId = (state: RootState): number => {
-  const { team } = state.team;
+const rootFolderId = (state: RootState): string => {
   const { user } = state.user;
-  const isTeam: boolean = sessionSelectors.isTeam(state);
 
-  return (isTeam ? team?.root_folder_id : user?.root_folder_id) || 0;
+  const selectedWorkspace = state.workspaces.selectedWorkspace;
+  const rootFolderId = (selectedWorkspace ? selectedWorkspace?.workspaceUser.rootFolderId : user?.rootFolderId) ?? '';
+  return rootFolderId;
 };
 
 const storageSelectors = {
   rootFolderId,
-  currentFolderId(state: RootState): number {
+  currentFolderId(state: RootState): string {
     const { namePath } = state.storage;
-    return namePath.length > 0 ? namePath[namePath.length - 1].id : rootFolderId(state);
+
+    const currentFolderId = namePath.length > 0 ? namePath[namePath.length - 1].uuid : rootFolderId(state);
+    return currentFolderId;
   },
   currentFolderPath(state: RootState): string {
     return state.storage.namePath.reduce((t, path) => `${t}${path.name}/`, '/');
@@ -22,27 +24,27 @@ const storageSelectors = {
   bucket(state: RootState): string {
     const { team } = state.team;
     const isTeam: boolean = sessionSelectors.isTeam(state);
-
-    return (isTeam ? team?.bucket : state.user.user?.bucket) || '';
+    // TODO: NEED TO CHANGE THIS BY WORKSPACE BUCKET
+    return (isTeam ? team?.bucket : state.user.user?.bucket) ?? '';
   },
   isCurrentFolderEmpty(state: RootState): boolean {
     const currentFolderId = this.currentFolderId(state);
     return this.levelItems(state)(currentFolderId).length === 0;
   },
-  isFolderInNamePath(state: RootState): (folderId: number) => boolean {
-    return (folderId) => state.storage.namePath.map((p) => p.id).includes(folderId);
+  isFolderInNamePath(state: RootState): (folderId: string) => boolean {
+    return (folderId) => state.storage.namePath.map((p) => p.uuid).includes(folderId);
   },
   currentFolderItems(state: RootState): DriveItemData[] {
     const currentFolderId = this.currentFolderId(state);
     return this.levelItems(state)(currentFolderId);
   },
   hasMoreFiles(state: RootState): boolean {
-    return state.storage.hasMoreDriveFiles[state.storage.currentPath.id];
+    return state.storage.hasMoreDriveFiles[state.storage.currentPath.uuid];
   },
   hasMoreFolders(state: RootState): boolean {
-    return state.storage.hasMoreDriveFolders[state.storage.currentPath.id];
+    return state.storage.hasMoreDriveFolders[state.storage.currentPath.uuid];
   },
-  levelItems(state: RootState): (folderId: number) => DriveItemData[] {
+  levelItems(state: RootState): (folderId: string) => DriveItemData[] {
     return (folderId) => state.storage.levels[folderId] || [];
   },
   filteredItems(state: RootState): (items: DriveItemData[]) => DriveItemData[] {
diff --git a/src/app/store/slices/storage/storage.thunks/createFolderThunk.ts b/src/app/store/slices/storage/storage.thunks/createFolderThunk.ts
index 3bcd5d3d0..7e22f3680 100644
--- a/src/app/store/slices/storage/storage.thunks/createFolderThunk.ts
+++ b/src/app/store/slices/storage/storage.thunks/createFolderThunk.ts
@@ -1,14 +1,16 @@
 import { ActionReducerMapBuilder, createAsyncThunk } from '@reduxjs/toolkit';
-import { StorageState } from '../storage.model';
+import notificationsService, { ToastType } from 'app/notifications/services/notifications.service';
+import { t } from 'i18next';
 import { storageActions, storageSelectors } from '..';
 import { RootState } from '../../..';
-import { DriveFolderData, DriveItemData } from '../../../../drive/types';
-import { CreateFolderTask, TaskProgress, TaskStatus, TaskType } from '../../../../tasks/types';
-import tasksService from '../../../../tasks/services/tasks.service';
 import errorService from '../../../../core/services/error.service';
+import workspacesService from '../../../../core/services/workspace.service';
 import folderService from '../../../../drive/services/folder.service';
-import { t } from 'i18next';
-import notificationsService, { ToastType } from 'app/notifications/services/notifications.service';
+import { DriveFolderData, DriveItemData } from '../../../../drive/types';
+import tasksService from '../../../../tasks/services/tasks.service';
+import { CreateFolderTask, TaskProgress, TaskStatus, TaskType } from '../../../../tasks/types';
+import workspacesSelectors from '../../workspaces/workspaces.selectors';
+import { StorageState } from '../storage.model';
 
 interface CreateFolderThunkOptions {
   relatedTaskId: string;
@@ -16,7 +18,7 @@ interface CreateFolderThunkOptions {
 }
 
 interface CreateFolderPayload {
-  parentFolderId: number;
+  parentFolderId: string;
   folderName: string;
   options?: Partial<CreateFolderThunkOptions>;
   uuid?: string;
@@ -27,9 +29,20 @@ export const createFolderThunk = createAsyncThunk<DriveFolderData, CreateFolderP
   async ({ folderName, parentFolderId, options }: CreateFolderPayload, { getState, dispatch }) => {
     options = Object.assign({ showErrors: true }, options || {});
     const currentFolderId = storageSelectors.currentFolderId(getState());
+    const selectedWorkspace = workspacesSelectors.getSelectedWorkspace(getState());
+    const workspaceId = selectedWorkspace?.workspace?.id;
+    let createdFolderPromise, requestCanceler;
 
     try {
-      const [createdFolderPromise, requestCanceler] = folderService.createFolder(parentFolderId, folderName);
+      if (workspaceId) {
+        [createdFolderPromise, requestCanceler] = workspacesService.createFolder({
+          workspaceId,
+          parentFolderUuid: parentFolderId,
+          plainName: folderName,
+        });
+      } else {
+        [createdFolderPromise, requestCanceler] = folderService.createFolderByUuid(parentFolderId, folderName);
+      }
 
       const taskId = tasksService.create<CreateFolderTask>({
         relatedTaskId: options.relatedTaskId,
diff --git a/src/app/store/slices/storage/storage.thunks/deleteItemsThunk.ts b/src/app/store/slices/storage/storage.thunks/deleteItemsThunk.ts
index a91e08307..40f542bde 100644
--- a/src/app/store/slices/storage/storage.thunks/deleteItemsThunk.ts
+++ b/src/app/store/slices/storage/storage.thunks/deleteItemsThunk.ts
@@ -8,8 +8,12 @@ import { planThunks } from '../../plan';
 
 export const deleteItemsThunk = createAsyncThunk<void, DriveItemData[], { state: RootState }>(
   'storage/deleteItems',
-  async (itemsToDelete: DriveItemData[], { dispatch }) => {
+  async (itemsToDelete: DriveItemData[], { dispatch, getState }) => {
+    const { selectedWorkspace } = getState().workspaces;
+    const memberId = selectedWorkspace?.workspaceUser?.memberId;
+
     dispatch(planThunks.fetchUsageThunk());
+    if (memberId) dispatch(planThunks.fetchBusinessLimitUsageThunk());
     dispatch(storageActions.popItems({ updateRecents: true, items: itemsToDelete }));
     dispatch(storageActions.clearSelectedItems());
   },
diff --git a/src/app/store/slices/storage/storage.thunks/downloadFileThunk.ts b/src/app/store/slices/storage/storage.thunks/downloadFileThunk.ts
index 2028be3fc..82453fb65 100644
--- a/src/app/store/slices/storage/storage.thunks/downloadFileThunk.ts
+++ b/src/app/store/slices/storage/storage.thunks/downloadFileThunk.ts
@@ -15,7 +15,7 @@ import dateService from '../../../../core/services/date.service';
 import { DriveItemBlobData } from '../../../../database/services/database.service';
 import { getDatabaseFileSourceData } from '../../../../drive/services/database.service';
 import { ConnectionLostError } from '../../../../network/requests';
-import { sessionSelectors } from '../../session/session.selectors';
+import workspacesSelectors from '../../workspaces/workspaces.selectors';
 import { StorageState } from '../storage.model';
 
 interface DownloadFileThunkOptions {
@@ -58,9 +58,10 @@ export const checkIfCachedSourceIsOlder = ({
 export const downloadFileThunk = createAsyncThunk<void, DownloadFileThunkPayload, { state: RootState }>(
   'storage/downloadFile',
   async (payload: DownloadFileThunkPayload, { getState, rejectWithValue }) => {
+    const selectedWorkspace = workspacesSelectors.getSelectedWorkspace(getState());
     const file = payload.file;
     const options = { ...defaultDownloadFileThunkOptions, ...payload.options };
-    const isTeam: boolean = sessionSelectors.isTeam(getState());
+    const isWorkspace = !!selectedWorkspace;
     const task = tasksService.findTask(options.taskId);
     const updateProgressCallback = (progress: number) => {
       if (task?.status !== TaskStatus.Cancelled) {
@@ -114,7 +115,7 @@ export const downloadFileThunk = createAsyncThunk<void, DownloadFileThunkPayload
       } else {
         await downloadService.downloadFile(
           file,
-          isTeam,
+          isWorkspace,
           updateProgressCallback,
           abortController,
           options.sharingOptions,
diff --git a/src/app/store/slices/storage/storage.thunks/downloadFolderThunk.ts b/src/app/store/slices/storage/storage.thunks/downloadFolderThunk.ts
index 172dbeb2a..0b921a22a 100644
--- a/src/app/store/slices/storage/storage.thunks/downloadFolderThunk.ts
+++ b/src/app/store/slices/storage/storage.thunks/downloadFolderThunk.ts
@@ -13,6 +13,7 @@ import { RootState } from '../../..';
 import downloadFolderUsingBlobs from '../../../../drive/services/download.service/downloadFolder/downloadFolderUsingBlobs';
 import { DriveFileData, DriveFolderData } from '../../../../drive/types';
 import { ConnectionLostError } from '../../../../network/requests';
+import workspacesSelectors from '../../workspaces/workspaces.selectors';
 import { StorageState } from '../storage.model';
 
 interface DownloadFolderThunkOptions {
@@ -23,8 +24,8 @@ interface DownloadFolderThunkOptions {
 
 interface DownloadFolderThunkPayload {
   folder: DriveFolderData;
-  fileIterator: (directoryId: number) => Iterator<DriveFileData>;
-  folderIterator: (directoryId: number) => Iterator<DriveFolderData>;
+  fileIterator: (directoryId: number, directoryUUID: string, workspaceId?: string) => Iterator<DriveFileData>;
+  folderIterator: (directoryId: number, directoryUUID: string, workspaceId?: string) => Iterator<DriveFolderData>;
   options: DownloadFolderThunkOptions;
 }
 
@@ -36,7 +37,10 @@ const defaultDownloadFolderThunkOptions = {
 // TODO: Enable compatibility for this functionality on Teams
 export const downloadFolderThunk = createAsyncThunk<void, DownloadFolderThunkPayload, { state: RootState }>(
   'storage/downloadFolder',
-  async (payload: DownloadFolderThunkPayload, { rejectWithValue }) => {
+  async (payload: DownloadFolderThunkPayload, { rejectWithValue, getState }) => {
+    const state = getState();
+    const selectedWorkspace = workspacesSelectors.getSelectedWorkspace(state);
+    const workspaceCredentials = workspacesSelectors.getWorkspaceCredentials(state);
     const folder = payload.folder;
     const options = { ...defaultDownloadFolderThunkOptions, ...payload.options };
     const task = tasksService.findTask(options.taskId);
@@ -82,16 +86,31 @@ export const downloadFolderThunk = createAsyncThunk<void, DownloadFolderThunkPay
       });
 
       if (isFirefox) {
-        await downloadFolderUsingBlobs({ folder, updateProgressCallback });
+        await downloadFolderUsingBlobs({ folder, updateProgressCallback, isWorkspace: !!selectedWorkspace });
       } else {
+        const existSelectedWorkspace = !!selectedWorkspace;
+        const credentials = existSelectedWorkspace
+          ? {
+              credentials: {
+                user: workspaceCredentials?.credentials.networkUser,
+                pass: workspaceCredentials?.credentials.networkPass,
+              },
+              workspaceId: selectedWorkspace?.workspace.id,
+              mnemonic: selectedWorkspace.workspaceUser.key,
+            }
+          : undefined;
         await folderService.downloadFolderAsZip(
           folder.id,
           folder.name,
+          folder.uuid,
           payload.folderIterator,
           payload.fileIterator,
           (progress) => {
             updateProgressCallback(progress);
           },
+          {
+            ...credentials,
+          },
         );
       }
 
diff --git a/src/app/store/slices/storage/storage.thunks/downloadItemsThunk.ts b/src/app/store/slices/storage/storage.thunks/downloadItemsThunk.ts
index a10524f5a..feeb74f7c 100644
--- a/src/app/store/slices/storage/storage.thunks/downloadItemsThunk.ts
+++ b/src/app/store/slices/storage/storage.thunks/downloadItemsThunk.ts
@@ -20,6 +20,7 @@ import { RootState } from '../../..';
 import { TrackingPlan } from '../../../../analytics/TrackingPlan';
 import analyticsService from '../../../../analytics/services/analytics.service';
 import folderService, { createFilesIterator, createFoldersIterator } from '../../../../drive/services/folder.service';
+import workspacesSelectors from '../../workspaces/workspaces.selectors';
 import { StorageState } from '../storage.model';
 import { checkIfCachedSourceIsOlder } from './downloadFileThunk';
 
@@ -33,7 +34,11 @@ type DownloadItemsThunkPayload = (DriveItemData & {
 
 export const downloadItemsThunk = createAsyncThunk<void, DownloadItemsThunkPayload, { state: RootState }>(
   'storage/downloadItems',
-  async (items: DownloadItemsThunkPayload, { dispatch, requestId, rejectWithValue }) => {
+  async (items: DownloadItemsThunkPayload, { dispatch, requestId, rejectWithValue, getState }) => {
+    const state = getState();
+    const selectedWorkspace = workspacesSelectors.getSelectedWorkspace(state);
+    const workspaceCredentials = workspacesSelectors.getWorkspaceCredentials(state);
+
     if (items.length > 1) {
       await dispatch(
         downloadItemsAsZipThunk({ items, fileIterator: createFilesIterator, folderIterator: createFoldersIterator }),
@@ -97,10 +102,20 @@ export const downloadItemsThunk = createAsyncThunk<void, DownloadItemsThunkPaylo
       } else {
         const isSharedFile = !!item.sharingOptions;
         if (isSharedFile && item.sharingOptions) {
+          const isWorkspace = !!selectedWorkspace;
+          const sharingOptions = isWorkspace
+            ? {
+                credentials: {
+                  user: workspaceCredentials?.credentials?.networkUser,
+                  pass: workspaceCredentials?.credentials.networkPass,
+                },
+                mnemonic: selectedWorkspace?.workspaceUser.key,
+              }
+            : undefined;
           await dispatch(
             storageThunks.downloadFileThunk({
               file: item as DriveFileData,
-              options: { taskId, sharingOptions: item.sharingOptions },
+              options: { taskId, sharingOptions: sharingOptions ?? item.sharingOptions },
             }),
           );
         } else {
@@ -134,8 +149,8 @@ type DownloadItemsAsZipThunkType = {
   sharedFolderName?: string;
 };
 
-type FolderIterator = (directoryId: number) => Iterator<DriveFolderData>;
-type FileIterator = (directoryId: number) => Iterator<DriveFileData>;
+type FolderIterator = (directoryId: number, directoryUUID: string, workspaceId?: string) => Iterator<DriveFolderData>;
+type FileIterator = (directoryId: number, directoryUUID: string, workspaceId?: string) => Iterator<DriveFileData>;
 
 type SharedFolderIterator = (directoryId: string, resourcesToken) => Iterator<SharedFolders>;
 type SharedFileIterator = (directoryId: string, resourcesToken) => Iterator<SharedFiles>;
@@ -144,8 +159,11 @@ export const downloadItemsAsZipThunk = createAsyncThunk<void, DownloadItemsAsZip
   'storage/downloadItemsAsZip',
   async (
     { items, credentials, mnemonic, existingTaskId, folderIterator, fileIterator, areSharedItems, sharedFolderName },
-    { rejectWithValue },
+    { rejectWithValue, getState },
   ) => {
+    const state = getState();
+    const selectedWorkspace = workspacesSelectors.getSelectedWorkspace(state);
+    const workspaceCredentials = workspacesSelectors.getWorkspaceCredentials(state);
     const errors: unknown[] = [];
     const lruFilesCacheManager = await LRUFilesCacheManager.getInstance();
     const downloadProgress: number[] = [];
@@ -154,8 +172,14 @@ export const downloadItemsAsZipThunk = createAsyncThunk<void, DownloadItemsAsZip
     const folderName = sharedFolderName ?? `Internxt (${formattedDate})`;
     const folder = new FlatFolderZip(folderName, {});
 
+    const workspaceCredentialsForOptions = workspaceCredentials?.credentials.networkUser
+      ? {
+          user: workspaceCredentials?.credentials.networkUser,
+          pass: workspaceCredentials?.credentials.networkPass,
+        }
+      : undefined;
     const moreOptions = {
-      credentials,
+      credentials: workspaceCredentialsForOptions ?? credentials,
       mnemonic,
     };
 
@@ -237,20 +261,26 @@ export const downloadItemsAsZipThunk = createAsyncThunk<void, DownloadItemsAsZip
                 downloadProgress[index] = progress;
                 updateProgressCallback(calculateProgress());
               },
-              driveItem.uuid as string,
+              driveItem.uuid,
               { destination: folder, closeWhenFinished: false, ...moreOptions },
             );
           } else {
             await folderService.downloadFolderAsZip(
               driveItem.id,
               driveItem.name,
+              driveItem.uuid,
               folderIterator as FolderIterator,
               fileIterator as FileIterator,
               (progress) => {
                 downloadProgress[index] = progress;
                 updateProgressCallback(calculateProgress());
               },
-              { destination: folder, closeWhenFinished: false, ...moreOptions },
+              {
+                destination: folder,
+                closeWhenFinished: false,
+                ...moreOptions,
+                workspaceId: selectedWorkspace?.workspace.id,
+              },
             );
           }
           downloadProgress[index] = 1;
@@ -260,7 +290,7 @@ export const downloadItemsAsZipThunk = createAsyncThunk<void, DownloadItemsAsZip
           const isCachedFileOlder = checkIfCachedSourceIsOlder({ cachedFile, file: driveItem });
 
           if (cachedFile?.source && !isCachedFileOlder) {
-            const blob = cachedFile.source as Blob;
+            const blob = cachedFile.source;
             downloadProgress[index] = 1;
             fileStream = blob.stream();
           } else {
@@ -281,10 +311,10 @@ export const downloadItemsAsZipThunk = createAsyncThunk<void, DownloadItemsAsZip
               fileId: driveItem.fileId,
               bucketId: driveItem.bucket,
               creds: {
-                user: credentials?.user || user.bridgeUser,
-                pass: credentials?.pass || user.userId,
+                user: workspaceCredentials?.credentials.networkUser ?? credentials?.user ?? user.bridgeUser,
+                pass: workspaceCredentials?.credentials.networkPass ?? credentials?.pass ?? user.userId,
               },
-              mnemonic: mnemonic || user.mnemonic,
+              mnemonic: selectedWorkspace?.workspaceUser.key ?? mnemonic ?? user.mnemonic,
               options: {
                 abortController,
                 notifyProgress: (totalBytes, downloadedBytes) => {
diff --git a/src/app/store/slices/storage/storage.thunks/fetchDialogContentThunk.ts b/src/app/store/slices/storage/storage.thunks/fetchDialogContentThunk.ts
index 6f4d434f8..589caa208 100644
--- a/src/app/store/slices/storage/storage.thunks/fetchDialogContentThunk.ts
+++ b/src/app/store/slices/storage/storage.thunks/fetchDialogContentThunk.ts
@@ -1,20 +1,25 @@
 import { ActionReducerMapBuilder, createAsyncThunk } from '@reduxjs/toolkit';
 import _ from 'lodash';
 
+import { t } from 'i18next';
 import { storageActions } from '..';
 import { RootState } from '../../..';
-import { StorageState } from '../storage.model';
-import notificationsService, { ToastType } from '../../../../notifications/services/notifications.service';
-import databaseService, { DatabaseCollection } from '../../../../database/services/database.service';
-import { DriveItemData } from '../../../../drive/types';
 import { SdkFactory } from '../../../../core/factory/sdk';
-import { t } from 'i18next';
+import databaseService, { DatabaseCollection } from '../../../../database/services/database.service';
+import { DriveFolderData, DriveItemData } from '../../../../drive/types';
+import notificationsService, { ToastType } from '../../../../notifications/services/notifications.service';
+import workspacesSelectors from '../../workspaces/workspaces.selectors';
+import { StorageState } from '../storage.model';
 
-export const fetchDialogContentThunk = createAsyncThunk<void, number, { state: RootState }>(
+export const fetchDialogContentThunk = createAsyncThunk<void, string, { state: RootState }>(
   'storage/fetchDialogContentThunk',
-  async (folderId, { dispatch }) => {
-    const storageClient = SdkFactory.getInstance().createStorageClient();
-    const [responsePromise] = storageClient.getFolderContent(folderId);
+  async (folderId, { dispatch, getState }) => {
+    const state = getState();
+    const workspaceCredentials = workspacesSelectors.getWorkspaceCredentials(state);
+
+    const storageClient = SdkFactory.getNewApiInstance().createNewStorageClient();
+
+    const [responsePromise] = storageClient.getFolderContentByUuid(folderId, false, workspaceCredentials?.tokenHeader);
     const databaseContent = await databaseService.get<DatabaseCollection.MoveDialogLevels>(
       DatabaseCollection.MoveDialogLevels,
       folderId,
@@ -30,7 +35,11 @@ export const fetchDialogContentThunk = createAsyncThunk<void, number, { state: R
     }
 
     await responsePromise.then(async (response) => {
-      const folders = response.children.map((folder) => ({ ...folder, isFolder: true }));
+      const folders = response.children.map((folder) => ({
+        ...folder,
+        isFolder: true,
+        name: (folder as DriveFolderData).plainName,
+      }));
       const items = _.concat(folders as DriveItemData[], response.files as DriveItemData[]);
       dispatch(
         storageActions.setMoveDialogItems({
diff --git a/src/app/store/slices/storage/storage.thunks/fetchFolderContentThunk.ts b/src/app/store/slices/storage/storage.thunks/fetchFolderContentThunk.ts
index 07daec264..63ecee403 100644
--- a/src/app/store/slices/storage/storage.thunks/fetchFolderContentThunk.ts
+++ b/src/app/store/slices/storage/storage.thunks/fetchFolderContentThunk.ts
@@ -1,14 +1,13 @@
 import { ActionReducerMapBuilder, createAsyncThunk } from '@reduxjs/toolkit';
-import _ from 'lodash';
 
 import { t } from 'i18next';
 import { storageActions } from '..';
 import { RootState } from '../../..';
 import { SdkFactory } from '../../../../core/factory/sdk';
 import errorService from '../../../../core/services/error.service';
-import databaseService, { DatabaseCollection } from '../../../../database/services/database.service';
 import { DriveItemData } from '../../../../drive/types';
 import notificationsService, { ToastType } from '../../../../notifications/services/notifications.service';
+import workspacesSelectors from '../../workspaces/workspaces.selectors';
 import { StorageState } from '../storage.model';
 
 const DEFAULT_LIMIT = 50;
@@ -16,10 +15,12 @@ const DEFAULT_LIMIT = 50;
 const filterFolderItems = (item: DriveItemData) => item.isFolder;
 const filterFilesItems = (item: DriveItemData) => !item.isFolder;
 
-export const fetchPaginatedFolderContentThunk = createAsyncThunk<void, number, { state: RootState }>(
+export const fetchPaginatedFolderContentThunk = createAsyncThunk<void, string, { state: RootState }>(
   'storage/fetchFolderContent',
   async (folderId, { getState, dispatch }) => {
     const storageState = getState().storage;
+    const selectedWorkspace = workspacesSelectors.getSelectedWorkspace(getState());
+
     const hasMoreDriveFolders = storageState.hasMoreDriveFolders[folderId] ?? true;
     const hasMoreDriveFiles = storageState.hasMoreDriveFiles[folderId] ?? true;
 
@@ -29,36 +30,75 @@ export const fetchPaginatedFolderContentThunk = createAsyncThunk<void, number, {
     const driveItemsOrder = storageState.driveItemsOrder;
 
     if (foldersOffset === 0 && filesOffset === 0) dispatch(storageActions.resetOrder());
-
     try {
-      const storageClient = SdkFactory.getNewApiInstance().createNewStorageClient();
       let itemsPromise;
 
+      const storageClient = SdkFactory.getNewApiInstance().createNewStorageClient();
+      const workspaceClient = SdkFactory.getNewApiInstance().createWorkspacesClient();
+
       if (hasMoreDriveFolders) {
-        [itemsPromise] = storageClient.getFolderFolders(
-          folderId,
-          foldersOffset,
-          DEFAULT_LIMIT,
-          driveItemsSort,
-          driveItemsOrder,
-        );
+        if (selectedWorkspace) {
+          const workspaceId = selectedWorkspace.workspace.id;
+          [itemsPromise] = workspaceClient.getFolders(
+            workspaceId ?? '',
+            folderId,
+            foldersOffset,
+            DEFAULT_LIMIT,
+            driveItemsSort,
+            driveItemsOrder,
+          );
+        } else {
+          [itemsPromise] = storageClient.getFolderFoldersByUuid(
+            folderId,
+            foldersOffset,
+            DEFAULT_LIMIT,
+            driveItemsSort,
+            driveItemsOrder,
+          );
+        }
       } else if (hasMoreDriveFiles) {
-        [itemsPromise] = storageClient.getFolderFiles(
-          folderId,
-          filesOffset,
-          DEFAULT_LIMIT,
-          driveItemsSort,
-          driveItemsOrder,
-        );
+        if (selectedWorkspace) {
+          const workspaceId = selectedWorkspace.workspace.id;
+          [itemsPromise] = workspaceClient.getFiles(
+            workspaceId ?? '',
+            folderId,
+            filesOffset,
+            DEFAULT_LIMIT,
+            driveItemsSort,
+            driveItemsOrder,
+          );
+        } else {
+          [itemsPromise] = storageClient.getFolderFilesByUuid(
+            folderId,
+            filesOffset,
+            DEFAULT_LIMIT,
+            driveItemsSort,
+            driveItemsOrder,
+          );
+        }
       } else {
         return;
       }
-      const items = await itemsPromise;
+      const itemsUnparsed = await itemsPromise;
+      let parsedItems;
+      let itemslength;
+
+      if (hasMoreDriveFolders) {
+        const items = selectedWorkspace ? itemsUnparsed.result : itemsUnparsed.folders;
+
+        parsedItems = items.map(
+          (item) => ({ ...item, isFolder: hasMoreDriveFolders, name: item.plainName } as DriveItemData),
+        );
+        itemslength = items.length;
+      } else if (!hasMoreDriveFolders) {
+        const items = selectedWorkspace ? itemsUnparsed.result : itemsUnparsed.files;
+
+        parsedItems = items.map(
+          (item) => ({ ...item, isFolder: hasMoreDriveFolders, name: item.plainName } as DriveItemData),
+        );
+        itemslength = items.length;
+      }
 
-      const parsedItems = items.result.map(
-        (item) => ({ ...item, isFolder: hasMoreDriveFolders, name: item.plainName } as DriveItemData),
-      );
-      const itemslength = items.result.length;
       const areLastItems = itemslength < DEFAULT_LIMIT;
 
       dispatch(storageActions.addItems({ folderId, items: parsedItems }));
@@ -77,41 +117,41 @@ export const fetchPaginatedFolderContentThunk = createAsyncThunk<void, number, {
   },
 );
 
-export const fetchFolderContentThunk = createAsyncThunk<void, number, { state: RootState }>(
-  'storage/fetchFolderContent',
-  async (folderId, { dispatch }) => {
-    const storageClient = SdkFactory.getInstance().createStorageClient();
-    const [responsePromise] = storageClient.getFolderContent(folderId);
-    const databaseContent = await databaseService.get<DatabaseCollection.Levels>(DatabaseCollection.Levels, folderId);
-
-    dispatch(storageActions.resetOrder());
-
-    if (databaseContent) {
-      dispatch(
-        storageActions.setItems({
-          folderId,
-          items: databaseContent,
-        }),
-      );
-    } else {
-      await responsePromise;
-    }
-
-    responsePromise.then((response) => {
-      const folders = response.children.map((folder) => ({ ...folder, isFolder: true }));
-      const items = _.concat(folders as DriveItemData[], response.files as DriveItemData[]);
-      const parsedItems = items.map((item) => ({ ...item, plainName: item?.plain_name }));
-
-      dispatch(
-        storageActions.setItems({
-          folderId,
-          items: parsedItems,
-        }),
-      );
-      databaseService.put(DatabaseCollection.Levels, folderId, parsedItems);
-    });
-  },
-);
+// export const fetchFolderContentThunk = createAsyncThunk<void, number, { state: RootState }>(
+//   'storage/fetchFolderContent',
+//   async (folderId, { dispatch }) => {
+//     const storageClient = SdkFactory.getInstance().createStorageClient();
+//     const [responsePromise] = storageClient.getFolderContent(folderId);
+//     const databaseContent = await databaseService.get<DatabaseCollection.Levels>(DatabaseCollection.Levels, folderId);
+
+//     dispatch(storageActions.resetOrder());
+
+//     if (databaseContent) {
+//       dispatch(
+//         storageActions.setItems({
+//           folderId,
+//           items: databaseContent,
+//         }),
+//       );
+//     } else {
+//       await responsePromise;
+//     }
+
+//     responsePromise.then((response) => {
+//       const folders = response.children.map((folder) => ({ ...folder, isFolder: true }));
+//       const items = _.concat(folders as DriveItemData[], response.files as DriveItemData[]);
+//       const parsedItems = items.map((item) => ({ ...item, plainName: item?.plain_name }));
+
+//       dispatch(
+//         storageActions.setItems({
+//           folderId,
+//           items: parsedItems,
+//         }),
+//       );
+//       databaseService.put(DatabaseCollection.Levels, folderId, parsedItems);
+//     });
+//   },
+// );
 
 export const fetchFolderContentThunkExtraReducers = (builder: ActionReducerMapBuilder<StorageState>): void => {
   builder
diff --git a/src/app/store/slices/storage/storage.thunks/fetchSortedFolderContentThunk.ts b/src/app/store/slices/storage/storage.thunks/fetchSortedFolderContentThunk.ts
index 4f0b7412a..f036fc98d 100644
--- a/src/app/store/slices/storage/storage.thunks/fetchSortedFolderContentThunk.ts
+++ b/src/app/store/slices/storage/storage.thunks/fetchSortedFolderContentThunk.ts
@@ -7,17 +7,20 @@ import { SdkFactory } from '../../../../core/factory/sdk';
 import errorService from '../../../../core/services/error.service';
 import { DriveItemData } from '../../../../drive/types';
 import notificationsService, { ToastType } from '../../../../notifications/services/notifications.service';
+import workspacesSelectors from '../../workspaces/workspaces.selectors';
 import { StorageState } from '../storage.model';
 
 const DEFAULT_LIMIT = 50;
 
-export const fetchSortedFolderContentThunk = createAsyncThunk<void, number, { state: RootState }>(
+export const fetchSortedFolderContentThunk = createAsyncThunk<void, string, { state: RootState }>(
   'storage/fetchSortedFolderContentThunk',
   async (folderId, { getState, dispatch }) => {
     dispatch(storageActions.setHasMoreDriveFolders({ folderId, status: true }));
     dispatch(storageActions.setHasMoreDriveFiles({ folderId, status: true }));
 
     const storageState = getState().storage;
+    const selectedWorkspace = workspacesSelectors.getSelectedWorkspace(getState());
+
     const hasMoreDriveFolders = storageState.hasMoreDriveFolders;
     const hasMoreDriveFiles = storageState.hasMoreDriveFiles;
     const foldersOffset = 0;
@@ -29,41 +32,70 @@ export const fetchSortedFolderContentThunk = createAsyncThunk<void, number, { st
       dispatch(storageActions.setIsLoadingFolder({ folderId, value: true }));
       dispatch(storageActions.setItems({ folderId, items: [] }));
       const storageClient = SdkFactory.getNewApiInstance().createNewStorageClient();
+      const workspaceClient = SdkFactory.getNewApiInstance().createWorkspacesClient();
+
       let folderPromise;
 
       if (hasMoreDriveFolders) {
-        [folderPromise] = await storageClient.getFolderFolders(
-          folderId,
-          foldersOffset,
-          DEFAULT_LIMIT,
-          driveItemsSort,
-          driveItemsOrder,
-        );
+        if (selectedWorkspace) {
+          const workspaceId = selectedWorkspace.workspace.id;
+          [folderPromise] = workspaceClient.getFolders(
+            workspaceId ?? '',
+            folderId,
+            foldersOffset,
+            DEFAULT_LIMIT,
+            driveItemsSort,
+            driveItemsOrder,
+          );
+        } else {
+          [folderPromise] = await storageClient.getFolderFoldersByUuid(
+            folderId,
+            foldersOffset,
+            DEFAULT_LIMIT,
+            driveItemsSort,
+            driveItemsOrder,
+          );
+        }
       }
 
-      const itemsFolder = await folderPromise;
-
-      const parsedItemsFolder = itemsFolder.result.map(
+      const itemsFolderUnparsed = await folderPromise;
+      const itemsFolder = selectedWorkspace ? itemsFolderUnparsed.result : itemsFolderUnparsed.folders;
+      const parsedItemsFolder = itemsFolder.map(
         (item) => ({ ...item, isFolder: true, name: item.plainName } as DriveItemData),
       );
+      const areLastFolders = itemsFolder.length < DEFAULT_LIMIT;
+      dispatch(storageActions.setHasMoreDriveFolders({ folderId, status: !areLastFolders }));
 
       let filesPromise;
 
       if (hasMoreDriveFiles) {
-        [filesPromise] = await storageClient.getFolderFiles(
-          folderId,
-          filesOffset,
-          DEFAULT_LIMIT,
-          driveItemsSort,
-          driveItemsOrder,
-        );
+        if (selectedWorkspace) {
+          const workspaceId = selectedWorkspace.workspace.id;
+          [filesPromise] = workspaceClient.getFiles(
+            workspaceId ?? '',
+            folderId,
+            filesOffset,
+            DEFAULT_LIMIT,
+            driveItemsSort,
+            driveItemsOrder,
+          );
+        } else {
+          [filesPromise] = await storageClient.getFolderFilesByUuid(
+            folderId,
+            filesOffset,
+            DEFAULT_LIMIT,
+            driveItemsSort,
+            driveItemsOrder,
+          );
+        }
       }
-      const itemsFiles = await filesPromise;
-
-      const parsedItemsFiles = itemsFiles.result.map(
+      const itemsFilesUnparsed = await filesPromise;
+      const itemsFiles = selectedWorkspace ? itemsFilesUnparsed.result : itemsFilesUnparsed.files;
+      const parsedItemsFiles = itemsFiles.map(
         (item) => ({ ...item, isFolder: false, name: item.plainName } as DriveItemData),
       );
-
+      const areLastFiles = itemsFiles.length < DEFAULT_LIMIT;
+      dispatch(storageActions.setHasMoreDriveFiles({ folderId, status: !areLastFiles }));
       const items = parsedItemsFolder.concat(parsedItemsFiles);
 
       dispatch(storageActions.setItems({ folderId, items: items }));
diff --git a/src/app/store/slices/storage/storage.thunks/goToFolderThunk.ts b/src/app/store/slices/storage/storage.thunks/goToFolderThunk.ts
index 694bf3091..b99aebb6b 100644
--- a/src/app/store/slices/storage/storage.thunks/goToFolderThunk.ts
+++ b/src/app/store/slices/storage/storage.thunks/goToFolderThunk.ts
@@ -20,6 +20,8 @@ const parsePathNames = (breadcrumbsList: FolderAncestor[]) => {
 };
 
 export const getAncestorsAndSetNamePath = async (uuid: string, dispatch) => {
+  // TODO: FOR WORKSPACES IT IS NOT WORKING PROPERLY
+  // CHECK HOW IT WORKS IN WORKSPACES AND IN THE PERSONAL DRIVE TO COMPARE AND SEE THE DIFFERENCE
   const breadcrumbsList: FolderAncestor[] = await newStorageService.getFolderAncestors(uuid);
   const fullPathParsedNames = parsePathNames(breadcrumbsList);
   dispatch(storageActions.setNamePath(fullPathParsedNames));
@@ -30,25 +32,26 @@ export const goToFolderThunk = createAsyncThunk<void, FolderPath, { state: RootS
   async (path: FolderPath, { getState, dispatch }) => {
     const state = getState();
     const currentPath = state.storage.currentPath;
-    if (currentPath.id === path.id) {
+    if (currentPath.uuid === path.uuid) {
       // no need to go to the same folder
       return;
     }
 
-    dispatch(storageActions.setHasMoreDriveFolders({ folderId: path.id, status: true }));
-    dispatch(storageActions.setHasMoreDriveFiles({ folderId: path.id, status: true }));
-    dispatch(storageActions.clearCurrentThumbnailItems({ folderId: path.id }));
-    const isInNamePath: boolean = storageSelectors.isFolderInNamePath(getState())(path.id);
+    dispatch(storageActions.setHasMoreDriveFolders({ folderId: path.uuid, status: true }));
+    dispatch(storageActions.setHasMoreDriveFiles({ folderId: path.uuid, status: true }));
+    dispatch(storageActions.clearCurrentThumbnailItems({ folderId: path.uuid }));
+    const isInNamePath: boolean = storageSelectors.isFolderInNamePath(getState())(path.uuid);
 
     dispatch(storageActions.clearSelectedItems());
 
     dispatch(storageActions.resetDrivePagination());
-    dispatch(storageActions.resetLevelsFoldersLength({ folderId: path.id }));
+    dispatch(storageActions.resetLevelsFoldersLength({ folderId: path.uuid }));
 
     isInNamePath ? dispatch(storageActions.popNamePathUpTo(path)) : dispatch(storageActions.pushNamePath(path));
 
     dispatch(uiActions.setFileInfoItem(null));
     dispatch(uiActions.setIsDriveItemInfoMenuOpen(false));
+
     dispatch(storageActions.setCurrentPath(path));
 
     if (path.uuid && !isInNamePath) {
diff --git a/src/app/store/slices/storage/storage.thunks/moveItemsThunk.ts b/src/app/store/slices/storage/storage.thunks/moveItemsThunk.ts
index e1386c9c9..270468f8e 100644
--- a/src/app/store/slices/storage/storage.thunks/moveItemsThunk.ts
+++ b/src/app/store/slices/storage/storage.thunks/moveItemsThunk.ts
@@ -1,36 +1,36 @@
 import { ActionReducerMapBuilder, createAsyncThunk } from '@reduxjs/toolkit';
 
-import { StorageState } from '../storage.model';
-import { storageActions } from '..';
-import { RootState } from '../../..';
-import { DriveItemData } from 'app/drive/types';
-import notificationsService, { ToastType } from 'app/notifications/services/notifications.service';
-import storageService from 'app/drive/services/storage.service';
 import databaseService, { DatabaseCollection } from 'app/database/services/database.service';
 import itemsListService from 'app/drive/services/items-list.service';
-import storageSelectors from '../storage.selectors';
-import { MoveFileTask, MoveFolderTask, TaskStatus, TaskType } from 'app/tasks/types';
+import storageService from 'app/drive/services/storage.service';
+import { DriveItemData } from 'app/drive/types';
+import notificationsService, { ToastType } from 'app/notifications/services/notifications.service';
 import tasksService from 'app/tasks/services/tasks.service';
+import { MoveFileTask, MoveFolderTask, TaskStatus, TaskType } from 'app/tasks/types';
 import { t } from 'i18next';
+import { storageActions } from '..';
+import { RootState } from '../../..';
 import errorService from '../../../../core/services/error.service';
+import { StorageState } from '../storage.model';
 
 export interface MoveItemsPayload {
   items: DriveItemData[];
-  destinationFolderId: number;
+  destinationFolderId: string;
 }
 
 export const moveItemsThunk = createAsyncThunk<void, MoveItemsPayload, { state: RootState }>(
   'storage/moveItems',
-  async (payload: MoveItemsPayload, { getState, dispatch }) => {
+  async (payload: MoveItemsPayload, { dispatch }) => {
     const { items, destinationFolderId } = payload;
     const promises: Promise<void>[] = [];
 
-    if (items.some((item) => item.isFolder && item.id === destinationFolderId)) {
-      return void notificationsService.show({ text: t('error.movingItemInsideItself'), type: ToastType.Error });
+    if (items.some((item) => item.isFolder && item.uuid === destinationFolderId)) {
+      notificationsService.show({ text: t('error.movingItemInsideItself'), type: ToastType.Error });
+      return;
     }
 
     for (const [index, item] of items.entries()) {
-      const fromFolderId = item.parentId || item.folderId;
+      const fromFolderId = item.folderUuid || item.parentUuid;
       let taskId: string;
 
       if (item.isFolder) {
@@ -51,7 +51,7 @@ export const moveItemsThunk = createAsyncThunk<void, MoveItemsPayload, { state:
         });
       }
 
-      promises.push(storageService.moveItem(item, destinationFolderId, storageSelectors.bucket(getState())));
+      promises.push(storageService.moveItem(item, destinationFolderId));
 
       promises[index]
         .then(async () => {
@@ -69,6 +69,13 @@ export const moveItemsThunk = createAsyncThunk<void, MoveItemsPayload, { state:
             }),
           );
 
+          dispatch(
+            storageActions.pushItems({
+              folderIds: [destinationFolderId],
+              items: item,
+            }),
+          );
+
           // Updates destination folder content in local database
           const destinationLevelDatabaseContent = await databaseService.get(
             DatabaseCollection.Levels,
diff --git a/src/app/store/slices/storage/storage.thunks/renameItemsThunk.ts b/src/app/store/slices/storage/storage.thunks/renameItemsThunk.ts
index a64fa25bc..10ca14ca3 100644
--- a/src/app/store/slices/storage/storage.thunks/renameItemsThunk.ts
+++ b/src/app/store/slices/storage/storage.thunks/renameItemsThunk.ts
@@ -1,20 +1,21 @@
 import { ActionReducerMapBuilder, createAsyncThunk, Dispatch } from '@reduxjs/toolkit';
 
-import { StorageState } from '../storage.model';
-import { storageActions } from '..';
-import { RootState } from '../../..';
+import renameIfNeeded from '@internxt/lib/dist/src/items/renameIfNeeded';
 import { DriveItemData } from 'app/drive/types';
-import { t } from 'i18next';
 import notificationsService, { ToastType } from 'app/notifications/services/notifications.service';
-import storageSelectors from '../storage.selectors';
-import { RenameFileTask, RenameFolderTask, TaskStatus, TaskType } from 'app/tasks/types';
 import tasksService from 'app/tasks/services/tasks.service';
-import renameFolderIfNeeded, { IRoot } from './uploadFolderThunk';
-import { uiActions } from '../../ui';
-import { SdkFactory } from '../../../../core/factory/sdk';
-import renameIfNeeded from '@internxt/lib/dist/src/items/renameIfNeeded';
+import { RenameFileTask, RenameFolderTask, TaskStatus, TaskType } from 'app/tasks/types';
+import { t } from 'i18next';
 import storageThunks from '.';
+import { storageActions } from '..';
+import { RootState } from '../../..';
+import { SdkFactory } from '../../../../core/factory/sdk';
 import errorService from '../../../../core/services/error.service';
+import { uiActions } from '../../ui';
+import workspacesSelectors from '../../workspaces/workspaces.selectors';
+import { StorageState } from '../storage.model';
+import storageSelectors from '../storage.selectors';
+import renameFolderIfNeeded, { IRoot } from './uploadFolderThunk';
 
 const checkRepeatedNameFiles = (destinationFolderFiles: DriveItemData[], files: (DriveItemData | File)[]) => {
   const repeatedFilesInDrive: DriveItemData[] = [];
@@ -98,25 +99,32 @@ export const handleRepeatedUploadingFolders = (
 
 export interface RenameItemsPayload {
   items: DriveItemData[];
-  destinationFolderId: number;
+  destinationFolderId: string;
 }
 
 export const renameItemsThunk = createAsyncThunk<void, RenameItemsPayload, { state: RootState }>(
   'storage/renameItems',
   async ({ items, destinationFolderId }: RenameItemsPayload, { getState, dispatch }) => {
     const promises: Promise<any>[] = [];
+    const state = getState();
+    const workspaceCredentials = workspacesSelectors.getWorkspaceCredentials(state);
 
-    if (items.some((item) => item.isFolder && item.id === destinationFolderId)) {
+    if (items.some((item) => item.isFolder && item.uuid === destinationFolderId)) {
       return void notificationsService.show({ text: t('error.movingItemInsideItself'), type: ToastType.Error });
     }
-    const state = getState();
+
     const currentFolderItems = storageSelectors.currentFolderItems(state);
 
     for (const [index, item] of items.entries()) {
       let itemParsed;
 
-      const storageClient = SdkFactory.getInstance().createStorageClient();
-      const [parentFolderContentPromise] = storageClient.getFolderContent(destinationFolderId);
+      const storageClient = SdkFactory.getNewApiInstance().createNewStorageClient();
+
+      const [parentFolderContentPromise] = storageClient.getFolderContentByUuid(
+        destinationFolderId,
+        false,
+        workspaceCredentials?.tokenHeader,
+      );
       const parentFolderContent = await parentFolderContentPromise;
 
       if (item.isFolder) {
diff --git a/src/app/store/slices/storage/storage.thunks/resetNamePathThunk.ts b/src/app/store/slices/storage/storage.thunks/resetNamePathThunk.ts
index 8dc3c156a..8e13e557e 100644
--- a/src/app/store/slices/storage/storage.thunks/resetNamePathThunk.ts
+++ b/src/app/store/slices/storage/storage.thunks/resetNamePathThunk.ts
@@ -10,9 +10,9 @@ export const resetNamePathThunk = createAsyncThunk<FolderPath[], void, { state:
   'storage/resetNamePath',
   async (payload: void, { getState, dispatch }) => {
     const { user } = getState().user;
-    const rootFolderId: number = storageSelectors.rootFolderId(getState());
+    const rootFolderId: string = storageSelectors.rootFolderId(getState());
     const rootFolderPath = {
-      id: rootFolderId,
+      uuid: rootFolderId,
       name: 'Drive',
     };
     dispatch(storageActions.resetNamePath());
diff --git a/src/app/store/slices/storage/storage.thunks/updateItemMetadataThunk.ts b/src/app/store/slices/storage/storage.thunks/updateItemMetadataThunk.ts
index 4285ce4f8..23df60a89 100644
--- a/src/app/store/slices/storage/storage.thunks/updateItemMetadataThunk.ts
+++ b/src/app/store/slices/storage/storage.thunks/updateItemMetadataThunk.ts
@@ -1,14 +1,13 @@
 import { ActionReducerMapBuilder, createAsyncThunk } from '@reduxjs/toolkit';
 
-import { StorageState } from '../storage.model';
-import { storageActions } from '..';
-import { RootState } from '../../..';
-import { DriveFileMetadataPayload, DriveFolderMetadataPayload, DriveItemData } from 'app/drive/types';
 import fileService from 'app/drive/services/file.service';
 import folderService from 'app/drive/services/folder.service';
-import { t } from 'i18next';
+import { DriveFileMetadataPayload, DriveFolderMetadataPayload, DriveItemData } from 'app/drive/types';
 import notificationsService, { ToastType } from 'app/notifications/services/notifications.service';
-import storageSelectors from '../storage.selectors';
+import { t } from 'i18next';
+import { storageActions } from '..';
+import { RootState } from '../../..';
+import { StorageState } from '../storage.model';
 
 export const updateItemMetadataThunk = createAsyncThunk<
   void,
@@ -25,18 +24,19 @@ export const updateItemMetadataThunk = createAsyncThunk<
     { dispatch, getState },
   ) => {
     const { item, metadata, resourceToken } = payload;
-    const namePath = getState().storage.namePath;
+    const state = getState();
+    const namePath = state.storage.namePath;
     const namePathDestinationArray = namePath.map((level) => level.name);
     namePathDestinationArray[0] = '';
 
     item.isFolder
-      ? await folderService.updateMetaData(item.id, metadata)
-      : await fileService.updateMetaData(item.fileId, metadata, storageSelectors.bucket(getState()), resourceToken);
+      ? await folderService.updateMetaData(item.uuid, metadata)
+      : await fileService.updateMetaData(item.uuid, metadata, resourceToken);
 
     dispatch(
       storageActions.patchItem({
-        id: item.id,
-        folderId: item.isFolder ? item.parentId : item.folderId,
+        uuid: item.uuid,
+        folderId: item.isFolder ? item.parentUuid : item.folderUuid,
         isFolder: item.isFolder,
         patch: {
           name: payload.metadata.itemName,
@@ -53,6 +53,7 @@ export const updateItemMetadataThunkExtraReducers = (builder: ActionReducerMapBu
     .addCase(updateItemMetadataThunk.pending, () => undefined)
     .addCase(updateItemMetadataThunk.fulfilled, () => undefined)
     .addCase(updateItemMetadataThunk.rejected, (state, action) => {
+      console.log({ action });
       const errorMessage = (action.error?.message || '').includes('this name exists')
         ? t('error.fileAlreadyExists')
         : t('error.changingName');
diff --git a/src/app/store/slices/storage/storage.thunks/uploadFolderThunk.ts b/src/app/store/slices/storage/storage.thunks/uploadFolderThunk.ts
index 0ac9eedbf..fed082bb7 100644
--- a/src/app/store/slices/storage/storage.thunks/uploadFolderThunk.ts
+++ b/src/app/store/slices/storage/storage.thunks/uploadFolderThunk.ts
@@ -1,4 +1,4 @@
-import { ActionReducerMapBuilder, createAsyncThunk } from '@reduxjs/toolkit';
+import { ActionReducerMapBuilder, AnyAction, ThunkDispatch, createAsyncThunk } from '@reduxjs/toolkit';
 
 import { t } from 'i18next';
 import storageThunks from '.';
@@ -10,13 +10,14 @@ import notificationsService, { ToastType } from '../../../../notifications/servi
 import tasksService from '../../../../tasks/services/tasks.service';
 import { TaskStatus, TaskType, UploadFolderTask } from '../../../../tasks/types';
 import { planThunks } from '../../plan';
+import workspacesSelectors from '../../workspaces/workspaces.selectors';
 import { StorageState } from '../storage.model';
 import { deleteItemsThunk } from './deleteItemsThunk';
 import { uploadItemsParallelThunk } from './uploadItemsThunk';
 
 export interface IRoot {
   name: string;
-  folderId: number | null;
+  folderId: string | null;
   childrenFiles: File[];
   childrenFolders: IRoot[];
   fullPathEdited: string;
@@ -24,7 +25,7 @@ export interface IRoot {
 
 interface UploadFolderThunkPayload {
   root: IRoot;
-  currentFolderId: number;
+  currentFolderId: string;
   options?: {
     taskId?: string;
     withNotification?: boolean;
@@ -32,9 +33,9 @@ interface UploadFolderThunkPayload {
   };
 }
 
-const handleFoldersRename = async (root: IRoot, currentFolderId: number) => {
-  const storageClient = SdkFactory.getInstance().createStorageClient();
-  const [parentFolderContentPromise] = storageClient.getFolderContent(currentFolderId);
+const handleFoldersRename = async (root: IRoot, currentFolderId: string, tokenHeader?: string) => {
+  const storageClient = SdkFactory.getNewApiInstance().createNewStorageClient();
+  const [parentFolderContentPromise] = storageClient.getFolderContentByUuid(currentFolderId, false, tokenHeader);
   const parentFolderContent = await parentFolderContentPromise;
   const [, , finalFilename] = renameFolderIfNeeded(parentFolderContent.children, root.name);
   const fileContent: IRoot = { ...root, name: finalFilename };
@@ -45,17 +46,46 @@ const wait = (ms: number): Promise<void> => {
   return new Promise((resolve) => setTimeout(resolve, ms));
 };
 
+const stopUploadTask = async (
+  uploadFolderAbortController: AbortController,
+  dispatch: ThunkDispatch<RootState, unknown, AnyAction>,
+  relatedTaskId?: string,
+  rootFolderItem?: DriveFolderData,
+) => {
+  uploadFolderAbortController.abort();
+  const relatedTasks = tasksService.getTasks({ relatedTaskId });
+  const promises: Promise<void>[] = [];
+
+  // Cancels related tasks
+  promises.push(
+    ...(relatedTasks.map((task) => task.stop?.()).filter((promise) => promise !== undefined) as Promise<void>[]),
+  );
+  // Deletes the root folder
+  if (rootFolderItem) {
+    promises.push(dispatch(deleteItemsThunk([rootFolderItem as DriveItemData])).unwrap());
+    const storageClient = SdkFactory.getInstance().createStorageClient();
+    promises.push(storageClient.deleteFolder(rootFolderItem.id) as Promise<void>);
+  }
+  await Promise.all(promises);
+};
+
 export const uploadFolderThunk = createAsyncThunk<void, UploadFolderThunkPayload, { state: RootState }>(
   'storage/createFolderStructure',
-  async ({ root, currentFolderId, options }, { dispatch, requestId }) => {
-    options = Object.assign({ withNotification: true }, options || {});
+  async ({ root, currentFolderId, options }, { dispatch, requestId, getState }) => {
+    const state = getState();
+    const workspaceCredentials = workspacesSelectors.getWorkspaceCredentials(state);
+
+    const workspaceSelected = workspacesSelectors.getSelectedWorkspace(state);
+    const memberId = workspaceSelected?.workspaceUser?.memberId;
+
+    options = { withNotification: true, ...options };
     const uploadFolderAbortController = new AbortController();
 
     let alreadyUploaded = 0;
     let rootFolderItem: DriveFolderData | undefined;
     let rootFolderData: DriveFolderData | undefined;
 
-    const renamedRoot = await handleFoldersRename(root, currentFolderId);
+    const renamedRoot = await handleFoldersRename(root, currentFolderId, workspaceCredentials?.tokenHeader);
     const levels = [renamedRoot];
 
     const itemsUnderRoot = countItemsUnderRoot(renamedRoot);
@@ -107,7 +137,7 @@ export const uploadFolderThunk = createAsyncThunk<void, UploadFolderThunkPayload
         const level: IRoot = levels.shift() as IRoot;
         const createdFolder = await dispatch(
           storageThunks.createFolderThunk({
-            parentFolderId: level.folderId as number,
+            parentFolderId: level.folderId as string,
             folderName: level.name,
             options: { relatedTaskId: taskId, showErrors: false },
           }),
@@ -121,25 +151,7 @@ export const uploadFolderThunk = createAsyncThunk<void, UploadFolderThunkPayload
           tasksService.updateTask({
             taskId,
             merge: {
-              stop: async () => {
-                uploadFolderAbortController.abort();
-                const relatedTasks = tasksService.getTasks({ relatedTaskId: taskId });
-                const promises: Promise<void>[] = [];
-
-                // Cancels related tasks
-                promises.push(
-                  ...(relatedTasks
-                    .map((task) => task.stop?.())
-                    .filter((promise) => promise !== undefined) as Promise<void>[]),
-                );
-                // Deletes the root folder
-                if (rootFolderItem) {
-                  promises.push(dispatch(deleteItemsThunk([rootFolderItem as DriveItemData])).unwrap());
-                  const storageClient = SdkFactory.getInstance().createStorageClient();
-                  promises.push(storageClient.deleteFolder(rootFolderItem.id) as Promise<void>);
-                }
-                await Promise.all(promises);
-              },
+              stop: () => stopUploadTask(uploadFolderAbortController, dispatch, taskId, rootFolderItem),
             },
           });
         }
@@ -148,7 +160,7 @@ export const uploadFolderThunk = createAsyncThunk<void, UploadFolderThunkPayload
           await dispatch(
             uploadItemsParallelThunk({
               files: level.childrenFiles,
-              parentFolderId: createdFolder.id,
+              parentFolderId: createdFolder.uuid,
               options: {
                 relatedTaskId: taskId,
                 showNotifications: false,
@@ -175,7 +187,7 @@ export const uploadFolderThunk = createAsyncThunk<void, UploadFolderThunkPayload
 
         const childrenFolders = [] as IRoot[];
         for (const child of level.childrenFolders) {
-          childrenFolders.push({ ...child, folderId: createdFolder.id });
+          childrenFolders.push({ ...child, folderId: createdFolder.uuid });
         }
 
         levels.push(...childrenFolders);
@@ -193,6 +205,7 @@ export const uploadFolderThunk = createAsyncThunk<void, UploadFolderThunkPayload
       options.onSuccess?.();
       setTimeout(() => {
         dispatch(planThunks.fetchUsageThunk());
+        if (memberId) dispatch(planThunks.fetchBusinessLimitUsageThunk());
       }, 1000);
     } catch (err: unknown) {
       const castedError = errorService.castError(err);
@@ -252,7 +265,7 @@ function getNextNewName(filename: string, i: number): string {
 
 const generateTaskIdForFolders = (foldersPayload: UploadFolderThunkPayload[]) => {
   return foldersPayload.map(({ root, currentFolderId, options: payloadOptions }) => {
-    const options = Object.assign({ withNotification: true }, payloadOptions || {});
+    const options = { withNotification: true, ...payloadOptions };
 
     const uploadFolderAbortController = new AbortController();
 
@@ -285,11 +298,16 @@ export const uploadMultipleFolderThunkNoCheck = createAsyncThunk<
   void,
   UploadFolderThunkPayload[],
   { state: RootState }
->('storage/createFolderStructure', async (payload, { dispatch }) => {
+>('storage/createFolderStructure', async (payload, { dispatch, getState }) => {
+  const state = getState();
   const payloadWithTaskId = generateTaskIdForFolders(payload);
+
+  const selectedWorkspace = workspacesSelectors.getSelectedWorkspace(state);
+  const memberId = selectedWorkspace?.workspaceUser?.memberId;
+
   // checking why is not aborting correctly the folder upload
   for (const { root, currentFolderId, options: payloadOptions, taskId, abortController } of payloadWithTaskId) {
-    const options = Object.assign({ withNotification: true }, payloadOptions || {});
+    const options = { withNotification: true, ...payloadOptions };
 
     let alreadyUploaded = 0;
 
@@ -307,7 +325,7 @@ export const uploadMultipleFolderThunkNoCheck = createAsyncThunk<
         const level: IRoot = levels.shift() as IRoot;
         const createdFolder = await dispatch(
           storageThunks.createFolderThunk({
-            parentFolderId: level.folderId as number,
+            parentFolderId: level.folderId as string,
             folderName: level.name,
             options: { relatedTaskId: taskId, showErrors: false },
           }),
@@ -320,25 +338,7 @@ export const uploadMultipleFolderThunkNoCheck = createAsyncThunk<
         tasksService.updateTask({
           taskId,
           merge: {
-            stop: async () => {
-              uploadFolderAbortController.abort();
-              const relatedTasks = tasksService.getTasks({ relatedTaskId: taskId });
-              const promises: Promise<void>[] = [];
-
-              // Cancels related tasks
-              promises.push(
-                ...(relatedTasks
-                  .map((task) => task.stop?.())
-                  .filter((promise) => promise !== undefined) as Promise<void>[]),
-              );
-              // Deletes the root folder
-              if (rootFolderItem) {
-                promises.push(dispatch(deleteItemsThunk([rootFolderItem as DriveItemData])).unwrap());
-                const storageClient = SdkFactory.getInstance().createStorageClient();
-                promises.push(storageClient.deleteFolder(rootFolderItem.id) as Promise<void>);
-              }
-              await Promise.all(promises);
-            },
+            stop: () => stopUploadTask(uploadFolderAbortController, dispatch, taskId, rootFolderItem),
           },
         });
         if (!rootFolderData) {
@@ -351,7 +351,7 @@ export const uploadMultipleFolderThunkNoCheck = createAsyncThunk<
           await dispatch(
             uploadItemsParallelThunk({
               files: level.childrenFiles,
-              parentFolderId: createdFolder.id,
+              parentFolderId: createdFolder.uuid,
               options: {
                 relatedTaskId: taskId,
                 showNotifications: false,
@@ -373,7 +373,7 @@ export const uploadMultipleFolderThunkNoCheck = createAsyncThunk<
 
         const childrenFolders = [] as IRoot[];
         for (const child of level.childrenFolders) {
-          childrenFolders.push({ ...child, folderId: createdFolder.id });
+          childrenFolders.push({ ...child, folderId: createdFolder.uuid });
         }
 
         levels.push(...childrenFolders);
@@ -391,6 +391,7 @@ export const uploadMultipleFolderThunkNoCheck = createAsyncThunk<
 
       setTimeout(() => {
         dispatch(planThunks.fetchUsageThunk());
+        if (memberId) dispatch(planThunks.fetchBusinessLimitUsageThunk());
       }, 1000);
     } catch (err: unknown) {
       const castedError = errorService.castError(err);
@@ -404,9 +405,9 @@ export const uploadMultipleFolderThunkNoCheck = createAsyncThunk<
             subtitle: t('tasks.subtitles.upload-failed') as string,
           },
         });
-        continue;
         // Log the error or report it but don't re-throw it to allow the next folder to be processed
-        // errorService.reportError(castedError);
+        errorService.reportError(castedError);
+        continue;
       }
     }
   }
diff --git a/src/app/store/slices/storage/storage.thunks/uploadItemsThunk.ts b/src/app/store/slices/storage/storage.thunks/uploadItemsThunk.ts
index 84ff4b749..9fe983a6c 100644
--- a/src/app/store/slices/storage/storage.thunks/uploadItemsThunk.ts
+++ b/src/app/store/slices/storage/storage.thunks/uploadItemsThunk.ts
@@ -16,11 +16,13 @@ import { storageActions } from '..';
 import { RootState } from '../../..';
 import { SdkFactory } from '../../../../core/factory/sdk';
 import errorService from '../../../../core/services/error.service';
+import workspacesService from '../../../../core/services/workspace.service';
 import { uploadFileWithManager } from '../../../../network/UploadManager';
 import DatabaseUploadRepository from '../../../../repositories/DatabaseUploadRepository';
 import shareService from '../../../../share/services/share.service';
 import { planThunks } from '../../plan';
 import { uiActions } from '../../ui';
+import workspacesSelectors from '../../workspaces/workspaces.selectors';
 import { StorageState } from '../storage.model';
 
 interface UploadItemsThunkOptions {
@@ -37,7 +39,7 @@ interface UploadItemsPayload {
   files: File[];
   taskId?: string;
   fileType?: string;
-  parentFolderId: number;
+  parentFolderId: string;
   options?: Partial<UploadItemsThunkOptions>;
   filesProgress?: { filesUploaded: number; totalFilesToUpload: number };
 }
@@ -91,18 +93,21 @@ const prepareFilesToUpload = async ({
   parentFolderId,
   disableDuplicatedNamesCheck,
   fileType,
+  workspaceToken,
 }: {
   files: File[];
-  parentFolderId: number;
+  parentFolderId: string;
   disableDuplicatedNamesCheck?: boolean;
   fileType?: string;
+  workspaceToken?: string;
 }): Promise<{ filesToUpload: FileToUpload[]; zeroLengthFilesNumber: number }> => {
   const filesToUpload: FileToUpload[] = [];
-  const storageClient = SdkFactory.getInstance().createStorageClient();
+  const storageClient = SdkFactory.getNewApiInstance().createNewStorageClient();
 
   let parentFolderContent;
+
   if (!disableDuplicatedNamesCheck) {
-    const [parentFolderContentPromise] = storageClient.getFolderContent(parentFolderId);
+    const [parentFolderContentPromise] = storageClient.getFolderContentByUuid(parentFolderId, false, workspaceToken);
     parentFolderContent = await parentFolderContentPromise;
   }
 
@@ -153,6 +158,24 @@ export const uploadItemsThunk = createAsyncThunk<void, UploadItemsPayload, { sta
 
     const options = { ...DEFAULT_OPTIONS, ...payloadOptions };
 
+    const state = getState();
+    const selectedWorkspace = workspacesSelectors.getSelectedWorkspace(state);
+    const workspaceCredentials = workspacesSelectors.getWorkspaceCredentials(state);
+    const memberId = selectedWorkspace?.workspaceUser?.memberId;
+
+    let ownerUserAuthenticationData: any = null;
+    const workspaceId = selectedWorkspace?.workspace?.id;
+    if (workspaceId) {
+      ownerUserAuthenticationData = {
+        bridgeUser: workspaceCredentials?.credentials.networkUser,
+        bridgePass: workspaceCredentials?.credentials.networkPass,
+        encryptionKey: selectedWorkspace?.workspaceUser?.key,
+        bucketId: workspaceCredentials?.bucket,
+        workspaceId: workspaceId,
+        workspacesToken: workspaceCredentials?.tokenHeader,
+      };
+    }
+
     const continueWithUpload = isUploadAllowed({ state: getState(), files, dispatch });
     if (!continueWithUpload) return;
 
@@ -161,6 +184,7 @@ export const uploadItemsThunk = createAsyncThunk<void, UploadItemsPayload, { sta
       parentFolderId,
       disableDuplicatedNamesCheck: options.disableDuplicatedNamesCheck,
       fileType,
+      workspaceToken: workspaceCredentials?.tokenHeader,
     });
 
     showEmptyFilesNotification(zeroLengthFilesNumber);
@@ -194,6 +218,14 @@ export const uploadItemsThunk = createAsyncThunk<void, UploadItemsPayload, { sta
         filesToUploadData,
         openMaxSpaceOccupiedDialog,
         DatabaseUploadRepository.getInstance(),
+        undefined,
+        {
+          ownerUserAuthenticationData: ownerUserAuthenticationData ?? undefined,
+          sharedItemData: {
+            isDeepFolder: false,
+            currentFolderId: parentFolderId,
+          },
+        },
       );
     } catch (error) {
       errors.push(error as Error);
@@ -203,11 +235,15 @@ export const uploadItemsThunk = createAsyncThunk<void, UploadItemsPayload, { sta
 
     setTimeout(() => {
       dispatch(planThunks.fetchUsageThunk());
+      if (memberId) dispatch(planThunks.fetchBusinessLimitUsageThunk());
     }, 1000);
 
     if (errors.length > 0) {
       for (const error of errors) {
-        if (error.message) notificationsService.show({ text: error.message, type: ToastType.Error });
+        if (error.message) {
+          console.error('message Error when upload', error.message);
+          notificationsService.show({ text: error.message, type: ToastType.Error });
+        }
       }
     }
   },
@@ -244,13 +280,20 @@ export const uploadSharedItemsThunk = createAsyncThunk<void, UploadSharedItemsPa
     }: UploadSharedItemsPayload,
     { getState, dispatch },
   ) => {
-    const user = getState().user.user as UserSettings;
+    const state = getState();
+    const user = state.user.user as UserSettings;
     const filesToUpload: FileToUpload[] = [];
     const errors: Error[] = [];
 
+    const selectedWorkspace = workspacesSelectors.getSelectedWorkspace(state);
+    const workspaceCredentials = workspacesSelectors.getWorkspaceCredentials(state);
+
+    const workspaceId = selectedWorkspace?.workspace.id;
+    const memberId = selectedWorkspace?.workspaceUser?.memberId;
+    const teamId = selectedWorkspace?.workspace.defaultTeamId;
     const options = { ...DEFAULT_OPTIONS, ...payloadOptions };
 
-    const continueWithUpload = isUploadAllowed({ state: getState(), files, dispatch });
+    const continueWithUpload = isUploadAllowed({ state: state, files, dispatch });
     if (!continueWithUpload) return;
 
     let zeroLengthFilesNumber = 0;
@@ -268,13 +311,28 @@ export const uploadSharedItemsThunk = createAsyncThunk<void, UploadSharedItemsPa
       let hasMoreItems = true;
 
       while (hasMoreItems) {
-        const parentFolderContent = await shareService.getSharedFolderContent(
-          currentFolderId,
-          'files',
-          isDeepFolder ? ownerUserAuthenticationData?.token ?? '' : '',
-          page,
-          offset,
-        );
+        let parentFolderContent;
+        if (workspaceId && teamId) {
+          const [promise] = workspacesService.getAllWorkspaceTeamSharedFolderFiles(
+            workspaceId,
+            teamId,
+            currentFolderId,
+            page,
+            offset,
+            isDeepFolder ? ownerUserAuthenticationData?.token ?? '' : '',
+          );
+          const response = await promise;
+          parentFolderContent = response;
+        } else {
+          parentFolderContent = await shareService.getSharedFolderContent(
+            currentFolderId,
+            'files',
+            isDeepFolder ? ownerUserAuthenticationData?.token ?? '' : '',
+            page,
+            offset,
+          );
+        }
+
         const parentFolderFiles = parentFolderContent.items;
 
         if (parentFolderFiles.length === 0 || parentFolderFiles.length < offset) hasMoreItems = false;
@@ -300,6 +358,18 @@ export const uploadSharedItemsThunk = createAsyncThunk<void, UploadSharedItemsPa
     }
     showEmptyFilesNotification(zeroLengthFilesNumber);
 
+    let ownerUserAuthenticationDataForWorkspaces: any = null;
+    if (workspaceId) {
+      ownerUserAuthenticationDataForWorkspaces = {
+        bridgeUser: workspaceCredentials?.credentials.networkUser,
+        bridgePass: workspaceCredentials?.credentials.networkPass,
+        encryptionKey: selectedWorkspace?.workspaceUser?.key,
+        bucketId: workspaceCredentials?.bucket,
+        workspaceId: workspaceId,
+        workspacesToken: workspaceCredentials?.tokenHeader,
+        resourcesToken: ownerUserAuthenticationData?.token,
+      };
+    }
     const filesToUploadData = filesToUpload.map((file) => ({
       filecontent: file,
       fileType: file.type,
@@ -330,7 +400,7 @@ export const uploadSharedItemsThunk = createAsyncThunk<void, UploadSharedItemsPa
         DatabaseUploadRepository.getInstance(),
         undefined,
         {
-          ownerUserAuthenticationData,
+          ownerUserAuthenticationData: ownerUserAuthenticationDataForWorkspaces ?? ownerUserAuthenticationData,
           sharedItemData: {
             isDeepFolder,
             currentFolderId,
@@ -345,6 +415,7 @@ export const uploadSharedItemsThunk = createAsyncThunk<void, UploadSharedItemsPa
 
     setTimeout(() => {
       dispatch(planThunks.fetchUsageThunk());
+      if (memberId) dispatch(planThunks.fetchBusinessLimitUsageThunk());
     }, 1000);
 
     if (errors.length > 0) {
@@ -361,21 +432,38 @@ export const uploadSharedItemsThunk = createAsyncThunk<void, UploadSharedItemsPa
  *  2. Schedule tasks
  */
 export const uploadItemsParallelThunk = createAsyncThunk<void, UploadItemsPayload, { state: RootState }>(
-  'storage/uploadParallelItems',
+  'storage/uploadItems',
   async (
     { files, parentFolderId, options: payloadOptions, filesProgress }: UploadItemsPayload,
     { getState, dispatch },
   ) => {
-    const user = getState().user.user as UserSettings;
+    const state = getState();
+    const user = state.user.user as UserSettings;
+    const workspaceCredentials = workspacesSelectors.getWorkspaceCredentials(state);
+    const selectedWorkspace = workspacesSelectors.getSelectedWorkspace(state);
     const errors: Error[] = [];
     const abortController = payloadOptions?.abortController ?? new AbortController();
 
     const options = { ...DEFAULT_OPTIONS, ...payloadOptions };
 
+    // TODO: REMOVE ANY AND ADD TYPE
+    let ownerUserAuthenticationData: any = null;
+    const workspaceId = selectedWorkspace?.workspace?.id;
+    if (workspaceId) {
+      ownerUserAuthenticationData = {
+        bridgeUser: workspaceCredentials?.credentials.networkUser,
+        bridgePass: workspaceCredentials?.credentials.networkPass,
+        encryptionKey: selectedWorkspace?.workspaceUser?.key,
+        bucketId: workspaceCredentials?.bucket,
+        workspaceId: workspaceId,
+        workspacesToken: workspaceCredentials?.tokenHeader,
+      };
+    }
     const { filesToUpload, zeroLengthFilesNumber } = await prepareFilesToUpload({
       files,
       parentFolderId,
       disableDuplicatedNamesCheck: options.disableDuplicatedNamesCheck,
+      workspaceToken: workspaceCredentials?.tokenHeader,
     });
 
     showEmptyFilesNotification(zeroLengthFilesNumber);
@@ -405,7 +493,15 @@ export const uploadItemsParallelThunk = createAsyncThunk<void, UploadItemsPayloa
         openMaxSpaceOccupiedDialog,
         DatabaseUploadRepository.getInstance(),
         abortController,
-        options,
+
+        {
+          ...options,
+          ownerUserAuthenticationData: ownerUserAuthenticationData ?? undefined,
+          sharedItemData: {
+            isDeepFolder: false,
+            currentFolderId: parentFolderId,
+          },
+        },
         filesProgress,
       );
     } catch (error) {
@@ -426,17 +522,6 @@ export const uploadItemsParallelThunk = createAsyncThunk<void, UploadItemsPayloa
 
 export const uploadItemsThunkExtraReducers = (builder: ActionReducerMapBuilder<StorageState>): void => {
   builder
-    .addCase(uploadItemsThunk.pending, () => undefined)
-    .addCase(uploadItemsThunk.fulfilled, () => undefined)
-    .addCase(uploadItemsThunk.rejected, (state, action) => {
-      const requestOptions = Object.assign(DEFAULT_OPTIONS, action.meta.arg.options ?? {});
-      if (requestOptions?.showErrors) {
-        notificationsService.show({
-          text: t('error.uploadingFile', { reason: action.error.message ?? '' }),
-          type: ToastType.Error,
-        });
-      }
-    })
     .addCase(uploadItemsParallelThunk.pending, () => undefined)
     .addCase(uploadItemsParallelThunk.fulfilled, () => undefined)
     .addCase(uploadItemsParallelThunk.rejected, (state, action) => {
diff --git a/src/app/store/slices/ui/index.ts b/src/app/store/slices/ui/index.ts
index 27fca856a..90290ec73 100644
--- a/src/app/store/slices/ui/index.ts
+++ b/src/app/store/slices/ui/index.ts
@@ -18,6 +18,7 @@ interface UISliceState {
   isEditFolderNameDialog: boolean;
   isNewsletterDialogOpen: boolean;
   isSurveyDialogOpen: boolean;
+  isPreferencesDialogOpen: boolean;
   isReachedPlanLimitDialogOpen: boolean;
   isSharedFolderTooBigDialogOpen: boolean;
   isShareItemDialogOpen: boolean;
@@ -54,6 +55,7 @@ const initialState: UISliceState = {
   isEditFolderNameDialog: false,
   isNewsletterDialogOpen: false,
   isSurveyDialogOpen: false,
+  isPreferencesDialogOpen: false,
   isReachedPlanLimitDialogOpen: false,
   isSharedFolderTooBigDialogOpen: false,
   isShareItemDialogOpen: false,
@@ -123,6 +125,9 @@ export const uiSlice = createSlice({
     setIsSurveyDialogOpen: (state: UISliceState, action: PayloadAction<boolean>) => {
       state.isSurveyDialogOpen = action.payload;
     },
+    setIsPreferencesDialogOpen: (state: UISliceState, action: PayloadAction<boolean>) => {
+      state.isPreferencesDialogOpen = action.payload;
+    },
     setIsReachedPlanLimitDialogOpen: (state: UISliceState, action: PayloadAction<boolean>) => {
       state.isReachedPlanLimitDialogOpen = action.payload;
     },
@@ -199,6 +204,7 @@ export const {
   setIsMoveItemsDialogOpen,
   setIsNewsletterDialogOpen,
   setIsSurveyDialogOpen,
+  setIsPreferencesDialogOpen,
   setIsFileLoggerOpen,
   setIsFileInfoMenuOpen,
   setIsReachedPlanLimitDialogOpen,
diff --git a/src/app/store/slices/user/index.ts b/src/app/store/slices/user/index.ts
index 997a39c8f..199411a30 100644
--- a/src/app/store/slices/user/index.ts
+++ b/src/app/store/slices/user/index.ts
@@ -1,25 +1,27 @@
+import { InitializeUserResponse, UpdateProfilePayload } from '@internxt/sdk/dist/drive/users/types';
+import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
 import { createAsyncThunk, createSlice, PayloadAction } from '@reduxjs/toolkit';
+import dayjs from 'dayjs';
 import { RootState } from '../..';
-
-import { teamActions } from '../team';
-import { uiActions } from '../ui';
-import { sessionActions } from '../session';
-import { storageActions } from '../storage';
+import authService from '../../../auth/services/auth.service';
+import userService from '../../../auth/services/user.service';
+import localStorageService from '../../../core/services/local-storage.service';
 import navigationService from '../../../core/services/navigation.service';
-import { sessionSelectors } from '../session/session.selectors';
 import { AppView, LocalStorageItem } from '../../../core/types';
+import { deleteDatabaseProfileAvatar } from '../../../drive/services/database.service';
+import { saveAvatarToDatabase } from '../../../newSettings/Sections/Account/Account/components/AvatarWrapper';
+import notificationsService, { ToastType } from '../../../notifications/services/notifications.service';
 import tasksService from '../../../tasks/services/tasks.service';
-import authService from '../../../auth/services/auth.service';
-import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
-import userService from '../../../auth/services/user.service';
-import { InitializeUserResponse, UpdateProfilePayload } from '@internxt/sdk/dist/drive/users/types';
 import { storeTeamsInfo } from '../../../teams/services/teams.service';
-import localStorageService from '../../../core/services/local-storage.service';
 import { referralsActions } from '../referrals';
-import notificationsService, { ToastType } from '../../../notifications/services/notifications.service';
-import { deleteDatabaseProfileAvatar } from '../../../drive/services/database.service';
-import { saveAvatarToDatabase } from '../../../core/views/Preferences/tabs/Account/AvatarWrapper';
-import dayjs from 'dayjs';
+import { sessionActions } from '../session';
+import { sessionSelectors } from '../session/session.selectors';
+import { storageActions } from '../storage';
+import { teamActions } from '../team';
+import { uiActions } from '../ui';
+
+import errorService from '../../../core/services/error.service';
+import { isTokenExpired } from '../../utils';
 
 export interface UserState {
   isInitializing: boolean;
@@ -78,18 +80,40 @@ export const initializeUserThunk = createAsyncThunk<
   }
 });
 
-export const refreshUserThunk = createAsyncThunk<void, void, { state: RootState }>(
+export const refreshUserThunk = createAsyncThunk<void, { forceRefresh?: boolean } | undefined, { state: RootState }>(
   'user/refresh',
-  async (payload: void, { dispatch, getState }) => {
-    const { user, token } = await userService.refreshUser();
+  async ({ forceRefresh } = {}, { dispatch, getState }) => {
+    const userToken = localStorageService.get(LocalStorageItem.UserToken);
+    const isExpired = isTokenExpired(userToken);
 
     const currentUser = getState().user.user;
     if (!currentUser) throw new Error('Current user is not defined');
 
-    const { avatar, emailVerified, name, lastname } = user;
+    if (isExpired || forceRefresh) {
+      const { user, token } = await userService.refreshUser();
+
+      const { avatar, emailVerified, name, lastname } = user;
 
-    dispatch(userActions.setUser({ ...currentUser, avatar, emailVerified, name, lastname }));
-    dispatch(userActions.setToken(token));
+      dispatch(userActions.setUser({ ...currentUser, avatar, emailVerified, name, lastname }));
+      dispatch(userActions.setToken(token));
+    }
+  },
+);
+
+export const refreshUserDataThunk = createAsyncThunk<void, void, { state: RootState }>(
+  'user/refreshUser',
+  async (_, { dispatch, getState }) => {
+    const currentUser = getState().user.user;
+    if (!currentUser) throw new Error('Current user is not defined');
+
+    try {
+      const { user } = await userService.refreshUserData(currentUser.uuid);
+      const { avatar, emailVerified, name, lastname } = user;
+
+      dispatch(userActions.setUser({ ...currentUser, avatar, emailVerified, name, lastname }));
+    } catch (err) {
+      errorService.reportError(err, { extra: { thunk: 'refreshUserData' } });
+    }
   },
 );
 
@@ -245,6 +269,7 @@ export const userActions = userSlice.actions;
 export const userThunks = {
   initializeUserThunk,
   refreshUserThunk,
+  refreshUserDataThunk,
   logoutThunk,
   updateUserEmailCredentialsThunk,
 };
diff --git a/src/app/store/slices/workspaces/workspaces.selectors.ts b/src/app/store/slices/workspaces/workspaces.selectors.ts
new file mode 100644
index 000000000..6bc3e5ff2
--- /dev/null
+++ b/src/app/store/slices/workspaces/workspaces.selectors.ts
@@ -0,0 +1,25 @@
+import { WorkspaceCredentialsDetails, WorkspaceData } from '@internxt/sdk/dist/workspaces';
+import { RootState } from '../..';
+
+const workspacesSelectors = {
+  isWorkspaceOwner(state: RootState): boolean {
+    const userUuid = state.user.user?.uuid;
+    const { selectedWorkspace } = state.workspaces;
+    const workspaceOwnerUUID = selectedWorkspace?.workspace?.ownerId;
+
+    return userUuid === workspaceOwnerUUID;
+  },
+  getSelectedWorkspace(state: RootState): WorkspaceData | null {
+    const { selectedWorkspace } = state.workspaces;
+    return selectedWorkspace;
+  },
+  getWorkspaceCredentials(state: RootState): WorkspaceCredentialsDetails | null {
+    const { workspaceCredentials } = state.workspaces;
+    return workspaceCredentials;
+  },
+  getFirstWorkspace(state: RootState): WorkspaceData | null {
+    return state.workspaces.workspaces[0];
+  },
+};
+
+export default workspacesSelectors;
diff --git a/src/app/store/slices/workspaces/workspacesStore.ts b/src/app/store/slices/workspaces/workspacesStore.ts
new file mode 100644
index 000000000..9688dc87b
--- /dev/null
+++ b/src/app/store/slices/workspaces/workspacesStore.ts
@@ -0,0 +1,371 @@
+import { PendingWorkspace, Workspace, WorkspaceCredentialsDetails, WorkspaceData } from '@internxt/sdk/dist/workspaces';
+import { PayloadAction, createAsyncThunk, createSlice } from '@reduxjs/toolkit';
+import { t } from 'i18next';
+import { RootState } from '../..';
+import localStorageService, { STORAGE_KEYS } from '../../../core/services/local-storage.service';
+import navigationService from '../../../core/services/navigation.service';
+import workspacesService from '../../../core/services/workspace.service';
+import { AppView } from '../../../core/types';
+import { encryptMessageWithPublicKey } from '../../../crypto/services/pgp.service';
+import {
+  deleteWorkspaceAvatarFromDatabase,
+  saveWorkspaceAvatarToDatabase,
+} from '../../../newSettings/Sections/Workspace/Overview/components/WorkspaceAvatarWrapper';
+import notificationsService, { ToastType } from '../../../notifications/services/notifications.service';
+import { decryptMnemonic } from '../../../share/services/share.service';
+import { planThunks } from '../plan';
+import sessionThunks from '../session/session.thunks';
+import workspacesSelectors from './workspaces.selectors';
+
+export interface PersonalWorkspace {
+  uuid: string;
+  name: string;
+  type: 'Business' | 'Personal';
+  avatar: MediaSource | null;
+}
+
+export interface WorkspacesState {
+  workspaces: WorkspaceData[];
+  workspaceCredentials: WorkspaceCredentialsDetails | null;
+  pendingWorkspaces: PendingWorkspace[];
+  selectedWorkspace: WorkspaceData | null;
+  isOwner: boolean;
+  isLoadingWorkspaces: boolean;
+}
+
+const initialState: WorkspacesState = {
+  workspaces: [],
+  workspaceCredentials: null,
+  pendingWorkspaces: [],
+  selectedWorkspace: null,
+  isOwner: false,
+  isLoadingWorkspaces: false,
+};
+
+const decryptWorkspacesMnemonic = async (workspaces: WorkspaceData[]): Promise<WorkspaceData[]> => {
+  return await Promise.all(
+    workspaces.map(async (workspace) => {
+      return {
+        ...workspace,
+        workspaceUser: {
+          ...workspace.workspaceUser,
+          key: await decryptMnemonic(workspace.workspaceUser.key),
+        },
+      } as WorkspaceData;
+    }),
+  );
+};
+
+const fetchWorkspaces = createAsyncThunk<void, undefined, { state: RootState }>(
+  'workspaces/updateWorkspaces',
+  async (_, { dispatch, getState }) => {
+    const state = getState();
+    const isUserLogged = state.user.user;
+
+    if (isUserLogged) {
+      const workspaces = await workspacesService.getWorkspaces();
+      const workspacesWithDecryptedMnemonic = await decryptWorkspacesMnemonic(workspaces.availableWorkspaces);
+      dispatch(workspacesActions.setWorkspaces(workspacesWithDecryptedMnemonic));
+      dispatch(workspacesActions.setPendingWorkspaces([...workspaces.pendingWorkspaces]));
+      dispatch(planThunks.initializeThunk());
+    }
+  },
+);
+
+const checkAndSetLocalWorkspace = createAsyncThunk<void, undefined, { state: RootState }>(
+  'workspaces/configureWorkspaces',
+  async (_, { dispatch }) => {
+    const b2bWorkspace = localStorageService.getB2BWorkspace();
+    if (b2bWorkspace) {
+      const workspaceId = b2bWorkspace?.workspace.id;
+      dispatch(setSelectedWorkspace({ workspaceId }));
+    }
+  },
+);
+
+const fetchCredentials = createAsyncThunk<void, undefined, { state: RootState }>(
+  'workspaces/fetchCredentials',
+  async (_, { getState, dispatch }) => {
+    const state = getState();
+    const selectedWorkspace = workspacesSelectors.getSelectedWorkspace(state);
+
+    if (selectedWorkspace) {
+      const workspaceId = selectedWorkspace?.workspace.id;
+
+      const credentials = await workspacesService.getWorkspaceCredentials(workspaceId);
+
+      dispatch(workspacesActions.setCredentials(credentials));
+      localStorageService.set(STORAGE_KEYS.WORKSPACE_CREDENTIALS, JSON.stringify(credentials));
+    }
+  },
+);
+
+const setSelectedWorkspace = createAsyncThunk<void, { workspaceId: string | null }, { state: RootState }>(
+  'workspaces/setSelectedWorkspace',
+  async ({ workspaceId }, { dispatch, getState }) => {
+    const state = getState();
+    const selectedWorkspace = state.workspaces.selectedWorkspace;
+    const localStorageB2BWorkspace = localStorageService.getB2BWorkspace();
+
+    const isUnselectingWorkspace = workspaceId === null;
+    const isSelectedWorkspace = localStorageB2BWorkspace?.workspace.id === workspaceId;
+
+    if (isUnselectingWorkspace) {
+      localStorageService.set(STORAGE_KEYS.B2B_WORKSPACE, 'null');
+      dispatch(workspacesActions.setSelectedWorkspace(null));
+      dispatch(workspacesActions.setCredentials(null));
+      localStorageService.set(STORAGE_KEYS.WORKSPACE_CREDENTIALS, 'null');
+    } else if (isSelectedWorkspace) {
+      dispatch(workspacesActions.setSelectedWorkspace(localStorageB2BWorkspace ?? null));
+    } else {
+      const workspace = state.workspaces.workspaces.find((workspace) => workspace.workspace.id === workspaceId);
+      if (workspace) {
+        localStorageService.set(STORAGE_KEYS.B2B_WORKSPACE, JSON.stringify(workspace));
+        dispatch(workspacesActions.setSelectedWorkspace(workspace ?? null));
+      }
+    }
+
+    if (workspaceId && workspaceId !== selectedWorkspace?.workspace.id) {
+      dispatch(fetchCredentials());
+    }
+    dispatch(sessionThunks.changeWorkspaceThunk());
+  },
+);
+
+const setupWorkspace = createAsyncThunk<void, { pendingWorkspace: PendingWorkspace }, { state: RootState }>(
+  'workspaces/setupWorkspace',
+  async ({ pendingWorkspace }, { dispatch, getState }) => {
+    // ADD LOADER WHILE WORKSPACE IS SETTING UP
+    try {
+      const rootState = getState();
+      const user = rootState.user.user;
+      if (!user) {
+        navigationService.push(AppView.Login);
+        return;
+      }
+      const { mnemonic, publicKey } = user;
+
+      const encryptedMnemonic = await encryptMessageWithPublicKey({
+        message: mnemonic,
+        publicKeyInBase64: publicKey,
+      });
+
+      const encryptedMnemonicInBase64 = btoa(encryptedMnemonic as string);
+
+      await workspacesService.setupWorkspace({
+        workspaceId: pendingWorkspace.id,
+        name: pendingWorkspace.name,
+        address: pendingWorkspace?.address ?? '',
+        description: pendingWorkspace?.description ?? '',
+        encryptedMnemonic: encryptedMnemonicInBase64,
+      });
+
+      // to avoid backend update delay
+      setTimeout(async () => {
+        const workspaces = await workspacesService.getWorkspaces();
+
+        const workspacesWithDecryptedMnemonic = await decryptWorkspacesMnemonic(workspaces.availableWorkspaces);
+
+        const selectedWorkspace = workspacesWithDecryptedMnemonic.find(
+          (workspace) => workspace.workspace.id === pendingWorkspace.id,
+        );
+
+        dispatch(workspacesActions.setWorkspaces(workspacesWithDecryptedMnemonic));
+        dispatch(workspacesActions.setPendingWorkspaces([...workspaces.pendingWorkspaces]));
+
+        dispatch(workspacesActions.setSelectedWorkspace(selectedWorkspace ?? null));
+
+        if (selectedWorkspace) {
+          localStorageService.set(STORAGE_KEYS.B2B_WORKSPACE, JSON.stringify(selectedWorkspace));
+          dispatch(planThunks.fetchBusinessLimitUsageThunk());
+          dispatch(fetchCredentials());
+          dispatch(sessionThunks.changeWorkspaceThunk());
+        }
+      }, 1000);
+    } catch (error) {
+      notificationsService.show({ text: 'Error seting up workspace', type: ToastType.Error });
+    }
+  },
+);
+
+const updateWorkspaceAvatar = createAsyncThunk<void, { workspaceId: string; avatar: Blob }, { state: RootState }>(
+  'workspaces/updateAvatar',
+  async (payload, { dispatch }) => {
+    const { avatar } = await workspacesService.updateWorkspaceAvatar(payload.workspaceId, payload.avatar);
+
+    await saveWorkspaceAvatarToDatabase(payload.workspaceId, avatar, payload.avatar);
+    dispatch(workspacesActions.patchWorkspace({ workspaceId: payload.workspaceId, patch: { avatar } }));
+  },
+);
+
+const deleteWorkspaceAvatar = createAsyncThunk<void, { workspaceId: string }, { state: RootState }>(
+  'workspaces/deleteAvatar',
+  async (payload, { dispatch }) => {
+    await workspacesService.deleteWorkspaceAvatar(payload.workspaceId);
+
+    await deleteWorkspaceAvatarFromDatabase(payload.workspaceId);
+    dispatch(workspacesActions.patchWorkspace({ workspaceId: payload.workspaceId, patch: { avatar: undefined } }));
+  },
+);
+
+const editWorkspace = createAsyncThunk<
+  boolean,
+  { workspaceId: string; details: { name?: string; description?: string; address?: string; phoneNumber?: string } },
+  { state: RootState }
+>('workspaces/editWorkspace', async (payload, { dispatch }) => {
+  await workspacesService.editWorkspace(payload.workspaceId, payload.details);
+  const workspace = await workspacesService.getWorkspace(payload.workspaceId);
+  if (workspace) {
+    const { name, description, address, phoneNumber } = workspace;
+    dispatch(
+      workspacesActions.patchWorkspace({
+        workspaceId: payload.workspaceId,
+        patch: { name, description, address, phoneNumber },
+      }),
+    );
+    return true;
+  }
+  return false;
+});
+
+export const workspacesSlice = createSlice({
+  name: 'user',
+  initialState,
+  reducers: {
+    setWorkspaces: (state: WorkspacesState, action: PayloadAction<WorkspaceData[]>) => {
+      state.workspaces = action.payload;
+    },
+    setPendingWorkspaces: (state: WorkspacesState, action: PayloadAction<PendingWorkspace[]>) => {
+      state.pendingWorkspaces = action.payload;
+    },
+    setSelectedWorkspace: (state: WorkspacesState, action: PayloadAction<WorkspaceData | null>) => {
+      state.selectedWorkspace = action.payload;
+    },
+    setCredentials: (state: WorkspacesState, action: PayloadAction<WorkspaceCredentialsDetails | null>) => {
+      state.workspaceCredentials = action.payload;
+    },
+    patchWorkspace: (
+      state: WorkspacesState,
+      action: PayloadAction<{ workspaceId: string; patch: Partial<Workspace> }>,
+    ) => {
+      const { workspaceId, patch } = action.payload;
+      state.workspaces = state.workspaces.map((item) => {
+        const workspace = item.workspace;
+        if (workspace.id === workspaceId) {
+          item.workspace = Object.assign(workspace, patch);
+          if (state.selectedWorkspace?.workspace.id === workspaceId) {
+            state.selectedWorkspace = item;
+            localStorageService.set(STORAGE_KEYS.B2B_WORKSPACE, JSON.stringify(item));
+          }
+        }
+        return item;
+      });
+    },
+  },
+  // TODO: TO CHANGE MESSAGES
+  extraReducers: (builder) => {
+    builder
+      .addCase(fetchWorkspaces.pending, (state) => {
+        state.isLoadingWorkspaces = true;
+      })
+      .addCase(fetchWorkspaces.fulfilled, (state) => {
+        state.isLoadingWorkspaces = false;
+      })
+      .addCase(fetchWorkspaces.rejected, (state, action) => {
+        const errorMsg = action.payload ? action.payload : '';
+
+        state.isLoadingWorkspaces = false;
+        notificationsService.show({ text: 'Fetching workspaces error ' + errorMsg, type: ToastType.Warning });
+      })
+      .addCase(setSelectedWorkspace.pending, (state) => {
+        state.isLoadingWorkspaces = true;
+      })
+      .addCase(setSelectedWorkspace.fulfilled, (state) => {
+        state.isLoadingWorkspaces = false;
+      })
+      .addCase(setSelectedWorkspace.rejected, (state, action) => {
+        const errorMsg = action.payload ? action.payload : '';
+
+        state.isLoadingWorkspaces = false;
+        notificationsService.show({
+          text: 'Changing workspace error ' + errorMsg,
+          type: ToastType.Warning,
+        });
+      })
+      .addCase(fetchCredentials.pending, (state) => {
+        state.isLoadingWorkspaces = true;
+      })
+      .addCase(fetchCredentials.fulfilled, (state) => {
+        state.isLoadingWorkspaces = false;
+      })
+      .addCase(fetchCredentials.rejected, (state, action) => {
+        const errorMsg = action.payload ? action.payload : '';
+
+        state.isLoadingWorkspaces = false;
+        notificationsService.show({
+          text: 'Fetching workspace credentials error ' + errorMsg,
+          type: ToastType.Warning,
+        });
+      })
+      .addCase(setupWorkspace.pending, (state) => {
+        state.isLoadingWorkspaces = true;
+      })
+      .addCase(setupWorkspace.fulfilled, (state) => {
+        state.isLoadingWorkspaces = false;
+      })
+      .addCase(setupWorkspace.rejected, (state, action) => {
+        const errorMsg = action.payload ? action.payload : '';
+
+        state.isLoadingWorkspaces = false;
+        notificationsService.show({ text: 'Setting up workspace error ' + errorMsg, type: ToastType.Warning });
+      })
+      .addCase(checkAndSetLocalWorkspace.pending, (state) => {
+        state.isLoadingWorkspaces = true;
+      })
+      .addCase(checkAndSetLocalWorkspace.fulfilled, (state) => {
+        state.isLoadingWorkspaces = false;
+      })
+      .addCase(checkAndSetLocalWorkspace.rejected, (state, action) => {
+        const errorMsg = action.payload ? action.payload : '';
+
+        state.isLoadingWorkspaces = false;
+        notificationsService.show({ text: 'checking workspaces error ' + errorMsg, type: ToastType.Warning });
+      })
+
+      .addCase(editWorkspace.rejected, () => {
+        notificationsService.show({
+          text: t('views.preferences.workspace.billing.errorUpdatingBillingDetails'),
+          type: ToastType.Warning,
+        });
+      })
+      .addCase(editWorkspace.fulfilled, (_, action) => {
+        const isUpdateSuccessful = action.payload;
+        if (isUpdateSuccessful) {
+          notificationsService.show({
+            text: t('views.preferences.workspace.billing.updatedBillingDetails'),
+            type: ToastType.Success,
+          });
+        } else {
+          notificationsService.show({
+            text: t('views.preferences.workspace.billing.errorUpdatingBillingDetails'),
+            type: ToastType.Warning,
+          });
+        }
+      });
+  },
+});
+
+export const workspacesActions = workspacesSlice.actions;
+
+export const workspaceThunks = {
+  fetchWorkspaces,
+  setupWorkspace,
+  fetchCredentials,
+  setSelectedWorkspace,
+  checkAndSetLocalWorkspace,
+  updateWorkspaceAvatar,
+  deleteWorkspaceAvatar,
+  editWorkspace,
+};
+
+export default workspacesSlice.reducer;
diff --git a/src/app/store/utils.test.ts b/src/app/store/utils.test.ts
new file mode 100644
index 000000000..d90fc0d84
--- /dev/null
+++ b/src/app/store/utils.test.ts
@@ -0,0 +1,36 @@
+import { isTokenExpired } from './utils';
+
+describe('isTokenExpired', () => {
+  it('should return true for an expired token', () => {
+    const expiredToken = 'header.eyJleHAiOjE2MDAwMDAwMDB9.signature';
+    expect(isTokenExpired(expiredToken)).toBe(true);
+  });
+
+  it('should return false for a valid token', () => {
+    const futureDate = Math.floor(Date.now() / 1000) + 3600;
+    const validToken = `header.${btoa(JSON.stringify({ exp: futureDate }))}.signature`;
+    expect(isTokenExpired(validToken)).toBe(false);
+  });
+
+  it('should return true for a token with malformed payload', () => {
+    const malformedToken = 'header.malformedPayload.signature';
+    expect(isTokenExpired(malformedToken)).toBe(true);
+  });
+
+  it('should return true for a token without exp field', () => {
+    const tokenWithoutExp = `header.${btoa(JSON.stringify({}))}.signature`;
+    expect(isTokenExpired(tokenWithoutExp)).toBe(true);
+  });
+
+  it('should return false for a token with exp field in future date', () => {
+    const futureDate = Math.floor(Date.now() / 1000) + 3600;
+    const tokenWithFutureExp = `header.${btoa(JSON.stringify({ exp: futureDate }))}.signature`;
+    expect(isTokenExpired(tokenWithFutureExp)).toBe(false);
+  });
+
+  it('should return true for a token with exp field in past date', () => {
+    const pastDate = Math.floor(Date.now() / 1000) - 3600;
+    const tokenWithPastExp = `header.${btoa(JSON.stringify({ exp: pastDate }))}.signature`;
+    expect(isTokenExpired(tokenWithPastExp)).toBe(true);
+  });
+});
diff --git a/src/app/store/utils.ts b/src/app/store/utils.ts
new file mode 100644
index 000000000..fe2726436
--- /dev/null
+++ b/src/app/store/utils.ts
@@ -0,0 +1,12 @@
+export function isTokenExpired(token): boolean {
+  try {
+    const arrayToken = token.split('.');
+    const tokenPayload = JSON.parse(atob(arrayToken[1]));
+    if (!tokenPayload.exp) {
+      return true;
+    }
+    return Math.floor(new Date().getTime() / 1000) >= tokenPayload.exp;
+  } catch (error) {
+    return true;
+  }
+}
diff --git a/src/app/survey/components/SurveyDialog/SurveyDialog.tsx b/src/app/survey/components/SurveyDialog/SurveyDialog.tsx
index 632132208..45f9c3c7c 100644
--- a/src/app/survey/components/SurveyDialog/SurveyDialog.tsx
+++ b/src/app/survey/components/SurveyDialog/SurveyDialog.tsx
@@ -42,7 +42,7 @@ const SurveyDialog = (props: { isOpen: boolean }): JSX.Element => {
             height={600}
             hidden={{
               clientid: clientId,
-              uuid: user.uuid
+              uuid: user.uuid,
             }}
           />
         </div>
diff --git a/src/app/tasks/components/TaskLoggerItem/TaskLoggerItem.tsx b/src/app/tasks/components/TaskLoggerItem/TaskLoggerItem.tsx
index 521b1c5bc..3eba27afd 100644
--- a/src/app/tasks/components/TaskLoggerItem/TaskLoggerItem.tsx
+++ b/src/app/tasks/components/TaskLoggerItem/TaskLoggerItem.tsx
@@ -1,4 +1,5 @@
 import { useState } from 'react';
+import { useSelector } from 'react-redux';
 import { useOpenItem } from '../../hooks/useOpen';
 import { useRetryDownload, useRetryUpload } from '../../hooks/useRetry';
 
@@ -9,6 +10,7 @@ import { useReduxActions } from '../../../store/slices/storage/hooks/useReduxAct
 import tasksService from '../../services/tasks.service';
 import { TaskData, TaskNotification, TaskStatus, TaskType, UploadFileData, UploadFolderData } from '../../types';
 import { TaskLoggerActions } from '../TaskLoggerActions/TaskLoggerActions';
+import workspacesSelectors from 'app/store/slices/workspaces/workspaces.selectors';
 
 const THREE_HUNDRED_MB_IN_BYTES = 3 * 100 * 1024 * 1024;
 interface TaskLoggerItemProps {
@@ -69,6 +71,7 @@ const resetTaskProgress = (notification: TaskNotification) => {
 const TaskLoggerItem = ({ notification, task }: TaskLoggerItemProps): JSX.Element => {
   const [isHovered, setIsHovered] = useState(false);
   const [isRetryActionDisabled, setIsRetryActionDisabled] = useState(false);
+  const selectedWorkspace = useSelector(workspacesSelectors.getSelectedWorkspace);
 
   const { openItem } = useOpenItem({
     notification,
@@ -84,6 +87,7 @@ const TaskLoggerItem = ({ notification, task }: TaskLoggerItemProps): JSX.Elemen
         type: ToastType.Error,
       });
     },
+    selectedWorkspace,
   });
   const { downloadItemsAsZip, downloadItems, uploadFolder, uploadItem, uploadSharedItem } = useReduxActions();
   const { retryDownload } = useRetryDownload({
diff --git a/src/app/tasks/hooks/useOpen.tsx b/src/app/tasks/hooks/useOpen.tsx
index 7718f7cca..263fa241c 100644
--- a/src/app/tasks/hooks/useOpen.tsx
+++ b/src/app/tasks/hooks/useOpen.tsx
@@ -1,4 +1,5 @@
 import { useCallback } from 'react';
+import { WorkspaceData } from '@internxt/sdk/dist/workspaces';
 import navigationService from '../../core/services/navigation.service';
 import { TaskNotification, TaskType } from '../types';
 
@@ -10,22 +11,31 @@ type OpenItemProps = {
   notification: TaskNotification;
   showOpenFileError: () => void;
   showOpenFolderError: () => void;
+  selectedWorkspace?: WorkspaceData | null;
 };
 
-export const useOpenItem = ({ notification, showOpenFileError, showOpenFolderError }: OpenItemProps): OpenItem => {
+export const useOpenItem = ({
+  notification,
+  showOpenFileError,
+  showOpenFolderError,
+  selectedWorkspace,
+}: OpenItemProps): OpenItem => {
   const openItem = useCallback(() => {
     const { item, action } = notification;
     const isFolderUpload = action === TaskType.UploadFolder;
 
     if (isFolderUpload) {
       if (notification?.itemUUID?.rootFolderUUID) {
-        navigationService.pushFolder(notification?.itemUUID?.rootFolderUUID);
+        navigationService.pushFolder(
+          notification?.itemUUID?.rootFolderUUID,
+          selectedWorkspace?.workspaceUser.workspaceId,
+        );
       } else {
         showOpenFolderError();
       }
     } else if (item) {
       if (notification?.itemUUID?.fileUUID) {
-        navigationService.pushFile(notification?.itemUUID?.fileUUID);
+        navigationService.pushFile(notification?.itemUUID?.fileUUID, selectedWorkspace?.workspaceUser.workspaceId);
       } else {
         showOpenFileError();
       }
diff --git a/src/app/tasks/hooks/useRetry.ts b/src/app/tasks/hooks/useRetry.ts
index 0fb27ea69..c63b84987 100644
--- a/src/app/tasks/hooks/useRetry.ts
+++ b/src/app/tasks/hooks/useRetry.ts
@@ -61,10 +61,10 @@ interface RetryUpload {
 type RetryUploadArgs = {
   notification: TaskNotification;
   uploadFolder: (data: UploadFolderData & { taskId: string }) => void;
-  uploadItem: (data: { uploadFile: File; parentFolderId: number; taskId: string; fileType: string }) => void;
+  uploadItem: (data: { uploadFile: File; parentFolderId: string; taskId: string; fileType: string }) => void;
   uploadSharedItem: (data: {
     uploadFile: File;
-    parentFolderId: number;
+    parentFolderId: string;
     taskId: string;
     fileType: string;
     sharedItemAuthenticationData: SharedItemAuthenticationData;
@@ -101,7 +101,7 @@ export const useRetryUpload = ({
         showErrorNotification();
       }
     } else if (item && taskId) {
-      const uploadItemData = item as { uploadFile: File; parentFolderId: number };
+      const uploadItemData = item as { uploadFile: File; parentFolderId: string };
 
       const isSharedItem = !!sharedItemAuthenticationData;
       if (isSharedItem) {
diff --git a/src/app/tasks/services/tasks.service/index.ts b/src/app/tasks/services/tasks.service/index.ts
index c5c844bfe..48c003244 100644
--- a/src/app/tasks/services/tasks.service/index.ts
+++ b/src/app/tasks/services/tasks.service/index.ts
@@ -8,7 +8,6 @@ import {
   BaseTask,
   DownloadFilesData,
   DownloadFolderData,
-  DownloadPhotosTask,
   TaskData,
   TaskEvent,
   TaskFilter,
@@ -199,11 +198,6 @@ class TaskManagerService {
         title = itemsLib.getItemDisplayName({ name: task.folder.name });
         break;
       }
-      case TaskType.DownloadPhotos: {
-        const { numberOfPhotos } = task as DownloadPhotosTask;
-        title = `${numberOfPhotos} ${numberOfPhotos > 1 ? 'Photos' : 'Photo'}`;
-        break;
-      }
       case TaskType.RenameFile: {
         title = itemsLib.getItemDisplayName(task.file);
         break;
@@ -260,10 +254,6 @@ class TaskManagerService {
         icon = iconService.getItemIcon(true, '');
         break;
       }
-      case TaskType.DownloadPhotos: {
-        icon = iconService.getItemIcon(false, 'jpeg');
-        break;
-      }
       case TaskType.RenameFile: {
         icon = iconService.getItemIcon(false, task.file.type);
         break;
diff --git a/src/app/tasks/types.ts b/src/app/tasks/types.ts
index a7569ed2a..2324c8db6 100644
--- a/src/app/tasks/types.ts
+++ b/src/app/tasks/types.ts
@@ -22,7 +22,6 @@ export enum TaskType {
   UploadFolder = 'upload-folder',
   MoveFile = 'move-file',
   MoveFolder = 'move-folder',
-  DownloadPhotos = 'download-photos',
   RenameFile = 'rename-file',
   RenameFolder = 'rename-folder',
 }
@@ -57,7 +56,7 @@ export interface CreateFolderTask extends BaseTask {
   action: TaskType.CreateFolder;
   cancellable: false;
   folderName: string;
-  parentFolderId: number;
+  parentFolderId: string;
   item?: IRoot;
 }
 
@@ -92,7 +91,7 @@ export interface UploadFileTask extends BaseTask {
   fileName: string;
   fileType: string;
   isFileNameValidated: boolean;
-  item: { uploadFile: File; parentFolderId: number };
+  item: { uploadFile: File; parentFolderId: string };
   sharedItemAuthenticationData?: SharedItemAuthenticationData;
 }
 
@@ -101,41 +100,35 @@ export interface UploadFolderTask extends BaseTask {
   cancellable: true;
   folderName: string;
   item: IRoot;
-  parentFolderId: number;
+  parentFolderId: string;
 }
 
 export interface MoveFileTask extends BaseTask {
   action: TaskType.MoveFile;
   cancellable: false;
   file: DriveFileData;
-  destinationFolderId: number;
+  destinationFolderId: string;
 }
 
 export interface MoveFolderTask extends BaseTask {
   action: TaskType.MoveFolder;
   cancellable: false;
   folder: DriveFolderData;
-  destinationFolderId: number;
-}
-
-export interface DownloadPhotosTask extends BaseTask {
-  action: TaskType.DownloadPhotos;
-  cancellable: true;
-  numberOfPhotos: number;
+  destinationFolderId: string;
 }
 
 export interface RenameFileTask extends BaseTask {
   action: TaskType.RenameFile;
   cancellable: true;
   file: DriveFileData;
-  destinationFolderId?: number;
+  destinationFolderId?: string;
 }
 
 export interface RenameFolderTask extends BaseTask {
   action: TaskType.RenameFolder;
   cancellable: true;
   folder: DriveFolderData;
-  destinationFolderId?: number;
+  destinationFolderId?: string;
 }
 
 export type TaskData = (
@@ -148,7 +141,6 @@ export type TaskData = (
   | UploadFolderTask
   | MoveFileTask
   | MoveFolderTask
-  | DownloadPhotosTask
   | RenameFileTask
   | RenameFolderTask
 ) & { file?: DriveFileData | DownloadFilesData } & {
@@ -162,8 +154,8 @@ export type TaskData = (
 
 export type DownloadFilesData = { name: string; type: string; items?: DriveItemData[] };
 export type DownloadFolderData = { id: number; name: string; type: string; isFolder: boolean };
-export type UploadFileData = { uploadFile: File; parentFolderId: number };
-export type UploadFolderData = { folder: IRoot; parentFolderId: number };
+export type UploadFileData = { uploadFile: File; parentFolderId: string };
+export type UploadFolderData = { folder: IRoot; parentFolderId: string };
 export type UploadSharedItemData = UploadFileData & SharedItemAuthenticationData;
 export type SharedItemAuthenticationData = {
   currentFolderId: string;
diff --git a/src/app/utils/backupKeyUtils.ts b/src/app/utils/backupKeyUtils.ts
new file mode 100644
index 000000000..84942e9e0
--- /dev/null
+++ b/src/app/utils/backupKeyUtils.ts
@@ -0,0 +1,30 @@
+import { saveAs } from 'file-saver';
+import notificationsService, { ToastType } from 'app/notifications/services/notifications.service';
+import localStorageService from 'app/core/services/local-storage.service';
+import { TrackingPlan } from 'app/analytics/TrackingPlan';
+import { trackBackupKeyDownloaded } from 'app/analytics/services/analytics.service';
+
+/**
+ * Downloads the backup key of the user and shows a notification
+ * @param translate used for the notification message
+ */
+
+export function handleExportBackupKey(translate) {
+  const trackBackupKeyDownloadedProperties: TrackingPlan.BackupKeyDownloadedProperties = {
+    backup_key_downloaded: true,
+  };
+  const mnemonic = localStorageService.get('xMnemonic');
+  if (!mnemonic) {
+    notificationsService.show({
+      text: translate('views.account.tabs.security.backupKey.error'),
+      type: ToastType.Error,
+    });
+  } else {
+    saveAs(new Blob([mnemonic], { type: 'text/plain' }), 'INTERNXT-BACKUP-KEY.txt');
+    notificationsService.show({
+      text: translate('views.account.tabs.security.backupKey.success'),
+      type: ToastType.Success,
+    });
+    trackBackupKeyDownloaded(trackBackupKeyDownloadedProperties);
+  }
+}
diff --git a/src/assets/dark.svg b/src/assets/dark.svg
new file mode 100644
index 000000000..ada70d0ac
--- /dev/null
+++ b/src/assets/dark.svg
@@ -0,0 +1,40 @@
+<svg fill="none" height="88" viewBox="0 0 144 88" width="144" xmlns="http://www.w3.org/2000/svg"
+  xmlns:xlink="http://www.w3.org/1999/xlink">
+  <filter id="theme-dark-a" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse" height="96" width="152" x="4" y="14">
+    <feFlood flood-opacity="0" result="BackgroundImageFix" />
+    <feColorMatrix in="SourceAlpha" result="hardAlpha" type="matrix"
+      values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" />
+    <feMorphology in="SourceAlpha" operator="erode" radius="3" result="effect1_dropShadow_9973_74" />
+    <feOffset dy="10" />
+    <feGaussianBlur stdDeviation="7.5" />
+    <feComposite in2="hardAlpha" operator="out" />
+    <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0" />
+    <feBlend in2="BackgroundImageFix" mode="normal" result="effect1_dropShadow_9973_74" />
+    <feColorMatrix in="SourceAlpha" result="hardAlpha" type="matrix"
+      values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" />
+    <feMorphology in="SourceAlpha" operator="erode" radius="4" result="effect2_dropShadow_9973_74" />
+    <feOffset dy="4" />
+    <feGaussianBlur stdDeviation="3" />
+    <feComposite in2="hardAlpha" operator="out" />
+    <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0" />
+    <feBlend in2="effect1_dropShadow_9973_74" mode="normal" result="effect2_dropShadow_9973_74" />
+    <feBlend in="SourceGraphic" in2="effect2_dropShadow_9973_74" mode="normal" result="shape" />
+  </filter>
+  <clipPath id="theme-dark-b">
+    <path d="m0 0h144v88h-144z" />
+  </clipPath>
+  <g clip-path="url(#theme-dark-b)">
+    <path d="m0 0h144v88h-144z" fill="#3a3a3b" />
+    <g filter="url(#theme-dark-a)">
+      <path d="m16 28c0-6.6274 5.3726-12 12-12h116v72h-128z" fill="#18181b" />
+      <path d="m28 16.5h115.5v71h-127v-59.5c0-6.3513 5.1487-11.5 11.5-11.5z" stroke="#464649" />
+      <g fill="#3a3a3b">
+        <rect height="20" rx="4" width="20" x="28" y="28" />
+        <rect height="10" rx="4" width="72" x="58" y="33" />
+        <rect height="20" rx="4" width="20" x="28" y="56" />
+        <path
+          d="m58 65c0-2.2091 1.7909-4 4-4h48c2.209 0 4 1.7909 4 4v2c0 2.2091-1.791 4-4 4h-48c-2.2091 0-4-1.7909-4-4z" />
+      </g>
+    </g>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/icons/empty/members-activity.svg b/src/assets/icons/empty/members-activity.svg
new file mode 100644
index 000000000..bfeea1a4d
--- /dev/null
+++ b/src/assets/icons/empty/members-activity.svg
@@ -0,0 +1,14 @@
+<svg width="64" height="48" viewBox="0 0 64 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_10458_61548)">
+<path d="M6.17603 44.1223C6.17603 44.653 6.58688 44.9664 7.03705 44.9664H56.0905C56.5471 44.9664 56.958 44.653 56.958 44.1223C56.958 43.5982 56.5471 43.2781 56.0905 43.2781H7.03705C6.58688 43.2781 6.17603 43.5982 6.17603 44.1223Z" fill="#0066FF"/>
+<path d="M45.5688 38.5819C45.5688 39.6732 46.2866 40.3443 47.4414 40.3443H53.7219C54.8364 40.3443 55.5947 39.6732 55.5947 38.5819V21.1631C55.5947 20.0888 54.8364 19.3943 53.7219 19.3943H47.4414C46.2866 19.3943 45.5688 20.0888 45.5688 21.1631V38.5819Z" fill="#0066FF" fill-opacity="0.25"/>
+<path d="M32.8879 38.5818C32.8879 39.6731 33.6292 40.3442 34.7269 40.3442H41.041C42.1622 40.3442 42.9202 39.6731 42.9202 38.5818V10.2988C42.9202 9.22441 42.1622 8.53656 41.041 8.53656H34.7269C33.6292 8.53656 32.8879 9.22441 32.8879 10.2988V38.5818Z" fill="#0066FF" fill-opacity="0.55"/>
+<path d="M20.1968 38.5819C20.1968 39.6731 20.9314 40.3442 22.0629 40.3442H28.3498C29.4813 40.3442 30.2225 39.6731 30.2225 38.5819V4.76234C30.2225 3.68797 29.4813 3.00012 28.3498 3.00012H22.0629C20.9314 3.00012 20.1968 3.68797 20.1968 4.76234V38.5819Z" fill="#0066FF"/>
+<path d="M7.53296 38.5818C7.53296 39.6731 8.25731 40.3441 9.40561 40.3441H15.686C16.7904 40.3441 17.5652 39.6731 17.5652 38.5818V15.8212C17.5652 14.7534 16.7904 14.059 15.686 14.059H9.40561C8.25731 14.059 7.53296 14.7534 7.53296 15.8212V38.5818Z" fill="#0066FF" fill-opacity="0.55"/>
+</g>
+<defs>
+<clipPath id="clip0_10458_61548">
+<rect width="51.6475" height="42" fill="white" transform="translate(6.17627 3)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/assets/icons/empty/members-teams.svg b/src/assets/icons/empty/members-teams.svg
new file mode 100644
index 000000000..ab320da0a
--- /dev/null
+++ b/src/assets/icons/empty/members-teams.svg
@@ -0,0 +1,5 @@
+<svg width="88" height="48" viewBox="0 0 88 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M81.9787 39.0292C81.9787 40.6504 80.7287 41.627 78.6585 41.627H62.0583C62.5065 40.8652 62.7405 39.979 62.7405 39.0292C62.7405 35.607 60.6955 31.7706 57.0811 28.8918C59.4525 27.7508 62.3053 27.0372 65.5529 27.0372C75.6897 27.0372 81.9787 33.9902 81.9787 39.0292ZM73.3655 14.9082C73.3655 19.791 69.7523 23.541 65.5725 23.541C61.3733 23.541 57.7601 19.791 57.7601 14.9473C57.7601 10.1621 61.3929 6.50977 65.5725 6.50977C69.7327 6.50977 73.3655 10.084 73.3655 14.9082Z" fill="#0066FF" fill-opacity="0.25"/>
+<path d="M60.0643 39.0292C60.0643 40.6504 58.8339 41.627 56.7439 41.627H40.1431C40.5921 40.8652 40.8261 39.979 40.8261 39.0292C40.8261 35.609 38.7783 31.775 35.1655 28.897C37.5385 27.7528 40.3925 27.0372 43.6385 27.0372C53.7753 27.0372 60.0643 33.9902 60.0643 39.0292ZM51.4511 14.9082C51.4511 19.791 47.8377 23.541 43.6581 23.541C39.4589 23.541 35.8455 19.791 35.8455 14.9473C35.8455 10.1621 39.4783 6.50977 43.6581 6.50977C47.8183 6.50977 51.4511 10.084 51.4511 14.9082Z" fill="#0066FF" fill-opacity="0.55"/>
+<path d="M21.7246 23.541C25.9239 23.541 29.5371 19.791 29.5371 14.9082C29.5371 10.084 25.9043 6.50977 21.7246 6.50977C17.5449 6.50977 13.9121 10.1621 13.9121 14.9473C13.9121 19.791 17.5449 23.541 21.7246 23.541ZM8.61916 41.627H34.8107C36.9005 41.627 38.1505 40.6504 38.1505 39.0292C38.1505 33.9902 31.8419 27.0372 21.7246 27.0372C11.5879 27.0372 5.2793 33.9902 5.2793 39.0292C5.2793 40.6504 6.5293 41.627 8.61916 41.627Z" fill="#0066FF"/>
+</svg>
diff --git a/src/assets/images/banner/BannerInternal-SummerCampaign-800x450-EN.svg b/src/assets/images/banner/BannerInternal-SummerCampaign-800x450-EN.svg
deleted file mode 100644
index ce82cc680..000000000
--- a/src/assets/images/banner/BannerInternal-SummerCampaign-800x450-EN.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-<svg width="800" height="450" viewBox="0 0 800 450" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_3883_2795)">
-<rect width="800" height="450" rx="20" fill="#0066FF"/>
-<g clip-path="url(#clip1_3883_2795)">
-<path d="M822.371 180.837C822.361 177.193 822.407 173.544 822.518 169.886C823.573 134.436 830.495 99.1255 828.662 63.7592C825.723 7.07916 795.224 -27.725 748.877 -46.3941C699.678 -66.2105 644.561 -57.908 593.82 -41.9664C572.753 -35.3502 551.613 -27.2458 533.927 -12.7925C508.029 8.37384 492.052 40.902 472.04 68.8734C418.07 144.315 321.437 132.736 247.855 167.186C205.321 187.099 169.166 221.272 138.096 259.333C118.296 283.587 100.002 310.13 89.5744 340.686C79.5846 369.952 77.2403 401.72 78.1982 432.843C79.9116 488.472 92.2596 544.254 118.743 591.139C157.827 660.323 218.402 676.537 277.622 714.147C340.698 754.203 413.035 775.605 485.723 780.111C566.273 785.11 651.06 769.638 717.051 716.98C744.704 694.915 784.7 656.771 795.413 620.981C819.814 539.444 844.515 455.746 841.793 370.247C839.766 306.624 822.536 244.369 822.371 180.837Z" fill="#005EEB"/>
-<g clip-path="url(#clip2_3883_2795)">
-<path d="M408.713 -4.85561C406.192 -0.79752 403.493 3.1415 400.555 6.92178C379.178 34.4305 347.137 51.1391 316.123 67.0093C293.302 78.6875 267.786 90.708 243.005 84.1347C281.125 31.826 319.24 -20.4877 357.359 -72.7964C400.099 -131.46 433.628 -147.043 501.71 -162C505.367 -148.898 500.971 -137.289 491.791 -126.668C483.097 -116.617 471.867 -109.086 462.538 -99.6205C436.938 -73.6348 427.942 -35.7924 408.708 -4.85561H408.713Z" fill="#0058DB"/>
-</g>
-</g>
-<g clip-path="url(#clip3_3883_2795)">
-<path d="M113.652 -125.549C105.13 -111.446 93.6994 -81.0788 92.2963 -76.9469C91.7723 -75.4027 91.2516 -73.8524 90.7324 -72.307C89.9304 -71.6763 89.2973 -70.7957 88.9189 -69.7787C87.6055 -66.2496 86.7554 -62.6127 86.2956 -58.9375C82.1828 -46.4099 78.1633 -33.8484 74.068 -21.3189C73.7105 -20.2302 73.3561 -19.1432 73.0004 -18.0515C72.4831 -17.8207 71.9606 -17.5989 71.4343 -17.3908C70.3512 -17.3604 69.4085 -16.9878 68.6553 -16.3932C60.4435 -13.7363 51.3206 -13.1604 42.9497 -12.5436C27.5385 -11.4075 12.4619 -9.20291 -2.40375 -4.64871C-32.0357 4.42626 -59.1914 20.1925 -84.5681 37.7503C-94.4353 44.577 -103.813 53.3009 -114.191 59.2568C-122.586 64.076 -130.396 65.694 -136.698 73.856C-121.163 75.6753 -104.462 75.5472 -89.2814 70.7031C-71.5023 65.0298 -54.7186 56.6333 -37.6254 49.212C-23.5684 43.1085 -9.27487 38.0381 5.74284 35.0371C21.0186 31.9869 36.9893 29.9208 50.8373 22.1653C55.1184 19.7654 59.1497 16.855 62.6915 13.5006L61.2393 17.9443L43.3065 62.0868C33.8885 69.2451 22.5742 73.7851 10.6673 74.7546C2.24136 75.4391 -6.28759 75.0452 -14.6031 76.9556C-23.5709 79.0189 -31.3687 84.1718 -37.897 90.5241C-44.5519 96.9974 -50.0194 104.578 -55.6661 111.89L-73.8231 135.405C-96.4054 164.649 -117.676 198.006 -145.309 222.847C-108.356 229.009 -89.8879 194.858 -68.5635 171.699C-62.6916 165.322 -56.5336 159.172 -49.8398 153.63C-43.7994 148.63 -37.2657 144.243 -30.6431 140.052C-17.0794 131.478 -2.88967 123.833 10.1029 114.383C16.6525 109.62 22.7759 104.415 28.1246 98.5924C27.8829 99.4706 27.646 100.35 27.4043 101.228L25.6714 105.491C23.947 109.732 22.2243 113.977 20.4999 118.218C12.5703 125.559 4.95841 133.224 -1.99801 141.492C-14.8751 156.804 -24.5407 173.759 -31.3151 192.399C-43.2227 225.158 -46.8132 260.005 -58.1177 292.923C-66.2822 316.709 -80.4827 328.673 -94.3391 348.099C-70.0686 345.414 -51.3571 333.305 -35.4144 314.998C-21.0734 298.529 -15.3984 280.005 -5.93847 261.276C4.40762 240.794 18.495 221.094 20.7751 198.461C21.7675 188.594 20.4253 178.701 20.4106 168.803C20.389 152.722 23.9413 136.573 30.7463 121.821C28.7367 146.509 30.1199 171.391 34.7886 195.585C39.1979 218.444 43.0541 241.295 47.916 263.988C48.8145 268.181 49.9235 272.383 49.8411 276.691C49.7664 280.743 48.6377 284.712 47.7955 288.696C43.4107 309.433 46.7172 330.765 50.0306 351.542C57.5311 339.829 58.3643 323.669 64.6137 310.619C71.5459 296.136 80.236 281.828 81.3351 265.555C82.4684 248.766 75.2575 232.875 69.5213 217.178C62.5921 198.218 57.7978 178.603 54.7933 158.603C52.4124 142.729 45.2705 127.05 45.4928 110.795C45.8344 85.8683 62.3444 99.533 74.1145 110.225C95.0344 129.225 107.029 155.514 115.257 182.073C121.083 200.888 121.368 230.416 134.097 245.773C132.379 208.987 140.167 170.929 135.804 134.246C132.634 107.617 118.99 78.2794 90.7353 70.8684C83.0694 68.8583 60.6579 71.908 55.5625 66.2219C50.1167 60.1273 56.1356 49.7532 59.2986 43.9145C63.6723 35.8357 66.8603 29.1401 70.4156 20.3879C75.015 9.06464 79.6175 -2.26043 84.2169 -13.5837C84.5542 -13.8144 84.8833 -14.0523 85.2137 -14.295C87.3842 1.47616 92.5576 16.7792 100.525 30.6366C107.717 43.1417 117.16 54.0271 128.18 63.3556C139.864 73.2468 153.278 82.1309 161.855 95.03C167.66 103.768 170.257 115.444 177.17 123.342C183.298 130.349 194.111 135.373 202.487 139.357C191.862 126.942 188.644 108.174 182.207 93.2968C174.729 76.0067 166.431 59.0339 156.141 43.2313C147.437 29.8629 137.053 17.9996 126.309 6.23616C116.615 -4.38106 106.996 -15.3243 100.977 -28.5061C98.8272 -33.2141 97.1988 -38.2029 96.2866 -43.2978C107.915 -71.9189 116.667 -101.278 129.166 -129.655C126.38 -130.646 123.598 -131.638 120.812 -132.629C119.097 -133.24 116.543 -130.328 113.652 -125.549Z" fill="#2DA4B9"/>
-</g>
-<g clip-path="url(#clip4_3883_2795)">
-<path d="M933.268 433.498C926.319 420.916 908.331 399.049 905.817 396.188C904.877 395.119 903.932 394.051 902.989 392.985C902.862 392.105 902.472 391.243 901.868 390.514C899.771 387.984 897.39 385.757 894.809 383.807C887.125 375.241 879.375 366.731 871.682 358.177C871.014 357.433 870.346 356.692 869.676 355.947C869.727 355.456 869.787 354.965 869.86 354.477C870.31 353.646 870.44 352.772 870.319 351.944C871.897 344.586 875.447 337.447 878.638 330.858C884.512 318.727 889.431 306.383 892.48 293.175C898.559 266.847 898.493 239.471 896.293 212.659C895.438 202.233 892.933 191.35 892.96 180.919C892.981 172.479 895.169 165.878 891.745 157.562C883.581 168.497 876.381 181.163 873.413 194.736C869.939 210.632 868.96 226.964 867.107 243.104C865.584 256.378 863.176 269.38 858.885 282.026C854.519 294.889 849.105 307.848 848.923 321.683C848.869 325.962 849.31 330.274 850.301 334.41L847.573 331.377L822.001 298.596C820.698 288.365 822.206 277.844 826.675 268.431C829.839 261.771 833.864 255.504 836.051 248.393C838.408 240.723 837.916 232.589 835.961 224.891C833.969 217.045 830.621 209.613 827.554 202.162L817.692 178.203C805.427 148.406 789.476 117.806 782.75 86.1156C761.94 111.328 779.716 140.159 787.926 166.354C790.186 173.567 792.15 180.897 793.419 188.366C794.564 195.107 795.03 201.952 795.308 208.779C795.87 222.757 795.456 236.803 796.93 250.731C797.674 257.752 798.937 264.644 801.007 271.221C800.448 270.655 799.886 270.093 799.327 269.528L796.858 266.362C794.401 263.211 791.942 260.06 789.485 256.909C787.394 247.722 784.92 238.634 781.701 229.778C775.74 213.381 767.131 198.693 755.985 185.453C736.395 162.183 711.591 144.282 691.618 121.399C677.184 104.866 674.335 88.9297 665.687 70C657.114 89.495 658.103 108.9 664.992 128.917C671.189 146.924 682.729 159.283 692.769 174.589C703.75 191.329 712.504 210.552 728.636 222.139C735.67 227.189 743.744 230.488 751.241 234.792C763.421 241.785 774.09 251.506 782.282 263.075C764.475 250.796 745.04 240.994 724.69 233.973C705.463 227.338 686.485 220.288 667.185 214.067C663.62 212.918 659.955 211.923 656.731 209.983C653.697 208.161 651.186 205.578 648.539 203.206C634.761 190.856 617.172 184.054 600 177.499C605.587 188.267 617.453 195.941 624.599 206.348C632.531 217.894 639.562 230.692 651.398 238.616C663.608 246.789 678.785 248.272 693.171 250.784C710.549 253.817 727.488 258.747 743.937 265.197C756.991 270.319 771.978 271.761 784.182 279.014C802.898 290.138 785.343 296.647 772.108 300.873C748.588 308.385 723.451 305.982 699.755 300.616C682.97 296.813 660.499 284.158 643.315 287.074C671.905 301.812 697.305 324.281 726.974 336.977C748.512 346.192 776.677 348.679 794.631 330.577C799.502 325.665 806.986 307.415 813.516 306.047C820.508 304.592 825.729 313.658 828.766 318.591C832.969 325.415 836.643 330.741 841.714 337.24C848.274 345.648 854.834 354.06 861.393 362.468C861.421 362.823 861.457 363.176 861.496 363.531C848.612 358.295 834.77 355.53 820.801 355.505C808.195 355.484 795.831 357.869 783.956 362.122C771.365 366.632 758.78 372.888 745.27 373.74C736.12 374.315 726.149 371.185 717.151 372.962C709.171 374.534 700.644 380.508 693.969 385.095C708.007 382.485 723.617 388.237 737.689 389.862C754.042 391.752 770.512 392.886 786.968 392.006C800.889 391.261 814.404 388.592 828.002 385.608C840.272 382.918 852.758 380.425 865.364 381.626C869.866 382.056 874.353 383.001 878.608 384.533C895.187 405.789 913.583 425.194 929.597 447C931.564 445.329 933.531 443.661 935.498 441.99C936.71 440.961 935.622 437.764 933.268 433.498Z" fill="#2DA4B9"/>
-</g>
-<g clip-path="url(#clip5_3883_2795)">
-<path d="M63.2059 423.443C68.6891 414.541 75.2187 406.232 81.7483 398.042C90.4185 387.161 99.7645 375.897 112.71 370.855C138.906 360.651 186.682 371.91 207.09 390.596C220.341 402.736 229.531 427.97 235.092 444.864C241.61 464.659 242.866 486.241 238.243 506.589C230.877 539.016 208.699 567.744 179.238 583.025C168.947 588.361 157.598 592.162 146.016 591.988C130.906 591.76 116.639 584.836 104.219 576.203C82.4359 561.066 64.5034 539.891 55.1096 515.042C45.7159 490.192 45.2973 461.656 55.893 437.298C57.9858 432.49 60.4673 427.892 63.2059 423.443Z" fill="#0094CE"/>
-</g>
-</g>
-<defs>
-<clipPath id="clip0_3883_2795">
-<rect width="800" height="450" rx="20" fill="white"/>
-</clipPath>
-<clipPath id="clip1_3883_2795">
-<rect width="764" height="839" fill="white" transform="translate(78 -58)"/>
-</clipPath>
-<clipPath id="clip2_3883_2795">
-<rect width="260" height="248" fill="white" transform="translate(243 -162)"/>
-</clipPath>
-<clipPath id="clip3_3883_2795">
-<rect width="384.488" height="432.438" fill="white" transform="translate(-56.7561 413.195) rotate(-120)"/>
-</clipPath>
-<clipPath id="clip4_3883_2795">
-<rect width="336" height="377" fill="white" transform="translate(600 70)"/>
-</clipPath>
-<clipPath id="clip5_3883_2795">
-<rect width="193" height="225" fill="white" transform="translate(48 367)"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/src/assets/images/banner/Crowdcube_Internxt.svg b/src/assets/images/banner/Crowdcube_Internxt.svg
deleted file mode 100644
index 61e79dc71..000000000
--- a/src/assets/images/banner/Crowdcube_Internxt.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<svg width="208" height="149" viewBox="0 0 208 149" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<path d="M100.28 78.8125V52H106.575V78.8125H100.28ZM90.7238 68.4697V62.399H116.075V68.4697H90.7238Z" fill="white"/>
-<rect y="90" width="207.606" height="58.9474" fill="url(#pattern0)"/>
-<path d="M8.03855 24.5101H2.87817V0H8.03855V24.5101Z" fill="white"/>
-<path d="M35.6914 16.8769V0H40.8164V24.5101H35.55L23.1084 7.59811V24.5101H17.9482V0H23.2145L35.6914 16.8769Z" fill="white"/>
-<path d="M48.8166 0H66.5244V4.51683H60.2331V24.5101H55.1079V4.51683H48.8166V0Z" fill="white"/>
-<path d="M89.6918 0V4.51683H79.6538V9.76898H88.3134V14.2858H79.6538V19.9932H89.6918V24.5101H74.4934V0H89.6918Z" fill="white"/>
-<path d="M118.819 24.5101H112.563L105.635 14.4259H103.974V24.5101H98.8138V0H108.781C111.326 0 113.27 0.676943 114.613 2.03082C115.98 3.38471 116.663 5.15877 116.663 7.35301C116.663 10.9244 114.872 13.107 111.291 13.9007L118.819 24.5101ZM103.974 10.2592H108.039C109.17 10.2592 110.03 10.0374 110.619 9.59391C111.232 9.12706 111.538 8.38009 111.538 7.35301C111.538 6.34926 111.232 5.62562 110.619 5.18212C110.03 4.7386 109.17 4.51683 108.039 4.51683H103.974V10.2592Z" fill="white"/>
-<path d="M144.605 16.8769V0H149.73V24.5101H144.464L132.022 7.59811V24.5101H126.862V0H132.128L144.605 16.8769Z" fill="white"/>
-<path d="M171.727 11.8698L180.281 24.5101H174.343L168.935 16.1066L163.562 24.5101H157.66L166.178 11.9049L158.119 0H163.987L168.935 7.66813L173.918 0H179.821L171.727 11.8698Z" fill="white"/>
-<path d="M186.296 0H204.004V4.51683H197.713V24.5101H192.588V4.51683H186.296V0Z" fill="white"/>
-<defs>
-<pattern id="pattern0" patternContentUnits="objectBoundingBox" width="1" height="1">
-<use xlink:href="#image0_4669_1626" transform="scale(0.000318674 0.00112233)"/>
-</pattern>
-<image id="image0_4669_1626" width="3138" height="891" xlink:href="data:image/png;base64,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"/>
-</defs>
-</svg>
diff --git a/src/assets/images/banner/banner_internal_cs_month_800x450_bg.webp b/src/assets/images/banner/banner_internal_cs_month_800x450_bg.webp
deleted file mode 100644
index a1dae936f..000000000
Binary files a/src/assets/images/banner/banner_internal_cs_month_800x450_bg.webp and /dev/null differ
diff --git a/src/assets/images/banner/christmas_banner_bg.png b/src/assets/images/banner/christmas_banner_bg.png
deleted file mode 100644
index 1920a8f73..000000000
Binary files a/src/assets/images/banner/christmas_banner_bg.png and /dev/null differ
diff --git a/src/assets/images/banner/free-users-banner-bg.webp b/src/assets/images/banner/free-users-banner-bg.webp
new file mode 100644
index 000000000..5203fe2fb
Binary files /dev/null and b/src/assets/images/banner/free-users-banner-bg.webp differ
diff --git a/src/assets/images/banner/grass.webp b/src/assets/images/banner/grass.webp
new file mode 100644
index 000000000..23c9eb76b
Binary files /dev/null and b/src/assets/images/banner/grass.webp differ
diff --git a/src/assets/images/banner/hearts.png b/src/assets/images/banner/hearts.png
deleted file mode 100644
index 83e034aa9..000000000
Binary files a/src/assets/images/banner/hearts.png and /dev/null differ
diff --git a/src/assets/light.svg b/src/assets/light.svg
new file mode 100644
index 000000000..e916047e0
--- /dev/null
+++ b/src/assets/light.svg
@@ -0,0 +1,39 @@
+<svg fill="none" height="88" viewBox="0 0 144 88" width="144" xmlns="http://www.w3.org/2000/svg"
+  xmlns:xlink="http://www.w3.org/1999/xlink">
+  <filter id="theme-light-a" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse" height="96" width="152" x="4" y="14">
+    <feFlood flood-opacity="0" result="BackgroundImageFix" />
+    <feColorMatrix in="SourceAlpha" result="hardAlpha" type="matrix"
+      values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" />
+    <feMorphology in="SourceAlpha" operator="erode" radius="3" result="effect1_dropShadow_9973_64" />
+    <feOffset dy="10" />
+    <feGaussianBlur stdDeviation="7.5" />
+    <feComposite in2="hardAlpha" operator="out" />
+    <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0" />
+    <feBlend in2="BackgroundImageFix" mode="normal" result="effect1_dropShadow_9973_64" />
+    <feColorMatrix in="SourceAlpha" result="hardAlpha" type="matrix"
+      values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" />
+    <feMorphology in="SourceAlpha" operator="erode" radius="4" result="effect2_dropShadow_9973_64" />
+    <feOffset dy="4" />
+    <feGaussianBlur stdDeviation="3" />
+    <feComposite in2="hardAlpha" operator="out" />
+    <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0" />
+    <feBlend in2="effect1_dropShadow_9973_64" mode="normal" result="effect2_dropShadow_9973_64" />
+    <feBlend in="SourceGraphic" in2="effect2_dropShadow_9973_64" mode="normal" result="shape" />
+  </filter>
+  <clipPath id="theme-light-b">
+    <path d="m0 0h144v88h-144z" />
+  </clipPath>
+  <g clip-path="url(#theme-light-b)">
+    <path d="m0 0h144v88h-144z" fill="#f3f3f8" />
+    <g filter="url(#theme-light-a)">
+      <path d="m16 28c0-6.6274 5.3726-12 12-12h116v72h-128z" fill="#fff" />
+      <path d="m28 16.5h115.5v71h-127v-59.5c0-6.3513 5.1487-11.5 11.5-11.5z" stroke="#e5e5e5" />
+      <g fill="#e5e5eb">
+        <rect height="20" rx="4" width="20" x="28" y="28" />
+        <rect height="10" rx="4" width="72" x="58" y="33" />
+        <rect height="20" rx="4" width="20" x="28" y="56" />
+        <rect height="10" rx="4" width="56" x="58" y="61" />
+      </g>
+    </g>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/system.svg b/src/assets/system.svg
new file mode 100644
index 000000000..549ee6ce1
--- /dev/null
+++ b/src/assets/system.svg
@@ -0,0 +1,104 @@
+<svg fill="none" height="88" viewBox="0 0 144 88" width="144" xmlns="http://www.w3.org/2000/svg"
+  xmlns:xlink="http://www.w3.org/1999/xlink">
+  <filter id="theme-system-a" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse" height="128" width="112" x="-20"
+    y="-8">
+    <feFlood flood-opacity="0" result="BackgroundImageFix" />
+    <feColorMatrix in="SourceAlpha" result="hardAlpha" type="matrix"
+      values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" />
+    <feOffset dy="12" />
+    <feGaussianBlur stdDeviation="10" />
+    <feComposite in2="hardAlpha" operator="out" />
+    <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.02 0" />
+    <feBlend in2="BackgroundImageFix" mode="normal" result="effect1_dropShadow_9973_45" />
+    <feBlend in="SourceGraphic" in2="effect1_dropShadow_9973_45" mode="normal" result="shape" />
+  </filter>
+  <filter id="theme-system-b" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse" height="96" width="80" x="4" y="14">
+    <feFlood flood-opacity="0" result="BackgroundImageFix" />
+    <feColorMatrix in="SourceAlpha" result="hardAlpha" type="matrix"
+      values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" />
+    <feMorphology in="SourceAlpha" operator="erode" radius="3" result="effect1_dropShadow_9973_45" />
+    <feOffset dy="10" />
+    <feGaussianBlur stdDeviation="7.5" />
+    <feComposite in2="hardAlpha" operator="out" />
+    <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0" />
+    <feBlend in2="BackgroundImageFix" mode="normal" result="effect1_dropShadow_9973_45" />
+    <feColorMatrix in="SourceAlpha" result="hardAlpha" type="matrix"
+      values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" />
+    <feMorphology in="SourceAlpha" operator="erode" radius="4" result="effect2_dropShadow_9973_45" />
+    <feOffset dy="4" />
+    <feGaussianBlur stdDeviation="3" />
+    <feComposite in2="hardAlpha" operator="out" />
+    <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0" />
+    <feBlend in2="effect1_dropShadow_9973_45" mode="normal" result="effect2_dropShadow_9973_45" />
+    <feBlend in="SourceGraphic" in2="effect2_dropShadow_9973_45" mode="normal" result="shape" />
+  </filter>
+  <filter id="theme-system-c" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse" height="128" width="112" x="52" y="-8">
+    <feFlood flood-opacity="0" result="BackgroundImageFix" />
+    <feColorMatrix in="SourceAlpha" result="hardAlpha" type="matrix"
+      values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" />
+    <feOffset dy="12" />
+    <feGaussianBlur stdDeviation="10" />
+    <feComposite in2="hardAlpha" operator="out" />
+    <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.02 0" />
+    <feBlend in2="BackgroundImageFix" mode="normal" result="effect1_dropShadow_9973_45" />
+    <feBlend in="SourceGraphic" in2="effect1_dropShadow_9973_45" mode="normal" result="shape" />
+  </filter>
+  <filter id="theme-system-d" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse" height="96" width="80" x="76" y="14">
+    <feFlood flood-opacity="0" result="BackgroundImageFix" />
+    <feColorMatrix in="SourceAlpha" result="hardAlpha" type="matrix"
+      values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" />
+    <feMorphology in="SourceAlpha" operator="erode" radius="3" result="effect1_dropShadow_9973_45" />
+    <feOffset dy="10" />
+    <feGaussianBlur stdDeviation="7.5" />
+    <feComposite in2="hardAlpha" operator="out" />
+    <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0" />
+    <feBlend in2="BackgroundImageFix" mode="normal" result="effect1_dropShadow_9973_45" />
+    <feColorMatrix in="SourceAlpha" result="hardAlpha" type="matrix"
+      values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" />
+    <feMorphology in="SourceAlpha" operator="erode" radius="4" result="effect2_dropShadow_9973_45" />
+    <feOffset dy="4" />
+    <feGaussianBlur stdDeviation="3" />
+    <feComposite in2="hardAlpha" operator="out" />
+    <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0" />
+    <feBlend in2="effect1_dropShadow_9973_45" mode="normal" result="effect2_dropShadow_9973_45" />
+    <feBlend in="SourceGraphic" in2="effect2_dropShadow_9973_45" mode="normal" result="shape" />
+  </filter>
+  <clipPath id="theme-system-e">
+    <path d="m0 0h144v88h-144z" />
+  </clipPath>
+  <clipPath id="theme-system-f">
+    <path d="m0 0h72v88h-72z" />
+  </clipPath>
+  <clipPath id="theme-system-g">
+    <path d="m72 0h72v88h-72z" />
+  </clipPath>
+  <g clip-path="url(#theme-system-e)">
+    <path d="m0 0h144v88h-144z" fill="#fff" />
+    <g clip-path="url(#theme-system-f)" filter="url(#theme-system-a)">
+      <path d="m0 0h72v88h-72z" fill="#f3f3f8" />
+      <g filter="url(#theme-system-b)">
+        <path d="m16 28c0-6.6274 5.3726-12 12-12h44v72h-56z" fill="#fff" />
+        <path d="m28 16.5h43.5v71h-55v-59.5c0-6.3513 5.1487-11.5 11.5-11.5z" stroke="#e5e5e5" />
+        <g fill="#e5e5eb">
+          <rect height="20" rx="4" width="20" x="28" y="28" />
+          <path d="m58 37c0-2.2091 1.7909-4 4-4h10v10h-10c-2.2091 0-4-1.7909-4-4z" />
+          <rect height="20" rx="4" width="20" x="28" y="56" />
+          <path d="m58 65c0-2.2091 1.7909-4 4-4h10v10h-10c-2.2091 0-4-1.7909-4-4z" />
+        </g>
+      </g>
+    </g>
+    <g clip-path="url(#theme-system-g)" filter="url(#theme-system-c)">
+      <path d="m0 0h72v88h-72z" fill="#3a3a3b" transform="translate(72)" />
+      <g filter="url(#theme-system-d)">
+        <path d="m88 28c0-6.6274 5.3726-12 12-12h44v72h-56z" fill="#18181b" />
+        <path d="m100 16.5h43.5v71h-55v-59.5c0-6.3513 5.1487-11.5 11.5-11.5z" stroke="#464649" />
+        <g fill="#3a3a3b">
+          <rect height="20" rx="4" width="20" x="100" y="28" />
+          <path d="m130 37c0-2.2091 1.791-4 4-4h10v10h-10c-2.209 0-4-1.7909-4-4z" />
+          <rect height="20" rx="4" width="20" x="100" y="56" />
+          <path d="m130 65c0-2.2091 1.791-4 4-4h10v10h-10c-2.209 0-4-1.7909-4-4z" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/src/react-app-env.d.ts b/src/react-app-env.d.ts
index 009e38a1e..f9a6fb224 100644
--- a/src/react-app-env.d.ts
+++ b/src/react-app-env.d.ts
@@ -7,7 +7,6 @@ declare namespace NodeJS {
     REACT_APP_NODE_ENV: string;
     REACT_APP_API_URL: string;
     REACT_APP_DRIVE_NEW_API_URL: string;
-    REACT_APP_PHOTOS_API_URL: string;
     REACT_APP_PAYMENTS_API_URL: string;
     REACT_APP_CRYPTO_SECRET: string;
     REACT_APP_CRYPTO_SECRET2: string;
diff --git a/src/use_cases/trash/clear-trash.ts b/src/use_cases/trash/clear-trash.ts
index 2eaed2755..04557cde4 100644
--- a/src/use_cases/trash/clear-trash.ts
+++ b/src/use_cases/trash/clear-trash.ts
@@ -1,11 +1,12 @@
-import { SdkFactory } from '../../app/core/factory/sdk';
-import { storageActions } from '../../app/store/slices/storage';
-import { store } from '../../app/store';
-import notificationsService, { ToastType } from '../../app/notifications/services/notifications.service';
 import { t } from 'i18next';
+import { SdkFactory } from '../../app/core/factory/sdk';
 import errorService from '../../app/core/services/error.service';
+import workspacesService from '../../app/core/services/workspace.service';
+import notificationsService, { ToastType } from '../../app/notifications/services/notifications.service';
+import { store } from '../../app/store';
+import { storageActions } from '../../app/store/slices/storage';
 
-const ClearTrash = async (): Promise<void> => {
+const clearTrash = async (workspaceId?: string): Promise<void> => {
   let deletingItemsToastId;
 
   try {
@@ -16,9 +17,12 @@ const ClearTrash = async (): Promise<void> => {
       closable: false,
     });
 
-    const trashClient = await SdkFactory.getNewApiInstance().createTrashClient();
-    await trashClient.clearTrash();
-
+    if (workspaceId) {
+      await workspacesService.emptyTrash(workspaceId);
+    } else {
+      const trashClient = SdkFactory.getNewApiInstance().createTrashClient();
+      await trashClient.clearTrash();
+    }
     store.dispatch(storageActions.resetTrash());
     store.dispatch(storageActions.clearSelectedItems());
 
@@ -38,4 +42,4 @@ const ClearTrash = async (): Promise<void> => {
   }
 };
 
-export default ClearTrash;
+export default clearTrash;
diff --git a/src/use_cases/trash/delete-items.ts b/src/use_cases/trash/delete-items.ts
index b87f82d75..1a4ef9f68 100644
--- a/src/use_cases/trash/delete-items.ts
+++ b/src/use_cases/trash/delete-items.ts
@@ -1,13 +1,13 @@
-import { storageActions } from '../../app/store/slices/storage';
-import { store } from '../../app/store';
-import notificationsService, { ToastType } from '../../app/notifications/services/notifications.service';
-import { SdkFactory } from '../../app/core/factory/sdk';
-import { DriveItemData } from '../../app/drive/types';
-import { DeleteItemsPermanentlyPayload } from '@internxt/sdk/dist/drive/trash/types';
-import { deleteDatabaseItems } from '../../app/drive/services/database.service';
-import { t } from 'i18next';
 import { Trash } from '@internxt/sdk/dist/drive';
+import { DeleteItemsPermanentlyByUUIDPayload } from '@internxt/sdk/dist/drive/trash/types';
+import { t } from 'i18next';
+import { SdkFactory } from '../../app/core/factory/sdk';
 import errorService from '../../app/core/services/error.service';
+import { deleteDatabaseItems } from '../../app/drive/services/database.service';
+import { DriveItemData } from '../../app/drive/types';
+import notificationsService, { ToastType } from '../../app/notifications/services/notifications.service';
+import { store } from '../../app/store';
+import { storageActions } from '../../app/store/slices/storage';
 
 const MAX_ITEMS_TO_DELETE = 20;
 const MAX_CONCURRENT_REQUESTS = 2;
@@ -18,7 +18,7 @@ async function deleteItemsPermanently({
   maxConcurrentRequests,
   trashClient,
 }: {
-  items: { id: number | string; type: string }[];
+  items: { uuid: string; type: string }[];
   maxItemsToDelete: number;
   maxConcurrentRequests: number;
   trashClient: Trash;
@@ -27,7 +27,9 @@ async function deleteItemsPermanently({
 
   for (let i = 0; i < items.length; i += maxItemsToDelete) {
     const itemsToDelete = items.slice(i, i + maxItemsToDelete);
-    const promise = trashClient.deleteItemsPermanently({ items: itemsToDelete } as DeleteItemsPermanentlyPayload);
+    const promise = trashClient.deleteItemsPermanentlyByUUID({
+      items: itemsToDelete,
+    } as DeleteItemsPermanentlyByUUIDPayload);
     promises.push(promise);
 
     if (promises.length === maxConcurrentRequests) {
@@ -42,15 +44,15 @@ async function deleteItemsPermanently({
 }
 
 const DeleteItems = async (itemsToDelete: DriveItemData[]): Promise<void> => {
-  const items: Array<{ id: number | string; type: string }> = itemsToDelete.map((item) => {
+  const items: Array<{ uuid: string; type: string }> = itemsToDelete.map((item) => {
     return {
-      id: item.id,
+      uuid: item.uuid,
       type: item.isFolder ? 'folder' : 'file',
     };
   });
 
   try {
-    const trashClient = await SdkFactory.getNewApiInstance().createTrashClient();
+    const trashClient = SdkFactory.getNewApiInstance().createTrashClient();
     await deleteItemsPermanently({
       items,
       maxItemsToDelete: MAX_ITEMS_TO_DELETE,
diff --git a/src/use_cases/trash/get_trash.ts b/src/use_cases/trash/get_trash.ts
index 8764f6f96..e284fa8d4 100644
--- a/src/use_cases/trash/get_trash.ts
+++ b/src/use_cases/trash/get_trash.ts
@@ -1,13 +1,15 @@
+import { t } from 'i18next';
 import { SdkFactory } from '../../app/core/factory/sdk';
-import { storageActions } from '../../app/store/slices/storage';
-import { store } from '../../app/store';
+import errorService from '../../app/core/services/error.service';
+import localStorageService from '../../app/core/services/local-storage.service';
+import workspacesService from '../../app/core/services/workspace.service';
 import { DriveItemData } from '../../app/drive/types';
 import notificationsService, { ToastType } from '../../app/notifications/services/notifications.service';
-import errorService from '../../app/core/services/error.service';
-import { t } from 'i18next';
+import { store } from '../../app/store';
+import { storageActions } from '../../app/store/slices/storage';
 
 const getTrash = async (): Promise<void> => {
-  const trashClient = await SdkFactory.getNewApiInstance().createTrashClient();
+  const trashClient = SdkFactory.getNewApiInstance().createTrashClient();
   const itemsInTrash = await trashClient.getTrash();
   itemsInTrash.children.forEach((folder) => {
     Object.assign(folder, { isFolder: true });
@@ -28,7 +30,7 @@ const getTrashPaginated = async (
   folderId?: number | undefined,
 ): Promise<{ finished: boolean; itemsRetrieved: number }> => {
   try {
-    const trashClient = await SdkFactory.getNewApiInstance().createTrashClient();
+    const trashClient = SdkFactory.getNewApiInstance().createTrashClient();
     const itemsInTrash = await trashClient.getTrashedFilesPaginated(limit, offset, type, root, folderId);
 
     const parsedTrashItems = itemsInTrash.result.map(
@@ -58,4 +60,40 @@ const getTrashPaginated = async (
   }
 };
 
-export { getTrash, getTrashPaginated };
+const getWorkspaceTrashPaginated = async (
+  limit: number,
+  offset: number | undefined,
+  type: 'files' | 'folders',
+): Promise<{ finished: boolean; itemsRetrieved: number }> => {
+  try {
+    const workspace = localStorageService.getB2BWorkspace();
+    const trashType = type === 'files' ? 'file' : 'folder';
+    const itemsInTrash = await workspacesService.getTrashItems(workspace?.workspace.id as string, trashType, offset);
+
+    const parsedTrashItems = itemsInTrash.result.map(
+      (item) => ({ ...item, isFolder: type === 'folders', name: item.plainName } as unknown as DriveItemData),
+    );
+    const itemslength = itemsInTrash.result.length;
+    const areLastItems = itemslength < limit;
+
+    store.dispatch(storageActions.clearSelectedItems());
+    store.dispatch(storageActions.addItemsOnTrash(parsedTrashItems));
+
+    if (type === 'folders') {
+      store.dispatch(storageActions.addFoldersOnTrashLength(itemslength));
+    } else {
+      store.dispatch(storageActions.addFilesOnTrashLength(itemslength));
+    }
+
+    return { finished: areLastItems, itemsRetrieved: itemslength };
+  } catch (error) {
+    notificationsService.show({
+      text: t('error.errorLoadingTrashItems'),
+      type: ToastType.Error,
+    });
+
+    errorService.reportError(error);
+    return { finished: false, itemsRetrieved: 0 };
+  }
+};
+export { getTrash, getTrashPaginated, getWorkspaceTrashPaginated };
diff --git a/src/use_cases/trash/move-items-to-trash.ts b/src/use_cases/trash/move-items-to-trash.ts
index a9c60d4bf..238447376 100644
--- a/src/use_cases/trash/move-items-to-trash.ts
+++ b/src/use_cases/trash/move-items-to-trash.ts
@@ -1,14 +1,14 @@
-import { SdkFactory } from '../../app/core/factory/sdk';
-import { storageActions } from '../../app/store/slices/storage';
-import { store } from '../../app/store';
-import notificationsService, { ToastType } from '../../app/notifications/services/notifications.service';
-import { DriveItemData } from '../../app/drive/types';
-import { AddItemsToTrashPayload } from '@internxt/sdk/dist/drive/trash/types';
 import { Trash } from '@internxt/sdk/dist/drive';
-import recoverItemsFromTrash from './recover-items-from-trash';
-import { deleteDatabaseItems } from '../../app/drive/services/database.service';
+import { AddItemsToTrashPayload } from '@internxt/sdk/dist/drive/trash/types';
+import storageThunks from 'app/store/slices/storage/storage.thunks';
 import { t } from 'i18next';
+import { SdkFactory } from '../../app/core/factory/sdk';
 import errorService from '../../app/core/services/error.service';
+import { deleteDatabaseItems } from '../../app/drive/services/database.service';
+import { DriveItemData } from '../../app/drive/types';
+import notificationsService, { ToastType } from '../../app/notifications/services/notifications.service';
+import { store } from '../../app/store';
+import { storageActions } from '../../app/store/slices/storage';
 
 const MAX_ITEMS_TO_DELETE = 10;
 const MAX_CONCURRENT_REQUESTS = 3;
@@ -19,7 +19,7 @@ async function sendItemsToTrashConcurrent({
   maxConcurrentRequests,
   trashClient,
 }: {
-  items: { id: number | string; type: string }[];
+  items: { uuid: string; type: string }[];
   maxItemsToDelete: number;
   maxConcurrentRequests: number;
   trashClient: Trash;
@@ -43,16 +43,16 @@ async function sendItemsToTrashConcurrent({
 }
 
 const moveItemsToTrash = async (itemsToTrash: DriveItemData[], onSuccess?: () => void): Promise<void> => {
-  const items: Array<{ id: number | string; type: string }> = itemsToTrash.map((item) => {
+  const items: Array<{ uuid: string; type: string }> = itemsToTrash.map((item) => {
     return {
-      id: item.isFolder ? item.id : item.fileId,
+      uuid: item.uuid,
       type: item.isFolder ? 'folder' : 'file',
     };
   });
   let movingItemsToastId;
 
   try {
-    const trashClient = await SdkFactory.getNewApiInstance().createTrashClient();
+    const trashClient = SdkFactory.getNewApiInstance().createTrashClient();
 
     movingItemsToastId = notificationsService.show({
       type: ToastType.Loading,
@@ -92,13 +92,19 @@ const moveItemsToTrash = async (itemsToTrash: DriveItemData[], onSuccess?: () =>
         onClick: async () => {
           notificationsService.dismiss(id);
           if (itemsToTrash.length > 0) {
-            const destinationId = itemsToTrash[0].isFolder ? itemsToTrash[0].parentId : itemsToTrash[0].folderId;
+            const destinationId = itemsToTrash[0].isFolder ? itemsToTrash[0].parentUuid : itemsToTrash[0].folderUuid;
+
             store.dispatch(
               storageActions.pushItems({ updateRecents: true, items: itemsToTrash, folderIds: [destinationId] }),
             );
 
             store.dispatch(storageActions.clearSelectedItems());
-            await recoverItemsFromTrash(itemsToTrash, destinationId, t);
+            await store.dispatch(
+              storageThunks.moveItemsThunk({
+                items: itemsToTrash,
+                destinationFolderId: destinationId,
+              }),
+            );
           }
         },
       },
diff --git a/src/use_cases/trash/recover-items-from-trash.ts b/src/use_cases/trash/recover-items-from-trash.ts
deleted file mode 100644
index 07540dc05..000000000
--- a/src/use_cases/trash/recover-items-from-trash.ts
+++ /dev/null
@@ -1,147 +0,0 @@
-import { SdkFactory } from 'app/core/factory/sdk';
-import { StorageTypes } from '@internxt/sdk/dist/drive';
-import analyticsService from 'app/analytics/services/analytics.service';
-import errorService from 'app/core/services/error.service';
-import localStorageService from 'app/core/services/local-storage.service';
-import { DevicePlatform } from 'app/core/types';
-import { t } from 'i18next';
-import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
-import * as uuid from 'uuid';
-import { store } from '../../app/store';
-import { storageActions } from 'app/store/slices/storage';
-import notificationsService, { ToastType } from 'app/notifications/services/notifications.service';
-import databaseService, { DatabaseCollection } from 'app/database/services/database.service';
-import itemsListService from 'app/drive/services/items-list.service';
-import { DriveItemData } from 'app/drive/types';
-import { TFunction } from 'i18next';
-
-async function trackMove(response, type) {
-  const user = localStorageService.getUser() as UserSettings;
-  analyticsService.trackMoveItem(type, {
-    file_id: response.item.id,
-    email: user.email,
-    platform: DevicePlatform.Web,
-  });
-  return response;
-}
-
-function handleError(err: unknown) {
-  const castedError = errorService.castError(err);
-  if (castedError.message.includes('same name')) {
-    notificationsService.show({ text: 'Item with same name already exists', type: ToastType.Error });
-  } else {
-    if (castedError.status) {
-      castedError.message = t(`tasks.move-folder.errors.${castedError.status}`);
-    }
-  }
-}
-
-function moveFile(
-  item: DriveItemData,
-  fileId: string,
-  destination: number,
-  bucketId: string,
-  failedItems: DriveItemData[],
-): Promise<StorageTypes.MoveFileResponse> {
-  const storageClient = SdkFactory.getInstance().createStorageClient();
-  const payload: StorageTypes.MoveFilePayload = {
-    fileId: fileId,
-    destination: destination,
-    bucketId: bucketId,
-    destinationPath: uuid.v4(),
-  };
-  return storageClient
-
-    .moveFile(payload)
-    .then((response) => trackMove(response, 'file'))
-    .catch((error) => {
-      errorService.reportError(error);
-      failedItems.push(item);
-      handleError(error);
-    });
-}
-
-function moveFolder(
-  item: DriveItemData,
-  folderId: number,
-  destination: number,
-  failedItems: DriveItemData[],
-): Promise<StorageTypes.MoveFolderResponse> {
-  const storageClient = SdkFactory.getInstance().createStorageClient();
-  const payload: StorageTypes.MoveFolderPayload = {
-    folderId: folderId,
-    destinationFolderId: destination,
-  };
-  return storageClient
-    .moveFolder(payload)
-    .then((response) => trackMove(response, 'folder'))
-    .catch((error) => {
-      errorService.reportError(error);
-      failedItems.push(item);
-      handleError(error);
-    });
-}
-
-async function afterMoving(
-  itemsToRecover: DriveItemData[],
-  destinationId: number,
-  failedItems: DriveItemData[],
-  t: TFunction,
-  isTrash = false,
-): Promise<void> {
-  itemsToRecover = itemsToRecover.filter((el) => !failedItems.includes(el));
-
-  if (itemsToRecover.length > 0) {
-    const destinationLevelDatabaseContent = await databaseService.get(DatabaseCollection.Levels, destinationId);
-    if (destinationLevelDatabaseContent) {
-      databaseService.put(
-        DatabaseCollection.Levels,
-        destinationId,
-        itemsListService.pushItems(itemsToRecover, destinationLevelDatabaseContent),
-      );
-    }
-    store.dispatch(storageActions.popItemsToDelete(itemsToRecover));
-    store.dispatch(storageActions.clearSelectedItems());
-
-    const translationKey = isTrash ? 'notificationMessages.restoreItems' : 'notificationMessages.moveItems';
-
-    const toastText = t(translationKey, {
-      [isTrash ? 'itemsToRecover' : 'itemsToMove']:
-        itemsToRecover.length > 1
-          ? t('general.files')
-          : itemsToRecover[0].isFolder
-          ? t('general.folder')
-          : t('general.file'),
-      s: itemsToRecover.length > 1 ? 'os' : itemsToRecover[0].isFolder ? 'a' : 'o',
-    });
-
-    notificationsService.show({
-      type: ToastType.Success,
-      text: toastText,
-    });
-  }
-
-  if (failedItems.length > 0) {
-    store.dispatch(storageActions.popItems({ updateRecents: true, items: failedItems }));
-    store.dispatch(storageActions.clearSelectedItems());
-  }
-}
-
-const moveItems = async (
-  itemsToRecover: DriveItemData[],
-  destinationId: number,
-  t: TFunction,
-  isTrash = true,
-): Promise<void> => {
-  const failedItems: DriveItemData[] = [];
-  for (const item of itemsToRecover) {
-    if (item.isFolder) {
-      await moveFolder(item, item.id, destinationId, failedItems);
-    } else {
-      await moveFile(item, item.fileId, destinationId, item.bucket, failedItems);
-    }
-  }
-  return afterMoving(itemsToRecover, destinationId, failedItems, t, isTrash);
-};
-
-export default moveItems;
diff --git a/tailwind.config.js b/tailwind.config.js
index d020558c4..3d6e3e991 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -154,6 +154,7 @@ module.exports = {
         112: '28rem',
         120: '30rem',
         156: '37.5rem',
+        640: '40rem',
       },
       maxWidth: {
         xxxs: '220px',
diff --git a/test/e2e/cypress.json b/test/e2e/cypress.json
index e241c8710..f587d6ecc 100644
--- a/test/e2e/cypress.json
+++ b/test/e2e/cypress.json
@@ -23,7 +23,6 @@
     "remove-folder.spec.ts",
     "delete-file.spec.ts",
     "drag-and-drop.spec.ts",
-    "photos.spec.ts",
     "change-password.spec.ts"
   ],
   "viewportWidth": 1500,
diff --git a/test/e2e/cypress/integration/photos.spec.ts b/test/e2e/cypress/integration/photos.spec.ts
deleted file mode 100644
index 76ed2ef0e..000000000
--- a/test/e2e/cypress/integration/photos.spec.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-/* eslint-disable cypress/unsafe-to-chain-command */
-import { join } from 'path';
-import { MOCK, mockPhotos, photos_data } from '../utils/photos.mock';
-
-describe('Photos panel', () => {
-  const downloadsFolder = String(Cypress.config('downloadsFolder'));
-
-  beforeEach(() => {
-    cy.clearLocalStorage();
-    cy.login();
-  });
-
-  it('CY-01_Should list 0 photos', () => {
-    mockPhotos(MOCK.EMPTY);
-    cy.visit('/photos');
-
-    cy.get('[data-test=photos-gallery]').should('be.visible');
-    cy.get('[data-test=photos-gallery]').contains('Your photo gallery is empty');
-    cy.get('[data-test=photos-grid]').should('not.exist');
-  });
-
-  it('CY-02_Should list 1 photo', () => {
-    mockPhotos(MOCK.PHOTO1);
-    cy.visit('/photos');
-
-    cy.get('[data-test=photos-gallery]').should('be.visible');
-    cy.get('[data-test=photos-grid]').should('be.visible');
-    cy.get('[data-test=photos-grid]').find('[data-test^="photos-item-"] > .relative').should('have.length', 1);
-  });
-
-  it('CY-03_Should list 2 photos', () => {
-    mockPhotos(MOCK.MULTIPLE);
-    cy.visit('/photos');
-
-    cy.get('[data-test=photos-gallery]').should('be.visible');
-    cy.get('[data-test=photos-grid]').should('be.visible');
-    cy.get('[data-test=photos-grid]').find('[data-test^="photos-item-"] > .relative').should('have.length', 2);
-  });
-
-  it('CY-04_Should do a fullscreen preview', () => {
-    mockPhotos(MOCK.MULTIPLE);
-    cy.visit('/photos');
-
-    const photoId = photos_data.PHOTO1.photoId;
-    cy.get('[data-test=photos-item-' + photoId + ']')
-      .find('img')
-      .click({ force: true });
-    cy.get('[data-test=photos-preview]').find('img').should('be.visible');
-  });
-
-  it('CY-05_Should download 1 photo', () => {
-    mockPhotos(MOCK.PHOTO1);
-    cy.visit('/photos');
-
-    const photo1 = photos_data.PHOTO1;
-    cy.get('[data-test=photos-item-selector-' + photo1.photoId + ']').click({ force: true });
-
-    cy.get('[data-test=photos-download-selected]').should('be.visible');
-    cy.get('[data-test=photos-download-selected]')
-      .click({ force: true })
-      .then(() => {
-        cy.readFile(join(downloadsFolder, photo1.photoName), 'binary', { timeout: 15000 });
-        // TODO not only check if the photo had been downloaded (it should be compared with the desired photo)
-        // i've tried to compare files but it runs out of memory
-      });
-  });
-
-  it('CY-06_Should download multiple photos', () => {
-    mockPhotos(MOCK.MULTIPLE);
-    cy.visit('/photos');
-
-    const photos = [photos_data.PHOTO1, photos_data.PHOTO2];
-    const resultZipName = 'photos.zip';
-
-    for (const photo of photos) {
-      cy.get('[data-test=photos-item-selector-' + photo.photoId + ']').click({ force: true });
-    }
-
-    cy.get('[data-test=photos-download-selected]').should('be.visible');
-    cy.get('[data-test=photos-download-selected]')
-      .click({ force: true })
-      .then(() => {
-        cy.readFile(join(downloadsFolder, resultZipName), 'binary', { timeout: 30000 });
-        // TODO not only check if the zip had been downloaded (it should be compared with the desired zip)
-        // i've tried to compare files but it runs out of memory
-      });
-  });
-});
diff --git a/test/e2e/cypress/utils/photos.mock.ts b/test/e2e/cypress/utils/photos.mock.ts
deleted file mode 100644
index 6ad64ec3e..000000000
--- a/test/e2e/cypress/utils/photos.mock.ts
+++ /dev/null
@@ -1,194 +0,0 @@
-const URL_PHOTOS = Cypress.env('REACT_APP_PHOTOS_API_URL');
-const URL_BRIDGE = Cypress.env('REACT_APP_STORJ_BRIDGE');
-const REACT_APP_PROXY = Cypress.env('REACT_APP_PROXY') ? Cypress.env('REACT_APP_PROXY') + '/' : '';
-
-export enum MOCK {
-  EMPTY = 'EMPTY',
-  PHOTO1 = 'PHOTO1',
-  PHOTO2 = 'PHOTO2',
-  MULTIPLE = 'MULTIPLE',
-}
-
-export const photos_data = {
-  BUCKET_ID: 'a528a6f703f27784eb101875',
-  PHOTO1: {
-    photoId: '637e3eecd77420b8a8e5cca5',
-    photoName: 'IMG20221117114447.jpg',
-    photoFileId: '637e3ee9f338d10007d10e5f',
-    previewId: '637e3ee65cec070007e3efcf',
-  },
-  PHOTO2: {
-    photoId: '637e3ef1d8426672d93a336e',
-    photoName: 'IMG20221117114446.jpg',
-    photoFileId: '637e3eb2e616ee0007f34d9c',
-    previewId: '637e3eedf338d10007d10e64',
-  },
-};
-
-export const mockPhotos = (typeMock: MOCK): void => {
-  mockDefaultApis();
-  switch (typeMock) {
-    case MOCK.EMPTY:
-      mockResultsEmpty();
-      break;
-    case MOCK.PHOTO1:
-      mockResults1();
-      mockPhoto1();
-      break;
-    case MOCK.MULTIPLE:
-      mockResultsMultiple();
-      mockMultiplePhotos();
-      break;
-  }
-};
-
-const GET_PHOTOS_PATH =
-  '/photos/sorted?includeDownloadLinks=true&limit=60&skip=0&sortBy=takenAt&sortType=DESC&status=EXISTS';
-
-const mockDefaultApis = () => {
-  cy.intercept('GET', URL_PHOTOS + '/photos/usage', {
-    statusCode: 200,
-    body: '{"usage":6094182}',
-    headers: {
-      'Content-Type': 'application/json; charset=utf-8',
-    },
-  });
-};
-
-const mockResultsEmpty = () => {
-  cy.intercept('GET', URL_PHOTOS + GET_PHOTOS_PATH, {
-    statusCode: 500,
-    body: '',
-  });
-};
-
-const mockResults1 = () => {
-  cy.intercept('GET', URL_PHOTOS + GET_PHOTOS_PATH, {
-    //get 1 photo
-    statusCode: 200,
-    fixture: 'photos/common/mock-results-1.json',
-    headers: {
-      'Content-Type': 'application/json; charset=utf-8',
-    },
-  });
-};
-
-const mockResultsMultiple = () => {
-  cy.intercept('GET', URL_PHOTOS + GET_PHOTOS_PATH, {
-    //get all photos
-    statusCode: 200,
-    fixture: 'photos/common/mock-results-multiple.json',
-    headers: {
-      'Content-Type': 'application/json; charset=utf-8',
-    },
-  });
-};
-
-const mockPhoto1 = () => {
-  //get photo preview info
-  cy.intercept(
-    'OPTIONS',
-    URL_BRIDGE + '/buckets/' + photos_data.BUCKET_ID + '/files/' + photos_data.PHOTO1.previewId + '/info',
-    {
-      statusCode: 200,
-    },
-  );
-  cy.intercept(
-    'GET',
-    URL_BRIDGE + '/buckets/' + photos_data.BUCKET_ID + '/files/' + photos_data.PHOTO1.previewId + '/info',
-    {
-      statusCode: 200,
-      fixture: 'photos/common/mock-preview-info-1.json',
-      headers: {
-        'Content-Type': 'application/json; charset=utf-8',
-      },
-    },
-  );
-  //get photo preview file
-  cy.intercept('GET', REACT_APP_PROXY + 'https://storage.gra.cloud.ovh.net/mock/' + photos_data.PHOTO1.previewId, {
-    statusCode: 200,
-    fixture: 'photos/common/mock-preview-photo-1.blob',
-  });
-
-  //get photo info
-  cy.intercept(
-    'OPTIONS',
-    URL_BRIDGE + '/buckets/' + photos_data.BUCKET_ID + '/files/' + photos_data.PHOTO1.photoFileId + '/info',
-    {
-      statusCode: 200,
-    },
-  );
-  cy.intercept(
-    'GET',
-    URL_BRIDGE + '/buckets/' + photos_data.BUCKET_ID + '/files/' + photos_data.PHOTO1.photoFileId + '/info',
-    {
-      statusCode: 200,
-      fixture: 'photos/common/mock-info-1.json',
-      headers: {
-        'Content-Type': 'application/json; charset=utf-8',
-      },
-    },
-  );
-  //get photo file
-  cy.intercept('GET', REACT_APP_PROXY + 'https://storage.gra.cloud.ovh.net/mock/' + photos_data.PHOTO1.photoFileId, {
-    statusCode: 200,
-    fixture: 'photos/common/mock-photo-1.blob',
-  });
-};
-
-const mockPhoto2 = () => {
-  //get photo preview info
-  cy.intercept(
-    'OPTIONS',
-    URL_BRIDGE + '/buckets/' + photos_data.BUCKET_ID + '/files/' + photos_data.PHOTO2.previewId + '/info',
-    {
-      statusCode: 200,
-    },
-  );
-  cy.intercept(
-    'GET',
-    URL_BRIDGE + '/buckets/' + photos_data.BUCKET_ID + '/files/' + photos_data.PHOTO2.previewId + '/info',
-    {
-      statusCode: 200,
-      fixture: 'photos/common/mock-preview-info-2.json',
-      headers: {
-        'Content-Type': 'application/json; charset=utf-8',
-      },
-    },
-  );
-  //get photo preview file
-  cy.intercept('GET', REACT_APP_PROXY + 'https://storage.gra.cloud.ovh.net/mock/' + photos_data.PHOTO2.previewId, {
-    statusCode: 200,
-    fixture: 'photos/common/mock-preview-photo-2.blob',
-  });
-
-  //get photo info
-  cy.intercept(
-    'OPTIONS',
-    URL_BRIDGE + '/buckets/' + photos_data.BUCKET_ID + '/files/' + photos_data.PHOTO2.photoFileId + '/info',
-    {
-      statusCode: 200,
-    },
-  );
-  cy.intercept(
-    'GET',
-    URL_BRIDGE + '/buckets/' + photos_data.BUCKET_ID + '/files/' + photos_data.PHOTO2.photoFileId + '/info',
-    {
-      statusCode: 200,
-      fixture: 'photos/common/mock-info-2.json',
-      headers: {
-        'Content-Type': 'application/json; charset=utf-8',
-      },
-    },
-  );
-  //get photo file
-  cy.intercept('GET', REACT_APP_PROXY + 'https://storage.gra.cloud.ovh.net/mock/' + photos_data.PHOTO2.photoFileId, {
-    statusCode: 200,
-    fixture: 'photos/common/mock-photo-2.blob',
-  });
-};
-
-const mockMultiplePhotos = () => {
-  mockPhoto1();
-  mockPhoto2();
-};
diff --git a/yarn.lock b/yarn.lock
index a96edf326..901165e54 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1612,10 +1612,10 @@
   resolved "https://npm.pkg.github.com/download/@internxt/prettier-config/1.0.2/5bd220b8de76734448db5475b3e0c01f9d22c19b#5bd220b8de76734448db5475b3e0c01f9d22c19b"
   integrity sha512-t4HiqvCbC7XgQepwWlIaFJe3iwW7HCf6xOSU9nKTV0tiGqOPz7xMtIgLEloQrDA34Cx4PkOYBXrvFPV6RxSFAA==
 
-"@internxt/sdk@^1.4.77":
-  version "1.4.77"
-  resolved "https://npm.pkg.github.com/download/@internxt/sdk/1.4.77/c0d13047a95df03b589b9e09502e3cd6f16928e0#c0d13047a95df03b589b9e09502e3cd6f16928e0"
-  integrity sha512-TYghDpyImfOy8amMrz7TZbkYRAEDkMl1LGCbqB2nU40jc+zIvuS2GworLn2kTsGmZA6Oz7tc/EGlg1gZ6vPbBw==
+"@internxt/sdk@^1.5.3":
+  version "1.5.3"
+  resolved "https://npm.pkg.github.com/download/@internxt/sdk/1.5.3/be37cfa86f822be80c4f7ea7fd8c8f3666474d05#be37cfa86f822be80c4f7ea7fd8c8f3666474d05"
+  integrity sha512-pL2dxfuTh329vnup3jHq/IvIySPoRNwXaaRLDfMEETraWMl1c0J/C96hyFyEW6mKn5ICZ641XshBYPhMOdMPZg==
   dependencies:
     axios "^0.24.0"
     query-string "^7.1.0"
@@ -2744,10 +2744,10 @@
   resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.5.tgz#38bd1733ae299620771bd414837ade2e57757498"
   integrity sha512-xrO9OoVPqFuYyR/loIHjnbvvyRZREYKLjxV4+dY6v3FQR3stQ9ZxIGkaclF7YhI9hfjpuTbu14hZEy94qKLtOA==
 
-"@types/react-avatar-editor@^12.0.0":
-  version "12.0.0"
-  resolved "https://registry.yarnpkg.com/@types/react-avatar-editor/-/react-avatar-editor-12.0.0.tgz#f800d63fd8fef1d149340d2b295a086fd58eb01e"
-  integrity sha512-835jSnCdQ2Kgrtz2sTYKMv9YSGJG0j2vd8C0sxWtYJoYOmYPs8nt25rTsbCOha3SVzWNiuw1TOQCVqN0iBQgrw==
+"@types/react-avatar-editor@^13.0.2":
+  version "13.0.2"
+  resolved "https://registry.yarnpkg.com/@types/react-avatar-editor/-/react-avatar-editor-13.0.2.tgz#26c58252e8465f5a99dd146072fe9351c07b9c3f"
+  integrity sha512-vnGU4sx5TDB9JMCuw+kB3+jfDNMhVlpBbgMRZG9NzVnaBb5xUjVV4VmHdD2O8gj/pb5GN+QXKk7jan09aMjG2A==
   dependencies:
     "@types/react" "*"
 
@@ -6387,6 +6387,11 @@ fecha@^4.2.0:
   resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.3.tgz#4d9ccdbc61e8629b259fdca67e65891448d569fd"
   integrity sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==
 
+fflate@^0.8.2:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/fflate/-/fflate-0.8.2.tgz#fc8631f5347812ad6028bbe4a2308b2792aa1dea"
+  integrity sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==
+
 figures@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
@@ -10691,10 +10696,10 @@ react-app-polyfill@^3.0.0:
     regenerator-runtime "^0.13.9"
     whatwg-fetch "^3.6.2"
 
-react-avatar-editor@^13.0.0:
-  version "13.0.0"
-  resolved "https://registry.yarnpkg.com/react-avatar-editor/-/react-avatar-editor-13.0.0.tgz#55013625ee9ae715c1fe2dc553b8079994d8a5f2"
-  integrity sha512-0xw63MbRRQdDy7YI1IXU9+7tTFxYEFLV8CABvryYOGjZmXRTH2/UA0mafe57ns62uaEFX181kA4XlGlxCaeXKA==
+react-avatar-editor@^13.0.2:
+  version "13.0.2"
+  resolved "https://registry.yarnpkg.com/react-avatar-editor/-/react-avatar-editor-13.0.2.tgz#7ed5a1fd7a9e7bd4b320a3a65df32d3d0e21eb10"
+  integrity sha512-a4ajbi7lwDh98kgEtSEeKMu0vs0CHTczkq4Xcxr1EiwMFH1GlgHCEtwGU8q/H5W8SeLnH4KPK8LUjEEaZXklxQ==
   dependencies:
     "@babel/plugin-transform-runtime" "^7.12.1"
     "@babel/runtime" "^7.12.5"
@@ -10852,6 +10857,11 @@ react-infinite-scroll-component@6.1.0:
   dependencies:
     throttle-debounce "^2.1.0"
 
+react-international-phone@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/react-international-phone/-/react-international-phone-4.3.0.tgz#cb04295b13b5a55f50f36e3c0b7f6c2dc549bb6c"
+  integrity sha512-lIntIkwq2j0m3j4RsRiGJl/buHMLBd+mQ9S9RfiX3KbiUCUtbawoPCV2r8BvyeRMZI0cDtovoukBCuZ+70QzJA==
+
 react-is@^16.13.1, react-is@^16.3.2, react-is@^16.6.0, react-is@^16.7.0:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"