diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 9b3dc87f3d..2914650654 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -109,7 +109,7 @@ jobs:
       fail-fast: false
       matrix:
         e2e-suites:
-          - name: "listViews,navigation"
+          - name: "listViews"
             id: 1
           - name: "search"
             id: 2
@@ -119,22 +119,14 @@ jobs:
             id: 4
           - name: "pagination"
             id: 5
-          - name: "actionsAvailableFilesFolders"
-            id: 6
-          - name: "actionsAvailableLibraries,actionsAvailableNewMenu"
-            id: 7
-          - name: "actionsAvailableSpecialPermissions"
-            id: 8
           - name: "copyMoveActions"
-            id: 9
+            id: 6
           - name: "deleteActions"
-            id: 10
+            id: 7
           - name: "editActions,favoriteActions"
-            id: 11
-          - name: "libraryActions"
-            id: 12
+            id: 8
           - name: "uploadDownloadActions"
-            id: 13
+            id: 9
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -182,6 +174,8 @@ jobs:
             id: 5
           - name: "special-permissions"
             id: 6
+          - name: "pagination"
+            id: 7
     steps:
       - name: Checkout
         uses: actions/checkout@v3
diff --git a/app/src/app.config.json b/app/src/app.config.json
index 6fbceff50a..c28817d8e8 100644
--- a/app/src/app.config.json
+++ b/app/src/app.config.json
@@ -12,14 +12,17 @@
   "plugins": {
     "aosPlugin": true,
     "contentService": true,
-    "folderRules": true
+    "folderRules": true,
+    "tags": true,
+    "categories": true
   },
   "oauth2": {
     "host": "{protocol}//{hostname}{:port}/auth/realms/alfresco",
     "clientId": "alfresco",
     "scope": "openid",
     "secret": "",
-    "implicitFlow": true,
+    "implicitFlow": false,
+    "codeFlow": true,
     "silentLogin": true,
     "publicUrls": ["**/preview/s/*", "**/settings", "**/blank"],
     "redirectSilentIframeUri": "{protocol}//{hostname}{:port}/assets/silent-refresh.html",
diff --git a/app/src/app/app.component.html b/app/src/app/app.component.html
index 8d2522a861..862e06c534 100644
--- a/app/src/app/app.component.html
+++ b/app/src/app/app.component.html
@@ -1,2 +1,2 @@
-<h1 class="sr-only" title="{{pageHeading | async | translate}}">{{ pageHeading | async | translate }}</h1>
+<h1 class="aca-sr-only" title="{{pageHeading | async | translate}}">{{ pageHeading | async | translate }}</h1>
 <router-outlet></router-outlet>
diff --git a/app/src/app/app.component.scss b/app/src/app/app.component.scss
index e79d1f871b..6e9a3a513d 100644
--- a/app/src/app/app.component.scss
+++ b/app/src/app/app.component.scss
@@ -2,7 +2,7 @@ app-root {
   display: flex;
   flex: 1;
 
-  .sr-only {
+  .aca-sr-only {
     position: absolute;
     width: 1px;
     height: 1px;
diff --git a/docker/docker-entrypoint.d/30-sed-on-appconfig.sh b/docker/docker-entrypoint.d/30-sed-on-appconfig.sh
index 2fd0a52568..603719d4c4 100755
--- a/docker/docker-entrypoint.d/30-sed-on-appconfig.sh
+++ b/docker/docker-entrypoint.d/30-sed-on-appconfig.sh
@@ -50,6 +50,13 @@ if [ -n "${APP_CONFIG_OAUTH2_IMPLICIT_FLOW}" ]; then
     -i "$APP_CONFIG_FILE"
 fi
 
+if [ -n "${APP_CONFIG_OAUTH2_CODE_FLOW}" ]; then
+  echo "SET APP_CONFIG_OAUTH2_CODE_FLOW"
+
+  sed -e "s/\"codeFlow\": [^,]*/\"codeFlow\": ${APP_CONFIG_OAUTH2_CODE_FLOW}/g" \
+    -i "$APP_CONFIG_FILE"
+fi
+
 if [ -n "${APP_CONFIG_OAUTH2_SILENT_LOGIN}" ]; then
   echo "SET APP_CONFIG_OAUTH2_SILENT_LOGIN"
 
diff --git a/docs/getting-started/docker.md b/docs/getting-started/docker.md
index f9d115ed8f..fd8483982c 100644
--- a/docs/getting-started/docker.md
+++ b/docs/getting-started/docker.md
@@ -74,6 +74,7 @@ docker run --rm -it \
 | APP_CONFIG_OAUTH2_HOST                       | `oauth2.host`                    |
 | APP_CONFIG_OAUTH2_CLIENTID                   | `oauth2.clientId`                |
 | APP_CONFIG_OAUTH2_IMPLICIT_FLOW              | `oauth2.implicitFlow`            |
+| APP_CONFIG_OAUTH2_CODE_FLOW                  | `oauth2.codeFlow`                |
 | APP_CONFIG_OAUTH2_SILENT_LOGIN               | `oauth2.silentLogin`             |
 | APP_CONFIG_OAUTH2_REDIRECT_SILENT_IFRAME_URI | `oauth2.redirectSilentIframeUri` |
 | APP_CONFIG_OAUTH2_REDIRECT_LOGIN             | `oauth2.redirectUri`             |
diff --git a/docs/getting-started/sso.md b/docs/getting-started/sso.md
index c0f02b363d..61a6d14583 100644
--- a/docs/getting-started/sso.md
+++ b/docs/getting-started/sso.md
@@ -22,7 +22,8 @@ You can find the settings in the `app.config.json` file, and they look similar t
     "clientId": "alfresco",
     "scope": "openid",
     "secret": "",
-    "implicitFlow": true,
+    "implicitFlow": false,
+    "codeFlow": true,
     "silentLogin": true,
     "redirectSilentIframeUri": "./assets/silent-refresh.html",
     "redirectUri": "/",
diff --git a/docs/ja/getting-started/sso.md b/docs/ja/getting-started/sso.md
index 203ec75b3e..b46076a031 100644
--- a/docs/ja/getting-started/sso.md
+++ b/docs/ja/getting-started/sso.md
@@ -23,7 +23,8 @@ Basic 認証に加えて、Content Application を以下で使用できます:
     "clientId": "alfresco",
     "scope": "openid",
     "secret": "",
-    "implicitFlow": true,
+    "implicitFlow": false,
+    "codeFlow": true,
     "silentLogin": true,
     "redirectSilentIframeUri": "./assets/silent-refresh.html",
     "redirectUri": "/",
diff --git a/e2e/playwright/actions/src/tests/create-folder.spec.ts b/e2e/playwright/actions/src/tests/create-folder.spec.ts
index ae13e6e8ff..649118cc3b 100644
--- a/e2e/playwright/actions/src/tests/create-folder.spec.ts
+++ b/e2e/playwright/actions/src/tests/create-folder.spec.ts
@@ -33,7 +33,6 @@ import {
   errorStrings,
   test
 } from '@alfresco/playwright-shared';
-import { logger } from '@alfresco/adf-cli/scripts/logger';
 
 test.describe('Create folders', () => {
   const apiClientFactory = new ApiClientFactory();
@@ -56,7 +55,7 @@ test.describe('Create folders', () => {
       nodesApi = await NodesApi.initialize(username, username);
       await nodesApi.createFolder(commonFolderName);
     } catch (error) {
-      logger.error(`beforeAll failed : ${error}`);
+      console.error(`beforeAll failed : ${error}`);
     }
   });
 
@@ -77,7 +76,7 @@ test.describe('Create folders', () => {
       await personalFiles.navigate();
       await personalFiles.selectCreateFolder();
     } catch (error) {
-      logger.error(`beforeEach failed : ${error}`);
+      console.error(`beforeEach failed : ${error}`);
     }
   });
 
@@ -85,7 +84,7 @@ test.describe('Create folders', () => {
     try {
       await nodesApi.deleteCurrentUserNodes();
     } catch (error) {
-      logger.error(`afterAll failed : ${error}`);
+      console.error(`afterAll failed : ${error}`);
     }
   });
 
diff --git a/e2e/playwright/actions/src/tests/create-library.spec.ts b/e2e/playwright/actions/src/tests/create-library.spec.ts
index bde61ce502..75b0fae39e 100644
--- a/e2e/playwright/actions/src/tests/create-library.spec.ts
+++ b/e2e/playwright/actions/src/tests/create-library.spec.ts
@@ -35,7 +35,6 @@ import {
   Breadcrumb,
   TrashcanApi
 } from '@alfresco/playwright-shared';
-import { logger } from '@alfresco/adf-cli/scripts/logger';
 
 test.describe('Create Libraries ', () => {
   const apiClientFactory = new ApiClientFactory();
@@ -70,7 +69,7 @@ test.describe('Create Libraries ', () => {
       await sitesApi.createSite(commonTrashLibraryName);
       await sitesApi.deleteSites([commonTrashLibraryName], false);
     } catch (error) {
-      logger.error(`beforeAll failed : ${error}`);
+      console.error(`beforeAll failed : ${error}`);
     }
   });
 
@@ -91,7 +90,7 @@ test.describe('Create Libraries ', () => {
       await myLibrariesPage.navigate();
       await myLibrariesPage.selectCreateLibrary();
     } catch (error) {
-      logger.error(`beforeEach failed : ${error}`);
+      console.error(`beforeEach failed : ${error}`);
     }
   });
 
@@ -101,7 +100,7 @@ test.describe('Create Libraries ', () => {
       const trashcanApi = await TrashcanApi.initialize(username, username);
       await trashcanApi.emptyTrashcan();
     } catch (error) {
-      logger.error(`afterAll failed : ${error}`);
+      console.error(`afterAll failed : ${error}`);
     }
   });
 
diff --git a/e2e/playwright/actions/src/tests/library/library-actions.spec.ts b/e2e/playwright/actions/src/tests/library/library-actions.spec.ts
new file mode 100644
index 0000000000..a95ee341bc
--- /dev/null
+++ b/e2e/playwright/actions/src/tests/library/library-actions.spec.ts
@@ -0,0 +1,442 @@
+/*!
+ * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
+ *
+ * Alfresco Example Content Application
+ *
+ * This file is part of the Alfresco Example Content Application.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * The Alfresco Example Content Application is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import { expect } from '@playwright/test';
+import {
+  Utils,
+  ApiClientFactory,
+  test,
+  SitesApi,
+  FavoritesPageApi,
+  timeouts,
+  DataTableComponent,
+  SnackBarComponent,
+  AdfConfirmDialogComponent,
+  AcaHeader,
+  MatMenuComponent,
+  TrashcanApi
+} from '@alfresco/playwright-shared';
+import { Site } from '@alfresco/js-api';
+
+test.describe('Library actions ', () => {
+  const notMemberString = 'Not a member';
+  const managerRole = 'Manager';
+  const contributorRole = 'Contributor';
+  const consumerRole = 'Consumer';
+  const joinButton = 'Join';
+  const libraryJoinedMessage = 'Library joined';
+  const requestToJoinMessage = 'Request sent to join this library';
+  const cancelJoinRequestButton = 'Cancel Join Request';
+  const cancelJoinRequestMessage = 'Canceled the request to join the library';
+  const leaveLibraryButton = 'Leave Library';
+  const leftMessage = 'You have left the library';
+  const favoriteButton = 'Favorite';
+  const removeFavoriteButton = 'Remove Favorite';
+  const deleteButton = 'Delete';
+  const libraryDeletedMessage = 'Library deleted';
+  const siteString = 'site';
+  const loadString = 'load';
+  const domContentLoadedString = 'domcontentloaded';
+
+  const username2 = `user-${Utils.random()}`;
+  const adminLibrary1 = `playwright-A-library-${Utils.random()}`;
+  const adminLibrary2 = `playwright-A-library-${Utils.random()}`;
+  const adminLibrary3 = `playwright-A-library-${Utils.random()}`;
+  const adminLibrary4 = `playwright-A-library-${Utils.random()}`;
+  const adminModerateLibrary1 = `playwright-Am-library-${Utils.random()}`;
+  const adminModerateLibrary2 = `playwright-Am-library-${Utils.random()}`;
+  const adminModerateLibrary3 = `playwright-Am-library-${Utils.random()}`;
+  const adminModerateLibrary4 = `playwright-Am-library-${Utils.random()}`;
+  const user1Library1 = `playwright-U1-library-${Utils.random()}`;
+  const user1Library2 = `playwright-U1-library-${Utils.random()}`;
+  const user1Library3 = `playwright-U1-library-${Utils.random()}`;
+  const user1Library4 = `playwright-U1-library-${Utils.random()}`;
+  const user1Library5 = `playwright-U1-library-${Utils.random()}`;
+  const user2Library1 = `playwright-U2-library-${Utils.random()}`;
+  const user2Library2 = `playwright-U2-library-${Utils.random()}`;
+  const user2Library3 = `playwright-U2-library-${Utils.random()}`;
+  const user2Library4 = `playwright-U2-library-${Utils.random()}`;
+  const user2Library5Delete = `playwright-T-library-${Utils.random()}`;
+  const user2Library6Delete = `playwright-T-library-${Utils.random()}`;
+  const user2Library7Delete = `playwright-T-library-${Utils.random()}`;
+
+  const adminLibraryIds = [adminLibrary1, adminLibrary2, adminLibrary3, adminLibrary4];
+  const adminModerateLibraryIds = [adminModerateLibrary1, adminModerateLibrary2, adminModerateLibrary3, adminModerateLibrary4];
+  const user1LibraryIds = [user1Library1, user1Library2, user1Library3, user1Library4, user1Library5];
+  const user2LibraryIds = [user2Library1, user2Library2, user2Library3, user2Library4];
+
+  let adminSitesApi: SitesApi;
+  let user2SitesApi: SitesApi;
+
+  test.beforeAll(async () => {
+    test.setTimeout(timeouts.extendedTest);
+    const apiClientFactory = new ApiClientFactory();
+    const username1 = `user-${Utils.random()}`;
+    const siteRoles = [
+      Site.RoleEnum.SiteManager,
+      Site.RoleEnum.SiteContributor,
+      Site.RoleEnum.SiteCollaborator,
+      Site.RoleEnum.SiteConsumer,
+      Site.RoleEnum.SiteManager
+    ];
+    const user2LibraryIdsDelete = [user2Library5Delete, user2Library6Delete, user2Library7Delete];
+    try {
+      await apiClientFactory.setUpAcaBackend('admin');
+      await apiClientFactory.createUser({ username: username1 });
+      await apiClientFactory.createUser({ username: username2 });
+
+      adminSitesApi = await SitesApi.initialize('admin');
+      for (const libraryId of adminLibraryIds) {
+        await adminSitesApi.createSite(libraryId);
+      }
+
+      for (const libraryId of adminModerateLibraryIds) {
+        await adminSitesApi.createSite(libraryId, Site.VisibilityEnum.MODERATED);
+      }
+      await adminSitesApi.addSiteMember(adminLibrary3, username2, Site.RoleEnum.SiteContributor);
+
+      const user1SitesApi = await SitesApi.initialize(username1, username1);
+      for (let i = 0; i < user1LibraryIds.length; i++) {
+        await user1SitesApi.createSite(user1LibraryIds[i]);
+        await user1SitesApi.addSiteMember(user1LibraryIds[i], username2, siteRoles[i]);
+      }
+
+      user2SitesApi = await SitesApi.initialize(username2, username2);
+      for (const libraryId of user2LibraryIds) {
+        await user2SitesApi.createSite(libraryId);
+      }
+
+      for (const libraryId of user2LibraryIdsDelete) {
+        await user2SitesApi.createSite(libraryId);
+      }
+
+      await new Promise((resolve) => setTimeout(resolve, timeouts.extraLarge));
+    } catch (error) {
+      console.error(`Main beforeAll failed : ${error}`);
+    }
+  });
+
+  test.beforeEach(async ({ loginPage, myLibrariesPage }) => {
+    try {
+      await loginPage.loginUser(
+        { username: username2, password: username2 },
+        {
+          withNavigation: true,
+          waitForLoading: true
+        }
+      );
+      await myLibrariesPage.navigate();
+    } catch (error) {
+      console.error(`Main beforeEach failed : ${error}`);
+    }
+  });
+
+  test.afterAll(async () => {
+    try {
+      await adminSitesApi.deleteSites(adminLibraryIds);
+      await adminSitesApi.deleteSites(adminModerateLibraryIds);
+      await adminSitesApi.deleteSites(user1LibraryIds);
+      await adminSitesApi.deleteSites(user2LibraryIds);
+      const trashcanApi = await TrashcanApi.initialize(username2, username2);
+      await trashcanApi.emptyTrashcan();
+    } catch (error) {
+      console.error(`Main afterAll failed : ${error}`);
+    }
+  });
+
+  test.describe('My Libraries page', () => {
+    let libraryTable: DataTableComponent;
+    let snackBar: SnackBarComponent;
+    let confirmDialog: AdfConfirmDialogComponent;
+    let myLibrariesHeader: AcaHeader;
+    let libraryMenu: MatMenuComponent;
+
+    test.beforeEach(async ({ myLibrariesPage }) => {
+      try {
+        libraryTable = myLibrariesPage.dataTable;
+        snackBar = myLibrariesPage.snackBar;
+        confirmDialog = myLibrariesPage.confirmDialogComponent;
+        myLibrariesHeader = myLibrariesPage.acaHeader;
+        libraryMenu = myLibrariesPage.matMenu;
+      } catch (error) {
+        console.error(`My Libraries, beforeEach failed : ${error}`);
+      }
+    });
+
+    test('[C290106] Leave a library from My Libraries', async () => {
+      await expect(libraryTable.getCellByColumnNameAndRowItem(user1Library1, managerRole)).toBeVisible();
+      await libraryTable.performActionFromExpandableMenu(user1Library1, leaveLibraryButton);
+      await expect.soft(confirmDialog.getDialogTitle('Leave this library?')).toBeVisible();
+      await expect.soft(confirmDialog.getDialogContent('Leaving will remove your access.')).toBeVisible();
+      await expect.soft(confirmDialog.okButton).toBeVisible();
+      await expect.soft(confirmDialog.cancelButton).toBeVisible();
+      await confirmDialog.okButton.click();
+      await expect.soft(snackBar.getByMessageLocator(leftMessage)).toBeVisible();
+      await expect(libraryTable.getRowByName(user1Library1)).not.toBeVisible();
+    });
+
+    test('[C290111] Cancel Leave Library', async () => {
+      await expect(libraryTable.getCellByColumnNameAndRowItem(user1Library5, managerRole)).toBeVisible();
+      await libraryTable.performActionFromExpandableMenu(user1Library5, leaveLibraryButton);
+      await confirmDialog.cancelButton.click();
+      await expect(libraryTable.getCellByColumnNameAndRowItem(user1Library5, managerRole)).toBeVisible();
+    });
+
+    test('[C290107] Leave a library - failure notification', async () => {
+      await expect(libraryTable.getCellByColumnNameAndRowItem(user2Library1, managerRole)).toBeVisible();
+      await libraryTable.performActionFromExpandableMenu(user2Library1, leaveLibraryButton);
+      await confirmDialog.okButton.click();
+      await expect.soft(snackBar.getByMessageLocator('Cannot leave this library')).toBeVisible();
+      await expect(libraryTable.getCellByColumnNameAndRowItem(user2Library1, managerRole)).toBeVisible();
+    });
+
+    test('[C289974] Mark library as favorite from My Libraries', async () => {
+      await expect(libraryTable.getCellByColumnNameAndRowItem(adminLibrary3, contributorRole)).toBeVisible();
+      await libraryTable.getCellByColumnNameAndRowItem(adminLibrary3, contributorRole).click();
+      await myLibrariesHeader.clickMoreActions();
+      await libraryMenu.clickMenuItem(favoriteButton);
+      await myLibrariesHeader.clickMoreActions();
+      expect(await libraryMenu.isMenuItemVisible(removeFavoriteButton)).toBe(true);
+    });
+
+    test('[C289975] Remove library from favorites from My Libraries', async ({ myLibrariesPage }) => {
+      await myLibrariesPage.reload({ waitUntil: domContentLoadedString });
+      await expect(libraryTable.getRowByName(user2Library2)).toBeVisible();
+      await libraryTable.getRowByName(user2Library2).click();
+      await myLibrariesHeader.clickMoreActions();
+      expect(await libraryMenu.isMenuItemVisible(removeFavoriteButton)).toBe(true);
+      await libraryMenu.clickMenuItem(removeFavoriteButton);
+      await myLibrariesHeader.clickMoreActions();
+      expect(await libraryMenu.isMenuItemVisible(favoriteButton)).toBe(true);
+    });
+
+    test('[C289988] Delete a library from My Libraries', async ({ trashPage }) => {
+      const trashTable = trashPage.dataTable;
+
+      await expect(libraryTable.getRowByName(user2Library5Delete)).toBeVisible();
+      await libraryTable.getRowByName(user2Library5Delete).click();
+      await myLibrariesHeader.clickMoreActions();
+      await libraryMenu.clickMenuItem(deleteButton);
+      await expect.soft(snackBar.getByMessageLocator(libraryDeletedMessage)).toBeVisible();
+      await expect(libraryTable.getRowByName(user2Library5Delete)).not.toBeVisible();
+      await trashPage.navigate({ waitUntil: loadString });
+      await expect(trashTable.getRowByName(user2Library5Delete)).toBeVisible();
+    });
+  });
+
+  test.describe('Favorite Libraries page', () => {
+    let libraryTable: DataTableComponent;
+    let snackBar: SnackBarComponent;
+    let favoritesApi: FavoritesPageApi;
+
+    test.beforeEach(async ({ favoriteLibrariesPage }) => {
+      try {
+        libraryTable = favoriteLibrariesPage.dataTable;
+        snackBar = favoriteLibrariesPage.snackBar;
+        favoritesApi = await FavoritesPageApi.initialize(username2, username2);
+      } catch (error) {
+        console.error(`beforeAll failed : ${error}`);
+      }
+    });
+
+    test('[C290105] Join a public library from Favorite Libraries', async ({ favoriteLibrariesPage }) => {
+      await favoritesApi.addFavoriteById(siteString, adminLibrary1);
+      await favoriteLibrariesPage.navigate();
+      await libraryTable.performActionFromExpandableMenu(adminLibrary1, joinButton);
+      await expect.soft(snackBar.getByMessageLocator(libraryJoinedMessage)).toBeVisible();
+      await expect(libraryTable.getCellByColumnNameAndRowItem(adminLibrary1, consumerRole)).toBeVisible();
+    });
+
+    test('[C290109] Join a moderated library from Favorite Libraries', async ({ favoriteLibrariesPage }) => {
+      await favoritesApi.addFavoriteById(siteString, adminModerateLibrary1);
+      await favoriteLibrariesPage.navigate();
+      await expect(libraryTable.getCellByColumnNameAndRowItem(adminModerateLibrary1, notMemberString)).toBeVisible();
+      await libraryTable.performActionFromExpandableMenu(adminModerateLibrary1, joinButton);
+      await expect.soft(snackBar.getByMessageLocator(requestToJoinMessage)).toBeVisible();
+      await expect(libraryTable.getCellByColumnNameAndRowItem(adminModerateLibrary1, notMemberString)).toBeVisible();
+      await adminSitesApi.approveSiteMembershipRequest(adminModerateLibrary1, username2);
+      await favoriteLibrariesPage.navigate();
+      await expect(libraryTable.getCellByColumnNameAndRowItem(adminModerateLibrary1, consumerRole)).toBeVisible();
+    });
+
+    test('[C290110] Leave a library from Favorite Libraries', async ({ favoriteLibrariesPage }) => {
+      const confirmDialog = favoriteLibrariesPage.confirmDialogComponent;
+      await favoritesApi.addFavoriteById(siteString, user1Library2);
+      await favoriteLibrariesPage.navigate();
+      await expect(libraryTable.getCellByColumnNameAndRowItem(user1Library2, contributorRole)).toBeVisible();
+      await libraryTable.performActionFromExpandableMenu(user1Library2, leaveLibraryButton);
+      await confirmDialog.okButton.click();
+      await expect.soft(snackBar.getByMessageLocator(leftMessage)).toBeVisible();
+      await expect(libraryTable.getCellByColumnNameAndRowItem(user1Library2, notMemberString)).toBeVisible();
+    });
+
+    test('[C290108] Cancel join from Favorite Libraries', async ({ favoriteLibrariesPage }) => {
+      await user2SitesApi.createSiteMembershipRequestForPerson(username2, adminModerateLibrary3);
+      await favoritesApi.addFavoriteById(siteString, adminModerateLibrary3);
+      await favoriteLibrariesPage.navigate();
+
+      await expect(libraryTable.getCellByColumnNameAndRowItem(adminModerateLibrary3, notMemberString)).toBeVisible();
+      await libraryTable.performActionFromExpandableMenu(adminModerateLibrary3, cancelJoinRequestButton);
+      await expect.soft(snackBar.getByMessageLocator(cancelJoinRequestMessage)).toBeVisible();
+      const hasJoinRequest = await user2SitesApi.hasMembershipRequest(username2, adminModerateLibrary3);
+      expect(hasJoinRequest).toBe(false);
+    });
+
+    test('[C289976] Remove library from favorites from Favorite Libraries', async ({ favoriteLibrariesPage }) => {
+      const myLibrariesHeader = favoriteLibrariesPage.acaHeader;
+      const libraryMenu = favoriteLibrariesPage.matMenu;
+
+      await favoriteLibrariesPage.navigate({ waitUntil: domContentLoadedString });
+      await expect(libraryTable.getRowByName(user2Library3)).toBeVisible();
+      await libraryTable.getRowByName(user2Library3).click();
+      await myLibrariesHeader.clickMoreActions();
+      await libraryMenu.clickMenuItem(removeFavoriteButton);
+      await expect(libraryTable.getRowByName(user2Library3)).not.toBeVisible();
+    });
+
+    test('[C289991] Delete a library from Favorite Libraries', async ({ favoriteLibrariesPage, trashPage }) => {
+      const myLibrariesHeader = favoriteLibrariesPage.acaHeader;
+      const libraryMenu = favoriteLibrariesPage.matMenu;
+      const trashTable = trashPage.dataTable;
+
+      await favoriteLibrariesPage.navigate();
+      await expect(libraryTable.getRowByName(user2Library6Delete)).toBeVisible();
+      await libraryTable.getRowByName(user2Library6Delete).click();
+      await myLibrariesHeader.clickMoreActions();
+      await libraryMenu.clickMenuItem(deleteButton);
+      await expect.soft(snackBar.getByMessageLocator(libraryDeletedMessage)).toBeVisible();
+      await expect(libraryTable.getRowByName(user2Library6Delete)).not.toBeVisible();
+      await trashPage.navigate({ waitUntil: loadString });
+      await expect(trashTable.getRowByName(user2Library6Delete)).toBeVisible();
+    });
+  });
+
+  test.describe('Search Page', () => {
+    let libraryTable: DataTableComponent;
+    let snackBar: SnackBarComponent;
+
+    test.beforeEach(async ({ searchPage }) => {
+      try {
+        libraryTable = searchPage.dataTable;
+        snackBar = searchPage.snackBar;
+      } catch (error) {
+        console.error(`Search Page, beforeEach failed : ${error}`);
+      }
+    });
+
+    test('[C306959] Join a public library from Search Results', async ({ searchPage }) => {
+      await searchPage.navigate({ remoteUrl: `#/search-libraries;q=${adminLibrary2}` });
+      await searchPage.reload({ waitUntil: loadString });
+      await expect(libraryTable.getCellByColumnNameAndRowItem(adminLibrary2, notMemberString)).toBeVisible();
+      await libraryTable.performActionFromExpandableMenu(adminLibrary2, joinButton);
+      await expect.soft(snackBar.getByMessageLocator(libraryJoinedMessage)).toBeVisible();
+      await expect(libraryTable.getCellByColumnNameAndRowItem(adminLibrary2, consumerRole)).toBeVisible();
+    });
+
+    test('[C306960] Join a moderated library from Search Results', async ({ myLibrariesPage, searchPage }) => {
+      await searchPage.navigate({ remoteUrl: `#/search-libraries;q=${adminModerateLibrary2}` });
+      await expect(libraryTable.getCellByColumnNameAndRowItem(adminModerateLibrary2, notMemberString)).toBeVisible();
+      await libraryTable.performActionFromExpandableMenu(adminModerateLibrary2, joinButton);
+      await expect.soft(snackBar.getByMessageLocator(requestToJoinMessage)).toBeVisible();
+      await expect(libraryTable.getCellByColumnNameAndRowItem(adminModerateLibrary2, notMemberString)).toBeVisible();
+      await adminSitesApi.approveSiteMembershipRequest(adminModerateLibrary2, username2);
+      await myLibrariesPage.navigate();
+      await expect(libraryTable.getCellByColumnNameAndRowItem(adminModerateLibrary2, consumerRole)).toBeVisible();
+    });
+
+    test('[C306961] Leave a library from Search Results', async ({ searchPage }) => {
+      const confirmDialog = searchPage.confirmDialogComponent;
+      await searchPage.navigate({ remoteUrl: `#/search-libraries;q=${user1Library3}` });
+
+      await expect(libraryTable.getCellByColumnNameAndRowItem(user1Library3, 'Collaborator')).toBeVisible();
+      await libraryTable.performActionFromExpandableMenu(user1Library3, leaveLibraryButton);
+      await confirmDialog.okButton.click();
+      await expect.soft(snackBar.getByMessageLocator(leftMessage)).toBeVisible();
+      await expect(libraryTable.getCellByColumnNameAndRowItem(user1Library3, notMemberString)).toBeVisible();
+    });
+
+    test('[C306962] Cancel join from Search Results', async ({ searchPage }) => {
+      await user2SitesApi.createSiteMembershipRequestForPerson(username2, adminModerateLibrary4);
+      await searchPage.navigate({ remoteUrl: `#/search-libraries;q=${adminModerateLibrary4}` });
+      await searchPage.reload({ waitUntil: loadString });
+      await expect(libraryTable.getCellByColumnNameAndRowItem(adminModerateLibrary4, notMemberString)).toBeVisible();
+      await libraryTable.performActionFromExpandableMenu(adminModerateLibrary4, cancelJoinRequestButton);
+      await expect.soft(snackBar.getByMessageLocator(cancelJoinRequestMessage)).toBeVisible();
+      const hasJoinRequest = await user2SitesApi.hasMembershipRequest(username2, adminModerateLibrary4);
+      expect(hasJoinRequest).toBe(false);
+    });
+
+    test('[C306963] Mark library as favorite from Search Results', async ({ myLibrariesPage, searchPage }) => {
+      const myLibrariesHeader = myLibrariesPage.acaHeader;
+      const libraryMenu = myLibrariesPage.matMenu;
+
+      await myLibrariesHeader.searchButton.click();
+      await searchPage.searchInput.searchButton.click();
+      await searchPage.searchOverlay.searchLibrariesOption.click();
+      await searchPage.searchOverlay.searchFor(adminLibrary4);
+
+      await expect(libraryTable.getRowByName(adminLibrary4)).toBeVisible();
+      await libraryTable.getRowByName(adminLibrary4).click();
+      await myLibrariesHeader.clickMoreActions();
+      await libraryMenu.clickMenuItem(favoriteButton);
+      await myLibrariesHeader.clickMoreActions();
+      expect(await libraryMenu.isMenuItemVisible(removeFavoriteButton)).toBe(true);
+    });
+
+    test('[C306964] Remove library from favorites from Search Results', async ({ searchPage }) => {
+      const searchHeader = searchPage.acaHeader;
+      const libraryMenu = searchPage.matMenu;
+
+      await searchHeader.searchButton.click();
+      await searchPage.searchInput.searchButton.click();
+      await searchPage.searchOverlay.searchLibrariesOption.click();
+      await searchPage.searchOverlay.searchFor(user2Library4);
+
+      await expect(libraryTable.getRowByName(user2Library4)).toBeVisible();
+      await searchPage.reload({ waitUntil: domContentLoadedString });
+      await libraryTable.getRowByName(user2Library4).click();
+      await searchHeader.clickMoreActions();
+      await libraryMenu.clickMenuItem(removeFavoriteButton);
+      await searchHeader.clickMoreActions();
+      expect(await libraryMenu.isMenuItemVisible(favoriteButton)).toBe(true);
+    });
+
+    test('[C306965] Delete a library from Search Results', async ({ searchPage, trashPage }) => {
+      const searchHeader = searchPage.acaHeader;
+      const libraryMenu = searchPage.matMenu;
+      const trashTable = trashPage.dataTable;
+
+      await searchPage.navigate({ remoteUrl: `#/search-libraries;q=${user2Library7Delete}` });
+      await searchPage.reload({ waitUntil: loadString });
+      await expect(libraryTable.getRowByName(user2Library7Delete)).toBeVisible();
+      await libraryTable.getRowByName(user2Library7Delete).click();
+      await searchHeader.clickMoreActions();
+      await libraryMenu.clickMenuItem(deleteButton);
+      await expect.soft(snackBar.getByMessageLocator(libraryDeletedMessage)).toBeVisible();
+      await expect(libraryTable.getRowByName(user2Library7Delete)).not.toBeVisible();
+      await trashPage.navigate({ waitUntil: loadString });
+      await expect(trashTable.getRowByName(user2Library7Delete)).toBeVisible();
+    });
+  });
+});
diff --git a/e2e/playwright/pagination/.eslintrc.json b/e2e/playwright/pagination/.eslintrc.json
new file mode 100644
index 0000000000..9bacf995fe
--- /dev/null
+++ b/e2e/playwright/pagination/.eslintrc.json
@@ -0,0 +1,17 @@
+{
+  "extends": "../../../.eslintrc.json",
+  "ignorePatterns": ["!**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts"],
+      "parserOptions": {
+        "project": ["e2e/playwright/pagination/tsconfig.e2e.json"],
+        "createDefaultProgram": true
+      },
+      "plugins": ["rxjs", "unicorn"],
+      "rules": {
+        "@typescript-eslint/no-floating-promises": "off"
+      }
+    }
+  ]
+}
diff --git a/e2e/playwright/pagination/exclude.tests.json b/e2e/playwright/pagination/exclude.tests.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/e2e/playwright/pagination/exclude.tests.json
@@ -0,0 +1 @@
+{}
diff --git a/projects/aca-testing-shared/src/utilities/browser-utils.ts b/e2e/playwright/pagination/playwright.config.ts
similarity index 64%
rename from projects/aca-testing-shared/src/utilities/browser-utils.ts
rename to e2e/playwright/pagination/playwright.config.ts
index 0742e2f834..c6e0c03fc4 100644
--- a/projects/aca-testing-shared/src/utilities/browser-utils.ts
+++ b/e2e/playwright/pagination/playwright.config.ts
@@ -19,20 +19,26 @@
  * GNU Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { browser } from 'protractor';
-import { USE_HASH_STRATEGY } from '../configs';
+import { PlaywrightTestConfig } from '@playwright/test';
+import { CustomConfig, getGlobalConfig, getExcludedTestsRegExpArray } from '@alfresco/playwright-shared';
+import EXCLUDED_JSON from './exclude.tests.json';
 
-export async function navigate(relativePath: string) {
-  const path = [
-    browser.baseUrl,
-    browser.baseUrl.endsWith('/') ? '' : '/',
-    USE_HASH_STRATEGY ? '#' : '',
-    relativePath.startsWith('/') ? '' : '/',
-    relativePath
-  ].join('');
+const config: PlaywrightTestConfig<CustomConfig> = {
+  ...getGlobalConfig,
 
-  return browser.get(path);
-}
+  grepInvert: getExcludedTestsRegExpArray(EXCLUDED_JSON, 'Pagination'),
+  projects: [
+    {
+      name: 'Pagination',
+      testDir: './src/tests/',
+      use: {
+        users: ['hruser']
+      }
+    }
+  ]
+};
+
+export default config;
diff --git a/e2e/playwright/pagination/project.json b/e2e/playwright/pagination/project.json
new file mode 100644
index 0000000000..6d28ddc609
--- /dev/null
+++ b/e2e/playwright/pagination/project.json
@@ -0,0 +1,22 @@
+{
+  "name": "pagination-e2e",
+  "$schema": "../../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "e2e/playwright/pagination/src",
+  "projectType": "application",
+  "targets": {
+    "e2e": {
+      "executor": "nx:run-commands",
+      "options": {
+        "commands": ["npx playwright test --config=e2e/playwright/pagination/playwright.config.ts"]
+      },
+      "configurations": {
+        "production": {
+          "devServerTarget": "content-ce:serve:production"
+        }
+      }
+    },
+    "lint": {
+      "executor": "@angular-eslint/builder:lint"
+    }
+  }
+}
diff --git a/e2e/playwright/pagination/src/tests/favorites.ts b/e2e/playwright/pagination/src/tests/favorites.ts
new file mode 100644
index 0000000000..5205165abc
--- /dev/null
+++ b/e2e/playwright/pagination/src/tests/favorites.ts
@@ -0,0 +1,105 @@
+/*!
+ * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
+ *
+ * Alfresco Example Content Application
+ *
+ * This file is part of the Alfresco Example Content Application.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * The Alfresco Example Content Application is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import { test } from '@alfresco/playwright-shared';
+import { expect } from '@playwright/test';
+
+export function favoritesTests(username: string) {
+  test.describe('Pagination controls : ', () => {
+    test.beforeEach(async ({ loginPage, favoritePage }) => {
+      await loginPage.navigate();
+      await loginPage.loginUser({ username: username, password: username });
+
+      await favoritePage.navigate();
+      await favoritePage.waitForPageLoad();
+    });
+
+    test('[C280113] Pagination control default values', async ({ favoritePage }) => {
+      expect(await favoritePage.pagination.getRange()).toContain('1-25 of 51');
+      expect(await favoritePage.pagination.getMaxItems()).toContain('25');
+      expect(await favoritePage.pagination.getCurrentPage()).toContain('Page 1');
+      expect(await favoritePage.pagination.getTotalPages()).toContain('of 3');
+      expect(await favoritePage.pagination.isPreviousEnabled()).toBe(false);
+      expect(await favoritePage.pagination.isNextEnabled()).toBe(true);
+    });
+
+    test('[C280114] Items per page values', async ({ favoritePage }) => {
+      await favoritePage.pagination.openMaxItemsMenu();
+      expect(await (await favoritePage.pagination.getNthItem(1)).innerText()).toBe('25');
+      expect(await (await favoritePage.pagination.getNthItem(2)).innerText()).toBe('50');
+      expect(await (await favoritePage.pagination.getNthItem(3)).innerText()).toBe('100');
+      await favoritePage.pagination.closeMenu();
+    });
+
+    test('[C280115] current page menu items', async ({ favoritePage }) => {
+      await favoritePage.pagination.openMaxItemsMenu();
+      await favoritePage.pagination.clickMenuItem('25');
+      expect(await favoritePage.pagination.getMaxItems()).toContain('25');
+      expect(await favoritePage.pagination.getTotalPages()).toContain('of 3');
+      expect(await favoritePage.pagination.getItemsCount()).toBe(3);
+      await favoritePage.pagination.closeMenu();
+
+      await favoritePage.pagination.openMaxItemsMenu();
+      await favoritePage.pagination.clickMenuItem('50');
+      expect(await favoritePage.pagination.getMaxItems()).toContain('50');
+      expect(await favoritePage.pagination.getTotalPages()).toContain('of 2');
+
+      await favoritePage.pagination.closeMenu();
+
+      await favoritePage.pagination.openMaxItemsMenu();
+      await favoritePage.pagination.clickMenuItem('100');
+      expect(await favoritePage.pagination.getMaxItems()).toContain('100');
+      expect(await favoritePage.pagination.getTotalPages()).toContain('of 1');
+
+      await favoritePage.pagination.resetToDefaultPageSize();
+    });
+
+    test('[C280116] change the current page from menu', async ({ favoritePage }) => {
+      await favoritePage.pagination.clickOnNextPage();
+      expect(await favoritePage.pagination.getRange()).toContain('Showing 26-50 of 51');
+      expect(await favoritePage.pagination.getCurrentPage()).toContain('Page 2');
+      expect(await favoritePage.pagination.isPreviousEnabled()).toBe(true);
+      expect(await favoritePage.pagination.isNextEnabled()).toBe(true);
+      await favoritePage.pagination.resetToDefaultPageSize();
+    });
+
+    test('[C280119] navigate to next and previous pages', async ({ favoritePage }) => {
+      await favoritePage.pagination.openMaxItemsMenu();
+      await favoritePage.pagination.clickMenuItem('25');
+      expect(await favoritePage.pagination.getMaxItems()).toContain('25');
+      await favoritePage.pagination.clickOnNextPage();
+      expect(await favoritePage.pagination.getRange()).toContain('Showing 26-50 of 51');
+
+      await favoritePage.pagination.clickOnPreviousPage();
+      expect(await favoritePage.pagination.getRange()).toContain('Showing 1-25 of 51');
+    });
+
+    test('[C280118] Next button is disabled on last page', async ({ favoritePage }) => {
+      await favoritePage.pagination.openMaxItemsMenu();
+      await favoritePage.pagination.clickNthItem(3);
+      expect(await favoritePage.pagination.getCurrentPage()).toContain('Page 1');
+      expect(await favoritePage.pagination.isNextEnabled()).toBe(false);
+    });
+  });
+}
diff --git a/e2e/playwright/pagination/src/tests/multiple-pages-files.spec.ts b/e2e/playwright/pagination/src/tests/multiple-pages-files.spec.ts
new file mode 100755
index 0000000000..431d57f551
--- /dev/null
+++ b/e2e/playwright/pagination/src/tests/multiple-pages-files.spec.ts
@@ -0,0 +1,72 @@
+/*!
+ * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
+ *
+ * Alfresco Example Content Application
+ *
+ * This file is part of the Alfresco Example Content Application.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * The Alfresco Example Content Application is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import { ApiClientFactory, FavoritesPageApi, NodesApi, test, timeouts, Utils } from '@alfresco/playwright-shared';
+import { personalFilesTests } from './personal-files';
+import { favoritesTests } from './favorites';
+
+test.describe('Pagination on multiple pages : ', () => {
+  const random = Utils.random();
+  const username = `user-${random}`;
+
+  const parent = `parent-${random}`;
+  let parentId: string;
+  let initialFavoritesTotalItems: number;
+
+  const apiClientFactory = new ApiClientFactory();
+
+  test.beforeAll(async () => {
+    test.setTimeout(timeouts.extendedTest);
+    await apiClientFactory.setUpAcaBackend('admin');
+    await apiClientFactory.createUser({ username });
+    const nodesApi = await NodesApi.initialize(username, username);
+    const favoritesApi = await FavoritesPageApi.initialize(username, username);
+
+    const files = Array(51)
+      .fill('my-file')
+      .map((name, index): string => `${name}-${index + 1}-${random}.txt`);
+
+    parentId = (await nodesApi.createFolder(parent)).entry.id;
+    const filesIds = (await nodesApi.createFiles(files, parent)).list.entries.map((entries) => entries.entry.id);
+    initialFavoritesTotalItems = await favoritesApi.getFavoritesTotalItems(username);
+
+    await favoritesApi.addFavoritesByIds('file', filesIds);
+  });
+
+  test.afterAll(async () => {
+    await apiClientFactory.nodes.deleteNode(parentId, { permanent: true });
+  });
+
+  test.describe('on Personal Files', () => {
+    personalFilesTests(username, parent);
+  });
+
+  test.describe('on Favorites', () => {
+    test.beforeAll(async () => {
+      const favoritesApi = await FavoritesPageApi.initialize(username, username);
+      await favoritesApi.waitForApi(username, { expect: initialFavoritesTotalItems + 51 });
+    });
+    favoritesTests(username);
+  });
+});
diff --git a/e2e/playwright/pagination/src/tests/personal-files.ts b/e2e/playwright/pagination/src/tests/personal-files.ts
new file mode 100644
index 0000000000..c1b4d05c80
--- /dev/null
+++ b/e2e/playwright/pagination/src/tests/personal-files.ts
@@ -0,0 +1,107 @@
+/*!
+ * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
+ *
+ * Alfresco Example Content Application
+ *
+ * This file is part of the Alfresco Example Content Application.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * The Alfresco Example Content Application is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import { test, timeouts } from '@alfresco/playwright-shared';
+import { expect } from '@playwright/test';
+
+export function personalFilesTests(userName: string, parentName: string) {
+  test.describe('Pagination controls : ', () => {
+    test.beforeEach(async ({ loginPage, personalFiles, page }) => {
+      await loginPage.navigate();
+      await loginPage.loginUser({ username: userName, password: userName });
+      await personalFiles.waitForPageLoad();
+      await personalFiles.dataTable.getRowByName(parentName).dblclick();
+      await page.waitForTimeout(timeouts.tiny);
+    });
+
+    test('[C280077] Pagination control default values', async ({ personalFiles }) => {
+      expect(await personalFiles.pagination.getRange()).toContain('Showing 1-25 of 51');
+      expect(await personalFiles.pagination.getMaxItems()).toContain('25');
+      expect(await personalFiles.pagination.getCurrentPage()).toContain('Page 1');
+      expect(await personalFiles.pagination.getTotalPages()).toContain('of 3');
+      expect(await personalFiles.pagination.isPreviousEnabled()).toBe(false);
+      expect(await personalFiles.pagination.isNextEnabled()).toBe(true);
+    });
+
+    test('[C280078] Items per page values', async ({ personalFiles }) => {
+      await personalFiles.pagination.openMaxItemsMenu();
+      expect(await (await personalFiles.pagination.getNthItem(1)).innerText()).toBe('25');
+      expect(await (await personalFiles.pagination.getNthItem(2)).innerText()).toBe('50');
+      expect(await (await personalFiles.pagination.getNthItem(3)).innerText()).toBe('100');
+      await personalFiles.closeMenu();
+    });
+
+    test('[C280079] current page menu items', async ({ personalFiles }) => {
+      await personalFiles.pagination.openMaxItemsMenu();
+      await personalFiles.pagination.clickMenuItem('25');
+      expect(await personalFiles.pagination.getMaxItems()).toContain('25');
+      expect(await personalFiles.pagination.getTotalPages()).toContain('of 3');
+      expect(await personalFiles.pagination.getItemsCount()).toBe(3);
+
+      await personalFiles.pagination.openMaxItemsMenu();
+      await personalFiles.pagination.clickMenuItem('50');
+      expect(await personalFiles.pagination.getMaxItems()).toContain('50');
+      expect(await personalFiles.pagination.getTotalPages()).toContain('of 2');
+
+      await personalFiles.pagination.openMaxItemsMenu();
+      await personalFiles.pagination.clickMenuItem('100');
+      expect(await personalFiles.pagination.getMaxItems()).toContain('100');
+      expect(await personalFiles.pagination.getTotalPages()).toContain('of 1');
+
+      await personalFiles.pagination.resetToDefaultPageSize();
+    });
+
+    test('[C280080] change the current page from menu', async ({ personalFiles }) => {
+      await personalFiles.pagination.clickOnNextPage();
+      expect(await personalFiles.pagination.getRange()).toContain('Showing 26-50 of 51');
+      expect(await personalFiles.pagination.getCurrentPage()).toContain('Page 2');
+      expect(await personalFiles.pagination.isPreviousEnabled()).toBe(true);
+      expect(await personalFiles.pagination.isNextEnabled()).toBe(true);
+      await personalFiles.pagination.resetToDefaultPageSize();
+    });
+
+    test('[C280083] navigate to next and previous pages', async ({ personalFiles }) => {
+      await personalFiles.pagination.openMaxItemsMenu();
+      await personalFiles.pagination.clickMenuItem('25');
+      expect(await personalFiles.pagination.getMaxItems()).toContain('25');
+      await personalFiles.pagination.clickOnNextPage();
+      expect(await personalFiles.pagination.getRange()).toContain('Showing 26-50 of 51');
+
+      await personalFiles.pagination.clickOnPreviousPage();
+      expect(await personalFiles.pagination.getRange()).toContain('Showing 1-25 of 51');
+    });
+
+    test('[C280081] Previous button is disabled on first page', async ({ personalFiles }) => {
+      expect(await personalFiles.pagination.getCurrentPage()).toContain('Page 1');
+      expect(await personalFiles.pagination.isPreviousEnabled()).toBe(false);
+    });
+
+    test('[C280082] Next button is disabled on last page', async ({ personalFiles }) => {
+      await personalFiles.pagination.openMaxItemsMenu();
+      await personalFiles.pagination.clickNthItem(3);
+      expect(await personalFiles.pagination.getCurrentPage()).toContain('Page 1');
+      expect(await personalFiles.pagination.isNextEnabled()).toBe(false);
+    });
+  });
+}
diff --git a/e2e/playwright/pagination/tsconfig.e2e.adf.json b/e2e/playwright/pagination/tsconfig.e2e.adf.json
new file mode 100644
index 0000000000..87cbcf775a
--- /dev/null
+++ b/e2e/playwright/pagination/tsconfig.e2e.adf.json
@@ -0,0 +1,15 @@
+{
+  "extends": "../../../tsconfig.adf.json",
+  "compilerOptions": {
+    "outDir": "../../out-tsc/e2e",
+    "baseUrl": "./",
+    "module": "commonjs",
+    "target": "es2017",
+    "types": ["jasmine", "jasminewd2", "node"],
+    "skipLibCheck": true,
+    "paths": {
+      "@alfresco/playwright-shared": ["../../../projects/aca-playwright-shared/src/index.ts"]
+    }
+  },
+  "exclude": ["node_modules"]
+}
diff --git a/e2e/playwright/pagination/tsconfig.e2e.json b/e2e/playwright/pagination/tsconfig.e2e.json
new file mode 100755
index 0000000000..c317985239
--- /dev/null
+++ b/e2e/playwright/pagination/tsconfig.e2e.json
@@ -0,0 +1,15 @@
+{
+  "extends": "../../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../out-tsc/e2e",
+    "baseUrl": "./",
+    "module": "commonjs",
+    "target": "es2017",
+    "types": ["jasmine", "jasminewd2", "node", "@playwright/test"],
+    "skipLibCheck": true,
+    "paths": {
+      "@alfresco/playwright-shared": ["../../../projects/aca-playwright-shared/src/index.ts"]
+    }
+  },
+  "exclude": ["node_modules"]
+}
diff --git a/e2e/playwright/special-permissions-actions-available/src/tests/folders-actions.spec.ts b/e2e/playwright/special-permissions-actions-available/src/tests/folders-actions.spec.ts
new file mode 100644
index 0000000000..fc636d25cd
--- /dev/null
+++ b/e2e/playwright/special-permissions-actions-available/src/tests/folders-actions.spec.ts
@@ -0,0 +1,117 @@
+/*!
+ * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
+ *
+ * Alfresco Example Content Application
+ *
+ * This file is part of the Alfresco Example Content Application.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * The Alfresco Example Content Application is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import { ApiClientFactory, FavoritesPageApi, PersonalFilesPage, NodesApi, TrashcanApi, Utils, test, timeouts } from '@alfresco/playwright-shared';
+import * as testData from '@alfresco/playwright-shared';
+
+test.describe('Folders - available actions : ', () => {
+  const username = `user-${Utils.random()}`;
+  let parentId: string;
+  let nodesApi: NodesApi;
+  let trashCanActions: TrashcanApi;
+
+  async function checkActionsAvailable(
+    myPersonalFiles: PersonalFilesPage,
+    item: string,
+    expectedToolbarPrimary: string[],
+    expectedToolbarMore: string[]
+  ): Promise<void> {
+    await myPersonalFiles.dataTable.selectItem(item);
+    await myPersonalFiles.acaHeader.verifyToolbarPrimaryActions(expectedToolbarPrimary);
+    await myPersonalFiles.acaHeader.clickMoreActions();
+    await myPersonalFiles.matMenu.verifyActualMoreActions(expectedToolbarMore);
+  }
+
+  async function checkMultipleSelActionsAvailable(
+    myPersonalFiles: PersonalFilesPage,
+    expectedToolbarPrimary: string[],
+    expectedToolbarMore: string[]
+  ): Promise<void> {
+    await myPersonalFiles.acaHeader.verifyToolbarPrimaryActions(expectedToolbarPrimary);
+    await myPersonalFiles.acaHeader.clickMoreActions();
+    await myPersonalFiles.matMenu.verifyActualMoreActions(expectedToolbarMore);
+  }
+
+  test.beforeAll(async () => {
+    test.setTimeout(timeouts.extendedTest);
+    const apiClientFactory = new ApiClientFactory();
+    const parentName = `parent-${Utils.random()}`;
+    await apiClientFactory.setUpAcaBackend('admin');
+    await apiClientFactory.createUser({ username });
+    nodesApi = await NodesApi.initialize(username, username);
+    const favoritesActions = await FavoritesPageApi.initialize(username, username);
+    trashCanActions = await TrashcanApi.initialize(username, username);
+    parentId = (await nodesApi.createFolder(parentName)).entry.id;
+    await nodesApi.createFile(testData.file.name, parentId);
+    await nodesApi.createFolder(testData.folderFile.name, parentId);
+    const folderFavId = (await nodesApi.createFolder(testData.folderFavFile.name, parentId)).entry.id;
+    const initialFavoritesTotalItems = (await favoritesActions.getFavoritesTotalItems(username)) || 0;
+    await favoritesActions.addFavoritesByIds('folder', [folderFavId]);
+    await favoritesActions.waitForApi(username, { expect: initialFavoritesTotalItems + 1 });
+  });
+
+  test.afterAll(async () => {
+    await nodesApi.deleteNodes([parentId]);
+    await trashCanActions.emptyTrashcan();
+  });
+
+  test.describe('on Personal Files : ', () => {
+    test.beforeEach(async ({ personalFiles, loginPage }) => {
+      await personalFiles.navigate({ remoteUrl: `#/personal-files/${parentId}` });
+      await loginPage.loginUser({ username, password: username });
+    });
+
+    test('Folder not favorite  - [C213123]', async ({ personalFiles }) => {
+      await personalFiles.dataTable.getRowByName(testData.folderFile.name).click({ button: 'right' });
+      await personalFiles.matMenu.verifyActualMoreActions(testData.folderFile.contextMenu);
+      await checkActionsAvailable(personalFiles, testData.folderFile.name, testData.folderFile.toolbarPrimary, testData.folderFile.toolbarMore);
+    });
+
+    test('Folder favorite - [C280451]', async ({ personalFiles }) => {
+      await personalFiles.dataTable.getRowByName(testData.folderFavFile.name).click({ button: 'right' });
+      await personalFiles.matMenu.verifyActualMoreActions(testData.folderFavFile.contextMenu);
+      await checkActionsAvailable(
+        personalFiles,
+        testData.folderFavFile.name,
+        testData.folderFavFile.toolbarPrimary,
+        testData.folderFavFile.toolbarMore
+      );
+    });
+
+    test('multiple folders - [C280459]', async ({ personalFiles }) => {
+      await personalFiles.dataTable.selectMultiItem(testData.folderFavFile.name, testData.folderFile.name);
+      await personalFiles.dataTable.getRowByName(testData.folderFavFile.name).click({ button: 'right' });
+      await personalFiles.matMenu.verifyActualMoreActions(testData.multipleSelFile.contextMenu);
+      await personalFiles.dataTable.selectMultiItem(testData.folderFavFile.name, testData.folderFile.name);
+      await checkMultipleSelActionsAvailable(personalFiles, testData.multipleSelFile.toolbarPrimary, testData.multipleSelFile.toolbarMore);
+    });
+
+    test('both files and folders - [C280460]', async ({ personalFiles }) => {
+      await personalFiles.dataTable.selectMultiItem(testData.file.name, testData.folderFile.name);
+      await personalFiles.dataTable.getRowByName(testData.folderFile.name).click({ button: 'right' });
+      await personalFiles.matMenu.verifyActualMoreActions(testData.multipleSelFile.contextMenu);
+      await checkMultipleSelActionsAvailable(personalFiles, testData.multipleSelFile.toolbarPrimary, testData.multipleSelFile.toolbarMore);
+    });
+  });
+});
diff --git a/e2e/playwright/special-permissions-actions-available/src/tests/special-permissions-actions.test.ts b/e2e/playwright/special-permissions-actions-available/src/tests/special-permissions-actions.test.ts
index e072108cd7..c2dc09a421 100644
--- a/e2e/playwright/special-permissions-actions-available/src/tests/special-permissions-actions.test.ts
+++ b/e2e/playwright/special-permissions-actions-available/src/tests/special-permissions-actions.test.ts
@@ -34,7 +34,8 @@ import {
   SitesApi,
   test,
   SharedLinksApi,
-  SearchPageApi
+  SearchPageApi,
+  timeouts
 } from '@alfresco/playwright-shared';
 import { Site } from '@alfresco/js-api';
 
@@ -79,7 +80,7 @@ test.describe('Special permissions : ', () => {
   let managerSearchActions: SearchPageApi;
 
   test.beforeAll(async () => {
-    test.setTimeout(140000);
+    test.setTimeout(timeouts.extendedTest);
     await apiClientFactory.setUpAcaBackend('admin');
     await apiClientFactory.createUser({ username: userManager });
     await apiClientFactory.createUser({ username: userConsumer });
diff --git a/e2e/protractor/suites/actions-available/files-folders/folders-actions.test.ts b/e2e/protractor/suites/actions-available/files-folders/folders-actions.test.ts
deleted file mode 100755
index 344cfcf1c4..0000000000
--- a/e2e/protractor/suites/actions-available/files-folders/folders-actions.test.ts
+++ /dev/null
@@ -1,202 +0,0 @@
-/*!
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Alfresco Example Content Application
- *
- * This file is part of the Alfresco Example Content Application.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The Alfresco Example Content Application is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import { RepoClient, Utils, AdminActions, UserActions, LoginPage, SearchResultsPage, BrowsingPage } from '@alfresco/aca-testing-shared';
-import * as testData from './test-data';
-import * as testUtil from '../test-util';
-
-describe('Folders - available actions : ', () => {
-  const random = testData.random;
-
-  const username = `user-${Utils.random()}`;
-  const parentName = `parent-${Utils.random()}`;
-
-  let parentId: string;
-  let folderFavId: string;
-  let folderFav2Id: string;
-  let fileFavId: string;
-
-  const userApi = new RepoClient(username, username);
-  const adminApiActions = new AdminActions();
-  const userActions = new UserActions();
-
-  const loginPage = new LoginPage();
-  const page = new BrowsingPage();
-  const { dataTable, toolbar } = page;
-  const { searchInput } = page.pageLayoutHeader;
-  const searchResultsPage = new SearchResultsPage();
-
-  beforeAll(async () => {
-    await adminApiActions.createUser({ username });
-
-    parentId = await userApi.createFolder(parentName);
-
-    await userApi.createFile(testData.file.name, parentId);
-    fileFavId = await userApi.createFile(testData.fileFav.name, parentId);
-
-    await userApi.createFolder(testData.folder.name, parentId);
-    folderFavId = await userApi.createFolder(testData.folderFav.name, parentId);
-    folderFav2Id = await userApi.createFolder(testData.folderFav2.name, parentId);
-
-    const initialFavoritesTotalItems = (await userApi.favorites.getFavoritesTotalItems()) || 0;
-    await userApi.favorites.addFavoritesByIds('folder', [folderFavId, folderFav2Id]);
-    await userApi.favorites.addFavoritesByIds('file', [fileFavId]);
-    await userApi.favorites.waitForApi({ expect: initialFavoritesTotalItems + 3 });
-    await userApi.search.waitForNodes(random, { expect: 5 });
-
-    await loginPage.loginWith(username);
-  });
-
-  afterAll(async () => {
-    await userActions.login(username, username);
-    await userActions.deleteNodes([parentId]);
-    await userActions.emptyTrashcan();
-  });
-
-  beforeEach(async () => {
-    await Utils.pressEscape();
-  });
-
-  describe('on Personal Files : ', () => {
-    beforeAll(async () => {
-      await page.clickPersonalFilesAndWait();
-      await dataTable.doubleClickOnRowByName(parentName);
-      await dataTable.waitForHeader();
-    });
-
-    it('Folder not favorite  - [C213123]', async () => {
-      await testUtil.checkToolbarActions(testData.folder.name, testData.folder.toolbarPrimary, testData.folder.toolbarMore);
-      await testUtil.checkContextMenu(testData.folder.name, testData.folder.contextMenu);
-    });
-
-    it('Folder favorite - [C280451]', async () => {
-      await testUtil.checkToolbarActions(testData.folderFav.name, testData.folderFav.toolbarPrimary, testData.folderFav.toolbarMore);
-      await testUtil.checkContextMenu(testData.folderFav.name, testData.folderFav.contextMenu);
-    });
-
-    it('multiple folders - [C280459]', async () => {
-      await testUtil.checkMultipleSelContextMenu([testData.folderFav.name, testData.folder.name], testData.multipleSel.contextMenu);
-      await testUtil.checkMultipleSelToolbarActions(
-        [testData.folderFav.name, testData.folder.name],
-        testData.multipleSel.toolbarPrimary,
-        testData.multipleSel.toolbarMore
-      );
-    });
-
-    it('both files and folders - [C280460]', async () => {
-      await testUtil.checkMultipleSelContextMenu([testData.file.name, testData.folder.name], testData.multipleSel.contextMenu);
-      await testUtil.checkMultipleSelToolbarActions(
-        [testData.file.name, testData.folder.name],
-        testData.multipleSel.toolbarPrimary,
-        testData.multipleSel.toolbarMore
-      );
-    });
-  });
-
-  describe('on Favorites Files : ', () => {
-    beforeAll(async () => {
-      await page.clickFavoritesAndWait();
-    });
-
-    it('Folder favorite - [C291817]', async () => {
-      await testUtil.checkToolbarActions(testData.folderFav.name, testData.folderFav.toolbarPrimary, testData.folderFav.favoritesToolbarMore);
-      await testUtil.checkContextMenu(testData.folderFav.name, testData.folderFav.favoritesContextMenu);
-    });
-
-    it('multiple folders - [C280664]', async () => {
-      await testUtil.checkMultipleSelContextMenu(
-        [testData.folderFav.name, testData.folderFav2.name],
-        testData.multipleSelAllFav.favoritesContextMenu
-      );
-      await testUtil.checkMultipleSelToolbarActions(
-        [testData.folderFav.name, testData.folderFav2.name],
-        testData.multipleSelAllFav.toolbarPrimary,
-        testData.multipleSelAllFav.favoritesToolbarMore
-      );
-    });
-
-    it('both files and folders - [C280657]', async () => {
-      await testUtil.checkMultipleSelContextMenu([testData.fileFav.name, testData.folderFav.name], testData.multipleSelAllFav.favoritesContextMenu);
-      await testUtil.checkMultipleSelToolbarActions(
-        [testData.fileFav.name, testData.folderFav.name],
-        testData.multipleSelAllFav.toolbarPrimary,
-        testData.multipleSelAllFav.favoritesToolbarMore
-      );
-    });
-  });
-
-  describe('on Search Results : ', () => {
-    describe('on a folder', () => {
-      beforeAll(async () => {
-        await page.clickPersonalFiles();
-        await toolbar.clickSearchIconButton();
-        await searchInput.clickSearchButton();
-        await searchInput.searchFor(`*${random}`);
-        await searchResultsPage.waitForResults();
-      });
-
-      it('[C280609] Folder not favorite', async () => {
-        await testUtil.checkToolbarActions(testData.folder.name, testData.folder.searchToolbarPrimary, testData.folder.searchToolbarMore);
-        await testUtil.checkContextMenu(testData.folder.name, testData.folder.searchContextMenu);
-      });
-
-      it('[C291828] Folder favorite', async () => {
-        await testUtil.checkToolbarActions(testData.folderFav.name, testData.folderFav.searchToolbarPrimary, testData.folderFav.searchToolbarMore);
-        await testUtil.checkContextMenu(testData.folderFav.name, testData.folderFav.searchContextMenu);
-      });
-    });
-
-    describe('on multiple selection', () => {
-      it('[C291821] multiple folders', async () => {
-        await page.clickPersonalFiles();
-        await toolbar.clickSearchIconButton();
-        await searchInput.clickSearchButton();
-        await searchInput.searchFor(`*${random}`);
-        await searchResultsPage.waitForResults();
-
-        await testUtil.checkMultipleSelContextMenu([testData.folder.name, testData.folderFav.name], testData.multipleSel.searchContextMenu);
-        await testUtil.checkMultipleSelToolbarActions(
-          [testData.folder.name, testData.folderFav.name],
-          testData.multipleSel.searchToolbarPrimary,
-          testData.multipleSel.searchToolbarMore
-        );
-      });
-
-      it('[C291822] both files and folders', async () => {
-        await page.clickPersonalFiles();
-        await toolbar.clickSearchIconButton();
-        await searchInput.clickSearchButton();
-        await searchInput.searchFor(`*${testData.file.name} or *${testData.folderFav.name}`);
-        await searchResultsPage.waitForResults();
-
-        await testUtil.checkMultipleSelContextMenu([testData.file.name, testData.folderFav.name], testData.multipleSel.searchContextMenu);
-        await testUtil.checkMultipleSelToolbarActions(
-          [testData.file.name, testData.folderFav.name],
-          testData.multipleSel.searchToolbarPrimary,
-          testData.multipleSel.searchToolbarMore
-        );
-      });
-    });
-  });
-});
diff --git a/e2e/protractor/suites/actions-available/files-folders/generic.test.ts b/e2e/protractor/suites/actions-available/files-folders/generic.test.ts
deleted file mode 100755
index f822895877..0000000000
--- a/e2e/protractor/suites/actions-available/files-folders/generic.test.ts
+++ /dev/null
@@ -1,175 +0,0 @@
-/*!
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Alfresco Example Content Application
- *
- * This file is part of the Alfresco Example Content Application.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The Alfresco Example Content Application is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import { LoginPage, BrowsingPage, RepoClient, NodeContentTree, Utils, AdminActions } from '@alfresco/aca-testing-shared';
-import { BrowserActions } from '@alfresco/adf-testing';
-
-describe('Generic tests : ', () => {
-  const random = Utils.random();
-
-  const username = `user-${random}`;
-
-  const parent = `parent-${random}`;
-
-  const file1 = `file-${random}-1.txt`;
-  const file2 = `file-${random}-2.txt`;
-
-  const folder1 = `my-folder1-${random}`;
-  const folder2 = `my-folder2-${random}`;
-
-  const content: NodeContentTree = {
-    name: parent,
-    files: [file1, file2],
-    folders: [folder1, folder2]
-  };
-
-  const userApi = new RepoClient(username, username);
-
-  const adminApiActions = new AdminActions();
-
-  const loginPage = new LoginPage();
-  const page = new BrowsingPage();
-  const { dataTable, toolbar } = page;
-  const { searchInput } = page.pageLayoutHeader;
-  const contextMenu = dataTable.menu;
-
-  beforeAll(async () => {
-    await adminApiActions.createUser({ username });
-    await userApi.nodes.createContent(content);
-    await loginPage.loginWith(username);
-  });
-
-  afterAll(async () => {
-    await userApi.nodes.deleteNodeByPath(parent);
-  });
-
-  beforeEach(async () => {
-    await Utils.pressEscape();
-  });
-
-  describe('single selection', () => {
-    beforeEach(async () => {
-      await page.clickPersonalFilesAndWait();
-      await dataTable.doubleClickOnRowByName(parent);
-      await dataTable.waitForHeader();
-    });
-
-    it('[C213134] selected row is marked with a check circle icon', async () => {
-      await dataTable.selectItem(file1);
-      expect(await dataTable.hasCheckMarkIcon(file1)).toBe(true, 'check mark missing');
-    });
-
-    it('[C286252] Row is marked with a check circle icon on direct right click', async () => {
-      await dataTable.rightClickOnItem(file2);
-      expect(await dataTable.hasCheckMarkIcon(file2)).toBe(true, 'check mark missing');
-    });
-
-    it('[C286253] Context menu appears on direct right click on an item', async () => {
-      await dataTable.rightClickOnItem(file1);
-      expect(await dataTable.hasContextMenu()).toBe(true, 'Context menu is not displayed');
-    });
-
-    it('[C286254] Context menu appears when selecting an item and then right clicking on it', async () => {
-      await dataTable.selectItem(file2);
-      await dataTable.rightClickOnItem(file2);
-      expect(await dataTable.hasContextMenu()).toBe(true, 'Context menu is not displayed');
-    });
-
-    it('[C284666] Context menu appears correctly when right clicking on another item', async () => {
-      await dataTable.selectItem(file1);
-      await dataTable.rightClickOnItem(file2);
-      expect(await dataTable.hasContextMenu()).toBe(true, `Context menu is not displayed`);
-      expect(await dataTable.hasCheckMarkIcon(file2)).toBe(true, `${file2} is not selected`);
-      expect(await dataTable.hasCheckMarkIcon(file1)).toBe(false, `${file1} is not selected`);
-    });
-
-    it('[C280619] Context menu closes when clicking away from it', async () => {
-      await dataTable.rightClickOnItem(file1);
-      expect(await dataTable.hasContextMenu()).toBe(true, 'Context menu is not displayed');
-      await BrowserActions.click(page.breadcrumb.currentItem);
-      expect(await dataTable.hasContextMenu()).toBe(false, 'Context menu is displayed');
-    });
-  });
-
-  describe('Actions are not displayed when no item is selected', () => {
-    it('[C291815] on Search Results', async () => {
-      await toolbar.clickSearchIconButton();
-      await searchInput.clickSearchButton();
-      await searchInput.searchFor('*');
-
-      expect(await toolbar.isEmpty()).toEqual(true);
-    });
-  });
-
-  describe('multiple selection', () => {
-    beforeEach(async () => {
-      await page.clickPersonalFilesAndWait();
-      await dataTable.doubleClickOnRowByName(parent);
-      await dataTable.waitForHeader();
-    });
-
-    it('[C286268] Context menu appears on right click on a multiple selection of items', async () => {
-      await dataTable.selectMultipleItems([file1, file2]);
-      await dataTable.rightClickOnMultipleSelection();
-
-      expect(await dataTable.hasContextMenu()).toBe(true, 'Context menu is not displayed');
-    });
-
-    it('[C286269] Context menu appears when right clicking on a single item while having multiple items selected', async () => {
-      await dataTable.selectMultipleItems([file2, folder1]);
-      await dataTable.rightClickOnItem(file1);
-
-      expect(await dataTable.hasContextMenu()).toBe(true, `Context menu is not displayed for ${file1}`);
-      expect(await dataTable.getSelectedRowsCount()).toEqual(1, 'incorrect number of selected rows');
-      expect(await contextMenu.editFolderAction.isPresent()).toBe(false, `Edit folder is displayed for ${file1}`);
-      expect(await dataTable.hasCheckMarkIcon(file1)).toBe(true, `${file1} is not selected`);
-      expect(await dataTable.hasCheckMarkIcon(file2)).toBe(false, `${file2} is selected`);
-      expect(await dataTable.hasCheckMarkIcon(folder1)).toBe(false, `${folder1} is selected`);
-    });
-
-    it('[C280458] Unselect items with single click', async () => {
-      await dataTable.selectMultipleItems([file1, file2, folder1, folder2]);
-      expect(await dataTable.getSelectedRowsCount()).toEqual(4, 'incorrect selected rows number');
-
-      await dataTable.clickItem(file1);
-      expect(await dataTable.getSelectedRowsCount()).toEqual(1, 'incorrect selected rows number');
-    });
-
-    it('[C217110] Select / unselect items by CMD+click', async () => {
-      await Utils.pressCmd();
-      await dataTable.clickItem(file1);
-      await dataTable.clickItem(file2);
-      await dataTable.clickItem(folder1);
-      await dataTable.clickItem(folder2);
-      await Utils.releaseKeyPressed();
-      expect(await dataTable.getSelectedRowsCount()).toEqual(4, 'incorrect selected rows number');
-
-      await Utils.pressCmd();
-      await dataTable.clickItem(file1);
-      await dataTable.clickItem(file2);
-      await Utils.releaseKeyPressed();
-      expect(await dataTable.getSelectedRowsCount()).toEqual(2, 'incorrect selected rows number');
-    });
-  });
-});
diff --git a/e2e/protractor/suites/actions-available/files-folders/locked-files-actions.test.ts b/e2e/protractor/suites/actions-available/files-folders/locked-files-actions.test.ts
deleted file mode 100755
index a029b7440e..0000000000
--- a/e2e/protractor/suites/actions-available/files-folders/locked-files-actions.test.ts
+++ /dev/null
@@ -1,386 +0,0 @@
-/*!
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Alfresco Example Content Application
- *
- * This file is part of the Alfresco Example Content Application.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The Alfresco Example Content Application is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import { RepoClient, Utils, AdminActions, UserActions, LoginPage, BrowsingPage, SearchResultsPage } from '@alfresco/aca-testing-shared';
-import * as testData from './test-data';
-import * as testUtil from '../test-util';
-
-describe('Locked Files - available actions : ', () => {
-  const random = testData.random;
-
-  const username = `user-${Utils.random()}`;
-  const parentName = `parent-${Utils.random()}`;
-
-  let parentId: string;
-  let fileLockedId: string;
-  let fileFavLockedId: string;
-  let fileSharedLockedId: string;
-  let fileSharedFavLockedId: string;
-
-  const userApi = new RepoClient(username, username);
-  const adminApiActions = new AdminActions();
-  const userActions = new UserActions();
-
-  const loginPage = new LoginPage();
-  const page = new BrowsingPage();
-  const { dataTable, toolbar } = page;
-  const { searchInput } = page.pageLayoutHeader;
-  const searchResultsPage = new SearchResultsPage();
-
-  beforeAll(async () => {
-    await adminApiActions.createUser({ username });
-    await userActions.login(username, username);
-
-    parentId = await userApi.createFolder(parentName);
-
-    fileLockedId = await userApi.createFile(testData.fileLocked.name, parentId);
-    fileFavLockedId = await userApi.createFile(testData.fileFavLocked.name, parentId);
-    fileSharedLockedId = await userApi.createFile(testData.fileSharedLocked.name, parentId);
-    fileSharedFavLockedId = await userApi.createFile(testData.fileSharedFavLocked.name, parentId);
-
-    const initialFavoritesTotalItems = (await userApi.favorites.getFavoritesTotalItems()) || 0;
-    await userApi.favorites.addFavoritesByIds('file', [fileFavLockedId, fileSharedFavLockedId]);
-    await userApi.favorites.waitForApi({ expect: initialFavoritesTotalItems + 2 });
-
-    await userApi.shared.shareFilesByIds([fileSharedLockedId, fileSharedFavLockedId]);
-
-    await userActions.lockNodes([fileLockedId, fileFavLockedId, fileSharedLockedId, fileSharedFavLockedId]);
-
-    await userApi.shared.waitForFilesToBeShared([fileSharedLockedId, fileSharedFavLockedId]);
-    await userApi.search.waitForApi(username, { expect: 4 });
-
-    await loginPage.loginWith(username);
-  });
-
-  afterAll(async () => {
-    await userActions.login(username, username);
-    await userActions.deleteNodes([parentId]);
-    await userActions.emptyTrashcan();
-  });
-
-  beforeEach(async () => {
-    await Utils.pressEscape();
-  });
-
-  describe('on Personal Files : ', () => {
-    beforeEach(async () => {
-      await page.clickPersonalFilesAndWait();
-      await dataTable.doubleClickOnRowByName(parentName);
-      await dataTable.waitForHeader();
-    });
-
-    describe('single selection : ', () => {
-      it('File locked - [C297617]', async () => {
-        await testUtil.checkToolbarActions(testData.fileLocked.name, testData.fileLocked.toolbarPrimary, testData.fileLocked.toolbarMore);
-        await testUtil.checkContextMenu(testData.fileLocked.name, testData.fileLocked.contextMenu);
-      });
-
-      it('File favorite, locked - [C291816]', async () => {
-        await testUtil.checkToolbarActions(testData.fileFavLocked.name, testData.fileFavLocked.toolbarPrimary, testData.fileFavLocked.toolbarMore);
-        await testUtil.checkContextMenu(testData.fileFavLocked.name, testData.fileFavLocked.contextMenu);
-      });
-
-      it('File shared, locked - [C280453]', async () => {
-        await testUtil.checkToolbarActions(
-          testData.fileSharedLocked.name,
-          testData.fileSharedLocked.toolbarPrimary,
-          testData.fileSharedLocked.toolbarMore
-        );
-        await testUtil.checkContextMenu(testData.fileSharedLocked.name, testData.fileSharedLocked.contextMenu);
-      });
-
-      it('File shared, favorite, locked - [C280454]', async () => {
-        await testUtil.checkToolbarActions(
-          testData.fileSharedFavLocked.name,
-          testData.fileSharedFavLocked.toolbarPrimary,
-          testData.fileSharedFavLocked.toolbarMore
-        );
-        await testUtil.checkContextMenu(testData.fileSharedFavLocked.name, testData.fileSharedFavLocked.contextMenu);
-      });
-    });
-
-    describe('Viewer - file opened from Personal Files : ', () => {
-      it('File locked - [C291832]', async () => {
-        await testUtil.checkViewerActions(testData.fileLocked.name, testData.fileLocked.viewerToolbarPrimary, testData.fileLocked.viewerToolbarMore);
-      });
-
-      it('File favorite, locked - [C297593]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileFavLocked.name,
-          testData.fileFavLocked.viewerToolbarPrimary,
-          testData.fileFavLocked.viewerToolbarMore
-        );
-      });
-
-      it('File shared, locked - [C291833]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileSharedLocked.name,
-          testData.fileSharedLocked.viewerToolbarPrimary,
-          testData.fileSharedLocked.viewerToolbarMore
-        );
-      });
-
-      it('File shared, favorite, locked - [C297592]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileSharedFavLocked.name,
-          testData.fileSharedFavLocked.viewerToolbarPrimary,
-          testData.fileSharedFavLocked.viewerToolbarMore
-        );
-      });
-    });
-  });
-
-  describe('on Favorites : ', () => {
-    beforeEach(async () => {
-      await page.clickFavoritesAndWait();
-    });
-
-    describe('single selection : ', () => {
-      it('File favorite, locked - [C280463]', async () => {
-        await testUtil.checkToolbarActions(
-          testData.fileFavLocked.name,
-          testData.fileFavLocked.toolbarPrimary,
-          testData.fileFavLocked.favoritesToolbarMore
-        );
-        await testUtil.checkContextMenu(testData.fileFavLocked.name, testData.fileFavLocked.favoritesContextMenu);
-      });
-
-      it('File shared, favorite, locked - [C280469]', async () => {
-        await testUtil.checkToolbarActions(
-          testData.fileSharedFavLocked.name,
-          testData.fileSharedFavLocked.favoritesToolbarPrimary,
-          testData.fileSharedFavLocked.favoritesToolbarMore
-        );
-        await testUtil.checkContextMenu(testData.fileSharedFavLocked.name, testData.fileSharedFavLocked.favoritesContextMenu);
-      });
-    });
-
-    describe('Viewer - file opened from Favorites : ', () => {
-      it('File favorite, locked - [C326707]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileFavLocked.name,
-          testData.fileFavLocked.viewerToolbarPrimary,
-          testData.fileFavLocked.viewerToolbarMore
-        );
-      });
-
-      it('File shared, favorite, locked - [C326706]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileSharedFavLocked.name,
-          testData.fileSharedFavLocked.viewerToolbarPrimary,
-          testData.fileSharedFavLocked.viewerToolbarMore
-        );
-      });
-    });
-  });
-
-  describe('on Recent Files : ', () => {
-    beforeEach(async () => {
-      await page.clickRecentFilesAndWait();
-    });
-
-    describe('single selection : ', () => {
-      it('File locked - [C280622]', async () => {
-        await testUtil.checkToolbarActions(testData.fileLocked.name, testData.fileLocked.toolbarPrimary, testData.fileLocked.toolbarMore);
-        await testUtil.checkContextMenu(testData.fileLocked.name, testData.fileLocked.contextMenu);
-      });
-
-      it('File favorite, locked - [C280608]', async () => {
-        await testUtil.checkToolbarActions(testData.fileFavLocked.name, testData.fileFavLocked.toolbarPrimary, testData.fileFavLocked.toolbarMore);
-        await testUtil.checkContextMenu(testData.fileFavLocked.name, testData.fileFavLocked.contextMenu);
-      });
-
-      it('File shared, locked - [C297636]', async () => {
-        await testUtil.checkToolbarActions(
-          testData.fileSharedLocked.name,
-          testData.fileSharedLocked.toolbarPrimary,
-          testData.fileSharedLocked.toolbarMore
-        );
-        await testUtil.checkContextMenu(testData.fileSharedLocked.name, testData.fileSharedLocked.contextMenu);
-      });
-
-      it('File shared, favorite, locked - [C286324]', async () => {
-        await testUtil.checkToolbarActions(
-          testData.fileSharedFavLocked.name,
-          testData.fileSharedFavLocked.toolbarPrimary,
-          testData.fileSharedFavLocked.toolbarMore
-        );
-        await testUtil.checkContextMenu(testData.fileSharedFavLocked.name, testData.fileSharedFavLocked.contextMenu);
-      });
-    });
-
-    describe('Viewer - file opened from Recent Files : ', () => {
-      it('File locked - [C326698]', async () => {
-        await testUtil.checkViewerActions(testData.fileLocked.name, testData.fileLocked.viewerToolbarPrimary, testData.fileLocked.viewerToolbarMore);
-      });
-
-      it('File favorite, locked - [C326701]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileFavLocked.name,
-          testData.fileFavLocked.viewerToolbarPrimary,
-          testData.fileFavLocked.viewerToolbarMore
-        );
-      });
-
-      it('File shared, locked - [C326699]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileSharedLocked.name,
-          testData.fileSharedLocked.viewerToolbarPrimary,
-          testData.fileSharedLocked.viewerToolbarMore
-        );
-      });
-
-      it('File shared, favorite, locked - [C326700]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileSharedFavLocked.name,
-          testData.fileSharedFavLocked.viewerToolbarPrimary,
-          testData.fileSharedFavLocked.viewerToolbarMore
-        );
-      });
-    });
-  });
-
-  describe('on Search Results : ', () => {
-    beforeEach(async () => {
-      await page.clickPersonalFiles();
-      await toolbar.clickSearchIconButton();
-      await searchInput.clickSearchButton();
-      await searchInput.checkOnlyFiles();
-      await searchInput.searchFor(`*${random}`);
-      await searchResultsPage.waitForResults();
-    });
-
-    describe('single selection : ', () => {
-      it('[C297628] File locked', async () => {
-        await testUtil.checkToolbarActions(testData.fileLocked.name, testData.fileLocked.searchToolbarPrimary, testData.fileLocked.searchToolbarMore);
-        await testUtil.checkContextMenu(testData.fileLocked.name, testData.fileLocked.searchContextMenu);
-      });
-
-      it('[C280648] File favorite, locked', async () => {
-        await testUtil.checkToolbarActions(
-          testData.fileFavLocked.name,
-          testData.fileFavLocked.searchToolbarPrimary,
-          testData.fileFavLocked.searchToolbarMore
-        );
-        await testUtil.checkContextMenu(testData.fileFavLocked.name, testData.fileFavLocked.searchContextMenu);
-      });
-
-      it('[C280574] File shared, locked', async () => {
-        await testUtil.checkToolbarActions(
-          testData.fileSharedLocked.name,
-          testData.fileSharedLocked.searchToolbarPrimary,
-          testData.fileSharedLocked.searchToolbarMore
-        );
-        await testUtil.checkContextMenu(testData.fileSharedLocked.name, testData.fileSharedLocked.searchContextMenu);
-      });
-
-      it('[C280642] File shared, favorite, locked', async () => {
-        await testUtil.checkToolbarActions(
-          testData.fileSharedFavLocked.name,
-          testData.fileSharedFavLocked.searchToolbarPrimary,
-          testData.fileSharedFavLocked.searchToolbarMore
-        );
-        await testUtil.checkContextMenu(testData.fileSharedFavLocked.name, testData.fileSharedFavLocked.searchContextMenu);
-      });
-    });
-
-    describe('Viewer - file opened from Search Results : ', () => {
-      it('File locked - [C326722]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileLocked.name,
-          testData.fileLocked.viewerToolbarPrimary,
-          testData.fileLocked.searchViewerToolbarMore
-        );
-      });
-
-      it('File favorite, locked - [C326725]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileFavLocked.name,
-          testData.fileFavLocked.viewerToolbarPrimary,
-          testData.fileFavLocked.searchViewerToolbarMore
-        );
-      });
-
-      it('File shared, locked - [C326723]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileSharedLocked.name,
-          testData.fileSharedLocked.viewerToolbarPrimary,
-          testData.fileSharedLocked.searchViewerToolbarMore
-        );
-      });
-
-      it('File shared, favorite, locked - [C326724]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileSharedFavLocked.name,
-          testData.fileSharedFavLocked.viewerToolbarPrimary,
-          testData.fileSharedFavLocked.searchViewerToolbarMore
-        );
-      });
-    });
-  });
-
-  describe('on Shared Files : ', () => {
-    beforeEach(async () => {
-      await page.clickSharedFilesAndWait();
-    });
-
-    describe('single selection : ', () => {
-      it('File shared, locked - [C286274]', async () => {
-        await testUtil.checkToolbarActions(
-          testData.fileSharedLocked.name,
-          testData.fileSharedLocked.toolbarPrimary,
-          testData.fileSharedLocked.toolbarMore
-        );
-        await testUtil.checkContextMenu(testData.fileSharedLocked.name, testData.fileSharedLocked.contextMenu);
-      });
-
-      it('File shared, favorite, locked - [C286275]', async () => {
-        await testUtil.checkToolbarActions(
-          testData.fileSharedFavLocked.name,
-          testData.fileSharedFavLocked.toolbarPrimary,
-          testData.fileSharedFavLocked.toolbarMore
-        );
-        await testUtil.checkContextMenu(testData.fileSharedFavLocked.name, testData.fileSharedFavLocked.contextMenu);
-      });
-    });
-
-    describe('Viewer - file opened from Shared Files : ', () => {
-      it('File shared, locked - [C326712]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileSharedLocked.name,
-          testData.fileSharedLocked.viewerToolbarPrimary,
-          testData.fileSharedLocked.viewerToolbarMore
-        );
-      });
-
-      it('File shared, favorite, locked - [C326713]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileSharedFavLocked.name,
-          testData.fileSharedFavLocked.viewerToolbarPrimary,
-          testData.fileSharedFavLocked.viewerToolbarMore
-        );
-      });
-    });
-  });
-});
diff --git a/e2e/protractor/suites/actions-available/files-folders/multiple-files-actions.test.ts b/e2e/protractor/suites/actions-available/files-folders/multiple-files-actions.test.ts
deleted file mode 100755
index c07ceb23fd..0000000000
--- a/e2e/protractor/suites/actions-available/files-folders/multiple-files-actions.test.ts
+++ /dev/null
@@ -1,228 +0,0 @@
-/*!
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Alfresco Example Content Application
- *
- * This file is part of the Alfresco Example Content Application.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The Alfresco Example Content Application is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import { RepoClient, Utils, AdminActions, UserActions, LoginPage, BrowsingPage, SearchResultsPage } from '@alfresco/aca-testing-shared';
-import * as testData from './test-data';
-import * as testUtil from '../test-util';
-
-describe('Multiple Files - available actions : ', () => {
-  const random = Utils.random();
-
-  const username = `user-${random}`;
-
-  const parentName = `parent-${random}`;
-  let parentId: string;
-
-  const file1 = `file-1-${random}.txt`;
-  let file1Id: string;
-  const file2 = `file-2-${random}.txt`;
-  let file2Id: string;
-  const file3Locked = `file-3-locked-${random}.txt`;
-  let file3LockedId: string;
-  const file1LockedFav = `file-lockedFav1-${random}.txt`;
-  let file1LockedFavId: string;
-  const file2LockedFav = `file-lockedFav2-${random}.txt`;
-  let file2LockedFavId: string;
-
-  const userApi = new RepoClient(username, username);
-  const adminApiActions = new AdminActions();
-  const userActions = new UserActions();
-
-  const loginPage = new LoginPage();
-  const page = new BrowsingPage();
-  const { dataTable, toolbar } = page;
-  const { searchInput } = page.pageLayoutHeader;
-  const searchResultsPage = new SearchResultsPage();
-
-  beforeAll(async () => {
-    await adminApiActions.createUser({ username });
-    await userActions.login(username, username);
-
-    parentId = await userApi.createFolder(parentName);
-
-    file1Id = await userApi.createFile(file1, parentId);
-    file2Id = await userApi.createFile(file2, parentId);
-    file3LockedId = await userApi.createFile(file3Locked, parentId);
-    file1LockedFavId = await userApi.createFile(file1LockedFav, parentId);
-    file2LockedFavId = await userApi.createFile(file2LockedFav, parentId);
-
-    await userActions.lockNodes([file1LockedFavId, file2LockedFavId, file3LockedId]);
-
-    const initialFavoritesTotalItems = (await userApi.favorites.getFavoritesTotalItems()) || 0;
-    await userApi.favorites.addFavoritesByIds('file', [file1LockedFavId, file2LockedFavId]);
-    await userApi.favorites.waitForApi({ expect: initialFavoritesTotalItems + 2 });
-
-    await userApi.shared.shareFilesByIds([file1Id, file2Id, file3LockedId, file1LockedFavId, file2LockedFavId]);
-    await userApi.shared.waitForFilesToBeShared([file1Id, file2Id, file3LockedId, file1LockedFavId, file2LockedFavId]);
-    await userApi.search.waitForApi(username, { expect: 5 });
-
-    await loginPage.loginWith(username);
-  });
-
-  afterAll(async () => {
-    await userActions.login(username, username);
-    await userActions.unlockNodes([file1LockedFavId, file2LockedFavId, file3LockedId]);
-    await userActions.deleteNodes([parentId]);
-  });
-
-  beforeEach(async () => {
-    await Utils.pressEscape();
-  });
-
-  describe('on Personal Files : ', () => {
-    beforeEach(async () => {
-      await page.clickPersonalFilesAndWait();
-      await dataTable.doubleClickOnRowByName(parentName);
-      await dataTable.waitForHeader();
-    });
-
-    it('multiple files - [C217112]', async () => {
-      await testUtil.checkMultipleSelContextMenu([file1, file2], testData.multipleSel.contextMenu);
-      await testUtil.checkMultipleSelToolbarActions([file1, file2], testData.multipleSel.toolbarPrimary, testData.multipleSel.toolbarMore);
-    });
-
-    it('multiple files - all favorite, locked - [C297619]', async () => {
-      await testUtil.checkMultipleSelContextMenu([file1LockedFav, file2LockedFav], testData.multipleSelAllFav.contextMenu);
-      await testUtil.checkMultipleSelToolbarActions(
-        [file1LockedFav, file2LockedFav],
-        testData.multipleSel.toolbarPrimary,
-        testData.multipleSelAllFav.toolbarMore
-      );
-    });
-
-    it('multiple locked files - [C326688]', async () => {
-      await testUtil.checkMultipleSelContextMenu([file3Locked, file1LockedFav], testData.multipleSel.contextMenu);
-      await testUtil.checkMultipleSelToolbarActions(
-        [file3Locked, file1LockedFav],
-        testData.multipleSel.toolbarPrimary,
-        testData.multipleSel.toolbarMore
-      );
-    });
-  });
-
-  describe('on Favorites : ', () => {
-    beforeEach(async () => {
-      await page.clickPersonalFiles();
-      await page.clickFavoritesAndWait();
-    });
-
-    it('multiple files - all favorite - [C280656]', async () => {
-      await testUtil.checkMultipleSelContextMenu([file1LockedFav, file2LockedFav], testData.multipleSelAllFav.favoritesContextMenu);
-      await testUtil.checkMultipleSelToolbarActions(
-        [file1LockedFav, file2LockedFav],
-        testData.multipleSelAllFav.toolbarPrimary,
-        testData.multipleSelAllFav.favoritesToolbarMore
-      );
-    });
-  });
-
-  describe('on Recent Files : ', () => {
-    beforeEach(async () => {
-      await page.clickPersonalFiles();
-      await page.clickRecentFilesAndWait();
-    });
-
-    it('multiple files - [C280468]', async () => {
-      await testUtil.checkMultipleSelContextMenu([file1, file2], testData.multipleSel.contextMenu);
-      await testUtil.checkMultipleSelToolbarActions([file1, file2], testData.multipleSel.toolbarPrimary, testData.multipleSel.toolbarMore);
-    });
-
-    it('multiple files - all favorite - [C326689]', async () => {
-      await testUtil.checkMultipleSelContextMenu([file1LockedFav, file2LockedFav], testData.multipleSelAllFav.contextMenu);
-      await testUtil.checkMultipleSelToolbarActions(
-        [file1LockedFav, file2LockedFav],
-        testData.multipleSel.toolbarPrimary,
-        testData.multipleSelAllFav.toolbarMore
-      );
-    });
-  });
-
-  describe('on Search Results : ', () => {
-    beforeEach(async () => {
-      await page.clickPersonalFiles();
-      await toolbar.clickSearchIconButton();
-      await searchInput.clickSearchButton();
-      await searchInput.checkOnlyFiles();
-      await searchInput.searchFor(`*${random}`);
-      await searchResultsPage.waitForResults();
-    });
-
-    it('[C291820] multiple files', async () => {
-      await testUtil.checkMultipleSelContextMenu([file1, file2], testData.multipleSel.searchContextMenu);
-      await testUtil.checkMultipleSelToolbarActions(
-        [file1, file2],
-        testData.multipleSel.searchToolbarPrimary,
-        testData.multipleSel.searchToolbarMore
-      );
-    });
-
-    it('[C326690] multiple files - all favorite, locked', async () => {
-      await testUtil.checkMultipleSelContextMenu([file1LockedFav, file2LockedFav], testData.multipleSelAllFav.searchContextMenu);
-      await testUtil.checkMultipleSelToolbarActions(
-        [file1LockedFav, file2LockedFav],
-        testData.multipleSelAllFav.searchToolbarPrimary,
-        testData.multipleSelAllFav.searchToolbarMore
-      );
-    });
-
-    it('[C297626] multiple locked files', async () => {
-      await testUtil.checkMultipleSelContextMenu([file3Locked, file1LockedFav], testData.multipleSel.searchContextMenu);
-      await testUtil.checkMultipleSelToolbarActions(
-        [file3Locked, file1LockedFav],
-        testData.multipleSel.searchToolbarPrimary,
-        testData.multipleSel.searchToolbarMore
-      );
-    });
-  });
-
-  describe('on Shared Files : ', () => {
-    beforeEach(async () => {
-      await page.clickPersonalFiles();
-      await page.clickSharedFilesAndWait();
-    });
-
-    it('multiple files - [C280467]', async () => {
-      await testUtil.checkMultipleSelContextMenu([file1, file2], testData.multipleSel.contextMenu);
-      await testUtil.checkMultipleSelToolbarActions([file1, file2], testData.multipleSel.toolbarPrimary, testData.multipleSel.toolbarMore);
-    });
-
-    it('multiple files - all favorite - [C326691]', async () => {
-      await testUtil.checkMultipleSelContextMenu([file1LockedFav, file2LockedFav], testData.multipleSelAllFav.contextMenu);
-      await testUtil.checkMultipleSelToolbarActions(
-        [file1LockedFav, file2LockedFav],
-        testData.multipleSelAllFav.toolbarPrimary,
-        testData.multipleSelAllFav.toolbarMore
-      );
-    });
-
-    it('multiple locked files - [C297623]', async () => {
-      await testUtil.checkMultipleSelContextMenu([file3Locked, file1LockedFav], testData.multipleSel.contextMenu);
-      await testUtil.checkMultipleSelToolbarActions(
-        [file3Locked, file1LockedFav],
-        testData.multipleSel.toolbarPrimary,
-        testData.multipleSel.toolbarMore
-      );
-    });
-  });
-});
diff --git a/e2e/protractor/suites/actions-available/files-folders/office-files-actions.test.ts b/e2e/protractor/suites/actions-available/files-folders/office-files-actions.test.ts
deleted file mode 100755
index 966493de4e..0000000000
--- a/e2e/protractor/suites/actions-available/files-folders/office-files-actions.test.ts
+++ /dev/null
@@ -1,359 +0,0 @@
-/*!
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Alfresco Example Content Application
- *
- * This file is part of the Alfresco Example Content Application.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The Alfresco Example Content Application is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import { RepoClient, Utils, AdminActions, UserActions, LoginPage, FILES, BrowsingPage, SearchResultsPage } from '@alfresco/aca-testing-shared';
-import * as testData from './test-data';
-import * as testUtil from '../test-util';
-
-describe('Office Files - available actions : ', () => {
-  const random = testData.random;
-
-  const username = `user-${Utils.random()}`;
-  const parentName = `parent-${Utils.random()}`;
-
-  let parentId: string;
-  let fileDocxFavId: string;
-  let fileDocxSharedId: string;
-  let fileDocxSharedFavId: string;
-
-  const userApi = new RepoClient(username, username);
-  const adminApiActions = new AdminActions();
-  const userActions = new UserActions();
-
-  const loginPage = new LoginPage();
-  const page = new BrowsingPage();
-  const { dataTable, toolbar } = page;
-  const { searchInput } = page.pageLayoutHeader;
-  const searchResultsPage = new SearchResultsPage();
-
-  beforeAll(async () => {
-    await adminApiActions.createUser({ username });
-
-    parentId = (await userApi.nodes.createFolder(parentName)).entry.id;
-
-    await userApi.upload.uploadFileWithRename(FILES.docxFile, parentId, testData.fileDocx.name);
-    fileDocxFavId = (await userApi.upload.uploadFileWithRename(FILES.docxFile, parentId, testData.fileDocxFav.name)).entry.id;
-    fileDocxSharedId = (await userApi.upload.uploadFileWithRename(FILES.docxFile, parentId, testData.fileDocxShared.name)).entry.id;
-    fileDocxSharedFavId = (await userApi.upload.uploadFileWithRename(FILES.docxFile, parentId, testData.fileDocxSharedFav.name)).entry.id;
-
-    const initialFavoritesTotalItems = (await userApi.favorites.getFavoritesTotalItems()) || 0;
-    await userApi.favorites.addFavoritesByIds('file', [fileDocxFavId, fileDocxSharedFavId]);
-    await userApi.favorites.waitForApi({ expect: initialFavoritesTotalItems + 2 });
-
-    await userApi.shared.shareFilesByIds([fileDocxSharedId, fileDocxSharedFavId]);
-    await userApi.shared.waitForFilesToBeShared([fileDocxSharedId, fileDocxSharedFavId]);
-
-    await loginPage.loginWith(username);
-  });
-
-  afterAll(async () => {
-    await userActions.login(username, username);
-    await userActions.deleteNodes([parentId]);
-    await userActions.emptyTrashcan();
-  });
-
-  beforeEach(async () => {
-    await Utils.pressEscape();
-  });
-
-  describe('on Personal Files : ', () => {
-    beforeEach(async () => {
-      await page.clickPersonalFilesAndWait();
-      await dataTable.doubleClickOnRowByName(parentName);
-      await dataTable.waitForHeader();
-    });
-
-    describe('on a file', () => {
-      it('File Office - [C213122]', async () => {
-        await testUtil.checkToolbarActions(testData.fileDocx.name, testData.fileDocx.toolbarPrimary, testData.fileDocx.toolbarMore);
-        await testUtil.checkContextMenu(testData.fileDocx.name, testData.fileDocx.contextMenu);
-      });
-
-      it('File Office, favorite - [C297612]', async () => {
-        await testUtil.checkToolbarActions(testData.fileDocxFav.name, testData.fileDocxFav.toolbarPrimary, testData.fileDocxFav.toolbarMore);
-        await testUtil.checkContextMenu(testData.fileDocxFav.name, testData.fileDocxFav.contextMenu);
-      });
-
-      it('File Office, shared - [C280448]', async () => {
-        await testUtil.checkToolbarActions(testData.fileDocxShared.name, testData.fileDocxShared.toolbarPrimary, testData.fileDocxShared.toolbarMore);
-        await testUtil.checkContextMenu(testData.fileDocxShared.name, testData.fileDocxShared.contextMenu);
-      });
-
-      it('File Office, shared, favorite - [C297616]', async () => {
-        await testUtil.checkToolbarActions(
-          testData.fileDocxSharedFav.name,
-          testData.fileDocxSharedFav.toolbarPrimary,
-          testData.fileDocxSharedFav.toolbarMore
-        );
-        await testUtil.checkContextMenu(testData.fileDocxSharedFav.name, testData.fileDocxSharedFav.contextMenu);
-      });
-    });
-
-    describe('Viewer - file opened from Personal Files : ', () => {
-      it('File Office - [C282025]', async () => {
-        await testUtil.checkViewerActions(testData.fileDocx.name, testData.fileDocx.viewerToolbarPrimary, testData.fileDocx.viewerToolbarMore);
-      });
-
-      it('File Office, favorite - [C297583]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileDocxFav.name,
-          testData.fileDocxFav.viewerToolbarPrimary,
-          testData.fileDocxFav.viewerToolbarMore
-        );
-      });
-
-      it('File Office, shared - [C297597]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileDocxShared.name,
-          testData.fileDocxShared.viewerToolbarPrimary,
-          testData.fileDocxShared.viewerToolbarMore
-        );
-      });
-
-      it('File Office, shared, favorite - [C297598]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileDocxSharedFav.name,
-          testData.fileDocxSharedFav.viewerToolbarPrimary,
-          testData.fileDocxSharedFav.viewerToolbarMore
-        );
-      });
-    });
-  });
-
-  describe('on Favorites : ', () => {
-    beforeEach(async () => {
-      await page.clickFavoritesAndWait();
-    });
-
-    describe('single selection : ', () => {
-      it('File Office, favorite - [C297618]', async () => {
-        await testUtil.checkToolbarActions(testData.fileDocxFav.name, testData.fileDocxFav.toolbarPrimary, testData.fileDocxFav.favoritesToolbarMore);
-        await testUtil.checkContextMenu(testData.fileDocxFav.name, testData.fileDocxFav.favoritesContextMenu);
-      });
-
-      it('File Office, shared, favorite - [C297620]', async () => {
-        await testUtil.checkToolbarActions(
-          testData.fileDocxSharedFav.name,
-          testData.fileDocxSharedFav.favoritesToolbarPrimary,
-          testData.fileDocxSharedFav.favoritesToolbarMore
-        );
-        await testUtil.checkContextMenu(testData.fileDocxSharedFav.name, testData.fileDocxSharedFav.favoritesContextMenu);
-      });
-    });
-
-    describe('Viewer - file opened from Favorites : ', () => {
-      it('File Office, favorite - [C326702]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileDocxFav.name,
-          testData.fileDocxFav.viewerToolbarPrimary,
-          testData.fileDocxFav.viewerToolbarMore
-        );
-      });
-
-      it('File Office, shared, favorite - [C326704]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileDocxSharedFav.name,
-          testData.fileDocxSharedFav.viewerToolbarPrimary,
-          testData.fileDocxSharedFav.viewerToolbarMore
-        );
-      });
-    });
-  });
-
-  describe('on Recent Files : ', () => {
-    beforeEach(async () => {
-      await page.clickRecentFilesAndWait();
-    });
-
-    describe('on single selection', () => {
-      it('File Office - [C297625]', async () => {
-        await testUtil.checkToolbarActions(testData.fileDocx.name, testData.fileDocx.toolbarPrimary, testData.fileDocx.toolbarMore);
-        await testUtil.checkContextMenu(testData.fileDocx.name, testData.fileDocx.contextMenu);
-      });
-
-      it('File Office, favorite - [C280470]', async () => {
-        await testUtil.checkToolbarActions(testData.fileDocxFav.name, testData.fileDocxFav.toolbarPrimary, testData.fileDocxFav.toolbarMore);
-        await testUtil.checkContextMenu(testData.fileDocxFav.name, testData.fileDocxFav.contextMenu);
-      });
-
-      it('File Office, shared - [C297633]', async () => {
-        await testUtil.checkToolbarActions(testData.fileDocxShared.name, testData.fileDocxShared.toolbarPrimary, testData.fileDocxShared.toolbarMore);
-        await testUtil.checkContextMenu(testData.fileDocxShared.name, testData.fileDocxShared.contextMenu);
-      });
-
-      it('File Office, shared, favorite - [C280616]', async () => {
-        await testUtil.checkToolbarActions(
-          testData.fileDocxSharedFav.name,
-          testData.fileDocxSharedFav.toolbarPrimary,
-          testData.fileDocxSharedFav.toolbarMore
-        );
-        await testUtil.checkContextMenu(testData.fileDocxSharedFav.name, testData.fileDocxSharedFav.contextMenu);
-      });
-    });
-
-    describe('Viewer - file opened from Recent Files : ', () => {
-      it('File Office - [C297599]', async () => {
-        await testUtil.checkViewerActions(testData.fileDocx.name, testData.fileDocx.viewerToolbarPrimary, testData.fileDocx.viewerToolbarMore);
-      });
-
-      it('File Office, favorite - [C297600]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileDocxFav.name,
-          testData.fileDocxFav.viewerToolbarPrimary,
-          testData.fileDocxFav.viewerToolbarMore
-        );
-      });
-
-      it('File Office, shared - [C326694]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileDocxShared.name,
-          testData.fileDocxShared.viewerToolbarPrimary,
-          testData.fileDocxShared.viewerToolbarMore
-        );
-      });
-
-      it('File Office, shared, favorite - [C326695]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileDocxSharedFav.name,
-          testData.fileDocxSharedFav.viewerToolbarPrimary,
-          testData.fileDocxSharedFav.viewerToolbarMore
-        );
-      });
-    });
-  });
-
-  describe('on Search Results : ', () => {
-    beforeEach(async () => {
-      await page.clickPersonalFiles();
-      await toolbar.clickSearchIconButton();
-      await searchInput.clickSearchButton();
-      await searchInput.searchFor(`*${random}`);
-      await searchResultsPage.waitForResults();
-    });
-
-    describe('on a file', () => {
-      it('[C297637] File Office', async () => {
-        await testUtil.checkToolbarActions(testData.fileDocx.name, testData.fileDocx.searchToolbarPrimary, testData.fileDocx.searchToolbarMore);
-        await testUtil.checkContextMenu(testData.fileDocx.name, testData.fileDocx.searchContextMenu);
-      });
-
-      it('[C291827] File Office, favorite', async () => {
-        await testUtil.checkToolbarActions(
-          testData.fileDocxFav.name,
-          testData.fileDocxFav.searchToolbarPrimary,
-          testData.fileDocxFav.searchToolbarMore
-        );
-        await testUtil.checkContextMenu(testData.fileDocxFav.name, testData.fileDocxFav.searchContextMenu);
-      });
-
-      it('[C297627] File Office, shared', async () => {
-        await testUtil.checkToolbarActions(
-          testData.fileDocxShared.name,
-          testData.fileDocxShared.searchToolbarPrimary,
-          testData.fileDocxShared.searchToolbarMore
-        );
-        await testUtil.checkContextMenu(testData.fileDocxShared.name, testData.fileDocxShared.searchContextMenu);
-      });
-
-      it('[C280631] File Office, shared, favorite', async () => {
-        await testUtil.checkToolbarActions(
-          testData.fileDocxSharedFav.name,
-          testData.fileDocxSharedFav.searchToolbarPrimary,
-          testData.fileDocxSharedFav.searchToolbarMore
-        );
-        await testUtil.checkContextMenu(testData.fileDocxSharedFav.name, testData.fileDocxSharedFav.searchContextMenu);
-      });
-    });
-
-    describe('Viewer - file opened from Search Results : ', () => {
-      it('File Office - [C326714]', async () => {
-        await testUtil.checkViewerActions(testData.fileDocx.name, testData.fileDocx.viewerToolbarPrimary, testData.fileDocx.searchViewerToolbarMore);
-      });
-
-      it('File Office, favorite - [C326715]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileDocxFav.name,
-          testData.fileDocxFav.viewerToolbarPrimary,
-          testData.fileDocxFav.searchViewerToolbarMore
-        );
-      });
-
-      it('File Office, shared - [C326718]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileDocxShared.name,
-          testData.fileDocxShared.viewerToolbarPrimary,
-          testData.fileDocxShared.searchViewerToolbarMore
-        );
-      });
-
-      it('File Office, shared, favorite - [C326719]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileDocxSharedFav.name,
-          testData.fileDocxSharedFav.viewerToolbarPrimary,
-          testData.fileDocxSharedFav.searchViewerToolbarMore
-        );
-      });
-    });
-  });
-
-  describe('on Shared Files : ', () => {
-    beforeEach(async () => {
-      await page.clickSharedFilesAndWait();
-    });
-
-    describe('single selection', () => {
-      it('File Office, shared - [C297629]', async () => {
-        await testUtil.checkToolbarActions(testData.fileDocxShared.name, testData.fileDocxShared.toolbarPrimary, testData.fileDocxShared.toolbarMore);
-        await testUtil.checkContextMenu(testData.fileDocxShared.name, testData.fileDocxShared.contextMenu);
-      });
-
-      it('File Office, shared, favorite - [C280652]', async () => {
-        await testUtil.checkToolbarActions(
-          testData.fileDocxSharedFav.name,
-          testData.fileDocxSharedFav.toolbarPrimary,
-          testData.fileDocxSharedFav.toolbarMore
-        );
-        await testUtil.checkContextMenu(testData.fileDocxSharedFav.name, testData.fileDocxSharedFav.contextMenu);
-      });
-    });
-
-    describe('Viewer - file opened from Shared Files', () => {
-      it('File Office, shared - [C326708]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileDocxShared.name,
-          testData.fileDocxShared.viewerToolbarPrimary,
-          testData.fileDocxShared.viewerToolbarMore
-        );
-      });
-
-      it('File Office, shared, favorite - [C326709]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileDocxSharedFav.name,
-          testData.fileDocxSharedFav.viewerToolbarPrimary,
-          testData.fileDocxSharedFav.viewerToolbarMore
-        );
-      });
-    });
-  });
-});
diff --git a/e2e/protractor/suites/actions-available/files-folders/single-file-actions.test.ts b/e2e/protractor/suites/actions-available/files-folders/single-file-actions.test.ts
deleted file mode 100755
index 02b64e7158..0000000000
--- a/e2e/protractor/suites/actions-available/files-folders/single-file-actions.test.ts
+++ /dev/null
@@ -1,346 +0,0 @@
-/*!
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Alfresco Example Content Application
- *
- * This file is part of the Alfresco Example Content Application.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The Alfresco Example Content Application is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import { RepoClient, Utils, AdminActions, UserActions, LoginPage, BrowsingPage, SearchResultsPage } from '@alfresco/aca-testing-shared';
-import * as testData from './test-data';
-import * as testUtil from '../test-util';
-import { Logger } from '@alfresco/adf-testing';
-
-describe('Files - available actions : ', () => {
-  const random = Utils.random();
-
-  const username = `user-${random}`;
-  const parentName = `parent-${random}`;
-
-  let parentId: string;
-  let fileFavId: string;
-  let fileSharedId: string;
-  let fileSharedFavId: string;
-
-  const userApi = new RepoClient(username, username);
-  const adminApiActions = new AdminActions();
-  const userActions = new UserActions();
-
-  const loginPage = new LoginPage();
-  const page = new BrowsingPage();
-  const { dataTable, toolbar } = page;
-  const { searchInput } = page.pageLayoutHeader;
-  const searchResultsPage = new SearchResultsPage();
-
-  beforeAll(async () => {
-    try {
-      await adminApiActions.createUser({ username });
-
-      parentId = (await userApi.nodes.createFolder(parentName)).entry.id;
-
-      await userApi.nodes.createFile(testData.file.name, parentId);
-      fileFavId = (await userApi.nodes.createFile(testData.fileFav.name, parentId)).entry.id;
-      fileSharedId = (await userApi.nodes.createFile(testData.fileShared.name, parentId)).entry.id;
-      fileSharedFavId = (await userApi.nodes.createFile(testData.fileSharedFav.name, parentId)).entry.id;
-
-      const initialFavoritesTotalItems = (await userApi.favorites.getFavoritesTotalItems()) || 0;
-      await userApi.favorites.addFavoritesByIds('file', [fileFavId, fileSharedFavId]);
-      await userApi.favorites.waitForApi({ expect: initialFavoritesTotalItems + 2 });
-
-      await userApi.shared.shareFilesByIds([fileSharedId, fileSharedFavId]);
-      await userApi.shared.waitForFilesToBeShared([fileSharedId, fileSharedFavId]);
-
-      await loginPage.loginWith(username);
-    } catch (error) {
-      Logger.error(`----- beforeEach failed : ${error}`);
-    }
-  });
-
-  afterAll(async () => {
-    await userActions.login(username, username);
-    await userActions.deleteNodes([parentId]);
-    await userActions.emptyTrashcan();
-  });
-
-  beforeEach(async () => {
-    await Utils.pressEscape();
-  });
-
-  describe('on Personal Files : ', () => {
-    beforeAll(async () => {
-      await page.clickPersonalFilesAndWait();
-      await dataTable.doubleClickOnRowByName(parentName);
-      await dataTable.waitForHeader();
-    });
-
-    it('File simple - [C286265]', async () => {
-      await testUtil.checkToolbarActions(testData.file.name, testData.file.toolbarPrimary, testData.file.toolbarMore);
-      await testUtil.checkContextMenu(testData.file.name, testData.file.contextMenu);
-    });
-
-    it('File favorite - [C297615]', async () => {
-      await testUtil.checkToolbarActions(testData.fileFav.name, testData.fileFav.toolbarPrimary, testData.fileFav.toolbarMore);
-      await testUtil.checkContextMenu(testData.fileFav.name, testData.fileFav.contextMenu);
-    });
-
-    it('File shared - [C286323]', async () => {
-      await testUtil.checkToolbarActions(testData.fileShared.name, testData.fileShared.toolbarPrimary, testData.fileShared.toolbarMore);
-      await testUtil.checkContextMenu(testData.fileShared.name, testData.fileShared.contextMenu);
-    });
-
-    it('File shared, favorite - [C280450]', async () => {
-      await testUtil.checkToolbarActions(testData.fileSharedFav.name, testData.fileSharedFav.toolbarPrimary, testData.fileSharedFav.toolbarMore);
-      await testUtil.checkContextMenu(testData.fileSharedFav.name, testData.fileSharedFav.contextMenu);
-    });
-
-    describe('Viewer - file opened from Personal Files : ', () => {
-      beforeAll(async () => {
-        await page.clickPersonalFilesAndWait();
-        await dataTable.doubleClickOnRowByName(parentName);
-        await dataTable.waitForHeader();
-      });
-
-      it('File simple - [C297587]', async () => {
-        await testUtil.checkViewerActions(testData.file.name, testData.file.viewerToolbarPrimary, testData.file.viewerToolbarMore);
-      });
-
-      it('File favorite - [C297588]', async () => {
-        await testUtil.checkViewerActions(testData.fileFav.name, testData.fileFav.viewerToolbarPrimary, testData.fileFav.viewerToolbarMore);
-      });
-
-      it('File shared - [C291831]', async () => {
-        await testUtil.checkViewerActions(testData.fileShared.name, testData.fileShared.viewerToolbarPrimary, testData.fileShared.viewerToolbarMore);
-      });
-
-      it('File shared, favorite - [C297632]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileSharedFav.name,
-          testData.fileSharedFav.viewerToolbarPrimary,
-          testData.fileSharedFav.viewerToolbarMore
-        );
-      });
-    });
-  });
-
-  describe('on Favorites : ', () => {
-    beforeAll(async () => {
-      await page.clickFavoritesAndWait();
-    });
-
-    it('File favorite - [C280461]', async () => {
-      await testUtil.checkToolbarActions(testData.fileFav.name, testData.fileFav.toolbarPrimary, testData.fileFav.favoritesToolbarMore);
-      await testUtil.checkContextMenu(testData.fileFav.name, testData.fileFav.favoritesContextMenu);
-    });
-
-    it('File shared, favorite - [C280462]', async () => {
-      await testUtil.checkToolbarActions(
-        testData.fileSharedFav.name,
-        testData.fileSharedFav.favoritesToolbarPrimary,
-        testData.fileSharedFav.favoritesToolbarMore
-      );
-      await testUtil.checkContextMenu(testData.fileSharedFav.name, testData.fileSharedFav.favoritesContextMenu);
-    });
-
-    describe('Viewer - file opened from Favorites : ', () => {
-      beforeAll(async () => {
-        await page.clickFavoritesAndWait();
-      });
-
-      it('File favorite - [C326703]', async () => {
-        await testUtil.checkViewerActions(testData.fileFav.name, testData.fileFav.viewerToolbarPrimary, testData.fileFav.viewerToolbarMore);
-      });
-
-      it('File shared, favorite - [C326705]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileSharedFav.name,
-          testData.fileSharedFav.viewerToolbarPrimary,
-          testData.fileSharedFav.viewerToolbarMore
-        );
-      });
-    });
-  });
-
-  describe('on Recent Files : ', () => {
-    beforeAll(async () => {
-      await page.clickRecentFilesAndWait();
-    });
-
-    it('File simple - [C280471]', async () => {
-      await testUtil.checkToolbarActions(testData.file.name, testData.file.toolbarPrimary, testData.file.toolbarMore);
-      await testUtil.checkContextMenu(testData.file.name, testData.file.contextMenu);
-    });
-
-    it('File favorite - [C280615]', async () => {
-      await testUtil.checkToolbarActions(testData.fileFav.name, testData.fileFav.toolbarPrimary, testData.fileFav.toolbarMore);
-      await testUtil.checkContextMenu(testData.fileFav.name, testData.fileFav.contextMenu);
-    });
-
-    it('File shared - [C280601]', async () => {
-      await testUtil.checkToolbarActions(testData.fileShared.name, testData.fileShared.toolbarPrimary, testData.fileShared.toolbarMore);
-      await testUtil.checkContextMenu(testData.fileShared.name, testData.fileShared.contextMenu);
-    });
-
-    it('File shared, favorite - [C297635]', async () => {
-      await testUtil.checkToolbarActions(testData.fileSharedFav.name, testData.fileSharedFav.toolbarPrimary, testData.fileSharedFav.toolbarMore);
-      await testUtil.checkContextMenu(testData.fileSharedFav.name, testData.fileSharedFav.contextMenu);
-    });
-
-    describe('Viewer - file opened from Recent Files : ', () => {
-      beforeAll(async () => {
-        await page.clickRecentFilesAndWait();
-      });
-
-      it('File simple - [C326692]', async () => {
-        await testUtil.checkViewerActions(testData.file.name, testData.file.viewerToolbarPrimary, testData.file.viewerToolbarMore);
-      });
-
-      it('File favorite - [C326693]', async () => {
-        await testUtil.checkViewerActions(testData.fileFav.name, testData.fileFav.viewerToolbarPrimary, testData.fileFav.viewerToolbarMore);
-      });
-
-      it('File shared - [C326696]', async () => {
-        await testUtil.checkViewerActions(testData.fileShared.name, testData.fileShared.viewerToolbarPrimary, testData.fileShared.viewerToolbarMore);
-      });
-
-      it('File shared, favorite - [C326697]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileSharedFav.name,
-          testData.fileSharedFav.viewerToolbarPrimary,
-          testData.fileSharedFav.viewerToolbarMore
-        );
-      });
-    });
-  });
-
-  describe('on Search Results : ', () => {
-    beforeEach(async () => {
-      await page.clickPersonalFiles();
-      await toolbar.clickSearchIconButton();
-      await searchInput.clickSearchButton();
-    });
-
-    it('[C297638] File simple', async () => {
-      await searchInput.searchFor(testData.file.name);
-      await searchResultsPage.waitForResults();
-
-      await testUtil.checkToolbarActions(testData.file.name, testData.file.searchToolbarPrimary, testData.file.searchToolbarMore);
-      await testUtil.checkContextMenu(testData.file.name, testData.file.searchContextMenu);
-    });
-
-    it('[C280661] File favorite', async () => {
-      await searchInput.searchFor(testData.fileFav.name);
-      await searchResultsPage.waitForResults();
-
-      await testUtil.checkToolbarActions(testData.fileFav.name, testData.fileFav.searchToolbarPrimary, testData.fileFav.searchToolbarMore);
-      await testUtil.checkContextMenu(testData.fileFav.name, testData.fileFav.searchContextMenu);
-    });
-
-    it('[C280632] File shared', async () => {
-      await searchInput.searchFor(testData.fileShared.name);
-      await searchResultsPage.waitForResults();
-
-      await testUtil.checkToolbarActions(testData.fileShared.name, testData.fileShared.searchToolbarPrimary, testData.fileShared.searchToolbarMore);
-      await testUtil.checkContextMenu(testData.fileShared.name, testData.fileShared.searchContextMenu);
-    });
-
-    it('[C280641] File shared, favorite', async () => {
-      await searchInput.searchFor(testData.fileSharedFav.name);
-      await searchResultsPage.waitForResults();
-
-      await testUtil.checkToolbarActions(
-        testData.fileSharedFav.name,
-        testData.fileSharedFav.searchToolbarPrimary,
-        testData.fileSharedFav.searchToolbarMore
-      );
-      await testUtil.checkContextMenu(testData.fileSharedFav.name, testData.fileSharedFav.searchContextMenu);
-    });
-
-    describe('Viewer - file opened from Search Results : ', () => {
-      it('File simple - [C326716]', async () => {
-        await searchInput.searchFor(testData.file.name);
-        await searchResultsPage.waitForResults();
-        await testUtil.checkViewerActions(testData.file.name, testData.file.viewerToolbarPrimary, testData.file.searchViewerToolbarMore);
-      });
-
-      it('File favorite - [C326717]', async () => {
-        await searchInput.searchFor(testData.fileFav.name);
-        await searchResultsPage.waitForResults();
-        await testUtil.checkViewerActions(testData.fileFav.name, testData.fileFav.viewerToolbarPrimary, testData.fileFav.searchViewerToolbarMore);
-      });
-
-      it('File shared - [C326720]', async () => {
-        await searchInput.searchFor(testData.fileShared.name);
-        await searchResultsPage.waitForResults();
-
-        await testUtil.checkViewerActions(
-          testData.fileShared.name,
-          testData.fileShared.viewerToolbarPrimary,
-          testData.fileShared.searchViewerToolbarMore
-        );
-      });
-
-      it('File shared, favorite - [C326721]', async () => {
-        await searchInput.searchFor(testData.fileSharedFav.name);
-        await searchResultsPage.waitForResults();
-
-        await testUtil.checkViewerActions(
-          testData.fileSharedFav.name,
-          testData.fileSharedFav.viewerToolbarPrimary,
-          testData.fileSharedFav.searchViewerToolbarMore
-        );
-      });
-    });
-  });
-
-  describe('on Shared Files : ', () => {
-    beforeAll(async () => {
-      await page.clickSharedFilesAndWait();
-    });
-
-    describe('single selection', () => {
-      it('File shared - [C297630]', async () => {
-        await testUtil.checkToolbarActions(testData.fileShared.name, testData.fileShared.toolbarPrimary, testData.fileShared.toolbarMore);
-        await testUtil.checkContextMenu(testData.fileShared.name, testData.fileShared.contextMenu);
-      });
-
-      it('File shared, favorite - [C286273]', async () => {
-        await testUtil.checkToolbarActions(testData.fileSharedFav.name, testData.fileSharedFav.toolbarPrimary, testData.fileSharedFav.toolbarMore);
-        await testUtil.checkContextMenu(testData.fileSharedFav.name, testData.fileSharedFav.contextMenu);
-      });
-    });
-
-    describe('Viewer - file opened from Shared Files : ', () => {
-      beforeAll(async () => {
-        await page.clickSharedFilesAndWait();
-      });
-
-      it('File shared - [C326710]', async () => {
-        await testUtil.checkViewerActions(testData.fileShared.name, testData.fileShared.viewerToolbarPrimary, testData.fileShared.viewerToolbarMore);
-      });
-
-      it('File shared, favorite - [C326711]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileSharedFav.name,
-          testData.fileSharedFav.viewerToolbarPrimary,
-          testData.fileSharedFav.viewerToolbarMore
-        );
-      });
-    });
-  });
-});
diff --git a/e2e/protractor/suites/actions-available/files-folders/test-data.ts b/e2e/protractor/suites/actions-available/files-folders/test-data.ts
deleted file mode 100644
index 68d39aab20..0000000000
--- a/e2e/protractor/suites/actions-available/files-folders/test-data.ts
+++ /dev/null
@@ -1,916 +0,0 @@
-/*!
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Alfresco Example Content Application
- *
- * This file is part of the Alfresco Example Content Application.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The Alfresco Example Content Application is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import { Utils } from '@alfresco/aca-testing-shared';
-
-export const random = Utils.random();
-
-export const trashActions = ['Permanently Delete', 'Restore'];
-
-// ----- files -----
-
-const fileContextMenu = [
-  'Share',
-  'Download',
-  'View',
-  'Edit Offline',
-  'Upload New Version',
-  'Favorite',
-  'Move',
-  'Copy',
-  'Delete',
-  'Manage Versions',
-  'Edit Aspects',
-  'Permissions'
-];
-const fileSharedFavLockedContextMenu = [
-  'Shared Link Settings',
-  'Download',
-  'View',
-  'Cancel Editing',
-  'Upload New Version',
-  'Remove Favorite',
-  'Move',
-  'Copy',
-  'Delete',
-  'Manage Versions',
-  'Permissions'
-];
-const fileToolbarPrimary = ['Share', 'Download', 'View', 'View Details', 'More Actions'];
-const fileToolbarMore = [
-  'Edit Offline',
-  'Upload New Version',
-  'Favorite',
-  'Move',
-  'Copy',
-  'Delete',
-  'Manage Versions',
-  'Edit Aspects',
-  'Permissions'
-];
-const fileDocxToolbarMore = [
-  'Edit in Microsoft Office™',
-  'Edit Offline',
-  'Upload New Version',
-  'Favorite',
-  'Move',
-  'Copy',
-  'Delete',
-  'Manage Versions',
-  'Edit Aspects',
-  'Permissions'
-];
-const fileDocxContextMenu = [
-  'Share',
-  'Download',
-  'View',
-  'Edit in Microsoft Office™',
-  'Edit Offline',
-  'Upload New Version',
-  'Favorite',
-  'Move',
-  'Copy',
-  'Delete',
-  'Manage Versions',
-  'Edit Aspects',
-  'Permissions'
-];
-const fileSharedToolbarPrimary = ['Shared Link Settings', 'Download', 'View', 'View Details', 'More Actions'];
-const fileFavLockedToolbarMore = [
-  'Cancel Editing',
-  'Upload New Version',
-  'Remove Favorite',
-  'Move',
-  'Copy',
-  'Delete',
-  'Manage Versions',
-  'Permissions'
-];
-const fileDocxFavContextMenu = [
-  'Share',
-  'Download',
-  'View',
-  'Edit in Microsoft Office™',
-  'Edit Offline',
-  'Upload New Version',
-  'Remove Favorite',
-  'Move',
-  'Copy',
-  'Delete',
-  'Manage Versions',
-  'Edit Aspects',
-  'Permissions'
-];
-const fileDocxFavToolbarMore = [
-  'Edit in Microsoft Office™',
-  'Edit Offline',
-  'Upload New Version',
-  'Remove Favorite',
-  'Move',
-  'Copy',
-  'Delete',
-  'Manage Versions',
-  'Edit Aspects',
-  'Permissions'
-];
-const fileDocxSharedFavContextMenu = [
-  'Shared Link Settings',
-  'Download',
-  'View',
-  'Edit in Microsoft Office™',
-  'Edit Offline',
-  'Upload New Version',
-  'Remove Favorite',
-  'Move',
-  'Copy',
-  'Delete',
-  'Manage Versions',
-  'Edit Aspects',
-  'Permissions'
-];
-const fileDocxSharedContextMenu = [
-  'Shared Link Settings',
-  'Download',
-  'View',
-  'Edit in Microsoft Office™',
-  'Edit Offline',
-  'Upload New Version',
-  'Favorite',
-  'Move',
-  'Copy',
-  'Delete',
-  'Manage Versions',
-  'Edit Aspects',
-  'Permissions'
-];
-const fileFavContextMenu = [
-  'Share',
-  'Download',
-  'View',
-  'Edit Offline',
-  'Upload New Version',
-  'Remove Favorite',
-  'Move',
-  'Copy',
-  'Delete',
-  'Manage Versions',
-  'Edit Aspects',
-  'Permissions'
-];
-const fileFavToolbarMore = [
-  'Edit Offline',
-  'Upload New Version',
-  'Remove Favorite',
-  'Move',
-  'Copy',
-  'Delete',
-  'Manage Versions',
-  'Edit Aspects',
-  'Permissions'
-];
-const fileSharedFavContextMenu = [
-  'Shared Link Settings',
-  'Download',
-  'View',
-  'Edit Offline',
-  'Upload New Version',
-  'Remove Favorite',
-  'Move',
-  'Copy',
-  'Delete',
-  'Manage Versions',
-  'Edit Aspects',
-  'Permissions'
-];
-const fileSharedContextMenu = [
-  'Shared Link Settings',
-  'Download',
-  'View',
-  'Edit Offline',
-  'Upload New Version',
-  'Favorite',
-  'Move',
-  'Copy',
-  'Delete',
-  'Manage Versions',
-  'Edit Aspects',
-  'Permissions'
-];
-const fileFavLockedContextMenu = [
-  'Share',
-  'Download',
-  'View',
-  'Cancel Editing',
-  'Upload New Version',
-  'Remove Favorite',
-  'Move',
-  'Copy',
-  'Delete',
-  'Manage Versions',
-  'Permissions'
-];
-const fileLockedContextMenu = [
-  'Share',
-  'Download',
-  'View',
-  'Cancel Editing',
-  'Upload New Version',
-  'Favorite',
-  'Move',
-  'Copy',
-  'Delete',
-  'Manage Versions',
-  'Permissions'
-];
-const fileLockedToolbarMore = ['Cancel Editing', 'Upload New Version', 'Favorite', 'Move', 'Copy', 'Delete', 'Manage Versions', 'Permissions'];
-const fileSharedLockedContextMenu = [
-  'Shared Link Settings',
-  'Download',
-  'View',
-  'Cancel Editing',
-  'Upload New Version',
-  'Favorite',
-  'Move',
-  'Copy',
-  'Delete',
-  'Manage Versions',
-  'Permissions'
-];
-
-// ---- VIEWER ----
-
-const viewerSharedToolbarPrimary = ['Activate full-screen mode', 'Shared Link Settings', 'Download', 'Print', 'View Details', 'More Actions'];
-const viewerToolbarPrimary = ['Activate full-screen mode', 'Share', 'Download', 'Print', 'View Details', 'More Actions'];
-const viewerToolbarMore = [
-  'Edit Offline',
-  'Upload New Version',
-  'Favorite',
-  'Move',
-  'Copy',
-  'Delete',
-  'Manage Versions',
-  'Edit Aspects',
-  'Permissions'
-];
-const viewerFavToolbarMore = [
-  'Edit Offline',
-  'Upload New Version',
-  'Remove Favorite',
-  'Move',
-  'Copy',
-  'Delete',
-  'Manage Versions',
-  'Edit Aspects',
-  'Permissions'
-];
-const viewerDocxToolbarMore = [
-  'Edit in Microsoft Office™',
-  'Edit Offline',
-  'Upload New Version',
-  'Favorite',
-  'Move',
-  'Copy',
-  'Delete',
-  'Manage Versions',
-  'Edit Aspects',
-  'Permissions'
-];
-const viewerFavLockedToolbarMore = [
-  'Cancel Editing',
-  'Upload New Version',
-  'Remove Favorite',
-  'Move',
-  'Copy',
-  'Delete',
-  'Manage Versions',
-  'Permissions'
-];
-const viewerDocxFavToolbarMore = [
-  'Edit in Microsoft Office™',
-  'Edit Offline',
-  'Upload New Version',
-  'Remove Favorite',
-  'Move',
-  'Copy',
-  'Delete',
-  'Manage Versions',
-  'Edit Aspects',
-  'Permissions'
-];
-const viewerLockedToolbarMore = ['Cancel Editing', 'Upload New Version', 'Favorite', 'Move', 'Copy', 'Delete', 'Manage Versions', 'Permissions'];
-// ---- FAVORITES workarounds ----
-
-// TODO: investigate why 'Edit Offline', 'Edit in Microsoft Office™' and 'Permissions' are not displayed and raise issue
-const favoritesContextMenu = ['Share', 'Download', 'View', 'Upload New Version', 'Remove Favorite', 'Move', 'Copy', 'Delete', 'Manage Versions'];
-// TODO: investigate why 'Permissions' is not displayed and raise issue
-const favoritesLockedContextMenu = [
-  'Share',
-  'Download',
-  'View',
-  'Cancel Editing',
-  'Upload New Version',
-  'Remove Favorite',
-  'Move',
-  'Copy',
-  'Delete',
-  'Manage Versions'
-];
-// TODO: investigate why 'Edit Offline', 'Edit in Microsoft Office™' and 'Permissions' are not displayed and raise issue
-const favoritesToolbarMore = ['Upload New Version', 'Remove Favorite', 'Move', 'Copy', 'Delete', 'Manage Versions'];
-// TODO: investigate why 'Permissions' is not displayed and raise issue
-const favoritesLockedToolbarMore = ['Cancel Editing', 'Upload New Version', 'Remove Favorite', 'Move', 'Copy', 'Delete', 'Manage Versions'];
-// TODO: investigate why 'Edit Offline', 'Edit in Microsoft Office™' and 'Permissions' are not displayed and raise issue
-const favoritesSharedContextMenu = [
-  'Shared Link Settings',
-  'Download',
-  'View',
-  'Upload New Version',
-  'Remove Favorite',
-  'Move',
-  'Copy',
-  'Delete',
-  'Manage Versions'
-];
-// TODO: investigate why 'Permissions' is not displayed and raise issue
-const favoritesSharedLockedContextMenu = [
-  'Shared Link Settings',
-  'Download',
-  'View',
-  'Cancel Editing',
-  'Upload New Version',
-  'Remove Favorite',
-  'Move',
-  'Copy',
-  'Delete',
-  'Manage Versions'
-];
-
-// ---- SEARCH workarounds ----
-
-const searchDocxContextMenu = [
-  'Share',
-  'Download',
-  'View',
-  'Edit in Microsoft Office™',
-  'Edit Offline',
-  'Upload New Version',
-  'Favorite',
-  'Copy',
-  'Manage Versions',
-  'Edit Aspects',
-  'Permissions'
-];
-const searchToolbarPrimary = ['Share', 'Download', 'View', 'View Details', 'More Actions'];
-const searchSharedToolbarPrimary = ['Shared Link Settings', 'Download', 'View', 'View Details', 'More Actions'];
-const searchFavLockedToolbarMore = ['Cancel Editing', 'Upload New Version', 'Remove Favorite', 'Copy', 'Manage Versions', 'Permissions'];
-const searchSharedFavLockedContextMenu = [
-  'Shared Link Settings',
-  'Download',
-  'View',
-  'Cancel Editing',
-  'Upload New Version',
-  'Remove Favorite',
-  'Copy',
-  'Manage Versions',
-  'Permissions'
-];
-const searchDocxToolbarMore = [
-  'Edit in Microsoft Office™',
-  'Edit Offline',
-  'Upload New Version',
-  'Favorite',
-  'Copy',
-  'Manage Versions',
-  'Edit Aspects',
-  'Permissions'
-];
-const searchFavContextMenu = [
-  'Share',
-  'Download',
-  'View',
-  'Edit Offline',
-  'Upload New Version',
-  'Remove Favorite',
-  'Copy',
-  'Manage Versions',
-  'Edit Aspects',
-  'Permissions'
-];
-const searchSharedLockedContextMenu = [
-  'Shared Link Settings',
-  'Download',
-  'View',
-  'Cancel Editing',
-  'Upload New Version',
-  'Favorite',
-  'Copy',
-  'Manage Versions',
-  'Permissions'
-];
-const searchDocxFavContextMenu = [
-  'Share',
-  'Download',
-  'View',
-  'Edit in Microsoft Office™',
-  'Edit Offline',
-  'Upload New Version',
-  'Remove Favorite',
-  'Copy',
-  'Manage Versions',
-  'Edit Aspects',
-  'Permissions'
-];
-const searchDocxFavToolbarMore = [
-  'Edit in Microsoft Office™',
-  'Edit Offline',
-  'Upload New Version',
-  'Remove Favorite',
-  'Copy',
-  'Manage Versions',
-  'Edit Aspects',
-  'Permissions'
-];
-const searchSharedContextMenu = [
-  'Shared Link Settings',
-  'Download',
-  'View',
-  'Edit Offline',
-  'Upload New Version',
-  'Favorite',
-  'Copy',
-  'Manage Versions',
-  'Edit Aspects',
-  'Permissions'
-];
-const searchToolbarMore = ['Edit Offline', 'Upload New Version', 'Favorite', 'Copy', 'Manage Versions', 'Edit Aspects', 'Permissions'];
-const searchDocxSharedFavContextMenu = [
-  'Shared Link Settings',
-  'Download',
-  'View',
-  'Edit in Microsoft Office™',
-  'Edit Offline',
-  'Upload New Version',
-  'Remove Favorite',
-  'Copy',
-  'Manage Versions',
-  'Edit Aspects',
-  'Permissions'
-];
-const searchDocxSharedContextMenu = [
-  'Shared Link Settings',
-  'Download',
-  'View',
-  'Edit in Microsoft Office™',
-  'Edit Offline',
-  'Upload New Version',
-  'Favorite',
-  'Copy',
-  'Manage Versions',
-  'Edit Aspects',
-  'Permissions'
-];
-const searchFavToolbarMore = ['Edit Offline', 'Upload New Version', 'Remove Favorite', 'Copy', 'Manage Versions', 'Edit Aspects', 'Permissions'];
-const searchContextMenu = [
-  'Share',
-  'Download',
-  'View',
-  'Edit Offline',
-  'Upload New Version',
-  'Favorite',
-  'Copy',
-  'Manage Versions',
-  'Edit Aspects',
-  'Permissions'
-];
-const searchFavLockedContextMenu = [
-  'Share',
-  'Download',
-  'View',
-  'Cancel Editing',
-  'Upload New Version',
-  'Remove Favorite',
-  'Copy',
-  'Manage Versions',
-  'Permissions'
-];
-const searchLockedToolbarMore = ['Cancel Editing', 'Upload New Version', 'Favorite', 'Copy', 'Manage Versions', 'Permissions'];
-const searchLockedContextMenu = [
-  'Share',
-  'Download',
-  'View',
-  'Cancel Editing',
-  'Upload New Version',
-  'Favorite',
-  'Copy',
-  'Manage Versions',
-  'Permissions'
-];
-const searchSharedFavContextMenu = [
-  'Shared Link Settings',
-  'Download',
-  'View',
-  'Edit Offline',
-  'Upload New Version',
-  'Remove Favorite',
-  'Copy',
-  'Manage Versions',
-  'Edit Aspects',
-  'Permissions'
-];
-
-const searchViewerToolbarMore = ['Edit Offline', 'Upload New Version', 'Favorite', 'Copy', 'Manage Versions', 'Edit Aspects', 'Permissions'];
-const searchViewerFavToolbarMore = [
-  'Edit Offline',
-  'Upload New Version',
-  'Remove Favorite',
-  'Copy',
-  'Manage Versions',
-  'Edit Aspects',
-  'Permissions'
-];
-const searchViewerDocxToolbarMore = [
-  'Edit in Microsoft Office™',
-  'Edit Offline',
-  'Upload New Version',
-  'Favorite',
-  'Copy',
-  'Manage Versions',
-  'Edit Aspects',
-  'Permissions'
-];
-const searchViewerFavLockedToolbarMore = ['Cancel Editing', 'Upload New Version', 'Remove Favorite', 'Copy', 'Manage Versions', 'Permissions'];
-const searchViewerDocxFavToolbarMore = [
-  'Edit in Microsoft Office™',
-  'Edit Offline',
-  'Upload New Version',
-  'Remove Favorite',
-  'Copy',
-  'Manage Versions',
-  'Edit Aspects',
-  'Permissions'
-];
-const searchViewerLockedToolbarMore = ['Cancel Editing', 'Upload New Version', 'Favorite', 'Copy', 'Manage Versions', 'Permissions'];
-
-export const fileDocx = {
-  name: `fileActions-docx-${random}.docx`,
-  description: 'file not shared, not fav, office, not locked',
-
-  contextMenu: fileDocxContextMenu,
-  toolbarPrimary: fileToolbarPrimary,
-  toolbarMore: fileDocxToolbarMore,
-  viewerToolbarPrimary,
-  viewerToolbarMore: viewerDocxToolbarMore,
-
-  searchContextMenu: searchDocxContextMenu,
-  searchToolbarPrimary,
-  searchToolbarMore: searchDocxToolbarMore,
-  searchViewerToolbarMore: searchViewerDocxToolbarMore
-};
-
-export const fileDocxFav = {
-  name: `fileActions-docx-fav-${random}.docx`,
-  description: 'file not shared, fav, office, not locked',
-
-  contextMenu: fileDocxFavContextMenu,
-  toolbarPrimary: fileToolbarPrimary,
-  toolbarMore: fileDocxFavToolbarMore,
-  viewerToolbarPrimary,
-  viewerToolbarMore: viewerDocxFavToolbarMore,
-
-  favoritesToolbarMore,
-  favoritesContextMenu,
-
-  searchContextMenu: searchDocxFavContextMenu,
-  searchToolbarPrimary,
-  searchToolbarMore: searchDocxFavToolbarMore,
-  searchViewerToolbarMore: searchViewerDocxFavToolbarMore
-};
-
-export const file = {
-  name: `fileActions-${random}.txt`,
-  description: 'file not shared, not fav, not office, not locked',
-
-  contextMenu: fileContextMenu,
-  toolbarPrimary: fileToolbarPrimary,
-  toolbarMore: fileToolbarMore,
-  viewerToolbarPrimary,
-  viewerToolbarMore,
-
-  searchViewerToolbarMore,
-  searchContextMenu,
-  searchToolbarPrimary,
-  searchToolbarMore
-};
-
-export const fileFav = {
-  name: `fileActions-fav-${random}.txt`,
-  description: 'file not shared, fav, not office, not locked',
-
-  contextMenu: fileFavContextMenu,
-  toolbarPrimary: fileToolbarPrimary,
-  toolbarMore: fileFavToolbarMore,
-  viewerToolbarPrimary,
-  viewerToolbarMore: viewerFavToolbarMore,
-
-  favoritesContextMenu,
-  favoritesToolbarMore,
-
-  searchContextMenu: searchFavContextMenu,
-  searchToolbarPrimary,
-  searchToolbarMore: searchFavToolbarMore,
-  searchViewerToolbarMore: searchViewerFavToolbarMore
-};
-
-export const fileDocxShared = {
-  name: `fileActions-docx-shared-${random}.docx`,
-  description: 'file shared, not fav, office, not locked',
-
-  contextMenu: fileDocxSharedContextMenu,
-  toolbarPrimary: fileSharedToolbarPrimary,
-  toolbarMore: fileDocxToolbarMore,
-  viewerToolbarPrimary: viewerSharedToolbarPrimary,
-  viewerToolbarMore: viewerDocxToolbarMore,
-
-  searchContextMenu: searchDocxSharedContextMenu,
-  searchToolbarPrimary: searchSharedToolbarPrimary,
-  searchToolbarMore: searchDocxToolbarMore,
-  searchViewerToolbarMore: searchViewerDocxToolbarMore
-};
-
-export const fileDocxSharedFav = {
-  name: `fileActions-docx-shared-fav-${random}.docx`,
-  description: 'file shared, fav, office, not locked',
-
-  contextMenu: fileDocxSharedFavContextMenu,
-  toolbarPrimary: fileSharedToolbarPrimary,
-  toolbarMore: fileDocxFavToolbarMore,
-  viewerToolbarPrimary: viewerSharedToolbarPrimary,
-  viewerToolbarMore: viewerDocxFavToolbarMore,
-
-  favoritesContextMenu: favoritesSharedContextMenu,
-  favoritesToolbarPrimary: fileSharedToolbarPrimary,
-  favoritesToolbarMore,
-
-  searchContextMenu: searchDocxSharedFavContextMenu,
-  searchToolbarPrimary: searchSharedToolbarPrimary,
-  searchToolbarMore: searchDocxFavToolbarMore,
-  searchViewerToolbarMore: searchViewerDocxFavToolbarMore
-};
-
-export const fileShared = {
-  name: `fileActions-shared-${random}.txt`,
-  description: 'file shared, not fav, not office, not locked',
-
-  contextMenu: fileSharedContextMenu,
-  toolbarPrimary: fileSharedToolbarPrimary,
-  toolbarMore: fileToolbarMore,
-  viewerToolbarPrimary: viewerSharedToolbarPrimary,
-  viewerToolbarMore,
-
-  searchContextMenu: searchSharedContextMenu,
-  searchToolbarPrimary: searchSharedToolbarPrimary,
-  searchToolbarMore,
-  searchViewerToolbarMore
-};
-
-export const fileSharedFav = {
-  name: `fileActions-shared-fav-${random}.txt`,
-  description: 'file shared, fav, not office, not locked',
-
-  contextMenu: fileSharedFavContextMenu,
-  toolbarPrimary: fileSharedToolbarPrimary,
-  toolbarMore: fileFavToolbarMore,
-  viewerToolbarPrimary: viewerSharedToolbarPrimary,
-  viewerToolbarMore: viewerFavToolbarMore,
-
-  favoritesContextMenu: favoritesSharedContextMenu,
-  favoritesToolbarPrimary: fileSharedToolbarPrimary,
-  favoritesToolbarMore,
-
-  searchContextMenu: searchSharedFavContextMenu,
-  searchToolbarPrimary: searchSharedToolbarPrimary,
-  searchToolbarMore: searchFavToolbarMore,
-  searchViewerToolbarMore: searchViewerFavToolbarMore
-};
-
-export const fileLocked = {
-  name: `fileActions-locked-${random}.txt`,
-  description: 'file not shared, not fav, not office, locked',
-
-  contextMenu: fileLockedContextMenu,
-  toolbarPrimary: fileToolbarPrimary,
-  toolbarMore: fileLockedToolbarMore,
-  viewerToolbarPrimary,
-  viewerToolbarMore: viewerLockedToolbarMore,
-
-  searchContextMenu: searchLockedContextMenu,
-  searchToolbarPrimary,
-  searchToolbarMore: searchLockedToolbarMore,
-  searchViewerToolbarMore: searchViewerLockedToolbarMore
-};
-
-export const fileFavLocked = {
-  name: `fileActions-fav-locked-${random}.txt`,
-  description: 'file not shared, fav, not office, locked',
-
-  contextMenu: fileFavLockedContextMenu,
-  toolbarPrimary: fileToolbarPrimary,
-  toolbarMore: fileFavLockedToolbarMore,
-  viewerToolbarPrimary,
-  viewerToolbarMore: viewerFavLockedToolbarMore,
-
-  favoritesContextMenu: favoritesLockedContextMenu,
-  favoritesToolbarMore: favoritesLockedToolbarMore,
-
-  searchContextMenu: searchFavLockedContextMenu,
-  searchToolbarPrimary,
-  searchToolbarMore: searchFavLockedToolbarMore,
-  searchViewerToolbarMore: searchViewerFavLockedToolbarMore
-};
-
-export const fileSharedLocked = {
-  name: `fileActions-shared-locked-${random}.txt`,
-  description: 'file shared, not fav, not office, locked',
-
-  contextMenu: fileSharedLockedContextMenu,
-  toolbarPrimary: fileSharedToolbarPrimary,
-  toolbarMore: fileLockedToolbarMore,
-  viewerToolbarPrimary: viewerSharedToolbarPrimary,
-  viewerToolbarMore: viewerLockedToolbarMore,
-
-  searchContextMenu: searchSharedLockedContextMenu,
-  searchToolbarPrimary: searchSharedToolbarPrimary,
-  searchToolbarMore: searchLockedToolbarMore,
-  searchViewerToolbarMore: searchViewerLockedToolbarMore
-};
-
-export const fileSharedFavLocked = {
-  name: `fileActions-shared-fav-locked-${random}.txt`,
-  description: 'file shared, fav, not office, locked',
-
-  contextMenu: fileSharedFavLockedContextMenu,
-  toolbarPrimary: fileSharedToolbarPrimary,
-  toolbarMore: fileFavLockedToolbarMore,
-  viewerToolbarPrimary: viewerSharedToolbarPrimary,
-  viewerToolbarMore: viewerFavLockedToolbarMore,
-
-  favoritesToolbarMore: favoritesLockedToolbarMore,
-  favoritesContextMenu: favoritesSharedLockedContextMenu,
-  favoritesToolbarPrimary: fileSharedToolbarPrimary,
-
-  searchContextMenu: searchSharedFavLockedContextMenu,
-  searchToolbarPrimary: searchSharedToolbarPrimary,
-  searchToolbarMore: searchFavLockedToolbarMore,
-  searchViewerToolbarMore: searchViewerFavLockedToolbarMore
-};
-
-export const fileInTrash = {
-  name: `deleted-file-${random}.txt`,
-  trashActions
-};
-
-export const file2InTrash = {
-  name: `deleted-file2-${random}.txt`,
-  trashActions
-};
-
-export const folderInTrash = {
-  name: `deleted-folder-${random}`,
-  trashActions
-};
-
-export const folder2InTrash = {
-  name: `deleted-folder2-${random}`,
-  trashActions
-};
-
-// ---- folders ---
-
-const folderContextMenu = ['Download', 'Edit', 'Favorite', 'Move', 'Copy', 'Delete', 'Edit Aspects', 'Permissions', 'Manage Rules'];
-const folderFavContextMenu = ['Download', 'Edit', 'Remove Favorite', 'Move', 'Copy', 'Delete', 'Edit Aspects', 'Permissions', 'Manage Rules'];
-const folderToolbarPrimary = ['Download', 'View Details', 'More Actions'];
-const folderToolbarMore = ['Edit', 'Favorite', 'Move', 'Copy', 'Delete', 'Edit Aspects', 'Permissions', 'Manage Rules'];
-const folderFavToolbarMore = ['Edit', 'Remove Favorite', 'Move', 'Copy', 'Delete', 'Edit Aspects', 'Permissions', 'Manage Rules'];
-
-const favoritesFolderFavContextMenu = ['Download', 'Edit', 'Remove Favorite', 'Move', 'Copy', 'Delete'];
-const favoritesFolderFavToolbarMore = ['Edit', 'Remove Favorite', 'Move', 'Copy', 'Delete'];
-
-const searchFolderContextMenu = ['Download', 'Edit', 'Favorite', 'Copy', 'Edit Aspects', 'Permissions', 'Manage Rules'];
-const searchFolderToolbarPrimary = ['Download', 'View Details', 'More Actions'];
-const searchFolderToolbarMore = ['Edit', 'Favorite', 'Copy', 'Edit Aspects', 'Permissions', 'Manage Rules'];
-const searchFolderFavContextMenu = ['Download', 'Edit', 'Remove Favorite', 'Copy', 'Edit Aspects', 'Permissions', 'Manage Rules'];
-const searchFolderFavToolbarMore = ['Edit', 'Remove Favorite', 'Copy', 'Edit Aspects', 'Permissions', 'Manage Rules'];
-
-export const folder = {
-  name: `folderActions-${random}`,
-  description: 'folder not favorite',
-
-  contextMenu: folderContextMenu,
-  toolbarPrimary: folderToolbarPrimary,
-  toolbarMore: folderToolbarMore,
-
-  searchContextMenu: searchFolderContextMenu,
-  searchToolbarPrimary: searchFolderToolbarPrimary,
-  searchToolbarMore: searchFolderToolbarMore
-};
-
-export const folderFav = {
-  name: `folderActions-fav-${random}`,
-  description: 'folder favorite',
-
-  contextMenu: folderFavContextMenu,
-  toolbarPrimary: folderToolbarPrimary,
-  toolbarMore: folderFavToolbarMore,
-
-  favoritesContextMenu: favoritesFolderFavContextMenu,
-  favoritesToolbarMore: favoritesFolderFavToolbarMore,
-
-  searchContextMenu: searchFolderFavContextMenu,
-  searchToolbarPrimary: searchFolderToolbarPrimary,
-  searchToolbarMore: searchFolderFavToolbarMore
-};
-
-export const folderFav2 = {
-  name: `folderActions-fav-2-${random}`,
-  description: 'folder favorite',
-
-  contextMenu: folderFavContextMenu,
-  toolbarPrimary: folderToolbarPrimary,
-  toolbarMore: folderFavToolbarMore,
-
-  favoritesContextMenu: favoritesFolderFavContextMenu,
-  favoritesToolbarMore: favoritesFolderFavToolbarMore,
-
-  searchContextMenu: searchFolderFavContextMenu,
-  searchToolbarPrimary: searchFolderToolbarPrimary,
-  searchToolbarMore: searchFolderFavToolbarMore
-};
-
-// ---- multiple selection ---
-
-// TODO: raise issue to remove 'Permissions'
-const multipleSelContextMenu = ['Download', 'Favorite', 'Move', 'Copy', 'Delete', 'Permissions'];
-// TODO: raise issue to remove 'Permissions'
-const multipleSelAllFavContextMenu = ['Download', 'Remove Favorite', 'Move', 'Copy', 'Delete', 'Permissions'];
-const multipleSelToolbarPrimary = ['Download', 'View Details', 'More Actions'];
-// TODO: raise issue to remove 'Permissions'
-const multipleSelToolbarMore = ['Favorite', 'Move', 'Copy', 'Delete', 'Permissions'];
-// TODO: raise issue to remove 'Permissions'
-const multipleSelAllFavToolbarMore = ['Remove Favorite', 'Move', 'Copy', 'Delete', 'Permissions'];
-
-const favoritesMultipleSelAllFavContextMenu = ['Download', 'Remove Favorite', 'Move', 'Copy', 'Delete'];
-const favoritesMultipleSelAllFavToolbarMore = ['Remove Favorite', 'Move', 'Copy', 'Delete'];
-
-// TODO: raise issue to remove 'Permissions'
-const searchMultipleSelContextMenu = ['Download', 'Favorite', 'Copy', 'Permissions'];
-// TODO: raise issue to remove 'Permissions'
-const searchMultipleSelAllFavContextMenu = ['Download', 'Remove Favorite', 'Copy', 'Permissions'];
-const searchMultipleSelToolbarPrimary = ['Download', 'View Details', 'More Actions'];
-// TODO: raise issue to remove 'Permissions'
-const searchMultipleSelToolbarMore = ['Favorite', 'Copy', 'Permissions'];
-// TODO: raise issue to remove 'Permissions'
-const searchMultipleSelAllFavToolbarMore = ['Remove Favorite', 'Copy', 'Permissions'];
-
-export const multipleSel = {
-  contextMenu: multipleSelContextMenu,
-  toolbarPrimary: multipleSelToolbarPrimary,
-  toolbarMore: multipleSelToolbarMore,
-
-  searchContextMenu: searchMultipleSelContextMenu,
-  searchToolbarMore: searchMultipleSelToolbarMore,
-  searchToolbarPrimary: searchMultipleSelToolbarPrimary
-};
-
-export const multipleSelAllFav = {
-  contextMenu: multipleSelAllFavContextMenu,
-  toolbarPrimary: multipleSelToolbarPrimary,
-  toolbarMore: multipleSelAllFavToolbarMore,
-
-  favoritesContextMenu: favoritesMultipleSelAllFavContextMenu,
-  favoritesToolbarMore: favoritesMultipleSelAllFavToolbarMore,
-
-  searchToolbarPrimary: searchMultipleSelToolbarPrimary,
-  searchContextMenu: searchMultipleSelAllFavContextMenu,
-  searchToolbarMore: searchMultipleSelAllFavToolbarMore
-};
diff --git a/e2e/protractor/suites/actions-available/files-folders/trash.test.ts b/e2e/protractor/suites/actions-available/files-folders/trash.test.ts
deleted file mode 100755
index 75c8fa9136..0000000000
--- a/e2e/protractor/suites/actions-available/files-folders/trash.test.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-/*!
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Alfresco Example Content Application
- *
- * This file is part of the Alfresco Example Content Application.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The Alfresco Example Content Application is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import { RepoClient, Utils, AdminActions, UserActions, LoginPage, BrowsingPage } from '@alfresco/aca-testing-shared';
-import * as testData from './test-data';
-import * as testUtil from '../test-util';
-
-const page = new BrowsingPage();
-
-describe('Trash - available actions : ', () => {
-  const random = Utils.random();
-
-  const username = `user-${random}`;
-
-  let fileInTrashId: string;
-  let file2InTrashId: string;
-  let folderInTrashId: string;
-  let folder2InTrashId: string;
-
-  const userApi = new RepoClient(username, username);
-  const adminApiActions = new AdminActions();
-  const userActions = new UserActions();
-
-  const loginPage = new LoginPage();
-
-  beforeAll(async () => {
-    await adminApiActions.createUser({ username });
-
-    fileInTrashId = (await userApi.nodes.createFile(testData.fileInTrash.name)).entry.id;
-    file2InTrashId = (await userApi.nodes.createFile(testData.file2InTrash.name)).entry.id;
-    folderInTrashId = (await userApi.nodes.createFolder(testData.folderInTrash.name)).entry.id;
-    folder2InTrashId = (await userApi.nodes.createFolder(testData.folder2InTrash.name)).entry.id;
-
-    await userActions.login(username, username);
-    const initialDeletedTotalItems = await userActions.getTrashcanSize();
-    await userActions.deleteNodes([fileInTrashId, file2InTrashId, folderInTrashId, folder2InTrashId], false);
-    await userActions.waitForTrashcanSize(initialDeletedTotalItems + 4);
-
-    await loginPage.loginWith(username);
-    await page.clickTrashAndWait();
-  });
-
-  afterAll(async () => {
-    await userActions.login(username, username);
-    await userActions.emptyTrashcan();
-  });
-
-  beforeEach(async () => {
-    await Utils.pressEscape();
-  });
-
-  it('on a file - [C286258]', async () => {
-    await testUtil.checkToolbarPrimary(testData.fileInTrash.name, testData.fileInTrash.trashActions);
-    await testUtil.checkContextMenu(testData.fileInTrash.name, testData.fileInTrash.trashActions);
-  });
-
-  it('on a folder - [C286259]', async () => {
-    await testUtil.checkToolbarPrimary(testData.folderInTrash.name, testData.folderInTrash.trashActions);
-    await testUtil.checkContextMenu(testData.folderInTrash.name, testData.folderInTrash.trashActions);
-  });
-
-  it('multiple files - [C280472]', async () => {
-    await testUtil.checkMultipleSelContextMenu([testData.fileInTrash.name, testData.file2InTrash.name], testData.trashActions);
-    await testUtil.checkMultipleSelToolbarPrimary([testData.fileInTrash.name, testData.file2InTrash.name], testData.trashActions);
-  });
-
-  it('multiple folders - [C280473]', async () => {
-    await testUtil.checkMultipleSelContextMenu([testData.folderInTrash.name, testData.folder2InTrash.name], testData.trashActions);
-    await testUtil.checkMultipleSelToolbarPrimary([testData.folderInTrash.name, testData.folder2InTrash.name], testData.trashActions);
-  });
-
-  it('both files and folders - [C280474]', async () => {
-    await testUtil.checkMultipleSelContextMenu([testData.fileInTrash.name, testData.folderInTrash.name], testData.trashActions);
-    await testUtil.checkMultipleSelToolbarPrimary([testData.fileInTrash.name, testData.folderInTrash.name], testData.trashActions);
-  });
-});
diff --git a/e2e/protractor/suites/actions-available/libraries/library-trash.test.ts b/e2e/protractor/suites/actions-available/libraries/library-trash.test.ts
deleted file mode 100755
index 55607fed72..0000000000
--- a/e2e/protractor/suites/actions-available/libraries/library-trash.test.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-/*!
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Alfresco Example Content Application
- *
- * This file is part of the Alfresco Example Content Application.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The Alfresco Example Content Application is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import { LoginPage, BrowsingPage, Utils, AdminActions, UserActions } from '@alfresco/aca-testing-shared';
-import * as testData from './test-data-libraries';
-import * as testUtil from '../test-util';
-
-describe('Library actions : ', () => {
-  const username = `user-${Utils.random()}`;
-
-  const adminApiActions = new AdminActions();
-  const userActions = new UserActions();
-
-  const loginPage = new LoginPage();
-  const page = new BrowsingPage();
-
-  beforeAll(async () => {
-    await adminApiActions.createUser({ username });
-    await userActions.login(username, username);
-
-    await userActions.createSites([testData.siteInTrash.name, testData.site2InTrash.name]);
-    await userActions.deleteSites([testData.siteInTrash.name, testData.site2InTrash.name], false);
-
-    await loginPage.loginWith(username);
-  });
-
-  afterAll(async () => {
-    await userActions.login(username, username);
-    await userActions.emptyTrashcan();
-  });
-
-  describe('on Trash', () => {
-    beforeAll(async () => {
-      await Utils.pressEscape();
-      await page.clickTrashAndWait();
-    });
-
-    beforeEach(async () => {
-      await Utils.pressEscape();
-    });
-
-    it('[C326686] single library', async () => {
-      await testUtil.checkToolbarPrimary(testData.siteInTrash.name, testData.siteInTrash.trashActions);
-      await testUtil.checkContextMenu(testData.siteInTrash.name, testData.siteInTrash.trashActions);
-    });
-
-    it('[C326687] multiple libraries', async () => {
-      await testUtil.checkMultipleSelContextMenu([testData.siteInTrash.name, testData.site2InTrash.name], testData.trashActions);
-      await testUtil.checkMultipleSelToolbarPrimary([testData.siteInTrash.name, testData.site2InTrash.name], testData.trashActions);
-    });
-  });
-});
diff --git a/e2e/protractor/suites/actions-available/libraries/library.test.ts b/e2e/protractor/suites/actions-available/libraries/library.test.ts
deleted file mode 100755
index 5f4c1bcfcf..0000000000
--- a/e2e/protractor/suites/actions-available/libraries/library.test.ts
+++ /dev/null
@@ -1,389 +0,0 @@
-/*!
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Alfresco Example Content Application
- *
- * This file is part of the Alfresco Example Content Application.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The Alfresco Example Content Application is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import {
-  LoginPage,
-  BrowsingPage,
-  SearchResultsPage,
-  RepoClient,
-  Utils,
-  AdminActions,
-  UserActions,
-  SITE_VISIBILITY
-} from '@alfresco/aca-testing-shared';
-import * as testData from './test-data-libraries';
-import * as testUtil from '../test-util';
-import { Logger } from '@alfresco/adf-testing';
-
-describe('Library actions : ', () => {
-  const username = `user-${Utils.random()}`;
-
-  const userApi = new RepoClient(username, username);
-  const adminApiActions = new AdminActions();
-  const userActions = new UserActions();
-
-  const loginPage = new LoginPage();
-  const page = new BrowsingPage();
-  const searchResultsPage = new SearchResultsPage();
-  const { toolbar } = page;
-  const { searchInput } = searchResultsPage.pageLayoutHeader;
-
-  beforeAll(async () => {
-    try {
-      await adminApiActions.createUser({ username });
-
-      await userApi.sites.createSite(testData.publicUserMemberFav.name);
-      await userApi.sites.createSite(testData.privateUserMemberFav.name, SITE_VISIBILITY.PRIVATE);
-      await userApi.sites.createSite(testData.moderatedUserMemberFav.name, SITE_VISIBILITY.MODERATED);
-      const publicUserMemberNotFavId = (await userApi.sites.createSite(testData.publicUserMemberNotFav.name)).entry.guid;
-      const privateUserMemberNotFavId = (await userApi.sites.createSite(testData.privateUserMemberNotFav.name, SITE_VISIBILITY.PRIVATE)).entry.guid;
-      const moderatedUserMemberNotFavId = (await userApi.sites.createSite(testData.moderatedUserMemberNotFav.name, SITE_VISIBILITY.MODERATED)).entry
-        .guid;
-
-      await adminApiActions.sites.createSites([testData.publicNotMemberFav.name, testData.publicNotMemberNotFav.name]);
-      await adminApiActions.sites.createSites(
-        [
-          testData.moderatedNotMemberFav.name,
-          testData.moderatedNotMemberNotFav.name,
-          testData.moderatedRequestedJoinFav.name,
-          testData.moderatedRequestedJoinNotFav.name
-        ],
-        SITE_VISIBILITY.MODERATED
-      );
-
-      await userApi.sites.requestToJoin(testData.moderatedRequestedJoinFav.name);
-      await userApi.sites.requestToJoin(testData.moderatedRequestedJoinNotFav.name);
-
-      await userApi.favorites.removeFavoritesByIds([publicUserMemberNotFavId, privateUserMemberNotFavId, moderatedUserMemberNotFavId]);
-      await userApi.favorites.addFavoritesByIds('site', [
-        testData.publicNotMemberFav.name,
-        testData.moderatedNotMemberFav.name,
-        testData.moderatedRequestedJoinFav.name
-      ]);
-
-      await loginPage.loginWith(username);
-    } catch (error) {
-      Logger.error(`----- beforeAll failed : ${error}`);
-    }
-  });
-
-  afterAll(async () => {
-    await userActions.login(username, username);
-    await userActions.deleteSites([
-      testData.publicUserMemberFav.name,
-      testData.privateUserMemberFav.name,
-      testData.moderatedUserMemberFav.name,
-      testData.publicUserMemberNotFav.name,
-      testData.privateUserMemberNotFav.name,
-      testData.moderatedUserMemberNotFav.name
-    ]);
-    await userActions.emptyTrashcan();
-
-    await adminApiActions.login();
-    await adminApiActions.deleteSites([
-      testData.publicNotMemberFav.name,
-      testData.moderatedNotMemberFav.name,
-      testData.publicNotMemberNotFav.name,
-      testData.moderatedNotMemberNotFav.name,
-      testData.moderatedRequestedJoinFav.name,
-      testData.moderatedRequestedJoinNotFav.name
-    ]);
-  });
-
-  describe('on My Libraries', () => {
-    beforeAll(async () => {
-      await Utils.pressEscape();
-      await page.goToMyLibrariesAndWait();
-    });
-
-    beforeEach(async () => {
-      await Utils.pressEscape();
-    });
-
-    it('[C213135] Public library, user is a member, favorite', async () => {
-      await testUtil.checkToolbarActions(
-        testData.publicUserMemberFav.name,
-        testData.publicUserMemberFav.toolbarPrimary,
-        testData.publicUserMemberFav.toolbarMore
-      );
-      await testUtil.checkContextMenu(testData.publicUserMemberFav.name, testData.publicUserMemberFav.contextMenu);
-    });
-
-    it('[C290080] Private library, user is a member, favorite', async () => {
-      await testUtil.checkToolbarActions(
-        testData.privateUserMemberFav.name,
-        testData.privateUserMemberFav.toolbarPrimary,
-        testData.privateUserMemberFav.toolbarMore
-      );
-      await testUtil.checkContextMenu(testData.privateUserMemberFav.name, testData.privateUserMemberFav.contextMenu);
-    });
-
-    it('[C326676] Moderated library, user is a member, favorite', async () => {
-      await testUtil.checkToolbarActions(
-        testData.moderatedUserMemberFav.name,
-        testData.moderatedUserMemberFav.toolbarPrimary,
-        testData.moderatedUserMemberFav.toolbarMore
-      );
-      await testUtil.checkContextMenu(testData.moderatedUserMemberFav.name, testData.moderatedUserMemberFav.contextMenu);
-    });
-
-    it('[C326677] Public library, user is a member, not favorite', async () => {
-      await testUtil.checkToolbarActions(
-        testData.publicUserMemberNotFav.name,
-        testData.publicUserMemberNotFav.toolbarPrimary,
-        testData.publicUserMemberNotFav.toolbarMore
-      );
-      await testUtil.checkContextMenu(testData.publicUserMemberNotFav.name, testData.publicUserMemberNotFav.contextMenu);
-    });
-
-    it('[C326678] Private library, user is a member, not favorite', async () => {
-      await testUtil.checkToolbarActions(
-        testData.privateUserMemberNotFav.name,
-        testData.privateUserMemberNotFav.toolbarPrimary,
-        testData.privateUserMemberNotFav.toolbarMore
-      );
-      await testUtil.checkContextMenu(testData.privateUserMemberNotFav.name, testData.privateUserMemberNotFav.contextMenu);
-    });
-
-    it('[C326679] Moderated library, user is a member, not favorite', async () => {
-      await testUtil.checkToolbarActions(
-        testData.moderatedUserMemberNotFav.name,
-        testData.moderatedUserMemberNotFav.toolbarPrimary,
-        testData.moderatedUserMemberNotFav.toolbarMore
-      );
-      await testUtil.checkContextMenu(testData.moderatedUserMemberNotFav.name, testData.moderatedUserMemberNotFav.contextMenu);
-    });
-  });
-
-  describe('on Favorite Libraries', () => {
-    beforeAll(async () => {
-      await Utils.pressEscape();
-      await page.goToFavoriteLibrariesAndWait();
-    });
-
-    beforeEach(async () => {
-      await Utils.pressEscape();
-    });
-
-    it('[C289892] Public library, user is a member, favorite', async () => {
-      await testUtil.checkToolbarActions(
-        testData.publicUserMemberFav.name,
-        testData.publicUserMemberFav.toolbarPrimary,
-        testData.publicUserMemberFav.toolbarMore
-      );
-      await testUtil.checkContextMenu(testData.publicUserMemberFav.name, testData.publicUserMemberFav.contextMenu);
-    });
-
-    it('[C290090] Private library, user is a member, favorite', async () => {
-      await testUtil.checkToolbarActions(
-        testData.privateUserMemberFav.name,
-        testData.privateUserMemberFav.toolbarPrimary,
-        testData.privateUserMemberFav.toolbarMore
-      );
-      await testUtil.checkContextMenu(testData.privateUserMemberFav.name, testData.privateUserMemberFav.contextMenu);
-    });
-
-    it('[C290091] Moderated library, user is a member, favorite', async () => {
-      await testUtil.checkToolbarActions(
-        testData.moderatedUserMemberFav.name,
-        testData.moderatedUserMemberFav.toolbarPrimary,
-        testData.moderatedUserMemberFav.toolbarMore
-      );
-      await testUtil.checkContextMenu(testData.moderatedUserMemberFav.name, testData.moderatedUserMemberFav.contextMenu);
-    });
-
-    it('[C290081] Public library, user not a member, favorite', async () => {
-      await testUtil.checkToolbarActions(
-        testData.publicNotMemberFav.name,
-        testData.publicNotMemberFav.toolbarPrimary,
-        testData.publicNotMemberFav.toolbarMore
-      );
-      await testUtil.checkContextMenu(testData.publicNotMemberFav.name, testData.publicNotMemberFav.contextMenu);
-    });
-
-    it('[C290082] Moderated library, user not a member, favorite', async () => {
-      await testUtil.checkToolbarActions(
-        testData.moderatedNotMemberFav.name,
-        testData.moderatedNotMemberFav.toolbarPrimary,
-        testData.moderatedNotMemberFav.toolbarMore
-      );
-      await testUtil.checkContextMenu(testData.moderatedNotMemberFav.name, testData.moderatedNotMemberFav.contextMenu);
-    });
-
-    it('[C290089] Moderated library, user requested to join, favorite', async () => {
-      await testUtil.checkToolbarActions(
-        testData.moderatedRequestedJoinFav.name,
-        testData.moderatedRequestedJoinFav.toolbarPrimary,
-        testData.moderatedRequestedJoinFav.toolbarMore
-      );
-      await testUtil.checkContextMenu(testData.moderatedRequestedJoinFav.name, testData.moderatedRequestedJoinFav.contextMenu);
-    });
-  });
-
-  describe('on Search Results', () => {
-    beforeEach(async () => {
-      try {
-        await Utils.pressEscape();
-        await page.clickPersonalFiles();
-        await toolbar.clickSearchIconButton();
-        await searchInput.clickSearchButton();
-        await searchInput.checkLibraries();
-      } catch (error) {
-        Logger.error(`----- beforeEach failed : ${error}`);
-      }
-    });
-
-    it('[C290084] Public library, user is a member, favorite', async () => {
-      await searchInput.searchForLibrary(testData.publicUserMemberFav.name);
-
-      await testUtil.checkToolbarActions(
-        testData.publicUserMemberFav.name,
-        testData.publicUserMemberFav.searchToolbarPrimary,
-        testData.publicUserMemberFav.toolbarMore
-      );
-      await testUtil.checkContextMenu(testData.publicUserMemberFav.name, testData.publicUserMemberFav.contextMenu);
-    });
-
-    it('[C290085] Private library, user is a member, favorite', async () => {
-      await searchInput.searchForLibrary(testData.privateUserMemberFav.name);
-
-      await testUtil.checkToolbarActions(
-        testData.privateUserMemberFav.name,
-        testData.privateUserMemberFav.searchToolbarPrimary,
-        testData.privateUserMemberFav.toolbarMore
-      );
-      await testUtil.checkContextMenu(testData.privateUserMemberFav.name, testData.privateUserMemberFav.contextMenu);
-    });
-
-    it('[C290086] Moderated library, user is a member, favorite', async () => {
-      await searchInput.searchForLibrary(testData.moderatedUserMemberFav.name);
-
-      await testUtil.checkToolbarActions(
-        testData.moderatedUserMemberFav.name,
-        testData.moderatedUserMemberFav.searchToolbarPrimary,
-        testData.moderatedUserMemberFav.toolbarMore
-      );
-      await testUtil.checkContextMenu(testData.moderatedUserMemberFav.name, testData.moderatedUserMemberFav.contextMenu);
-    });
-
-    it('[C291812] Public library, user is a member, not favorite', async () => {
-      await searchInput.searchForLibrary(testData.publicUserMemberNotFav.name);
-
-      await testUtil.checkToolbarActions(
-        testData.publicUserMemberNotFav.name,
-        testData.publicUserMemberNotFav.searchToolbarPrimary,
-        testData.publicUserMemberNotFav.toolbarMore
-      );
-      await testUtil.checkContextMenu(testData.publicUserMemberNotFav.name, testData.publicUserMemberNotFav.contextMenu);
-    });
-
-    it('[C291813] Private library, user is a member, not favorite', async () => {
-      await searchInput.searchForLibrary(testData.privateUserMemberNotFav.name);
-
-      await testUtil.checkToolbarActions(
-        testData.privateUserMemberNotFav.name,
-        testData.privateUserMemberNotFav.searchToolbarPrimary,
-        testData.privateUserMemberNotFav.toolbarMore
-      );
-      await testUtil.checkContextMenu(testData.privateUserMemberNotFav.name, testData.privateUserMemberNotFav.contextMenu);
-    });
-
-    it('[C291814] Moderated library, user is a member, not favorite', async () => {
-      await searchInput.searchForLibrary(testData.moderatedUserMemberNotFav.name);
-
-      await testUtil.checkToolbarActions(
-        testData.moderatedUserMemberNotFav.name,
-        testData.moderatedUserMemberNotFav.searchToolbarPrimary,
-        testData.moderatedUserMemberNotFav.toolbarMore
-      );
-      await testUtil.checkContextMenu(testData.moderatedUserMemberNotFav.name, testData.moderatedUserMemberNotFav.contextMenu);
-    });
-
-    it('[C326680] Public library, user not a member, favorite', async () => {
-      await searchInput.searchForLibrary(testData.publicNotMemberFav.name);
-
-      await testUtil.checkToolbarActions(
-        testData.publicNotMemberFav.name,
-        testData.publicNotMemberFav.searchToolbarPrimary,
-        testData.publicNotMemberFav.toolbarMore
-      );
-      await testUtil.checkContextMenu(testData.publicNotMemberFav.name, testData.publicNotMemberFav.contextMenu);
-    });
-
-    it('[C326681] Moderated library, user not a member, favorite', async () => {
-      await searchInput.searchForLibrary(testData.moderatedNotMemberFav.name);
-
-      await testUtil.checkToolbarActions(
-        testData.moderatedNotMemberFav.name,
-        testData.moderatedNotMemberFav.searchToolbarPrimary,
-        testData.moderatedNotMemberFav.toolbarMore
-      );
-      await testUtil.checkContextMenu(testData.moderatedNotMemberFav.name, testData.moderatedNotMemberFav.contextMenu);
-    });
-
-    it('[C326682] Public library, user not a member, not favorite', async () => {
-      await searchInput.searchForLibrary(testData.publicNotMemberNotFav.name);
-
-      await testUtil.checkToolbarActions(
-        testData.publicNotMemberNotFav.name,
-        testData.publicNotMemberNotFav.searchToolbarPrimary,
-        testData.publicNotMemberNotFav.toolbarMore
-      );
-      await testUtil.checkContextMenu(testData.publicNotMemberNotFav.name, testData.publicNotMemberNotFav.contextMenu);
-    });
-
-    it('[C326683] Moderated library, user not a member, not favorite', async () => {
-      await searchInput.searchForLibrary(testData.moderatedNotMemberNotFav.name);
-
-      await testUtil.checkToolbarActions(
-        testData.moderatedNotMemberNotFav.name,
-        testData.moderatedNotMemberNotFav.searchToolbarPrimary,
-        testData.moderatedNotMemberNotFav.toolbarMore
-      );
-      await testUtil.checkContextMenu(testData.moderatedNotMemberNotFav.name, testData.moderatedNotMemberNotFav.contextMenu);
-    });
-
-    it('[C326685] Moderated library, user requested to join, favorite', async () => {
-      await searchInput.searchForLibrary(testData.moderatedRequestedJoinFav.name);
-
-      await testUtil.checkToolbarActions(
-        testData.moderatedRequestedJoinFav.name,
-        testData.moderatedRequestedJoinFav.searchToolbarPrimary,
-        testData.moderatedRequestedJoinFav.toolbarMore
-      );
-      await testUtil.checkContextMenu(testData.moderatedRequestedJoinFav.name, testData.moderatedRequestedJoinFav.contextMenu);
-    });
-
-    it('[C326684] Moderated library, user requested to join, not favorite', async () => {
-      await searchInput.searchForLibrary(testData.moderatedRequestedJoinNotFav.name);
-
-      await testUtil.checkToolbarActions(
-        testData.moderatedRequestedJoinNotFav.name,
-        testData.moderatedRequestedJoinNotFav.searchToolbarPrimary,
-        testData.moderatedRequestedJoinNotFav.toolbarMore
-      );
-      await testUtil.checkContextMenu(testData.moderatedRequestedJoinNotFav.name, testData.moderatedRequestedJoinNotFav.contextMenu);
-    });
-  });
-});
diff --git a/e2e/protractor/suites/actions-available/libraries/test-data-libraries.ts b/e2e/protractor/suites/actions-available/libraries/test-data-libraries.ts
deleted file mode 100644
index 398f5f5210..0000000000
--- a/e2e/protractor/suites/actions-available/libraries/test-data-libraries.ts
+++ /dev/null
@@ -1,176 +0,0 @@
-/*!
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Alfresco Example Content Application
- *
- * This file is part of the Alfresco Example Content Application.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The Alfresco Example Content Application is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import { Utils } from '@alfresco/aca-testing-shared';
-
-// ---- multiple selection ---
-
-export const trashActions = ['Permanently Delete', 'Restore'];
-
-// ---- single selection ----
-
-const memberFavContextMenu = ['Leave Library', 'Delete', 'Remove Favorite'];
-const memberNotFavContextMenu = ['Leave Library', 'Delete', 'Favorite'];
-const memberToolbarPrimary = ['Leave Library', 'View Details', 'More Actions'];
-const favToolbarMore = ['Delete', 'Remove Favorite'];
-const notFavToolbarMore = ['Delete', 'Favorite'];
-const searchMemberToolbarPrimary = ['Leave Library', 'View Details', 'More Actions'];
-const searchReqJoinToolbarPrimary = ['Cancel Join Request', 'More Actions'];
-const searchNotMemberToolbarPrimary = ['Join', 'More Actions'];
-const reqJoinToolbarMore = ['Cancel Join Request', 'More Actions'];
-const notMemberFavContextMenu = ['Join', 'Delete', 'Remove Favorite'];
-const notMemberNotFavContextMenu = ['Join', 'Delete', 'Favorite'];
-const notMemberToolbarPrimary = ['Join', 'More Actions'];
-const reqJoinNotFavContextMenu = ['Cancel Join Request', 'Delete', 'Favorite'];
-const reqJoinFavContextMenu = ['Cancel Join Request', 'Delete', 'Remove Favorite'];
-
-export const publicUserMemberFav = {
-  name: `actionsSite-public-member-fav-${Utils.random()}`,
-  description: 'public site, user member, user favorite',
-  contextMenu: memberFavContextMenu,
-  toolbarPrimary: memberToolbarPrimary,
-  toolbarMore: favToolbarMore,
-
-  searchToolbarPrimary: searchMemberToolbarPrimary
-};
-
-export const privateUserMemberFav = {
-  name: `actionsSite-private-member-fav-${Utils.random()}`,
-  description: 'private site, user member, user favorite',
-  contextMenu: memberFavContextMenu,
-  toolbarPrimary: memberToolbarPrimary,
-  toolbarMore: favToolbarMore,
-
-  searchToolbarPrimary: searchMemberToolbarPrimary
-};
-
-export const moderatedUserMemberFav = {
-  name: `actionsSite-moderated-member-fav-${Utils.random()}`,
-  description: 'moderated site, user member, user favorite',
-  contextMenu: memberFavContextMenu,
-  toolbarPrimary: memberToolbarPrimary,
-  toolbarMore: favToolbarMore,
-
-  searchToolbarPrimary: searchMemberToolbarPrimary
-};
-
-export const publicUserMemberNotFav = {
-  name: `actionsSite-public-member-not-fav-${Utils.random()}`,
-  description: 'public site, user member, not favorite',
-  contextMenu: memberNotFavContextMenu,
-  toolbarPrimary: memberToolbarPrimary,
-  toolbarMore: notFavToolbarMore,
-
-  searchToolbarPrimary: searchMemberToolbarPrimary
-};
-
-export const privateUserMemberNotFav = {
-  name: `actionsSite-private-member-not-fav-${Utils.random()}`,
-  description: 'private site, user member, not favorite',
-  contextMenu: memberNotFavContextMenu,
-  toolbarPrimary: memberToolbarPrimary,
-  toolbarMore: notFavToolbarMore,
-
-  searchToolbarPrimary: searchMemberToolbarPrimary
-};
-
-export const moderatedUserMemberNotFav = {
-  name: `actionsSite-moderated-member-not-fav-${Utils.random()}`,
-  description: 'moderated site, user member, not favorite',
-  contextMenu: memberNotFavContextMenu,
-  toolbarPrimary: memberToolbarPrimary,
-  toolbarMore: notFavToolbarMore,
-
-  searchToolbarPrimary: searchMemberToolbarPrimary
-};
-
-export const publicNotMemberFav = {
-  name: `actionsSite-public-not-member-fav-${Utils.random()}`,
-  description: 'public site, user not member, user favorite',
-  contextMenu: notMemberFavContextMenu,
-  toolbarPrimary: notMemberToolbarPrimary,
-  toolbarMore: favToolbarMore,
-
-  searchToolbarPrimary: searchNotMemberToolbarPrimary
-};
-
-export const moderatedNotMemberFav = {
-  name: `actionsSite-moderated-not-member-fav-${Utils.random()}`,
-  description: 'moderated site, user not member, user favorite',
-  contextMenu: notMemberFavContextMenu,
-  toolbarPrimary: notMemberToolbarPrimary,
-  toolbarMore: favToolbarMore,
-
-  searchToolbarPrimary: searchNotMemberToolbarPrimary
-};
-
-export const publicNotMemberNotFav = {
-  name: `actionsSite-public-not-member-not-fav-${Utils.random()}`,
-  description: 'public site, user not member, not favorite',
-  contextMenu: notMemberNotFavContextMenu,
-  toolbarPrimary: notMemberToolbarPrimary,
-  toolbarMore: notFavToolbarMore,
-
-  searchToolbarPrimary: searchNotMemberToolbarPrimary
-};
-
-export const moderatedNotMemberNotFav = {
-  name: `actionsSite-moderated-not-member-not-fav-${Utils.random()}`,
-  description: 'moderated site, user not member, not favorite',
-  contextMenu: notMemberNotFavContextMenu,
-  toolbarPrimary: notMemberToolbarPrimary,
-  toolbarMore: notFavToolbarMore,
-
-  searchToolbarPrimary: searchNotMemberToolbarPrimary
-};
-
-export const moderatedRequestedJoinFav = {
-  name: `actionsSite-moderated-req-join-fav-${Utils.random()}`,
-  description: 'moderated site, user requested join, user favorite',
-  contextMenu: reqJoinFavContextMenu,
-  toolbarPrimary: reqJoinToolbarMore,
-  toolbarMore: favToolbarMore,
-
-  searchToolbarPrimary: searchReqJoinToolbarPrimary
-};
-
-export const moderatedRequestedJoinNotFav = {
-  name: `actionsSite-moderated-req-join-not-fav-${Utils.random()}`,
-  description: 'moderated site, user requested join, not favorite',
-  contextMenu: reqJoinNotFavContextMenu,
-  toolbarPrimary: reqJoinToolbarMore,
-  toolbarMore: notFavToolbarMore,
-
-  searchToolbarPrimary: searchReqJoinToolbarPrimary
-};
-
-export const siteInTrash = {
-  name: `deleted-site-${Utils.random()}`,
-  trashActions
-};
-
-export const site2InTrash = {
-  name: `deleted-site2-${Utils.random()}`,
-  trashActions
-};
diff --git a/e2e/protractor/suites/actions-available/new-menu/new-menu.test.ts b/e2e/protractor/suites/actions-available/new-menu/new-menu.test.ts
deleted file mode 100755
index 605f715c16..0000000000
--- a/e2e/protractor/suites/actions-available/new-menu/new-menu.test.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-/*!
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Alfresco Example Content Application
- *
- * This file is part of the Alfresco Example Content Application.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The Alfresco Example Content Application is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import { AdminActions, LoginPage, BrowsingPage, SITE_ROLES, Utils, UserActions } from '@alfresco/aca-testing-shared';
-
-describe('New menu', () => {
-  const username = `user-${Utils.random()}`;
-
-  const siteUser = `site-user-${Utils.random()}`;
-  const siteAdmin = `site-admin-${Utils.random()}`;
-
-  const loginPage = new LoginPage();
-  const page = new BrowsingPage();
-  const { sidenav } = page;
-  const { menu } = sidenav;
-
-  const adminApiActions = new AdminActions();
-  const userActions = new UserActions();
-
-  beforeAll(async () => {
-    await adminApiActions.createUser({ username });
-    await userActions.login(username, username);
-
-    await adminApiActions.sites.createSite(siteAdmin);
-    await adminApiActions.sites.addSiteMember(siteAdmin, username, SITE_ROLES.SITE_CONSUMER.ROLE);
-
-    await userActions.createSites([siteUser]);
-
-    await loginPage.loginWith(username);
-  });
-
-  afterAll(async () => {
-    await userActions.login(username, username);
-    await userActions.deleteSites([siteUser]);
-
-    await adminApiActions.login();
-    await adminApiActions.deleteSites([siteAdmin]);
-  });
-
-  afterEach(async () => {
-    await sidenav.closeNewMenu();
-  });
-
-  it('[C286524] Actions in Personal Files', async () => {
-    await page.clickPersonalFiles();
-    await sidenav.openNewMenu();
-
-    expect(await menu.isCreateFolderEnabled()).toBe(true, 'Create Folder option not enabled');
-
-    expect(await menu.isCreateFileFromTemplateEnabled()).toBe(true, 'Create file from template is not enabled');
-    expect(await menu.isCreateFolderFromTemplateEnabled()).toBe(true, 'Create folder from template is not enabled');
-  });
-
-  it('[C280393] Actions in File Libraries - user with enough permissions', async () => {
-    await page.goToMyLibrariesAndWait();
-    await sidenav.openNewMenu();
-
-    expect(await menu.isCreateLibraryEnabled()).toBe(true, 'Create Library option not enabled');
-  });
-
-  it('[C216342] Enabled actions tooltips', async () => {
-    await page.clickPersonalFiles();
-    await sidenav.openNewMenu();
-
-    let tooltip: string;
-
-    tooltip = await menu.getItemTooltip('Create Folder');
-    expect(tooltip).toContain('Create new folder');
-
-    tooltip = await menu.getItemTooltip('Create file from template');
-    expect(tooltip).toContain('Create file from template');
-  });
-});
diff --git a/e2e/protractor/suites/actions-available/special-permissions/favorites.ts b/e2e/protractor/suites/actions-available/special-permissions/favorites.ts
deleted file mode 100755
index 0c757517fd..0000000000
--- a/e2e/protractor/suites/actions-available/special-permissions/favorites.ts
+++ /dev/null
@@ -1,159 +0,0 @@
-/*!
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Alfresco Example Content Application
- *
- * This file is part of the Alfresco Example Content Application.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The Alfresco Example Content Application is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import { BrowsingPage, Utils } from '@alfresco/aca-testing-shared';
-import * as testData from './test-data-permissions';
-import * as testUtil from '../test-util';
-
-export function favoritesTests() {
-  const page = new BrowsingPage();
-
-  describe('available actions : ', () => {
-    beforeAll(async () => {
-      await page.clickFavoritesAndWait();
-    });
-
-    beforeEach(async () => {
-      await Utils.pressEscape();
-    });
-
-    afterEach(async () => {
-      await page.closeOpenDialogs();
-    });
-
-    describe('on a file', () => {
-      it('File Office, favorite - [C286311]', async () => {
-        await testUtil.checkToolbarActions(testData.fileDocxFav.name, testData.fileDocxFav.toolbarPrimary, testData.fileDocxFav.favoritesToolbarMore);
-        await testUtil.checkContextMenu(testData.fileDocxFav.name, testData.fileDocxFav.favoritesContextMenu);
-      });
-
-      it('File favorite - [C306991]', async () => {
-        await testUtil.checkToolbarActions(testData.fileFav.name, testData.fileFav.toolbarPrimary, testData.fileFav.favoritesToolbarMore);
-        await testUtil.checkContextMenu(testData.fileFav.name, testData.fileFav.favoritesContextMenu);
-      });
-
-      it('File Office, shared, favorite - [C279187]', async () => {
-        await testUtil.checkToolbarActions(
-          testData.fileDocxSharedFav.name,
-          testData.fileDocxSharedFav.toolbarPrimary,
-          testData.fileDocxSharedFav.favoritesToolbarMore
-        );
-        await testUtil.checkContextMenu(testData.fileDocxSharedFav.name, testData.fileDocxSharedFav.favoritesContextMenu);
-      });
-
-      it('File shared, favorite - [C280053]', async () => {
-        await testUtil.checkToolbarActions(
-          testData.fileSharedFav.name,
-          testData.fileSharedFav.toolbarPrimary,
-          testData.fileSharedFav.favoritesToolbarMore
-        );
-        await testUtil.checkContextMenu(testData.fileSharedFav.name, testData.fileSharedFav.favoritesContextMenu);
-      });
-
-      it('File favorite, locked - [C280050]', async () => {
-        await testUtil.checkToolbarActions(
-          testData.fileFavLocked.name,
-          testData.fileFavLocked.toolbarPrimary,
-          testData.fileFavLocked.favoritesToolbarMore
-        );
-        await testUtil.checkContextMenu(testData.fileFavLocked.name, testData.fileFavLocked.favoritesContextMenu);
-      });
-
-      it('File shared, favorite, locked - [C325011]', async () => {
-        await testUtil.checkToolbarActions(
-          testData.fileSharedFavLocked.name,
-          testData.fileSharedFavLocked.toolbarPrimary,
-          testData.fileSharedFavLocked.favoritesToolbarMore
-        );
-        await testUtil.checkContextMenu(testData.fileSharedFavLocked.name, testData.fileSharedFavLocked.favoritesContextMenu);
-      });
-    });
-
-    describe('on a folder', () => {
-      it('Folder favorite - [C325012]', async () => {
-        await testUtil.checkToolbarActions(testData.folderFav.name, testData.folderFav.toolbarPrimary, testData.folderFav.favoritesToolbarMore);
-        await testUtil.checkContextMenu(testData.folderFav.name, testData.folderFav.favoritesContextMenu);
-      });
-    });
-
-    describe('on multiple selection', () => {
-      it('multiple files - [C325046]', async () => {
-        await testUtil.checkMultipleSelContextMenu(
-          [testData.fileDocxFav.name, testData.fileDocxSharedFav.name],
-          testData.multipleSelAllFav.favoritesContextMenu
-        );
-        await testUtil.checkMultipleSelToolbarActions(
-          [testData.fileDocxFav.name, testData.fileDocxSharedFav.name],
-          testData.multipleSelAllFav.toolbarPrimary,
-          testData.multipleSelAllFav.favoritesToolbarMore
-        );
-      });
-
-      it('multiple locked files - [C217145]', async () => {
-        await testUtil.checkMultipleSelContextMenu(
-          [testData.fileFavLocked.name, testData.fileSharedFavLocked.name],
-          testData.multipleSelAllFav.favoritesContextMenu
-        );
-        await testUtil.checkMultipleSelToolbarActions(
-          [testData.fileFavLocked.name, testData.fileSharedFavLocked.name],
-          testData.multipleSelAllFav.toolbarPrimary,
-          testData.multipleSelAllFav.favoritesToolbarMore
-        );
-      });
-
-      it('multiple folders - [C213196]', async () => {
-        await testUtil.checkMultipleSelContextMenu(
-          [testData.folderFav.name, testData.folderFav2.name],
-          testData.multipleSelAllFav.favoritesContextMenu
-        );
-        await testUtil.checkMultipleSelToolbarActions(
-          [testData.folderFav.name, testData.folderFav2.name],
-          testData.multipleSelAllFav.toolbarPrimary,
-          testData.multipleSelAllFav.favoritesToolbarMore
-        );
-      });
-
-      it('both files and folders - [C217146]', async () => {
-        await testUtil.checkMultipleSelContextMenu([testData.fileFav.name, testData.folderFav.name], testData.multipleSelAllFav.favoritesContextMenu);
-        await testUtil.checkMultipleSelToolbarActions(
-          [testData.fileFav.name, testData.folderFav.name],
-          testData.multipleSelAllFav.toolbarPrimary,
-          testData.multipleSelAllFav.favoritesToolbarMore
-        );
-      });
-
-      it('multiple files with different granular permissions - [C213193]', async () => {
-        await testUtil.checkMultipleSelContextMenu(
-          [testData.fileFav.name, testData.fileGranularPermission],
-          testData.multipleSelAllFav.favoritesContextMenu
-        );
-        await testUtil.checkMultipleSelToolbarActions(
-          [testData.fileFav.name, testData.fileGranularPermission],
-          testData.multipleSelAllFav.toolbarPrimary,
-          testData.multipleSelAllFav.favoritesToolbarMore
-        );
-      });
-    });
-  });
-}
diff --git a/e2e/protractor/suites/actions-available/special-permissions/my-libraries.ts b/e2e/protractor/suites/actions-available/special-permissions/my-libraries.ts
deleted file mode 100755
index 892911a0ef..0000000000
--- a/e2e/protractor/suites/actions-available/special-permissions/my-libraries.ts
+++ /dev/null
@@ -1,196 +0,0 @@
-/*!
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Alfresco Example Content Application
- *
- * This file is part of the Alfresco Example Content Application.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The Alfresco Example Content Application is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import { BrowsingPage, Utils } from '@alfresco/aca-testing-shared';
-import * as testData from './test-data-permissions';
-import * as testUtil from '../test-util';
-
-export function librariesTests(siteName?: string) {
-  const page = new BrowsingPage();
-  const { dataTable } = page;
-
-  describe('available actions : ', () => {
-    beforeAll(async () => {
-      await page.goToMyLibrariesAndWait();
-      await dataTable.doubleClickOnRowByName(siteName);
-      await dataTable.waitForHeader();
-    });
-
-    beforeEach(async () => {
-      await Utils.pressEscape();
-    });
-
-    afterEach(async () => {
-      await page.closeOpenDialogs();
-    });
-
-    describe('on a file', () => {
-      it('File Office - [C280476]', async () => {
-        await testUtil.checkToolbarActions(testData.fileDocx.name, testData.fileDocx.toolbarPrimary, testData.fileDocx.toolbarMore);
-        await testUtil.checkContextMenu(testData.fileDocx.name, testData.fileDocx.contextMenu);
-      });
-
-      it('File Office, favorite - [C280455]', async () => {
-        await testUtil.checkToolbarActions(testData.fileDocxFav.name, testData.fileDocxFav.toolbarPrimary, testData.fileDocxFav.toolbarMore);
-        await testUtil.checkContextMenu(testData.fileDocxFav.name, testData.fileDocxFav.contextMenu);
-      });
-
-      it('File simple - [C280444]', async () => {
-        await testUtil.checkToolbarActions(testData.file.name, testData.file.toolbarPrimary, testData.file.toolbarMore);
-        await testUtil.checkContextMenu(testData.file.name, testData.file.contextMenu);
-      });
-
-      it('File favorite - [C280464]', async () => {
-        await testUtil.checkToolbarActions(testData.fileFav.name, testData.fileFav.toolbarPrimary, testData.fileFav.toolbarMore);
-        await testUtil.checkContextMenu(testData.fileFav.name, testData.fileFav.contextMenu);
-      });
-
-      it('File Office, shared - [C280465]', async () => {
-        await testUtil.checkToolbarActions(testData.fileDocxShared.name, testData.fileDocxShared.toolbarPrimary, testData.fileDocxShared.toolbarMore);
-        await testUtil.checkContextMenu(testData.fileDocxShared.name, testData.fileDocxShared.contextMenu);
-      });
-
-      it('File Office, shared, favorite - [C280466]', async () => {
-        await testUtil.checkToolbarActions(
-          testData.fileDocxSharedFav.name,
-          testData.fileDocxSharedFav.toolbarPrimary,
-          testData.fileDocxSharedFav.toolbarMore
-        );
-        await testUtil.checkContextMenu(testData.fileDocxSharedFav.name, testData.fileDocxSharedFav.contextMenu);
-      });
-
-      it('File shared - [C280599]', async () => {
-        await testUtil.checkToolbarActions(testData.fileShared.name, testData.fileShared.toolbarPrimary, testData.fileShared.toolbarMore);
-        await testUtil.checkContextMenu(testData.fileShared.name, testData.fileShared.contextMenu);
-      });
-
-      it('File shared, favorite - [C280600]', async () => {
-        await testUtil.checkToolbarActions(testData.fileSharedFav.name, testData.fileSharedFav.toolbarPrimary, testData.fileSharedFav.toolbarMore);
-        await testUtil.checkContextMenu(testData.fileSharedFav.name, testData.fileSharedFav.contextMenu);
-      });
-
-      it('File locked - [C280647]', async () => {
-        await testUtil.checkToolbarActions(testData.fileLocked.name, testData.fileLocked.toolbarPrimary, testData.fileLocked.toolbarMore);
-        await testUtil.checkContextMenu(testData.fileLocked.name, testData.fileLocked.contextMenu);
-      });
-
-      it('File favorite, locked - [C280477]', async () => {
-        await testUtil.checkToolbarActions(testData.fileFavLocked.name, testData.fileFavLocked.toolbarPrimary, testData.fileFavLocked.toolbarMore);
-        await testUtil.checkContextMenu(testData.fileFavLocked.name, testData.fileFavLocked.contextMenu);
-      });
-
-      it('File shared, locked - [C280666]', async () => {
-        await testUtil.checkToolbarActions(
-          testData.fileSharedLocked.name,
-          testData.fileSharedLocked.toolbarPrimary,
-          testData.fileSharedLocked.toolbarMore
-        );
-        await testUtil.checkContextMenu(testData.fileSharedLocked.name, testData.fileSharedLocked.contextMenu);
-      });
-
-      it('File shared, favorite, locked - [C280669]', async () => {
-        await testUtil.checkToolbarActions(
-          testData.fileSharedFavLocked.name,
-          testData.fileSharedFavLocked.toolbarPrimary,
-          testData.fileSharedFavLocked.toolbarMore
-        );
-        await testUtil.checkContextMenu(testData.fileSharedFavLocked.name, testData.fileSharedFavLocked.contextMenu);
-      });
-    });
-
-    describe('on a folder', () => {
-      it('Folder not favorite - [C280456]', async () => {
-        await testUtil.checkToolbarActions(testData.folder.name, testData.folder.toolbarPrimary, testData.folder.toolbarMore);
-        await testUtil.checkContextMenu(testData.folder.name, testData.folder.contextMenu);
-      });
-
-      it('Folder favorite - [C286284]', async () => {
-        await testUtil.checkToolbarActions(testData.folderFav.name, testData.folderFav.toolbarPrimary, testData.folderFav.toolbarMore);
-        await testUtil.checkContextMenu(testData.folderFav.name, testData.folderFav.contextMenu);
-      });
-    });
-
-    describe('on multiple selection', () => {
-      it('multiple files - [C286264]', async () => {
-        await testUtil.checkMultipleSelContextMenu([testData.fileDocx.name, testData.fileDocxSharedFav.name], testData.multipleSel.contextMenu);
-        await testUtil.checkMultipleSelToolbarActions(
-          [testData.fileDocx.name, testData.fileDocxSharedFav.name],
-          testData.multipleSel.toolbarPrimary,
-          testData.multipleSel.toolbarMore
-        );
-      });
-
-      it('multiple files - all favorite - [C286283]', async () => {
-        await testUtil.checkMultipleSelContextMenu(
-          [testData.fileDocxFav.name, testData.fileDocxSharedFav.name],
-          testData.multipleSelAllFav.contextMenu
-        );
-        await testUtil.checkMultipleSelToolbarActions(
-          [testData.fileDocxFav.name, testData.fileDocxSharedFav.name],
-          testData.multipleSel.toolbarPrimary,
-          testData.multipleSelAllFav.toolbarMore
-        );
-      });
-
-      it('multiple locked files - [C280478]', async () => {
-        await testUtil.checkMultipleSelContextMenu([testData.fileLocked.name, testData.fileSharedFavLocked.name], testData.multipleSel.contextMenu);
-        await testUtil.checkMultipleSelToolbarActions(
-          [testData.fileLocked.name, testData.fileSharedFavLocked.name],
-          testData.multipleSel.toolbarPrimary,
-          testData.multipleSel.toolbarMore
-        );
-      });
-
-      it('multiple folders - [C213121]', async () => {
-        await testUtil.checkMultipleSelContextMenu([testData.folderFav.name, testData.folder.name], testData.multipleSel.contextMenu);
-        await testUtil.checkMultipleSelToolbarActions(
-          [testData.folderFav.name, testData.folder.name],
-          testData.multipleSel.toolbarPrimary,
-          testData.multipleSel.toolbarMore
-        );
-      });
-
-      it('both files and folders - [C286266]', async () => {
-        await testUtil.checkMultipleSelContextMenu([testData.file.name, testData.folder.name], testData.multipleSel.contextMenu);
-        await testUtil.checkMultipleSelToolbarActions(
-          [testData.file.name, testData.folder.name],
-          testData.multipleSel.toolbarPrimary,
-          testData.multipleSel.toolbarMore
-        );
-      });
-
-      it('multiple files with different granular permissions - [C286285]', async () => {
-        await testUtil.checkMultipleSelContextMenu(
-          [testData.fileDocxFav.name, testData.fileGranularPermission],
-          testData.multipleSelAllFav.contextMenu
-        );
-        await testUtil.checkMultipleSelToolbarActions(
-          [testData.fileDocxFav.name, testData.fileGranularPermission],
-          testData.multipleSel.toolbarPrimary,
-          testData.multipleSelAllFav.toolbarMore
-        );
-      });
-    });
-  });
-}
diff --git a/e2e/protractor/suites/actions-available/special-permissions/search-results.ts b/e2e/protractor/suites/actions-available/special-permissions/search-results.ts
deleted file mode 100755
index 0e98142199..0000000000
--- a/e2e/protractor/suites/actions-available/special-permissions/search-results.ts
+++ /dev/null
@@ -1,243 +0,0 @@
-/*!
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Alfresco Example Content Application
- *
- * This file is part of the Alfresco Example Content Application.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The Alfresco Example Content Application is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import { BrowsingPage, SearchResultsPage, Utils } from '@alfresco/aca-testing-shared';
-import * as testData from './test-data-permissions';
-import * as testUtil from '../test-util';
-
-export function searchResultsTests() {
-  const page = new BrowsingPage();
-  const searchResultsPage = new SearchResultsPage();
-  const { searchInput, toolbar } = page.pageLayoutHeader;
-
-  describe('available actions : ', () => {
-    beforeEach(async () => {
-      await Utils.pressEscape();
-    });
-
-    afterEach(async () => {
-      await page.closeOpenDialogs();
-    });
-
-    describe('on a file', () => {
-      beforeEach(async () => {
-        await page.clickPersonalFiles();
-        await toolbar.clickSearchIconButton();
-        await searchInput.clickSearchButton();
-        await searchInput.checkOnlyFiles();
-        await searchInput.searchFor(`*${testData.random}`);
-        await searchResultsPage.waitForResults();
-      });
-
-      it('File Office - [C286286]', async () => {
-        await testUtil.checkToolbarActions(testData.fileDocx.name, testData.fileDocx.searchToolbarPrimary, testData.fileDocx.toolbarMore);
-        await testUtil.checkContextMenu(testData.fileDocx.name, testData.fileDocx.contextMenu);
-      });
-
-      it('File Office, favorite - [C286287]', async () => {
-        await testUtil.checkToolbarActions(testData.fileDocxFav.name, testData.fileDocxFav.searchToolbarPrimary, testData.fileDocxFav.toolbarMore);
-        await testUtil.checkContextMenu(testData.fileDocxFav.name, testData.fileDocxFav.contextMenu);
-      });
-
-      it('File simple - [C286262]', async () => {
-        await testUtil.checkToolbarActions(testData.file.name, testData.file.searchToolbarPrimary, testData.file.toolbarMore);
-        await testUtil.checkContextMenu(testData.file.name, testData.file.contextMenu);
-      });
-
-      it('File favorite - [C286263]', async () => {
-        await testUtil.checkToolbarActions(testData.fileFav.name, testData.fileFav.searchToolbarPrimary, testData.fileFav.toolbarMore);
-        await testUtil.checkContextMenu(testData.fileFav.name, testData.fileFav.contextMenu);
-      });
-
-      it('File Office, shared - [C286280]', async () => {
-        await testUtil.checkToolbarActions(
-          testData.fileDocxShared.name,
-          testData.fileDocxShared.searchToolbarPrimary,
-          testData.fileDocxShared.toolbarMore
-        );
-        await testUtil.checkContextMenu(testData.fileDocxShared.name, testData.fileDocxShared.contextMenu);
-      });
-
-      it('File Office, shared, favorite - [C286281]', async () => {
-        await testUtil.checkToolbarActions(
-          testData.fileDocxSharedFav.name,
-          testData.fileDocxSharedFav.searchToolbarPrimary,
-          testData.fileDocxSharedFav.toolbarMore
-        );
-        await testUtil.checkContextMenu(testData.fileDocxSharedFav.name, testData.fileDocxSharedFav.contextMenu);
-      });
-
-      it('File shared - [C286282]', async () => {
-        await testUtil.checkToolbarActions(testData.fileShared.name, testData.fileShared.searchToolbarPrimary, testData.fileShared.toolbarMore);
-        await testUtil.checkContextMenu(testData.fileShared.name, testData.fileShared.contextMenu);
-      });
-
-      it('File shared, favorite - [C291823]', async () => {
-        await testUtil.checkToolbarActions(
-          testData.fileSharedFav.name,
-          testData.fileSharedFav.searchToolbarPrimary,
-          testData.fileSharedFav.toolbarMore
-        );
-        await testUtil.checkContextMenu(testData.fileSharedFav.name, testData.fileSharedFav.contextMenu);
-      });
-
-      it('File locked - [C291818]', async () => {
-        await testUtil.checkToolbarActions(testData.fileLocked.name, testData.fileLocked.searchToolbarPrimary, testData.fileLocked.toolbarMore);
-        await testUtil.checkContextMenu(testData.fileLocked.name, testData.fileLocked.contextMenu);
-      });
-
-      it('File favorite, locked - [C291819]', async () => {
-        await testUtil.checkToolbarActions(
-          testData.fileFavLocked.name,
-          testData.fileFavLocked.searchToolbarPrimary,
-          testData.fileFavLocked.toolbarMore
-        );
-        await testUtil.checkContextMenu(testData.fileFavLocked.name, testData.fileFavLocked.contextMenu);
-      });
-
-      it('File shared, locked - [C291824]', async () => {
-        await testUtil.checkToolbarActions(
-          testData.fileSharedLocked.name,
-          testData.fileSharedLocked.searchToolbarPrimary,
-          testData.fileSharedLocked.toolbarMore
-        );
-        await testUtil.checkContextMenu(testData.fileSharedLocked.name, testData.fileSharedLocked.contextMenu);
-      });
-
-      it('File shared, favorite, locked - [C291825]', async () => {
-        await testUtil.checkToolbarActions(
-          testData.fileSharedFavLocked.name,
-          testData.fileSharedFavLocked.searchToolbarPrimary,
-          testData.fileSharedFavLocked.toolbarMore
-        );
-        await testUtil.checkContextMenu(testData.fileSharedFavLocked.name, testData.fileSharedFavLocked.contextMenu);
-      });
-    });
-
-    describe('on a folder', () => {
-      beforeAll(async () => {
-        await page.clickPersonalFiles();
-        await toolbar.clickSearchIconButton();
-        await searchInput.clickSearchButton();
-        await searchInput.checkOnlyFolders();
-        await searchInput.searchFor(`*${testData.random}`);
-        await searchResultsPage.waitForResults();
-      });
-
-      it('Folder not favorite - [C291826]', async () => {
-        await testUtil.checkToolbarActions(testData.folder.name, testData.folder.searchToolbarPrimary, testData.folder.toolbarMore);
-        await testUtil.checkContextMenu(testData.folder.name, testData.folder.contextMenu);
-      });
-
-      it('Folder favorite - [C291829]', async () => {
-        await testUtil.checkToolbarActions(testData.folderFav.name, testData.folderFav.searchToolbarPrimary, testData.folderFav.toolbarMore);
-        await testUtil.checkContextMenu(testData.folderFav.name, testData.folderFav.contextMenu);
-      });
-    });
-
-    describe('on multiple selection', () => {
-      describe('of files', () => {
-        beforeAll(async () => {
-          await page.clickPersonalFiles();
-          await toolbar.clickSearchIconButton();
-          await searchInput.clickSearchButton();
-          await searchInput.checkOnlyFiles();
-          await searchInput.searchFor(`*${testData.random}`);
-          await searchResultsPage.waitForResults();
-        });
-
-        it('multiple files - [C291830]', async () => {
-          await testUtil.checkMultipleSelContextMenu([testData.file.name, testData.fileDocxShared.name], testData.multipleSel.contextMenu);
-          await testUtil.checkMultipleSelToolbarActions(
-            [testData.file.name, testData.fileDocxShared.name],
-            testData.multipleSel.searchToolbarPrimary,
-            testData.multipleSel.toolbarMore
-          );
-        });
-
-        it('multiple files - all favorite - [C291834]', async () => {
-          await testUtil.checkMultipleSelContextMenu(
-            [testData.fileDocxFav.name, testData.fileSharedFav.name],
-            testData.multipleSelAllFav.contextMenu
-          );
-          await testUtil.checkMultipleSelToolbarActions(
-            [testData.fileDocxFav.name, testData.fileSharedFav.name],
-            testData.multipleSel.searchToolbarPrimary,
-            testData.multipleSelAllFav.toolbarMore
-          );
-        });
-
-        it('multiple locked files - [C291835]', async () => {
-          await testUtil.checkMultipleSelContextMenu([testData.fileLocked.name, testData.fileSharedFavLocked.name], testData.multipleSel.contextMenu);
-          await testUtil.checkMultipleSelToolbarActions(
-            [testData.fileLocked.name, testData.fileSharedFavLocked.name],
-            testData.multipleSel.searchToolbarPrimary,
-            testData.multipleSel.toolbarMore
-          );
-        });
-
-        it('multiple files with different granular permissions - [C286310]', async () => {
-          await testUtil.checkMultipleSelContextMenu(
-            [testData.fileDocxFav.name, testData.fileGranularPermission],
-            testData.multipleSelAllFav.contextMenu
-          );
-          await testUtil.checkMultipleSelToolbarActions(
-            [testData.fileDocxFav.name, testData.fileGranularPermission],
-            testData.multipleSel.searchToolbarPrimary,
-            testData.multipleSelAllFav.toolbarMore
-          );
-        });
-      });
-
-      it('multiple folders - [C291836]', async () => {
-        await page.clickPersonalFiles();
-        await toolbar.clickSearchIconButton();
-        await searchInput.clickSearchButton();
-        await searchInput.checkOnlyFolders();
-        await searchInput.searchFor(`*${testData.random}`);
-
-        await testUtil.checkMultipleSelContextMenu([testData.folder.name, testData.folderFav.name], testData.multipleSel.contextMenu);
-        await testUtil.checkMultipleSelToolbarActions(
-          [testData.folder.name, testData.folderFav.name],
-          testData.multipleSel.searchToolbarPrimary,
-          testData.multipleSel.toolbarMore
-        );
-      });
-
-      it('both files and folders - [C268128]', async () => {
-        await page.clickPersonalFiles();
-        await toolbar.clickSearchIconButton();
-        await searchInput.clickSearchButton();
-        await searchInput.searchFor(`${testData.file.name} or ${testData.folderFav.name}`);
-
-        await testUtil.checkMultipleSelContextMenu([testData.file.name, testData.folderFav.name], testData.multipleSel.contextMenu);
-        await testUtil.checkMultipleSelToolbarActions(
-          [testData.file.name, testData.folderFav.name],
-          testData.multipleSel.searchToolbarPrimary,
-          testData.multipleSel.toolbarMore
-        );
-      });
-    });
-  });
-}
diff --git a/e2e/protractor/suites/actions-available/special-permissions/shared-files.ts b/e2e/protractor/suites/actions-available/special-permissions/shared-files.ts
deleted file mode 100755
index 2475115509..0000000000
--- a/e2e/protractor/suites/actions-available/special-permissions/shared-files.ts
+++ /dev/null
@@ -1,144 +0,0 @@
-/*!
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Alfresco Example Content Application
- *
- * This file is part of the Alfresco Example Content Application.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The Alfresco Example Content Application is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import { BrowsingPage, Utils } from '@alfresco/aca-testing-shared';
-import * as testData from './test-data-permissions';
-import * as testUtil from '../test-util';
-
-export function sharedFilesTests() {
-  const page = new BrowsingPage();
-
-  describe('available actions : ', () => {
-    beforeAll(async () => {
-      await page.clickSharedFilesAndWait();
-    });
-
-    beforeEach(async () => {
-      await Utils.pressEscape();
-    });
-
-    afterEach(async () => {
-      await page.closeOpenDialogs();
-    });
-
-    describe('single selection', () => {
-      it('File Office, shared - [C326626]', async () => {
-        await testUtil.checkToolbarActions(
-          testData.fileDocxShared.name,
-          testData.fileDocxShared.toolbarPrimary,
-          testData.fileDocxShared.sharedToolbarMore
-        );
-        await testUtil.checkContextMenu(testData.fileDocxShared.name, testData.fileDocxShared.sharedContextMenu);
-      });
-
-      it('File Office, shared, favorite - [C326627]', async () => {
-        await testUtil.checkToolbarActions(
-          testData.fileDocxSharedFav.name,
-          testData.fileDocxSharedFav.toolbarPrimary,
-          testData.fileDocxSharedFav.sharedToolbarMore
-        );
-        await testUtil.checkContextMenu(testData.fileDocxSharedFav.name, testData.fileDocxSharedFav.sharedContextMenu);
-      });
-
-      it('File shared - [C326628]', async () => {
-        await testUtil.checkToolbarActions(testData.fileShared.name, testData.fileShared.toolbarPrimary, testData.fileShared.sharedToolbarMore);
-        await testUtil.checkContextMenu(testData.fileShared.name, testData.fileShared.sharedContextMenu);
-      });
-
-      it('File shared, favorite - [C326629]', async () => {
-        await testUtil.checkToolbarActions(
-          testData.fileSharedFav.name,
-          testData.fileSharedFav.toolbarPrimary,
-          testData.fileSharedFav.sharedToolbarMore
-        );
-        await testUtil.checkContextMenu(testData.fileSharedFav.name, testData.fileSharedFav.sharedContextMenu);
-      });
-
-      it('File shared, locked - [C326631]', async () => {
-        await testUtil.checkToolbarActions(
-          testData.fileSharedLocked.name,
-          testData.fileSharedLocked.toolbarPrimary,
-          testData.fileSharedLocked.sharedToolbarMore
-        );
-        await testUtil.checkContextMenu(testData.fileSharedLocked.name, testData.fileSharedLocked.sharedContextMenu);
-      });
-
-      it('File shared, favorite, locked - [C326632]', async () => {
-        await testUtil.checkToolbarActions(
-          testData.fileSharedFavLocked.name,
-          testData.fileSharedFavLocked.toolbarPrimary,
-          testData.fileSharedFavLocked.sharedToolbarMore
-        );
-        await testUtil.checkContextMenu(testData.fileSharedFavLocked.name, testData.fileSharedFavLocked.sharedContextMenu);
-      });
-    });
-
-    describe('multiple selection', () => {
-      it('multiple files - [C326634]', async () => {
-        await testUtil.checkMultipleSelContextMenu([testData.fileShared.name, testData.fileSharedFav.name], testData.multipleSel.contextMenu);
-        await testUtil.checkMultipleSelToolbarActions(
-          [testData.fileShared.name, testData.fileSharedFav.name],
-          testData.multipleSel.toolbarPrimary,
-          testData.multipleSel.toolbarMore
-        );
-      });
-
-      it('multiple files - all favorite - [C326635]', async () => {
-        await testUtil.checkMultipleSelContextMenu(
-          [testData.fileSharedFav.name, testData.fileSharedFavLocked.name],
-          testData.multipleSelAllFav.contextMenu
-        );
-        await testUtil.checkMultipleSelToolbarActions(
-          [testData.fileSharedFav.name, testData.fileSharedFavLocked.name],
-          testData.multipleSel.toolbarPrimary,
-          testData.multipleSelAllFav.toolbarMore
-        );
-      });
-
-      it('multiple locked files - [C326636]', async () => {
-        await testUtil.checkMultipleSelContextMenu(
-          [testData.fileSharedLocked.name, testData.fileSharedFavLocked.name],
-          testData.multipleSel.contextMenu
-        );
-        await testUtil.checkMultipleSelToolbarActions(
-          [testData.fileSharedLocked.name, testData.fileSharedFavLocked.name],
-          testData.multipleSel.toolbarPrimary,
-          testData.multipleSel.toolbarMore
-        );
-      });
-
-      it('multiple files with different granular permissions - [C326639]', async () => {
-        await testUtil.checkMultipleSelContextMenu(
-          [testData.fileSharedFav.name, testData.fileGranularPermission],
-          testData.multipleSelAllFav.contextMenu
-        );
-        await testUtil.checkMultipleSelToolbarActions(
-          [testData.fileSharedFav.name, testData.fileGranularPermission],
-          testData.multipleSel.toolbarPrimary,
-          testData.multipleSelAllFav.toolbarMore
-        );
-      });
-    });
-  });
-}
diff --git a/e2e/protractor/suites/actions-available/special-permissions/special-permissions-actions.test.ts b/e2e/protractor/suites/actions-available/special-permissions/special-permissions-actions.test.ts
deleted file mode 100644
index 269ec5dbe9..0000000000
--- a/e2e/protractor/suites/actions-available/special-permissions/special-permissions-actions.test.ts
+++ /dev/null
@@ -1,178 +0,0 @@
-/*!
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Alfresco Example Content Application
- *
- * This file is part of the Alfresco Example Content Application.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The Alfresco Example Content Application is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import { LoginPage, RepoClient, Utils, AdminActions, FILES, SITE_ROLES, SITE_VISIBILITY, UserActions } from '@alfresco/aca-testing-shared';
-import * as testData from './test-data-permissions';
-import { librariesTests } from './my-libraries';
-import { favoritesTests } from './favorites';
-import { searchResultsTests } from './search-results';
-import { sharedFilesTests } from './shared-files';
-
-describe('Special permissions : ', () => {
-  const random = testData.random;
-
-  const sitePrivate = `site-private-${random}`;
-
-  const userManager = `manager-${random}`;
-  const userConsumer = `consumer-${random}`;
-  const userDemoted = `demoted-${random}`;
-
-  let fileDocxFavId: string;
-  let fileFavId: string;
-  let fileDocxSharedId: string;
-  let fileDocxSharedFavId: string;
-  let fileSharedId: string;
-  let fileSharedFavId: string;
-  let fileLockedId: string;
-  let fileFavLockedId: string;
-  let fileSharedLockedId: string;
-  let fileSharedFavLockedId: string;
-  let fileGranularPermissionId: string;
-  let fileLockedByUserId: string;
-  let folderFavId: string;
-  let folderFav2Id: string;
-
-  const adminApiActions = new AdminActions();
-  const managerActions = new UserActions();
-  const demotedUserActions = new UserActions();
-
-  const userManagerApi = new RepoClient(userManager, userManager);
-  const userConsumerApi = new RepoClient(userConsumer, userConsumer);
-  const userDemotedApi = new RepoClient(userDemoted, userDemoted);
-
-  const loginPage = new LoginPage();
-
-  beforeAll(async () => {
-    await adminApiActions.createUser({ username: userManager });
-    await adminApiActions.createUser({ username: userConsumer });
-    await adminApiActions.createUser({ username: userDemoted });
-
-    await managerActions.login(userManager, userManager);
-    await demotedUserActions.login(userDemoted, userDemoted);
-
-    const consumerFavoritesTotalItems = await userConsumerApi.favorites.getFavoritesTotalItems();
-    const managerSearchTotalItems = await userManagerApi.search.getTotalItems(userManager);
-
-    await userManagerApi.sites.createSite(sitePrivate, SITE_VISIBILITY.PRIVATE);
-    const docLibId = await userManagerApi.sites.getDocLibId(sitePrivate);
-    await userManagerApi.sites.addSiteConsumer(sitePrivate, userConsumer);
-    await userManagerApi.sites.addSiteManager(sitePrivate, userDemoted);
-
-    await userManagerApi.upload.uploadFileWithRename(FILES.docxFile, docLibId, testData.fileDocx.name);
-    fileDocxFavId = (await userManagerApi.upload.uploadFileWithRename(FILES.docxFile, docLibId, testData.fileDocxFav.name)).entry.id;
-    await userManagerApi.createFile(testData.file.name, docLibId);
-    fileFavId = await userManagerApi.createFile(testData.fileFav.name, docLibId);
-    fileDocxSharedId = (await userManagerApi.upload.uploadFileWithRename(FILES.docxFile, docLibId, testData.fileDocxShared.name)).entry.id;
-    fileDocxSharedFavId = (await userManagerApi.upload.uploadFileWithRename(FILES.docxFile, docLibId, testData.fileDocxSharedFav.name)).entry.id;
-    fileSharedId = await userManagerApi.createFile(testData.fileShared.name, docLibId);
-    fileSharedFavId = await userManagerApi.createFile(testData.fileSharedFav.name, docLibId);
-    fileLockedId = await userManagerApi.createFile(testData.fileLocked.name, docLibId);
-    fileFavLockedId = await userManagerApi.createFile(testData.fileFavLocked.name, docLibId);
-    fileSharedLockedId = await userManagerApi.createFile(testData.fileSharedLocked.name, docLibId);
-    fileSharedFavLockedId = await userManagerApi.createFile(testData.fileSharedFavLocked.name, docLibId);
-    fileGranularPermissionId = await userManagerApi.createFile(testData.fileGranularPermission, docLibId);
-
-    fileLockedByUserId = await userManagerApi.createFile(testData.fileLockedByUser, docLibId);
-    await demotedUserActions.lockNodes([fileLockedByUserId]);
-    await userDemotedApi.favorites.addFavoriteById('file', fileLockedByUserId);
-    await userDemotedApi.shared.shareFilesByIds([fileLockedByUserId]);
-    await userManagerApi.sites.updateSiteMember(sitePrivate, userDemoted, SITE_ROLES.SITE_CONSUMER.ROLE);
-
-    await userManagerApi.nodes.createFolder(testData.folder.name, docLibId);
-    folderFavId = await userManagerApi.createFolder(testData.folderFav.name, docLibId);
-    folderFav2Id = await userManagerApi.createFolder(testData.folderFav2.name, docLibId);
-    await userConsumerApi.favorites.addFavoritesByIds('folder', [folderFavId, folderFav2Id]);
-
-    await userConsumerApi.favorites.addFavoritesByIds('file', [
-      fileDocxFavId,
-      fileFavId,
-      fileDocxSharedFavId,
-      fileSharedFavId,
-      fileFavLockedId,
-      fileSharedFavLockedId,
-      fileGranularPermissionId
-    ]);
-
-    await userConsumerApi.shared.shareFilesByIds([
-      fileDocxSharedId,
-      fileDocxSharedFavId,
-      fileSharedId,
-      fileSharedFavId,
-      fileSharedLockedId,
-      fileSharedFavLockedId,
-      fileGranularPermissionId
-    ]);
-
-    await managerActions.lockNodes([fileLockedId, fileFavLockedId, fileSharedLockedId, fileSharedFavLockedId]);
-
-    await userManagerApi.nodes.setGranularPermission(fileGranularPermissionId, false, userConsumer, SITE_ROLES.SITE_MANAGER.ROLE);
-
-    await userManagerApi.favorites.addFavoriteById('file', fileLockedByUserId);
-
-    await Promise.all([
-      userConsumerApi.favorites.waitForApi({ expect: consumerFavoritesTotalItems + 9 }),
-      userManagerApi.shared.waitForFilesToBeShared([
-        fileDocxSharedId,
-        fileDocxSharedFavId,
-        fileSharedId,
-        fileSharedFavId,
-        fileSharedLockedId,
-        fileSharedFavLockedId,
-        fileGranularPermissionId,
-        fileLockedByUserId
-      ]),
-      userManagerApi.search.waitForApi(userManager, { expect: managerSearchTotalItems + 14 })
-    ]);
-  });
-
-  afterAll(async () => {
-    await userManagerApi.sites.deleteSite(sitePrivate);
-  });
-
-  beforeEach(async () => {
-    await Utils.pressEscape();
-  });
-
-  describe('Consumer', () => {
-    beforeAll(async () => {
-      await loginPage.loginWith(userConsumer);
-    });
-
-    describe('on File Libraries', () => {
-      librariesTests(sitePrivate);
-    });
-
-    describe('on Favorites', () => {
-      favoritesTests();
-    });
-
-    describe('on Search Results', () => {
-      searchResultsTests();
-    });
-
-    describe('on Shared Files', () => {
-      sharedFilesTests();
-    });
-  });
-});
diff --git a/e2e/protractor/suites/actions-available/special-permissions/test-data-permissions.ts b/e2e/protractor/suites/actions-available/special-permissions/test-data-permissions.ts
deleted file mode 100644
index a38809c049..0000000000
--- a/e2e/protractor/suites/actions-available/special-permissions/test-data-permissions.ts
+++ /dev/null
@@ -1,404 +0,0 @@
-/*!
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Alfresco Example Content Application
- *
- * This file is part of the Alfresco Example Content Application.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The Alfresco Example Content Application is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import { Utils } from '@alfresco/aca-testing-shared';
-
-export const random = Utils.random();
-
-// ----- files -----
-
-const consumerContextMenu = ['Share', 'Download', 'View', 'Favorite', 'Copy', 'Manage Versions'];
-const consumerFavContextMenu = ['Share', 'Download', 'View', 'Remove Favorite', 'Copy', 'Manage Versions'];
-const consumerSharedContextMenu = ['Shared Link Settings', 'Download', 'View', 'Favorite', 'Copy', 'Manage Versions'];
-const consumerSharedFavContextMenu = ['Shared Link Settings', 'Download', 'View', 'Remove Favorite', 'Copy', 'Manage Versions'];
-
-const consumerToolbarPrimary = ['Share', 'Download', 'View', 'View Details', 'More Actions'];
-const consumerSharedToolbarPrimary = ['Shared Link Settings', 'Download', 'View', 'View Details', 'More Actions'];
-
-const searchConsumerToolbarPrimary = ['Share', 'Download', 'View', 'View Details', 'More Actions'];
-const searchConsumerSharedToolbarPrimary = ['Shared Link Settings', 'Download', 'View', 'View Details', 'More Actions'];
-
-const consumerToolbarMore = ['Favorite', 'Copy', 'Manage Versions'];
-const consumerFavToolbarMore = ['Remove Favorite', 'Copy', 'Manage Versions'];
-
-// ---- VIEWER ----
-
-const consumerViewerSharedToolbarPrimary = ['Activate full-screen mode', 'Shared Link Settings', 'Download', 'Print', 'View Details', 'More Actions'];
-const consumerViewerToolbarPrimary = ['Activate full-screen mode', 'Share', 'Download', 'Print', 'View Details', 'More Actions'];
-const consumerViewerFavToolbarMore = ['Remove Favorite', 'Copy', 'Manage Versions'];
-const consumerViewerToolbarMore = ['Favorite', 'Copy', 'Manage Versions'];
-
-// ---- FAVORITES workarounds ----
-
-// TODO: remove 'Move' and 'Delete' when ACA-1737 is done
-// TODO: investigate why 'Upload New Version' appears and raise issue
-const favoritesConsumerToolbarMore = ['Upload New Version', 'Remove Favorite', 'Move', 'Copy', 'Delete', 'Manage Versions'];
-// TODO: remove 'Move' and 'Delete' when ACA-1737 is done
-// TODO: investigate why 'Upload New Version' appears and raise issue
-const favoritesConsumerContextMenu = [
-  'Share',
-  'Download',
-  'View',
-  'Upload New Version',
-  'Remove Favorite',
-  'Move',
-  'Copy',
-  'Delete',
-  'Manage Versions'
-];
-// TODO: remove 'Move' and 'Delete' when ACA-1737 is done
-// TODO: investigate why 'Upload New Version' appears and raise issue
-const favoritesConsumerSharedContextMenu = [
-  'Shared Link Settings',
-  'Download',
-  'View',
-  'Upload New Version',
-  'Remove Favorite',
-  'Move',
-  'Copy',
-  'Delete',
-  'Manage Versions'
-];
-
-// ---- SHARED FILES workaround ----
-
-// TODO: investigate why 'Upload New Version' appears and raise issue
-const sharedConsumerToolbarMore = ['Upload New Version', 'Favorite', 'Copy', 'Manage Versions'];
-// TODO: investigate why 'Cancel Editing' appears and raise issue
-// TODO: investigate why 'Upload New Version' appears and raise issue
-const sharedConsumerLockedToolbarMore = ['Cancel Editing', 'Upload New Version', 'Favorite', 'Copy', 'Manage Versions'];
-// TODO: investigate why 'Upload New Version' appears and raise issue
-const sharedConsumerFavToolbarMore = ['Upload New Version', 'Remove Favorite', 'Copy', 'Manage Versions'];
-// TODO: investigate why 'Cancel Editing' appears and raise issue
-// TODO: investigate why 'Upload New Version' appears and raise issue
-const sharedConsumerFavLockedToolbarMore = ['Cancel Editing', 'Upload New Version', 'Remove Favorite', 'Copy', 'Manage Versions'];
-// TODO: investigate why 'Upload New Version' appears and raise issue
-const sharedConsumerContextMenu = ['Shared Link Settings', 'Download', 'View', 'Upload New Version', 'Favorite', 'Copy', 'Manage Versions'];
-// TODO: investigate why 'Cancel Editing' appears and raise issue
-// TODO: investigate why 'Upload New Version' appears and raise issue
-const sharedConsumerLockedContextMenu = [
-  'Shared Link Settings',
-  'Download',
-  'View',
-  'Cancel Editing',
-  'Upload New Version',
-  'Favorite',
-  'Copy',
-  'Manage Versions'
-];
-// TODO: investigate why 'Upload New Version' appears and raise issue
-const sharedConsumerFavContextMenu = ['Shared Link Settings', 'Download', 'View', 'Upload New Version', 'Remove Favorite', 'Copy', 'Manage Versions'];
-// TODO: investigate why 'Cancel Editing' appears and raise issue
-// TODO: investigate why 'Upload New Version' appears and raise issue
-const sharedConsumerFavLockedContextMenu = [
-  'Shared Link Settings',
-  'Download',
-  'View',
-  'Cancel Editing',
-  'Upload New Version',
-  'Remove Favorite',
-  'Copy',
-  'Manage Versions'
-];
-
-export const fileDocx = {
-  name: `file-${random}-docx.docx`,
-  description: 'file not shared, not fav, office, not locked',
-
-  contextMenu: consumerContextMenu,
-  toolbarPrimary: consumerToolbarPrimary,
-  toolbarMore: consumerToolbarMore,
-  viewerToolbarPrimary: consumerViewerToolbarPrimary,
-  viewerToolbarMore: consumerViewerToolbarMore,
-
-  searchToolbarPrimary: searchConsumerToolbarPrimary
-};
-
-export const fileDocxFav = {
-  name: `file-${random}-docx-fav.docx`,
-  description: 'file not shared, fav, office, not locked',
-
-  contextMenu: consumerFavContextMenu,
-  toolbarPrimary: consumerToolbarPrimary,
-  toolbarMore: consumerFavToolbarMore,
-  viewerToolbarPrimary: consumerViewerToolbarPrimary,
-  viewerToolbarMore: consumerViewerFavToolbarMore,
-
-  favoritesToolbarMore: favoritesConsumerToolbarMore,
-  favoritesContextMenu: favoritesConsumerContextMenu,
-
-  searchToolbarPrimary: searchConsumerToolbarPrimary
-};
-
-export const file = {
-  name: `file-${random}.txt`,
-  description: 'file not shared, not fav, not office, not locked',
-
-  contextMenu: consumerContextMenu,
-  toolbarPrimary: consumerToolbarPrimary,
-  toolbarMore: consumerToolbarMore,
-  viewerToolbarPrimary: consumerViewerToolbarPrimary,
-  viewerToolbarMore: consumerViewerToolbarMore,
-
-  searchToolbarPrimary: searchConsumerToolbarPrimary
-};
-
-export const fileFav = {
-  name: `file-${random}-fav.txt`,
-  description: 'file not shared, fav, not office, not locked',
-
-  contextMenu: consumerFavContextMenu,
-  toolbarPrimary: consumerToolbarPrimary,
-  toolbarMore: consumerFavToolbarMore,
-  viewerToolbarPrimary: consumerViewerToolbarPrimary,
-  viewerToolbarMore: consumerViewerFavToolbarMore,
-
-  favoritesToolbarMore: favoritesConsumerToolbarMore,
-  favoritesContextMenu: favoritesConsumerContextMenu,
-
-  searchToolbarPrimary: searchConsumerToolbarPrimary
-};
-
-export const fileDocxShared = {
-  name: `file-${random}-docx-shared.docx`,
-  description: 'file shared, not fav, office, not locked',
-
-  contextMenu: consumerSharedContextMenu,
-  toolbarPrimary: consumerSharedToolbarPrimary,
-  toolbarMore: consumerToolbarMore,
-  viewerToolbarPrimary: consumerViewerSharedToolbarPrimary,
-  viewerToolbarMore: consumerViewerToolbarMore,
-
-  sharedToolbarMore: sharedConsumerToolbarMore,
-  sharedContextMenu: sharedConsumerContextMenu,
-
-  searchToolbarPrimary: searchConsumerSharedToolbarPrimary
-};
-
-export const fileDocxSharedFav = {
-  name: `file-${random}-docx-shared-fav.docx`,
-  description: 'file shared, fav, office, not locked',
-
-  contextMenu: consumerSharedFavContextMenu,
-  toolbarPrimary: consumerSharedToolbarPrimary,
-  toolbarMore: consumerFavToolbarMore,
-  viewerToolbarPrimary: consumerViewerSharedToolbarPrimary,
-  viewerToolbarMore: consumerViewerFavToolbarMore,
-
-  favoritesToolbarMore: favoritesConsumerToolbarMore,
-  favoritesContextMenu: favoritesConsumerSharedContextMenu,
-
-  sharedToolbarMore: sharedConsumerFavToolbarMore,
-  sharedContextMenu: sharedConsumerFavContextMenu,
-
-  searchToolbarPrimary: searchConsumerSharedToolbarPrimary
-};
-
-export const fileShared = {
-  name: `file-${random}-shared.txt`,
-  description: 'file shared, not fav, not office, not locked',
-
-  contextMenu: consumerSharedContextMenu,
-  toolbarPrimary: consumerSharedToolbarPrimary,
-  toolbarMore: consumerToolbarMore,
-  viewerToolbarPrimary: consumerViewerSharedToolbarPrimary,
-  viewerToolbarMore: consumerViewerToolbarMore,
-
-  sharedToolbarMore: sharedConsumerToolbarMore,
-  sharedContextMenu: sharedConsumerContextMenu,
-
-  searchToolbarPrimary: searchConsumerSharedToolbarPrimary
-};
-
-export const fileSharedFav = {
-  name: `file-${random}-shared-fav.txt`,
-  description: 'file shared, fav, not office, not locked',
-
-  contextMenu: consumerSharedFavContextMenu,
-  toolbarPrimary: consumerSharedToolbarPrimary,
-  toolbarMore: consumerFavToolbarMore,
-  viewerToolbarPrimary: consumerViewerSharedToolbarPrimary,
-  viewerToolbarMore: consumerViewerFavToolbarMore,
-
-  favoritesToolbarMore: favoritesConsumerToolbarMore,
-  favoritesContextMenu: favoritesConsumerSharedContextMenu,
-
-  sharedToolbarMore: sharedConsumerFavToolbarMore,
-  sharedContextMenu: sharedConsumerFavContextMenu,
-
-  searchToolbarPrimary: searchConsumerSharedToolbarPrimary
-};
-
-export const fileLocked = {
-  name: `file-${random}-locked.txt`,
-  description: 'file not shared, not fav, not office, locked',
-
-  contextMenu: consumerContextMenu,
-  toolbarPrimary: consumerToolbarPrimary,
-  toolbarMore: consumerToolbarMore,
-  viewerToolbarPrimary: consumerViewerToolbarPrimary,
-  viewerToolbarMore: consumerViewerToolbarMore,
-
-  searchToolbarPrimary: searchConsumerToolbarPrimary
-};
-
-export const fileFavLocked = {
-  name: `file-${random}-fav-locked.txt`,
-  description: 'file not shared, fav, not office, locked',
-
-  contextMenu: consumerFavContextMenu,
-  toolbarPrimary: consumerToolbarPrimary,
-  toolbarMore: consumerFavToolbarMore,
-  viewerToolbarPrimary: consumerViewerToolbarPrimary,
-  viewerToolbarMore: consumerViewerFavToolbarMore,
-
-  favoritesToolbarMore: favoritesConsumerToolbarMore,
-  favoritesContextMenu: favoritesConsumerContextMenu,
-
-  searchToolbarPrimary: searchConsumerToolbarPrimary
-};
-
-export const fileSharedLocked = {
-  name: `file-${random}-shared-locked.txt`,
-  description: 'file shared, not fav, not office, locked',
-
-  contextMenu: consumerSharedContextMenu,
-  toolbarPrimary: consumerSharedToolbarPrimary,
-  toolbarMore: consumerToolbarMore,
-  viewerToolbarPrimary: consumerViewerSharedToolbarPrimary,
-  viewerToolbarMore: consumerViewerToolbarMore,
-
-  sharedToolbarMore: sharedConsumerLockedToolbarMore,
-  sharedContextMenu: sharedConsumerLockedContextMenu,
-
-  searchToolbarPrimary: searchConsumerSharedToolbarPrimary
-};
-
-export const fileSharedFavLocked = {
-  name: `file-${random}-shared-fav-locked.txt`,
-  description: 'file shared, fav, not office, locked',
-
-  contextMenu: consumerSharedFavContextMenu,
-  toolbarPrimary: consumerSharedToolbarPrimary,
-  toolbarMore: consumerFavToolbarMore,
-  viewerToolbarPrimary: consumerViewerSharedToolbarPrimary,
-  viewerToolbarMore: consumerViewerFavToolbarMore,
-
-  favoritesToolbarMore: favoritesConsumerToolbarMore,
-  favoritesContextMenu: favoritesConsumerSharedContextMenu,
-
-  sharedToolbarMore: sharedConsumerFavLockedToolbarMore,
-  sharedContextMenu: sharedConsumerFavLockedContextMenu,
-
-  searchToolbarPrimary: searchConsumerSharedToolbarPrimary
-};
-
-export const fileGranularPermission = `file-${random}-granular.txt`;
-export const fileLockedByUser = `file-${random}-my-locked.txt`;
-
-// ---- folders ---
-
-const consumerFolderContextMenu = ['Download', 'Favorite', 'Copy'];
-const consumerFolderToolbarPrimary = ['Download', 'View Details', 'More Actions'];
-const consumerFolderToolbarMore = ['Favorite', 'Copy'];
-const searchConsumerFolderToolbarPrimary = ['Download', 'View Details', 'More Actions'];
-const consumerFolderFavContextMenu = ['Download', 'Remove Favorite', 'Copy'];
-const consumerFolderFavToolbarMore = ['Remove Favorite', 'Copy'];
-
-// ---- FAVORITES workarounds ----
-
-// TODO: remove 'Edit', 'Move' and 'Delete' when ACA-1737 is done
-const favoritesConsumerFolderContextMenu = ['Download', 'Edit', 'Remove Favorite', 'Move', 'Copy', 'Delete'];
-// TODO: remove 'Edit', 'Move' and 'Delete' when ACA-1737 is done
-const favoritesConsumerFolderToolbarMore = ['Edit', 'Remove Favorite', 'Move', 'Copy', 'Delete'];
-
-export const folder = {
-  name: `folder-${random}`,
-  description: 'folder not favorite',
-  contextMenu: consumerFolderContextMenu,
-  toolbarPrimary: consumerFolderToolbarPrimary,
-  toolbarMore: consumerFolderToolbarMore,
-
-  searchToolbarPrimary: searchConsumerFolderToolbarPrimary
-};
-
-export const folderFav = {
-  name: `folder-fav-${random}`,
-  description: 'folder favorite',
-  contextMenu: consumerFolderFavContextMenu,
-  toolbarPrimary: consumerFolderToolbarPrimary,
-  toolbarMore: consumerFolderFavToolbarMore,
-
-  favoritesContextMenu: favoritesConsumerFolderContextMenu,
-  favoritesToolbarMore: favoritesConsumerFolderToolbarMore,
-
-  searchToolbarPrimary: searchConsumerFolderToolbarPrimary
-};
-
-export const folderFav2 = {
-  name: `folder-fav-2-${random}`,
-  description: 'folder 2 favorite'
-};
-
-// ---- multiple selection ---
-
-const multipleSelContextMenu = ['Download', 'Favorite', 'Copy'];
-const multipleSelAllFavContextMenu = ['Download', 'Remove Favorite', 'Copy'];
-const multipleSelToolbarPrimary = ['Download', 'View Details', 'More Actions'];
-const multipleSelToolbarMore = ['Favorite', 'Copy'];
-const multipleSelAllFavToolbarMore = ['Remove Favorite', 'Copy'];
-const searchMultipleSelToolbarPrimary = ['Download', 'View Details', 'More Actions'];
-
-// ---- FAVORITES workarounds ----
-
-// TODO: remove 'Move' and 'Delete' when ACA-1737 is done
-const favoritesMultipleSelContextMenu = ['Download', 'Favorite', 'Move', 'Copy', 'Delete'];
-// TODO: remove 'Move' and 'Delete' when ACA-1737 is done
-const favoritesMultipleSelToolbarMore = ['Favorite', 'Move', 'Copy', 'Delete'];
-// TODO: remove 'Move' and 'Delete' when ACA-1737 is done
-const favoritesMultipleSelAllFavContextMenu = ['Download', 'Remove Favorite', 'Move', 'Copy', 'Delete'];
-// TODO: remove 'Move' and 'Delete' when ACA-1737 is done
-const favoritesMultipleSelAllFavToolbarMore = ['Remove Favorite', 'Move', 'Copy', 'Delete'];
-
-export const multipleSel = {
-  contextMenu: multipleSelContextMenu,
-  toolbarPrimary: multipleSelToolbarPrimary,
-  toolbarMore: multipleSelToolbarMore,
-
-  favoritesContextMenu: favoritesMultipleSelContextMenu,
-  favoritesToolbarMore: favoritesMultipleSelToolbarMore,
-
-  searchToolbarPrimary: searchMultipleSelToolbarPrimary
-};
-
-export const multipleSelAllFav = {
-  contextMenu: multipleSelAllFavContextMenu,
-  toolbarPrimary: multipleSelToolbarPrimary,
-  toolbarMore: multipleSelAllFavToolbarMore,
-
-  favoritesContextMenu: favoritesMultipleSelAllFavContextMenu,
-  favoritesToolbarMore: favoritesMultipleSelAllFavToolbarMore,
-
-  searchToolbarPrimary: searchMultipleSelToolbarPrimary
-};
diff --git a/e2e/protractor/suites/actions-available/special-permissions/viewer.ts b/e2e/protractor/suites/actions-available/special-permissions/viewer.ts
deleted file mode 100755
index 4786467b68..0000000000
--- a/e2e/protractor/suites/actions-available/special-permissions/viewer.ts
+++ /dev/null
@@ -1,314 +0,0 @@
-/*!
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Alfresco Example Content Application
- *
- * This file is part of the Alfresco Example Content Application.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The Alfresco Example Content Application is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import { BrowsingPage, SearchResultsPage, Utils } from '@alfresco/aca-testing-shared';
-import * as testData from './test-data-permissions';
-import * as testUtil from '../test-util';
-
-export function viewerTests(siteName?: string) {
-  const page = new BrowsingPage();
-  const searchResultsPage = new SearchResultsPage();
-  const { dataTable, toolbar } = page;
-  const { searchInput } = page.pageLayoutHeader;
-
-  describe('available actions : ', () => {
-    beforeEach(async () => {
-      await Utils.pressEscape();
-    });
-
-    afterEach(async () => {
-      await page.closeOpenDialogs();
-    });
-
-    describe('file opened from File Libraries', () => {
-      beforeAll(async () => {
-        await page.goToMyLibrariesAndWait();
-        await dataTable.doubleClickOnRowByName(siteName);
-        await dataTable.waitForHeader();
-      });
-
-      it('File Office - [C326622]', async () => {
-        await testUtil.checkViewerActions(testData.fileDocx.name, testData.fileDocx.viewerToolbarPrimary, testData.fileDocx.viewerToolbarMore);
-      });
-
-      it('File Office, favorite - [C326623]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileDocxFav.name,
-          testData.fileDocxFav.viewerToolbarPrimary,
-          testData.fileDocxFav.viewerToolbarMore
-        );
-      });
-
-      it('File simple - [C326624]', async () => {
-        await testUtil.checkViewerActions(testData.file.name, testData.file.viewerToolbarPrimary, testData.file.viewerToolbarMore);
-      });
-
-      it('File favorite - [C326625]', async () => {
-        await testUtil.checkViewerActions(testData.fileFav.name, testData.fileFav.viewerToolbarPrimary, testData.fileFav.viewerToolbarMore);
-      });
-
-      it('File Office, shared - [C326637]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileDocxShared.name,
-          testData.fileDocxShared.viewerToolbarPrimary,
-          testData.fileDocxShared.viewerToolbarMore
-        );
-      });
-
-      it('File Office, shared, favorite - [C326638]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileDocxSharedFav.name,
-          testData.fileDocxSharedFav.viewerToolbarPrimary,
-          testData.fileDocxSharedFav.viewerToolbarMore
-        );
-      });
-
-      it('File shared - [C326648]', async () => {
-        await testUtil.checkViewerActions(testData.fileShared.name, testData.fileShared.viewerToolbarPrimary, testData.fileShared.viewerToolbarMore);
-      });
-
-      it('File shared, favorite - [C326649]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileSharedFav.name,
-          testData.fileSharedFav.viewerToolbarPrimary,
-          testData.fileSharedFav.viewerToolbarMore
-        );
-      });
-
-      it('File locked - [C326630]', async () => {
-        await testUtil.checkViewerActions(testData.fileLocked.name, testData.fileLocked.viewerToolbarPrimary, testData.fileLocked.viewerToolbarMore);
-      });
-
-      it('File favorite, locked - [C326633]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileFavLocked.name,
-          testData.fileFavLocked.viewerToolbarPrimary,
-          testData.fileFavLocked.viewerToolbarMore
-        );
-      });
-
-      it('File shared, locked - [C326650]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileSharedLocked.name,
-          testData.fileSharedLocked.viewerToolbarPrimary,
-          testData.fileSharedLocked.viewerToolbarMore
-        );
-      });
-
-      it('File shared, favorite, locked - [C326651]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileSharedFavLocked.name,
-          testData.fileSharedFavLocked.viewerToolbarPrimary,
-          testData.fileSharedFavLocked.viewerToolbarMore
-        );
-      });
-    });
-
-    describe('file opened from Favorites', () => {
-      beforeAll(async () => {
-        await page.clickFavoritesAndWait();
-      });
-
-      it('File Office, favorite - [C326652]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileDocxFav.name,
-          testData.fileDocxFav.viewerToolbarPrimary,
-          testData.fileDocxFav.viewerToolbarMore
-        );
-      });
-
-      it('File favorite - [C326653]', async () => {
-        await testUtil.checkViewerActions(testData.fileFav.name, testData.fileFav.viewerToolbarPrimary, testData.fileFav.viewerToolbarMore);
-      });
-
-      it('File Office, shared, favorite - [C326655]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileDocxSharedFav.name,
-          testData.fileDocxSharedFav.viewerToolbarPrimary,
-          testData.fileDocxSharedFav.viewerToolbarMore
-        );
-      });
-
-      it('File shared, favorite - [C326656]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileSharedFav.name,
-          testData.fileSharedFav.viewerToolbarPrimary,
-          testData.fileSharedFav.viewerToolbarMore
-        );
-      });
-
-      it('File favorite, locked - [C326654]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileFavLocked.name,
-          testData.fileFavLocked.viewerToolbarPrimary,
-          testData.fileFavLocked.viewerToolbarMore
-        );
-      });
-
-      it('File shared, favorite, locked - [C326657]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileSharedFavLocked.name,
-          testData.fileSharedFavLocked.viewerToolbarPrimary,
-          testData.fileSharedFavLocked.viewerToolbarMore
-        );
-      });
-    });
-
-    describe('file opened from Shared Files', () => {
-      beforeAll(async () => {
-        await page.clickSharedFilesAndWait();
-      });
-
-      it('File Office, shared - [C326658]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileDocxShared.name,
-          testData.fileDocxShared.viewerToolbarPrimary,
-          testData.fileDocxShared.viewerToolbarMore
-        );
-      });
-
-      it('File Office, shared, favorite - [C326659]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileDocxSharedFav.name,
-          testData.fileDocxSharedFav.viewerToolbarPrimary,
-          testData.fileDocxSharedFav.viewerToolbarMore
-        );
-      });
-
-      it('File shared - [C326660]', async () => {
-        await testUtil.checkViewerActions(testData.fileShared.name, testData.fileShared.viewerToolbarPrimary, testData.fileShared.viewerToolbarMore);
-      });
-
-      it('File shared, favorite - [C326661]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileSharedFav.name,
-          testData.fileSharedFav.viewerToolbarPrimary,
-          testData.fileSharedFav.viewerToolbarMore
-        );
-      });
-
-      it('File shared, locked - [C326662]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileSharedLocked.name,
-          testData.fileSharedLocked.viewerToolbarPrimary,
-          testData.fileSharedLocked.viewerToolbarMore
-        );
-      });
-
-      it('File shared, favorite, locked - [C326663]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileSharedFavLocked.name,
-          testData.fileSharedFavLocked.viewerToolbarPrimary,
-          testData.fileSharedFavLocked.viewerToolbarMore
-        );
-      });
-    });
-
-    describe('file opened from Search Results', () => {
-      beforeAll(async () => {
-        await toolbar.clickSearchIconButton();
-        await searchInput.clickSearchButton();
-        await searchInput.checkOnlyFiles();
-        await searchInput.searchFor(`*${testData.random}`);
-        await searchResultsPage.waitForResults();
-      });
-
-      it('File Office - [C326664]', async () => {
-        await testUtil.checkViewerActions(testData.fileDocx.name, testData.fileDocx.viewerToolbarPrimary, testData.fileDocx.viewerToolbarMore);
-      });
-
-      it('File Office, favorite - [C326665]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileDocxFav.name,
-          testData.fileDocxFav.viewerToolbarPrimary,
-          testData.fileDocxFav.viewerToolbarMore
-        );
-      });
-
-      it('File simple - [C326666]', async () => {
-        await testUtil.checkViewerActions(testData.file.name, testData.file.viewerToolbarPrimary, testData.file.viewerToolbarMore);
-      });
-
-      it('File favorite - [C326667]', async () => {
-        await testUtil.checkViewerActions(testData.fileFav.name, testData.fileFav.viewerToolbarPrimary, testData.fileFav.viewerToolbarMore);
-      });
-
-      it('File Office, shared - [C326670]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileDocxShared.name,
-          testData.fileDocxShared.viewerToolbarPrimary,
-          testData.fileDocxShared.viewerToolbarMore
-        );
-      });
-
-      it('File Office, shared, favorite - [C326671]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileDocxSharedFav.name,
-          testData.fileDocxSharedFav.viewerToolbarPrimary,
-          testData.fileDocxSharedFav.viewerToolbarMore
-        );
-      });
-
-      it('File shared - [C326672]', async () => {
-        await testUtil.checkViewerActions(testData.fileShared.name, testData.fileShared.viewerToolbarPrimary, testData.fileShared.viewerToolbarMore);
-      });
-
-      it('File shared, favorite - [C326673]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileSharedFav.name,
-          testData.fileSharedFav.viewerToolbarPrimary,
-          testData.fileSharedFav.viewerToolbarMore
-        );
-      });
-
-      it('File locked - [C326668]', async () => {
-        await testUtil.checkViewerActions(testData.fileLocked.name, testData.fileLocked.viewerToolbarPrimary, testData.fileLocked.viewerToolbarMore);
-      });
-
-      it('File favorite, locked - [C326669]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileFavLocked.name,
-          testData.fileFavLocked.viewerToolbarPrimary,
-          testData.fileFavLocked.viewerToolbarMore
-        );
-      });
-
-      it('File shared, locked - [C326674]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileSharedLocked.name,
-          testData.fileSharedLocked.viewerToolbarPrimary,
-          testData.fileSharedLocked.viewerToolbarMore
-        );
-      });
-
-      it('File shared, favorite, locked - [C326675]', async () => {
-        await testUtil.checkViewerActions(
-          testData.fileSharedFavLocked.name,
-          testData.fileSharedFavLocked.viewerToolbarPrimary,
-          testData.fileSharedFavLocked.viewerToolbarMore
-        );
-      });
-    });
-  });
-}
diff --git a/e2e/protractor/suites/actions-available/test-util.ts b/e2e/protractor/suites/actions-available/test-util.ts
deleted file mode 100644
index a31b3f8032..0000000000
--- a/e2e/protractor/suites/actions-available/test-util.ts
+++ /dev/null
@@ -1,145 +0,0 @@
-/*!
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Alfresco Example Content Application
- *
- * This file is part of the Alfresco Example Content Application.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The Alfresco Example Content Application is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import { BrowsingPage, Viewer, Utils, Menu } from '@alfresco/aca-testing-shared';
-import { BrowserActions } from '@alfresco/adf-testing';
-
-const page = new BrowsingPage();
-const { dataTable, toolbar } = page;
-const contextMenu = dataTable.menu;
-const viewer = new Viewer();
-const viewerToolbar = viewer.toolbar;
-const menu = new Menu();
-
-export async function checkContextMenu(item: string, expectedContextMenu: string[]): Promise<void> {
-  await dataTable.rightClickOnItem(item);
-  await contextMenu.waitForMenuToOpen();
-
-  const actualActions = await contextMenu.getMenuItems();
-  for (const action of expectedContextMenu) {
-    expect(actualActions.includes(action)).toBe(true, `Expected to contain ${action}`);
-  }
-
-  await Utils.pressEscape();
-  await menu.waitForMenuToClose();
-}
-
-export async function checkToolbarPrimary(item: string, expectedToolbarPrimary: string[]): Promise<void> {
-  await dataTable.selectItem(item);
-
-  const actualPrimaryActions = await toolbar.getButtons();
-  for (const action of expectedToolbarPrimary) {
-    expect(actualPrimaryActions.includes(action)).toBe(true, `Expected to contain ${action}`);
-  }
-}
-
-export async function checkToolbarActions(item: string, expectedToolbarPrimary: string[], expectedToolbarMore: string[]): Promise<void> {
-  await dataTable.selectItem(item);
-
-  const actualPrimaryActions = await toolbar.getButtons();
-  for (const action of expectedToolbarPrimary) {
-    expect(actualPrimaryActions.includes(action)).toBe(true, `Expected to contain ${action}`);
-  }
-
-  await toolbar.openMoreMenu();
-
-  const actualMoreActions = await toolbar.menu.getMenuItems();
-  for (const action of expectedToolbarMore) {
-    expect(actualMoreActions.includes(action)).toBe(true, `Expected to contain ${action}`);
-  }
-
-  await toolbar.closeMoreMenu();
-}
-
-export async function checkMultipleSelContextMenu(items: string[], expectedContextMenu: string[]): Promise<void> {
-  await dataTable.selectMultipleItems(items);
-  await dataTable.rightClickOnMultipleSelection();
-  await contextMenu.waitForMenuToOpen();
-
-  const actualActions = await contextMenu.getMenuItems();
-  for (const action of expectedContextMenu) {
-    expect(actualActions.includes(action)).toBe(true, `Expected to contain ${action}`);
-  }
-
-  await Utils.pressEscape();
-  await menu.waitForMenuToClose();
-}
-
-export async function checkMultipleSelToolbarPrimary(items: string[], expectedToolbarPrimary: string[]): Promise<void> {
-  await dataTable.selectMultipleItems(items);
-
-  const actualPrimaryActions = await toolbar.getButtons();
-  for (const action of expectedToolbarPrimary) {
-    expect(actualPrimaryActions.includes(action)).toBe(true, `Expected to contain ${action}`);
-  }
-}
-
-export async function checkMultipleSelToolbarActions(
-  items: string[],
-  expectedToolbarPrimary: string[],
-  expectedToolbarMore: string[]
-): Promise<void> {
-  await dataTable.selectMultipleItems(items);
-
-  const actualPrimaryActions = await toolbar.getButtons();
-  for (const action of expectedToolbarPrimary) {
-    expect(actualPrimaryActions.includes(action)).toBe(true, `Expected to contain ${action}`);
-  }
-
-  await toolbar.openMoreMenu();
-
-  const actualMoreActions = await toolbar.menu.getMenuItems();
-  for (const action of expectedToolbarMore) {
-    expect(actualMoreActions.includes(action)).toBe(true, `Expected to contain ${action}`);
-  }
-
-  await toolbar.closeMoreMenu();
-}
-
-export async function checkViewerActions(item: string, expectedToolbarPrimary: string[], expectedToolbarMore: string[]): Promise<void> {
-  await dataTable.selectItem(item);
-  await BrowserActions.click(toolbar.viewButton);
-  await viewer.waitForViewerToOpen();
-
-  let actualPrimaryActions = await viewerToolbar.getButtons();
-  actualPrimaryActions = removeClosePreviousNextOldInfo(actualPrimaryActions);
-
-  for (const action of expectedToolbarPrimary) {
-    expect(actualPrimaryActions.includes(action)).toBe(true, `Expected to contain ${action}`);
-  }
-
-  await viewerToolbar.openMoreMenu();
-
-  const actualMoreActions = await viewerToolbar.menu.getMenuItems();
-  for (const action of expectedToolbarMore) {
-    expect(actualMoreActions.includes(action)).toBe(true, `Expected to contain ${action}`);
-  }
-
-  await Utils.pressEscape();
-  await menu.waitForMenuToClose();
-}
-
-const toRemove = ['Close', 'Previous File', 'Next File', 'View details'];
-
-const removeClosePreviousNextOldInfo = (actions: string[]): string[] => actions.filter((elem) => !toRemove.includes(elem));
diff --git a/e2e/protractor/suites/actions/library/library-actions.test.ts b/e2e/protractor/suites/actions/library/library-actions.test.ts
deleted file mode 100755
index 588b18afaa..0000000000
--- a/e2e/protractor/suites/actions/library/library-actions.test.ts
+++ /dev/null
@@ -1,429 +0,0 @@
-/*!
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Alfresco Example Content Application
- *
- * This file is part of the Alfresco Example Content Application.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The Alfresco Example Content Application is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import { AdminActions, SITE_VISIBILITY, SITE_ROLES, LoginPage, BrowsingPage, Utils, ConfirmDialog, RepoClient } from '@alfresco/aca-testing-shared';
-import { BrowserActions } from '@alfresco/adf-testing';
-
-describe('Library actions', () => {
-  const username = `user-${Utils.random()}`;
-
-  const sitePublic1Admin = `admin-public1-${Utils.random()}`;
-  const sitePublic2Admin = `admin-public2-${Utils.random()}`;
-  const sitePublic3Admin = `admin-public3-${Utils.random()}`;
-  const sitePublic4Admin = `admin-public4-${Utils.random()}`;
-  const sitePublic5Admin = `admin-public5-${Utils.random()}`;
-  const sitePublic6Admin = `admin-public6-${Utils.random()}`;
-  const sitePublic7Admin = `admin-public7-${Utils.random()}`;
-  const sitePublic8Admin = `admin-public8-${Utils.random()}`;
-
-  const sitePublicUser = `user-public1-${Utils.random()}`;
-  const siteForDelete1 = `user-public2-${Utils.random()}`;
-  const siteForDelete2 = `user-public3-${Utils.random()}`;
-
-  const siteModerated1Admin = `admin-moderated1-${Utils.random()}`;
-  const siteModerated2Admin = `admin-moderated2-${Utils.random()}`;
-
-  const siteSearchModerated1Admin = `site-moderated-search-1-${Utils.random()}`;
-  const siteSearchModerated2Admin = `site-moderated-search-2-${Utils.random()}`;
-
-  const siteSearchPublic1Admin = `site-public-search-1-${Utils.random()}`;
-  const siteSearchPublic2Admin = `site-public-search-2-${Utils.random()}`;
-  const siteSearchPublic3Admin = `site-public-search-3-${Utils.random()}`;
-  const siteSearchPublic4Admin = `site-public-search-4-${Utils.random()}`;
-  const siteSearchForDelete = `site-public-search-5-${Utils.random()}`;
-
-  const apis = {
-    user: new RepoClient(username, username)
-  };
-
-  const loginPage = new LoginPage();
-  const page = new BrowsingPage();
-  const { dataTable, toolbar } = page;
-  const { searchInput } = page.pageLayoutHeader;
-
-  const confirmDialog = new ConfirmDialog();
-  const adminApiActions = new AdminActions();
-
-  const publicAdminSites = [siteSearchPublic1Admin, siteSearchPublic2Admin, siteSearchPublic3Admin, siteSearchPublic4Admin];
-  const moderatedSites = [siteSearchModerated1Admin, siteSearchModerated2Admin];
-
-  beforeAll(async () => {
-    await adminApiActions.createUser({ username });
-
-    await adminApiActions.sites.createSites(publicAdminSites);
-    await adminApiActions.sites.createSites(moderatedSites, SITE_VISIBILITY.MODERATED);
-
-    await loginPage.loginWith(username);
-  });
-
-  beforeEach(async () => {
-    await Utils.pressEscape();
-  });
-
-  afterEach(async () => {
-    await Utils.pressEscape();
-    await page.header.expandSideNav();
-    await page.clickPersonalFiles();
-  });
-
-  afterAll(async () => {
-    await adminApiActions.login();
-    await adminApiActions.deleteSites([...publicAdminSites, ...moderatedSites]);
-  });
-
-  describe('Join a public library', () => {
-    beforeAll(async () => {
-      await adminApiActions.sites.createSite(sitePublic1Admin);
-      await apis.user.favorites.addFavoriteById('site', sitePublic1Admin);
-    });
-
-    afterAll(async () => {
-      await adminApiActions.sites.deleteSite(sitePublic1Admin);
-    });
-
-    it('[C290105] from Favorite Libraries', async () => {
-      await page.goToFavoriteLibrariesAndWait();
-      await dataTable.selectItem(sitePublic1Admin);
-      await BrowserActions.click(toolbar.joinButton);
-
-      expect(await dataTable.getLibraryRole(sitePublic1Admin)).toEqual(SITE_ROLES.SITE_CONSUMER.LABEL);
-    });
-
-    it('[C306959] from Search Results', async () => {
-      await toolbar.clickSearchIconButton();
-      await searchInput.clickSearchButton();
-      await searchInput.checkLibraries();
-      await searchInput.searchForLibrary(siteSearchPublic1Admin);
-      await dataTable.waitForBody();
-      await dataTable.selectItem(siteSearchPublic1Admin);
-      await BrowserActions.click(toolbar.joinButton);
-
-      expect(await dataTable.getLibraryRole(siteSearchPublic1Admin)).toEqual(SITE_ROLES.SITE_CONSUMER.LABEL);
-    });
-  });
-
-  describe('Join a moderated library', () => {
-    beforeAll(async () => {
-      await adminApiActions.sites.createSite(siteModerated1Admin, SITE_VISIBILITY.MODERATED);
-      await apis.user.favorites.addFavoriteById('site', siteModerated1Admin);
-      await apis.user.queries.waitForSites(siteSearchModerated1Admin, { expect: 1 });
-    });
-
-    afterAll(async () => {
-      await adminApiActions.sites.deleteSite(siteModerated1Admin);
-    });
-
-    it('[C290109] from Favorite Libraries', async () => {
-      await page.goToFavoriteLibrariesAndWait();
-      await dataTable.selectItem(siteModerated1Admin);
-      await BrowserActions.click(toolbar.joinButton);
-
-      expect(await dataTable.getLibraryRole(siteModerated1Admin)).toEqual(SITE_ROLES.NONE.LABEL);
-      const hasJoinRequest = await apis.user.sites.hasMembershipRequest(siteModerated1Admin);
-      expect(hasJoinRequest).toBe(true, `Join request does not exist on ${siteModerated1Admin}`);
-    });
-
-    it('[C306960] from Search Results', async () => {
-      await toolbar.clickSearchIconButton();
-      await searchInput.clickSearchButton();
-      await searchInput.checkLibraries();
-      await searchInput.searchForLibrary(siteSearchModerated1Admin);
-      await dataTable.waitForBody();
-      await dataTable.selectItem(siteSearchModerated1Admin);
-      await BrowserActions.click(toolbar.joinButton);
-
-      expect(await dataTable.getLibraryRole(siteSearchModerated1Admin)).toEqual(SITE_ROLES.NONE.LABEL);
-      const hasJoinRequest = await apis.user.sites.hasMembershipRequest(siteSearchModerated1Admin);
-      expect(hasJoinRequest).toBe(true, `Join request does not exist on ${siteSearchModerated1Admin}`);
-    });
-  });
-
-  describe('Leave a library', () => {
-    const adminSites = [sitePublic2Admin, sitePublic3Admin, sitePublic4Admin, sitePublic5Admin];
-    const userSites = [sitePublicUser];
-
-    beforeAll(async () => {
-      await adminApiActions.sites.createSites(adminSites);
-      await apis.user.sites.createSites(userSites);
-
-      await apis.user.favorites.addFavoriteById('site', sitePublic3Admin);
-      await adminApiActions.sites.addSiteMember(sitePublic2Admin, username, SITE_ROLES.SITE_COLLABORATOR.ROLE);
-      await adminApiActions.sites.addSiteMember(sitePublic3Admin, username, SITE_ROLES.SITE_MANAGER.ROLE);
-      await adminApiActions.sites.addSiteMember(siteSearchPublic2Admin, username, SITE_ROLES.SITE_CONTRIBUTOR.ROLE);
-      await adminApiActions.sites.addSiteMember(sitePublic4Admin, username, SITE_ROLES.SITE_MANAGER.ROLE);
-      await adminApiActions.sites.addSiteMember(sitePublic5Admin, username, SITE_ROLES.SITE_MANAGER.ROLE);
-      await apis.user.queries.waitForSites(siteSearchPublic2Admin, { expect: 1 });
-    });
-
-    afterAll(async () => {
-      await adminApiActions.deleteSites(adminSites);
-      await apis.user.sites.deleteSites(userSites);
-    });
-
-    it('[C290106] from My Libraries', async () => {
-      await page.goToMyLibrariesAndWait();
-      await dataTable.selectItem(sitePublic2Admin);
-      await BrowserActions.click(toolbar.leaveButton);
-      await page.waitForDialog();
-      await BrowserActions.click(confirmDialog.okButton);
-
-      expect(await page.getSnackBarMessage()).toEqual(`You have left the library`);
-      expect(await dataTable.isItemPresent(sitePublic2Admin)).toBe(false, `${sitePublic2Admin} is displayed`);
-    });
-
-    it('[C290110] from Favorite Libraries', async () => {
-      await page.goToFavoriteLibrariesAndWait();
-      await dataTable.selectItem(sitePublic3Admin);
-      await BrowserActions.click(toolbar.leaveButton);
-      await page.waitForDialog();
-      await BrowserActions.click(confirmDialog.okButton);
-
-      expect(await page.getSnackBarMessage()).toEqual(`You have left the library`);
-      expect(await dataTable.isItemPresent(sitePublic3Admin)).toBe(true, `${sitePublic3Admin} is not displayed`);
-    });
-
-    it('[C306961] from Search Results', async () => {
-      await toolbar.clickSearchIconButton();
-      await searchInput.clickSearchButton();
-      await searchInput.checkLibraries();
-      await searchInput.searchForLibrary(siteSearchPublic2Admin);
-      await dataTable.waitForBody();
-
-      await dataTable.selectItem(siteSearchPublic2Admin);
-      await BrowserActions.click(toolbar.leaveButton);
-      await page.waitForDialog();
-      await BrowserActions.click(confirmDialog.okButton);
-
-      expect(await page.getSnackBarMessage()).toEqual(`You have left the library`);
-      expect(await dataTable.isItemPresent(siteSearchPublic2Admin)).toBe(true, `${siteSearchPublic2Admin} is not displayed`);
-    });
-
-    it('[C290136] Confirmation dialog UI', async () => {
-      await page.goToMyLibrariesAndWait();
-      await dataTable.selectItem(sitePublic4Admin);
-      await BrowserActions.click(toolbar.leaveButton);
-      await page.waitForDialog();
-
-      expect(await confirmDialog.isDialogOpen()).toBe(true, 'Confirm delete dialog not open');
-      expect(await confirmDialog.getDialogTitle()).toContain('Leave this library?');
-      expect(await confirmDialog.getText()).toContain('Leaving will remove your access.');
-      expect(await confirmDialog.isOkEnabled()).toBe(true, 'OK button is not enabled');
-      expect(await confirmDialog.isCancelEnabled()).toBe(true, 'Cancel button is not enabled');
-    });
-
-    it('[C290111] Cancel Leave Library', async () => {
-      await page.goToMyLibrariesAndWait();
-      await dataTable.selectItem(sitePublic5Admin);
-      await BrowserActions.click(toolbar.leaveButton);
-      await page.waitForDialog();
-
-      expect(await confirmDialog.isCancelEnabled()).toBe(true, 'Cancel button is not enabled');
-      await BrowserActions.click(confirmDialog.cancelButton);
-
-      expect(await dataTable.isItemPresent(sitePublic5Admin)).toBe(true, `${sitePublic5Admin} was deleted`);
-    });
-
-    it('[C290107] Leave a library - failure notification', async () => {
-      await page.goToMyLibrariesAndWait();
-      await dataTable.selectItem(sitePublicUser);
-      await BrowserActions.click(toolbar.leaveButton);
-      await page.waitForDialog();
-      await BrowserActions.click(confirmDialog.okButton);
-
-      expect(await page.getSnackBarMessage()).toEqual(`Cannot leave this library`);
-    });
-  });
-
-  describe('Cancel join', () => {
-    beforeAll(async () => {
-      await adminApiActions.sites.createSite(siteModerated2Admin, SITE_VISIBILITY.MODERATED);
-      await apis.user.favorites.addFavoriteById('site', siteModerated2Admin);
-      await apis.user.sites.requestToJoin(siteModerated2Admin);
-      await apis.user.sites.requestToJoin(siteSearchModerated2Admin);
-      await apis.user.queries.waitForSites(siteSearchModerated2Admin, { expect: 1 });
-    });
-
-    afterAll(async () => {
-      await adminApiActions.sites.deleteSite(siteModerated2Admin);
-    });
-
-    it('[C290108] from Favorite Libraries', async () => {
-      await page.goToFavoriteLibrariesAndWait();
-      await dataTable.selectItem(siteModerated2Admin);
-      await toolbar.clickButton('Cancel Join Request');
-
-      expect(await page.getSnackBarMessage()).toEqual(`Canceled the request to join the library`);
-
-      const hasJoinRequest = await apis.user.sites.hasMembershipRequest(siteModerated2Admin);
-      expect(hasJoinRequest).toBe(false, `Join request exists on ${siteModerated2Admin}`);
-    });
-
-    it('[C306962] from Search Results', async () => {
-      await toolbar.clickSearchIconButton();
-      await searchInput.clickSearchButton();
-      await searchInput.checkLibraries();
-      await searchInput.searchForLibrary(siteSearchModerated2Admin);
-      await dataTable.waitForBody();
-
-      await dataTable.selectItem(siteSearchModerated2Admin);
-      await toolbar.clickButton('Cancel Join Request');
-
-      expect(await page.getSnackBarMessage()).toEqual(`Canceled the request to join the library`);
-
-      const hasJoinRequest = await apis.user.sites.hasMembershipRequest(siteSearchModerated2Admin);
-      expect(hasJoinRequest).toBe(false, `Join request exists on ${siteSearchModerated2Admin}`);
-    });
-  });
-
-  describe('Mark library as favorite', () => {
-    beforeAll(async () => {
-      await adminApiActions.sites.createSite(sitePublic6Admin);
-      await adminApiActions.sites.addSiteMember(sitePublic6Admin, username, SITE_ROLES.SITE_MANAGER.ROLE);
-      await apis.user.queries.waitForSites(siteSearchPublic3Admin, { expect: 1 });
-    });
-
-    afterAll(async () => {
-      await adminApiActions.sites.deleteSite(sitePublic6Admin);
-    });
-
-    it('[C289974] from My Libraries', async () => {
-      await page.goToMyLibrariesAndWait();
-      await dataTable.selectItem(sitePublic6Admin);
-      await toolbar.clickMoreActionsFavorite();
-
-      expect(await apis.user.favorites.isFavoriteWithRetry(sitePublic6Admin, { expect: true })).toBe(true, `${sitePublic6Admin} not favorite`);
-    });
-
-    it('[C306963] from Search Results', async () => {
-      await toolbar.clickSearchIconButton();
-      await searchInput.clickSearchButton();
-      await searchInput.checkLibraries();
-      await searchInput.searchForLibrary(siteSearchPublic3Admin);
-      await dataTable.waitForBody();
-
-      await dataTable.selectItem(siteSearchPublic3Admin);
-      await toolbar.clickMoreActionsFavorite();
-
-      expect(await apis.user.favorites.isFavoriteWithRetry(siteSearchPublic3Admin, { expect: true })).toBe(
-        true,
-        `${siteSearchPublic3Admin} not favorite`
-      );
-    });
-  });
-
-  describe('Remove library from favorites', () => {
-    const adminSites = [sitePublic7Admin, sitePublic8Admin];
-
-    beforeAll(async () => {
-      await adminApiActions.sites.createSites(adminSites);
-
-      await apis.user.favorites.addFavoriteById('site', sitePublic7Admin);
-      await apis.user.favorites.addFavoriteById('site', sitePublic8Admin);
-
-      await apis.user.favorites.addFavoriteById('site', siteSearchPublic4Admin);
-      await adminApiActions.sites.addSiteMember(sitePublic7Admin, username, SITE_ROLES.SITE_MANAGER.ROLE);
-      await adminApiActions.sites.addSiteMember(sitePublic8Admin, username, SITE_ROLES.SITE_MANAGER.ROLE);
-      await adminApiActions.sites.addSiteMember(siteSearchPublic4Admin, username, SITE_ROLES.SITE_MANAGER.ROLE);
-      await apis.user.queries.waitForSites(siteSearchPublic4Admin, { expect: 1 });
-    });
-
-    afterAll(async () => {
-      await adminApiActions.sites.deleteSites(adminSites);
-    });
-
-    it('[C289975] from My Libraries', async () => {
-      await page.goToMyLibrariesAndWait();
-      await dataTable.selectItem(sitePublic7Admin);
-      await toolbar.clickMoreActionsRemoveFavorite();
-
-      expect(await apis.user.favorites.isFavoriteWithRetry(sitePublic7Admin, { expect: false })).toBe(false, `${sitePublic7Admin} still favorite`);
-    });
-
-    it('[C289976] from Favorite Libraries', async () => {
-      await page.goToFavoriteLibrariesAndWait();
-      await dataTable.selectItem(sitePublic8Admin);
-      await toolbar.clickMoreActionsRemoveFavorite();
-
-      expect(await dataTable.isItemPresent(sitePublic8Admin)).toBe(false, `${sitePublic8Admin} is displayed`);
-      expect(await apis.user.favorites.isFavoriteWithRetry(sitePublic8Admin, { expect: false })).toBe(false, `${sitePublic8Admin} still favorite`);
-    });
-
-    it('[C306964] from Search Results', async () => {
-      await toolbar.clickSearchIconButton();
-      await searchInput.clickSearchButton();
-      await searchInput.checkLibraries();
-      await searchInput.searchForLibrary(siteSearchPublic4Admin);
-      await dataTable.waitForBody();
-
-      await dataTable.selectItem(siteSearchPublic4Admin);
-      await toolbar.clickMoreActionsRemoveFavorite();
-
-      expect(await apis.user.favorites.isFavoriteWithRetry(siteSearchPublic4Admin, { expect: false })).toBe(
-        false,
-        `${siteSearchPublic4Admin} still favorite`
-      );
-    });
-  });
-
-  describe('Delete a library', () => {
-    const userSites = [siteForDelete1, siteForDelete2, siteSearchForDelete];
-
-    beforeAll(async () => {
-      await apis.user.sites.createSites(userSites);
-      await apis.user.queries.waitForSites(siteSearchForDelete, { expect: 1 });
-    });
-
-    it('[C289988] from My Libraries', async () => {
-      await page.goToMyLibrariesAndWait();
-      await dataTable.selectItem(siteForDelete1);
-      await toolbar.clickMoreActionsDelete();
-
-      expect(await page.getSnackBarMessage()).toEqual(`Library deleted`);
-      expect(await dataTable.isItemPresent(siteForDelete1)).toBe(false, `${siteForDelete1} still displayed`);
-    });
-
-    it('[C289991] from Favorite Libraries', async () => {
-      await page.goToFavoriteLibrariesAndWait();
-      await dataTable.selectItem(siteForDelete2);
-      await toolbar.clickMoreActionsDelete();
-
-      expect(await page.getSnackBarMessage()).toEqual(`Library deleted`);
-      expect(await dataTable.isItemPresent(siteForDelete2)).toBe(false, `${siteForDelete2} still displayed`);
-    });
-
-    it('[C306965] from Search Results', async () => {
-      await toolbar.clickSearchIconButton();
-      await searchInput.clickSearchButton();
-      await searchInput.checkLibraries();
-      await searchInput.searchForLibrary(siteSearchForDelete);
-      await dataTable.waitForBody();
-
-      await dataTable.selectItem(siteSearchForDelete);
-      await toolbar.clickMoreActionsDelete();
-
-      expect(await page.getSnackBarMessage()).toEqual(`Library deleted`);
-      expect(await dataTable.isItemPresent(siteSearchForDelete)).toBe(false, `${siteSearchForDelete} still displayed`);
-    });
-  });
-});
diff --git a/e2e/protractor/suites/navigation/single-click.test.ts b/e2e/protractor/suites/navigation/single-click.test.ts
deleted file mode 100755
index a91b82fbd8..0000000000
--- a/e2e/protractor/suites/navigation/single-click.test.ts
+++ /dev/null
@@ -1,154 +0,0 @@
-/*!
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Alfresco Example Content Application
- *
- * This file is part of the Alfresco Example Content Application.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The Alfresco Example Content Application is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import { AdminActions, UserActions, LoginPage, BrowsingPage, Viewer, RepoClient, Utils } from '@alfresco/aca-testing-shared';
-
-describe('Single click on item name', () => {
-  const username = `user-${Utils.random()}`;
-
-  const file1 = `file1-${Utils.random()}.txt`;
-  let file1Id: string;
-  const folder1 = `folder1-${Utils.random()}`;
-  let folder1Id: string;
-
-  const deletedFile1 = `file1-${Utils.random()}.txt`;
-  let deletedFile1Id: string;
-  const deletedFolder1 = `folder1-${Utils.random()}`;
-  let deletedFolder1Id: string;
-
-  const siteName = `site-${Utils.random()}`;
-  const fileSite = `fileSite-${Utils.random()}.txt`;
-
-  const apis = {
-    user: new RepoClient(username, username)
-  };
-
-  const loginPage = new LoginPage();
-  const page = new BrowsingPage();
-  const { dataTable, breadcrumb, toolbar } = page;
-  const viewer = new Viewer();
-  const { searchInput } = page.pageLayoutHeader;
-
-  const adminApiActions = new AdminActions();
-  const userActions = new UserActions();
-
-  beforeAll(async () => {
-    await adminApiActions.createUser({ username });
-
-    const initialRecentTotalItems = await apis.user.search.getTotalItems(username);
-
-    file1Id = (await apis.user.nodes.createFile(file1)).entry.id;
-    folder1Id = (await apis.user.nodes.createFolder(folder1)).entry.id;
-
-    await apis.user.sites.createSite(siteName);
-    const docLibId = await apis.user.sites.getDocLibId(siteName);
-    await apis.user.nodes.createFile(fileSite, docLibId);
-
-    await apis.user.search.waitForApi(username, { expect: initialRecentTotalItems + 2 });
-
-    deletedFile1Id = (await apis.user.nodes.createFile(deletedFile1)).entry.id;
-    deletedFolder1Id = (await apis.user.nodes.createFolder(deletedFolder1)).entry.id;
-
-    await userActions.login(username, username);
-    await userActions.deleteNodes([deletedFile1Id, deletedFolder1Id], false);
-
-    await loginPage.loginWith(username);
-  });
-
-  afterAll(async () => {
-    await userActions.login(username, username);
-    await userActions.deleteSites([siteName]);
-    await userActions.deleteNodes([folder1Id, file1Id]);
-    await userActions.emptyTrashcan();
-  });
-
-  describe('on Favorites', () => {
-    beforeAll(async () => {
-      const initialFavoriteTotalItems = await apis.user.favorites.getFavoritesTotalItems();
-      await apis.user.favorites.addFavoriteById('file', file1Id);
-      await apis.user.favorites.addFavoriteById('folder', folder1Id);
-      await apis.user.favorites.waitForApi({ expect: initialFavoriteTotalItems + 2 });
-    });
-
-    beforeEach(async () => {
-      await page.clickFavoritesAndWait();
-    });
-
-    it('[C284909] Hyperlink appears when mouse over a file/folder', async () => {
-      expect(await dataTable.hasLinkOnName(file1)).toBe(true, 'Link on name is missing');
-    });
-
-    it('[C284910] File preview opens when clicking the hyperlink', async () => {
-      await dataTable.clickNameLink(file1);
-
-      expect(await viewer.isViewerOpened()).toBe(true, 'Viewer is not opened');
-
-      await Utils.pressEscape();
-    });
-
-    it('[C284911] Navigate inside the folder when clicking the hyperlink', async () => {
-      await dataTable.clickNameLink(folder1);
-
-      expect(await breadcrumb.currentItem.getText()).toBe(folder1);
-    });
-  });
-
-  describe('on Search Results', () => {
-    beforeEach(async () => {
-      await toolbar.clickSearchIconButton();
-      await searchInput.clickSearchButton();
-      await searchInput.checkFilesAndFolders();
-    });
-
-    afterEach(async () => {
-      await Utils.pressEscape();
-      await page.clickPersonalFilesAndWait();
-    });
-
-    it('[C306988] Hyperlink appears when mouse over a file', async () => {
-      await searchInput.searchFor(file1);
-      await dataTable.waitForBody();
-
-      expect(await dataTable.hasLinkOnSearchResultName(file1)).toBe(true, 'Link on name is missing');
-    });
-
-    it('[C306989] File preview opens when clicking the hyperlink', async () => {
-      await searchInput.searchFor(file1);
-      await dataTable.waitForBody();
-      await dataTable.clickSearchResultNameLink(file1);
-
-      expect(await viewer.isViewerOpened()).toBe(true, 'Viewer is not opened');
-
-      await Utils.pressEscape();
-    });
-
-    it('[C306990] Navigate inside the folder when clicking the hyperlink', async () => {
-      await searchInput.searchFor(folder1);
-      await dataTable.waitForBody();
-      await dataTable.clickSearchResultNameLink(folder1);
-
-      expect(await breadcrumb.currentItem.getText()).toBe(folder1);
-    });
-  });
-});
diff --git a/e2e/protractor/suites/pagination/favorites.ts b/e2e/protractor/suites/pagination/favorites.ts
deleted file mode 100755
index 316fec04b0..0000000000
--- a/e2e/protractor/suites/pagination/favorites.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-/*!
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Alfresco Example Content Application
- *
- * This file is part of the Alfresco Example Content Application.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The Alfresco Example Content Application is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import { BrowsingPage, LoginPage, Utils } from '@alfresco/aca-testing-shared';
-
-export function favoritesTests(username: string) {
-  const page = new BrowsingPage();
-  const loginPage = new LoginPage();
-  const { dataTable, pagination } = page;
-
-  describe('Pagination controls : ', () => {
-    beforeAll(async () => {
-      await loginPage.loginWith(username);
-      await page.clickFavoritesAndWait();
-    });
-
-    afterEach(async () => {
-      await Utils.pressEscape();
-    });
-
-    it('[C280113] Pagination control default values', async () => {
-      expect(await pagination.getRange()).toContain('1-25 of 51');
-      expect(await pagination.getMaxItems()).toContain('25');
-      expect(await pagination.getCurrentPage()).toContain('Page 1');
-      expect(await pagination.getTotalPages()).toContain('of 3');
-      expect(await pagination.isPreviousEnabled()).toBe(false, 'Previous button is enabled');
-      expect(await pagination.isNextEnabled()).toBe(true, 'Next button is not enabled');
-    });
-
-    it('[C280114] Items per page values', async () => {
-      await pagination.openMaxItemsMenu();
-      expect(await pagination.menu.getNthItem(1).getText()).toBe('25');
-      expect(await pagination.menu.getNthItem(2).getText()).toBe('50');
-      expect(await pagination.menu.getNthItem(3).getText()).toBe('100');
-      await pagination.menu.closeMenu();
-    });
-
-    it('[C280115] current page menu items', async () => {
-      await pagination.openMaxItemsMenu();
-      await pagination.menu.clickMenuItem('25');
-      expect(await pagination.getMaxItems()).toContain('25');
-      expect(await pagination.getTotalPages()).toContain('of 3');
-      await pagination.openCurrentPageMenu();
-      expect(await pagination.menu.getItemsCount()).toBe(3);
-      await pagination.menu.closeMenu();
-
-      await pagination.openMaxItemsMenu();
-      await pagination.menu.clickMenuItem('50');
-      expect(await pagination.getMaxItems()).toContain('50');
-      expect(await pagination.getTotalPages()).toContain('of 2');
-      await pagination.openCurrentPageMenu();
-      expect(await pagination.menu.getItemsCount()).toBe(2);
-      await pagination.menu.closeMenu();
-
-      await pagination.openMaxItemsMenu();
-      await pagination.menu.clickMenuItem('100');
-      expect(await pagination.getMaxItems()).toContain('100');
-      expect(await pagination.getTotalPages()).toContain('of 1');
-
-      await pagination.resetToDefaultPageSize();
-    });
-
-    it('[C280116] change the current page from menu', async () => {
-      await pagination.openCurrentPageMenu();
-      await pagination.menu.clickNthItem(3);
-      expect(await pagination.getRange()).toContain('51-51 of 51');
-      expect(await pagination.getCurrentPage()).toContain('Page 3');
-      expect(await pagination.isPreviousEnabled()).toBe(true, 'Previous button is not enabled');
-      expect(await pagination.isNextEnabled()).toBe(false, 'Next button is enabled');
-      expect(await dataTable.isItemPresent('my-file-1')).toBe(true, 'File not found on page');
-
-      await pagination.resetToDefaultPageNumber();
-    });
-
-    it('[C280119] navigate to next and previous pages', async () => {
-      await pagination.clickNext();
-      await dataTable.waitForHeader();
-      expect(await pagination.getRange()).toContain('26-50 of 51');
-      expect(await dataTable.isItemPresent('my-file-21')).toBe(true, 'File not found on page');
-      await pagination.resetToDefaultPageNumber();
-
-      await pagination.openCurrentPageMenu();
-      await pagination.menu.clickNthItem(2);
-      await dataTable.waitForHeader();
-      await pagination.clickPrevious();
-      await dataTable.waitForHeader();
-      expect(await pagination.getRange()).toContain('1-25 of 51');
-      expect(await dataTable.isItemPresent('my-file-50')).toBe(true, 'File not found on page');
-
-      await pagination.resetToDefaultPageNumber();
-    });
-
-    it('[C280117] Previous button is disabled on first page', async () => {
-      expect(await pagination.getCurrentPage()).toContain('Page 1');
-      expect(await pagination.isPreviousEnabled()).toBe(false, 'Previous button is enabled on first page');
-    });
-
-    it('[C280118] Next button is disabled on last page', async () => {
-      await pagination.openCurrentPageMenu();
-      await pagination.menu.clickNthItem(3);
-      expect(await dataTable.getRowsCount()).toBe(1, 'Incorrect number of items on the last page');
-      expect(await pagination.getCurrentPage()).toContain('Page 3');
-      expect(await pagination.isNextEnabled()).toBe(false, 'Next button is enabled on last page');
-    });
-  });
-}
diff --git a/e2e/protractor/suites/pagination/multiple-pages-files.test.ts b/e2e/protractor/suites/pagination/multiple-pages-files.test.ts
index 82e2a8afca..2aee39be8c 100644
--- a/e2e/protractor/suites/pagination/multiple-pages-files.test.ts
+++ b/e2e/protractor/suites/pagination/multiple-pages-files.test.ts
@@ -23,11 +23,9 @@
  */
 
 import { Utils, AdminActions, RepoClient } from '@alfresco/aca-testing-shared';
-import { personalFilesTests } from './personal-files';
 import { recentFilesTests } from './recent-files';
 import { searchResultsTests } from './search-results';
 import { sharedFilesTests } from './shared-files';
-import { favoritesTests } from './favorites';
 
 describe('Pagination on multiple pages : ', () => {
   const random = Utils.random();
@@ -44,7 +42,6 @@ describe('Pagination on multiple pages : ', () => {
   const userApi = new RepoClient(username, username);
   const adminApiActions = new AdminActions();
 
-  let initialFavoritesTotalItems: number;
   let initialSearchTotalItems: number;
 
   beforeAll(async () => {
@@ -55,7 +52,6 @@ describe('Pagination on multiple pages : ', () => {
     parentId = (await userApi.nodes.createFolder(parent)).entry.id;
     filesIds = (await userApi.nodes.createFiles(files, parent)).list.entries.map((entries: any) => entries.entry.id);
 
-    initialFavoritesTotalItems = await userApi.favorites.getFavoritesTotalItems();
     await userApi.shared.shareFilesByIds(filesIds);
     await userApi.favorites.addFavoritesByIds('file', filesIds);
   });
@@ -64,10 +60,6 @@ describe('Pagination on multiple pages : ', () => {
     await userApi.nodes.deleteNodeById(parentId);
   });
 
-  describe('on Personal Files', () => {
-    personalFilesTests(username, parent);
-  });
-
   describe('on Recent Files', () => {
     beforeAll(async () => {
       await userApi.search.waitForApi(username, { expect: initialSearchTotalItems + 51 });
@@ -88,11 +80,4 @@ describe('Pagination on multiple pages : ', () => {
     });
     sharedFilesTests(username);
   });
-
-  describe('on Favorites', () => {
-    beforeAll(async () => {
-      await userApi.favorites.waitForApi({ expect: initialFavoritesTotalItems + 51 });
-    });
-    favoritesTests(username);
-  });
 });
diff --git a/e2e/protractor/suites/pagination/personal-files.ts b/e2e/protractor/suites/pagination/personal-files.ts
deleted file mode 100755
index 078d451a53..0000000000
--- a/e2e/protractor/suites/pagination/personal-files.ts
+++ /dev/null
@@ -1,130 +0,0 @@
-/*!
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Alfresco Example Content Application
- *
- * This file is part of the Alfresco Example Content Application.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The Alfresco Example Content Application is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import { BrowsingPage, LoginPage, Utils } from '@alfresco/aca-testing-shared';
-
-export function personalFilesTests(username: string, parentName: string) {
-  const page = new BrowsingPage();
-  const loginPage = new LoginPage();
-  const { dataTable, pagination } = page;
-
-  describe('Pagination controls : ', () => {
-    beforeAll(async () => {
-      await loginPage.loginWith(username);
-      await page.clickPersonalFilesAndWait();
-      await dataTable.doubleClickOnRowByName(parentName);
-      await dataTable.waitForHeader();
-    });
-
-    afterEach(async () => {
-      await Utils.pressEscape();
-    });
-
-    it('[C280077] Pagination control default values', async () => {
-      expect(await pagination.getRange()).toContain('1-25 of 51');
-      expect(await pagination.getMaxItems()).toContain('25');
-      expect(await pagination.getCurrentPage()).toContain('Page 1');
-      expect(await pagination.getTotalPages()).toContain('of 3');
-      expect(await pagination.isPreviousEnabled()).toBe(false, 'Previous button is enabled');
-      expect(await pagination.isNextEnabled()).toBe(true, 'Next button is not enabled');
-    });
-
-    it('[C280078] Items per page values', async () => {
-      await pagination.openMaxItemsMenu();
-      expect(await pagination.menu.getNthItem(1).getText()).toBe('25');
-      expect(await pagination.menu.getNthItem(2).getText()).toBe('50');
-      expect(await pagination.menu.getNthItem(3).getText()).toBe('100');
-      await pagination.menu.closeMenu();
-    });
-
-    it('[C280079] current page menu items', async () => {
-      await pagination.openMaxItemsMenu();
-      await pagination.menu.clickMenuItem('25');
-      expect(await pagination.getMaxItems()).toContain('25');
-      expect(await pagination.getTotalPages()).toContain('of 3');
-      await pagination.openCurrentPageMenu();
-      expect(await pagination.menu.getItemsCount()).toBe(3);
-      await pagination.menu.closeMenu();
-
-      await pagination.openMaxItemsMenu();
-      await pagination.menu.clickMenuItem('50');
-      expect(await pagination.getMaxItems()).toContain('50');
-      expect(await pagination.getTotalPages()).toContain('of 2');
-      await pagination.openCurrentPageMenu();
-      expect(await pagination.menu.getItemsCount()).toBe(2);
-      await pagination.menu.closeMenu();
-
-      await pagination.openMaxItemsMenu();
-      await pagination.menu.clickMenuItem('100');
-      expect(await pagination.getMaxItems()).toContain('100');
-      expect(await pagination.getTotalPages()).toContain('of 1');
-
-      await pagination.resetToDefaultPageSize();
-    });
-
-    it('[C280080] change the current page from menu', async () => {
-      await pagination.openCurrentPageMenu();
-      await pagination.menu.clickNthItem(3);
-      await dataTable.waitForHeader();
-      expect(await pagination.getRange()).toContain('51-51 of 51');
-      expect(await pagination.getCurrentPage()).toContain('Page 3');
-      expect(await pagination.isPreviousEnabled()).toBe(true, 'Previous button is not enabled');
-      expect(await pagination.isNextEnabled()).toBe(false, 'Next button is enabled');
-      expect(await dataTable.isItemPresent('my-file-9')).toBe(true, 'File not found on page');
-
-      await pagination.resetToDefaultPageNumber();
-    });
-
-    it('[C280083] navigate to next and previous pages', async () => {
-      await pagination.clickNext();
-      await dataTable.waitForHeader();
-      expect(await pagination.getRange()).toContain('26-50 of 51');
-      expect(await dataTable.isItemPresent('my-file-34')).toBe(true, 'my-file-34 not found on page');
-      await pagination.resetToDefaultPageNumber();
-
-      await pagination.openCurrentPageMenu();
-      await pagination.menu.clickNthItem(2);
-      await dataTable.waitForHeader();
-      await pagination.clickPrevious();
-      await dataTable.waitForHeader();
-      expect(await pagination.getRange()).toContain('1-25 of 51');
-      expect(await dataTable.isItemPresent('my-file-15')).toBe(true, 'my-file-15 not found on page');
-
-      await pagination.resetToDefaultPageNumber();
-    });
-
-    it('[C280081] Previous button is disabled on first page', async () => {
-      expect(await pagination.getCurrentPage()).toContain('Page 1');
-      expect(await pagination.isPreviousEnabled()).toBe(false, 'Previous button is enabled on first page');
-    });
-
-    it('[C280082] Next button is disabled on last page', async () => {
-      await pagination.openCurrentPageMenu();
-      await pagination.menu.clickNthItem(3);
-      expect(await dataTable.getRowsCount()).toBe(1, 'Incorrect number of items on the last page');
-      expect(await pagination.getCurrentPage()).toContain('Page 3');
-      expect(await pagination.isNextEnabled()).toBe(false, 'Next button is enabled on last page');
-    });
-  });
-}
diff --git a/package-lock.json b/package-lock.json
index 2667d2678e..6786802be5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,11 +10,11 @@
       "hasInstallScript": true,
       "license": "LGPL-3.0",
       "dependencies": {
-        "@alfresco/adf-content-services": ">=6.6.0-6904949573",
-        "@alfresco/adf-core": ">=6.6.0-6904949573",
-        "@alfresco/adf-extensions": ">=6.6.0-6904949573",
-        "@alfresco/eslint-plugin-eslint-angular": ">=6.6.0-6904949573",
-        "@alfresco/js-api": "7.2.0",
+        "@alfresco/adf-content-services": "6.6.0-7045741448",
+        "@alfresco/adf-core": "6.6.0-7045741448",
+        "@alfresco/adf-extensions": "6.6.0-7045741448",
+        "@alfresco/eslint-plugin-eslint-angular": "6.6.0-7045741448",
+        "@alfresco/js-api": "7.5.0-7045741448",
         "@angular/animations": "14.1.3",
         "@angular/cdk": "14.1.3",
         "@angular/common": "14.1.3",
@@ -42,8 +42,8 @@
         "zone.js": "0.11.8"
       },
       "devDependencies": {
-        "@alfresco/adf-cli": ">=6.6.0-6904949573",
-        "@alfresco/adf-testing": ">=6.6.0-6904949573",
+        "@alfresco/adf-cli": "6.6.0-7045741448",
+        "@alfresco/adf-testing": "6.6.0-7045741448",
         "@angular-devkit/build-angular": "14.2.11",
         "@angular-devkit/core": "14.1.2",
         "@angular-devkit/schematics": "14.1.2",
@@ -110,18 +110,18 @@
       }
     },
     "node_modules/@adobe/css-tools": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.2.0.tgz",
-      "integrity": "sha512-E09FiIft46CmH5Qnjb0wsW54/YQd69LsxeKUOWawmws1XWvyFGURnAChH0mlr7YPFR1ofwvUQfcL0J3lMxXqPA==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.1.tgz",
+      "integrity": "sha512-/62yikz7NLScCGAAST5SHdnjaDJQBDq0M2muyRTpf2VQhw6StBg2ALiu73zSJQ4fMVLA+0uBhBHAle7Wg+2kSg==",
       "dev": true
     },
     "node_modules/@alfresco/adf-cli": {
-      "version": "6.6.0-6904949573",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-6.6.0-6904949573.tgz",
-      "integrity": "sha512-we5DkUUoL0MUYHn/Z4YIztVZExkgDesp0kLUAaPaBWxYbc4Dde1yfXGmDlIZbM3T1U0Resdo9IJ+BhsX9T602Q==",
+      "version": "6.6.0-7045741448",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-6.6.0-7045741448.tgz",
+      "integrity": "sha512-Wzewr1+yjZpmM881osDg+0MvnjngP6n4HTNrHisJpgkswSnJew0b70CbZEwhYzbiXgSuN7SqhVuvMOa7QkOybA==",
       "dev": true,
       "dependencies": {
-        "@alfresco/js-api": ">=7.2.0",
+        "@alfresco/js-api": ">=7.5.0-7045741448",
         "commander": "^6.2.1",
         "ejs": "^3.1.9",
         "license-checker": "^25.0.1",
@@ -136,15 +136,15 @@
       }
     },
     "node_modules/@alfresco/adf-content-services": {
-      "version": "6.6.0-6904949573",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-6.6.0-6904949573.tgz",
-      "integrity": "sha512-saV1lbUru+0/I7m7gIEtCrL1h/Zl/PDFtLOTw9av0XHTmb5VthnYahldW2isv1guhw05o156nsJd1TDhkIO0eQ==",
+      "version": "6.6.0-7045741448",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-6.6.0-7045741448.tgz",
+      "integrity": "sha512-eeJv5D50nEbvMtQNMtbzXV92/bcWp4VkoCMBLuwxl3Y/5QWvOWxvwbctcNGwBDtZK8VV64y2mwm5nglGZuAFaQ==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
       "peerDependencies": {
-        "@alfresco/adf-core": ">=6.6.0-6904949573",
-        "@alfresco/js-api": ">=7.2.0",
+        "@alfresco/adf-core": ">=6.6.0-7045741448",
+        "@alfresco/js-api": ">=7.5.0-7045741448",
         "@angular/animations": ">=14.1.3",
         "@angular/cdk": ">=14.1.2",
         "@angular/common": ">=14.1.3",
@@ -159,9 +159,9 @@
       }
     },
     "node_modules/@alfresco/adf-core": {
-      "version": "6.6.0-6904949573",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-6.6.0-6904949573.tgz",
-      "integrity": "sha512-69oPZZOyfQzuNHCS6PyEosC9GmZR9OTfWJBP6xu5uixMVMG+ami0jbYVAoLwnuu8EeoZM8Tsd629FT8Lr5tK9A==",
+      "version": "6.6.0-7045741448",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-6.6.0-7045741448.tgz",
+      "integrity": "sha512-eklIQROU6/3BzONNNnJLvydflDmfPPtt+vX/1mQ8XQnUUS6qnxzQm0PDNGu5ul2GcSkrz9YY6V5ki2SH7pdP1Q==",
       "dependencies": {
         "angular-oauth2-oidc": "^13.0.1",
         "angular-oauth2-oidc-jwks": "^13.0.1",
@@ -169,8 +169,8 @@
         "tslib": "^2.3.0"
       },
       "peerDependencies": {
-        "@alfresco/adf-extensions": ">=6.6.0-6904949573",
-        "@alfresco/js-api": ">=7.2.0",
+        "@alfresco/adf-extensions": ">=6.6.0-7045741448",
+        "@alfresco/js-api": ">=7.5.0-7045741448",
         "@angular/animations": ">=14.1.3",
         "@angular/cdk": ">=14.1.2",
         "@angular/common": ">=14.1.3",
@@ -185,45 +185,47 @@
       }
     },
     "node_modules/@alfresco/adf-extensions": {
-      "version": "6.6.0-6904949573",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-6.6.0-6904949573.tgz",
-      "integrity": "sha512-Va04hh9OdYeTkJmKsiP+0De9zvuu33XMLvXNUCndLWYX9936twDiVsRZX7pK59f6lxR5yf8pfU+SwUMMsJ3gGg==",
+      "version": "6.6.0-7045741448",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-6.6.0-7045741448.tgz",
+      "integrity": "sha512-AcLlfeX4RcewDKfb9SrOArkWsOKlyZS7aMUEiSVQgT6TE2d54suiZJaxAqBCKa6cyLWObRCJan2hGMQUHcdSWw==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
       "peerDependencies": {
-        "@alfresco/js-api": ">=7.2.0",
+        "@alfresco/js-api": ">=7.5.0-7045741448",
         "@angular/common": ">=14.1.3",
         "@angular/core": ">=14.1.3"
       }
     },
     "node_modules/@alfresco/adf-testing": {
-      "version": "6.6.0-6904949573",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-6.6.0-6904949573.tgz",
-      "integrity": "sha512-encRjYI1+4iEdTV/2Kj3c/U2qyKMGG4vB/b+4dE/wSo4yvXtjkB/UlEPFdmLMNo4lArsqlTM8dMvr/oWnL6wVw==",
+      "version": "6.6.0-7045741448",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-6.6.0-7045741448.tgz",
+      "integrity": "sha512-xSTcV9IYj9ycrx2HcpG4Y9/BNa6W69hLfBrqRn3ez8OCewOBWyf1z2wbgxCVeLO+2K8uQPS9kBhgKnxqny1q8g==",
       "dev": true,
       "dependencies": {
-        "@alfresco/js-api": ">=7.2.0",
+        "@alfresco/js-api": ">=7.5.0-7045741448",
         "@angular/compiler": "14.1.3",
         "@angular/core": "14.1.3",
         "date-fns": "^2.30.0",
+        "event-emitter": "^0.3.5",
         "rxjs": "6.6.6",
+        "superagent": "^8.1.2",
         "tslib": "^2.6.2",
         "zone.js": "~0.11.4"
       },
       "peerDependencies": {
-        "@alfresco/js-api": ">=7.2.0"
+        "@alfresco/js-api": ">=7.5.0-7045741448"
       }
     },
     "node_modules/@alfresco/eslint-plugin-eslint-angular": {
-      "version": "6.6.0-6904949573",
-      "resolved": "https://registry.npmjs.org/@alfresco/eslint-plugin-eslint-angular/-/eslint-plugin-eslint-angular-6.6.0-6904949573.tgz",
-      "integrity": "sha512-Ux0j11RwB0sQJhP9k0YwhVr//CT9IjC6N9IcOw8Y8hi+vEUeh3n0pGkI6eq9UWDiMutTZLKKu5hbChh80X9IJA=="
+      "version": "6.6.0-7045741448",
+      "resolved": "https://registry.npmjs.org/@alfresco/eslint-plugin-eslint-angular/-/eslint-plugin-eslint-angular-6.6.0-7045741448.tgz",
+      "integrity": "sha512-gyjrVu+jarWJjU5AQqyaZh+uKUK2dbzkC2lUeulmDXpdgesBOWRE2kVnNkmEgulQXYNZudtGa4tFKra8tCEF3Q=="
     },
     "node_modules/@alfresco/js-api": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-7.2.0.tgz",
-      "integrity": "sha512-/Tr88IO1s1cV8RC6X9EZ2jixPJ5IQQZWR6heN406l0/eqHxroXUGShRfNZxNLZBkMn0b3uiqnAxjNo2HmB+xug==",
+      "version": "7.5.0-7045741448",
+      "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-7.5.0-7045741448.tgz",
+      "integrity": "sha512-QTR/WFaF0nEqyZY1GKjVNbgpZ9ZTbbsiJhWsbPCW9xPQV3reTN9mbkQodr5S2tJVyg3eKJ6vN6E7K6eqJVxhqg==",
       "dependencies": {
         "event-emitter": "^0.3.5",
         "superagent": "^8.0.9",
@@ -20169,9 +20171,9 @@
       }
     },
     "node_modules/jsrsasign": {
-      "version": "10.8.6",
-      "resolved": "https://registry.npmjs.org/jsrsasign/-/jsrsasign-10.8.6.tgz",
-      "integrity": "sha512-bQmbVtsfbgaKBTWCKiDCPlUPbdlRIK/FzSwT3BzIgZl/cU6TqXu6pZJsCI/dJVrZ9Gir5GC4woqw9shH/v7MBw==",
+      "version": "10.9.0",
+      "resolved": "https://registry.npmjs.org/jsrsasign/-/jsrsasign-10.9.0.tgz",
+      "integrity": "sha512-QWLUikj1SBJGuyGK8tjKSx3K7Y69KYJnrs/pQ1KZ6wvZIkHkWjZ1PJDpuvc1/28c1uP0KW9qn1eI1LzHQqDOwQ==",
       "funding": {
         "url": "https://github.com/kjur/jsrsasign#donations"
       }
diff --git a/package.json b/package.json
index 630acb4840..b2877c603a 100644
--- a/package.json
+++ b/package.json
@@ -33,11 +33,11 @@
   },
   "private": true,
   "dependencies": {
-    "@alfresco/adf-content-services": ">=6.6.0-6904949573",
-    "@alfresco/adf-core": ">=6.6.0-6904949573",
-    "@alfresco/adf-extensions": ">=6.6.0-6904949573",
-    "@alfresco/eslint-plugin-eslint-angular": ">=6.6.0-6904949573",
-    "@alfresco/js-api": "7.2.0",
+    "@alfresco/adf-content-services": "6.6.0-7045741448",
+    "@alfresco/adf-core": "6.6.0-7045741448",
+    "@alfresco/adf-extensions": "6.6.0-7045741448",
+    "@alfresco/eslint-plugin-eslint-angular": "6.6.0-7045741448",
+    "@alfresco/js-api": "7.5.0-7045741448",
     "@angular/animations": "14.1.3",
     "@angular/cdk": "14.1.3",
     "@angular/common": "14.1.3",
@@ -65,8 +65,8 @@
     "zone.js": "0.11.8"
   },
   "devDependencies": {
-    "@alfresco/adf-cli": ">=6.6.0-6904949573",
-    "@alfresco/adf-testing": ">=6.6.0-6904949573",
+    "@alfresco/adf-cli": "6.6.0-7045741448",
+    "@alfresco/adf-testing": "6.6.0-7045741448",
     "@angular-devkit/build-angular": "14.2.11",
     "@angular-devkit/core": "14.1.2",
     "@angular-devkit/schematics": "14.1.2",
diff --git a/projects/aca-content/about/src/about.component.html b/projects/aca-content/about/src/about.component.html
index 808609799c..f0d2bf32f6 100644
--- a/projects/aca-content/about/src/about.component.html
+++ b/projects/aca-content/about/src/about.component.html
@@ -6,7 +6,7 @@
     <h1>{{ 'APP.BROWSE.ABOUT.TITLE' | translate }}</h1>
   </div>
 
-  <div class="aca-page-layout-content scrollable">
+  <div class="aca-page-layout-content aca-scrollable">
     <adf-about>
       <adf-about-panel *ngIf="dev" [label]="'ABOUT.SERVER_SETTINGS.TITLE' | translate">
         <ng-template>
diff --git a/projects/aca-content/assets/app.extensions.json b/projects/aca-content/assets/app.extensions.json
index 2046ea4c98..a52f7c55b5 100644
--- a/projects/aca-content/assets/app.extensions.json
+++ b/projects/aca-content/assets/app.extensions.json
@@ -1495,6 +1495,9 @@
                 "allowOnlyPredefinedValues": true,
                 "field": "TAG"
               }
+            },
+            "rules": {
+              "visible": "app.areTagsEnabled"
             }
           },
           {
@@ -1509,6 +1512,9 @@
                 "allowOnlyPredefinedValues": true,
                 "field": "cm:categories"
               }
+            },
+            "rules": {
+              "visible": "app.areCategoriesEnabled"
             }
           }
         ]
@@ -2160,7 +2166,10 @@
           "type": "text",
           "sortable": false,
           "desktopOnly": true,
-          "order": 60
+          "order": 60,
+          "rules": {
+            "visible": "app.areTagsEnabled"
+          }
         }
       ],
       "libraries": [
@@ -2357,7 +2366,10 @@
           "type": "text",
           "sortable": false,
           "desktopOnly": true,
-          "order": 80
+          "order": 80,
+          "rules": {
+            "visible": "app.areTagsEnabled"
+          }
         }
       ],
       "recent": [
@@ -2422,7 +2434,10 @@
           "type": "text",
           "sortable": false,
           "desktopOnly": true,
-          "order": 60
+          "order": 60,
+          "rules": {
+            "visible": "app.areTagsEnabled"
+          }
         }
       ],
       "favorites": [
@@ -2497,7 +2512,10 @@
           "type": "text",
           "sortable": false,
           "desktopOnly": true,
-          "order": 70
+          "order": 70,
+          "rules": {
+            "visible": "app.areTagsEnabled"
+          }
         }
       ],
       "trashcan": [
diff --git a/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.html b/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.html
index a2b38e9c7a..e66ca3d626 100644
--- a/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.html
+++ b/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.html
@@ -10,7 +10,7 @@ <h1 class="aca-page-title">{{ 'ACA_FOLDER_RULES.ACTIONS.MANAGE_RULES' | translat
   </div>
 
   <div class="aca-page-layout-content">
-    <div class="main-content">
+    <div class="aca-main-content">
 
       <ng-container *ngIf="((ruleSetsLoading$ | async) && (inheritedRuleSets$ | async).length === 0) || (actionsLoading$ | async); else onLoaded">
         <mat-progress-bar color="primary" mode="indeterminate"></mat-progress-bar>
@@ -27,6 +27,7 @@ <h2 class="aca-page-title">{{ (folderInfo$ | async).name }}:{{'ACA_FOLDER_RULES.
 
             <mat-slide-toggle
               data-automation-id="manage-rules-inheritance-toggle-button"
+              class="aca-manage-rules__actions-bar__toggle"
               [checked]="isInheritanceEnabled"
               (change)="onInheritanceToggleChange($event)"
               [disabled]="isInheritanceToggleDisabled"
@@ -34,7 +35,7 @@ <h2 class="aca-page-title">{{ (folderInfo$ | async).name }}:{{'ACA_FOLDER_RULES.
               {{ 'ACA_FOLDER_RULES.MANAGE_RULES.TOOLBAR.ACTIONS.INHERIT_RULES' | translate }}
             </mat-slide-toggle>
 
-            <mat-divider vertical class="vertical-divider"></mat-divider>
+            <mat-divider vertical class="aca-manage-rules__actions-bar__vertical-divider"></mat-divider>
 
             <div class="aca-manage-rules__actions-bar__buttons">
               <button
diff --git a/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.scss b/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.scss
index d6a08e6534..04c694a0c6 100644
--- a/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.scss
+++ b/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.scss
@@ -19,12 +19,12 @@
       gap: 12px;
     }
 
-    .mat-slide-toggle-label {
+    &__toggle {
       font-weight: 600;
       font-size: 14px;
     }
 
-    .vertical-divider {
+    &__vertical-divider {
       height: 50%;
       margin: 0 12px;
     }
diff --git a/projects/aca-content/folder-rules/src/mock/action-parameter-constraints.mock.ts b/projects/aca-content/folder-rules/src/mock/action-parameter-constraints.mock.ts
index 46899d0615..70078cf6ff 100644
--- a/projects/aca-content/folder-rules/src/mock/action-parameter-constraints.mock.ts
+++ b/projects/aca-content/folder-rules/src/mock/action-parameter-constraints.mock.ts
@@ -62,3 +62,47 @@ export const rawConstraints = {
     constraintName: 'ac-aspects'
   }
 };
+
+export const dummyTagsConstraints: ActionParameterConstraint[] = [
+  {
+    name: 'aspect-name',
+    constraints: [
+      {
+        value: 'cm:tagscope',
+        label: 'Label 1'
+      },
+      {
+        value: 'cm:tagScopeCache',
+        label: 'Label 2'
+      },
+      {
+        value: 'cm:notTagRelated',
+        label: 'Label 3'
+      },
+      {
+        value: 'cm:taggable',
+        label: 'Label 4'
+      }
+    ]
+  }
+];
+
+export const dummyCategoriesConstraints: ActionParameterConstraint[] = [
+  {
+    name: 'aspect-name',
+    constraints: [
+      {
+        value: 'cm:categories',
+        label: 'Label 1'
+      },
+      {
+        value: 'cm:notCategoryRelated',
+        label: 'Label 2'
+      },
+      {
+        value: 'cm:generalclassifiable',
+        label: 'Label 3'
+      }
+    ]
+  }
+];
diff --git a/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.scss b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.scss
index 51598a840f..7474178d1f 100644
--- a/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.scss
+++ b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.scss
@@ -4,8 +4,9 @@
     flex-direction: row;
     gap: 20px;
 
-    adf-card-view .adf-property-list .adf-property adf-card-view-item-dispatcher adf-card-view-textitem .mat-form-field .mat-form-field-infix {
-      width: 280px;
+    adf-card-view .adf-property-list .adf-property adf-card-view-item-dispatcher adf-card-view-textitem {
+      display: inline-block;
+      width: 300px;
     }
   }
 
diff --git a/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.spec.ts b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.spec.ts
index 524707ec8c..9aed9534df 100644
--- a/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.spec.ts
+++ b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.spec.ts
@@ -26,26 +26,27 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { CardViewBoolItemModel, CardViewComponent, CardViewSelectItemModel, CardViewTextItemModel, CoreTestingModule } from '@alfresco/adf-core';
 import { RuleActionUiComponent } from './rule-action.ui-component';
 import { actionLinkToCategoryTransformedMock, actionsTransformedListMock } from '../../mock/actions.mock';
-import { DebugElement } from '@angular/core';
 import { By } from '@angular/platform-browser';
-import { dummyConstraints } from '../../mock/action-parameter-constraints.mock';
+import { dummyCategoriesConstraints, dummyConstraints, dummyTagsConstraints } from '../../mock/action-parameter-constraints.mock';
+import { CategoryService, TagService } from '@alfresco/adf-content-services';
+import { MatSelect } from '@angular/material/select';
 
 describe('RuleActionUiComponent', () => {
   let fixture: ComponentFixture<RuleActionUiComponent>;
   let component: RuleActionUiComponent;
 
-  const getByDataAutomationId = (dataAutomationId: string): DebugElement =>
-    fixture.debugElement.query(By.css(`[data-automation-id="${dataAutomationId}"]`));
+  const getSelectElement = (): HTMLElement => fixture.debugElement.query(By.directive(MatSelect)).nativeElement;
 
-  const changeMatSelectValue = (dataAutomationId: string, value: string) => {
-    const matSelect = getByDataAutomationId(dataAutomationId).nativeElement;
-    matSelect.click();
+  const changeMatSelectValue = (value: string) => {
+    getSelectElement().click();
     fixture.detectChanges();
     const matOption = fixture.debugElement.query(By.css(`.mat-option[ng-reflect-value="${value}"]`)).nativeElement;
     matOption.click();
     fixture.detectChanges();
   };
 
+  const getPropertiesCardView = (): CardViewComponent => fixture.debugElement.query(By.directive(CardViewComponent)).componentInstance;
+
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [CoreTestingModule, RuleActionUiComponent]
@@ -59,8 +60,7 @@ describe('RuleActionUiComponent', () => {
     component.actionDefinitions = actionsTransformedListMock;
     fixture.detectChanges();
 
-    const matSelect = getByDataAutomationId('rule-action-select').nativeElement;
-    matSelect.click();
+    getSelectElement().click();
     fixture.detectChanges();
 
     const matOptions = fixture.debugElement.queryAll(By.css(`mat-option`));
@@ -74,10 +74,10 @@ describe('RuleActionUiComponent', () => {
     component.parameterConstraints = dummyConstraints;
     fixture.detectChanges();
 
-    const cardView = getByDataAutomationId('rule-action-card-view').componentInstance as CardViewComponent;
+    const cardView = getPropertiesCardView();
     expect(cardView.properties.length).toBe(0);
 
-    changeMatSelectValue('rule-action-select', 'mock-action-1-definition');
+    changeMatSelectValue('mock-action-1-definition');
 
     expect(cardView.properties.length).toBe(5);
     expect(cardView.properties[0]).toBeInstanceOf(CardViewTextItemModel);
@@ -86,7 +86,7 @@ describe('RuleActionUiComponent', () => {
     expect(cardView.properties[3]).toBeInstanceOf(CardViewTextItemModel);
     expect(cardView.properties[4]).toBeInstanceOf(CardViewSelectItemModel);
 
-    changeMatSelectValue('rule-action-select', 'mock-action-2-definition');
+    changeMatSelectValue('mock-action-2-definition');
     expect(cardView.properties.length).toBe(0);
   });
 
@@ -95,13 +95,95 @@ describe('RuleActionUiComponent', () => {
     component.parameterConstraints = dummyConstraints;
     fixture.detectChanges();
 
-    const cardView = getByDataAutomationId('rule-action-card-view').componentInstance as CardViewComponent;
+    const cardView = getPropertiesCardView();
     expect(cardView.properties.length).toBe(0);
 
-    changeMatSelectValue('rule-action-select', 'mock-action-3-definition');
+    changeMatSelectValue('mock-action-3-definition');
 
     expect(cardView.properties[0].icon).toBeFalsy();
     expect(cardView.properties[0].value).toBeFalsy();
     expect(cardView.properties[0]).toBeInstanceOf(CardViewTextItemModel);
   });
+
+  describe('Select options', () => {
+    beforeEach(() => {
+      component.actionDefinitions = actionsTransformedListMock;
+    });
+
+    it('should not filter out tags related options if tagService.areTagsEnabled returns true', (done) => {
+      component.parameterConstraints = dummyTagsConstraints;
+      const tagService = TestBed.inject(TagService);
+      spyOn(tagService, 'areTagsEnabled').and.returnValue(true);
+      fixture.detectChanges();
+
+      changeMatSelectValue('mock-action-1-definition');
+      expect(tagService.areTagsEnabled).toHaveBeenCalled();
+      (getPropertiesCardView().properties[2] as CardViewSelectItemModel<string>).options$.subscribe((options) => {
+        expect(options).toEqual(
+          dummyTagsConstraints[0].constraints.map((constraint) => ({
+            key: constraint.value,
+            label: `${constraint.label} [${constraint.value}]`
+          }))
+        );
+        done();
+      });
+    });
+
+    it('should filter out tags related options if tagService.areTagsEnabled returns false', (done) => {
+      component.parameterConstraints = dummyTagsConstraints;
+      const tagService = TestBed.inject(TagService);
+      spyOn(tagService, 'areTagsEnabled').and.returnValue(false);
+      fixture.detectChanges();
+
+      changeMatSelectValue('mock-action-1-definition');
+      expect(tagService.areTagsEnabled).toHaveBeenCalled();
+      (getPropertiesCardView().properties[2] as CardViewSelectItemModel<string>).options$.subscribe((options) => {
+        expect(options).toEqual([
+          {
+            key: 'cm:notTagRelated',
+            label: 'Label 3 [cm:notTagRelated]'
+          }
+        ]);
+        done();
+      });
+    });
+
+    it('should not filter out categories related options if categoryService.areCategoriesEnabled returns true', (done) => {
+      component.parameterConstraints = dummyCategoriesConstraints;
+      const categoriesService = TestBed.inject(CategoryService);
+      spyOn(categoriesService, 'areCategoriesEnabled').and.returnValue(true);
+      fixture.detectChanges();
+
+      changeMatSelectValue('mock-action-1-definition');
+      expect(categoriesService.areCategoriesEnabled).toHaveBeenCalled();
+      (getPropertiesCardView().properties[2] as CardViewSelectItemModel<string>).options$.subscribe((options) => {
+        expect(options).toEqual(
+          dummyCategoriesConstraints[0].constraints.map((constraint) => ({
+            key: constraint.value,
+            label: `${constraint.label} [${constraint.value}]`
+          }))
+        );
+        done();
+      });
+    });
+
+    it('should filter out categories related options if categoryService.areCategoriesEnabled returns false', (done) => {
+      component.parameterConstraints = dummyCategoriesConstraints;
+      const categoryService = TestBed.inject(CategoryService);
+      spyOn(categoryService, 'areCategoriesEnabled').and.returnValue(false);
+      fixture.detectChanges();
+
+      changeMatSelectValue('mock-action-1-definition');
+      expect(categoryService.areCategoriesEnabled).toHaveBeenCalled();
+      (getPropertiesCardView().properties[2] as CardViewSelectItemModel<string>).options$.subscribe((options) => {
+        expect(options).toEqual([
+          {
+            key: 'cm:notCategoryRelated',
+            label: 'Label 2 [cm:notCategoryRelated]'
+          }
+        ]);
+        done();
+      });
+    });
+  });
 });
diff --git a/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.ts b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.ts
index a058933ee6..04ab305108 100644
--- a/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.ts
+++ b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.ts
@@ -37,9 +37,15 @@ import {
 } from '@alfresco/adf-core';
 import { ActionParameterDefinition, Node } from '@alfresco/js-api';
 import { of, Subject } from 'rxjs';
-import { takeUntil } from 'rxjs/operators';
+import { map, takeUntil } from 'rxjs/operators';
 import { ActionParameterConstraint, ConstraintValue } from '../../model/action-parameter-constraint.model';
-import { ContentNodeSelectorComponent, ContentNodeSelectorComponentData, NodeAction } from '@alfresco/adf-content-services';
+import {
+  CategoryService,
+  ContentNodeSelectorComponent,
+  ContentNodeSelectorComponentData,
+  NodeAction,
+  TagService
+} from '@alfresco/adf-content-services';
 import { MatDialog } from '@angular/material/dialog';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { CommonModule } from '@angular/common';
@@ -82,6 +88,9 @@ export class RuleActionUiComponent implements ControlValueAccessor, OnInit, OnCh
     this._parameterConstraints = value.map((obj) => ({ ...obj, constraints: this.parseConstraintsToSelectOptions(obj.constraints) }));
   }
 
+  private readonly tagsRelatedPropertiesAndAspects = ['cm:tagscope', 'cm:tagScopeCache', 'cm:taggable'];
+  private readonly categoriesRelatedPropertiesAndAspects = ['cm:categories', 'cm:generalclassifiable'];
+
   isFullWidth = false;
 
   form = new FormGroup({
@@ -107,7 +116,13 @@ export class RuleActionUiComponent implements ControlValueAccessor, OnInit, OnCh
   onChange: (action: RuleAction) => void = () => undefined;
   onTouch: () => void = () => undefined;
 
-  constructor(private cardViewUpdateService: CardViewUpdateService, private dialog: MatDialog, private translate: TranslateService) {}
+  constructor(
+    private cardViewUpdateService: CardViewUpdateService,
+    private dialog: MatDialog,
+    private translate: TranslateService,
+    private tagService: TagService,
+    private categoryService: CategoryService
+  ) {}
 
   writeValue(action: RuleAction) {
     this.form.setValue({
@@ -170,6 +185,8 @@ export class RuleActionUiComponent implements ControlValueAccessor, OnInit, OnCh
   }
 
   setCardViewProperties() {
+    const disabledTags = !this.tagService.areTagsEnabled();
+    const disabledCategories = !this.categoryService.areCategoriesEnabled();
     this.cardViewItems = (this.selectedActionDefinition?.parameterDefinitions ?? []).map((paramDef) => {
       this.isFullWidth = false;
       const constraintsForDropdownBox = this._parameterConstraints.find((obj) => obj.name === paramDef.name);
@@ -212,7 +229,17 @@ export class RuleActionUiComponent implements ControlValueAccessor, OnInit, OnCh
             return new CardViewSelectItemModel({
               ...cardViewPropertiesModel,
               value: (this.parameters[paramDef.name] as string) ?? '',
-              options$: of(constraintsForDropdownBox.constraints)
+              options$: of(constraintsForDropdownBox.constraints).pipe(
+                map((options) => {
+                  return options.filter(
+                    (option) =>
+                      !(
+                        (disabledTags && this.tagsRelatedPropertiesAndAspects.includes(option.key)) ||
+                        (disabledCategories && this.categoriesRelatedPropertiesAndAspects.includes(option.key))
+                      )
+                  );
+                })
+              )
             });
           }
           return new CardViewTextItemModel({
diff --git a/projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.scss b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.scss
index c16258477b..0f1622c951 100644
--- a/projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.scss
+++ b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.scss
@@ -2,11 +2,11 @@
   display: block;
   border-radius: 8px;
 
-  &.childCompositeCondition {
+  &.aca-childCompositeCondition {
     padding: 8px 16px;
     background-color: hsl(0deg, 0%, 100%);
 
-    &.secondaryBackground {
+    &.aca-secondaryBackground {
       background-color: hsl(0deg, 0%, 95%);
     }
   }
diff --git a/projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.ts b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.ts
index e9cf5ba1fb..4ae4228101 100644
--- a/projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.ts
+++ b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.ts
@@ -62,10 +62,10 @@ import { RuleSimpleConditionUiComponent } from './rule-simple-condition.ui-compo
   ]
 })
 export class RuleCompositeConditionUiComponent implements ControlValueAccessor, OnDestroy, OnChanges {
-  @HostBinding('class.secondaryBackground')
+  @HostBinding('class.aca-secondaryBackground')
   @Input()
   secondaryBackground = false;
-  @HostBinding('class.childCompositeCondition')
+  @HostBinding('class.aca-childCompositeCondition')
   @Input()
   childCondition = false;
 
diff --git a/projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.html b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.html
index 8cff2654dd..2250e3f5b7 100644
--- a/projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.html
+++ b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.html
@@ -11,7 +11,7 @@
     </mat-select>
   </mat-form-field>
 
-  <mat-form-field class="aca-rule-simple-condition__form__comparator-input" [class]="{ hidden: isComparatorHidden }" data-automation-id="comparator-form-field">
+  <mat-form-field class="aca-rule-simple-condition__form__comparator-input" [class]="{ 'aca-hidden': isComparatorHidden }" data-automation-id="comparator-form-field">
     <mat-select formControlName="comparator" data-automation-id="comparator-select">
       <mat-option
         *ngFor="let comparator of selectedFieldComparators"
diff --git a/projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.scss b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.scss
index 958e977805..d3dfd7bec4 100644
--- a/projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.scss
+++ b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.scss
@@ -10,7 +10,7 @@
     }
 
     &__comparator-input {
-      &.hidden {
+      &.aca-hidden {
         display: none;
       }
     }
diff --git a/projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.spec.ts b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.spec.ts
index adbb87c3e3..a211c13b0a 100644
--- a/projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.spec.ts
+++ b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.spec.ts
@@ -29,15 +29,19 @@ import { By } from '@angular/platform-browser';
 import { DebugElement } from '@angular/core';
 import { tagMock, mimeTypeMock, simpleConditionUnknownFieldMock, categoriesListMock } from '../../mock/conditions.mock';
 import { MimeType } from './rule-mime-types';
-import { CategoryService } from '@alfresco/adf-content-services';
+import { CategoryService, TagService } from '@alfresco/adf-content-services';
 import { of } from 'rxjs';
 import { RuleSimpleCondition } from '../../model/rule-simple-condition.model';
 import { delay } from 'rxjs/operators';
+import { MatOption } from '@angular/material/core';
+import { RuleConditionField, ruleConditionFields } from './rule-condition-fields';
 
 describe('RuleSimpleConditionUiComponent', () => {
   let fixture: ComponentFixture<RuleSimpleConditionUiComponent>;
   let categoryService: CategoryService;
 
+  const fieldSelectAutomationId = 'field-select';
+
   const getByDataAutomationId = (dataAutomationId: string): DebugElement =>
     fixture.debugElement.query(By.css(`[data-automation-id="${dataAutomationId}"]`));
 
@@ -57,6 +61,18 @@ describe('RuleSimpleConditionUiComponent', () => {
     fixture.detectChanges();
   };
 
+  const expectConditionFieldsDisplayedAsOptions = (conditionFields: RuleConditionField[]): void => {
+    fixture.detectChanges();
+    getByDataAutomationId(fieldSelectAutomationId).nativeElement.click();
+    fixture.detectChanges();
+    const options = fixture.debugElement.queryAll(By.directive(MatOption));
+    conditionFields.forEach((field, i) => {
+      const option = options[i];
+      expect(field.name).toBe(option.componentInstance.value);
+      expect(field.label).toBe(option.nativeElement.textContent.trim());
+    });
+  };
+
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [CoreTestingModule, RuleSimpleConditionUiComponent]
@@ -69,7 +85,7 @@ describe('RuleSimpleConditionUiComponent', () => {
   it('should default the field to the name, the comparator to equals and the value empty', () => {
     fixture.detectChanges();
 
-    expect(getByDataAutomationId('field-select').componentInstance.value).toBe('cm:name');
+    expect(getByDataAutomationId(fieldSelectAutomationId).componentInstance.value).toBe('cm:name');
     expect(getByDataAutomationId('comparator-select').componentInstance.value).toBe('equals');
     expect(getByDataAutomationId('value-input').nativeElement.value).toBe('');
   });
@@ -81,7 +97,7 @@ describe('RuleSimpleConditionUiComponent', () => {
     expect(fixture.componentInstance.isComparatorHidden).toBeFalsy();
     expect(getComputedStyle(comparatorFormField).display).not.toBe('none');
 
-    changeMatSelectValue('field-select', 'category');
+    changeMatSelectValue(fieldSelectAutomationId, 'category');
 
     expect(fixture.componentInstance.isComparatorHidden).toBeTruthy();
     expect(getComputedStyle(comparatorFormField).display).toBe('none');
@@ -94,7 +110,7 @@ describe('RuleSimpleConditionUiComponent', () => {
     expect(fixture.componentInstance.isComparatorHidden).toBeFalsy();
     expect(getComputedStyle(comparatorFormField).display).not.toBe('none');
 
-    changeMatSelectValue('field-select', 'mimetype');
+    changeMatSelectValue(fieldSelectAutomationId, 'mimetype');
 
     expect(fixture.componentInstance.isComparatorHidden).toBeTruthy();
     expect(getComputedStyle(comparatorFormField).display).toBe('none');
@@ -108,7 +124,7 @@ describe('RuleSimpleConditionUiComponent', () => {
     expect(fixture.componentInstance.isComparatorHidden).toBeFalsy();
     expect(getComputedStyle(comparatorFormField).display).not.toBe('none');
 
-    changeMatSelectValue('field-select', autoCompleteField);
+    changeMatSelectValue(fieldSelectAutomationId, autoCompleteField);
 
     expect(fixture.componentInstance.isComparatorHidden).toBeTruthy();
     expect(getComputedStyle(comparatorFormField).display).toBe('none');
@@ -120,11 +136,11 @@ describe('RuleSimpleConditionUiComponent', () => {
     changeMatSelectValue('comparator-select', 'contains');
 
     expect(getByDataAutomationId('comparator-select').componentInstance.value).toBe('contains');
-    changeMatSelectValue('field-select', 'mimetype');
+    changeMatSelectValue(fieldSelectAutomationId, 'mimetype');
 
     expect(onChangeFieldSpy).toHaveBeenCalledTimes(1);
     expect(getByDataAutomationId('comparator-select').componentInstance.value).toBe('equals');
-    changeMatSelectValue('field-select', 'size');
+    changeMatSelectValue(fieldSelectAutomationId, 'size');
 
     expect(onChangeFieldSpy).toHaveBeenCalledTimes(2);
     expect(getByDataAutomationId('comparator-select').componentInstance.value).toBe('equals');
@@ -134,8 +150,8 @@ describe('RuleSimpleConditionUiComponent', () => {
     fixture.componentInstance.writeValue(simpleConditionUnknownFieldMock);
     fixture.detectChanges();
 
-    expect(getByDataAutomationId('field-select').componentInstance.value).toBe(simpleConditionUnknownFieldMock.field);
-    const matSelect = getByDataAutomationId('field-select').nativeElement;
+    expect(getByDataAutomationId(fieldSelectAutomationId).componentInstance.value).toBe(simpleConditionUnknownFieldMock.field);
+    const matSelect = getByDataAutomationId(fieldSelectAutomationId).nativeElement;
     matSelect.click();
     fixture.detectChanges();
 
@@ -147,8 +163,8 @@ describe('RuleSimpleConditionUiComponent', () => {
   it('should remove the option for the unknown field as soon as another option is selected', () => {
     fixture.componentInstance.writeValue(simpleConditionUnknownFieldMock);
     fixture.detectChanges();
-    changeMatSelectValue('field-select', 'cm:name');
-    const matSelect = getByDataAutomationId('field-select').nativeElement;
+    changeMatSelectValue(fieldSelectAutomationId, 'cm:name');
+    const matSelect = getByDataAutomationId(fieldSelectAutomationId).nativeElement;
     matSelect.click();
     fixture.detectChanges();
 
@@ -200,7 +216,7 @@ describe('RuleSimpleConditionUiComponent', () => {
 
   it('should provide auto-complete option when category is selected', () => {
     fixture.detectChanges();
-    changeMatSelectValue('field-select', 'category');
+    changeMatSelectValue(fieldSelectAutomationId, 'category');
 
     expect(getByDataAutomationId('auto-complete-input-field')).toBeTruthy();
     expect(fixture.componentInstance.form.get('parameter').value).toEqual('');
@@ -210,7 +226,7 @@ describe('RuleSimpleConditionUiComponent', () => {
     spyOn(categoryService, 'searchCategories').and.returnValue(of(categoriesListMock));
 
     fixture.detectChanges();
-    changeMatSelectValue('field-select', 'category');
+    changeMatSelectValue(fieldSelectAutomationId, 'category');
     tick(500);
 
     expect(categoryService.searchCategories).toHaveBeenCalledWith('');
@@ -221,7 +237,7 @@ describe('RuleSimpleConditionUiComponent', () => {
     spyOn(categoryService, 'searchCategories').and.returnValue(of(categoriesListMock));
 
     fixture.detectChanges();
-    changeMatSelectValue('field-select', 'category');
+    changeMatSelectValue(fieldSelectAutomationId, 'category');
     tick(500);
     expect(categoryService.searchCategories).toHaveBeenCalledWith('');
 
@@ -256,7 +272,7 @@ describe('RuleSimpleConditionUiComponent', () => {
   it('should show loading spinner while auto-complete options are fetched, and then remove it once it is received', fakeAsync(() => {
     spyOn(categoryService, 'searchCategories').and.returnValue(of(categoriesListMock).pipe(delay(1000)));
     fixture.detectChanges();
-    changeMatSelectValue('field-select', 'category');
+    changeMatSelectValue(fieldSelectAutomationId, 'category');
     tick(500);
     getByDataAutomationId('auto-complete-input-field')?.nativeElement?.click();
     let loadingSpinner = getByDataAutomationId('auto-complete-loading-spinner');
@@ -271,7 +287,7 @@ describe('RuleSimpleConditionUiComponent', () => {
   it('should display correct label for category when user selects a category from auto-complete dropdown', fakeAsync(() => {
     spyOn(categoryService, 'searchCategories').and.returnValue(of(categoriesListMock));
     fixture.detectChanges();
-    changeMatSelectValue('field-select', 'category');
+    changeMatSelectValue(fieldSelectAutomationId, 'category');
     tick(500);
     getByDataAutomationId('auto-complete-input-field')?.nativeElement?.click();
     changeMatSelectValue('folder-rule-auto-complete', categoriesListMock.list.entries[0].entry.id);
@@ -283,7 +299,7 @@ describe('RuleSimpleConditionUiComponent', () => {
   it('should automatically select first category when user focuses out of parameter form field with category option selected', fakeAsync(() => {
     spyOn(categoryService, 'searchCategories').and.returnValue(of(categoriesListMock));
     fixture.detectChanges();
-    changeMatSelectValue('field-select', 'category');
+    changeMatSelectValue(fieldSelectAutomationId, 'category');
     tick(500);
     const autoCompleteInputField = getByDataAutomationId('auto-complete-input-field')?.nativeElement;
     autoCompleteInputField.value = 'FakeCat';
@@ -292,4 +308,38 @@ describe('RuleSimpleConditionUiComponent', () => {
     expect(parameterValue).toEqual(categoriesListMock.list.entries[0].entry.id);
     discardPeriodicTasks();
   }));
+
+  it('should display correct condition field options when tagService.areTagsEnabled returns true', () => {
+    const tagService = TestBed.inject(TagService);
+    spyOn(tagService, 'areTagsEnabled').and.returnValue(true);
+    fixture = TestBed.createComponent(RuleSimpleConditionUiComponent);
+
+    expect(tagService.areTagsEnabled).toHaveBeenCalled();
+    expectConditionFieldsDisplayedAsOptions(ruleConditionFields);
+  });
+
+  it('should display correct condition field options when tagService.areTagsEnabled returns false', () => {
+    const tagService = TestBed.inject(TagService);
+    spyOn(tagService, 'areTagsEnabled').and.returnValue(false);
+    fixture = TestBed.createComponent(RuleSimpleConditionUiComponent);
+
+    expect(tagService.areTagsEnabled).toHaveBeenCalled();
+    expectConditionFieldsDisplayedAsOptions(ruleConditionFields.filter((field) => field.name !== 'tag'));
+  });
+
+  it('should display correct condition field options when categoryService.areCategoriesEnabled returns true', () => {
+    spyOn(categoryService, 'areCategoriesEnabled').and.returnValue(true);
+    fixture = TestBed.createComponent(RuleSimpleConditionUiComponent);
+
+    expect(categoryService.areCategoriesEnabled).toHaveBeenCalled();
+    expectConditionFieldsDisplayedAsOptions(ruleConditionFields);
+  });
+
+  it('should display correct condition field options when categoryService.areCategoriesEnabled returns false', () => {
+    spyOn(categoryService, 'areCategoriesEnabled').and.returnValue(false);
+    fixture = TestBed.createComponent(RuleSimpleConditionUiComponent);
+
+    expect(categoryService.areCategoriesEnabled).toHaveBeenCalled();
+    expectConditionFieldsDisplayedAsOptions(ruleConditionFields.filter((field) => field.name !== 'category'));
+  });
 });
diff --git a/projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.ts b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.ts
index a3cda946ab..781a96aa3d 100644
--- a/projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.ts
+++ b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.ts
@@ -34,7 +34,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatSelectModule } from '@angular/material/select';
 import { MatInputModule } from '@angular/material/input';
-import { CategoryService } from '@alfresco/adf-content-services';
+import { CategoryService, TagService } from '@alfresco/adf-content-services';
 import { MatAutocompleteModule } from '@angular/material/autocomplete';
 import { debounceTime, distinctUntilChanged, first, takeUntil } from 'rxjs/operators';
 import { Subject, Subscription } from 'rxjs';
@@ -77,8 +77,6 @@ const AUTOCOMPLETE_OPTIONS_DEBOUNCE_TIME = 500;
   ]
 })
 export class RuleSimpleConditionUiComponent implements OnInit, ControlValueAccessor, OnDestroy {
-  readonly fields = ruleConditionFields;
-
   form = new FormGroup({
     field: new FormControl('cm:name'),
     comparator: new FormControl('equals'),
@@ -102,8 +100,15 @@ export class RuleSimpleConditionUiComponent implements OnInit, ControlValueAcces
     this.setDisabledState(isReadOnly);
   }
 
-  constructor(private config: AppConfigService, private categoryService: CategoryService) {
-    this.mimeTypes = this.config.get<Array<MimeType>>('mimeTypes');
+  private readonly disabledTags = !this.tagService.areTagsEnabled();
+  private readonly disabledCategories = !this.categoryService.areCategoriesEnabled();
+
+  readonly fields = ruleConditionFields.filter(
+    (condition) => !((this.disabledTags && condition.name === 'tag') || (this.disabledCategories && condition.name === 'category'))
+  );
+
+  constructor(config: AppConfigService, private categoryService: CategoryService, private tagService: TagService) {
+    this.mimeTypes = config.get<Array<MimeType>>('mimeTypes');
   }
   get isSelectedFieldKnown(): boolean {
     const selectedFieldName = this.form.get('field').value;
diff --git a/projects/aca-content/folder-rules/src/rule-details/edit-rule-dialog.ui-component.scss b/projects/aca-content/folder-rules/src/rule-details/edit-rule-dialog.ui-component.scss
index a24044e643..bfadfac1e1 100644
--- a/projects/aca-content/folder-rules/src/rule-details/edit-rule-dialog.ui-component.scss
+++ b/projects/aca-content/folder-rules/src/rule-details/edit-rule-dialog.ui-component.scss
@@ -1,16 +1,14 @@
 .aca-edit-rule-dialog-container {
   --edit-rule-dialog-padding: 8px 20px;
-
-  .mat-dialog-container {
-    padding: 0;
-  }
 }
 
 .aca-edit-rule-dialog {
+  margin: -24px;
+
   &__header {
     display: flex;
     align-items: center;
-    margin: 0;
+    margin: -43px -24px 0;
     padding: var(--edit-rule-dialog-padding);
     box-sizing: border-box;
     border-bottom: 1px solid var(--theme-border-color);
@@ -29,7 +27,7 @@
   }
 
   &__content {
-    margin: 0;
+    margin: 0 -24px;
     padding: 0;
 
     &__spinner {
@@ -41,7 +39,7 @@
   }
 
   &__footer {
-    margin: 0;
+    margin: 0 -24px -43px;
     padding: var(--edit-rule-dialog-padding);
     box-sizing: border-box;
     border-top: 1px solid var(--theme-border-color);
diff --git a/projects/aca-content/folder-rules/src/rule-details/options/rule-options.ui-component.html b/projects/aca-content/folder-rules/src/rule-details/options/rule-options.ui-component.html
index e996d0abaf..601e090479 100644
--- a/projects/aca-content/folder-rules/src/rule-details/options/rule-options.ui-component.html
+++ b/projects/aca-content/folder-rules/src/rule-details/options/rule-options.ui-component.html
@@ -3,6 +3,7 @@
     <mat-checkbox
       formControlName="isAsynchronous"
       (change)="toggleErrorScriptDropdown($event)"
+      class="aca-rule-options__checkbox"
       data-automation-id="rule-option-checkbox-asynchronous">
       {{ 'ACA_FOLDER_RULES.RULE_DETAILS.OPTIONS.IS_ASYNCHRONOUS' | translate }}
     </mat-checkbox>
@@ -10,7 +11,7 @@
     <mat-form-field
       data-automation-id="rule-option-form-field-errorScript"
       floatLabel="always"
-      [ngClass]="{ 'hide-error-script-dropdown': hideErrorScriptDropdown }">
+      [ngClass]="{ 'aca-hide-error-script-dropdown': hideErrorScriptDropdown }">
 
       <mat-select
         formControlName="errorScript"
@@ -31,6 +32,7 @@
   <div class="aca-rule-options__option" *ngIf="!readOnly || isInheritableChecked">
     <mat-checkbox
       formControlName="isInheritable"
+      class="aca-rule-options__checkbox"
       data-automation-id="rule-option-checkbox-inheritable">
       {{ 'ACA_FOLDER_RULES.RULE_DETAILS.OPTIONS.IS_INHERITABLE' | translate }}
     </mat-checkbox>
@@ -39,6 +41,7 @@
   <div class="aca-rule-options__option" *ngIf="!readOnly">
     <mat-checkbox
       formControlName="isDisabled"
+      class="aca-rule-options__checkbox"
       data-automation-id="rule-option-checkbox-disabled">
       {{ 'ACA_FOLDER_RULES.RULE_DETAILS.OPTIONS.DISABLE_RULE' | translate }}
     </mat-checkbox>
diff --git a/projects/aca-content/folder-rules/src/rule-details/options/rule-options.ui-component.scss b/projects/aca-content/folder-rules/src/rule-details/options/rule-options.ui-component.scss
index 1f1463bc9c..af7a9f4105 100644
--- a/projects/aca-content/folder-rules/src/rule-details/options/rule-options.ui-component.scss
+++ b/projects/aca-content/folder-rules/src/rule-details/options/rule-options.ui-component.scss
@@ -8,11 +8,11 @@
     flex-direction: column;
   }
 
-  &.read-only .mat-checkbox-inner-container {
+  &.aca-read-only &__checkbox label > span:first-child {
     display: none;
   }
 
-  .hide-error-script-dropdown {
+  .aca-hide-error-script-dropdown {
     visibility: hidden;
   }
 }
diff --git a/projects/aca-content/folder-rules/src/rule-details/options/rule-options.ui-component.spec.ts b/projects/aca-content/folder-rules/src/rule-details/options/rule-options.ui-component.spec.ts
index e9d84702b5..314547fe23 100644
--- a/projects/aca-content/folder-rules/src/rule-details/options/rule-options.ui-component.spec.ts
+++ b/projects/aca-content/folder-rules/src/rule-details/options/rule-options.ui-component.spec.ts
@@ -45,11 +45,11 @@ describe('RuleOptionsUiComponent', () => {
   const testErrorScriptFormFieldVisibility = (isVisible: boolean) => {
     if (isVisible) {
       expect((getByDataAutomationId('rule-option-form-field-errorScript').nativeElement as HTMLElement).classList).not.toContain(
-        'hide-error-script-dropdown'
+        'aca-hide-error-script-dropdown'
       );
     } else {
       expect((getByDataAutomationId('rule-option-form-field-errorScript').nativeElement as HTMLElement).classList).toContain(
-        'hide-error-script-dropdown'
+        'aca-hide-error-script-dropdown'
       );
     }
   };
diff --git a/projects/aca-content/folder-rules/src/rule-details/options/rule-options.ui-component.ts b/projects/aca-content/folder-rules/src/rule-details/options/rule-options.ui-component.ts
index e127c1870d..581a38257d 100644
--- a/projects/aca-content/folder-rules/src/rule-details/options/rule-options.ui-component.ts
+++ b/projects/aca-content/folder-rules/src/rule-details/options/rule-options.ui-component.ts
@@ -74,7 +74,7 @@ export class RuleOptionsUiComponent implements ControlValueAccessor, OnChanges,
   @Input()
   errorScriptConstraint: ActionParameterConstraint;
 
-  @HostBinding('class.read-only')
+  @HostBinding('class.aca-read-only')
   readOnly = false;
 
   onChange: (options: RuleOptions) => void = () => undefined;
diff --git a/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.html b/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.html
index a649c0360d..2946924e82 100644
--- a/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.html
+++ b/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.html
@@ -1,10 +1,10 @@
-<form class="aca-rule-details__form" [ngClass]="{ 'read-only': readOnly }" [formGroup]="form">
+<form class="aca-rule-details__form" [ngClass]="{ 'aca-read-only': readOnly }" [formGroup]="form">
 
   <ng-container *ngIf="!preview">
     <div class="aca-rule-details__form__row aca-rule-details__form__name">
       <label for="rule-details-name-input">{{ 'ACA_FOLDER_RULES.RULE_DETAILS.LABEL.NAME' | translate }}</label>
       <div>
-        <mat-form-field floatLabel='never'>
+        <mat-form-field floatLabel='never' class="aca-rule-details__form__row__field">
           <input
             id="rule-details-name-input"
             matInput type="text" formControlName="name" data-automation-id="rule-details-name-input"
@@ -17,8 +17,9 @@
     <div class="aca-rule-details__form__row aca-rule-details__form__description">
       <label for="rule-details-description-textarea">{{ 'ACA_FOLDER_RULES.RULE_DETAILS.LABEL.DESCRIPTION' | translate }}</label>
       <div>
-        <mat-form-field floatLabel='never'>
+        <mat-form-field floatLabel='never' class="aca-rule-details__form__row__field">
         <textarea
+          class="aca-rule-details__form__row__field__textarea"
           id="rule-details-description-textarea"
           matInput formControlName="description" data-automation-id="rule-details-description-textarea"
           [placeholder]="descriptionPlaceHolder | translate">
@@ -29,20 +30,20 @@
   </ng-container>
 
   <div class="aca-rule-details__form__row aca-rule-details__form__triggers">
-    <div class="label">{{ 'ACA_FOLDER_RULES.RULE_DETAILS.LABEL.WHEN' | translate }}</div>
+    <div class="aca-label">{{ 'ACA_FOLDER_RULES.RULE_DETAILS.LABEL.WHEN' | translate }}</div>
     <div>
       <aca-rule-triggers formControlName="triggers" data-automation-id="rule-details-triggers-component"></aca-rule-triggers>
-      <mat-error class="rule-details-error" *ngIf="triggers.hasError('required')">{{ 'ACA_FOLDER_RULES.RULE_DETAILS.ERROR.INSUFFICIENT_TRIGGERS_SELECTED' | translate }}</mat-error>
+      <mat-error class="aca-rule-details-error" *ngIf="triggers.hasError('required')">{{ 'ACA_FOLDER_RULES.RULE_DETAILS.ERROR.INSUFFICIENT_TRIGGERS_SELECTED' | translate }}</mat-error>
     </div>
   </div>
 
   <div class="aca-rule-details__form__conditions">
     <aca-rule-composite-condition formControlName="conditions"></aca-rule-composite-condition>
-    <mat-error class="rule-details-error" *ngIf="conditions.hasError('ruleCompositeConditionInvalid')">{{ 'ACA_FOLDER_RULES.RULE_DETAILS.ERROR.RULE_COMPOSITE_CONDITION_INVALID' | translate }}</mat-error>
+    <mat-error class="aca-rule-details-error" *ngIf="conditions.hasError('ruleCompositeConditionInvalid')">{{ 'ACA_FOLDER_RULES.RULE_DETAILS.ERROR.RULE_COMPOSITE_CONDITION_INVALID' | translate }}</mat-error>
   </div>
 
   <div class="aca-rule-details__form__row aca-rule-details__form__actions">
-    <div class="label">{{ 'ACA_FOLDER_RULES.RULE_DETAILS.LABEL.PERFORM_ACTIONS' | translate }}</div>
+    <div class="aca-label">{{ 'ACA_FOLDER_RULES.RULE_DETAILS.LABEL.PERFORM_ACTIONS' | translate }}</div>
     <aca-rule-action-list
       formControlName="actions"
       [actionDefinitions]="actionDefinitions"
@@ -53,7 +54,7 @@
   </div>
 
   <div class="aca-rule-details__form__row" *ngIf="showOptionsSection">
-    <div class="label">{{ 'ACA_FOLDER_RULES.RULE_DETAILS.LABEL.OPTIONS' | translate }}</div>
+    <div class="aca-label">{{ 'ACA_FOLDER_RULES.RULE_DETAILS.LABEL.OPTIONS' | translate }}</div>
     <aca-rule-options
       formControlName="options"
       data-automation-id="rule-details-options-component"
diff --git a/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.scss b/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.scss
index 0661eaca37..1cf1579f60 100644
--- a/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.scss
+++ b/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.scss
@@ -25,7 +25,7 @@
       gap: 8px;
 
       & > label,
-      & > .label {
+      & > .aca-label {
         font-weight: bold;
         width: 20%;
         min-width: 100px;
@@ -35,15 +35,16 @@
 
       & > div {
         flex-grow: 1;
+      }
 
-        mat-form-field {
-          width: 100%;
-          max-width: 400px;
-          font-size: inherit;
+      &__field {
+        width: 100%;
+        max-width: 400px;
+        margin-top: -11px;
+        font-size: inherit;
 
-          .mat-form-field-infix {
-            border: none;
-          }
+        &__textarea {
+          min-height: 4em;
         }
       }
     }
@@ -55,17 +56,13 @@
     &__conditions {
       width: 100%;
 
-      & > .rule-details-error {
+      & > .aca-rule-details-error {
         margin-left: 16px;
         color: inherit;
       }
     }
 
-    textarea {
-      min-height: 4em;
-    }
-
-    .rule-details-error {
+    .aca-rule-details-error {
       font-size: 75%;
       height: 1em;
     }
@@ -76,7 +73,7 @@
       }
     }
 
-    &.read-only,
+    &.aca-read-only,
     .mat-form-field-disabled {
       .mat-form-field-underline,
       .mat-select-arrow-wrapper {
diff --git a/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.spec.ts b/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.spec.ts
index 959239e626..5e7cd8c638 100644
--- a/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.spec.ts
+++ b/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.spec.ts
@@ -29,6 +29,8 @@ import { Rule } from '../model/rule.model';
 import { By } from '@angular/platform-browser';
 import { RuleTriggersUiComponent } from './triggers/rule-triggers.ui-component';
 import { RuleOptionsUiComponent } from './options/rule-options.ui-component';
+import { RuleActionListUiComponent } from './actions/rule-action-list.ui-component';
+import { CategoryService } from '@alfresco/adf-content-services';
 
 describe('RuleDetailsUiComponent', () => {
   let fixture: ComponentFixture<RuleDetailsUiComponent>;
@@ -140,4 +142,54 @@ describe('RuleDetailsUiComponent', () => {
 
     expect(getComponentInstance<RuleOptionsUiComponent>('rule-details-options-component')).toBeFalsy();
   });
+
+  describe('RuleActionListUiComponent', () => {
+    let categoryService: CategoryService;
+
+    const getRuleActionsListComponent = (): RuleActionListUiComponent =>
+      fixture.debugElement.query(By.directive(RuleActionListUiComponent)).componentInstance;
+
+    beforeEach(() => {
+      categoryService = TestBed.inject(CategoryService);
+      component.actionDefinitions = [
+        {
+          id: 'link-category',
+          name: 'test name',
+          description: 'some description',
+          title: 'some title',
+          applicableTypes: [],
+          trackStatus: false,
+          parameterDefinitions: []
+        },
+        {
+          id: 'test id',
+          name: 'test name 2',
+          description: 'some description',
+          title: 'some title',
+          applicableTypes: [],
+          trackStatus: false,
+          parameterDefinitions: []
+        }
+      ];
+    });
+
+    it('should have assigned not filtered out category related actions from actionDefinitions if categoryService.areCategoriesEnabled returns true', () => {
+      spyOn(categoryService, 'areCategoriesEnabled').and.returnValue(true);
+
+      fixture.detectChanges();
+      expect(categoryService.areCategoriesEnabled).toHaveBeenCalled();
+      expect(component.actionDefinitions.length).toBe(2);
+      expect(getRuleActionsListComponent().actionDefinitions).toBe(component.actionDefinitions);
+    });
+
+    it('should have assigned filter out category related actions from actionDefinitions if categoryService.areCategoriesEnabled returns false', () => {
+      spyOn(categoryService, 'areCategoriesEnabled').and.returnValue(false);
+
+      fixture.detectChanges();
+      expect(categoryService.areCategoriesEnabled).toHaveBeenCalled();
+      expect(component.actionDefinitions.length).toBe(1);
+      expect(component.actionDefinitions[0].id).toBe('test id');
+      expect(getRuleActionsListComponent().actionDefinitions).toBe(component.actionDefinitions);
+    });
+  });
 });
diff --git a/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.ts b/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.ts
index 40dace9d23..d133756f3c 100644
--- a/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.ts
+++ b/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.ts
@@ -40,6 +40,7 @@ import { RuleTriggersUiComponent } from './triggers/rule-triggers.ui-component';
 import { RuleCompositeConditionUiComponent } from './conditions/rule-composite-condition.ui-component';
 import { RuleActionListUiComponent } from './actions/rule-action-list.ui-component';
 import { RuleOptionsUiComponent } from './options/rule-options.ui-component';
+import { CategoryService } from '@alfresco/adf-content-services';
 
 @Component({
   standalone: true,
@@ -136,7 +137,11 @@ export class RuleDetailsUiComponent implements OnInit, OnDestroy {
     return !this.readOnly || this.value.isAsynchronous || this.value.isInheritable;
   }
 
+  constructor(private categoryService: CategoryService) {}
+
   ngOnInit() {
+    const disabledCategory = !this.categoryService.areCategoriesEnabled();
+    this.actionDefinitions = this.actionDefinitions.filter((action) => !(disabledCategory && action.id === 'link-category'));
     this.form = new UntypedFormGroup({
       id: new UntypedFormControl(this.value.id),
       name: new UntypedFormControl(this.value.name || '', Validators.required),
diff --git a/projects/aca-content/folder-rules/src/rule-list/rule-list-grouping/rule-list-grouping.ui-component.html b/projects/aca-content/folder-rules/src/rule-list/rule-list-grouping/rule-list-grouping.ui-component.html
index 6f94c0b94d..b800860c80 100644
--- a/projects/aca-content/folder-rules/src/rule-list/rule-list-grouping/rule-list-grouping.ui-component.html
+++ b/projects/aca-content/folder-rules/src/rule-list/rule-list-grouping/rule-list-grouping.ui-component.html
@@ -15,7 +15,7 @@
     <div
       *ngIf="item.type === 'load-more-rules'; else loadMoreRuleSets"
       tabindex="0"
-      class="aca-rule-list-grouping__non-rule-item load-more"
+      class="aca-rule-list-grouping__non-rule-item aca-load-more"
       matRipple matRippleColor="hsla(0,0%,0%,0.05)"
       (click)="onClickLoadMoreRules(item.ruleSet)"
       (keyup.enter)="onClickLoadMoreRules(item.ruleSet)">
@@ -27,7 +27,7 @@
     <div
       *ngIf="item.type === 'load-more-rule-sets'; else loadingRules"
       tabindex="0"
-      class="aca-rule-list-grouping__non-rule-item load-more"
+      class="aca-rule-list-grouping__non-rule-item aca-load-more"
       matRipple matRippleColor="hsla(0,0%,0%,0.05)"
       (click)="onClickLoadMoreRuleSets()"
       (keyup.enter)="onClickLoadMoreRuleSets()">
@@ -40,7 +40,7 @@
       tabindex="0"
       class="aca-rule-list-grouping__non-rule-item"
       matRipple matRippleColor="hsla(0,0%,0%,0.05)">
-      <mat-spinner mode="indeterminate" [diameter]="16"></mat-spinner>
+      <mat-spinner mode="indeterminate" [diameter]="16" class="aca-spinner"></mat-spinner>
       {{ 'ACA_FOLDER_RULES.RULE_LIST.LOADING_RULES' | translate }}
     </div>
   </ng-template>
diff --git a/projects/aca-content/folder-rules/src/rule-list/rule-list-grouping/rule-list-grouping.ui-component.scss b/projects/aca-content/folder-rules/src/rule-list/rule-list-grouping/rule-list-grouping.ui-component.scss
index bfb12d73f4..2992e261b2 100644
--- a/projects/aca-content/folder-rules/src/rule-list/rule-list-grouping/rule-list-grouping.ui-component.scss
+++ b/projects/aca-content/folder-rules/src/rule-list/rule-list-grouping/rule-list-grouping.ui-component.scss
@@ -12,7 +12,7 @@
     text-align: center;
     padding: 0.5em 0;
 
-    &.load-more {
+    &.aca-load-more {
       cursor: pointer;
     }
 
@@ -20,7 +20,7 @@
       border-bottom: 1px solid var(--theme-border-color);
     }
 
-    .mat-spinner {
+    .aca-spinner {
       margin-right: 0.5em;
     }
   }
diff --git a/projects/aca-content/folder-rules/src/rule-list/rule-list-item/rule-list-item.ui-component.scss b/projects/aca-content/folder-rules/src/rule-list/rule-list-item/rule-list-item.ui-component.scss
index 4f04be4719..1766a702e0 100644
--- a/projects/aca-content/folder-rules/src/rule-list/rule-list-item/rule-list-item.ui-component.scss
+++ b/projects/aca-content/folder-rules/src/rule-list/rule-list-item/rule-list-item.ui-component.scss
@@ -34,7 +34,7 @@
     text-overflow: ellipsis;
   }
 
-  &.selected {
-    background: var(--theme-selected-button-bg-color);
+  &.aca-selected {
+    background: var(--adf-theme-background-selected-button-color);
   }
 }
diff --git a/projects/aca-content/folder-rules/src/rule-list/rule-list-item/rule-list-item.ui-component.ts b/projects/aca-content/folder-rules/src/rule-list/rule-list-item/rule-list-item.ui-component.ts
index 327e9939de..19103b22f3 100644
--- a/projects/aca-content/folder-rules/src/rule-list/rule-list-item/rule-list-item.ui-component.ts
+++ b/projects/aca-content/folder-rules/src/rule-list/rule-list-item/rule-list-item.ui-component.ts
@@ -40,7 +40,7 @@ export class RuleListItemUiComponent {
   @Input()
   rule: Rule;
   @Input()
-  @HostBinding('class.selected')
+  @HostBinding('class.aca-selected')
   isSelected: boolean;
   @Input()
   showEnabledToggle = false;
diff --git a/projects/aca-content/folder-rules/src/rule-list/rule-list/rule-list.ui-component.html b/projects/aca-content/folder-rules/src/rule-list/rule-list/rule-list.ui-component.html
index 53808d20a1..27e424016c 100644
--- a/projects/aca-content/folder-rules/src/rule-list/rule-list/rule-list.ui-component.html
+++ b/projects/aca-content/folder-rules/src/rule-list/rule-list/rule-list.ui-component.html
@@ -2,7 +2,7 @@
   *ngIf="inheritedRuleSetGroupingItems.length > 0"
   class="aca-rule-list__item"
   data-automation-id="rule-list-item"
-  [ngClass]="{ expanded: inheritedRuleSetsExpanded }">
+  [ngClass]="{ 'aca-expanded': inheritedRuleSetsExpanded }">
 
   <div
     tabindex="0"
@@ -13,7 +13,7 @@
 
     <span class="aca-rule-list__item__header__title">
       {{ 'ACA_FOLDER_RULES.RULE_LIST.INHERITED_RULES' | translate }}
-      <mat-icon [matTooltip]="'ACA_FOLDER_RULES.RULE_LIST.INHERITED_RULES_WILL_BE_RUN_FIRST' | translate">
+      <mat-icon class="aca-rule-list__item__header__title__mat-icon" [matTooltip]="'ACA_FOLDER_RULES.RULE_LIST.INHERITED_RULES_WILL_BE_RUN_FIRST' | translate">
         info
       </mat-icon>
     </span>
@@ -38,7 +38,7 @@
   *ngIf="mainRuleSetGroupingItems.length > 0 || isMainRuleSetLinked"
   class="aca-rule-list__item"
   data-automation-id="rule-list-item"
-  [ngClass]="{ expanded: mainRuleSetExpanded }">
+  [ngClass]="{ 'aca-expanded': mainRuleSetExpanded }">
 
   <div
     tabindex="0"
diff --git a/projects/aca-content/folder-rules/src/rule-list/rule-list/rule-list.ui-component.scss b/projects/aca-content/folder-rules/src/rule-list/rule-list/rule-list.ui-component.scss
index 43f5bb19bb..eb45570bb3 100644
--- a/projects/aca-content/folder-rules/src/rule-list/rule-list/rule-list.ui-component.scss
+++ b/projects/aca-content/folder-rules/src/rule-list/rule-list/rule-list.ui-component.scss
@@ -35,13 +35,13 @@
         justify-content: flex-start;
         flex: 1;
 
-        .mat-icon {
+        &__mat-icon {
           transform: scale(0.8);
         }
       }
     }
 
-    &.expanded {
+    &.aca-expanded {
       .aca-rule-list__item__header {
         border-bottom: 1px solid var(--theme-border-color);
       }
diff --git a/projects/aca-content/folder-rules/src/rule-set-picker/rule-set-picker.smart-component.html b/projects/aca-content/folder-rules/src/rule-set-picker/rule-set-picker.smart-component.html
index 12a097fa1b..5554802315 100644
--- a/projects/aca-content/folder-rules/src/rule-set-picker/rule-set-picker.smart-component.html
+++ b/projects/aca-content/folder-rules/src/rule-set-picker/rule-set-picker.smart-component.html
@@ -3,7 +3,7 @@
     {{ 'ACA_FOLDER_RULES.LINK_RULES_DIALOG.TITLE' | translate }}
   </div>
   <button mat-icon-button mat-dialog-close class="aca-rule-set-picker__header__close" tabindex="-1">
-    <mat-icon>close</mat-icon>
+    <mat-icon class="aca-rule-set-picker__header__close__icon">close</mat-icon>
   </button>
 </div>
 
@@ -17,7 +17,7 @@
     (siteChange)="setFolderLoading(true)">
   </adf-content-node-selector-panel>
 
-  <div class="aca-rule-set-picker__content__rule-list" [ngClass]="{ justify: rulesLoading$ | async }">
+  <div class="aca-rule-set-picker__content__rule-list" [ngClass]="{ 'aca-justify': rulesLoading$ | async }">
     <ng-container *ngIf="rulesLoading$ | async; else rulesLoaded">
       <mat-progress-spinner color="primary" mode="indeterminate"></mat-progress-spinner>
     </ng-container>
diff --git a/projects/aca-content/folder-rules/src/rule-set-picker/rule-set-picker.smart-component.scss b/projects/aca-content/folder-rules/src/rule-set-picker/rule-set-picker.smart-component.scss
index 4a7769af04..35ca40e7c4 100644
--- a/projects/aca-content/folder-rules/src/rule-set-picker/rule-set-picker.smart-component.scss
+++ b/projects/aca-content/folder-rules/src/rule-set-picker/rule-set-picker.smart-component.scss
@@ -1,7 +1,7 @@
 .aca-rule-set-picker-container {
   --rule-set-picker-padding: 8px 20px;
 
-  .mat-dialog-container {
+  & > * {
     padding: 0;
   }
 }
@@ -22,7 +22,7 @@
     }
 
     &__close {
-      & mat-icon {
+      &__icon {
         font-size: 18px;
       }
     }
@@ -50,7 +50,7 @@
       overflow-y: auto;
       overflow-x: hidden;
 
-      &.justify {
+      &.aca-justify {
         align-items: center;
         justify-content: center;
       }
diff --git a/projects/aca-content/package.json b/projects/aca-content/package.json
index af78d1bd9f..9137c60226 100644
--- a/projects/aca-content/package.json
+++ b/projects/aca-content/package.json
@@ -5,10 +5,10 @@
   "peerDependencies": {
     "@angular/common": ">=14.1.0",
     "@angular/core": ">=14.1.0",
-    "@alfresco/adf-core": ">=6.6.0",
-    "@alfresco/adf-content-services": ">=6.6.0",
-    "@alfresco/adf-extensions": ">=6.6.0",
-    "@alfresco/js-api": ">=7.2.0",
+    "@alfresco/adf-core": ">=6.6.0-7017572520",
+    "@alfresco/adf-content-services": ">=6.6.0-7017572520",
+    "@alfresco/adf-extensions": ">=6.6.0-7017572520",
+    "@alfresco/js-api": ">=7.5.0-7004095144",
     "@angular/animations": ">=14.1.3",
     "@angular/cdk": ">=14.1.3",
     "@angular/forms": ">=14.1.3",
diff --git a/projects/aca-content/preview/src/lib/components/preview.component.html b/projects/aca-content/preview/src/lib/components/preview.component.html
index e0eed96c12..8fc9881dd4 100644
--- a/projects/aca-content/preview/src/lib/components/preview.component.html
+++ b/projects/aca-content/preview/src/lib/components/preview.component.html
@@ -1,7 +1,7 @@
 <ng-container *ngIf="nodeId">
   <adf-alfresco-viewer
     [ngClass]="{
-      'right_side--hide': !showRightSide
+      'aca-right_side--hide': !showRightSide
     }"
     [nodeId]="nodeId"
     [allowNavigate]="navigateMultiple"
diff --git a/projects/aca-content/preview/src/lib/components/preview.component.scss b/projects/aca-content/preview/src/lib/components/preview.component.scss
index c48df594fd..86a05e3a9f 100644
--- a/projects/aca-content/preview/src/lib/components/preview.component.scss
+++ b/projects/aca-content/preview/src/lib/components/preview.component.scss
@@ -18,10 +18,10 @@
 }
 
 // todo: remove this when viewer supports extensions
-.adf-viewer-toolbar .mat-toolbar > button:last-child {
+.adf-viewer-toolbar > * > button:last-child {
   display: none;
 }
 
-.adf-alfresco-viewer.right_side--hide .adf-viewer__sidebar__right {
+.adf-alfresco-viewer.aca-right_side--hide .adf-viewer__sidebar__right {
   width: 0;
 }
diff --git a/projects/aca-content/src/lib/aca-content.module.ts b/projects/aca-content/src/lib/aca-content.module.ts
index 47dd3bc2f7..87ade007ff 100644
--- a/projects/aca-content/src/lib/aca-content.module.ts
+++ b/projects/aca-content/src/lib/aca-content.module.ts
@@ -244,7 +244,9 @@ export class ContentServiceExtensionModule {
       'app.isContentServiceEnabled': rules.isContentServiceEnabled,
       'app.isUploadSupported': rules.isUploadSupported,
       'app.canCreateLibrary': rules.canCreateLibrary,
-      'app.isSearchSupported': rules.isSearchSupported
+      'app.isSearchSupported': rules.isSearchSupported,
+      'app.areTagsEnabled': rules.areTagsEnabled,
+      'app.areCategoriesEnabled': rules.areCategoriesEnabled
     });
   }
 }
diff --git a/projects/aca-content/src/lib/components/details/details.component.html b/projects/aca-content/src/lib/components/details/details.component.html
index 3c6abe85f1..b6dfa450d5 100644
--- a/projects/aca-content/src/lib/components/details/details.component.html
+++ b/projects/aca-content/src/lib/components/details/details.component.html
@@ -5,12 +5,12 @@
   </div>
 
   <div class="aca-page-layout-content">
-    <div class="acs-details-container">
-      <div class="acs-details-title">
-        <div class="acs-details-breadcrumb" role="heading" aria-level="2" *ngIf="node">
-          <span class="acs-details-breadcrumb-library"> {{ node.name }} </span>
+    <div class="aca-details-container">
+      <div class="aca-details-title">
+        <div class="aca-details-breadcrumb" role="heading" aria-level="2" *ngIf="node">
+          <span class="aca-details-breadcrumb-library"> {{ node.name }} </span>
           -
-          <span class="acs-details-breadcrumb-item">{{ 'APP.INFO_DRAWER.TITLE' | translate }}</span>
+          <span class="aca-details-breadcrumb-item">{{ 'APP.INFO_DRAWER.TITLE' | translate }}</span>
         </div>
         <button
           class="aca-close-details-button"
diff --git a/projects/aca-content/src/lib/components/details/details.component.scss b/projects/aca-content/src/lib/components/details/details.component.scss
index 778bead773..a1097ae2e4 100644
--- a/projects/aca-content/src/lib/components/details/details.component.scss
+++ b/projects/aca-content/src/lib/components/details/details.component.scss
@@ -18,7 +18,7 @@ app-details-manager {
   }
 }
 
-.acs-details-container {
+.aca-details-container {
   background-color: var(--theme-card-background-color);
   width: 100%;
 }
@@ -31,27 +31,27 @@ app-details-manager {
     height: 100%;
   }
 
-  .mat-tab-labels {
+  mat-tab-header {
     text-transform: uppercase;
   }
 }
 
-.acs-details-title {
+.aca-details-title {
   width: 100%;
   display: flex;
   align-items: center;
   justify-content: space-between;
 }
 
-.acs-details-breadcrumb {
+.aca-details-breadcrumb {
   font-size: 18px;
   margin-left: 20px;
 
-  .acs-details-breadcrumb-library {
+  &-library {
     font-weight: 900;
   }
 
-  .acs-details-breadcrumb-item {
+  &-item {
     font-weight: 100;
   }
 }
diff --git a/projects/aca-content/src/lib/components/dl-custom-components/name-column/name-column.component.scss b/projects/aca-content/src/lib/components/dl-custom-components/name-column/name-column.component.scss
index b232556f96..985605f27e 100644
--- a/projects/aca-content/src/lib/components/dl-custom-components/name-column/name-column.component.scss
+++ b/projects/aca-content/src/lib/components/dl-custom-components/name-column/name-column.component.scss
@@ -17,14 +17,14 @@
     overflow: hidden;
     text-overflow: ellipsis;
 
-    aca-locked-by {
+    .aca-locked-by {
       display: flex;
       align-items: center;
       color: rgba(0, 0, 0, 0.54);
       max-width: 100%;
-      padding: 0 10px;
+      padding-right: 10px;
 
-      .locked_by--name {
+      &--name {
         overflow: hidden;
         text-overflow: ellipsis;
       }
diff --git a/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.html b/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.html
index 9e9177e38a..5a004c6d68 100644
--- a/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.html
+++ b/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.html
@@ -5,7 +5,7 @@ <h1 class="aca-page-title">{{ 'APP.BROWSE.LIBRARIES.MENU.FAVORITE_LIBRARIES.TITL
   </div>
 
   <div class="aca-page-layout-content">
-    <div class="main-content">
+    <div class="aca-main-content">
       <adf-document-list
         #documentList
         acaDocumentList
diff --git a/projects/aca-content/src/lib/components/favorites/favorites.component.html b/projects/aca-content/src/lib/components/favorites/favorites.component.html
index a046424807..3ae915cf56 100644
--- a/projects/aca-content/src/lib/components/favorites/favorites.component.html
+++ b/projects/aca-content/src/lib/components/favorites/favorites.component.html
@@ -5,7 +5,7 @@ <h1 class="aca-page-title">{{ 'APP.BROWSE.FAVORITES.TITLE' | translate }}</h1>
   </div>
 
   <div class="aca-page-layout-content">
-    <div class="main-content">
+    <div class="aca-main-content">
       <adf-document-list
         #documentList
         acaDocumentList
diff --git a/projects/aca-content/src/lib/components/files/files.component.html b/projects/aca-content/src/lib/components/files/files.component.html
index d3d0cea225..c24e0e63a3 100644
--- a/projects/aca-content/src/lib/components/files/files.component.html
+++ b/projects/aca-content/src/lib/components/files/files.component.html
@@ -9,7 +9,7 @@
   </div>
 
   <div class="aca-page-layout-content">
-    <div class="main-content" *ngIf="!(showLoader$ | async)">
+    <div class="aca-main-content" *ngIf="!(showLoader$ | async)">
       <adf-upload-drag-area [rootFolderId]="node?.id" [disabled]="!canUpload" (updateFileVersion)="onUploadNewVersion($event)">
         <adf-document-list
           #documentList
diff --git a/projects/aca-content/src/lib/components/info-drawer/library-metadata-tab/library-metadata-form.component.html b/projects/aca-content/src/lib/components/info-drawer/library-metadata-tab/library-metadata-form.component.html
index 7d80a4127b..06de3ab75a 100644
--- a/projects/aca-content/src/lib/components/info-drawer/library-metadata-tab/library-metadata-form.component.html
+++ b/projects/aca-content/src/lib/components/info-drawer/library-metadata-tab/library-metadata-form.component.html
@@ -1,7 +1,7 @@
 <mat-card *ngIf="node">
   <mat-card-content>
     <form [formGroup]="form" autocomplete="off">
-      <mat-form-field floatLabel="auto" data-automation-id="library-name-properties-wrapper">
+      <mat-form-field floatLabel="auto" data-automation-id="library-name-properties-wrapper" class="app-library-metadata-form-field">
         <input
           matInput
           [cdkTrapFocusAutoCapture]="form.enabled"
@@ -17,11 +17,11 @@
         </mat-error>
       </mat-form-field>
 
-      <mat-form-field floatLabel="auto" data-automation-id="library-id-properties-wrapper">
+      <mat-form-field floatLabel="auto" data-automation-id="library-id-properties-wrapper" class="app-library-metadata-form-field">
         <input matInput placeholder="{{ 'LIBRARY.DIALOG.FORM.SITE_ID' | translate }}" formControlName="id" />
       </mat-form-field>
 
-      <mat-form-field floatLabel="auto" data-automation-id="library-visibility-properties-wrapper">
+      <mat-form-field floatLabel="auto" data-automation-id="library-visibility-properties-wrapper" class="app-library-metadata-form-field">
         <mat-select placeholder="{{ 'LIBRARY.DIALOG.FORM.VISIBILITY' | translate }}" formControlName="visibility">
           <mat-option [value]="type.value" *ngFor="let type of libraryType">
             {{ type.label | translate }}
@@ -29,7 +29,7 @@
         </mat-select>
       </mat-form-field>
 
-      <mat-form-field floatLabel="auto" data-automation-id="library-description-properties-wrapper">
+      <mat-form-field floatLabel="auto" data-automation-id="library-description-properties-wrapper" class="app-library-metadata-form-field">
         <textarea
           matInput
           placeholder="{{ 'LIBRARY.DIALOG.FORM.DESCRIPTION' | translate }}"
diff --git a/projects/aca-content/src/lib/components/info-drawer/library-metadata-tab/library-metadata-form.component.scss b/projects/aca-content/src/lib/components/info-drawer/library-metadata-tab/library-metadata-form.component.scss
index c3e3bd81fa..bd3a219353 100644
--- a/projects/aca-content/src/lib/components/info-drawer/library-metadata-tab/library-metadata-form.component.scss
+++ b/projects/aca-content/src/lib/components/info-drawer/library-metadata-tab/library-metadata-form.component.scss
@@ -1,24 +1,5 @@
 app-library-metadata-form {
-  .mat-form-field {
+  .app-library-metadata-form-field {
     width: 100%;
   }
-
-  .mat-form-field-infix {
-    position: relative;
-    width: 180px;
-
-    .mat-form-field-label-wrapper {
-      position: absolute;
-      width: 100%;
-      pointer-events: none;
-
-      .mat-form-field-label {
-        position: absolute;
-        white-space: nowrap;
-        text-overflow: ellipsis;
-        overflow: hidden;
-        transform-origin: 0 0;
-      }
-    }
-  }
 }
diff --git a/projects/aca-content/src/lib/components/info-drawer/metadata-tab/metadata-tab.component.spec.ts b/projects/aca-content/src/lib/components/info-drawer/metadata-tab/metadata-tab.component.spec.ts
index 7098640b22..d85b2e4cc6 100644
--- a/projects/aca-content/src/lib/components/info-drawer/metadata-tab/metadata-tab.component.spec.ts
+++ b/projects/aca-content/src/lib/components/info-drawer/metadata-tab/metadata-tab.component.spec.ts
@@ -34,6 +34,7 @@ import { AppExtensionService, NodePermissionService } from '@alfresco/aca-shared
 import { Actions } from '@ngrx/effects';
 import { of, Subject } from 'rxjs';
 import { ContentActionType } from '@alfresco/adf-extensions';
+import { CategoryService, ContentMetadataCardComponent, TagService } from '@alfresco/adf-content-services';
 
 describe('MetadataTabComponent', () => {
   let fixture: ComponentFixture<MetadataTabComponent>;
@@ -251,26 +252,70 @@ describe('MetadataTabComponent', () => {
     });
   });
 
-  describe('displayAspect', () => {
+  describe('ContentMetadataCardComponent', () => {
+    const getContentMetadataCard = (): ContentMetadataCardComponent =>
+      fixture.debugElement.query(By.directive(ContentMetadataCardComponent)).componentInstance;
+
     beforeEach(() => {
       fixture = TestBed.createComponent(MetadataTabComponent);
-      store = TestBed.inject(Store);
       component = fixture.componentInstance;
     });
 
-    it('show pass empty when store is in initial state', () => {
-      const initialState = fixture.debugElement.query(By.css('adf-content-metadata-card'));
-      expect(initialState.componentInstance.displayAspect).toBeFalsy();
+    describe('displayAspect', () => {
+      beforeEach(() => {
+        store = TestBed.inject(Store);
+      });
+
+      it('should show pass empty when store is in initial state', () => {
+        expect(getContentMetadataCard().displayAspect).toBeFalsy();
+      });
+
+      it('should update the exif if store got updated', () => {
+        store.dispatch(new SetInfoDrawerMetadataAspectAction('EXIF'));
+        component.displayAspect$.subscribe((aspect) => {
+          expect(aspect).toBe('EXIF');
+        });
+        fixture.detectChanges();
+        expect(getContentMetadataCard().displayAspect).toBe('EXIF');
+      });
     });
 
-    it('should update the exif if store got updated', () => {
-      store.dispatch(new SetInfoDrawerMetadataAspectAction('EXIF'));
-      component.displayAspect$.subscribe((aspect) => {
-        expect(aspect).toBe('EXIF');
+    describe('Tags and categories', () => {
+      it('should have assigned displayCategories to true if categoryService.areCategoriesEnabled returns true', () => {
+        const categoryService = TestBed.inject(CategoryService);
+        spyOn(categoryService, 'areCategoriesEnabled').and.returnValue(true);
+
+        fixture.detectChanges();
+        expect(categoryService.areCategoriesEnabled).toHaveBeenCalled();
+        expect(getContentMetadataCard().displayCategories).toBeTrue();
+      });
+
+      it('should have assigned displayCategories to false if categoryService.areCategoriesEnabled returns false', () => {
+        const categoryService = TestBed.inject(CategoryService);
+        spyOn(categoryService, 'areCategoriesEnabled').and.returnValue(false);
+
+        fixture.detectChanges();
+        expect(categoryService.areCategoriesEnabled).toHaveBeenCalled();
+        expect(getContentMetadataCard().displayCategories).toBeFalse();
+      });
+
+      it('should have assigned displayTags to true if tagService.areTagsEnabled returns true', () => {
+        const tagService = TestBed.inject(TagService);
+        spyOn(tagService, 'areTagsEnabled').and.returnValue(true);
+
+        fixture.detectChanges();
+        expect(tagService.areTagsEnabled).toHaveBeenCalled();
+        expect(getContentMetadataCard().displayTags).toBeTrue();
+      });
+
+      it('should have assigned displayTags to false if tagService.areTagsEnabled returns false', () => {
+        const tagService = TestBed.inject(TagService);
+        spyOn(tagService, 'areTagsEnabled').and.returnValue(false);
+
+        fixture.detectChanges();
+        expect(tagService.areTagsEnabled).toHaveBeenCalled();
+        expect(getContentMetadataCard().displayTags).toBeFalse();
       });
-      fixture.detectChanges();
-      const initialState = fixture.debugElement.query(By.css('adf-content-metadata-card'));
-      expect(initialState.componentInstance.displayAspect).toBe('EXIF');
     });
   });
 
diff --git a/projects/aca-content/src/lib/components/info-drawer/metadata-tab/metadata-tab.component.ts b/projects/aca-content/src/lib/components/info-drawer/metadata-tab/metadata-tab.component.ts
index 708cbf75da..57ee8cbe7f 100644
--- a/projects/aca-content/src/lib/components/info-drawer/metadata-tab/metadata-tab.component.ts
+++ b/projects/aca-content/src/lib/components/info-drawer/metadata-tab/metadata-tab.component.ts
@@ -29,7 +29,13 @@ import { AppStore, EditOfflineAction, infoDrawerMetadataAspect, NodeActionTypes
 import { AppConfigService, NotificationService } from '@alfresco/adf-core';
 import { Observable, Subject } from 'rxjs';
 import { Store } from '@ngrx/store';
-import { ContentMetadataModule, ContentMetadataService, ContentMetadataCustomPanel } from '@alfresco/adf-content-services';
+import {
+  ContentMetadataModule,
+  ContentMetadataService,
+  ContentMetadataCustomPanel,
+  TagService,
+  CategoryService
+} from '@alfresco/adf-content-services';
 import { filter, map, takeUntil } from 'rxjs/operators';
 import { CommonModule } from '@angular/common';
 import { Actions, ofType } from '@ngrx/effects';
@@ -46,6 +52,8 @@ import { Actions, ofType } from '@ngrx/effects';
       [displayAspect]="displayAspect$ | async"
       [customPanels]="customPanels | async"
       [(editable)]="editable"
+      [displayCategories]="displayCategories"
+      [displayTags]="displayTags"
     >
     </adf-content-metadata-card>
   `,
@@ -54,6 +62,8 @@ import { Actions, ofType } from '@ngrx/effects';
 })
 export class MetadataTabComponent implements OnInit, OnDestroy {
   protected onDestroy$ = new Subject<boolean>();
+  private _displayCategories = true;
+  private _displayTags = true;
 
   @Input()
   node: Node;
@@ -63,6 +73,14 @@ export class MetadataTabComponent implements OnInit, OnDestroy {
   editable = false;
   customPanels: Observable<ContentMetadataCustomPanel[]>;
 
+  get displayCategories(): boolean {
+    return this._displayCategories;
+  }
+
+  get displayTags(): boolean {
+    return this._displayTags;
+  }
+
   constructor(
     private permission: NodePermissionService,
     protected extensions: AppExtensionService,
@@ -70,7 +88,9 @@ export class MetadataTabComponent implements OnInit, OnDestroy {
     private store: Store<AppStore>,
     private notificationService: NotificationService,
     private contentMetadataService: ContentMetadataService,
-    private actions$: Actions
+    private actions$: Actions,
+    private tagService: TagService,
+    private categoryService: CategoryService
   ) {
     if (this.extensions.contentMetadata) {
       this.appConfig.config['content-metadata'].presets = this.extensions.contentMetadata.presets;
@@ -79,6 +99,8 @@ export class MetadataTabComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit() {
+    this._displayTags = this.tagService.areTagsEnabled();
+    this._displayCategories = this.categoryService.areCategoriesEnabled();
     this.contentMetadataService.error.pipe(takeUntil(this.onDestroy$)).subscribe((err: { message: string }) => {
       this.notificationService.showError(err.message);
     });
diff --git a/projects/aca-content/src/lib/components/libraries/libraries.component.html b/projects/aca-content/src/lib/components/libraries/libraries.component.html
index 0d9773e3f9..26c0fe84f5 100644
--- a/projects/aca-content/src/lib/components/libraries/libraries.component.html
+++ b/projects/aca-content/src/lib/components/libraries/libraries.component.html
@@ -5,7 +5,7 @@ <h1 class="aca-page-title">{{ 'APP.BROWSE.LIBRARIES.MENU.MY_LIBRARIES.TITLE' | t
   </div>
 
   <div class="aca-page-layout-content">
-    <div class="main-content">
+    <div class="aca-main-content">
       <adf-document-list
         #documentList
         acaDocumentList
diff --git a/projects/aca-content/src/lib/components/recent-files/recent-files.component.html b/projects/aca-content/src/lib/components/recent-files/recent-files.component.html
index 0cee480ee8..8659a57519 100644
--- a/projects/aca-content/src/lib/components/recent-files/recent-files.component.html
+++ b/projects/aca-content/src/lib/components/recent-files/recent-files.component.html
@@ -5,7 +5,7 @@ <h1 class="aca-page-title">{{ 'APP.BROWSE.RECENT.TITLE' | translate }}</h1>
   </div>
 
   <div class="aca-page-layout-content">
-    <div class="main-content">
+    <div class="aca-main-content">
       <adf-document-list
         #documentList
         acaDocumentList
diff --git a/projects/aca-content/src/lib/components/search/search-input-control/search-input-control.component.html b/projects/aca-content/src/lib/components/search/search-input-control/search-input-control.component.html
index 1861f2710b..f046567171 100644
--- a/projects/aca-content/src/lib/components/search/search-input-control/search-input-control.component.html
+++ b/projects/aca-content/src/lib/components/search/search-input-control/search-input-control.component.html
@@ -6,7 +6,7 @@
     (click)="searchSubmit(searchTerm)"
     [title]="'SEARCH.BUTTON.TOOLTIP' | translate"
   >
-    <mat-icon [attr.aria-label]="'SEARCH.BUTTON.ARIA-LABEL' | translate">search</mat-icon>
+    <mat-icon class="app-search-button-icon" [attr.aria-label]="'SEARCH.BUTTON.ARIA-LABEL' | translate">search</mat-icon>
   </button>
   <mat-form-field class="app-input-form-field" [floatLabel]="'never'">
     <input
@@ -18,6 +18,7 @@
       [(ngModel)]="searchTerm"
       (ngModelChange)="inputChange($event)"
       (keyup.enter)="searchSubmit($event)"
+      class="app-input-form-field-input"
       [placeholder]="'SEARCH.INPUT.PLACEHOLDER' | translate"
       autocomplete="off"
     />
diff --git a/projects/aca-content/src/lib/components/search/search-input-control/search-input-control.component.scss b/projects/aca-content/src/lib/components/search/search-input-control/search-input-control.component.scss
index 42612bc81b..c30aeabde2 100644
--- a/projects/aca-content/src/lib/components/search/search-input-control/search-input-control.component.scss
+++ b/projects/aca-content/src/lib/components/search/search-input-control/search-input-control.component.scss
@@ -5,7 +5,7 @@ $top-margin: 12px;
   margin: 14px 1px;
   float: left;
 
-  .mat-icon {
+  mat-icon {
     font-size: 24px;
     cursor: pointer;
   }
@@ -24,10 +24,6 @@ $top-margin: 12px;
   box-sizing: border-box;
   margin-bottom: 12px;
 
-  .mat-form-field {
-    font-size: 16px;
-  }
-
   .mat-form-field-underline {
     display: none;
   }
@@ -37,7 +33,7 @@ $top-margin: 12px;
   }
 
   // fixes pointer event on FF
-  &.searchMenuTrigger .mat-form-field-label-wrapper {
+  &.app-search-menu-trigger .mat-form-field-label-wrapper {
     pointer-events: auto;
   }
 
@@ -45,16 +41,16 @@ $top-margin: 12px;
     letter-spacing: -0.7px;
     width: calc(100% - 56px);
 
-    .mat-input-element {
+    &-input {
       letter-spacing: -0.7px;
     }
   }
 
-  .app-search-button.mat-icon-button {
+  .app-search-button {
     top: -2px;
     left: -8px;
 
-    .mat-icon {
+    &-icon {
       font-size: 24px;
       padding-right: 0;
     }
diff --git a/projects/aca-content/src/lib/components/search/search-input/search-input.component.html b/projects/aca-content/src/lib/components/search/search-input/search-input.component.html
index ef6b848251..ae2076d9a9 100644
--- a/projects/aca-content/src/lib/components/search/search-input/search-input.component.html
+++ b/projects/aca-content/src/lib/components/search/search-input/search-input.component.html
@@ -1,4 +1,4 @@
-<div class="app-search-container searchMenuTrigger"
+<div class="app-search-container app-search-menu-trigger"
   [matMenuTriggerFor]="searchOptionsMenu"
   (menuOpened)="onMenuOpened()"
   (menuClosed)="syncInputValues()"
@@ -11,6 +11,7 @@
     <input
       matInput
       [attr.aria-label]="'SEARCH.INPUT.ARIA-LABEL' | translate"
+      class="app-input-form-field-input"
       [type]="'text'"
       [disabled]="true"
       [value]="searchedWord"
@@ -21,8 +22,8 @@
       <mat-icon>arrow_drop_down</mat-icon>
     </div>
 
-    <button mat-icon-button matSuffix class="app-suffix-search-icon-wrapper app-close-icon" (click)="exitSearch()">
-      <mat-icon>close</mat-icon>
+    <button mat-icon-button matSuffix class="app-suffix-search-icon-wrapper app-close-button" (click)="exitSearch()">
+      <mat-icon class="app-close-icon">close</mat-icon>
     </button>
   </mat-form-field>
 </div>
@@ -39,8 +40,9 @@
       </app-search-input-control>
       <mat-hint *ngIf="hasLibrariesConstraint" class="app-search-hint">{{ 'SEARCH.INPUT.HINT' | translate }}</mat-hint>
 
-      <div id="search-options">
+      <div id="search-options" class="app-search-options">
         <mat-checkbox
+          class="app-search-options-checkbox"
           *ngFor="let option of searchOptions"
           id="{{ option.id }}"
           [(ngModel)]="option.value"
diff --git a/projects/aca-content/src/lib/components/search/search-input/search-input.component.scss b/projects/aca-content/src/lib/components/search/search-input/search-input.component.scss
index 81e357fc4f..e45afb69b6 100644
--- a/projects/aca-content/src/lib/components/search/search-input/search-input.component.scss
+++ b/projects/aca-content/src/lib/components/search/search-input/search-input.component.scss
@@ -10,10 +10,6 @@ $top-margin: 12px;
   max-width: $search-width;
   height: $search-height + $top-margin;
 
-  &.mat-menu-trigger {
-    margin: 0;
-  }
-
   .app-search-button {
     width: 32px;
     height: 32px;
@@ -23,18 +19,16 @@ $top-margin: 12px;
   }
 
   .app-input-form-field {
-    .app-close-icon {
+    .app-suffix-search-icon-wrapper.app-close-button {
       height: 6px;
 
-      &.app-suffix-search-icon-wrapper {
-        .mat-icon {
-          font-size: 18px;
-          line-height: 28px;
-        }
+      .app-close-icon {
+        font-size: 18px;
+        line-height: 28px;
       }
     }
 
-    .mat-input-element {
+    &-input {
       caret-color: var(--theme-text-color);
 
       &:disabled {
@@ -43,30 +37,19 @@ $top-margin: 12px;
     }
   }
 
-  .mat-focused label.mat-form-field-label {
-    display: none;
+  &:focus-within {
+    label {
+      display: none;
+    }
   }
 }
 
 .app-search-options-menu {
-  &.mat-menu-panel {
-    background-color: var(--theme-dialog-background-color);
-    width: $search-width;
-    max-width: unset;
-    border-radius: $search-border-radius;
-    margin-top: $top-margin;
-  }
-
-  .mat-menu-content:not(:empty) {
-    padding-top: 0;
-    padding-bottom: 0;
-  }
-}
-
-mat-checkbox {
-  .mat-checkbox-frame {
-    border-color: var(--theme-text-color);
-  }
+  background-color: var(--theme-dialog-background-color);
+  width: $search-width;
+  max-width: unset;
+  border-radius: $search-border-radius;
+  margin-top: 3px;
 }
 
 .aca-search-input {
@@ -77,20 +60,25 @@ mat-checkbox {
   height: $search-height;
   margin-bottom: 0;
   padding-bottom: 26px;
+
+  .app-search-container {
+    margin: 0;
+  }
 }
 
 .app-search-control {
   margin-top: -$top-margin;
 }
 
-#search-options {
+.app-search-options {
   color: var(--theme-text-color);
   border-top: 1px solid var(--theme-divider-color);
   padding: 20px 0;
   font-size: 16px;
   letter-spacing: -0.7px;
+  margin-bottom: -8px;
 
-  mat-checkbox {
+  &-checkbox {
     padding: 3px 24px 3px 19px;
 
     .mat-checkbox-inner-container {
@@ -105,7 +93,7 @@ mat-checkbox {
     }
   }
 
-  .mat-checkbox-layout {
+  .app-search-options-checkbox label {
     max-width: 155px;
   }
 }
@@ -128,9 +116,7 @@ mat-checkbox {
   }
 
   .app-search-options-menu {
-    &.mat-menu-panel {
-      width: $search-width-small;
-    }
+    width: $search-width-small;
   }
 
   #search-options {
@@ -144,7 +130,7 @@ mat-checkbox {
       }
     }
 
-    .mat-checkbox-layout {
+    label {
       max-width: 105px;
     }
   }
@@ -162,13 +148,10 @@ mat-checkbox {
   }
 
   .app-search-options-menu {
-    &.mat-menu-panel {
-      width: $search-width-xsmall;
-      margin-top: 9px;
-    }
+    width: $search-width-xsmall;
   }
 
-  #search-options .mat-checkbox-layout {
+  #search-options label {
     max-width: 180px;
   }
 }
diff --git a/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.html b/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.html
index 43a1a3c7a1..e891d4251d 100644
--- a/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.html
+++ b/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.html
@@ -6,12 +6,12 @@
   </div>
 
   <div class="aca-page-layout-content">
-    <div class="main-content">
+    <div class="aca-main-content">
       <div class="adf-search-results">
         <div class="adf-search-results__content">
           <mat-progress-bar *ngIf="isLoading" color="primary" mode="indeterminate"></mat-progress-bar>
-          <div class="adf-search-results__content-header content" *ngIf="data?.list.entries.length">
-            <div class="content__side--left">
+          <div class="adf-search-results__content-header aca-content" *ngIf="data?.list.entries.length">
+            <div class="aca-content__side--left">
               <div class="adf-search-results--info-text" *ngIf="totalResults !== 1">
                 {{ 'APP.BROWSE.SEARCH_LIBRARIES.FOUND_RESULTS' | translate: { number: totalResults } }}
               </div>
diff --git a/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.scss b/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.scss
index 36a1154d06..aac217e30d 100644
--- a/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.scss
+++ b/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.scss
@@ -28,11 +28,7 @@ aca-search-results {
       color: rgba(0, 0, 0, 0.54);
     }
 
-    .text--bold {
-      font-weight: 600;
-    }
-
-    .content {
+    .aca-content {
       @include flex-row;
 
       flex: unset;
diff --git a/projects/aca-content/src/lib/components/search/search-results-row/search-results-row.component.html b/projects/aca-content/src/lib/components/search/search-results-row/search-results-row.component.html
index d2ee25c15b..13d97c9b04 100644
--- a/projects/aca-content/src/lib/components/search/search-results-row/search-results-row.component.html
+++ b/projects/aca-content/src/lib/components/search/search-results-row/search-results-row.component.html
@@ -1,12 +1,12 @@
 <div class="search-file-name">
-  <span tabindex="0" role="link" *ngIf="isFile" (click)="showPreview($event)" (keyup.enter)="showPreview($event)" class="link">
+  <span tabindex="0" role="link" *ngIf="isFile" (click)="showPreview($event)" (keyup.enter)="showPreview($event)" class="aca-link">
     {{ name$ | async }}
   </span>
-  <span tabindex="0" role="link" *ngIf="!isFile" (click)="navigate($event)" (keyup.enter)="navigate($event)" class="bold link">
+  <span tabindex="0" role="link" *ngIf="!isFile" (click)="navigate($event)" (keyup.enter)="navigate($event)" class="bold aca-link">
     {{ name$ | async }}
   </span>
   <span>{{ title$ | async }}</span>
 </div>
-<div class="result-location">
+<div class="aca-result-location">
   <aca-location-link [context]="context" [showLocation]="true"></aca-location-link>
 </div>
diff --git a/projects/aca-content/src/lib/components/search/search-results-row/search-results-row.component.scss b/projects/aca-content/src/lib/components/search/search-results-row/search-results-row.component.scss
index 3d77e1ba21..4e4a351053 100644
--- a/projects/aca-content/src/lib/components/search/search-results-row/search-results-row.component.scss
+++ b/projects/aca-content/src/lib/components/search/search-results-row/search-results-row.component.scss
@@ -1,10 +1,10 @@
 .aca-search-results-row {
-  .result-location {
+  .aca-result-location {
     height: 15px;
     padding-top: 3px;
   }
 
-  .link {
+  .aca-link {
     text-decoration: none;
     color: var(--theme-text-bold-color);
   }
@@ -14,13 +14,13 @@
     color: var(--theme-foreground-text-color);
   }
 
-  .link:hover,
+  .aca-link:hover,
   .aca-location-link .adf-datatable-cell-value:hover {
     color: var(--theme-primary-color);
     text-decoration: underline;
   }
 
-  .adf-is-selected .link:not(:hover),
+  .adf-is-selected .aca-link:not(:hover),
   .adf-is-selected .adf-datatable-cell-value:not(:hover) {
     color: var(--theme-primary-color);
   }
diff --git a/projects/aca-content/src/lib/components/search/search-results/search-results.component.html b/projects/aca-content/src/lib/components/search/search-results/search-results.component.html
index 8aa242761a..8e99f06b52 100644
--- a/projects/aca-content/src/lib/components/search/search-results/search-results.component.html
+++ b/projects/aca-content/src/lib/components/search/search-results/search-results.component.html
@@ -6,7 +6,7 @@
   </div>
 
   <div class="aca-page-layout-content">
-    <div class="main-content">
+    <div class="aca-main-content">
       <div class="adf-search-results">
         <div class="adf-search-results__content">
           <mat-progress-bar *ngIf="isLoading" color="primary" mode="indeterminate" aria-live="polite"> </mat-progress-bar>
diff --git a/projects/aca-content/src/lib/components/search/search-results/search-results.component.scss b/projects/aca-content/src/lib/components/search/search-results/search-results.component.scss
index 9a8947ddc8..dc7ced64d5 100644
--- a/projects/aca-content/src/lib/components/search/search-results/search-results.component.scss
+++ b/projects/aca-content/src/lib/components/search/search-results/search-results.component.scss
@@ -30,16 +30,9 @@ aca-search-results {
     border-top: 1px solid var(--theme-border-color);
     border-bottom: 1px solid var(--theme-border-color);
 
-    .adf-search-filter-chip,
-    .adf-search-filter-chip-tabbed {
-      &[disabled] {
-        &.mat-chip {
-          background-color: var(--theme-disabled-chip-background-color);
-          color: var(--theme-search-chip-icon-color);
-        }
-      }
-
-      &.mat-chip {
+    .aca-content__advanced-filters {
+      .adf-search-filter-chip,
+      .adf-search-filter-chip-tabbed {
         background-color: var(--theme-dropdown-color);
         color: var(--theme-selected-text-color);
 
@@ -48,6 +41,11 @@ aca-search-results {
           background-color: var(--theme-grey-background-hover);
         }
 
+        &[disabled] {
+          background-color: var(--theme-disabled-chip-background-color);
+          color: var(--theme-search-chip-icon-color);
+        }
+
         mat-icon {
           color: var(--theme-search-chip-icon-color);
         }
diff --git a/projects/aca-content/src/lib/components/shared-files/shared-files.component.html b/projects/aca-content/src/lib/components/shared-files/shared-files.component.html
index 6b4bea0515..013d7aa7bf 100644
--- a/projects/aca-content/src/lib/components/shared-files/shared-files.component.html
+++ b/projects/aca-content/src/lib/components/shared-files/shared-files.component.html
@@ -5,7 +5,7 @@ <h1 class="aca-page-title">{{ 'APP.BROWSE.SHARED.TITLE' | translate }}</h1>
   </div>
 
   <div class="aca-page-layout-content">
-    <div class="main-content">
+    <div class="aca-main-content">
       <adf-document-list
         #documentList
         acaDocumentList
diff --git a/projects/aca-content/src/lib/components/sidenav/components/expand-menu.component.html b/projects/aca-content/src/lib/components/sidenav/components/expand-menu.component.html
index 6643acd88a..e174f8b06c 100644
--- a/projects/aca-content/src/lib/components/sidenav/components/expand-menu.component.html
+++ b/projects/aca-content/src/lib/components/sidenav/components/expand-menu.component.html
@@ -1,14 +1,14 @@
 <ng-container *ngIf="!item.children">
-  <div class="item">
+  <div class="aca-expansion-panel-item">
     <button
-      acaActiveLink="action-button--active"
+      acaActiveLink="aca-action-button--active"
       [action]="item"
       [attr.aria-label]="item.title | translate"
       [id]="item.id"
       [attr.data-automation-id]="item.id"
       [attr.title]="item.description | translate"
       mat-button
-      class="action-button full-width"
+      class="aca-action-button aca-full-width"
     >
       <adf-icon *ngIf="item.icon" [value]="item.icon"></adf-icon>
       <span class="action-button__label">{{ item.title | translate }}</span>
@@ -18,41 +18,43 @@
 
 <ng-container *ngIf="item.children && item.children.length">
   <mat-expansion-panel
+    class="aca-expansion-panel"
     [expanded]="true"
     [acaExpansionPanel]="item"
     [@.disabled]="true"
   >
-    <mat-expansion-panel-header expandedHeight="32px" collapsedHeight="32px" role="group">
-      <mat-panel-title>
-        <div class="item">
+    <mat-expansion-panel-header expandedHeight="32px" collapsedHeight="32px" role="group" class="aca-expansion-panel-header">
+      <mat-panel-title class="aca-expansion-panel-header-title">
+        <div class="aca-expansion-panel-item">
           <span
             [attr.aria-label]="item.title | translate"
             [id]="item.id"
             [attr.title]="item.description | translate"
             [attr.data-automation-id]="item.id"
-            class="action-button full-width"
+            class="aca-action-button aca-full-width"
           >
             <adf-icon *ngIf="item.icon" [value]="item.icon"></adf-icon>
-            <span class="action-button__label">{{ item.title | translate }}</span>
+            <span class="aca-action-button__label">{{ item.title | translate }}</span>
           </span>
         </div>
       </mat-panel-title>
     </mat-expansion-panel-header>
-
-    <div *ngFor="let child of item.children; trackBy: trackById" class="item">
-      <button
-        acaActiveLink="action-button--active"
-        [action]="child"
-        [attr.aria-label]="child.title | translate"
-        [id]="child.id"
-        [attr.data-automation-id]="child.id"
-        [attr.title]="child.description | translate"
-        mat-button
-        class="action-button full-width"
-      >
-        <adf-icon *ngIf="child.icon" [value]="child.icon"></adf-icon>
-        <span class="action-button__label">{{ child.title | translate }}</span>
-      </button>
+    <div class="aca-expansion-panel-body">
+      <div *ngFor="let child of item.children; trackBy: trackById" class="aca-expansion-panel-item">
+        <button
+          acaActiveLink="aca-action-button--active"
+          [action]="child"
+          [attr.aria-label]="child.title | translate"
+          [id]="child.id"
+          [attr.data-automation-id]="child.id"
+          [attr.title]="child.description | translate"
+          mat-button
+          class="aca-action-button aca-full-width"
+        >
+          <adf-icon *ngIf="child.icon" [value]="child.icon"></adf-icon>
+          <span class="aca-action-button__label">{{ child.title | translate }}</span>
+        </button>
+      </div>
     </div>
   </mat-expansion-panel>
 </ng-container>
diff --git a/projects/aca-content/src/lib/components/sidenav/components/sidenav-header.component.html b/projects/aca-content/src/lib/components/sidenav/components/sidenav-header.component.html
index 7a74ed6e61..9265278887 100644
--- a/projects/aca-content/src/lib/components/sidenav/components/sidenav-header.component.html
+++ b/projects/aca-content/src/lib/components/sidenav/components/sidenav-header.component.html
@@ -1,6 +1,6 @@
-<div class="sidenav-header">
-  <div class="sidenav-header-title">
-    <div class="sidenav-header-title-logo"
+<div class="aca-sidenav-header">
+  <div class="aca-sidenav-header-title">
+    <div class="aca-sidenav-header-title-logo"
       tabindex=0
       (click)="toggleNavBar.emit()"
       (keypress)="toggleNavBar.emit()">
@@ -10,7 +10,7 @@
         alt="{{ 'CORE.HEADER.LOGO_ARIA' | translate }}" />
     </div>
 
-    <div class="sidenav-header-title-text" [routerLink]="landingPage">
+    <div class="aca-sidenav-header-title-text" [routerLink]="landingPage">
       {{ appName$ | async | translate }}
     </div>
 
diff --git a/projects/aca-content/src/lib/components/sidenav/sidenav.component.html b/projects/aca-content/src/lib/components/sidenav/sidenav.component.html
index 1391a0bb29..b9ff2c612d 100644
--- a/projects/aca-content/src/lib/components/sidenav/sidenav.component.html
+++ b/projects/aca-content/src/lib/components/sidenav/sidenav.component.html
@@ -1,8 +1,8 @@
-<div class="sidenav">
+<div class="aca-sidenav">
     <app-sidenav-header (toggleNavBar)="toggleClick()"></app-sidenav-header>
 
-    <div class="section-sub-actions">
-      <div *ngFor="let group of groups; trackBy: trackByGroupId" class="section">
+    <div class="aca-sidenav__section">
+      <div *ngFor="let group of groups; trackBy: trackByGroupId" class="aca-sidenav__section__actions">
           <mat-list-item *ngFor="let item of group.items; trackBy: trackByLinkId">
             <ng-container *ngIf="!item.component">
               <app-expand-menu [item]="item"></app-expand-menu>
diff --git a/projects/aca-content/src/lib/components/sidenav/sidenav.component.scss b/projects/aca-content/src/lib/components/sidenav/sidenav.component.scss
index 4b20f56e1f..97ca0a5b1d 100644
--- a/projects/aca-content/src/lib/components/sidenav/sidenav.component.scss
+++ b/projects/aca-content/src/lib/components/sidenav/sidenav.component.scss
@@ -1,4 +1,4 @@
-.sidenav {
+.aca-sidenav {
   display: flex;
   flex: 1;
   flex-direction: column;
@@ -38,14 +38,10 @@
     }
   }
 
-  .section:last-child {
-    border-bottom: 0;
-  }
-
-  .section-sub-actions {
+  &__section {
     overflow-y: auto;
 
-    .mat-expansion-panel {
+    .aca-expansion-panel {
       width: 100%;
       background-color: unset;
       box-shadow: none;
@@ -56,80 +52,69 @@
         display: flex;
         align-items: center;
         border: none;
-      }
-
-      &-header-title {
-        display: flex;
-        flex-direction: row;
 
-        .mat-button {
-          line-height: 32px;
-          align-items: center;
-          border: none;
+        span::after {
+          transform: rotate(226deg);
         }
 
-        .action-button__label {
-          font-size: var(--theme-caption-font-size);
-        }
-      }
+        &-title {
+          display: flex;
+          flex-direction: row;
 
-      &-body {
-        padding: 0 0 16px;
-        font-size: var(--theme-body-1-font-size);
-
-        .mat-button {
-          line-height: 32px;
-          align-items: center;
-
-          .mat-button-wrapper {
-            display: flex;
+          .aca-action-button__label {
+            font-size: var(--theme-caption-font-size);
           }
         }
       }
 
-      .mat-expansion-indicator {
-        display: flex;
-        align-content: center;
+      .aca-expansion-panel-header:hover {
+        background: var(--adf-theme-background-hover-color);
       }
 
-      .mat-expansion-indicator::after {
-        transform: rotate(226deg);
-      }
-    }
+      &-item {
+        flex-direction: row;
+        display: flex;
+        align-items: center;
+        text-decoration: none;
+        width: 100%;
+        user-select: none;
 
-    .mat-expansion-panel-header:hover {
-      background: var(--adf-theme-background-hover-color);
-    }
+        &:hover .aca-action-button__label {
+          color: var(--theme-selected-text-color);
+        }
+      }
 
-    .item {
-      flex-direction: row;
-      display: flex;
-      align-items: center;
-      text-decoration: none;
-      width: 100%;
-      user-select: none;
+      &-body {
+        margin: 0 -24px 16px;
+        font-size: var(--theme-body-1-font-size);
 
-      &:hover .action-button__label {
-        color: var(--theme-selected-text-color);
+        button {
+          line-height: 32px;
+          align-items: center;
+        }
       }
     }
 
-    .action-button {
+    .aca-action-button {
       color: var(--theme-action-button-text-color);
       height: 32px;
       padding: 0 24px;
       border-radius: 0;
       line-height: 32px;
+
+      &--active {
+        color: var(--theme-selected-text-color);
+        background: var(--theme-selected-background-color);
+      }
     }
 
-    .full-width {
+    .aca-full-width {
       display: flex;
       width: 100%;
     }
 
-    .action-button--active {
-      color: var(--theme-selected-text-color);
-      background: var(--theme-selected-background-color);
+    &__actions:last-child {
+      border-bottom: 0;
     }
   }
 }
diff --git a/projects/aca-content/src/lib/components/trashcan/trashcan.component.html b/projects/aca-content/src/lib/components/trashcan/trashcan.component.html
index 2f88eccf92..d42f77d1f5 100644
--- a/projects/aca-content/src/lib/components/trashcan/trashcan.component.html
+++ b/projects/aca-content/src/lib/components/trashcan/trashcan.component.html
@@ -5,7 +5,7 @@ <h1 class="aca-page-title">{{ 'APP.BROWSE.TRASHCAN.TITLE' | translate }}</h1>
   </div>
 
   <div class="aca-page-layout-content">
-    <div class="main-content">
+    <div class="aca-main-content">
       <adf-document-list
         #documentList
         acaDocumentList
diff --git a/projects/aca-content/src/lib/dialogs/node-template/create-from-template.dialog.html b/projects/aca-content/src/lib/dialogs/node-template/create-from-template.dialog.html
index a2f375368f..510999d22f 100644
--- a/projects/aca-content/src/lib/dialogs/node-template/create-from-template.dialog.html
+++ b/projects/aca-content/src/lib/dialogs/node-template/create-from-template.dialog.html
@@ -1,5 +1,5 @@
-<h2 mat-dialog-title [innerHTML]="title"></h2>
-<div mat-dialog-content>
+<h2 mat-dialog-title [innerHTML]="title" class="app-create-from-template-title"></h2>
+<div mat-dialog-content class="app-create-from-template-content">
   <form [formGroup]="form" novalidate>
     <mat-form-field class="app-create-from-template-field">
       <input
@@ -41,12 +41,12 @@ <h2 mat-dialog-title [innerHTML]="title"></h2>
     </mat-form-field>
   </form>
 </div>
-<div mat-dialog-actions>
+<div mat-dialog-actions class="app-create-from-template-footer">
   <button mat-button mat-dialog-close data-automation-id="create-from-template-dialog-cancel-button">
     {{ 'NODE_FROM_TEMPLATE.CANCEL' | translate }}
   </button>
   <button
-    class="create"
+    class="app-create-from-template-footer-create-button"
     [disabled]="form.invalid"
     mat-button
     (click)="onSubmit()"
diff --git a/projects/aca-content/src/lib/dialogs/node-template/create-from-template.dialog.scss b/projects/aca-content/src/lib/dialogs/node-template/create-from-template.dialog.scss
index f52968cf33..4ca4c60273 100644
--- a/projects/aca-content/src/lib/dialogs/node-template/create-from-template.dialog.scss
+++ b/projects/aca-content/src/lib/dialogs/node-template/create-from-template.dialog.scss
@@ -4,54 +4,56 @@ app-create-from-template-dialog {
   margin-left: -24px;
   margin-right: -24px;
 
-  .mat-dialog-title {
-    margin-left: 24px;
-    margin-right: 24px;
-    font-size: 20px;
-    font-style: normal;
-    font-stretch: normal;
-    line-height: 1.6;
-    letter-spacing: -0.5px;
-    color: var(--theme-text-bold-color);
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-
-    .bold {
-      font-weight: 600;
+  .app-create-from-template {
+    &-title {
+      margin-left: 24px;
+      margin-right: 24px;
+      font-size: 20px;
+      font-style: normal;
+      font-stretch: normal;
+      line-height: 1.6;
+      letter-spacing: -0.5px;
+      color: var(--theme-text-bold-color);
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+
+      .bold {
+        font-weight: 600;
+      }
     }
-  }
 
-  .app-create-from-template-field {
-    width: 100%;
+    &-field {
+      width: 100%;
 
-    &:not(:last-of-type) {
-      margin-bottom: 20px;
+      &:not(:last-of-type) {
+        margin-bottom: 20px;
+      }
     }
-  }
 
-  .mat-dialog-content {
-    margin: 0 2px;
-    overflow: hidden;
-  }
+    &-content {
+      margin: 0 2px;
+      overflow: hidden;
+    }
 
-  .mat-dialog-actions {
-    padding: 8px 22px;
-    display: flex;
-    justify-content: flex-end;
-    color: var(--theme-secondary-text-color);
+    &-footer {
+      padding: 8px 22px;
+      display: flex;
+      justify-content: flex-end;
+      color: var(--theme-secondary-text-color);
 
-    button {
-      text-transform: uppercase;
-      font-weight: normal;
-    }
+      button {
+        text-transform: uppercase;
+        font-weight: normal;
+      }
 
-    .create[disabled] {
-      opacity: 0.6;
-    }
+      &-create-button[disabled] {
+        opacity: 0.6;
+      }
 
-    .create:enabled {
-      color: var(--theme-accent-color);
+      &-create-button:enabled {
+        color: var(--theme-accent-color);
+      }
     }
   }
 }
diff --git a/projects/aca-content/src/lib/ui/application.scss b/projects/aca-content/src/lib/ui/application.scss
index 2be7581910..29e879de64 100644
--- a/projects/aca-content/src/lib/ui/application.scss
+++ b/projects/aca-content/src/lib/ui/application.scss
@@ -19,7 +19,7 @@ body {
   }
 }
 
-[dir='rtl'] .mat-icon {
+[dir='rtl'] mat-icon {
   transform: scale(-1, 1);
 }
 
diff --git a/projects/aca-content/src/lib/ui/overrides/adf-pagination.theme.scss b/projects/aca-content/src/lib/ui/overrides/adf-pagination.theme.scss
index 61bd810314..7501bf9bb1 100644
--- a/projects/aca-content/src/lib/ui/overrides/adf-pagination.theme.scss
+++ b/projects/aca-content/src/lib/ui/overrides/adf-pagination.theme.scss
@@ -26,7 +26,7 @@
       .adf-pagination__actualinfo-block {
         padding-right: 12px;
 
-        .mat-menu-trigger {
+        button {
           display: none;
         }
       }
diff --git a/projects/aca-content/src/lib/ui/theme.scss b/projects/aca-content/src/lib/ui/theme.scss
index 08d30fa30c..b492548154 100644
--- a/projects/aca-content/src/lib/ui/theme.scss
+++ b/projects/aca-content/src/lib/ui/theme.scss
@@ -4,7 +4,7 @@
 @import 'variables/variables';
 @include custom-theme($custom-theme);
 
-.mat-toolbar {
+mat-toolbar {
   color: var(--theme-text-color, rgba(0, 0, 0, 0.54));
 }
 
@@ -48,11 +48,6 @@ mat-toolbar.mat-toolbar.mat-toolbar-single-row {
   }
 }
 
-.mat-chip.mat-standard-chip {
-  background-color: #efefef;
-  color: var(--theme-contrast-gray);
-}
-
 .adf-property-field {
   .adf-textitem-edit-icon.mat-icon {
     color: var(--theme-contrast-gray);
diff --git a/projects/aca-content/viewer/src/lib/components/viewer/viewer.component.html b/projects/aca-content/viewer/src/lib/components/viewer/viewer.component.html
index be796b728c..62b2ac4c9e 100644
--- a/projects/aca-content/viewer/src/lib/components/viewer/viewer.component.html
+++ b/projects/aca-content/viewer/src/lib/components/viewer/viewer.component.html
@@ -1,7 +1,7 @@
 <ng-container *ngIf="nodeId">
   <adf-alfresco-viewer
     [ngClass]="{
-      'right_side--hide': !showRightSide
+      'aca-right_side--hide': !showRightSide
     }"
     [maxRetries]="'viewer.maxRetries' | adfAppConfig"
     [nodeId]="nodeId"
diff --git a/projects/aca-content/viewer/src/lib/components/viewer/viewer.component.scss b/projects/aca-content/viewer/src/lib/components/viewer/viewer.component.scss
index 3e916c55bd..31ae358f5d 100644
--- a/projects/aca-content/viewer/src/lib/components/viewer/viewer.component.scss
+++ b/projects/aca-content/viewer/src/lib/components/viewer/viewer.component.scss
@@ -17,11 +17,11 @@
   }
 
   // todo: remove this when viewer supports extensions
-  .adf-viewer-toolbar .mat-toolbar > button:last-child {
+  .adf-viewer-toolbar > * > button:last-child {
     display: none;
   }
 
-  .adf-alfresco-viewer.right_side--hide .adf-viewer__sidebar__right {
+  .adf-alfresco-viewer.aca-right_side--hide .adf-viewer__sidebar__right {
     width: 0;
   }
 }
diff --git a/projects/aca-playwright-shared/src/api/api-client-factory.ts b/projects/aca-playwright-shared/src/api/api-client-factory.ts
index 23c646a69d..7adaa41133 100644
--- a/projects/aca-playwright-shared/src/api/api-client-factory.ts
+++ b/projects/aca-playwright-shared/src/api/api-client-factory.ts
@@ -41,7 +41,6 @@ import {
   TrashcanApi,
   PersonEntry
 } from '@alfresco/js-api';
-import { logger } from '@alfresco/adf-cli/scripts/logger';
 import { ActionTypes, Rule } from './rules-api';
 import { users } from '../base-config';
 import { Person, PersonModel } from './people-api-models';
@@ -145,7 +144,7 @@ export class ApiClientFactory {
     try {
       e = await this.alfrescoApi.login(user, userPassword);
     } catch (error) {
-      logger.error(`[API Client Factory] Log in user ${user} failed ${e}`);
+      console.error(`[API Client Factory] Log in user ${user} failed ${e}`);
       throw error;
     }
   }
@@ -155,7 +154,7 @@ export class ApiClientFactory {
     try {
       e = await this.alfrescoApi.login(user.username, user.password);
     } catch (error) {
-      logger.error(`[API Client Factory] Log in user ${user.username} failed ${e}`);
+      console.error(`[API Client Factory] Log in user ${user.username} failed ${e}`);
       throw error;
     }
   }
@@ -167,7 +166,7 @@ export class ApiClientFactory {
     try {
       return peopleApi.createPerson(person);
     } catch (error) {
-      logger.error('[API Client Factory] createUser failed : ', error);
+      console.error('[API Client Factory] createUser failed : ', error);
       return null;
     }
   }
@@ -178,7 +177,7 @@ export class ApiClientFactory {
     try {
       return peopleApi.updatePerson(username, { password: newPassword });
     } catch (error) {
-      logger.error('[API Client Factory] changePassword failed : ', error);
+      console.error('[API Client Factory] changePassword failed : ', error);
       return null;
     }
   }
diff --git a/projects/aca-playwright-shared/src/api/nodes-api.ts b/projects/aca-playwright-shared/src/api/nodes-api.ts
index b3b341fa1c..c83f563888 100755
--- a/projects/aca-playwright-shared/src/api/nodes-api.ts
+++ b/projects/aca-playwright-shared/src/api/nodes-api.ts
@@ -23,8 +23,7 @@
  */
 
 import { ApiClientFactory } from './api-client-factory';
-import { NodeChildAssociationPaging, NodeEntry } from '@alfresco/js-api';
-import { logger } from '@alfresco/adf-cli/scripts/logger';
+import { NodeChildAssociationPaging, NodeEntry, NodePaging } from '@alfresco/js-api';
 import { NodeContentTree, flattenNodeContentTree } from './node-content-tree';
 
 export class NodesApi {
@@ -51,7 +50,7 @@ export class NodesApi {
     try {
       return await this.createNode('cm:folder', name, parentId, title, description, null, author, null, aspectNames);
     } catch (error) {
-      logger.error(`${this.constructor.name} ${this.createFolder.name}`, error);
+      console.error(`${this.constructor.name} ${this.createFolder.name}`, error);
       return null;
     }
   }
@@ -68,7 +67,16 @@ export class NodesApi {
     try {
       return await this.createNode('cm:content', name, parentId, title, description, null, author, majorVersion, aspectNames);
     } catch (error) {
-      logger.error(`${this.constructor.name} ${this.createFile.name}`, error);
+      console.error(`${this.constructor.name} ${this.createFile.name}`, error);
+      return null;
+    }
+  }
+
+  async createFiles(names: string[], relativePath = '/'): Promise<NodePaging> {
+    try {
+      return await this.createContent({ files: names }, relativePath);
+    } catch (error) {
+      console.error(`${this.constructor.name} ${this.createFiles.name}: ${error}`);
       return null;
     }
   }
@@ -107,7 +115,7 @@ export class NodesApi {
         majorVersion
       });
     } catch (error) {
-      logger.error(`${this.constructor.name} ${this.createNode.name}`, error);
+      console.error(`${this.constructor.name} ${this.createNode.name}`, error);
       return null;
     }
   }
@@ -116,7 +124,7 @@ export class NodesApi {
     try {
       return this.apiService.nodes.updateNode(nodeId, { name: newName });
     } catch (error) {
-      logger.error(`${this.constructor.name} ${this.renameNode.name}`, error);
+      console.error(`${this.constructor.name} ${this.renameNode.name}`, error);
       return null;
     }
   }
@@ -132,21 +140,21 @@ export class NodesApi {
         await this.apiService.nodes.deleteNode(nodeId, { permanent });
       }
     } catch (error) {
-      logger.error(`${this.constructor.name} ${this.deleteNodes.name}`, error);
+      console.error(`${this.constructor.name} ${this.deleteNodes.name}`, error);
     }
   }
 
   /**
- * Delete all nodes of the currently logged in user
- * @param userNodeId The id of User node, all child nodes of "userNodeId" will be gathered as a list and deleted ( e.g.: "-my-" - User Homes folder)
- */
+   * Delete all nodes of the currently logged in user
+   * @param userNodeId The id of User node, all child nodes of "userNodeId" will be gathered as a list and deleted ( e.g.: "-my-" - User Homes folder)
+   */
   async deleteCurrentUserNodes(): Promise<void> {
     try {
       const userNodes = (await this.getNodeChildren('-my-')).list.entries;
       const userNodesIds = userNodes.map((nodeChild) => nodeChild.entry.id);
       await this.deleteNodes(userNodesIds);
     } catch (error) {
-      logger.error(`${this.constructor.name} ${this.deleteCurrentUserNodes.name}`, error);
+      console.error(`${this.constructor.name} ${this.deleteCurrentUserNodes.name}`, error);
     }
   }
 
@@ -156,15 +164,16 @@ export class NodesApi {
         await this.apiService.nodes.lockNode(nodeId, { type: lockType });
       }
     } catch (error) {
-      logger.error(`${this.constructor.name} ${this.lockNodes.name}`, error);
+      console.error(`${this.constructor.name} ${this.lockNodes.name}`, error);
     }
   }
 
-  async createContent(content: NodeContentTree, relativePath: string = '/'): Promise<NodeEntry | any> {
+  async createContent(content: NodeContentTree, relativePath: string = '/'): Promise<NodePaging> {
     try {
       return await this.apiService.nodes.createNode('-my-', flattenNodeContentTree(content, relativePath) as any);
     } catch (error) {
-      logger.error(`${this.constructor.name} ${this.createContent.name}`, error);
+      console.error(`${this.constructor.name} ${this.createContent.name}`, error);
+      return null;
     }
   }
 
@@ -172,7 +181,7 @@ export class NodesApi {
     try {
       return await this.apiService.nodes.getNode(id);
     } catch (error) {
-      logger.error(`${this.constructor.name} ${this.getNodeById.name}`, error);
+      console.error(`${this.constructor.name} ${this.getNodeById.name}`, error);
       return null;
     }
   }
@@ -182,7 +191,7 @@ export class NodesApi {
       const children = (await this.getNodeChildren(parentId)).list.entries;
       return children.find((elem) => elem.entry.name === name).entry.id || '';
     } catch (error) {
-      logger.error(`${this.constructor.name} ${this.getNodeIdFromParent.name}`, error);
+      console.error(`${this.constructor.name} ${this.getNodeIdFromParent.name}`, error);
       return '';
     }
   }
@@ -194,7 +203,7 @@ export class NodesApi {
       };
       return await this.apiService.nodes.listNodeChildren(nodeId, opts);
     } catch (error) {
-      logger.error(`${this.constructor.name} ${this.getNodeChildren.name}`, error);
+      console.error(`${this.constructor.name} ${this.getNodeChildren.name}`, error);
       return null;
     }
   }
@@ -203,7 +212,7 @@ export class NodesApi {
     try {
       await this.apiService.nodes.deleteNode(id, { permanent });
     } catch (error) {
-      logger.error(`${this.constructor.name} ${this.deleteNodeById.name}`, error);
+      console.error(`${this.constructor.name} ${this.deleteNodeById.name}`, error);
     }
   }
 
@@ -215,7 +224,7 @@ export class NodesApi {
         await this.deleteNodeById(nodeId);
       }
     } catch (error) {
-      logger.error('Admin Actions - cleanupNodeTemplatesItems failed : ', error);
+      console.error('Admin Actions - cleanupNodeTemplatesItems failed : ', error);
     }
   }
 
@@ -227,7 +236,7 @@ export class NodesApi {
         await this.deleteNodeById(nodeId);
       }
     } catch (error) {
-      logger.error('Admin Actions - cleanupSpaceTemplatesFolder failed : ', error);
+      console.error('Admin Actions - cleanupSpaceTemplatesFolder failed : ', error);
     }
   }
 
@@ -235,7 +244,7 @@ export class NodesApi {
     try {
       return this.getNodeIdFromParent('Node Templates', await this.getDataDictionaryId());
     } catch (error) {
-      logger.error('Admin Actions - getNodeTemplatesFolderId failed : ', error);
+      console.error('Admin Actions - getNodeTemplatesFolderId failed : ', error);
       return '';
     }
   }
@@ -244,17 +253,16 @@ export class NodesApi {
     try {
       return this.getNodeIdFromParent('Space Templates', await this.getDataDictionaryId());
     } catch (error) {
-      logger.error('Admin Actions - getSpaceTemplatesFolderId failed : ', error);
+      console.error('Admin Actions - getSpaceTemplatesFolderId failed : ', error);
       return '';
     }
   }
 
   private async getDataDictionaryId(): Promise<string> {
-    return this.getNodeIdFromParent('Data Dictionary', '-root-')
-      .catch((error) => {
-        logger.error('Admin Actions - getDataDictionaryId failed : ', error);
-        return '';
-      });
+    return this.getNodeIdFromParent('Data Dictionary', '-root-').catch((error) => {
+      console.error('Admin Actions - getDataDictionaryId failed : ', error);
+      return '';
+    });
   }
 
   async setGranularPermission(nodeId: string, inheritPermissions: boolean = false, username: string, role: string): Promise<NodeEntry | null> {
@@ -273,7 +281,7 @@ export class NodesApi {
     try {
       return await this.apiService.nodes.updateNode(nodeId, data);
     } catch (error) {
-      logger.error(`${this.constructor.name} ${this.setGranularPermission.name}`, error);
+      console.error(`${this.constructor.name} ${this.setGranularPermission.name}`, error);
       return null;
     }
   }
@@ -285,7 +293,7 @@ export class NodesApi {
 
       return this.setInheritPermissions(nodeId, false);
     } catch (error) {
-      logger.error('Admin Actions - removeUserAccessOnNodeTemplate failed : ', error);
+      console.error('Admin Actions - removeUserAccessOnNodeTemplate failed : ', error);
       return null;
     }
   }
@@ -297,7 +305,7 @@ export class NodesApi {
 
       return this.setInheritPermissions(nodeId, false);
     } catch (error) {
-      logger.error('Admin Actions - removeUserAccessOnSpaceTemplate failed : ', error);
+      console.error('Admin Actions - removeUserAccessOnSpaceTemplate failed : ', error);
       return null;
     }
   }
@@ -312,7 +320,7 @@ export class NodesApi {
     try {
       return await this.apiService.nodes.updateNode(nodeId, data);
     } catch (error) {
-      logger.error(`${this.constructor.name} ${this.setInheritPermissions.name}`, error);
+      console.error(`${this.constructor.name} ${this.setInheritPermissions.name}`, error);
       return null;
     }
   }
@@ -321,7 +329,7 @@ export class NodesApi {
     try {
       return this.apiService.nodes.updateNode(nodeId, { aspectNames });
     } catch (error) {
-      logger.error(`${this.constructor.name} ${this.addAspects.name}`, error);
+      console.error(`${this.constructor.name} ${this.addAspects.name}`, error);
       return null;
     }
   }
@@ -341,7 +349,7 @@ export class NodesApi {
       await this.addAspects(originalNodeId, ['app:linked']);
       return link;
     } catch (error) {
-      logger.error(`${this.constructor.name} ${this.createFileLink.name}`, error);
+      console.error(`${this.constructor.name} ${this.createFileLink.name}`, error);
       return null;
     }
   }
@@ -364,7 +372,7 @@ export class NodesApi {
       await this.addAspects(originalNodeId, ['app:linked']);
       return link;
     } catch (error) {
-      logger.error(`${this.constructor.name} ${this.createFolderLink.name}`, error);
+      console.error(`${this.constructor.name} ${this.createFolderLink.name}`, error);
       return null;
     }
   }
@@ -377,7 +385,7 @@ export class NodesApi {
 
       return this.createFileLink(nodeId, destinationParentId);
     } catch (error) {
-      logger.error('Admin Actions - createLinkToFileName failed : ', error);
+      console.error('Admin Actions - createLinkToFileName failed : ', error);
       return null;
     }
   }
@@ -389,7 +397,7 @@ export class NodesApi {
       const nodeId = await this.getNodeIdFromParent(originalFolderName, originalFolderParentId);
       return this.createFolderLink(nodeId, destinationParentId);
     } catch (error) {
-      logger.error('Admin Actions - createLinkToFolderName failed : ', error);
+      console.error('Admin Actions - createLinkToFolderName failed : ', error);
       return null;
     }
   }
diff --git a/projects/aca-playwright-shared/src/api/shared-links-api.ts b/projects/aca-playwright-shared/src/api/shared-links-api.ts
index c90089c6d9..48800b8cc9 100755
--- a/projects/aca-playwright-shared/src/api/shared-links-api.ts
+++ b/projects/aca-playwright-shared/src/api/shared-links-api.ts
@@ -22,7 +22,6 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { logger } from '@alfresco/adf-cli/scripts/logger';
 import { ApiClientFactory } from './api-client-factory';
 import { SharedLinkEntry, SharedLinkPaging } from '@alfresco/js-api';
 import { Utils } from '../utils';
@@ -61,7 +60,7 @@ export class SharedLinksApi {
         }
       }
     } catch (error) {
-      logger.error(`SharedLinksApi shareFilesByIds : catch : `, error);
+      console.error(`SharedLinksApi shareFilesByIds : catch : `, error);
     }
     return sharedLinks;
   }
@@ -73,7 +72,7 @@ export class SharedLinksApi {
       };
       return await this.apiService.share.listSharedLinks(opts);
     } catch (error) {
-      logger.error(`SharedLinksApi getSharedLinks : catch : `, error);
+      console.error(`SharedLinksApi getSharedLinks : catch : `, error);
       return new SharedLinkPaging;
     }
   }
@@ -92,8 +91,8 @@ export class SharedLinksApi {
 
       return Utils.retryCall(sharedFile);
     } catch (error) {
-      logger.error(`SharedLinksApi waitForFilesToBeShared :  catch : ${error}`);
-      logger.error(`\tWait timeout reached waiting for files to be shared`);
+      console.error(`SharedLinksApi waitForFilesToBeShared :  catch : ${error}`);
+      console.error(`\tWait timeout reached waiting for files to be shared`);
     }
   }
 }
diff --git a/projects/aca-playwright-shared/src/api/sites-api.ts b/projects/aca-playwright-shared/src/api/sites-api.ts
index 15625fb415..1b33218104 100755
--- a/projects/aca-playwright-shared/src/api/sites-api.ts
+++ b/projects/aca-playwright-shared/src/api/sites-api.ts
@@ -23,8 +23,7 @@
  */
 
 import { ApiClientFactory } from './api-client-factory';
-import { Site, SiteBodyCreate, SiteEntry, SiteMemberEntry, SiteMembershipBodyCreate, SiteMembershipBodyUpdate } from '@alfresco/js-api';
-import { logger } from '@alfresco/adf-cli/scripts/logger';
+import { Site, SiteBodyCreate, SiteEntry, SiteMemberEntry, SiteMembershipBodyCreate, SiteMembershipBodyUpdate, SiteMembershipRequestBodyCreate, SiteMembershipRequestEntry } from '@alfresco/js-api';
 
 export class SitesApi {
   private apiService: ApiClientFactory;
@@ -49,7 +48,7 @@ export class SitesApi {
     try {
       return await this.apiService.sites.createSite(site);
     } catch (error) {
-      logger.error(`SitesApi createSite : catch : `, error);
+      console.error(`SitesApi createSite : catch : `, error);
       return null;
     }
   }
@@ -58,7 +57,7 @@ export class SitesApi {
     try {
       return (await this.apiService.sites.listSiteContainers(siteId)).list.entries[0].entry.id;
     } catch (error) {
-      logger.error(`SitesApi getDocLibId : catch : `, error);
+      console.error(`SitesApi getDocLibId : catch : `, error);
       return null;
     }
   }
@@ -76,7 +75,7 @@ export class SitesApi {
         }
       }
     } catch (error) {
-      logger.error(`${this.constructor.name} ${this.deleteSites.name}`, error);
+      console.error(`${this.constructor.name} ${this.deleteSites.name}`, error);
     }
   }
 
@@ -88,7 +87,7 @@ export class SitesApi {
     try {
       return await this.apiService.sites.updateSiteMembership(siteId, userId, siteRole);
     } catch (error) {
-      logger.error(`SitesApi updateSiteMember : catch : `, error);
+      console.error(`SitesApi updateSiteMember : catch : `, error);
       return new SiteMemberEntry;
     }
   }
@@ -105,9 +104,41 @@ export class SitesApi {
       if (error.status === 409) {
         return this.updateSiteMember(siteId, userId, role);
       } else {
-        logger.error(`SitesApi addSiteMember : catch : `, error);
+        console.error(`SitesApi addSiteMember : catch : `, error);
         return new SiteMemberEntry;
       }
     }
   }
+
+  async createSiteMembershipRequestForPerson(personId: string, siteId: string): Promise<SiteMembershipRequestEntry> {
+    const body = {
+      id: siteId
+    } as SiteMembershipRequestBodyCreate;
+
+    try {
+      return await this.apiService.sites.createSiteMembershipRequestForPerson(personId, body);
+    } catch (error) {
+      console.error(`SitesApi createSiteMembershipRequestForPerson : catch : `, error);
+      return null;
+    }
+  }
+
+  async approveSiteMembershipRequest(siteId: string, inviteeId: string): Promise<SiteMemberEntry> {
+    try {
+      return await this.apiService.sites.approveSiteMembershipRequest(siteId, inviteeId);
+    } catch (error) {
+      console.error(`SitesApi approveSiteMembershipRequest : catch : `, error);
+      return null;
+    }
+  }
+
+  async hasMembershipRequest(personId: string, siteId: string): Promise<boolean> {
+    try {
+      const requests = (await this.apiService.sites.listSiteMembershipRequestsForPerson(personId)).list.entries.map((e) => e.entry.id);
+      return requests.includes(siteId);
+    } catch (error) {
+      console.error(`SitesApi hasMembershipRequest : catch : `, error);
+      return null;
+    }
+  }
 }
diff --git a/projects/aca-playwright-shared/src/api/trashcan-api.ts b/projects/aca-playwright-shared/src/api/trashcan-api.ts
index b5a4be5949..0bfeb462c6 100644
--- a/projects/aca-playwright-shared/src/api/trashcan-api.ts
+++ b/projects/aca-playwright-shared/src/api/trashcan-api.ts
@@ -23,7 +23,6 @@
  */
 
 import { ApiClientFactory } from './api-client-factory';
-import { logger } from '@alfresco/adf-cli/scripts/logger';
 
 export class TrashcanApi {
   private apiService = new ApiClientFactory();
@@ -51,7 +50,7 @@ export class TrashcanApi {
           }
         }
       } catch (error) {
-        logger.error('User Actions - emptyTrashcan failed : ', error);
+        console.error('User Actions - emptyTrashcan failed : ', error);
       }
     }
 
diff --git a/projects/aca-playwright-shared/src/fixtures/page-initialization.ts b/projects/aca-playwright-shared/src/fixtures/page-initialization.ts
index 39ba021cad..c4b28a0c26 100644
--- a/projects/aca-playwright-shared/src/fixtures/page-initialization.ts
+++ b/projects/aca-playwright-shared/src/fixtures/page-initialization.ts
@@ -38,7 +38,8 @@ import {
   LoginPage,
   NodesApi,
   SitesApi,
-  users
+  users,
+  FavoritesLibrariesPage
 } from '../';
 
 interface Pages {
@@ -51,6 +52,7 @@ interface Pages {
   favoritePage: FavoritesPage;
   trashPage: TrashPage;
   loginPage: LoginPage;
+  favoriteLibrariesPage: FavoritesLibrariesPage;
 }
 
 interface Api {
@@ -109,4 +111,7 @@ export const test = base.extend<Pages & Api>({
   myLibrariesPage: async ({ page }, use) => {
     await use(new MyLibrariesPage(page));
   },
+  favoriteLibrariesPage: async ({ page }, use) => {
+    await use(new FavoritesLibrariesPage(page));
+  }
 });
diff --git a/projects/aca-playwright-shared/src/page-objects/components/dataTable/data-table.component.ts b/projects/aca-playwright-shared/src/page-objects/components/dataTable/data-table.component.ts
index bc5669a233..4e51de20ba 100644
--- a/projects/aca-playwright-shared/src/page-objects/components/dataTable/data-table.component.ts
+++ b/projects/aca-playwright-shared/src/page-objects/components/dataTable/data-table.component.ts
@@ -216,6 +216,16 @@ export class DataTableComponent extends BaseComponent {
     }
   }
 
+  async selectMultiItem(name: string, name2: string): Promise<void> {
+    await this.page.keyboard.down('Meta');
+    let row = this.getRowByName(name);
+    await row.locator('[title="Size"]').click();
+    await row.locator('.adf-datatable-selected').waitFor({ state: 'attached' });
+    row = this.getRowByName(name2);
+    await row.locator('[title="Size"]').click();
+    await row.locator('.adf-datatable-selected').waitFor({ state: 'attached' });
+  }
+
   async hasCheckMarkIcon(itemName: string): Promise<boolean> {
     const row = this.getRowByName(itemName);
     return await row.locator('.adf-datatable-selected').isVisible();
diff --git a/projects/aca-playwright-shared/src/page-objects/components/dialogs/adf-confirm-dialog.component.ts b/projects/aca-playwright-shared/src/page-objects/components/dialogs/adf-confirm-dialog.component.ts
new file mode 100644
index 0000000000..0590fa0a6e
--- /dev/null
+++ b/projects/aca-playwright-shared/src/page-objects/components/dialogs/adf-confirm-dialog.component.ts
@@ -0,0 +1,39 @@
+/*!
+ * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
+ *
+ * Alfresco Example Content Application
+ *
+ * This file is part of the Alfresco Example Content Application.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * The Alfresco Example Content Application is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import { Page } from '@playwright/test';
+import { BaseComponent } from '../base.component';
+
+export class AdfConfirmDialogComponent extends BaseComponent {
+  private static rootElement = 'adf-confirm-dialog';
+
+  constructor(page: Page) {
+    super(page, AdfConfirmDialogComponent.rootElement);
+  }
+
+  getDialogTitle = (text: string) => this.getChild('[data-automation-id="adf-confirm-dialog-title"]', { hasText: text });
+  getDialogContent = (text: string) => this.getChild('[data-automation-id="adf-confirm-dialog-base-message"]', { hasText: text });
+  okButton = this.getChild('[data-automation-id="adf-confirm-dialog-confirmation"]');
+  cancelButton = this.getChild('[data-automation-id="adf-confirm-dialog-reject"]');
+}
diff --git a/projects/aca-playwright-shared/src/page-objects/components/dialogs/index.ts b/projects/aca-playwright-shared/src/page-objects/components/dialogs/index.ts
index c1504a172b..c1a913f24d 100644
--- a/projects/aca-playwright-shared/src/page-objects/components/dialogs/index.ts
+++ b/projects/aca-playwright-shared/src/page-objects/components/dialogs/index.ts
@@ -28,3 +28,4 @@ export * from './password-overlay-dialog.component';
 export * from './viewer-overlay-dialog.component';
 export * from './content-node-selector-dialog';
 export * from './create-from-template-dialog-component';
+export * from './adf-confirm-dialog.component';
diff --git a/projects/aca-playwright-shared/src/page-objects/components/pagination.component.ts b/projects/aca-playwright-shared/src/page-objects/components/pagination.component.ts
index e964929f38..cafbcb512c 100644
--- a/projects/aca-playwright-shared/src/page-objects/components/pagination.component.ts
+++ b/projects/aca-playwright-shared/src/page-objects/components/pagination.component.ts
@@ -23,8 +23,9 @@
  */
 
 import { BaseComponent } from './base.component';
-import { Page } from '@playwright/test';
+import { Locator, Page } from '@playwright/test';
 import { MatMenuComponent } from './dataTable/mat-menu.component';
+import { timeouts } from '../../utils';
 
 export enum PaginationActionsType {
   PageSizeSelector = 'Page size selector',
@@ -39,6 +40,14 @@ export class PaginationComponent extends BaseComponent {
     super(page, PaginationComponent.rootElement);
   }
 
+  private range = this.getChild('.adf-pagination__range');
+  private maxItems = this.getChild('.adf-pagination__max-items');
+  private currentPage = this.getChild('.adf-pagination__current-page');
+  private totalPages = this.getChild('.adf-pagination__total-pages');
+  private previousButton = this.getChild('.adf-pagination__previous-button');
+  private nextButton = this.getChild('.adf-pagination__next-button');
+  private maxItemsButton = this.getChild('.adf-pagination__max-items + button[mat-icon-button]');
+
   private itemsPerPageMenu = new MatMenuComponent(this.page);
 
   public currentPageLocator = this.getChild('.adf-pagination__current-page');
@@ -65,4 +74,96 @@ export class PaginationComponent extends BaseComponent {
       this.logger.info('Spinner was not present');
     }
   }
+
+  async getRange(): Promise<string> {
+    return this.range.innerText();
+  }
+
+  async getMaxItems(): Promise<string> {
+    return this.maxItems.innerText();
+  }
+
+  async getCurrentPage(): Promise<string> {
+    return this.currentPage.innerText();
+  }
+
+  async getTotalPages(): Promise<string> {
+    return this.totalPages.innerText();
+  }
+
+  async isPreviousEnabled(): Promise<boolean> {
+    return this.previousButton.isEnabled();
+  }
+
+  async isNextEnabled(): Promise<boolean> {
+    await this.page.waitForTimeout(timeouts.tiny);
+    return this.nextButton.isEnabled();
+  }
+
+  async clickOnNextPage(): Promise<void> {
+    try {
+      if (await this.isNextEnabled()) {
+        await this.nextButton.click();
+      }
+    } catch(error) {
+      throw new Error(`Failed on previous click: ${error}`);
+    }
+  }
+
+  async clickOnPreviousPage(): Promise<void> {
+    try {
+      if (await this.isPreviousEnabled()) {
+        await this.previousButton.click();
+      }
+    } catch(error) {
+      throw new Error(`Failed on previous click: ${error}`);
+    }
+  }
+
+  async openMaxItemsMenu(): Promise<void> {
+    try {
+      await this.maxItemsButton.waitFor({ state: 'visible' });
+      await this.maxItemsButton.click();
+    } catch (error) {
+      throw new Error(`Open max items catch: ${error}`);
+    }
+  }
+
+  async resetToDefaultPageSize(): Promise<void> {
+    try {
+      await this.openMaxItemsMenu();
+      await this.clickNthItem(1);
+      await this.page.waitForTimeout(timeouts.tiny);
+    } catch (error) {
+      throw new Error(`Reset to default page size catch: ${error}`);
+    }
+  }
+
+  async clickMenuItem(menuItem: string): Promise<void> {
+    try {
+      await this.page.getByRole('menuitem', { name: menuItem }).click();
+    } catch (e) {
+      throw new Error(`Click menu item catch : failed to click on: ${e}`);
+    }
+  }
+
+  async getNthItem(nth: number): Promise<Locator> {
+    return this.page.getByRole('menuitem').nth(nth - 1);
+  }
+
+  async getItemsCount(): Promise<number> {
+    return await this.page.getByRole('menuitem').count();
+  }
+
+  async clickNthItem(nth: number): Promise<void> {
+    try {
+      await (await this.getNthItem(nth)).click();
+    } catch (e) {
+      throw new Error(`Click nth menu item catch: ${e}`);
+    }
+  }
+
+  async closeMenu(): Promise<void> {
+    await this.page.keyboard.press('Escape');
+  }
 }
diff --git a/projects/aca-playwright-shared/src/page-objects/components/sidenav.component.ts b/projects/aca-playwright-shared/src/page-objects/components/sidenav.component.ts
index 1886414aec..58e43dafd3 100644
--- a/projects/aca-playwright-shared/src/page-objects/components/sidenav.component.ts
+++ b/projects/aca-playwright-shared/src/page-objects/components/sidenav.component.ts
@@ -37,7 +37,7 @@ export class SidenavComponent extends BaseComponent {
   private recentFiles = this.getChild(`[data-automation-id='app.navbar.recentFiles']`);
   private favorites = this.getChild(`[data-automation-id='app.navbar.favorites']`);
   private trash = this.getChild(`[data-automation-id='app.navbar.trashcan']`);
-  private sidenavToggle = this.getChild(`.sidenav-header-title-logo`);
+  private sidenavToggle = this.getChild(`.aca-sidenav-header-title-logo`);
   private sidenavExpand = this.page.getByTitle('Expand navigation menu');
   public expandedSidenav = this.page.locator(`[data-automation-id='expanded']`);
 
diff --git a/projects/aca-playwright-shared/src/page-objects/pages/favorites-libraries.page.ts b/projects/aca-playwright-shared/src/page-objects/pages/favorites-libraries.page.ts
index c6d57bb9ee..1f71a93050 100644
--- a/projects/aca-playwright-shared/src/page-objects/pages/favorites-libraries.page.ts
+++ b/projects/aca-playwright-shared/src/page-objects/pages/favorites-libraries.page.ts
@@ -26,7 +26,7 @@ import { Page } from '@playwright/test';
 import { BasePage } from './base.page';
 import { DataTableComponent, MatMenuComponent, SidenavComponent, ViewerComponent } from '../components';
 import { AcaHeader } from '../components/aca-header.component';
-import { AdfFolderDialogComponent, ViewerOverlayDialogComponent } from '../components/dialogs';
+import { AdfConfirmDialogComponent, AdfFolderDialogComponent, ViewerOverlayDialogComponent } from '../components/dialogs';
 
 export class FavoritesLibrariesPage extends BasePage {
   private static pageUrl = 'favorite/libraries';
@@ -42,4 +42,5 @@ export class FavoritesLibrariesPage extends BasePage {
   public viewer = new ViewerComponent(this.page);
   public viewerDialog = new ViewerOverlayDialogComponent(this.page);
   public sidenav = new SidenavComponent(this.page);
+  public confirmDialogComponent = new AdfConfirmDialogComponent(this.page);
 }
diff --git a/projects/aca-playwright-shared/src/page-objects/pages/favorites.page.ts b/projects/aca-playwright-shared/src/page-objects/pages/favorites.page.ts
index 7b1ef705d8..8574042dc1 100644
--- a/projects/aca-playwright-shared/src/page-objects/pages/favorites.page.ts
+++ b/projects/aca-playwright-shared/src/page-objects/pages/favorites.page.ts
@@ -24,7 +24,7 @@
 
 import { Page } from '@playwright/test';
 import { BasePage } from './base.page';
-import { DataTableComponent, MatMenuComponent, ViewerComponent, SidenavComponent } from '../components';
+import { DataTableComponent, MatMenuComponent, ViewerComponent, SidenavComponent, PaginationComponent } from '../components';
 import { AcaHeader } from '../components/aca-header.component';
 import { AdfFolderDialogComponent, ViewerOverlayDialogComponent } from '../components/dialogs';
 
@@ -42,4 +42,9 @@ export class FavoritesPage extends BasePage {
   public viewer = new ViewerComponent(this.page);
   public viewerDialog = new ViewerOverlayDialogComponent(this.page);
   public sidenav = new SidenavComponent(this.page);
+  public pagination = new PaginationComponent(this.page);
+
+  async waitForPageLoad() {
+    await this.page.waitForURL(`**/${FavoritesPage.pageUrl}`);
+  }
 }
diff --git a/projects/aca-playwright-shared/src/page-objects/pages/my-libraries.page.ts b/projects/aca-playwright-shared/src/page-objects/pages/my-libraries.page.ts
index 8fe5e44ba7..a6f13b4021 100644
--- a/projects/aca-playwright-shared/src/page-objects/pages/my-libraries.page.ts
+++ b/projects/aca-playwright-shared/src/page-objects/pages/my-libraries.page.ts
@@ -35,7 +35,8 @@ import {
   ContentNodeSelectorDialog,
   Breadcrumb,
   SidenavComponent,
-  CreateFromTemplateDialogComponent
+  CreateFromTemplateDialogComponent,
+  AdfConfirmDialogComponent
 } from '../components';
 
 export class MyLibrariesPage extends BasePage {
@@ -56,6 +57,7 @@ export class MyLibrariesPage extends BasePage {
   public sidenav = new SidenavComponent(this.page);
   public contentNodeSelector = new ContentNodeSelectorDialog(this.page);
   public createFromTemplateDialogComponent = new CreateFromTemplateDialogComponent(this.page);
+  public confirmDialogComponent = new AdfConfirmDialogComponent(this.page);
 
   async selectCreateLibrary(): Promise<void> {
     await this.acaHeader.createButton.click();
diff --git a/projects/aca-playwright-shared/src/page-objects/pages/personal-files.page.ts b/projects/aca-playwright-shared/src/page-objects/pages/personal-files.page.ts
index 4baaef79a7..1f2d76ac9c 100644
--- a/projects/aca-playwright-shared/src/page-objects/pages/personal-files.page.ts
+++ b/projects/aca-playwright-shared/src/page-objects/pages/personal-files.page.ts
@@ -35,7 +35,8 @@ import {
   DataTableComponent,
   MatMenuComponent,
   ViewerComponent,
-  SidenavComponent
+  SidenavComponent,
+  PaginationComponent
 } from '../components';
 
 export class PersonalFilesPage extends BasePage {
@@ -56,9 +57,18 @@ export class PersonalFilesPage extends BasePage {
   public breadcrumb = new Breadcrumb(this.page);
   public sidenav = new SidenavComponent(this.page);
   public createFromTemplateDialogComponent = new CreateFromTemplateDialogComponent(this.page);
+  public pagination = new PaginationComponent(this.page);
 
   async selectCreateFolder(): Promise<void> {
     await this.acaHeader.createButton.click();
     await this.matMenu.createFolder.click();
   }
+
+  async closeMenu(): Promise<void> {
+    await this.page.keyboard.press('Escape');
+  }
+
+  async waitForPageLoad() {
+    await this.page.waitForURL(`**/${PersonalFilesPage.pageUrl}`);
+  }
 }
diff --git a/projects/aca-playwright-shared/src/page-objects/pages/search.page.ts b/projects/aca-playwright-shared/src/page-objects/pages/search.page.ts
index 1e72c1fcf6..cd9b63d5b5 100644
--- a/projects/aca-playwright-shared/src/page-objects/pages/search.page.ts
+++ b/projects/aca-playwright-shared/src/page-objects/pages/search.page.ts
@@ -26,7 +26,7 @@ import { Page } from '@playwright/test';
 import { BasePage } from './base.page';
 import { DataTableComponent, MatMenuComponent, ViewerComponent, SearchInputComponent, SearchOverlayComponent, SidenavComponent } from '../components';
 import { AcaHeader } from '../components/aca-header.component';
-import { AdfFolderDialogComponent } from '../components/dialogs';
+import { AdfConfirmDialogComponent, AdfFolderDialogComponent } from '../components/dialogs';
 
 export class SearchPage extends BasePage {
   private static pageUrl = 'search';
@@ -43,4 +43,5 @@ export class SearchPage extends BasePage {
   public searchInput = new SearchInputComponent(this.page);
   public searchOverlay = new SearchOverlayComponent(this.page);
   public sidenav = new SidenavComponent(this.page);
+  public confirmDialogComponent = new AdfConfirmDialogComponent(this.page);
 }
diff --git a/projects/aca-playwright-shared/src/resources/test-data/index.ts b/projects/aca-playwright-shared/src/resources/test-data/index.ts
index 9d04786adc..88e9da4c2c 100644
--- a/projects/aca-playwright-shared/src/resources/test-data/index.ts
+++ b/projects/aca-playwright-shared/src/resources/test-data/index.ts
@@ -23,3 +23,4 @@
  */
 
 export * from './test-data-permissions';
+export * from './test-data-files-folders';
diff --git a/projects/aca-playwright-shared/src/resources/test-data/test-data-files-folders.ts b/projects/aca-playwright-shared/src/resources/test-data/test-data-files-folders.ts
new file mode 100644
index 0000000000..97c76b84ee
--- /dev/null
+++ b/projects/aca-playwright-shared/src/resources/test-data/test-data-files-folders.ts
@@ -0,0 +1,61 @@
+/*!
+ * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
+ *
+ * Alfresco Example Content Application
+ *
+ * This file is part of the Alfresco Example Content Application.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * The Alfresco Example Content Application is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import { Utils } from '@alfresco/playwright-shared';
+
+const random = Utils.random();
+const multipleSelToolbarPrimary = ['Download', 'View Details', 'More Actions'];
+
+// ---- folders ---
+
+const folderContextMenu = ['Download', 'Edit', 'Favorite', 'Move', 'Copy', 'Delete', 'Edit Aspects', 'Permissions', 'Manage Rules'];
+const folderFavContextMenu = ['Download', 'Edit', 'Remove Favorite', 'Move', 'Copy', 'Delete', 'Edit Aspects', 'Permissions', 'Manage Rules'];
+const folderToolbarMore = ['Edit', 'Favorite', 'Move', 'Copy', 'Delete', 'Edit Aspects', 'Permissions', 'Manage Rules'];
+const folderFavToolbarMore = ['Edit', 'Remove Favorite', 'Move', 'Copy', 'Delete', 'Edit Aspects', 'Permissions', 'Manage Rules'];
+
+export const folderFile = {
+  name: `folderActions-${random}`,
+  description: 'folder not favorite',
+  contextMenu: folderContextMenu,
+  toolbarPrimary: multipleSelToolbarPrimary,
+  toolbarMore: folderToolbarMore
+};
+
+export const folderFavFile = {
+  name: `folderActions-fav-${random}`,
+  contextMenu: folderFavContextMenu,
+  toolbarPrimary: multipleSelToolbarPrimary,
+  toolbarMore: folderFavToolbarMore
+};
+
+// ---- multiple selection ---
+
+const multipleSelContextMenu = ['Download', 'Favorite', 'Move', 'Copy', 'Delete', 'Permissions'];
+const multipleSelToolbarMore = ['Favorite', 'Move', 'Copy', 'Delete', 'Permissions'];
+
+export const multipleSelFile = {
+  contextMenu: multipleSelContextMenu,
+  toolbarPrimary: multipleSelToolbarPrimary,
+  toolbarMore: multipleSelToolbarMore
+};
diff --git a/projects/aca-playwright-shared/src/utils/exclude-tests.ts b/projects/aca-playwright-shared/src/utils/exclude-tests.ts
index aa89a8a291..223e77a224 100644
--- a/projects/aca-playwright-shared/src/utils/exclude-tests.ts
+++ b/projects/aca-playwright-shared/src/utils/exclude-tests.ts
@@ -6,16 +6,14 @@
  * agreement is prohibited.
  */
 
-import { logger } from '@alfresco/adf-cli/scripts/logger';
-
 export const getExcludedTestsRegExpArray = (excludedJson: any, projectName: string) => {
     const prefix = `[ 🎭 Playwright Excludes - ${projectName} ]`;
     const objectKeys = Object.keys(excludedJson);
 
     if (!objectKeys.length) {
-        logger.info(`${prefix} ✅ No excluded tests 🎉 `);
+        console.info(`${prefix} ✅ No excluded tests 🎉 `);
     } else {
-        logger.warn(`${prefix} ❌ Tests excluded because of 🐛 : ${objectKeys}`);
+        console.warn(`${prefix} ❌ Tests excluded because of 🐛 : ${objectKeys}`);
     }
 
     return objectKeys.map((key) => new RegExp(key));
diff --git a/projects/aca-playwright-shared/src/utils/timeouts.ts b/projects/aca-playwright-shared/src/utils/timeouts.ts
index 8d86987f25..62a5b16be4 100644
--- a/projects/aca-playwright-shared/src/utils/timeouts.ts
+++ b/projects/aca-playwright-shared/src/utils/timeouts.ts
@@ -32,7 +32,7 @@ export const timeouts = {
   large: 10000,
   extraLarge: 20 * 1000,
   globalTest: 45 * 1000,
-  extendedTest: 120 * 1000,
+  extendedTest: 150 * 1000,
   webServer: 240 * 1000,
   globalSpec: 60 * 10 * 1000
 };
diff --git a/projects/aca-shared/package.json b/projects/aca-shared/package.json
index 250c6a7f1a..f8e3b5f5b2 100644
--- a/projects/aca-shared/package.json
+++ b/projects/aca-shared/package.json
@@ -5,10 +5,10 @@
   "license": "LGPL-3.0",
   "scripts": {},
   "peerDependencies": {
-    "@alfresco/adf-content-services": ">=6.6.0",
-    "@alfresco/adf-core": ">=6.6.0",
-    "@alfresco/adf-extensions": ">=6.6.0",
-    "@alfresco/js-api": ">=7.2.0",
+    "@alfresco/adf-content-services": ">=6.6.0-7017572520",
+    "@alfresco/adf-core": ">=6.6.0-7017572520",
+    "@alfresco/adf-extensions": ">=6.6.0-7017572520",
+    "@alfresco/js-api": ">=7.5.0-7004095144",
     "@angular/animations": ">=14.1.3",
     "@angular/common": ">=14.1.3",
     "@angular/compiler": ">=14.1.3",
diff --git a/projects/aca-shared/rules/src/app.rules.spec.ts b/projects/aca-shared/rules/src/app.rules.spec.ts
index 8b95847101..4f3a848a60 100644
--- a/projects/aca-shared/rules/src/app.rules.spec.ts
+++ b/projects/aca-shared/rules/src/app.rules.spec.ts
@@ -858,6 +858,72 @@ describe('app.evaluators', () => {
       expect(app.canManagePermissions(context)).toBe(true);
     });
   });
+
+  describe('areTagsEnabled', () => {
+    it('should call context.appConfig.get with correct parameters', () => {
+      const context: any = {
+        appConfig: {
+          get: jasmine.createSpy()
+        }
+      };
+
+      app.areTagsEnabled(context);
+      expect(context.appConfig.get).toHaveBeenCalledWith('plugins.tags', true);
+    });
+
+    it('should return true if get from appConfig returns true', () => {
+      expect(
+        app.areTagsEnabled({
+          appConfig: {
+            get: () => true
+          }
+        } as any)
+      ).toBeTrue();
+    });
+
+    it('should return false if get from appConfig returns false', () => {
+      expect(
+        app.areTagsEnabled({
+          appConfig: {
+            get: () => false
+          }
+        } as any)
+      ).toBeFalse();
+    });
+  });
+
+  describe('areCategoriesEnabled', () => {
+    it('should call context.appConfig.get with correct parameters', () => {
+      const context: any = {
+        appConfig: {
+          get: jasmine.createSpy()
+        }
+      };
+
+      app.areCategoriesEnabled(context);
+      expect(context.appConfig.get).toHaveBeenCalledWith('plugins.categories', true);
+    });
+
+    it('should return true if get from appConfig returns true', () => {
+      expect(
+        app.areCategoriesEnabled({
+          appConfig: {
+            get: () => true
+          }
+        } as any)
+      ).toBeTrue();
+    });
+
+    it('should return false if get from appConfig returns false', () => {
+      expect(
+        app.areCategoriesEnabled({
+          appConfig: {
+            get: () => false
+          }
+        } as any)
+      ).toBeFalse();
+    });
+  });
 });
 
 function createTestContext(): TestRuleContext {
diff --git a/projects/aca-shared/rules/src/app.rules.ts b/projects/aca-shared/rules/src/app.rules.ts
index 1c741b1463..df9e89374d 100644
--- a/projects/aca-shared/rules/src/app.rules.ts
+++ b/projects/aca-shared/rules/src/app.rules.ts
@@ -636,3 +636,7 @@ export function isSmartFolder(context: RuleContext): boolean {
   }
   return false;
 }
+
+export const areTagsEnabled = (context: AcaRuleContext): boolean => context.appConfig.get('plugins.tags', true);
+
+export const areCategoriesEnabled = (context: AcaRuleContext): boolean => context.appConfig.get('plugins.categories', true);
diff --git a/projects/aca-shared/src/lib/components/locked-by/locked-by.component.scss b/projects/aca-shared/src/lib/components/locked-by/locked-by.component.scss
index 0a45cd42ef..585868d8f4 100644
--- a/projects/aca-shared/src/lib/components/locked-by/locked-by.component.scss
+++ b/projects/aca-shared/src/lib/components/locked-by/locked-by.component.scss
@@ -3,14 +3,14 @@
   align-items: center;
   color: var(--theme-text-color, rgba(0, 0, 0, 0.54));
 
-  .locked_by--icon {
+  &--icon {
     font-size: 14px;
     width: 14px;
     height: 14px;
   }
 
-  .locked_by--label,
-  .locked_by--name {
+  &--label,
+  &--name {
     font-size: 12px;
     padding: 0 2px;
   }
diff --git a/projects/aca-shared/src/lib/components/locked-by/locked-by.component.ts b/projects/aca-shared/src/lib/components/locked-by/locked-by.component.ts
index 5b67e5bece..b4619b9778 100644
--- a/projects/aca-shared/src/lib/components/locked-by/locked-by.component.ts
+++ b/projects/aca-shared/src/lib/components/locked-by/locked-by.component.ts
@@ -32,9 +32,9 @@ import { MatIconModule } from '@angular/material/icon';
   imports: [TranslateModule, MatIconModule],
   selector: 'aca-locked-by',
   template: `
-    <mat-icon class="locked_by--icon">lock</mat-icon>
-    <span class="locked_by--label">{{ 'APP.LOCKED_BY' | translate }}</span>
-    <span class="locked_by--name">{{ text }}</span>
+    <mat-icon class="aca-locked-by--icon">lock</mat-icon>
+    <span class="aca-locked-by--label">{{ 'APP.LOCKED_BY' | translate }}</span>
+    <span class="aca-locked-by--name">{{ text }}</span>
   `,
   styleUrls: ['./locked-by.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/projects/aca-shared/src/lib/components/open-in-app/open-in-app.component.html b/projects/aca-shared/src/lib/components/open-in-app/open-in-app.component.html
index 8c814acd01..81d2d56329 100644
--- a/projects/aca-shared/src/lib/components/open-in-app/open-in-app.component.html
+++ b/projects/aca-shared/src/lib/components/open-in-app/open-in-app.component.html
@@ -1,18 +1,18 @@
-<div class="alfresco-mobile-application-container">
+<div class="aca-mobile-application-container">
   <span>{{ 'APP.DIALOGS.MOBILE_APP.OPEN_ALFRESCO_MOBILE_APP' | translate }}</span>
-  <button mat-button class="cross-button" (click)="onCloseDialog()">
-    <mat-icon class="cross-icon">close</mat-icon>
+  <button mat-button class="aca-cross-button" (click)="onCloseDialog()">
+    <mat-icon class="aca-cross-button-icon">close</mat-icon>
   </button>
 </div>
 
-<div class="open-in-app-container">
-  <button mat-button (click)="openInApp()" data-automation-id="open-in-app-button" class="open-in-app" cdkFocusInitial>
+<div class="aca-open-in-app-container">
+  <button mat-button (click)="openInApp()" data-automation-id="open-in-app-button" class="aca-open-in-app-container-button" cdkFocusInitial>
     <span>{{ 'APP.DIALOGS.MOBILE_APP.MOBILE_APP_BUTTON_LABEL' | translate }}</span>
   </button>
 </div>
 
-<div class="download-app-container" *ngIf="appStoreUrl">
-  <button mat-button data-automation-id="download-app-button" class="download-app-button" (click)="downloadIosApp()">
+<div class="aca-download-app-container" *ngIf="appStoreUrl">
+  <button mat-button data-automation-id="download-app-button" class="aca-download-app-container-button" (click)="downloadIosApp()">
     <span>{{ 'APP.DIALOGS.MOBILE_APP.DOWNLOAD_APP_BUTTON_LABEL' | translate }}</span>
   </button>
 </div>
diff --git a/projects/aca-shared/src/lib/components/open-in-app/open-in-app.component.scss b/projects/aca-shared/src/lib/components/open-in-app/open-in-app.component.scss
index 36cf82b28b..6943d0a893 100644
--- a/projects/aca-shared/src/lib/components/open-in-app/open-in-app.component.scss
+++ b/projects/aca-shared/src/lib/components/open-in-app/open-in-app.component.scss
@@ -1,5 +1,5 @@
 aca-open-in-app {
-  .open-in-app-container {
+  .aca-open-in-app-container {
     display: flex;
     place-content: center;
     padding: 0;
@@ -7,28 +7,34 @@ aca-open-in-app {
     background-color: var(--theme-primary-color);
     color: var(--theme-about-panel-background-color);
     margin-top: 12px;
-  }
-
-  .open-in-app {
-    overflow-x: hidden;
-    font-size: 16px;
-    width: 100%;
-    padding: 0;
-    height: 48px;
 
-    &:focus-visible {
-      outline: none;
-      border-radius: unset;
+    &-button {
+      overflow-x: hidden;
+      font-size: 16px;
+      width: 100%;
+      padding: 0;
+      height: 48px;
+
+      &:focus-visible {
+        outline: none;
+        border-radius: unset;
+      }
     }
   }
 
-  .download-app-container {
+  .aca-download-app-container {
     display: flex;
     place-content: center;
     margin-top: 12px;
+
+    &-button {
+      background: var(--theme-dialog-background-color);
+      color: var(--theme-primary-color);
+      font-size: 14px;
+    }
   }
 
-  .alfresco-mobile-application-container {
+  .aca-mobile-application-container {
     display: flex;
     flex-direction: row;
     justify-content: space-between;
@@ -37,28 +43,18 @@ aca-open-in-app {
     padding: 6px 0;
   }
 
-  .cross-button {
+  .aca-cross-button {
     padding-right: 0;
 
     &:focus-visible {
       outline: none;
       border-radius: unset;
     }
-  }
-
-  .cross-icon {
-    font-weight: bold;
-    font-size: 21px;
-    height: 21px;
-  }
 
-  .download-app-button {
-    background: var(--theme-dialog-background-color);
-    color: var(--theme-primary-color);
-    font-size: 14px;
-  }
-
-  .mat-dialog-container {
-    padding: 8px 24px 24px;
+    &-icon {
+      font-weight: bold;
+      font-size: 21px;
+      height: 21px;
+    }
   }
 }
diff --git a/projects/aca-shared/src/lib/components/page-layout/page-layout-content.component.ts b/projects/aca-shared/src/lib/components/page-layout/page-layout-content.component.ts
index 22537d4091..b2e0f9a2b2 100644
--- a/projects/aca-shared/src/lib/components/page-layout/page-layout-content.component.ts
+++ b/projects/aca-shared/src/lib/components/page-layout/page-layout-content.component.ts
@@ -35,6 +35,6 @@ import { Component, ViewEncapsulation, ChangeDetectionStrategy, Input, HostBindi
 })
 export class PageLayoutContentComponent {
   @Input()
-  @HostBinding('class.scrollable')
+  @HostBinding('class.aca-scrollable')
   scrollable = false;
 }
diff --git a/projects/aca-shared/src/lib/components/page-layout/page-layout.component.scss b/projects/aca-shared/src/lib/components/page-layout/page-layout.component.scss
index 2e1049fc4e..d5f0fd36b9 100644
--- a/projects/aca-shared/src/lib/components/page-layout/page-layout.component.scss
+++ b/projects/aca-shared/src/lib/components/page-layout/page-layout.component.scss
@@ -24,7 +24,7 @@
     }
 
     .aca-toolbar-action {
-      .mat-button-base {
+      button {
         display: flex;
         justify-content: center;
         align-items: center;
@@ -43,27 +43,27 @@
     @include flex-row;
   }
 
-  .main-content {
+  .aca-main-content {
     @include flex-column;
   }
 
-  .scrollable {
+  .aca-scrollable {
     overflow: auto;
 
-    .main-content {
+    .aca-main-content {
       overflow: auto;
     }
   }
 }
 
 [dir='rtl'] .aca-page-layout {
-  .main-content {
+  .aca-main-content {
     border-left: 1px solid var(--theme-border-color, rgba(0, 0, 0, 0.07));
   }
 }
 
 [dir='ltr'] .aca-page-layout {
-  .main-content {
+  .aca-main-content {
     border-right: 1px solid var(--theme-border-color, rgba(0, 0, 0, 0.07));
   }
 }
diff --git a/projects/aca-shared/src/lib/components/page-layout/page-layout.md b/projects/aca-shared/src/lib/components/page-layout/page-layout.md
index 6aa6d4ad37..66b5c03dba 100644
--- a/projects/aca-shared/src/lib/components/page-layout/page-layout.md
+++ b/projects/aca-shared/src/lib/components/page-layout/page-layout.md
@@ -56,13 +56,13 @@ Displayed only when an error is detected by the parent container component.
 ## Layout Content
 
 You can provide any Angular component or HTML element as the main content.
-In addition, you can use `scrollable` class to make the content scroll.
+In addition, you can use `aca-scrollable` class to make the content scroll.
 
 The content is displayed only when there are no errors detected.
 
 ```html
 <aca-page-layout>
-  <div class="aca-page-layout-content scrollable">
+  <div class="aca-page-layout-content aca-scrollable">
     <!-- Main Content -->
   </div>
 </aca-page-layout>
diff --git a/projects/aca-shared/src/lib/components/toolbar/toolbar.component.html b/projects/aca-shared/src/lib/components/toolbar/toolbar.component.html
index 24eb310f86..953f9caaea 100644
--- a/projects/aca-shared/src/lib/components/toolbar/toolbar.component.html
+++ b/projects/aca-shared/src/lib/components/toolbar/toolbar.component.html
@@ -1,4 +1,4 @@
-<mat-toolbar>
+<mat-toolbar class="aca-toolbar">
   <ng-container *ngFor="let item of items; trackBy: trackByActionId">
     <aca-toolbar-action [actionRef]="item"></aca-toolbar-action>
   </ng-container>
diff --git a/projects/aca-shared/src/lib/components/toolbar/toolbar.component.scss b/projects/aca-shared/src/lib/components/toolbar/toolbar.component.scss
index f92293e970..c2e9eb05e8 100644
--- a/projects/aca-shared/src/lib/components/toolbar/toolbar.component.scss
+++ b/projects/aca-shared/src/lib/components/toolbar/toolbar.component.scss
@@ -1,5 +1,5 @@
 aca-toolbar {
-  .mat-toolbar {
+  .aca-toolbar {
     min-height: 48px;
     color: var(--adf-theme-foreground-text-color-054);
     background-color: inherit;
@@ -7,16 +7,6 @@ aca-toolbar {
     padding: 0;
   }
 
-  .mat-toolbar-row {
-    height: 48px;
-    font-size: var(--theme-body-1-font-size);
-    white-space: normal;
-  }
-
-  .mat-toolbar-single-row {
-    height: 64px;
-  }
-
   .aca-toolbar-divider {
     height: 24px;
     width: 1px;
diff --git a/projects/aca-shared/src/lib/services/app.extension.service.spec.ts b/projects/aca-shared/src/lib/services/app.extension.service.spec.ts
index 6f6af0ceab..632eb238cb 100644
--- a/projects/aca-shared/src/lib/services/app.extension.service.spec.ts
+++ b/projects/aca-shared/src/lib/services/app.extension.service.spec.ts
@@ -1049,13 +1049,14 @@ describe('AppExtensionService', () => {
   });
 
   describe('search', () => {
+    let config: ExtensionConfig;
+
     beforeEach(() => {
       extensions.setEvaluators({
         visible: () => true,
         notVisible: () => false
       });
-
-      applyConfig({
+      config = {
         $id: 'test',
         $name: 'test',
         $version: '1.0.0',
@@ -1105,22 +1106,64 @@ describe('AppExtensionService', () => {
             }
           ]
         }
-      });
+      };
     });
 
     it('should load the search extension', () => {
+      applyConfig(config);
       expect(service.search.length).toBe(2);
       expect(service.search[0].id).toBe('app.search');
       expect(service.search[1].id).toBe('app.search-1');
     });
 
     it('should not load the disabled search extension', () => {
+      applyConfig(config);
       expect(service.search.find(({ id }) => id === 'app.search-2')).toBe(undefined, 'disabled configuration shown in the result');
     });
 
     it('should not load the not visible search extension', () => {
+      applyConfig(config);
       expect(service.search.find(({ id }) => id === 'app.search-3')).toBe(undefined, 'not visible configuration shown in the result');
     });
+
+    it('should contain category if it has no rules field', () => {
+      applyConfig(config);
+      const search = service.search[0];
+      expect(search.categories.length).toBe(1);
+      expect(search.categories[0].id).toBe('size');
+    });
+
+    it('should contain category if it has no visible field in rules', () => {
+      config.features.search[0].categories[0].rules = {};
+
+      applyConfig(config);
+      const search = service.search[0];
+      expect(search.categories.length).toBe(1);
+      expect(search.categories[0].id).toBe('size');
+    });
+
+    it('should contain category if it has visible field and extensions.evaluateRule returns true', () => {
+      spyOn(extensions, 'evaluateRule').and.returnValue(true);
+      const visible = 'test';
+      config.features.search[0].categories[0].rules = { visible };
+
+      applyConfig(config);
+      const search = service.search[0];
+      expect(extensions.evaluateRule).toHaveBeenCalledWith(visible, service);
+      expect(search.categories.length).toBe(1);
+      expect(search.categories[0].id).toBe('size');
+    });
+
+    it('should not contain category if it has visible field and extensions.evaluateRule returns false', () => {
+      spyOn(extensions, 'evaluateRule').and.returnValue(false);
+      const visible = 'test';
+      config.features.search[0].categories[0].rules = { visible };
+
+      applyConfig(config);
+      const search = service.search[0];
+      expect(extensions.evaluateRule).toHaveBeenCalledWith(visible, service);
+      expect(search.categories.length).toBe(0);
+    });
   });
 
   describe('rules', () => {
diff --git a/projects/aca-shared/src/lib/services/app.extension.service.ts b/projects/aca-shared/src/lib/services/app.extension.service.ts
index 81c01e6a0c..15ada1b5b9 100644
--- a/projects/aca-shared/src/lib/services/app.extension.service.ts
+++ b/projects/aca-shared/src/lib/services/app.extension.service.ts
@@ -56,6 +56,7 @@ import { ViewerRules } from '../models/viewer.rules';
 import { Badge, SettingsGroupRef } from '../models/types';
 import { NodePermissionService } from '../services/node-permission.service';
 import { filter, map } from 'rxjs/operators';
+import { SearchCategory } from '@alfresco/adf-content-services';
 
 @Injectable({
   providedIn: 'root'
@@ -167,6 +168,9 @@ export class AppExtensionService implements RuleContext {
     this.sidebarTabs = this.loader.getElements<SidebarTabRef>(config, 'features.sidebar.tabs');
     this.contentMetadata = this.loadContentMetadata(config);
     this.search = this.loadSearchForms(config);
+    this.search?.forEach((searchSet) => {
+      searchSet.categories = searchSet.categories?.filter((category) => this.filterVisible(category));
+    });
 
     this.documentListPresets = {
       libraries: this.getDocumentListPreset(config, 'libraries'),
@@ -482,7 +486,7 @@ export class AppExtensionService implements RuleContext {
     };
   }
 
-  filterVisible(action: ContentActionRef | SettingsGroupRef | SidebarTabRef | DocumentListPresetRef): boolean {
+  filterVisible(action: ContentActionRef | SettingsGroupRef | SidebarTabRef | DocumentListPresetRef | SearchCategory): boolean {
     if (action?.rules?.visible) {
       return this.extensions.evaluateRule(action.rules.visible, this);
     }
diff --git a/projects/aca-testing-shared/src/components/breadcrumb/breadcrumb.ts b/projects/aca-testing-shared/src/components/breadcrumb/breadcrumb.ts
index c058f8de3b..4ee63adee0 100755
--- a/projects/aca-testing-shared/src/components/breadcrumb/breadcrumb.ts
+++ b/projects/aca-testing-shared/src/components/breadcrumb/breadcrumb.ts
@@ -38,9 +38,4 @@ export class Breadcrumb extends Component {
       return str.split('\nchevron_right')[0];
     });
   }
-
-  async clickItem(name: string): Promise<void> {
-    const elem = this.byCss(`.adf-breadcrumb-item[title=${name}]`);
-    await elem.click();
-  }
 }
diff --git a/projects/aca-testing-shared/src/components/components.ts b/projects/aca-testing-shared/src/components/components.ts
index 494a2774ea..988a56ede7 100755
--- a/projects/aca-testing-shared/src/components/components.ts
+++ b/projects/aca-testing-shared/src/components/components.ts
@@ -28,7 +28,6 @@ export * from './pageLayoutHeader/pageLayoutHeader';
 export * from './data-table/data-table';
 export * from './dialog/confirm-dialog';
 export * from './dialog/create-edit-folder-dialog';
-export * from './dialog/password-dialog';
 export * from './pagination/pagination';
 export * from './sidenav/sidenav';
 export * from './toolbar/toolbar';
diff --git a/projects/aca-testing-shared/src/components/data-table/data-table.ts b/projects/aca-testing-shared/src/components/data-table/data-table.ts
index 558f16391c..f0f3fc4181 100755
--- a/projects/aca-testing-shared/src/components/data-table/data-table.ts
+++ b/projects/aca-testing-shared/src/components/data-table/data-table.ts
@@ -46,14 +46,11 @@ export class DataTable extends Component {
   head = this.byCss('.adf-datatable-header');
   body = this.byCss('.adf-datatable-body');
   emptyList = this.byCss('div.adf-no-content-container');
-  emptyFolderDragAndDrop = this.byCss('.adf-empty-list_template .adf-empty-folder');
   emptyListTitle = this.byCss('.adf-empty-content__title');
   emptyListSubtitle = this.byCss('.adf-empty-content__subtitle');
   emptySearchText = this.byCss('.empty-search__text');
   selectedRow = this.byCss('.adf-datatable-row.adf-is-selected');
 
-  columnModified = this.byCss('.adf-datatable-header [data-automation-id="auto_id_modifiedAt"]');
-
   menu = new Menu();
 
   constructor(ancestor?: string) {
@@ -103,19 +100,6 @@ export class DataTable extends Component {
     }
   }
 
-  async sortByModified(order: 'asc' | 'desc'): Promise<void> {
-    let sortOrder = await this.getSortingOrder();
-    const sortColumn = await this.getSortedColumnHeaderText();
-
-    if (sortColumn !== 'Modified') {
-      await this.columnModified.click();
-      sortOrder = await this.getSortingOrder();
-    }
-    if (sortOrder !== order) {
-      await this.columnModified.click();
-    }
-  }
-
   private getSortedColumnHeader(): ElementFinder {
     const locator = by.css(DataTable.selectors.sortedColumnHeader);
     return this.head.element(locator);
@@ -150,12 +134,6 @@ export class DataTable extends Component {
     return this.body.all(by.css('.adf-datatable-row.adf-is-selected'));
   }
 
-  async getSelectedRowsNames(): Promise<string[]> {
-    return this.getSelectedRows().map((row) => {
-      return row.element(by.css('.adf-datatable-cell[title="Name"]')).getText();
-    });
-  }
-
   async getSelectedRowsCount(): Promise<number> {
     return this.getSelectedRows().count();
   }
@@ -174,10 +152,6 @@ export class DataTable extends Component {
     return this.getRowByName(name, location).all(by.css(DataTable.selectors.cell));
   }
 
-  async getRowCellsCount(itemName: string): Promise<number> {
-    return this.getRowCells(itemName).count();
-  }
-
   private getRowFirstCell(name: string, location: string = ''): ElementFinder {
     return this.getRowCells(name, location).get(0);
   }
@@ -213,19 +187,11 @@ export class DataTable extends Component {
   async getLockOwner(itemName: string, location: string = ''): Promise<string> {
     if (await this.hasLockOwnerInfo(itemName, location)) {
       const row = this.getRowByName(itemName, location);
-      return row.$(DataTable.selectors.lockOwner).$('.locked_by--name').getText();
+      return row.$(DataTable.selectors.lockOwner).$('.aca-locked-by--name').getText();
     }
     return '';
   }
 
-  private getNameLink(itemName: string): ElementFinder {
-    return this.getRowNameCell(itemName).$('.adf-datatable-link [role="link"]');
-  }
-
-  async hasLinkOnName(itemName: string): Promise<boolean> {
-    return this.getNameLink(itemName).isPresent();
-  }
-
   async doubleClickOnRowByName(name: string, location: string = ''): Promise<void> {
     try {
       const item = this.getRowFirstCell(name, location);
@@ -262,15 +228,6 @@ export class DataTable extends Component {
     }
   }
 
-  async clickItem(name: string, location: string = ''): Promise<void> {
-    const item = this.getRowFirstCell(name, location);
-    await item.click();
-  }
-
-  async clickNameLink(itemName: string): Promise<void> {
-    await this.getNameLink(itemName).click();
-  }
-
   async selectMultipleItems(names: string[], location: string = ''): Promise<void> {
     await this.clearSelection();
     await Utils.pressCmd();
@@ -298,12 +255,6 @@ export class DataTable extends Component {
     await browser.actions().click(protractor.Button.RIGHT).perform();
   }
 
-  async rightClickOnMultipleSelection(): Promise<void> {
-    const itemFromSelection = this.getSelectedRows().get(0);
-    await browser.actions().mouseMove(itemFromSelection).perform();
-    await browser.actions().click(protractor.Button.RIGHT).perform();
-  }
-
   private getItemLocationEl(name: string): ElementFinder {
     return this.getRowByName(name).element(by.css('.aca-location-link'));
   }
@@ -330,14 +281,6 @@ export class DataTable extends Component {
     return this.emptyList.isPresent();
   }
 
-  async getEmptyDragAndDropText(): Promise<string> {
-    const isEmpty = await this.emptyFolderDragAndDrop.isDisplayed();
-    if (isEmpty) {
-      return this.emptyFolderDragAndDrop.getText();
-    }
-    return '';
-  }
-
   async getEmptyStateTitle(): Promise<string> {
     const isEmpty = await this.isEmpty();
     if (isEmpty) {
@@ -369,11 +312,6 @@ export class DataTable extends Component {
     });
   }
 
-  async hasContextMenu(): Promise<boolean> {
-    const count = await this.menu.getItemsCount();
-    return count > 0;
-  }
-
   async getLibraryRole(name: string): Promise<string> {
     return this.getRowByName(name).element(by.css('adf-library-role-column')).getText();
   }
@@ -413,26 +351,4 @@ export class DataTable extends Component {
   getNthSearchResultsRow(nth: number): ElementFinder {
     return this.getSearchResultsRows().get(nth - 1);
   }
-
-  private getSearchResultsRowByName(name: string, location: string = ''): ElementFinder {
-    if (location) {
-      return this.body
-        .all(by.cssContainingText(DataTable.selectors.searchResultsRow, name))
-        .filter(async (elem) => browser.isElementPresent(elem.element(by.cssContainingText(DataTable.selectors.searchResultsRowLine, location))))
-        .first();
-    }
-    return this.body.element(by.cssContainingText(DataTable.selectors.searchResultsRow, name));
-  }
-
-  private getSearchResultNameLink(itemName: string, location: string = ''): ElementFinder {
-    return this.getSearchResultsRowByName(itemName, location).$('.link');
-  }
-
-  async hasLinkOnSearchResultName(itemName: string, location: string = ''): Promise<boolean> {
-    return this.getSearchResultNameLink(itemName, location).isPresent();
-  }
-
-  async clickSearchResultNameLink(itemName: string, location: string = ''): Promise<void> {
-    await this.getSearchResultNameLink(itemName, location).click();
-  }
 }
diff --git a/projects/aca-testing-shared/src/components/datetime-picker/datetime-picker.ts b/projects/aca-testing-shared/src/components/datetime-picker/datetime-picker.ts
index 5858604f76..ee11e4332e 100755
--- a/projects/aca-testing-shared/src/components/datetime-picker/datetime-picker.ts
+++ b/projects/aca-testing-shared/src/components/datetime-picker/datetime-picker.ts
@@ -29,12 +29,7 @@ import { BrowserActions } from '@alfresco/adf-testing';
 
 export class DateTimePicker extends Component {
   calendar = this.byCss('.mat-datepicker-popup', browser);
-  headerTime = this.byCss('.mat-datetimepicker-calendar-header-time');
-  headerDate = this.byCss('.mat-datetimepicker-calendar-header-date');
-  headerYear = this.byCss('.mat-datetimepicker-calendar-header-year');
   dayPicker = this.byCss('mat-month-view');
-  hourPicker = this.byCss('.mat-datetimepicker-clock-hours');
-  minutePicker = this.byCss('.mat-datetimepicker-clock-minutes');
   nextMonthBtn = this.byCss('.mat-calendar-next-button');
   rootElemLocator = by.css('.mat-datepicker-popup');
 
@@ -53,7 +48,7 @@ export class DateTimePicker extends Component {
   }
 
   async pickDateTime(): Promise<void> {
-    const today = new Date()
+    const today = new Date();
     const nextAvailableDay = new Date();
     nextAvailableDay.setDate(today.getDate() + 2);
     if (nextAvailableDay.getMonth() !== today.getMonth()) {
@@ -67,16 +62,4 @@ export class DateTimePicker extends Component {
     const firstActiveDayElem = this.dayPicker.element(by.cssContainingText(firstActiveDay, `${day}`));
     await BrowserActions.click(firstActiveDayElem);
   }
-
-  async selectHour(hour: number): Promise<void> {
-    const clockCellClass = '.mat-datetimepicker-clock-cell';
-    const selectedHourElem = this.hourPicker.element(by.cssContainingText(clockCellClass, `${hour}`));
-    await BrowserActions.click(selectedHourElem);
-  }
-
-  async selectMinute(minute: number): Promise<void> {
-    const clockCellClass = '.mat-datetimepicker-clock-cell';
-    const selectedMinuteElem = this.minutePicker.element(by.cssContainingText(clockCellClass, `${minute}`));
-    await BrowserActions.click(selectedMinuteElem);
-  }
 }
diff --git a/projects/aca-testing-shared/src/components/dialog/confirm-dialog.ts b/projects/aca-testing-shared/src/components/dialog/confirm-dialog.ts
index ad20c6e739..b601478a45 100755
--- a/projects/aca-testing-shared/src/components/dialog/confirm-dialog.ts
+++ b/projects/aca-testing-shared/src/components/dialog/confirm-dialog.ts
@@ -27,7 +27,6 @@ import { GenericDialog } from '../dialog/generic-dialog';
 import { isPresentAndEnabled } from '../../utilities/utils';
 
 export class ConfirmDialog extends GenericDialog {
-  okButton = this.childElement(by.buttonText('OK'));
   cancelButton = this.childElement(by.buttonText('Cancel'));
   keepButton = this.childElement(by.buttonText('Keep'));
   deleteButton = this.childElement(by.buttonText('Delete'));
@@ -41,10 +40,6 @@ export class ConfirmDialog extends GenericDialog {
     return this.content.getText();
   }
 
-  async isOkEnabled(): Promise<boolean> {
-    return isPresentAndEnabled(this.okButton);
-  }
-
   async isCancelEnabled(): Promise<boolean> {
     return isPresentAndEnabled(this.cancelButton);
   }
diff --git a/projects/aca-testing-shared/src/components/dialog/create-edit-folder-dialog.ts b/projects/aca-testing-shared/src/components/dialog/create-edit-folder-dialog.ts
index 011658a99f..843ed412e3 100755
--- a/projects/aca-testing-shared/src/components/dialog/create-edit-folder-dialog.ts
+++ b/projects/aca-testing-shared/src/components/dialog/create-edit-folder-dialog.ts
@@ -49,10 +49,6 @@ export class CreateOrEditFolderDialog extends GenericDialog {
     return isPresentAndEnabled(this.updateButton);
   }
 
-  async isCreateButtonEnabled(): Promise<boolean> {
-    return isPresentAndEnabled(this.createButton);
-  }
-
   async isCancelButtonEnabled(): Promise<boolean> {
     return isPresentAndEnabled(this.cancelButton);
   }
diff --git a/projects/aca-testing-shared/src/components/dialog/create-from-template-dialog.ts b/projects/aca-testing-shared/src/components/dialog/create-from-template-dialog.ts
deleted file mode 100755
index 8c68319166..0000000000
--- a/projects/aca-testing-shared/src/components/dialog/create-from-template-dialog.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-/*!
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Alfresco Example Content Application
- *
- * This file is part of the Alfresco Example Content Application.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The Alfresco Example Content Application is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import { by } from 'protractor';
-import { GenericDialog } from '../dialog/generic-dialog';
-import { isPresentAndDisplayed, isPresentAndEnabled, typeText } from '../../utilities/utils';
-import { BrowserActions } from '@alfresco/adf-testing';
-
-export class CreateFromTemplateDialog extends GenericDialog {
-  createButton = this.childElement(by.cssContainingText('.mat-dialog-actions button', 'Create'));
-  cancelButton = this.childElement(by.cssContainingText('.mat-dialog-actions button', 'CANCEL'));
-
-  nameInput = this.childElement(by.css('input[formcontrolname="name"]'));
-  titleInput = this.childElement(by.css('input[formcontrolname="title"]'));
-  descriptionTextArea = this.childElement(by.css('textarea[formcontrolname="description"]'));
-  validationMessage = this.childElement(by.css('.mat-error'));
-
-  constructor() {
-    super('.aca-create-from-template-dialog');
-  }
-
-  async isValidationMessageDisplayed(): Promise<boolean> {
-    return isPresentAndDisplayed(this.validationMessage);
-  }
-
-  async isCreateButtonEnabled(): Promise<boolean> {
-    return isPresentAndEnabled(this.createButton);
-  }
-
-  async isCancelButtonEnabled(): Promise<boolean> {
-    return isPresentAndEnabled(this.cancelButton);
-  }
-
-  async getValidationMessage(): Promise<string> {
-    if (await this.isValidationMessageDisplayed()) {
-      return this.validationMessage.getText();
-    } else {
-      return '';
-    }
-  }
-
-  async getNameInputValue(): Promise<string> {
-    return BrowserActions.getInputValue(this.nameInput);
-  }
-
-  async enterName(name: string): Promise<void> {
-    await typeText(this.nameInput, name);
-  }
-
-  async enterTitle(title: string): Promise<void> {
-    await typeText(this.titleInput, title);
-  }
-
-  async enterDescription(description: string): Promise<void> {
-    await typeText(this.descriptionTextArea, description);
-  }
-
-  async clickCancel(): Promise<void> {
-    await BrowserActions.click(this.cancelButton);
-    await this.waitForDialogToClose();
-  }
-}
diff --git a/projects/aca-testing-shared/src/components/dialog/create-library-dialog.ts b/projects/aca-testing-shared/src/components/dialog/create-library-dialog.ts
deleted file mode 100755
index ef6d9036d6..0000000000
--- a/projects/aca-testing-shared/src/components/dialog/create-library-dialog.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-/*!
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Alfresco Example Content Application
- *
- * This file is part of the Alfresco Example Content Application.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The Alfresco Example Content Application is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import { by, ElementFinder } from 'protractor';
-import { GenericDialog } from '../dialog/generic-dialog';
-import { isPresentAndEnabled, typeText } from '../../utilities/utils';
-import { BrowserActions, BrowserVisibility } from '@alfresco/adf-testing';
-
-export class CreateLibraryDialog extends GenericDialog {
-  createButton = this.childElement(by.cssContainingText('.mat-dialog-actions button', 'Create'));
-  cancelButton = this.childElement(by.cssContainingText('.mat-dialog-actions button', 'Cancel'));
-
-  nameInput = this.rootElem.element(by.css('input[formcontrolname="title"]'));
-  libraryIdInput = this.rootElem.element(by.css('input[formcontrolname="id"]'));
-  descriptionTextArea = this.rootElem.element(by.css('textarea[formcontrolname="description"]'));
-  visibilityPublic = this.rootElem.element(by.cssContainingText('.mat-radio-label', 'Public'));
-  visibilityModerated = this.rootElem.element(by.cssContainingText('.mat-radio-label', 'Moderated'));
-  visibilityPrivate = this.rootElem.element(by.cssContainingText('.mat-radio-label', 'Private'));
-
-  errorMessage = this.rootElem.element(by.css('.mat-error'));
-
-  constructor() {
-    super('adf-library-dialog');
-  }
-
-  async waitForDialogToOpen(): Promise<void> {
-    await super.waitForDialogToOpen();
-    await BrowserVisibility.waitUntilElementIsClickable(this.nameInput);
-  }
-
-  async getErrorMessage(): Promise<string> {
-    if (await this.errorMessage.isDisplayed()) {
-      return this.errorMessage.getText();
-    }
-    return '';
-  }
-
-  async enterName(name: string): Promise<void> {
-    await typeText(this.nameInput, name);
-  }
-
-  async enterLibraryId(id: string): Promise<void> {
-    await typeText(this.libraryIdInput, id);
-  }
-
-  async enterDescription(description: string): Promise<void> {
-    await typeText(this.descriptionTextArea, description);
-  }
-
-  async isCreateEnabled(): Promise<boolean> {
-    return isPresentAndEnabled(this.createButton);
-  }
-
-  async isCancelEnabled(): Promise<boolean> {
-    return isPresentAndEnabled(this.cancelButton);
-  }
-
-  async clickCancel(): Promise<void> {
-    await BrowserActions.click(this.cancelButton);
-    await this.waitForDialogToClose();
-  }
-
-  private async isChecked(target: ElementFinder): Promise<boolean> {
-    const elemClass = await target.element(by.xpath('..')).getAttribute('class');
-    return elemClass.includes('mat-radio-checked');
-  }
-
-  async isPublicChecked(): Promise<boolean> {
-    return this.isChecked(this.visibilityPublic);
-  }
-}
diff --git a/projects/aca-testing-shared/src/components/dialog/index.ts b/projects/aca-testing-shared/src/components/dialog/index.ts
index 0985fa79f9..76aec9d704 100644
--- a/projects/aca-testing-shared/src/components/dialog/index.ts
+++ b/projects/aca-testing-shared/src/components/dialog/index.ts
@@ -25,12 +25,8 @@
 export * from './confirm-dialog';
 export * from './content-node-selector-dialog';
 export * from './create-edit-folder-dialog';
-export * from './create-from-template-dialog';
-export * from './create-library-dialog';
 export * from './generic-dialog';
 export * from './manage-versions-dialog';
-export * from './password-dialog';
-export * from './select-template-dialog';
 export * from './share-dialog';
 export * from './upload-new-version-dialog';
 export * from './upload-files-dialog';
diff --git a/projects/aca-testing-shared/src/components/dialog/password-dialog.ts b/projects/aca-testing-shared/src/components/dialog/password-dialog.ts
deleted file mode 100755
index fd99629b49..0000000000
--- a/projects/aca-testing-shared/src/components/dialog/password-dialog.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-/*!
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Alfresco Example Content Application
- *
- * This file is part of the Alfresco Example Content Application.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The Alfresco Example Content Application is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import { by, browser } from 'protractor';
-import { GenericDialog } from '../dialog/generic-dialog';
-import { isPresentAndEnabled, typeText } from '../../utilities/utils';
-import { BrowserVisibility } from '@alfresco/adf-testing';
-
-export class PasswordDialog extends GenericDialog {
-  closeButton = this.childElement(by.css('[data-automation-id="adf-password-dialog-close"]'));
-  submitButton = this.childElement(by.css('[data-automation-id="adf-password-dialog-submit"]'));
-  passwordInput = this.childElement(by.css('input[type="Password"]'));
-  errorMessage = this.childElement(by.css('.mat-error'));
-
-  constructor() {
-    super('adf-pdf-viewer-password-dialog');
-  }
-
-  async waitForDialogToOpen(): Promise<void> {
-    await BrowserVisibility.waitUntilElementIsClickable(this.passwordInput);
-  }
-
-  async isDialogOpen(): Promise<boolean> {
-    try {
-      await this.waitForDialogToOpen();
-      return true;
-    } catch (error) {
-      return false;
-    }
-  }
-
-  async isCloseEnabled(): Promise<boolean> {
-    return isPresentAndEnabled(this.closeButton);
-  }
-
-  async isSubmitEnabled(): Promise<boolean> {
-    return isPresentAndEnabled(this.submitButton);
-  }
-
-  async isPasswordInputDisplayed(): Promise<boolean> {
-    const present = await browser.isElementPresent(this.passwordInput);
-    if (present) {
-      return this.passwordInput.isDisplayed();
-    } else {
-      return false;
-    }
-  }
-
-  async isErrorDisplayed(): Promise<boolean> {
-    try {
-      await this.waitForDialogToOpen();
-      return (await this.errorMessage.isPresent()) && (await this.errorMessage.isDisplayed());
-    } catch (error) {
-      return false;
-    }
-  }
-
-  async getErrorMessage(): Promise<string> {
-    if (await this.isErrorDisplayed()) {
-      return this.errorMessage.getText();
-    }
-    return '';
-  }
-
-  async enterPassword(password: string): Promise<void> {
-    await typeText(this.passwordInput, password);
-  }
-}
diff --git a/projects/aca-testing-shared/src/components/dialog/select-template-dialog.ts b/projects/aca-testing-shared/src/components/dialog/select-template-dialog.ts
deleted file mode 100755
index 6228fc0249..0000000000
--- a/projects/aca-testing-shared/src/components/dialog/select-template-dialog.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-/*!
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Alfresco Example Content Application
- *
- * This file is part of the Alfresco Example Content Application.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The Alfresco Example Content Application is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import { by } from 'protractor';
-import { GenericDialog } from '../dialog/generic-dialog';
-import { DropDownBreadcrumb } from '../breadcrumb/dropdown-breadcrumb';
-import { DataTable } from '../data-table/data-table';
-import { isPresentAndEnabled } from '../../utilities/utils';
-import { BrowserActions } from '@alfresco/adf-testing';
-
-export class SelectTemplateDialog extends GenericDialog {
-  nextButton = this.childElement(by.css('[data-automation-id="content-node-selector-actions-choose"]'));
-  cancelButton = this.childElement(by.css('[data-automation-id="content-node-selector-actions-cancel"]'));
-
-  breadcrumb = new DropDownBreadcrumb();
-  dataTable = new DataTable('.aca-template-node-selector-dialog');
-
-  constructor() {
-    super('.aca-template-node-selector-dialog');
-  }
-
-  get content() {
-    return this.rootElem.element(by.css('.adf-content-node-selector-content'));
-  }
-
-  async isCancelButtonEnabled(): Promise<boolean> {
-    return isPresentAndEnabled(this.cancelButton);
-  }
-
-  async isNextButtonEnabled(): Promise<boolean> {
-    return isPresentAndEnabled(this.nextButton);
-  }
-
-  async clickCancel(): Promise<void> {
-    await BrowserActions.click(this.cancelButton);
-    await this.waitForDialogToClose();
-  }
-
-  async clickNext(): Promise<void> {
-    await BrowserActions.click(this.nextButton);
-    await this.waitForDialogToClose();
-  }
-}
diff --git a/projects/aca-testing-shared/src/components/header/header.ts b/projects/aca-testing-shared/src/components/header/header.ts
index 1e27fe283b..f5a53c74a8 100755
--- a/projects/aca-testing-shared/src/components/header/header.ts
+++ b/projects/aca-testing-shared/src/components/header/header.ts
@@ -32,7 +32,7 @@ import { BrowserActions } from '@alfresco/adf-testing';
 
 export class Header extends Component {
   userMenuButton = this.byCss(`.aca-user-menu-button`);
-  sidenavToggle = this.byCss(`.sidenav-header-title-logo`);
+  sidenavToggle = this.byCss(`.aca-sidenav-header-title-logo`);
 
   menu = new Menu();
   toolbar = new Toolbar();
diff --git a/projects/aca-testing-shared/src/components/info-drawer/info-drawer-comments-tab.ts b/projects/aca-testing-shared/src/components/info-drawer/info-drawer-comments-tab.ts
index 6d26863fa9..016bca96a4 100755
--- a/projects/aca-testing-shared/src/components/info-drawer/info-drawer-comments-tab.ts
+++ b/projects/aca-testing-shared/src/components/info-drawer/info-drawer-comments-tab.ts
@@ -101,11 +101,6 @@ export class CommentsTab extends Component {
     return time.getText();
   }
 
-  async getNthCommentId(index: number): Promise<string> {
-    const list = this.allByCss('.adf-comment-list-item');
-    return list.get(index - 1).getAttribute('id');
-  }
-
   async getNthCommentText(index: number): Promise<string> {
     const list = this.allByCss('mat-list-item .adf-comment-message');
     return list.get(index - 1).getText();
@@ -118,8 +113,4 @@ export class CommentsTab extends Component {
   async clickAddButton(): Promise<void> {
     await BrowserActions.click(this.addCommentButton);
   }
-
-  async getCommentTextFromTextArea(): Promise<string> {
-    return BrowserActions.getInputValue(this.commentTextarea);
-  }
 }
diff --git a/projects/aca-testing-shared/src/components/info-drawer/info-drawer-metadata-content.ts b/projects/aca-testing-shared/src/components/info-drawer/info-drawer-metadata-content.ts
index 8ffd74ee7b..04dbbbf0a3 100755
--- a/projects/aca-testing-shared/src/components/info-drawer/info-drawer-metadata-content.ts
+++ b/projects/aca-testing-shared/src/components/info-drawer/info-drawer-metadata-content.ts
@@ -22,18 +22,14 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { by, browser, ElementFinder } from 'protractor';
+import { browser } from 'protractor';
 import { Component } from '../component';
-import { isPresentAndEnabled, isPresentAndDisplayed } from '../../utilities/utils';
-import { BrowserActions, BrowserVisibility } from '@alfresco/adf-testing';
+import { isPresentAndEnabled } from '../../utilities/utils';
 
 export class ContentMetadata extends Component {
   expandedPanel = this.byCss('.mat-expansion-panel.mat-expanded');
-  editPropertiesButton = this.byCss(`button[title='Edit']`);
   lessInfoButton = this.byCssText(`[data-automation-id='meta-data-card-toggle-expand']`, 'Less information');
   moreInfoButton = this.byCssText(`[data-automation-id='meta-data-card-toggle-expand']`, 'More information');
-  imagePropertiesPanel = this.byCss(`[data-automation-id='adf-metadata-group-APP.CONTENT_METADATA.EXIF_GROUP_TITLE']`);
-  expandedImagePropertiesPanel = this.byCss(`[data-automation-id='adf-metadata-group-APP.CONTENT_METADATA.EXIF_GROUP_TITLE'].mat-expanded`);
 
   constructor(ancestor?: string) {
     super('adf-content-metadata-card', ancestor);
@@ -43,32 +39,6 @@ export class ContentMetadata extends Component {
     return browser.isElementPresent(this.expandedPanel);
   }
 
-  async waitForImagePropertiesPanelToExpand(): Promise<void> {
-    await BrowserVisibility.waitUntilElementIsVisible(this.expandedImagePropertiesPanel);
-  }
-
-  async getVisiblePropertiesLabels(): Promise<string[]> {
-    return this.allByCss('.adf-property-label')
-      .filter(async (elem) => elem.isDisplayed())
-      .map(async (elem) => elem.getText());
-  }
-
-  async getVisiblePropertiesValues() {
-    return this.allByCss('.adf-property-value')
-      .filter(async (elem) => elem.isDisplayed())
-      .map(async (elem) => {
-        if (await elem.isElementPresent(by.css('.mat-checkbox'))) {
-          return !!(await elem.isElementPresent(by.css('.mat-checkbox-checked')));
-        }
-
-        return this.getElementValue(elem);
-      });
-  }
-
-  async isEditPropertiesButtonEnabled(): Promise<boolean> {
-    return isPresentAndEnabled(this.editPropertiesButton);
-  }
-
   async isLessInfoButtonEnabled(): Promise<boolean> {
     return isPresentAndEnabled(this.lessInfoButton);
   }
@@ -80,18 +50,4 @@ export class ContentMetadata extends Component {
   async isMoreInfoButtonDisplayed(): Promise<boolean> {
     return browser.isElementPresent(this.moreInfoButton);
   }
-
-  async isImagePropertiesPanelDisplayed(): Promise<boolean> {
-    return isPresentAndDisplayed(this.imagePropertiesPanel);
-  }
-
-  private async getElementValue(elem: ElementFinder): Promise<string> {
-    const tagName = await elem.getTagName();
-
-    if (tagName === 'input' || tagName === 'textarea') {
-      return BrowserActions.getInputValue(elem);
-    }
-
-    return elem.getText();
-  }
 }
diff --git a/projects/aca-testing-shared/src/components/info-drawer/info-drawer.ts b/projects/aca-testing-shared/src/components/info-drawer/info-drawer.ts
index 23ed4fe115..c6b3e47cd6 100755
--- a/projects/aca-testing-shared/src/components/info-drawer/info-drawer.ts
+++ b/projects/aca-testing-shared/src/components/info-drawer/info-drawer.ts
@@ -42,7 +42,7 @@ export class InfoDrawer extends Component {
   tabActiveContent = this.byCss('.mat-tab-body-active .mat-tab-body-content adf-dynamic-tab');
   expandDetailsButton = TestElement.byCss(`button[title='Expand']`);
   selectedTab = TestElement.byCss(`.mat-tab-list [aria-selected='true'] div`);
-  expandedDetailsPermissionsTab = TestElement.byText('.acs-details-container .mat-tab-label-content', 'Permissions');
+  expandedDetailsPermissionsTab = TestElement.byText('.aca-details-container .mat-tab-label-content', 'Permissions');
   previewButton = TestElement.byCss(`button[title='Preview File']`);
   toolbar = new Toolbar('adf-info-drawer');
 
diff --git a/projects/aca-testing-shared/src/components/login/login.ts b/projects/aca-testing-shared/src/components/login/login.ts
index 0878f5debe..22244740ea 100755
--- a/projects/aca-testing-shared/src/components/login/login.ts
+++ b/projects/aca-testing-shared/src/components/login/login.ts
@@ -30,7 +30,6 @@ export class LoginComponent extends Component {
   passwordInput = this.byCss('input#password');
   submitButton = this.byCss('button#login-button');
   copyright = this.byCss('.adf-copyright');
-  passwordVisibility = this.byCss('.adf-login-password-icon');
 
   constructor(ancestor?: string) {
     super('adf-login', ancestor);
@@ -48,21 +47,4 @@ export class LoginComponent extends Component {
     await this.enterUsername(username);
     await this.enterPassword(password);
   }
-
-  private async getPasswordVisibility(): Promise<boolean> {
-    const text = await this.passwordVisibility.getText();
-    return text.endsWith('visibility');
-  }
-
-  async isPasswordDisplayed(): Promise<boolean> {
-    const type = await this.passwordInput.getAttribute('type');
-    if (type === 'text') {
-      return true;
-    }
-    return false;
-  }
-
-  async isPasswordHidden() {
-    return !(await this.getPasswordVisibility());
-  }
 }
diff --git a/projects/aca-testing-shared/src/components/menu/menu.ts b/projects/aca-testing-shared/src/components/menu/menu.ts
index 3d420291d4..95b60e3b2e 100755
--- a/projects/aca-testing-shared/src/components/menu/menu.ts
+++ b/projects/aca-testing-shared/src/components/menu/menu.ts
@@ -25,7 +25,7 @@
 import { ElementFinder, by, browser } from 'protractor';
 import { Logger, BrowserVisibility, BrowserActions } from '@alfresco/adf-testing';
 import { Component } from '../component';
-import { Utils, isPresentAndEnabled, waitForPresence, waitForStaleness } from '../../utilities/utils';
+import { Utils, waitForPresence, waitForStaleness } from '../../utilities/utils';
 
 export class Menu extends Component {
   items = this.allByCss('.mat-menu-item');
@@ -33,9 +33,6 @@ export class Menu extends Component {
   uploadFilesInput = this.byId('app-upload-files', browser);
   submenus = browser.element.all(by.css('app-context-menu-item .mat-menu-item'));
   createFolderAction = this.byId('app.create.folder');
-  createLibraryAction = this.byId('app.create.library');
-  createFileFromTemplateAction = this.byId('app.create.fileFromTemplate');
-  createFolderFromTemplateAction = this.byId('app.create.folderFromTemplate');
 
   cancelEditingAction = this.byCss(`.mat-menu-item[title='Cancel Editing']`);
   copyAction = this.byTitleAttr('Copy');
@@ -75,10 +72,6 @@ export class Menu extends Component {
     return this.byId(id);
   }
 
-  async getItemTooltip(menuItem: string): Promise<string> {
-    return this.getItemByLabel(menuItem).getAttribute('title');
-  }
-
   async getItemIconText(menuItem: string): Promise<string> {
     return this.getItemByLabel(menuItem).element(by.css('.mat-icon')).getText();
   }
@@ -91,13 +84,6 @@ export class Menu extends Component {
     return this.items.count();
   }
 
-  async getMenuItems(): Promise<string[]> {
-    return this.items.map(async (elem) => {
-      const span = elem.element(by.css('span'));
-      return span.getText();
-    });
-  }
-
   async clickNthItem(nth: number): Promise<void> {
     try {
       const elem = this.getNthItem(nth);
@@ -163,20 +149,4 @@ export class Menu extends Component {
       return null;
     }
   }
-
-  async isCreateFolderEnabled(): Promise<boolean> {
-    return isPresentAndEnabled(this.createFolderAction);
-  }
-
-  async isCreateLibraryEnabled(): Promise<boolean> {
-    return isPresentAndEnabled(this.createLibraryAction);
-  }
-
-  async isCreateFileFromTemplateEnabled(): Promise<boolean> {
-    return isPresentAndEnabled(this.createFileFromTemplateAction);
-  }
-
-  async isCreateFolderFromTemplateEnabled(): Promise<boolean> {
-    return isPresentAndEnabled(this.createFolderFromTemplateAction);
-  }
 }
diff --git a/projects/aca-testing-shared/src/components/search/filters/created-date-filter.ts b/projects/aca-testing-shared/src/components/search/filters/created-date-filter.ts
index c5f5f9dd21..44ca03409c 100755
--- a/projects/aca-testing-shared/src/components/search/filters/created-date-filter.ts
+++ b/projects/aca-testing-shared/src/components/search/filters/created-date-filter.ts
@@ -22,61 +22,10 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { by, ElementFinder, protractor } from 'protractor';
 import { GenericFilter } from './generic-filter';
-import { isPresentAndDisplayed } from '../../../utilities/utils';
-import { BrowserActions } from '@alfresco/adf-testing';
 
 export class CreatedDateFilter extends GenericFilter {
   constructor() {
     super('Created date');
   }
-
-  fromField: ElementFinder = this.filterDialogOpened.element(by.cssContainingText('.adf-search-date-range .mat-form-field', 'From'));
-  fromInput: ElementFinder = this.fromField.element(by.css(`[data-automation-id='date-range-from-input']`));
-  fromFieldError: ElementFinder = this.fromField.element(by.css(`[data-automation-id='date-range-from-error']`));
-  toField: ElementFinder = this.filterDialogOpened.element(by.cssContainingText('.adf-search-date-range .mat-form-field', 'To'));
-  toInput: ElementFinder = this.toField.element(by.css(`[data-automation-id='date-range-to-input']`));
-  toFieldError: ElementFinder = this.toField.element(by.css(`[data-automation-id='date-range-to-error']`));
-  async isFromErrorDisplayed(): Promise<boolean> {
-    return isPresentAndDisplayed(this.fromFieldError);
-  }
-  async isToErrorDisplayed(): Promise<boolean> {
-    return isPresentAndDisplayed(this.toFieldError);
-  }
-
-  async getFromValue(): Promise<string> {
-    return BrowserActions.getInputValue(this.fromInput);
-  }
-
-  async getFromError(): Promise<string> {
-    try {
-      return await this.fromFieldError.getText();
-    } catch (err) {
-      return '';
-    }
-  }
-
-  async getToValue(): Promise<string> {
-    return BrowserActions.getInputValue(this.fromInput);
-  }
-
-  async getToError(): Promise<string> {
-    try {
-      return await this.toFieldError.getText();
-    } catch (err) {
-      return '';
-    }
-  }
-  async enterFromDate(date: string): Promise<void> {
-    await this.openDialog();
-    await BrowserActions.clearWithBackSpace(this.fromInput);
-    await this.fromInput.sendKeys(date, protractor.Key.TAB);
-  }
-
-  async enterToDate(date: string): Promise<void> {
-    await this.openDialog();
-    await BrowserActions.clearWithBackSpace(this.toInput);
-    await this.toInput.sendKeys(date, protractor.Key.TAB);
-  }
 }
diff --git a/projects/aca-testing-shared/src/components/sidenav/sidenav.ts b/projects/aca-testing-shared/src/components/sidenav/sidenav.ts
index 28cf8fcfeb..f7d6b4a918 100755
--- a/projects/aca-testing-shared/src/components/sidenav/sidenav.ts
+++ b/projects/aca-testing-shared/src/components/sidenav/sidenav.ts
@@ -26,7 +26,6 @@ import { ElementFinder, by, element, browser, By } from 'protractor';
 import { Logger, BrowserActions } from '@alfresco/adf-testing';
 import { Menu } from '../menu/menu';
 import { Component } from '../component';
-import { waitElement } from '../../utilities';
 
 export class Sidenav extends Component {
   links = this.component.all(by.css('.item'));
@@ -39,7 +38,6 @@ export class Sidenav extends Component {
   recentFiles = this.byCss(`[data-automation-id='app.navbar.recentFiles']`);
   favorites = this.byCss(`[data-automation-id='app.navbar.favorites']`);
   trash = this.byCss(`[data-automation-id='app.navbar.trashcan']`);
-  sidenavToggle = this.byCss(`.sidenav-header-title-logo`);
 
   menu: Menu = new Menu();
 
@@ -47,44 +45,21 @@ export class Sidenav extends Component {
     super('app-sidenav', ancestor);
   }
 
-  async isSidenavExpanded(): Promise<boolean> {
-    return browser.isElementPresent(by.css(`[data-automation-id='expanded']`));
-  }
-
-  async expandSideNav(): Promise<void> {
-    const expanded = await this.isSidenavExpanded();
-    if (!expanded) {
-      await BrowserActions.click(this.sidenavToggle);
-      await waitElement(`[data-automation-id='expanded']`);
-    }
-  }
-
-  async collapseSideNav(): Promise<void> {
-    const expanded = await this.isSidenavExpanded();
-    if (expanded) {
-      await BrowserActions.click(this.sidenavToggle);
-      await waitElement(`[data-automation-id='collapsed']`);
-    }
-  }
-
   async openNewMenu(): Promise<void> {
     await BrowserActions.click(this.newButton);
     await this.menu.waitForMenuToOpen();
   }
 
-  async closeNewMenu(): Promise<void> {
-    await BrowserActions.click(element(by.css('button[id="app.toolbar.create"] span span')));
-    await this.menu.waitForMenuToClose();
-  }
-
   async openCreateFolderDialog(): Promise<void> {
     await this.openNewMenu();
     await BrowserActions.click(this.menu.createFolderAction);
   }
+
   async isActive(name: string): Promise<boolean> {
     const cssClass = await this.getLinkLabel(name).getAttribute('class');
     return cssClass.includes('action-button--active');
   }
+
   private getLinkLabel(name: string): ElementFinder {
     switch (name) {
       case 'Personal Files':
@@ -108,11 +83,6 @@ export class Sidenav extends Component {
     }
   }
 
-  async getLinkTooltip(name: string): Promise<string> {
-    const link = this.getLinkLabel(name);
-    return link.getAttribute('title');
-  }
-
   async clickLink(name: string): Promise<void> {
     try {
       const link = this.getLinkLabel(name);
diff --git a/projects/aca-testing-shared/src/components/toolbar/toolbar.ts b/projects/aca-testing-shared/src/components/toolbar/toolbar.ts
index 092fdb7451..be161dc46b 100755
--- a/projects/aca-testing-shared/src/components/toolbar/toolbar.ts
+++ b/projects/aca-testing-shared/src/components/toolbar/toolbar.ts
@@ -35,13 +35,9 @@ export class Toolbar extends Component {
   createButton = element(By.css('[id="app.toolbar.create"]'));
   uploadButton = element(By.css('[id="app.toolbar.upload"]'));
   shareButton = element(By.css('button[data-automation-id="share-action-button"]'));
-  viewButton = element(By.css(`button[title='View']`));
   downloadButton = element(By.css(`.mat-icon-button[title='Download']`));
   viewDetailsButton = element(By.css(`button[title='View Details']`));
   printButton = element(By.css(`button[title='Print']`));
-  fullScreenButton = element(By.css(`button[title='Activate full-screen mode']`));
-  joinButton = element(By.css(`button[title='Join']`));
-  leaveButton = element(By.css(`button[title='Leave Library']`));
   permanentlyDeleteButton = element(By.css(`button[title='Permanently Delete']`));
   restoreButton = element(By.css(`button[title='Restore']`));
   searchIconButton = element(By.css(`button[title='Search']`));
@@ -51,17 +47,6 @@ export class Toolbar extends Component {
     super('aca-toolbar', ancestor);
   }
 
-  async isEmpty(): Promise<boolean> {
-    const count = await this.buttons.count();
-    return count === 0;
-  }
-
-  async getButtons(): Promise<string[]> {
-    return this.buttons.map(async (elem) => {
-      return elem.getAttribute('title');
-    });
-  }
-
   async isButtonPresent(title: string) {
     const element = this.byCss(`button[title="${title}"]`);
     return element.isPresent();
@@ -113,25 +98,6 @@ export class Toolbar extends Component {
     return browser.isElementPresent(this.printButton);
   }
 
-  async openCreateFolderDialog(): Promise<void> {
-    await this.openCreateMenu();
-    await BrowserActions.click(this.menu.createFolderAction);
-  }
-
-  async openCreateFileFromTemplateDialog(): Promise<void> {
-    await this.openCreateMenu();
-    await BrowserActions.click(this.menu.createFileFromTemplateAction);
-  }
-
-  async openCreateFolderFromTemplateDialog(): Promise<void> {
-    await this.openCreateMenu();
-    await BrowserActions.click(this.menu.createFolderFromTemplateAction);
-  }
-
-  async openCreateMenu(): Promise<void> {
-    await BrowserActions.click(this.createButton);
-    await this.menu.waitForMenuToOpen();
-  }
   async openUploadMenu(): Promise<void> {
     await BrowserActions.click(this.uploadButton);
     await this.menu.waitForMenuToOpen();
diff --git a/projects/aca-testing-shared/src/components/viewer/viewer.ts b/projects/aca-testing-shared/src/components/viewer/viewer.ts
index 7c33ebe9de..54d0467dda 100755
--- a/projects/aca-testing-shared/src/components/viewer/viewer.ts
+++ b/projects/aca-testing-shared/src/components/viewer/viewer.ts
@@ -35,7 +35,6 @@ export class Viewer extends Component {
   closeButton = this.byCss('.adf-viewer-close-button');
   fileTitle = this.byCss('.adf-viewer__file-title');
   viewerExtensionContent = this.byCss('adf-preview-extension');
-  pdfViewerContentPages = this.allByCss('.adf-pdf-viewer__content .page');
   txtViewerContent = this.byCss('.adf-txt-viewer-content');
 
   toolbar = new Toolbar('adf-viewer');
@@ -87,10 +86,6 @@ export class Viewer extends Component {
     return browser.isElementPresent(this.fileTitle);
   }
 
-  async getCloseButtonTooltip(): Promise<string> {
-    return this.toolbar.getButtonTooltip(this.closeButton);
-  }
-
   async getFileTitle(): Promise<string> {
     return this.fileTitle.getText();
   }
@@ -107,11 +102,6 @@ export class Viewer extends Component {
     return '';
   }
 
-  async isPdfViewerContentDisplayed(): Promise<boolean> {
-    const count = await this.pdfViewerContentPages.count();
-    return count > 0;
-  }
-
   async clickCloseButton(): Promise<void> {
     const closeButton: ElementFinder = element(by.css('button[data-automation-id="adf-toolbar-back"]'));
     await BrowserActions.click(closeButton);
diff --git a/projects/aca-testing-shared/src/configs.ts b/projects/aca-testing-shared/src/configs.ts
index e57262f6aa..91958deb04 100755
--- a/projects/aca-testing-shared/src/configs.ts
+++ b/projects/aca-testing-shared/src/configs.ts
@@ -27,10 +27,6 @@ export const BROWSER_WAIT_TIMEOUT = 10000;
 // Application configs
 export const USE_HASH_STRATEGY = true;
 
-// Dates
-export const DATE_FORMAT = 'MMM D, YYYY';
-export const DATE_TIME_FORMAT = 'MMM D, YYYY, H:mm';
-
 // Application Routes
 export const APP_ROUTES = {
   FAVORITES: '/favorites',
diff --git a/projects/aca-testing-shared/src/pages/search-results-page.ts b/projects/aca-testing-shared/src/pages/search-results-page.ts
index 566d291480..94d753a279 100755
--- a/projects/aca-testing-shared/src/pages/search-results-page.ts
+++ b/projects/aca-testing-shared/src/pages/search-results-page.ts
@@ -22,11 +22,9 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { by } from 'protractor';
 import { BrowsingPage } from './browsing-page';
 import { SearchSortingPicker } from '../components/search/search-sorting-picker';
 import { SearchFilters } from '../components/search/search-filters';
-import { BrowserActions } from '@alfresco/adf-testing';
 
 export class SearchResultsPage extends BrowsingPage {
   root = this.byCss('aca-search-results');
@@ -36,28 +34,4 @@ export class SearchResultsPage extends BrowsingPage {
   async waitForResults(): Promise<void> {
     await this.dataTable.waitForBody();
   }
-
-  async getName(name: string): Promise<string> {
-    return this.dataTable.getRowByName(name).element(by.css('[title="Name"] div.search-file-name')).getText();
-  }
-
-  async getDescription(name: string): Promise<string> {
-    return this.dataTable.getRowByName(name).element(by.css('[title="Description"]')).getText();
-  }
-
-  async getModified(name: string): Promise<string> {
-    return BrowserActions.getAttribute(this.dataTable.getRowByName(name).element(by.css('[title="Modified"] span')), 'title');
-  }
-
-  async getSize(name: string): Promise<string> {
-    return this.dataTable.getRowByName(name).element(by.css('[title="Size"]')).getText();
-  }
-
-  async getModifiedBy(name: string): Promise<string> {
-    return this.dataTable.getRowByName(name).element(by.css('[title="Modified by"]')).getText();
-  }
-
-  async getLocation(name: string): Promise<string> {
-    return this.dataTable.getRowByName(name).element(by.css('[title="Name"] a')).getText();
-  }
 }
diff --git a/projects/aca-testing-shared/src/utilities/admin-actions.ts b/projects/aca-testing-shared/src/utilities/admin-actions.ts
index 3c413b427a..982054c629 100755
--- a/projects/aca-testing-shared/src/utilities/admin-actions.ts
+++ b/projects/aca-testing-shared/src/utilities/admin-actions.ts
@@ -22,8 +22,8 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { PersonEntry, NodeEntry, PeopleApi } from '@alfresco/js-api';
-import { PersonModel, SitesApi, UploadApi, NodesApi, NodeContentTree, Person, SharedLinksApi } from './repo-client/apis';
+import { PersonEntry, PeopleApi } from '@alfresco/js-api';
+import { PersonModel, SitesApi, UploadApi, NodesApi, Person, SharedLinksApi } from './repo-client/apis';
 import { UserActions } from './user-actions';
 import { browser } from 'protractor';
 
@@ -37,31 +37,6 @@ export class AdminActions extends UserActions {
     return super.login(username || browser.params.ADMIN_USERNAME, password || browser.params.ADMIN_PASSWORD);
   }
 
-  private async getDataDictionaryId(): Promise<string> {
-    return this.nodes.getNodeIdFromParent('Data Dictionary', '-root-').catch((error) => {
-      super.handleError('Admin Actions - getDataDictionaryId failed : ', error);
-      return '';
-    });
-  }
-
-  async getNodeTemplatesFolderId(): Promise<string> {
-    try {
-      return this.nodes.getNodeIdFromParent('Node Templates', await this.getDataDictionaryId());
-    } catch (error) {
-      super.handleError('Admin Actions - getNodeTemplatesFolderId failed : ', error);
-      return '';
-    }
-  }
-
-  async getSpaceTemplatesFolderId(): Promise<string> {
-    try {
-      return this.nodes.getNodeIdFromParent('Space Templates', await this.getDataDictionaryId());
-    } catch (error) {
-      super.handleError('Admin Actions - getSpaceTemplatesFolderId failed : ', error);
-      return '';
-    }
-  }
-
   async createUser(user: PersonModel): Promise<PersonEntry> {
     const person = new Person(user);
     const peopleApi = new PeopleApi(this.alfrescoApi);
@@ -74,118 +49,4 @@ export class AdminActions extends UserActions {
       return null;
     }
   }
-
-  async disableUser(username: string): Promise<PersonEntry> {
-    const peopleApi = new PeopleApi(this.alfrescoApi);
-
-    await this.login();
-    try {
-      return peopleApi.updatePerson(username, { enabled: false });
-    } catch (error) {
-      super.handleError('Admin Actions - createUser failed : ', error);
-      return null;
-    }
-  }
-
-  async changePassword(username: string, newPassword: string): Promise<PersonEntry> {
-    const peopleApi = new PeopleApi(this.alfrescoApi);
-
-    await this.login();
-    try {
-      return peopleApi.updatePerson(username, { password: newPassword });
-    } catch (error) {
-      super.handleError('Admin Actions - changePassword failed : ', error);
-      return null;
-    }
-  }
-
-  async createNodeTemplatesHierarchy(hierarchy: NodeContentTree): Promise<any> {
-    return this.nodes.createContent(hierarchy, `Data Dictionary/Node Templates`).catch((error) => {
-      super.handleError('Admin Actions - createNodeTemplatesHierarchy failed : ', error);
-    });
-  }
-
-  async createSpaceTemplatesHierarchy(hierarchy: NodeContentTree): Promise<any> {
-    return this.nodes.createContent(hierarchy, `Data Dictionary/Space Templates`).catch((error) => {
-      super.handleError('Admin Actions - createSpaceTemplatesHierarchy failed : ', error);
-    });
-  }
-
-  async removeUserAccessOnNodeTemplate(nodeName: string): Promise<NodeEntry> {
-    try {
-      const templatesRootFolderId = await this.getNodeTemplatesFolderId();
-      const nodeId: string = await this.nodes.getNodeIdFromParent(nodeName, templatesRootFolderId);
-
-      return this.nodes.setInheritPermissions(nodeId, false);
-    } catch (error) {
-      super.handleError('Admin Actions - removeUserAccessOnNodeTemplate failed : ', error);
-      return null;
-    }
-  }
-
-  async removeUserAccessOnSpaceTemplate(nodeName: string): Promise<NodeEntry> {
-    try {
-      const templatesRootFolderId = await this.getSpaceTemplatesFolderId();
-      const nodeId: string = await this.nodes.getNodeIdFromParent(nodeName, templatesRootFolderId);
-
-      return this.nodes.setInheritPermissions(nodeId, false);
-    } catch (error) {
-      super.handleError('Admin Actions - removeUserAccessOnSpaceTemplate failed : ', error);
-      return null;
-    }
-  }
-
-  async cleanupNodeTemplatesItems(nodeNames: string[]): Promise<void> {
-    try {
-      const templatesFolderId = await this.getNodeTemplatesFolderId();
-      for (const nodeName of nodeNames) {
-        const nodeId = await this.nodes.getNodeIdFromParent(nodeName, templatesFolderId);
-        await this.nodes.deleteNodeById(nodeId);
-      }
-    } catch (error) {
-      super.handleError('Admin Actions - cleanupNodeTemplatesItems failed : ', error);
-    }
-  }
-
-  async cleanupSpaceTemplatesItems(nodeNames: string[]): Promise<void> {
-    try {
-      const spaceTemplatesNodeId = await this.getSpaceTemplatesFolderId();
-      for (const nodeName of nodeNames) {
-        const nodeId = await this.nodes.getNodeIdFromParent(nodeName, spaceTemplatesNodeId);
-        await this.nodes.deleteNodeById(nodeId);
-      }
-    } catch (error) {
-      super.handleError('Admin Actions - cleanupSpaceTemplatesFolder failed : ', error);
-    }
-  }
-
-  async createLinkToFileName(originalFileName: string, originalFileParentId: string, destinationParentId?: string): Promise<NodeEntry> {
-    if (!destinationParentId) {
-      destinationParentId = originalFileParentId;
-    }
-
-    try {
-      const nodeId = await this.nodes.getNodeIdFromParent(originalFileName, originalFileParentId);
-
-      return this.nodes.createFileLink(nodeId, destinationParentId);
-    } catch (error) {
-      super.handleError('Admin Actions - createLinkToFileName failed : ', error);
-      return null;
-    }
-  }
-
-  async createLinkToFolderName(originalFolderName: string, originalFolderParentId: string, destinationParentId?: string): Promise<NodeEntry> {
-    if (!destinationParentId) {
-      destinationParentId = originalFolderParentId;
-    }
-
-    try {
-      const nodeId = await this.nodes.getNodeIdFromParent(originalFolderName, originalFolderParentId);
-
-      return this.nodes.createFolderLink(nodeId, destinationParentId);
-    } catch (error) {
-      super.handleError('Admin Actions - createLinkToFolderName failed : ', error);
-      return null;
-    }
-  }
 }
diff --git a/projects/aca-testing-shared/src/utilities/index.ts b/projects/aca-testing-shared/src/utilities/index.ts
index 61eca7548b..5374657021 100644
--- a/projects/aca-testing-shared/src/utilities/index.ts
+++ b/projects/aca-testing-shared/src/utilities/index.ts
@@ -26,5 +26,4 @@ export * from './repo-client/apis';
 export * from './repo-client/repo-client';
 export * from './admin-actions';
 export * from './user-actions';
-export * from './browser-utils';
 export * from './utils';
diff --git a/projects/aca-testing-shared/src/utilities/repo-client/apis/favorites/favorites-api.ts b/projects/aca-testing-shared/src/utilities/repo-client/apis/favorites/favorites-api.ts
index b2d8152a65..c2a278c9d2 100755
--- a/projects/aca-testing-shared/src/utilities/repo-client/apis/favorites/favorites-api.ts
+++ b/projects/aca-testing-shared/src/utilities/repo-client/apis/favorites/favorites-api.ts
@@ -93,16 +93,6 @@ export class FavoritesApi extends RepoApi {
     }
   }
 
-  async getFavoriteById(nodeId: string) {
-    try {
-      await this.apiAuth();
-      return await this.favoritesApi.getFavorite('-me-', nodeId);
-    } catch (error) {
-      this.handleError(`FavoritesApi getFavoriteById : catch : `, error);
-      return null;
-    }
-  }
-
   async isFavorite(nodeId: string) {
     try {
       return JSON.stringify((await this.getFavorites()).list.entries).includes(nodeId);
diff --git a/projects/aca-testing-shared/src/utilities/repo-client/apis/nodes/nodes-api.ts b/projects/aca-testing-shared/src/utilities/repo-client/apis/nodes/nodes-api.ts
index 79e9d40db6..8039da2421 100755
--- a/projects/aca-testing-shared/src/utilities/repo-client/apis/nodes/nodes-api.ts
+++ b/projects/aca-testing-shared/src/utilities/repo-client/apis/nodes/nodes-api.ts
@@ -74,16 +74,6 @@ export class NodesApi extends RepoApi {
     }
   }
 
-  async getNodeTitle(name: string, parentId: string): Promise<string> {
-    try {
-      const children = (await this.getNodeChildren(parentId)).list.entries;
-      return children.find((elem) => elem.entry.name === name).entry.properties['cm:title'];
-    } catch (error) {
-      this.handleError(`${this.constructor.name} ${this.getNodeTitle.name}`, error);
-      return '';
-    }
-  }
-
   async getNodeProperty(nodeId: string, property: string): Promise<string> {
     try {
       const node = await this.getNodeById(nodeId);
@@ -341,27 +331,6 @@ export class NodesApi extends RepoApi {
     }
   }
 
-  async createFileLink(originalNodeId: string, destinationId: string): Promise<NodeEntry | null> {
-    const name = (await this.getNodeById(originalNodeId)).entry.name;
-    const nodeBody = {
-      name: `Link to ${name}.url`,
-      nodeType: 'app:filelink',
-      properties: {
-        'cm:destination': originalNodeId
-      }
-    };
-
-    try {
-      await this.apiAuth();
-      const link = await this.nodesApi.createNode(destinationId, nodeBody);
-      await this.addAspects(originalNodeId, ['app:linked']);
-      return link;
-    } catch (error) {
-      this.handleError(`${this.constructor.name} ${this.createFileLink.name}`, error);
-      return null;
-    }
-  }
-
   async createFolderLink(originalNodeId: string, destinationId: string): Promise<NodeEntry | null> {
     const name = (await this.getNodeById(originalNodeId)).entry.name;
     const nodeBody = {
@@ -407,33 +376,6 @@ export class NodesApi extends RepoApi {
     }
   }
 
-  async renameNode(nodeId: string, newName: string): Promise<NodeEntry | null> {
-    try {
-      await this.apiAuth();
-      return this.nodesApi.updateNode(nodeId, { name: newName });
-    } catch (error) {
-      this.handleError(`${this.constructor.name} ${this.renameNode.name}`, error);
-      return null;
-    }
-  }
-
-  // node permissions
-  async setInheritPermissions(nodeId: string, inheritPermissions: boolean): Promise<NodeEntry | null> {
-    const data = {
-      permissions: {
-        isInheritanceEnabled: inheritPermissions
-      }
-    };
-
-    try {
-      await this.apiAuth();
-      return await this.nodesApi.updateNode(nodeId, data);
-    } catch (error) {
-      this.handleError(`${this.constructor.name} ${this.setGranularPermission.name}`, error);
-      return null;
-    }
-  }
-
   async setGranularPermission(nodeId: string, inheritPermissions: boolean = false, username: string, role: string): Promise<NodeEntry | null> {
     const data = {
       permissions: {
diff --git a/projects/aca-testing-shared/src/utilities/repo-client/apis/sites/sites-api.ts b/projects/aca-testing-shared/src/utilities/repo-client/apis/sites/sites-api.ts
index cb5ba4c7e6..cd0d350ea1 100755
--- a/projects/aca-testing-shared/src/utilities/repo-client/apis/sites/sites-api.ts
+++ b/projects/aca-testing-shared/src/utilities/repo-client/apis/sites/sites-api.ts
@@ -118,21 +118,6 @@ export class SitesApi extends RepoApi {
     }
   }
 
-  async deleteAllUserSites(permanent: boolean = true) {
-    try {
-      await this.apiAuth();
-      const sites = await this.sitesApi.listSiteMembershipsForPerson(this.username);
-      const siteIds = sites.list.entries.map((entries) => entries.entry.id);
-
-      return await siteIds.reduce(async (previous, current) => {
-        await previous;
-        return this.deleteSite(current, permanent);
-      }, Promise.resolve());
-    } catch (error) {
-      this.handleError(`SitesApi deleteAllUserSites : catch : `, error);
-    }
-  }
-
   async updateSiteMember(siteId: string, userId: string, role: string) {
     const siteRole = {
       role: role
@@ -178,10 +163,6 @@ export class SitesApi extends RepoApi {
     return this.addSiteMember(siteId, userId, SITE_ROLES.SITE_COLLABORATOR.ROLE);
   }
 
-  async addSiteManager(siteId: string, userId: string): Promise<SiteMemberEntry> {
-    return this.addSiteMember(siteId, userId, SITE_ROLES.SITE_MANAGER.ROLE);
-  }
-
   async deleteSiteMember(siteId: string, userId: string) {
     try {
       await this.apiAuth();
diff --git a/projects/aca-testing-shared/src/utilities/repo-client/repo-client.ts b/projects/aca-testing-shared/src/utilities/repo-client/repo-client.ts
index eb79320fc4..5ce7ce3cf2 100755
--- a/projects/aca-testing-shared/src/utilities/repo-client/repo-client.ts
+++ b/projects/aca-testing-shared/src/utilities/repo-client/repo-client.ts
@@ -69,11 +69,6 @@ export class RepoClient {
     return new UploadApi(this.username, this.password);
   }
 
-  async logout(): Promise<any> {
-    await this.apiAuth();
-    return this.alfrescoApi.logout();
-  }
-
   async createFolder(name: string, parentId?: string): Promise<string> {
     const response = await this.nodes.createFolder(name, parentId);
     return response.entry.id;
diff --git a/projects/aca-testing-shared/src/utilities/user-actions.ts b/projects/aca-testing-shared/src/utilities/user-actions.ts
index 2fded960bb..2f60a10c55 100644
--- a/projects/aca-testing-shared/src/utilities/user-actions.ts
+++ b/projects/aca-testing-shared/src/utilities/user-actions.ts
@@ -23,9 +23,8 @@
  */
 
 import { Logger } from '@alfresco/adf-testing';
-import { AlfrescoApi, Comment, CommentsApi, NodesApi, TrashcanApi, SitesApi, SharedlinksApi, SiteEntry } from '@alfresco/js-api';
+import { AlfrescoApi, Comment, CommentsApi, NodesApi, TrashcanApi, SitesApi, SharedlinksApi } from '@alfresco/js-api';
 import { browser } from 'protractor';
-import { SITE_VISIBILITY } from '../configs';
 import { Utils } from './utils';
 
 export class UserActions {
@@ -62,15 +61,6 @@ export class UserActions {
     }
   }
 
-  async logout(): Promise<any> {
-    try {
-      await this.alfrescoApi.login(this.username, this.password);
-      return this.alfrescoApi.logout();
-    } catch (error) {
-      this.handleError('User Actions - logout failed : ', error);
-    }
-  }
-
   async createComment(nodeId: string, content: string): Promise<Comment | null> {
     try {
       const comment = await this.commentsApi.createComment(nodeId, { content });
@@ -180,32 +170,6 @@ export class UserActions {
     }
   }
 
-  /**
-   * Create multiple sites
-   * @param siteNames The list of the site names
-   * @param visibility Default site visibility
-   * @returns List of site entries
-   */
-  async createSites(siteNames: string[], visibility?: string): Promise<SiteEntry[]> {
-    const sites: SiteEntry[] = [];
-
-    try {
-      if (siteNames && siteNames.length > 0) {
-        for (const siteName of siteNames) {
-          const site = await this.sitesApi.createSite({
-            title: siteName,
-            visibility: visibility || SITE_VISIBILITY.PUBLIC,
-            id: siteName
-          });
-          sites.push(site);
-        }
-      }
-    } catch (error) {
-      this.handleError(`User Actions - createSites failed : `, error);
-    }
-    return sites;
-  }
-
   /**
    * Delete multiple sites/libraries.
    * @param siteIds The list of the site/library IDs to delete.
diff --git a/projects/aca-testing-shared/src/utilities/utils.ts b/projects/aca-testing-shared/src/utilities/utils.ts
index 4043218f76..74931f54a1 100644
--- a/projects/aca-testing-shared/src/utilities/utils.ts
+++ b/projects/aca-testing-shared/src/utilities/utils.ts
@@ -86,10 +86,6 @@ export class Utils {
     return crypto.getRandomValues(new Uint32Array(1))[0].toString(36).substring(0, 5).toLowerCase();
   }
 
-  static async clearLocalStorage(): Promise<void> {
-    await browser.executeScript('window.localStorage.clear();');
-  }
-
   static async setSessionStorageFromConfig(configFileName: string): Promise<void> {
     const configFile = `${browser.params.e2eRootPath}/resources/extensibility-configs/${configFileName}`;
     const fileContent = JSON.stringify(fs.readFileSync(configFile, { encoding: 'utf8' }));
diff --git a/protractor.conf.js b/protractor.conf.js
index 31e28b1a23..1f4aa777dd 100755
--- a/protractor.conf.js
+++ b/protractor.conf.js
@@ -51,13 +51,11 @@ exports.config = {
 
   specs: [
     './e2e/protractor/suites/actions/**/**/*test.ts',
-    './e2e/protractor/suites/actions-available/**/**/*test.ts',
     './e2e/protractor/suites/application/**/*test.ts',
     './e2e/protractor/suites/authentication/**/*test.ts',
     './e2e/protractor/suites/extensions/**/*test.ts',
     './e2e/protractor/suites/info-drawer/**/*test.ts',
     './e2e/protractor/suites/list-views/**/*test.ts',
-    './e2e/protractor/suites/navigation/**/*test.ts',
     './e2e/protractor/suites/pagination/**/*test.ts',
     './e2e/protractor/suites/search/**/*test.ts',
     './e2e/protractor/suites/viewer/**/*test.ts'
@@ -73,17 +71,11 @@ exports.config = {
     shareActions: './e2e/protractor/suites/actions/share/**/**/*test.ts',
     uploadDownloadActions: './e2e/protractor/suites/actions/upload-download/**/**/*test.ts',
 
-    actionsAvailableFilesFolders: './e2e/protractor/suites/actions-available/files-folders/**/**/*test.ts',
-    actionsAvailableLibraries: './e2e/protractor/suites/actions-available/libraries/**/**/*test.ts',
-    actionsAvailableSpecialPermissions: './e2e/protractor/suites/actions-available/special-permissions/**/**/*test.ts',
-    actionsAvailableNewMenu: './e2e/protractor/suites/actions-available/new-menu/**/**/*test.ts',
-
     application: './e2e/protractor/suites/application/**/*test.ts',
     authentication: './e2e/protractor/suites/authentication/**/*test.ts',
     extensions: './e2e/protractor/suites/extensions/**/*test.ts',
     infoDrawer: './e2e/protractor/suites/info-drawer/**/*test.ts',
     listViews: './e2e/protractor/suites/list-views/**/*test.ts',
-    navigation: './e2e/protractor/suites/navigation/**/*test.ts',
     pagination: './e2e/protractor/suites/pagination/**/*test.ts',
     search: './e2e/protractor/suites/search/**/*test.ts',
     viewer: './e2e/protractor/suites/viewer/**/*test.ts'