diff --git a/packages/design-system/src/components/OcStatusIndicators/OcStatusIndicators.vue b/packages/design-system/src/components/OcStatusIndicators/OcStatusIndicators.vue
index c37221b87a..065b21bab1 100644
--- a/packages/design-system/src/components/OcStatusIndicators/OcStatusIndicators.vue
+++ b/packages/design-system/src/components/OcStatusIndicators/OcStatusIndicators.vue
@@ -13,6 +13,8 @@
         appearance="raw"
         :data-testid="indicator.id"
         :data-test-indicator-type="indicator.type"
+        :data-test-indicator-resource-name="resource.name"
+        :data-test-indicator-resource-path="resource.path"
         no-hover
         @click="(e: MouseEvent) => indicator.handler?.(resource, e)"
       >
@@ -67,7 +69,7 @@ export interface Props {
   /**
    * @docs The resource that the indicators are related to.
    */
-  resource: unknown
+  resource: { id?: string; name?: string; path?: string }
   /**
    * @docs The indicators to be displayed. Please refer to the component source code for the `Indicator` type definition.
    */
diff --git a/packages/web-app-admin-settings/tests/unit/components/Spaces/__snapshots__/SpacesList.spec.ts.snap b/packages/web-app-admin-settings/tests/unit/components/Spaces/__snapshots__/SpacesList.spec.ts.snap
index 4a1aab353e..bc5f153a03 100644
--- a/packages/web-app-admin-settings/tests/unit/components/Spaces/__snapshots__/SpacesList.spec.ts.snap
+++ b/packages/web-app-admin-settings/tests/unit/components/Spaces/__snapshots__/SpacesList.spec.ts.snap
@@ -157,7 +157,7 @@ exports[`SpacesList > should render all spaces in a table 1`] = `
       };
       return svg;
     }" aria-hidden="true" focusable="false" class="size-5.5"></svg></span>
-            </button> <button type="button" aria-label="Show context menu" class="oc-button-secondary oc-button-raw oc-button-secondary-raw gap-2 justify-center text-base min-h-4 oc-button inline-flex cursor-pointer disabled:opacity-60 disabled:cursor-default quick-action-button ml-1 p-1 spaces-table-btn-action-dropdown" id="context-menu-trigger-1">
+            </button> <button type="button" aria-label="Show context menu" class="oc-button-secondary oc-button-raw oc-button-secondary-raw gap-2 justify-center text-base min-h-4 oc-button inline-flex cursor-pointer disabled:opacity-60 disabled:cursor-default quick-action-button ml-1 p-1 spaces-table-btn-action-dropdown" id="context-menu-trigger-1" data-test-context-menu-resource-name="1 Some space">
               <!--v-if-->
               <!-- @slot Content of the button --> <span class="oc-icon box-content size-5.5"><svg data-testid="inline-svg-stub" src="icons/more-2-fill.svg" transform-source="(svg) => {
       if (__props.accessibleLabel !== &quot;&quot;) {
@@ -215,7 +215,7 @@ exports[`SpacesList > should render all spaces in a table 1`] = `
       };
       return svg;
     }" aria-hidden="true" focusable="false" class="size-5.5"></svg></span>
-            </button> <button type="button" aria-label="Show context menu" class="oc-button-secondary oc-button-raw oc-button-secondary-raw gap-2 justify-center text-base min-h-4 oc-button inline-flex cursor-pointer disabled:opacity-60 disabled:cursor-default quick-action-button ml-1 p-1 spaces-table-btn-action-dropdown" id="context-menu-trigger-2">
+            </button> <button type="button" aria-label="Show context menu" class="oc-button-secondary oc-button-raw oc-button-secondary-raw gap-2 justify-center text-base min-h-4 oc-button inline-flex cursor-pointer disabled:opacity-60 disabled:cursor-default quick-action-button ml-1 p-1 spaces-table-btn-action-dropdown" id="context-menu-trigger-2" data-test-context-menu-resource-name="2 Another space">
               <!--v-if-->
               <!-- @slot Content of the button --> <span class="oc-icon box-content size-5.5"><svg data-testid="inline-svg-stub" src="icons/more-2-fill.svg" transform-source="(svg) => {
       if (__props.accessibleLabel !== &quot;&quot;) {
diff --git a/packages/web-app-admin-settings/tests/unit/views/__snapshots__/Spaces.spec.ts.snap b/packages/web-app-admin-settings/tests/unit/views/__snapshots__/Spaces.spec.ts.snap
index c9b812869b..8737a121cc 100644
--- a/packages/web-app-admin-settings/tests/unit/views/__snapshots__/Spaces.spec.ts.snap
+++ b/packages/web-app-admin-settings/tests/unit/views/__snapshots__/Spaces.spec.ts.snap
@@ -10,7 +10,7 @@ exports[`Spaces view > loading states > should render spaces list after loading
             <oc-breadcrumb-stub items="[object Object],[object Object]" contextmenupadding="medium" id="admin-settings-breadcrumb" maxwidth="-1" showcontextactions="false" truncationoffset="2" variation="default"></oc-breadcrumb-stub>
             <portal-target name="app.runtime.mobile.nav"></portal-target>
             <div class="flex">
-              <view-options-stub perpagestorageprefix="admin-settings" hashiddenfiles="false" hasfileextensions="false" haspagination="true" paginationoptions="20,50,100,250" perpagequeryname="items-per-page" perpagedefault="50" viewmodedefault="resource-table" viewmodes=""></view-options-stub>
+              <view-options-stub perpagestorageprefix="admin-settings" hashiddenfiles="false" hasfileextensions="false" haspagination="true" paginationoptions="20,50,100,250" perpagequeryname="items-per-page" perpagedefault="50" viewmodedefault="resource-tiles" viewmodes=""></view-options-stub>
             </div>
           </div>
           <div class="admin-settings-app-bar-actions flex items-center mt-1 min-h-10">
diff --git a/packages/web-app-admin-settings/tests/unit/views/__snapshots__/Users.spec.ts.snap b/packages/web-app-admin-settings/tests/unit/views/__snapshots__/Users.spec.ts.snap
index 3c0cb0db32..a119bdee2d 100644
--- a/packages/web-app-admin-settings/tests/unit/views/__snapshots__/Users.spec.ts.snap
+++ b/packages/web-app-admin-settings/tests/unit/views/__snapshots__/Users.spec.ts.snap
@@ -10,7 +10,7 @@ exports[`Users view > list view > renders initially warning if filters are manda
             <oc-breadcrumb-stub items="[object Object],[object Object]" contextmenupadding="medium" id="admin-settings-breadcrumb" maxwidth="-1" showcontextactions="false" truncationoffset="2" variation="default"></oc-breadcrumb-stub>
             <portal-target name="app.runtime.mobile.nav"></portal-target>
             <div class="flex">
-              <view-options-stub perpagestorageprefix="admin-settings" hashiddenfiles="false" hasfileextensions="false" haspagination="true" paginationoptions="20,50,100,250" perpagequeryname="items-per-page" perpagedefault="50" viewmodedefault="resource-table" viewmodes=""></view-options-stub>
+              <view-options-stub perpagestorageprefix="admin-settings" hashiddenfiles="false" hasfileextensions="false" haspagination="true" paginationoptions="20,50,100,250" perpagequeryname="items-per-page" perpagedefault="50" viewmodedefault="resource-tiles" viewmodes=""></view-options-stub>
             </div>
           </div>
           <div class="admin-settings-app-bar-actions flex items-center mt-1 min-h-10">
@@ -70,7 +70,7 @@ exports[`Users view > list view > renders list initially 1`] = `
             <oc-breadcrumb-stub items="[object Object],[object Object]" contextmenupadding="medium" id="admin-settings-breadcrumb" maxwidth="-1" showcontextactions="false" truncationoffset="2" variation="default"></oc-breadcrumb-stub>
             <portal-target name="app.runtime.mobile.nav"></portal-target>
             <div class="flex">
-              <view-options-stub perpagestorageprefix="admin-settings" hashiddenfiles="false" hasfileextensions="false" haspagination="true" paginationoptions="20,50,100,250" perpagequeryname="items-per-page" perpagedefault="50" viewmodedefault="resource-table" viewmodes=""></view-options-stub>
+              <view-options-stub perpagestorageprefix="admin-settings" hashiddenfiles="false" hasfileextensions="false" haspagination="true" paginationoptions="20,50,100,250" perpagequeryname="items-per-page" perpagedefault="50" viewmodedefault="resource-tiles" viewmodes=""></view-options-stub>
             </div>
           </div>
           <div class="admin-settings-app-bar-actions flex items-center mt-1 min-h-10">
diff --git a/packages/web-app-files/src/views/spaces/Projects.vue b/packages/web-app-files/src/views/spaces/Projects.vue
index 2c7adcd948..78e05887b8 100644
--- a/packages/web-app-files/src/views/spaces/Projects.vue
+++ b/packages/web-app-files/src/views/spaces/Projects.vue
@@ -11,7 +11,7 @@
         :batch-actions-loading="batchActionsLoading"
         :is-side-bar-open="isSideBarOpen"
         :view-modes="viewModes"
-        :view-mode-default="FolderViewModeConstants.name.tiles"
+        :view-mode-default="FolderViewModeConstants.defaultModeName"
       >
         <template #actions>
           <create-space v-if="hasCreatePermission" class="mr-2" />
diff --git a/packages/web-app-files/tests/unit/views/trash/__snapshots__/Overview.spec.ts.snap b/packages/web-app-files/tests/unit/views/trash/__snapshots__/Overview.spec.ts.snap
index cf8d76e7c0..bfdc0ba320 100644
--- a/packages/web-app-files/tests/unit/views/trash/__snapshots__/Overview.spec.ts.snap
+++ b/packages/web-app-files/tests/unit/views/trash/__snapshots__/Overview.spec.ts.snap
@@ -4,7 +4,7 @@ exports[`TrashOverview > view states > should render trash list 1`] = `
 "<div class="flex">
   <div class="files-view-wrapper relative grid grid-cols-1 flex-1 focus:outline-0 h-full overflow-y-auto gap-0">
     <div id="files-view" class="outline-0 z-0">
-      <app-bar-stub viewmodedefault="resource-table" breadcrumbs="[object Object]" breadcrumbscontextactionsitems="" viewmodes="" hasbulkactions="false" hasviewoptions="true" hashiddenfiles="false" hasfileextensions="false" haspagination="false" showactionsonselection="false" issidebaropen="false" batchactionsloading="false"></app-bar-stub>
+      <app-bar-stub viewmodedefault="resource-tiles" breadcrumbs="[object Object]" breadcrumbscontextactionsitems="" viewmodes="" hasbulkactions="false" hasviewoptions="true" hashiddenfiles="false" hasfileextensions="false" haspagination="false" showactionsonselection="false" issidebaropen="false" batchactionsloading="false"></app-bar-stub>
       <div class="trash-bin-filters flex justify-end flex-wrap items-end mx-4 mb-4">
         <div class="w-3xs"><label class="oc-label" for="trash-filter">Search
             <!--v-if-->
diff --git a/packages/web-pkg/src/components/AppBar/AppBar.vue b/packages/web-pkg/src/components/AppBar/AppBar.vue
index ded04baac3..8212b96be1 100644
--- a/packages/web-pkg/src/components/AppBar/AppBar.vue
+++ b/packages/web-pkg/src/components/AppBar/AppBar.vue
@@ -123,7 +123,7 @@ export default defineComponent({
     viewModeDefault: {
       type: String,
       required: false,
-      default: () => FolderViewModeConstants.name.table
+      default: () => FolderViewModeConstants.defaultModeName
     },
     breadcrumbs: {
       type: Array as PropType<BreadcrumbItem[]>,
diff --git a/packages/web-pkg/src/components/ContextActions/ContextMenuQuickAction.vue b/packages/web-pkg/src/components/ContextActions/ContextMenuQuickAction.vue
index 4302e62f03..8b876e44e8 100644
--- a/packages/web-pkg/src/components/ContextActions/ContextMenuQuickAction.vue
+++ b/packages/web-pkg/src/components/ContextActions/ContextMenuQuickAction.vue
@@ -2,6 +2,7 @@
   <oc-button
     :id="`context-menu-trigger-${resourceDomSelector(item)}`"
     v-oc-tooltip="contextMenuLabel"
+    :data-test-context-menu-resource-name="item.name"
     :aria-label="contextMenuLabel"
     appearance="raw"
     class="quick-action-button ml-1 p-1"
diff --git a/packages/web-pkg/src/components/FilesList/ResourceListItem.vue b/packages/web-pkg/src/components/FilesList/ResourceListItem.vue
index ae4558e156..edfaeef065 100644
--- a/packages/web-pkg/src/components/FilesList/ResourceListItem.vue
+++ b/packages/web-pkg/src/components/FilesList/ResourceListItem.vue
@@ -16,6 +16,7 @@
         :key="thumbnail"
         v-oc-tooltip="tooltipLabelIcon"
         :src="thumbnail"
+        :data-test-thumbnail-resource-name="resource.name"
         class="oc-resource-thumbnail rounded-xs size-8 object-cover"
         width="40"
         height="40"
diff --git a/packages/web-pkg/src/components/FilesList/ResourceTable.vue b/packages/web-pkg/src/components/FilesList/ResourceTable.vue
index b73443bf5f..fe566e7e0c 100644
--- a/packages/web-pkg/src/components/FilesList/ResourceTable.vue
+++ b/packages/web-pkg/src/components/FilesList/ResourceTable.vue
@@ -67,6 +67,8 @@
         :disabled="isResourceDisabled(item)"
         :model-value="isResourceSelected(item)"
         :outline="isLatestSelectedItem(item)"
+        :data-test-selection-resource-name="item.name"
+        :data-test-selection-resource-path="item.path"
         @click.stop="
           (e: MouseEvent) => {
             if (!interceptModifierClick(e, item)) {
diff --git a/packages/web-pkg/src/components/FilesList/ResourceTile.vue b/packages/web-pkg/src/components/FilesList/ResourceTile.vue
index d3e8b58310..98f77f8479 100644
--- a/packages/web-pkg/src/components/FilesList/ResourceTile.vue
+++ b/packages/web-pkg/src/components/FilesList/ResourceTile.vue
@@ -52,9 +52,10 @@
           <slot name="imageField" :item="resource">
             <oc-image
               v-if="resource.thumbnail"
-              class="tile-preview rounded-t-sm size-full object-cover aspect-[16/9]"
+              class="tile-preview rounded-t-sm size-full object-cover aspect-[16/9] pointer-events-none"
               :class="{ 'rounded-sm': isResourceSelected }"
               :src="resource.thumbnail"
+              :data-test-thumbnail-resource-name="resource.name"
               @click="toggleTile([resource, $event])"
             />
             <resource-icon
@@ -222,9 +223,11 @@ if (!lazy) {
   .oc-tile-card:hover .tile-preview {
     @apply rounded-sm;
   }
+
   .oc-tile-card:hover .oc-tile-card-preview {
     @apply p-2;
   }
+
   /* Show tooltip on status indicators without handler */
   .oc-tile-card-disabled span.oc-status-indicators-indicator {
     pointer-events: all;
diff --git a/packages/web-pkg/src/components/FilesList/ResourceTiles.vue b/packages/web-pkg/src/components/FilesList/ResourceTiles.vue
index a4d6cdd566..12bd79c7a4 100644
--- a/packages/web-pkg/src/components/FilesList/ResourceTiles.vue
+++ b/packages/web-pkg/src/components/FilesList/ResourceTiles.vue
@@ -59,7 +59,7 @@
           :is-extension-displayed="areFileExtensionsShown"
           :resource-icon-size="resourceIconSize"
           :draggable="dragDrop"
-          :lazy="lazy"
+          :lazy="areTilesLazy"
           :is-loading="isResourceInDeleteQueue(resource.id)"
           @vue:mounted="
             $emit('rowMounted', resource, tileRefs.tiles[resource.id], ImageDimension.Tile)
@@ -82,6 +82,8 @@
               class="inline-flex p-2"
               :disabled="isResourceDisabled(resource)"
               :model-value="isResourceSelected(resource)"
+              :data-test-selection-resource-name="resource.name"
+              :data-test-selection-resource-path="resource.path"
               @click.stop.prevent="toggleTile([resource, $event])"
             />
           </template>
@@ -92,7 +94,7 @@
             <resource-status-indicators
               :space="space"
               :resource="resource"
-              :filter="(indicator) => indicator.category === 'system'"
+              :filter="(indicator) => ['system', 'sharing'].includes(indicator.category)"
               :disable-handler="isResourceDisabled(resource)"
             />
           </template>
@@ -240,6 +242,9 @@ const viewSizeCurrent = computed(() => {
   return Math.min(unref(viewSizeMax), viewSize)
 })
 
+// Disable lazy loading during E2E tests to avoid having to scroll in tests
+const areTilesLazy = (window as any).__E2E__ === true ? false : lazy
+
 const areFileExtensionsShown = computed(() => resourcesStore.areFileExtensionsShown)
 
 const selectAllCheckboxLabel = computed(() => {
@@ -652,6 +657,7 @@ onBeforeUnmount(() => {
   .oc-tiles {
     grid-template-columns: repeat(auto-fit, minmax(var(--oc-size-tiles-actual), 1fr));
   }
+
   .oc-tiles-sort-filter-chip .oc-filter-chip-label {
     @apply text-sm;
   }
diff --git a/packages/web-pkg/src/composables/viewMode/constants.ts b/packages/web-pkg/src/composables/viewMode/constants.ts
index e26706d2fb..2a0d124be8 100644
--- a/packages/web-pkg/src/composables/viewMode/constants.ts
+++ b/packages/web-pkg/src/composables/viewMode/constants.ts
@@ -5,7 +5,7 @@ export const FolderViewModeConstants = {
     condensedTable: 'resource-table-condensed',
     tiles: 'resource-tiles'
   },
-  defaultModeName: 'resource-table',
+  defaultModeName: 'resource-tiles',
   queryName: 'view-mode',
   tilesSizeDefault: 2,
   tilesSizeMax: 6,
diff --git a/packages/web-pkg/tests/unit/components/AppBar/__snapshots__/AppBar.spec.ts.snap b/packages/web-pkg/tests/unit/components/AppBar/__snapshots__/AppBar.spec.ts.snap
index cbd72bc67a..1ec10e9592 100644
--- a/packages/web-pkg/tests/unit/components/AppBar/__snapshots__/AppBar.spec.ts.snap
+++ b/packages/web-pkg/tests/unit/components/AppBar/__snapshots__/AppBar.spec.ts.snap
@@ -10,7 +10,7 @@ exports[`AppBar component > renders > by default no breadcrumbs, no bulkactions,
       <portal-target name="app.runtime.mobile.nav"></portal-target>
       <!--v-if-->
       <div id="files-app-bar-controls-right" class="flex">
-        <view-options-stub perpagestorageprefix="files" hashiddenfiles="true" hasfileextensions="true" haspagination="true" paginationoptions="20,50,100,250,500" perpagequeryname="items-per-page" perpagedefault="100" viewmodedefault="resource-table" viewmodes=""></view-options-stub>
+        <view-options-stub perpagestorageprefix="files" hashiddenfiles="true" hasfileextensions="true" haspagination="true" paginationoptions="20,50,100,250,500" perpagequeryname="items-per-page" perpagedefault="100" viewmodedefault="resource-tiles" viewmodes=""></view-options-stub>
       </div>
     </div>
     <div class="files-app-bar-actions flex items-center justify-end mt-1 min-h-10 gap-2">
@@ -32,7 +32,7 @@ exports[`AppBar component > renders > if given, with content in the actions slot
       <portal-target name="app.runtime.mobile.nav"></portal-target>
       <!--v-if-->
       <div id="files-app-bar-controls-right" class="flex">
-        <view-options-stub perpagestorageprefix="files" hashiddenfiles="true" hasfileextensions="true" haspagination="true" paginationoptions="20,50,100,250,500" perpagequeryname="items-per-page" perpagedefault="100" viewmodedefault="resource-table" viewmodes=""></view-options-stub>
+        <view-options-stub perpagestorageprefix="files" hashiddenfiles="true" hasfileextensions="true" haspagination="true" paginationoptions="20,50,100,250,500" perpagequeryname="items-per-page" perpagedefault="100" viewmodedefault="resource-tiles" viewmodes=""></view-options-stub>
       </div>
     </div>
     <div class="files-app-bar-actions flex items-center justify-end mt-1 min-h-10 gap-2">
@@ -54,7 +54,7 @@ exports[`AppBar component > renders > if given, with content in the content slot
       <portal-target name="app.runtime.mobile.nav"></portal-target>
       <!--v-if-->
       <div id="files-app-bar-controls-right" class="flex">
-        <view-options-stub perpagestorageprefix="files" hashiddenfiles="true" hasfileextensions="true" haspagination="true" paginationoptions="20,50,100,250,500" perpagequeryname="items-per-page" perpagedefault="100" viewmodedefault="resource-table" viewmodes=""></view-options-stub>
+        <view-options-stub perpagestorageprefix="files" hashiddenfiles="true" hasfileextensions="true" haspagination="true" paginationoptions="20,50,100,250,500" perpagequeryname="items-per-page" perpagedefault="100" viewmodedefault="resource-tiles" viewmodes=""></view-options-stub>
       </div>
     </div>
     <div class="files-app-bar-actions flex items-center justify-end mt-1 min-h-10 gap-2">
diff --git a/packages/web-pkg/tests/unit/components/FilesList/__snapshots__/ResourceTiles.spec.ts.snap b/packages/web-pkg/tests/unit/components/FilesList/__snapshots__/ResourceTiles.spec.ts.snap
index acce9aacc5..cc3608c97d 100644
--- a/packages/web-pkg/tests/unit/components/FilesList/__snapshots__/ResourceTiles.spec.ts.snap
+++ b/packages/web-pkg/tests/unit/components/FilesList/__snapshots__/ResourceTiles.spec.ts.snap
@@ -35,7 +35,7 @@ exports[`ResourceTiles component > renders an array of spaces correctly 1`] = `
               <!-- Slot for indicators !-->
               <!--v-if-->
               <!-- Slot for individual actions -->
-              <!-- Slot for contextmenu --> <button type="button" aria-label="Show context menu" class="oc-button-secondary oc-button-raw oc-button-secondary-raw gap-2 justify-center text-base min-h-4 oc-button inline-flex cursor-pointer disabled:opacity-60 disabled:cursor-default quick-action-button ml-1 p-1 resource-tiles-btn-action-dropdown" id="context-menu-trigger-1">
+              <!-- Slot for contextmenu --> <button type="button" aria-label="Show context menu" class="oc-button-secondary oc-button-raw oc-button-secondary-raw gap-2 justify-center text-base min-h-4 oc-button inline-flex cursor-pointer disabled:opacity-60 disabled:cursor-default quick-action-button ml-1 p-1 resource-tiles-btn-action-dropdown" id="context-menu-trigger-1" data-test-context-menu-resource-name="Space 1">
                 <!--v-if-->
                 <!-- @slot Content of the button --> <span class="oc-icon box-content size-5.5"><svg data-testid="inline-svg-stub" src="icons/more-2-fill.svg" transform-source="(svg) => {
       if (__props.accessibleLabel !== &quot;&quot;) {
@@ -74,7 +74,7 @@ exports[`ResourceTiles component > renders an array of spaces correctly 1`] = `
               <!-- Slot for indicators !-->
               <!--v-if-->
               <!-- Slot for individual actions -->
-              <!-- Slot for contextmenu --> <button type="button" aria-label="Show context menu" class="oc-button-secondary oc-button-raw oc-button-secondary-raw gap-2 justify-center text-base min-h-4 oc-button inline-flex cursor-pointer disabled:opacity-60 disabled:cursor-default quick-action-button ml-1 p-1 resource-tiles-btn-action-dropdown" id="context-menu-trigger-2">
+              <!-- Slot for contextmenu --> <button type="button" aria-label="Show context menu" class="oc-button-secondary oc-button-raw oc-button-secondary-raw gap-2 justify-center text-base min-h-4 oc-button inline-flex cursor-pointer disabled:opacity-60 disabled:cursor-default quick-action-button ml-1 p-1 resource-tiles-btn-action-dropdown" id="context-menu-trigger-2" data-test-context-menu-resource-name="Space 2">
                 <!--v-if-->
                 <!-- @slot Content of the button --> <span class="oc-icon box-content size-5.5"><svg data-testid="inline-svg-stub" src="icons/more-2-fill.svg" transform-source="(svg) => {
       if (__props.accessibleLabel !== &quot;&quot;) {
diff --git a/tests/e2e/cucumber/features/file-action/copyMove.feature b/tests/e2e/cucumber/features/file-action/copyMove.feature
index d65a1f47fb..39a0252c5d 100644
--- a/tests/e2e/cucumber/features/file-action/copyMove.feature
+++ b/tests/e2e/cucumber/features/file-action/copyMove.feature
@@ -33,6 +33,7 @@ Feature: Copy
       | PARENT/fileToCopy4.txt   | some content                        |
       | PARENT/fileToCopy5.txt   | some content                        |
     And "Alice" logs in
+    And "Alice" reduces the tile size
 
     When "Alice" copies the following resource using sidebar-panel
       | resource    | to          |
diff --git a/tests/e2e/cucumber/features/shares/denyShareAccess.feature b/tests/e2e/cucumber/features/shares/denyShareAccess.feature
index 169c0e9dc1..dcd7977e49 100644
--- a/tests/e2e/cucumber/features/shares/denyShareAccess.feature
+++ b/tests/e2e/cucumber/features/shares/denyShareAccess.feature
@@ -12,6 +12,7 @@ Feature: deny share access
       | folder_to_shared/folder         |
       | folder_to_shared/folder_to_deny |
     And "Alice" opens the "files" app
+    And "Alice" switches to the "resource-table" view mode
     And "Alice" shares the following resource using the quick action
       | resource         | recipient | type | role     | resourceType |
       | folder_to_shared | Brian     | user | Can view | folder       |
diff --git a/tests/e2e/cucumber/features/smoke/tags.feature b/tests/e2e/cucumber/features/smoke/tags.feature
index 599f486a89..193ba0b0ed 100644
--- a/tests/e2e/cucumber/features/smoke/tags.feature
+++ b/tests/e2e/cucumber/features/smoke/tags.feature
@@ -11,6 +11,7 @@ Feature: Users can use web to organize tags
       | pathToFile | content     |
       | lorem.txt  | lorem ipsum |
     And "Alice" logs in
+    And "Alice" switches to the "resource-table" view mode
     And "Alice" adds the following tags for the following resources using the sidebar panel
       | resource  | tags         |
       | lorem.txt | tag 1, tag 2 |
@@ -38,6 +39,7 @@ Feature: Users can use web to organize tags
       | lorem.txt    | lorem ipsum |
       | textfile.txt | test file   |
     And "Alice" logs in
+    And "Alice" switches to the "resource-table" view mode
     And "Alice" adds the following tags for the following resources using the sidebar panel
       | resource  | tags       |
       | lorem.txt | tag1, tag2 |
@@ -59,6 +61,7 @@ Feature: Users can use web to organize tags
       | pathToFile                 | content     |
       | folder_to_shared/lorem.txt | lorem ipsum |
     And "Alice" logs in
+    And "Alice" switches to the "resource-table" view mode
     And "Alice" adds the following tags for the following resources using the sidebar panel
       | resource                   | tags         |
       | folder_to_shared/lorem.txt | tag 1, tag 2 |
@@ -68,6 +71,7 @@ Feature: Users can use web to organize tags
     And "Alice" logs out
 
     And "Brian" logs in
+    And "Brian" switches to the "resource-table" view mode
     And "Brian" navigates to the shared with me page
     Then the following resources should contain the following tags in the files list for user "Brian"
       | resource                   | tags         |
diff --git a/tests/e2e/cucumber/steps/ui/resources.ts b/tests/e2e/cucumber/steps/ui/resources.ts
index 6d9715fb21..346e226aba 100644
--- a/tests/e2e/cucumber/steps/ui/resources.ts
+++ b/tests/e2e/cucumber/steps/ui/resources.ts
@@ -1101,6 +1101,15 @@ When(
   }
 )
 
+When(
+  '{string} reduces the tile size',
+  async function (this: World, stepUser: string): Promise<void> {
+    const { page } = this.actorsEnvironment.getActor({ key: stepUser })
+    const resourceObject = new objects.applicationFiles.Resource({ page })
+    await resourceObject.reduceTileSize()
+  }
+)
+
 When(
   '{string} opens the right sidebar of the resource {string}',
   async function (this: World, stepUser: string, resource: string): Promise<void> {
diff --git a/tests/e2e/support/environment/actor/actor.ts b/tests/e2e/support/environment/actor/actor.ts
index 451e4f189d..0b19b3c285 100644
--- a/tests/e2e/support/environment/actor/actor.ts
+++ b/tests/e2e/support/environment/actor/actor.ts
@@ -18,6 +18,10 @@ export class ActorEnvironment extends EventEmitter implements Actor {
   async setup(): Promise<void> {
     this.context = await this.options.browser.newContext(buildBrowserContextOptions(this.options))
 
+    await this.context.addInitScript(() => {
+      ;(window as any).__E2E__ = true
+    })
+
     if (this.options.context.reportTracing) {
       await this.context.tracing.start({ screenshots: true, snapshots: true, sources: true })
     }
diff --git a/tests/e2e/support/objects/app-files/resource/actions.ts b/tests/e2e/support/objects/app-files/resource/actions.ts
index 9bf25e6ed9..edd9ea842b 100644
--- a/tests/e2e/support/objects/app-files/resource/actions.ts
+++ b/tests/e2e/support/objects/app-files/resource/actions.ts
@@ -20,8 +20,8 @@ const appBarContextMenu = '#oc-openfile-contextmenu-trigger'
 const appBarDownloadFileButton = '#oc-openfile-contextmenu .oc-files-actions-download-file-trigger'
 const deleteButtonBatchAction = '.oc-files-actions-delete-trigger'
 const createSpaceFromResourceAction = '.oc-files-actions-create-space-from-resource-trigger'
-const checkBox = `//*[@data-test-resource-name="%s"]//ancestor::tr//input`
-const checkBoxForTrashbin = `//*[@data-test-resource-path="%s"]//ancestor::tr//input`
+const checkBox = `//*[@data-test-selection-resource-name="%s"]//input[@type="checkbox"]`
+const checkBoxForTrashbin = `//*[@data-test-selection-resource-path="%s"]//input[@type="checkbox"]`
 const filesSelector = '//*[@data-test-resource-name="%s"]'
 export const fileRow =
   '//ancestor::*[(contains(@class, "oc-tile-card") or contains(@class, "oc-tbody-tr"))]'
@@ -96,6 +96,7 @@ const itemsPerPageDropDownOptionSelector =
   '//li[contains(@class,"vs__dropdown-option") and text()="%s"]'
 const footerTextSelector = '//*[@data-testid="files-list-footer-info"]'
 const filesTableRowSelector = 'tbody tr'
+const filesTableTilesSelector = '.oc-tiles-item'
 const itemsPerPageDropDownSelector = '.vs__actions'
 const filesPaginationNavSelector = '.files-pagination'
 const uploadInfoSuccessLabelSelector = '.upload-info-label.upload-info-success'
@@ -106,7 +107,7 @@ const pauseUploadButton = '#pause-upload-info-btn[aria-label="Pause upload"]'
 const resumeUploadButton = '#pause-upload-info-btn[aria-label="Resume upload"]'
 const cancelUploadButton = '#cancel-upload-info-btn'
 const filesContextMenuAction = 'div[id^="context-menu-drop"] button.oc-files-actions-%s-trigger'
-const highlightedFileRowSelector = '#files-space-table tr.oc-table-highlighted'
+const highlightedTileCardSelector = '.oc-tile-card-selected'
 const emptyTrashbinButtonSelector = '.oc-files-actions-empty-trash-bin-trigger'
 const resourceLockIcon =
   '//*[@data-test-resource-name="%s"]/ancestor::tr//td//span[@data-test-indicator-type="resource-locked"]'
@@ -115,8 +116,10 @@ const keepBothButton = '.oc-modal-body-actions-confirm'
 const mediaNavigationButton = `//button[contains(@class, "preview-controls-%s")]`
 const sideBarActions =
   '//ul[@id="oc-files-actions-sidebar"]//span[contains(@class,"oc-files-context-action-label")]/span'
-const selectAllCheckbox = '#resource-table-select-all'
-const filesTable = '#files-space-table .oc-table-data-cell-select'
+const selectAllCheckbox =
+  '//input[@type="checkbox" and (@id="tiles-view-select-all" or @id="resource-table-select-all")]'
+const firstResourceCheckbox =
+  '//*[contains(@class, "oc-table-data-cell-select") or contains(@class, "oc-tile-card-selection")]'
 const sharerAvatarSelector =
   '//*[@data-test-resource-name="%s"]/ancestor::tr//td[contains(@class, "oc-table-data-cell-sharedBy")]//img'
 const recipientAvatarSelector =
@@ -136,7 +139,7 @@ const onlyOfficeCanvasEditorSelector = '#id_viewer_overlay'
 const onlyOfficeCanvasCursorSelector = '#id_target_cursor'
 const onlyOfficeInfoDialog = '.alert .info-box'
 const onlyOfficeInfoDialogConfirm = `.alert button[result="ok"]`
-const fileThumbnail = `//span[@data-test-resource-name="%s"]/ancestor::tr[contains(@class, "oc-tbody-tr")]//img[contains(@class,"oc-resource-thumbnail")]`
+const fileThumbnail = `//img[@data-test-thumbnail-resource-name="%s"]`
 const fileIconWrapper = '#oc-file-details-sidebar .details-icon-wrapper'
 const fileIconPreview = '#oc-file-details-sidebar .details-preview'
 const activitySidebarPanel = 'sidebar-panel-activities'
@@ -144,6 +147,7 @@ const activitySidebarPanelBodyContent = '#sidebar-panel-activities .sidebar-pane
 const contextMenuAction = '//*[@id="oc-files-context-actions-context"]//span[text()="%s"]'
 const openWithAction = '.oc-files-actions-%s-trigger'
 const openWithButton = '//*[@id="oc-files-context-actions-context"]//span[text()="Open with..."]'
+const tilesSlider = '#tiles-size-slider'
 
 export const clickResource = async ({
   page,
@@ -283,7 +287,7 @@ export const createSpaceFromSelection = async ({
 }): Promise<Space> => {
   await selectOrDeselectResources({
     page,
-    resources: resources.map((r) => ({name: r}) as resourceArgs), // prettier-ignore
+    resources: resources.map((r) => ({ name: r }) as resourceArgs), // prettier-ignore
     select: true
   })
   await page.locator(util.format(resourceNameSelector, resources[0])).click({ button: 'right' })
@@ -311,7 +315,7 @@ export const createSpaceFromAll = async ({
   spaceName: string
 }): Promise<Space> => {
   await page.locator(selectAllCheckbox).click()
-  await page.locator(filesTable).first().click({ button: 'right' })
+  await page.locator(firstResourceCheckbox).first().click({ button: 'right' })
 
   await page.locator(createSpaceFromResourceAction).click()
   await page.locator(resourceNameInput).fill(spaceName)
@@ -838,11 +842,12 @@ export const selectOrDeselectResources = async (args: selectResourcesArgs): Prom
     await clickResource({ page, path: folder })
   }
   for (const resource of resources) {
+    await page.locator(util.format(checkBox, resource.name)).waitFor()
     const resourceCheckbox = page.locator(util.format(checkBox, resource.name))
     if (!(await resourceCheckbox.isChecked()) && select) {
-      await resourceCheckbox.check()
+      await resourceCheckbox.click()
     } else if (await resourceCheckbox.isChecked()) {
-      await resourceCheckbox.uncheck()
+      await resourceCheckbox.click()
     }
   }
 }
@@ -931,7 +936,7 @@ export const moveOrCopyMultipleResources = async (
   switch (method) {
     case 'dropdown-menu': {
       // after selecting multiple resources, resources can be copied or moved by clicking on any of the selected resources
-      await page.locator(highlightedFileRowSelector).first().click({ button: 'right' })
+      await page.locator(highlightedTileCardSelector).first().click({ button: 'right' })
       await page.locator(util.format(filesContextMenuAction, action)).click()
 
       await page.locator(breadcrumbRoot).click()
@@ -972,7 +977,7 @@ export const moveOrCopyMultipleResources = async (
       break
     }
     case 'drag-drop': {
-      const source = page.locator(highlightedFileRowSelector).first()
+      const source = page.locator(highlightedTileCardSelector).first()
       const target = page.locator(util.format(resourceNameSelector, newLocation))
 
       await Promise.all([...waitForMoveResponses, source.dragTo(target)])
@@ -981,7 +986,7 @@ export const moveOrCopyMultipleResources = async (
       break
     }
     case 'drag-drop-breadcrumb': {
-      const source = page.locator(highlightedFileRowSelector).first()
+      const source = page.locator(highlightedTileCardSelector).first()
       const target = page.locator(
         util.format(
           breadcrumbResourceNameSelector,
@@ -1033,7 +1038,10 @@ export const moveOrCopyResource = async (args: moveOrCopyResourceArgs): Promise<
     }
     case 'keyboard': {
       const resourceCheckbox = page.locator(util.format(checkBox, resourceBase))
-      await resourceCheckbox.check()
+      const isChecked = await resourceCheckbox.isChecked()
+      if (!isChecked) {
+        await resourceCheckbox.click()
+      }
       const keyValue = action === 'copy' ? 'c' : 'x'
       await page.keyboard.press(`ControlOrMeta+${keyValue}`)
       await page.locator(breadcrumbRoot).click()
@@ -1743,7 +1751,6 @@ export interface openFileInViewerArgs {
 
 export const openFileInViewer = async (args: openFileInViewerArgs): Promise<void> => {
   const { page, name, actionType } = args
-
   switch (actionType) {
     case 'OnlyOffice':
       await Promise.all([
@@ -1920,10 +1927,12 @@ export const countNumberOfResourcesInThePage = async ({
   // all the elements present
   await page.locator(footerTextSelector).waitFor()
   return page.evaluate(
-    ([filesTableRowSelector]) => {
-      return Promise.resolve(document.querySelectorAll(filesTableRowSelector).length)
+    ([filesTableRowSelector, filesTableTilesSelector]) => {
+      const rows = document.querySelectorAll(filesTableRowSelector).length
+      const tiles = document.querySelectorAll(filesTableTilesSelector).length
+      return Promise.resolve(Math.max(rows, tiles))
     },
-    [filesTableRowSelector]
+    [filesTableRowSelector, filesTableTilesSelector]
   )
 }
 
@@ -2242,6 +2251,13 @@ export const uploadImageFromClipboard = async ({ page }: { page: Page }): Promis
   await page.keyboard.press('Escape')
 }
 
+export const reduceTileSize = async ({ page }: { page: Page }): Promise<void> => {
+  await page.locator(filesViewOptionButton).click()
+  const slider = page.locator(tilesSlider)
+  await slider.focus()
+  await page.keyboard.press('ArrowLeft')
+}
+
 export const openRightSidebar = async ({
   page,
   resource
diff --git a/tests/e2e/support/objects/app-files/resource/index.ts b/tests/e2e/support/objects/app-files/resource/index.ts
index e2bb2fb074..22303980bb 100644
--- a/tests/e2e/support/objects/app-files/resource/index.ts
+++ b/tests/e2e/support/objects/app-files/resource/index.ts
@@ -411,6 +411,10 @@ export class Resource {
     await po.uploadImageFromClipboard({ page: this.#page })
   }
 
+  async reduceTileSize(): Promise<void> {
+    await po.reduceTileSize({ page: this.#page })
+  }
+
   async openRightSidebar(resource: string): Promise<void> {
     await po.openRightSidebar({ page: this.#page, resource })
   }
diff --git a/tests/e2e/support/objects/app-files/resource/utils.ts b/tests/e2e/support/objects/app-files/resource/utils.ts
index 9c932b4d7f..9a897659bd 100644
--- a/tests/e2e/support/objects/app-files/resource/utils.ts
+++ b/tests/e2e/support/objects/app-files/resource/utils.ts
@@ -1,9 +1,10 @@
 import { Page, Locator } from '@playwright/test'
 import util from 'util'
 
-const resourceNameSelector = '#files-space-table [data-test-resource-name="%s"]'
+const resourceNameSelector =
+  '//div[@id="files-space-table" or @id="tiles-view"]//*[@data-test-resource-name="%s"]'
 const showLinkShareButton =
-  '//span[@data-test-resource-name="%s"]/ancestor::tr[contains(@class, "oc-tbody-tr")]//button[contains(@data-test-indicator-type, "%s")]'
+  '//button[@data-test-indicator-resource-name="%s" and @data-test-indicator-type="%s"]'
 
 export const waitForResources = async ({
   page,
diff --git a/tests/e2e/support/objects/app-files/utils/sidebar.ts b/tests/e2e/support/objects/app-files/utils/sidebar.ts
index 88b412c96f..8c99f93db0 100644
--- a/tests/e2e/support/objects/app-files/utils/sidebar.ts
+++ b/tests/e2e/support/objects/app-files/utils/sidebar.ts
@@ -2,8 +2,13 @@ import { Page } from '@playwright/test'
 import util from 'util'
 import { locatorUtils } from '../../../utils'
 
-const contextMenuSelector =
-  '//span[@data-test-resource-name="%s"]/ancestor::tr[contains(@class, "oc-tbody-tr")]//button[contains(@class, "resource-table-btn-action-dropdown")]'
+const contextMenuSelector = `
+//button[
+  @data-test-context-menu-resource-name="%s" and
+  (contains(@class, "resource-tiles-btn-action-dropdown") or
+   contains(@class, "resource-table-btn-action-dropdown"))
+]
+`
 const closeSidebarRootPanelBtn = `#app-sidebar .is-active-root-panel .header__close`
 const closeSidebarSubPanelBtn = `#app-sidebar .is-active-sub-panel .header__close`