diff --git a/changelog/unreleased/bugfix-nav-icon-flickering-lightmode b/changelog/unreleased/bugfix-nav-icon-flickering-lightmode
new file mode 100644
index 00000000000..ceff8518b0a
--- /dev/null
+++ b/changelog/unreleased/bugfix-nav-icon-flickering-lightmode
@@ -0,0 +1,6 @@
+Bugfix: SidebarNavItem icon flickering
+
+We've fixed a bug which caused the icons on the SidebarNav 
+to flicker when transitioning in lightmode
+
+https://github.com/owncloud/web/pull/7309
\ No newline at end of file
diff --git a/changelog/unreleased/enhancement-keyboard-shortcut-indicators b/changelog/unreleased/enhancement-keyboard-shortcut-indicators
new file mode 100644
index 00000000000..68ee3415ef0
--- /dev/null
+++ b/changelog/unreleased/enhancement-keyboard-shortcut-indicators
@@ -0,0 +1,6 @@
+Enhancement: Keyboard shortcut indicators in ContextMenu
+
+We've added the option to display relevant keyboard shortcuts in the contextmenu to give notice to the user which shortcuts are available
+
+https://github.com/owncloud/web/pull/7309
+https://github.com/owncloud/web/issues/6892
\ No newline at end of file
diff --git a/changelog/unreleased/enhancement-lowlight-cut-resources b/changelog/unreleased/enhancement-lowlight-cut-resources
new file mode 100644
index 00000000000..a54603b50c4
--- /dev/null
+++ b/changelog/unreleased/enhancement-lowlight-cut-resources
@@ -0,0 +1,5 @@
+Enhancement: Lowlight cut resources
+
+We've added a visual indication to show which resources are being cut
+
+https://github.com/owncloud/web/pull/7309
\ No newline at end of file
diff --git a/changelog/unreleased/enhancement-replace-locationpicker-clipboard b/changelog/unreleased/enhancement-replace-locationpicker-clipboard
new file mode 100644
index 00000000000..df299088d01
--- /dev/null
+++ b/changelog/unreleased/enhancement-replace-locationpicker-clipboard
@@ -0,0 +1,7 @@
+Enhancement: Replace locationpicker with clipboard actions
+
+We've replaced the locationpicker in batchactions and contextmenu with
+the new cut/copy/paste clipboard actions.
+
+https://github.com/owncloud/web/pull/7309
+https://github.com/owncloud/web/issues/6892
diff --git a/packages/web-app-files/src/components/ActionMenuItem.vue b/packages/web-app-files/src/components/ActionMenuItem.vue
index c968de70a89..397655e71be 100644
--- a/packages/web-app-files/src/components/ActionMenuItem.vue
+++ b/packages/web-app-files/src/components/ActionMenuItem.vue
@@ -32,6 +32,11 @@
       <span class="oc-files-context-action-label" data-testid="action-label">{{
         action.label(filterParams)
       }}</span>
+      <span
+        v-if="action.shortcut && shortcutHint"
+        class="oc-files-context-action-shortcut"
+        v-text="action.shortcut"
+      />
       <span
         v-if="action.opensInNewWindow"
         data-testid="action-sr-hint"
@@ -57,6 +62,11 @@ export default {
     appearance: {
       type: String,
       default: 'raw'
+    },
+    shortcutHint: {
+      type: Boolean,
+      default: true,
+      required: false
     }
   },
   computed: {
@@ -110,4 +120,10 @@ export default {
 .action-menu-item {
   vertical-align: middle;
 }
+.oc-files-context-action-shortcut {
+  justify-content: right !important;
+  font-size: 0.85rem;
+  font-weight: bold !important;
+  opacity: 0.7;
+}
 </style>
diff --git a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
index 1792b702ec0..dbd3de60d15 100644
--- a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
+++ b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
@@ -110,6 +110,15 @@
         </li>
       </oc-list>
     </oc-drop>
+    <div id="clipboard-btns" class="oc-button-group">
+      <oc-button v-if="showPasteHereButton" @click="pasteFilesHere">
+        <oc-icon fill-type="line" name="clipboard" />
+        <span v-translate>Paste here</span>
+      </oc-button>
+      <oc-button v-if="showPasteHereButton" @click="clearClipboardFiles">
+        <oc-icon fill-type="line" name="close" />
+      </oc-button>
+    </div>
   </div>
 </template>
 
@@ -130,7 +139,8 @@ import {
   useCapabilitySpacesEnabled,
   useStore,
   usePublicLinkPassword,
-  useUserContext
+  useUserContext,
+  usePublicLinkContext
 } from 'web-pkg/src/composables'
 
 import { DavProperties, DavProperty } from 'web-pkg/src/constants'
@@ -184,7 +194,8 @@ export default defineComponent({
       hasShareJail: useCapabilityShareJailEnabled(),
       hasSpaces: useCapabilitySpacesEnabled(),
       publicLinkPassword: usePublicLinkPassword({ store }),
-      isUserContext: useUserContext({ store })
+      isUserContext: useUserContext({ store }),
+      isPublicLinkContext: usePublicLinkContext({ store })
     }
   },
   data: () => ({
@@ -194,10 +205,13 @@ export default defineComponent({
   }),
   computed: {
     ...mapGetters(['capabilities', 'configuration', 'newFileHandlers', 'user']),
-    ...mapGetters('Files', ['files', 'currentFolder', 'selectedFiles']),
+    ...mapGetters('Files', ['files', 'currentFolder', 'selectedFiles', 'clipboardResources']),
     ...mapGetters('runtime/spaces', ['spaces']),
     ...mapState('Files', ['areFileExtensionsShown']),
 
+    showPasteHereButton() {
+      return this.clipboardResources && this.clipboardResources.length !== 0
+    },
     mimetypesAllowedForCreation() {
       // we can't use `mapGetters` here because the External app doesn't exist in all deployments
       const mimeTypes = this.$store.getters['External/mimeTypes']
@@ -275,7 +289,12 @@ export default defineComponent({
     }
   },
   methods: {
-    ...mapActions('Files', ['loadPreview', 'loadIndicators']),
+    ...mapActions('Files', [
+      'loadPreview',
+      'loadIndicators',
+      'clearClipboardFiles',
+      'pasteSelectedFiles'
+    ]),
     ...mapActions([
       'openFile',
       'showMessage',
@@ -287,6 +306,23 @@ export default defineComponent({
     ...mapMutations('runtime/spaces', ['UPDATE_SPACE_FIELD']),
     ...mapMutations(['SET_QUOTA']),
 
+    pasteFilesHere() {
+      this.pasteSelectedFiles({
+        client: this.$client,
+        createModal: this.createModal,
+        hideModal: this.hideModal,
+        showMessage: this.showMessage,
+        $gettext: this.$gettext,
+        $gettextInterpolate: this.$gettextInterpolate,
+        $ngettext: this.$ngettext,
+        isPublicLinkContext: this.isPublicLinkContext,
+        publicLinkPassword: this.publicLinkPassword,
+        upsertResource: this.UPSERT_RESOURCE
+      }).then(() => {
+        ;(document.activeElement as HTMLElement).blur()
+      })
+    },
+
     async onUploadComplete(result) {
       if (result.successful) {
         const file = result.successful[0]
@@ -810,7 +846,7 @@ export default defineComponent({
   }
 })
 </script>
-<style lang="scss" scoped>
+<style lang="scss">
 #create-list {
   li {
     border: 1px solid transparent;
@@ -843,4 +879,12 @@ export default defineComponent({
     height: 100% !important;
   }
 }
+#clipboard-btns {
+  :nth-child(1) {
+    border-right: 0px !important;
+  }
+  :nth-child(2) {
+    border-left: 0px !important;
+  }
+}
 </style>
diff --git a/packages/web-app-files/src/components/AppBar/SelectedResources/BatchActions.vue b/packages/web-app-files/src/components/AppBar/SelectedResources/BatchActions.vue
index 72fd9adcf27..c8a3c4730a9 100644
--- a/packages/web-app-files/src/components/AppBar/SelectedResources/BatchActions.vue
+++ b/packages/web-app-files/src/components/AppBar/SelectedResources/BatchActions.vue
@@ -7,6 +7,7 @@
       :items="selectedFiles"
       appearance="outline"
       class="oc-mr-s"
+      :shortcut-hint="false"
     />
   </oc-list>
 </template>
diff --git a/packages/web-app-files/src/components/FilesList/ContextActions.vue b/packages/web-app-files/src/components/FilesList/ContextActions.vue
index eb9806a085d..0fd0b2f09ea 100644
--- a/packages/web-app-files/src/components/FilesList/ContextActions.vue
+++ b/packages/web-app-files/src/components/FilesList/ContextActions.vue
@@ -16,6 +16,7 @@ import DownloadFile from '../../mixins/actions/downloadFile'
 import EmptyTrashBin from '../../mixins/actions/emptyTrashBin'
 import Favorite from '../../mixins/actions/favorite'
 import Move from '../../mixins/actions/move'
+import Paste from '../../mixins/actions/paste'
 import Navigate from '../../mixins/actions/navigate'
 import Rename from '../../mixins/actions/rename'
 import Restore from '../../mixins/actions/restore'
@@ -43,6 +44,7 @@ export default {
     EmptyTrashBin,
     Favorite,
     Move,
+    Paste,
     Navigate,
     Rename,
     Restore,
@@ -148,6 +150,7 @@ export default {
         ...this.$_delete_items,
         ...this.$_move_items,
         ...this.$_copy_items,
+        ...this.$_paste_items,
         ...this.$_rename_items,
         ...this.$_restore_items,
         ...this.$_acceptShare_items,
diff --git a/packages/web-app-files/src/components/FilesList/KeyboardActions.vue b/packages/web-app-files/src/components/FilesList/KeyboardActions.vue
index 8d8d7245a11..db8cd4924fa 100644
--- a/packages/web-app-files/src/components/FilesList/KeyboardActions.vue
+++ b/packages/web-app-files/src/components/FilesList/KeyboardActions.vue
@@ -7,6 +7,7 @@ import { bus } from 'web-pkg/src/instance'
 import { mapActions, mapState, mapMutations } from 'vuex'
 import { defineComponent } from '@vue/composition-api'
 import MixinFilesListScrolling from '../../mixins/filesListScrolling'
+import { usePublicLinkContext, usePublicLinkPassword, useStore } from 'web-pkg/src/composables'
 
 export default defineComponent({
   mixins: [MixinFilesListScrolling],
@@ -21,6 +22,13 @@ export default defineComponent({
       default: 'files-view'
     }
   },
+  setup() {
+    const store = useStore()
+    return {
+      publicLinkPassword: usePublicLinkPassword({ store }),
+      isPublicLinkContext: usePublicLinkContext({ store })
+    }
+  },
   data: () => {
     return {
       selectionCursor: 0
@@ -202,6 +210,8 @@ export default defineComponent({
         $gettext: this.$gettext,
         $gettextInterpolate: this.$gettextInterpolate,
         $ngettext: this.$ngettext,
+        isPublicLinkContext: this.isPublicLinkContext,
+        publicLinkPassword: this.publicLinkPassword,
         upsertResource: this.upsertResource
       })
     },
diff --git a/packages/web-app-files/src/components/FilesList/ResourceTable.vue b/packages/web-app-files/src/components/FilesList/ResourceTable.vue
index 7c236510925..0c4ed4672c1 100644
--- a/packages/web-app-files/src/components/FilesList/ResourceTable.vue
+++ b/packages/web-app-files/src/components/FilesList/ResourceTable.vue
@@ -61,6 +61,7 @@
           :is-resource-clickable="isResourceClickable(item.id)"
           :folder-link="folderLink(item)"
           :parent-folder-link="parentFolderLink(item)"
+          :class="{ 'resource-table-resource-cut': isResourceCut(item) }"
           @click="emitFileClick(item)"
         />
         <oc-button
@@ -186,6 +187,7 @@ import Rename from '../../mixins/actions/rename'
 import { defineComponent, PropType } from '@vue/composition-api'
 import { extractDomSelector } from 'web-client/src/helpers/resource'
 import { Resource } from 'web-client'
+import { ClipboardActions } from '../../helpers/clipboardActions'
 import { ShareTypes } from 'web-client/src/helpers/share'
 import { createLocationSpaces } from '../../router'
 
@@ -400,7 +402,12 @@ export default defineComponent({
   },
   computed: {
     ...mapGetters(['configuration']),
-    ...mapState('Files', ['areFileExtensionsShown', 'latestSelectedId']),
+    ...mapState('Files', [
+      'areFileExtensionsShown',
+      'latestSelectedId',
+      'clipboardResources',
+      'clipboardAction'
+    ]),
     ...mapState('runtime/spaces', ['spaces']),
     popperOptions() {
       return {
@@ -563,6 +570,10 @@ export default defineComponent({
     isResourceSelected(item) {
       return this.selectedIds.includes(item.id)
     },
+    isResourceCut(resource) {
+      if (this.clipboardAction !== ClipboardActions.Cut) return false
+      return this.clipboardResources.some((r) => r.id === resource.id)
+    },
     isLatestSelectedItem(item) {
       return item.id === this.latestSelectedId
     },
@@ -801,6 +812,9 @@ export default defineComponent({
 </script>
 <style lang="scss">
 .resource-table {
+  &-resource-cut {
+    opacity: 0.6;
+  }
   &-resource-wrapper {
     &-limit-max-width {
       max-width: calc(100% - var(--oc-space-medium));
diff --git a/packages/web-app-files/src/helpers/resource/copyMove.ts b/packages/web-app-files/src/helpers/resource/copyMove.ts
index 9e0e3204285..4740d2bd29d 100644
--- a/packages/web-app-files/src/helpers/resource/copyMove.ts
+++ b/packages/web-app-files/src/helpers/resource/copyMove.ts
@@ -135,7 +135,7 @@ export const resolveAllConflicts = async (
 
 const hasRecursion = (resourcesToMove: Resource[], targetResource: Resource): boolean => {
   return resourcesToMove.some((resource: Resource) =>
-    targetResource.webDavPath.startsWith(resource.webDavPath)
+    targetResource.webDavPath.endsWith(resource.webDavPath)
   )
 }
 
@@ -208,8 +208,8 @@ export const move = (
   $gettext,
   $gettextInterpolate,
   $ngettext,
-  context,
-  publicLinkPassword = null
+  isPublicLinkContext: boolean,
+  publicLinkPassword: string | null = null
 ): Promise<Resource[]> => {
   return copyMoveResource(
     resourcesToMove,
@@ -221,7 +221,7 @@ export const move = (
     $gettext,
     $gettextInterpolate,
     $ngettext,
-    context,
+    isPublicLinkContext,
     publicLinkPassword,
     false
   )
@@ -237,8 +237,8 @@ export const copy = (
   $gettext,
   $gettextInterpolate,
   $ngettext,
-  context,
-  publicLinkPassword = null
+  isPublicLinkContext: boolean,
+  publicLinkPassword: string | null = null
 ): Promise<Resource[]> => {
   return copyMoveResource(
     resourcesToMove,
@@ -250,7 +250,7 @@ export const copy = (
     $gettext,
     $gettextInterpolate,
     $ngettext,
-    context,
+    isPublicLinkContext,
     publicLinkPassword,
     true
   )
@@ -273,11 +273,10 @@ const clientListFilesInFolder = async (
   client: any,
   webDavPath: string,
   depth: number,
-  context: string,
+  isPublicLinkContext: boolean,
   publicLinkPassword: string
 ) => {
-  const isPublicFilesRoute = context === 'files-public-files'
-  if (isPublicFilesRoute) {
+  if (isPublicLinkContext) {
     return client.publicFiles.list(webDavPath, publicLinkPassword, DavProperties.Default, depth)
   }
   return client.files.list(webDavPath, depth, DavProperties.Default)
@@ -288,11 +287,10 @@ const clientMoveFilesInFolder = async (
   webDavPathSource: string,
   webDavPathTarget: string,
   overwrite: boolean,
-  context: string,
+  isPublicLinkContext: boolean,
   publicLinkPassword: string
 ) => {
-  const isPublicFilesRoute = context === 'files-public-files'
-  if (isPublicFilesRoute) {
+  if (isPublicLinkContext) {
     return client.publicFiles.move(
       webDavPathSource,
       webDavPathTarget,
@@ -308,11 +306,10 @@ const clientCopyFilesInFolder = async (
   webDavPathSource: string,
   webDavPathTarget: string,
   overwrite: boolean,
-  context: string,
+  isPublicLinkContext: boolean,
   publicLinkPassword: string
 ) => {
-  const isPublicFilesRoute = context === 'files-public-files'
-  if (isPublicFilesRoute) {
+  if (isPublicLinkContext) {
     return client.publicFiles.copy(
       webDavPathSource,
       webDavPathTarget,
@@ -333,7 +330,7 @@ const copyMoveResource = async (
   $gettext,
   $gettextInterpolate,
   $ngettext,
-  context,
+  isPublicLinkContext,
   publicLinkPassword,
   copy = false
 ): Promise<Resource[]> => {
@@ -349,7 +346,7 @@ const copyMoveResource = async (
     client,
     targetFolder.webDavPath,
     1,
-    context,
+    isPublicLinkContext,
     publicLinkPassword
   )
   const targetFolderResources = targetFolderItems.map((i) => buildResource(i))
@@ -396,7 +393,7 @@ const copyMoveResource = async (
           resource.webDavPath,
           webDavPathTarget,
           overwriteTarget,
-          context,
+          isPublicLinkContext,
           publicLinkPassword
         )
       } else {
@@ -405,7 +402,7 @@ const copyMoveResource = async (
           resource.webDavPath,
           webDavPathTarget,
           overwriteTarget,
-          context,
+          isPublicLinkContext,
           publicLinkPassword
         )
       }
diff --git a/packages/web-app-files/src/index.js b/packages/web-app-files/src/index.js
index 31e44701e50..aa4fba86f2b 100644
--- a/packages/web-app-files/src/index.js
+++ b/packages/web-app-files/src/index.js
@@ -1,7 +1,6 @@
 import App from './App.vue'
 import Favorites from './views/Favorites.vue'
 import FilesDrop from './views/FilesDrop.vue'
-import LocationPicker from './views/LocationPicker.vue'
 import PrivateLink from './views/PrivateLink.vue'
 import PublicFiles from './views/PublicFiles.vue'
 import Personal from './views/Personal.vue'
@@ -100,7 +99,6 @@ export default {
     Favorites,
     Personal,
     FilesDrop,
-    LocationPicker,
     PrivateLink,
     PublicFiles,
     SearchResults,
diff --git a/packages/web-app-files/src/mixins/actions/copy.js b/packages/web-app-files/src/mixins/actions/copy.js
index f409167ba46..aae3d24e423 100644
--- a/packages/web-app-files/src/mixins/actions/copy.js
+++ b/packages/web-app-files/src/mixins/actions/copy.js
@@ -1,24 +1,35 @@
 import {
-  createLocationOperations,
   isLocationCommonActive,
   isLocationPublicActive,
   isLocationSpacesActive
 } from '../../router'
+import { mapActions } from 'vuex'
 
 export default {
   computed: {
+    isMacOs() {
+      return window.navigator.platform.match('Mac')
+    },
+    getCopyShortcutString() {
+      if (this.isMacOs) {
+        return this.$pgettext('Keyboard shortcut for macOS for copying files', '⌘ + C')
+      }
+      return this.$pgettext('Keyboard shortcut for non-macOS systems for copying files', 'Ctrl + C')
+    },
     $_copy_items() {
       return [
         {
           name: 'copy',
           icon: 'file-copy-2',
           handler: this.$_copy_trigger,
+          shortcut: this.getCopyShortcutString,
           label: () =>
             this.$pgettext('Action in the files list row to initiate copying resources', 'Copy'),
           isEnabled: ({ resources }) => {
             if (
               !isLocationSpacesActive(this.$router, 'files-spaces-personal') &&
               !isLocationSpacesActive(this.$router, 'files-spaces-project') &&
+              !isLocationSpacesActive(this.$router, 'files-spaces-share') &&
               !isLocationPublicActive(this.$router, 'files-public-files') &&
               !isLocationCommonActive(this.$router, 'files-common-favorites')
             ) {
@@ -43,41 +54,10 @@ export default {
     }
   },
   methods: {
-    $_copy_trigger({ resources }) {
-      let context = 'private'
-
-      const query = {
-        resource: resources.map((resource) => {
-          return resource.path
-        })
-      }
+    ...mapActions('Files', ['copySelectedFiles']),
 
-      if (isLocationPublicActive(this.$router, 'files-public-files')) {
-        context = 'public'
-      }
-
-      if (isLocationSpacesActive(this.$router, 'files-spaces-project')) {
-        context = 'space'
-        query.storageId = this.$route.params.storageId
-      }
-
-      if (isLocationSpacesActive(this.$router, 'files-spaces-personal')) {
-        context = 'personal'
-        query.storageId = this.$route.params.storageId
-      }
-
-      const item = this.currentFolder.path || this.homeFolder
-
-      return this.$router.push(
-        createLocationOperations('files-operations-location-picker', {
-          params: {
-            context,
-            item,
-            action: 'copy'
-          },
-          query
-        })
-      )
+    $_copy_trigger() {
+      this.copySelectedFiles()
     }
   }
 }
diff --git a/packages/web-app-files/src/mixins/actions/move.js b/packages/web-app-files/src/mixins/actions/move.js
index 6c2c4d66635..fe6f8e63667 100644
--- a/packages/web-app-files/src/mixins/actions/move.js
+++ b/packages/web-app-files/src/mixins/actions/move.js
@@ -1,25 +1,36 @@
 import { canBeMoved } from '../../helpers/permissions'
 import {
-  createLocationOperations,
   isLocationCommonActive,
   isLocationPublicActive,
   isLocationSpacesActive
 } from '../../router'
+import { mapActions } from 'vuex'
 
 export default {
   computed: {
+    isMacOs() {
+      return window.navigator.platform.match('Mac')
+    },
+    getCutShortcutString() {
+      if (this.isMacOs) {
+        return this.$pgettext('Keyboard shortcut for macOS for cutting files', '⌘ + X')
+      }
+      return this.$pgettext('Keyboard shortcut for non-macOS systems for cutting files', 'Ctrl + X')
+    },
     $_move_items() {
       return [
         {
-          name: 'move',
-          icon: 'folder-shared',
+          name: 'cut',
+          icon: 'scissors',
           handler: this.$_move_trigger,
+          shortcut: this.getCutShortcutString,
           label: () =>
-            this.$pgettext('Action in the files list row to initiate moving resources', 'Move'),
+            this.$pgettext('Action in the files list row to initiate cutting resources', 'Cut'),
           isEnabled: ({ resources }) => {
             if (
               !isLocationSpacesActive(this.$router, 'files-spaces-personal') &&
               !isLocationSpacesActive(this.$router, 'files-spaces-project') &&
+              !isLocationSpacesActive(this.$router, 'files-spaces-share') &&
               !isLocationPublicActive(this.$router, 'files-public-files') &&
               !isLocationCommonActive(this.$router, 'files-common-favorites')
             ) {
@@ -45,41 +56,9 @@ export default {
     }
   },
   methods: {
-    $_move_trigger({ resources }) {
-      let context = 'private'
-
-      const query = {
-        resource: resources.map((resource) => {
-          return resource.path
-        })
-      }
-
-      if (isLocationPublicActive(this.$router, 'files-public-files')) {
-        context = 'public'
-      }
-
-      if (isLocationSpacesActive(this.$router, 'files-spaces-project')) {
-        context = 'space'
-        query.storageId = this.$route.params.storageId
-      }
-
-      if (isLocationSpacesActive(this.$router, 'files-spaces-personal')) {
-        context = 'personal'
-        query.storageId = this.$route.params.storageId
-      }
-
-      const item = this.currentFolder.path || this.homeFolder
-
-      return this.$router.push(
-        createLocationOperations('files-operations-location-picker', {
-          params: {
-            context,
-            item,
-            action: 'move'
-          },
-          query
-        })
-      )
+    ...mapActions('Files', ['cutSelectedFiles']),
+    $_move_trigger() {
+      this.cutSelectedFiles()
     }
   }
 }
diff --git a/packages/web-app-files/src/mixins/actions/paste.js b/packages/web-app-files/src/mixins/actions/paste.js
new file mode 100644
index 00000000000..49f6b254fd6
--- /dev/null
+++ b/packages/web-app-files/src/mixins/actions/paste.js
@@ -0,0 +1,82 @@
+import {
+  isLocationCommonActive,
+  isLocationPublicActive,
+  isLocationSpacesActive
+} from '../../router'
+import { mapActions, mapMutations, mapGetters } from 'vuex'
+
+export default {
+  computed: {
+    ...mapGetters('Files', ['clipboardResources']),
+    isMacOs() {
+      return window.navigator.platform.match('Mac')
+    },
+    getPasteShortcutString() {
+      if (this.isMacOs) {
+        return this.$pgettext('Keyboard shortcut for macOS for pasting files', '⌘ + V')
+      }
+      return this.$pgettext('Keyboard shortcut for non-macOS systems for pasting files', 'Ctrl + V')
+    },
+    $_paste_items() {
+      return [
+        {
+          name: 'paste',
+          icon: 'clipboard',
+          handler: this.$_paste_trigger,
+          label: () =>
+            this.$pgettext('Action in the files list row to initiate pasting resources', 'Paste'),
+          shortcut: this.getPasteShortcutString,
+          isEnabled: ({ resources }) => {
+            if (this.clipboardResources.length === 0) return false
+            if (
+              !isLocationSpacesActive(this.$router, 'files-spaces-personal') &&
+              !isLocationSpacesActive(this.$router, 'files-spaces-project') &&
+              !isLocationSpacesActive(this.$router, 'files-spaces-share') &&
+              !isLocationPublicActive(this.$router, 'files-public-files') &&
+              !isLocationCommonActive(this.$router, 'files-common-favorites')
+            ) {
+              return false
+            }
+            if (resources.length === 0) {
+              return false
+            }
+
+            if (isLocationPublicActive(this.$router, 'files-public-files')) {
+              return this.currentFolder.canCreate()
+            }
+
+            // copy can't be restricted in authenticated context, because
+            // a user always has their home dir with write access
+            return true
+          },
+          componentType: 'oc-button',
+          class: 'oc-files-actions-copy-trigger'
+        }
+      ]
+    }
+  },
+  methods: {
+    ...mapActions(['showMessage', 'createModal', 'hideModal']),
+    ...mapActions('Files', ['pasteSelectedFiles']),
+    ...mapMutations('Files', {
+      upsertResource: 'UPSERT_RESOURCE'
+    }),
+
+    $_paste_trigger() {
+      const isPublicLinkContext = this.$store.getters['runtime/auth/isPublicLinkContextReady']
+      const publicLinkPassword = this.$store.getters['runtime/auth/publicLinkPassword']
+      this.pasteSelectedFiles({
+        client: this.$client,
+        createModal: this.createModal,
+        hideModal: this.hideModal,
+        showMessage: this.showMessage,
+        $gettext: this.$gettext,
+        $gettextInterpolate: this.$gettextInterpolate,
+        $ngettext: this.$ngettext,
+        isPublicLinkContext,
+        publicLinkPassword,
+        upsertResource: this.upsertResource
+      })
+    }
+  }
+}
diff --git a/packages/web-app-files/src/mixins/actions/rename.js b/packages/web-app-files/src/mixins/actions/rename.js
index 1bf181c68cd..8676d469259 100644
--- a/packages/web-app-files/src/mixins/actions/rename.js
+++ b/packages/web-app-files/src/mixins/actions/rename.js
@@ -9,7 +9,6 @@ export default {
     ...mapGetters('Files', ['files', 'currentFolder']),
     ...mapGetters(['capabilities']),
     ...mapState('Files', ['areFileExtensionsShown']),
-    ...mapGetters('runtime/auth', { isPublicLinkContext: 'isPublicLinkContextReady' }),
 
     $_rename_items() {
       return [
@@ -190,11 +189,12 @@ export default {
       this.toggleModalConfirmButton()
       const sameResource = isSameResource(resource, this.currentFolder)
 
+      const isPublicLinkContext = this.$store.getters['runtime/auth/isPublicLinkContextReady']
       this.renameFile({
         client: this.$client,
         file: resource,
         newValue: newName,
-        isPublicLinkContext: this.isPublicLinkContext,
+        isPublicLinkContext,
         isSameResource: sameResource
       })
         .then(() => {
diff --git a/packages/web-app-files/src/mixins/deleteResources.js b/packages/web-app-files/src/mixins/deleteResources.js
index 7e7e4d78511..fae17aee487 100644
--- a/packages/web-app-files/src/mixins/deleteResources.js
+++ b/packages/web-app-files/src/mixins/deleteResources.js
@@ -16,8 +16,6 @@ export default {
   computed: {
     ...mapGetters('Files', ['selectedFiles']),
     ...mapGetters(['user', 'configuration', 'capabilities']),
-    ...mapGetters('runtime/auth', { isPublicLinkContext: 'isPublicLinkContextReady' }),
-    ...mapGetters('runtime/auth', ['accessToken']),
 
     $_deleteResources_isInTrashbin() {
       return (
@@ -152,10 +150,11 @@ export default {
     },
 
     $_deleteResources_filesList_delete() {
+      const isPublicLinkContext = this.$store.getters['runtime/auth/isPublicLinkContextReady']
       this.deleteFiles({
         client: this.$client,
         files: this.$_deleteResources_resources,
-        isPublicLinkContext: this.isPublicLinkContext,
+        isPublicLinkContext,
         $gettext: this.$gettext,
         $gettextInterpolate: this.$gettextInterpolate
       }).then(async () => {
@@ -168,9 +167,10 @@ export default {
           isLocationSpacesActive(this.$router, 'files-spaces-personal')
         ) {
           if (this.capabilities?.spaces?.enabled) {
+            const accessToken = this.$store.getters['runtime/auth/accessToken']
             const graphClient = clientService.graphAuthenticated(
               this.configuration.server,
-              this.accessToken
+              accessToken
             )
             const driveResponse = await graphClient.drives.getDrive(
               this.$_deleteResources_resources[0].storageId
diff --git a/packages/web-app-files/src/mixins/spaces/actions/delete.js b/packages/web-app-files/src/mixins/spaces/actions/delete.js
index 117fd29ed2f..adc8250d22b 100644
--- a/packages/web-app-files/src/mixins/spaces/actions/delete.js
+++ b/packages/web-app-files/src/mixins/spaces/actions/delete.js
@@ -37,7 +37,7 @@ export default {
       'showMessage',
       'toggleModalConfirmButton'
     ]),
-    ...mapMutations('Files', ['REMOVE_FILES', 'REMOVE_SPACE']),
+    ...mapMutations('Files', ['REMOVE_FILES']),
     ...mapMutations('runtime/spaces', ['REMOVE_SPACE']),
 
     $_delete_trigger({ resources }) {
diff --git a/packages/web-app-files/src/router/operations.ts b/packages/web-app-files/src/router/operations.ts
index fe5bd4cdd3c..a1d8d54c609 100644
--- a/packages/web-app-files/src/router/operations.ts
+++ b/packages/web-app-files/src/router/operations.ts
@@ -2,31 +2,20 @@ import { RouteComponents } from './router'
 import { Location, RouteConfig } from 'vue-router'
 import { $gettext, createLocation, isLocationActiveDirector } from './utils'
 
-type operationsTypes = 'files-operations-location-picker' | 'files-operations-resolver-private-link'
+type operationsTypes = 'files-operations-resolver-private-link'
 
 export const createLocationOperations = (name: operationsTypes, location = {}): Location =>
   createLocation(name, location)
 
-const locationLocationPicker = createLocationOperations('files-operations-location-picker')
 const locationResolverPrivateLink = createLocationOperations(
   'files-operations-resolver-private-link'
 )
 
 export const isLocationOperationsActive = isLocationActiveDirector<operationsTypes>(
-  locationLocationPicker,
   locationResolverPrivateLink
 )
 
 export const buildRoutes = (components: RouteComponents): RouteConfig[] => [
-  {
-    name: locationLocationPicker.name,
-    path: '/ops/location-picker/:context/:action/:item*',
-    component: components.LocationPicker,
-    meta: {
-      auth: false,
-      patchCleanPath: true
-    }
-  },
   {
     name: locationResolverPrivateLink.name,
     path: '/ops/resolver/private-link/:fileId',
diff --git a/packages/web-app-files/src/router/router.ts b/packages/web-app-files/src/router/router.ts
index 0b878a12bc2..4d31b4209a9 100644
--- a/packages/web-app-files/src/router/router.ts
+++ b/packages/web-app-files/src/router/router.ts
@@ -10,7 +10,6 @@ export interface RouteComponents {
   App: ComponentOptions<Vue>
   Favorites: ComponentOptions<Vue>
   FilesDrop: ComponentOptions<Vue>
-  LocationPicker: ComponentOptions<Vue>
   PrivateLink: ComponentOptions<Vue>
   PublicFiles: ComponentOptions<Vue>
   Personal: ComponentOptions<Vue>
diff --git a/packages/web-app-files/src/store/actions.ts b/packages/web-app-files/src/store/actions.ts
index 0e03390562b..7457b847106 100644
--- a/packages/web-app-files/src/store/actions.ts
+++ b/packages/web-app-files/src/store/actions.ts
@@ -63,6 +63,9 @@ export default {
       { root: true }
     )
   },
+  async clearClipboardFiles(context) {
+    context.commit('CLEAR_CLIPBOARD')
+  },
   async pasteSelectedFiles(
     context,
     {
@@ -73,7 +76,7 @@ export default {
       $gettext,
       $gettextInterpolate,
       $ngettext,
-      routeContext,
+      isPublicLinkContext,
       publicLinkPassword,
       upsertResource
     }
@@ -90,10 +93,9 @@ export default {
         $gettext,
         $gettextInterpolate,
         $ngettext,
-        routeContext,
+        isPublicLinkContext,
         publicLinkPassword
       )
-      context.commit('CLEAR_CLIPBOARD')
     }
     if (context.state.clipboardAction === ClipboardActions.Copy) {
       movedResources = await copy(
@@ -106,14 +108,14 @@ export default {
         $gettext,
         $gettextInterpolate,
         $ngettext,
-        routeContext,
+        isPublicLinkContext,
         publicLinkPassword
       )
     }
+    context.commit('CLEAR_CLIPBOARD')
     const loadMovedResource = async (resource) => {
-      const isPublicFilesRoute = routeContext === 'files-public-files'
       let loadedResource
-      if (isPublicFilesRoute) {
+      if (isPublicLinkContext) {
         loadedResource = await client.publicFiles.getFileInfo(
           resource.webDavPath,
           publicLinkPassword,
diff --git a/packages/web-app-files/src/store/getters.ts b/packages/web-app-files/src/store/getters.ts
index 01924012a3a..d2c5a5c9a3d 100644
--- a/packages/web-app-files/src/store/getters.ts
+++ b/packages/web-app-files/src/store/getters.ts
@@ -11,6 +11,12 @@ export default {
   currentFolder: (state) => {
     return state.currentFolder
   },
+  clipboardResources: (state) => {
+    return state.clipboardResources
+  },
+  clipboardAction: (state) => {
+    return state.clipboardAction
+  },
   // a flat file list has no current folder nor parent
   flatFileList: (state) => !!state.currentFolder === false,
   activeFiles: (state, getters) => {
diff --git a/packages/web-app-files/src/views/Personal.vue b/packages/web-app-files/src/views/Personal.vue
index 2cb53173067..e652e1ca7f6 100644
--- a/packages/web-app-files/src/views/Personal.vue
+++ b/packages/web-app-files/src/views/Personal.vue
@@ -273,7 +273,7 @@ export default defineComponent({
         this.$gettext,
         this.$gettextInterpolate,
         this.$ngettext,
-        this.$route.name
+        false
       )
       for (const resource of movedResources) {
         this.REMOVE_FILES([resource])
diff --git a/packages/web-app-files/src/views/PublicFiles.vue b/packages/web-app-files/src/views/PublicFiles.vue
index c13b7e58f5c..fb7211ad736 100644
--- a/packages/web-app-files/src/views/PublicFiles.vue
+++ b/packages/web-app-files/src/views/PublicFiles.vue
@@ -208,7 +208,7 @@ export default defineComponent({
         this.$gettext,
         this.$gettextInterpolate,
         this.$ngettext,
-        this.$route.name,
+        false,
         this.publicLinkPassword
       )
       for (const resource of movedResources) {
diff --git a/packages/web-app-files/src/views/shares/SharedResource.vue b/packages/web-app-files/src/views/shares/SharedResource.vue
index cc7fbed69de..4bcae8e44b7 100644
--- a/packages/web-app-files/src/views/shares/SharedResource.vue
+++ b/packages/web-app-files/src/views/shares/SharedResource.vue
@@ -243,7 +243,7 @@ export default defineComponent({
         this.$gettext,
         this.$gettextInterpolate,
         this.$ngettext,
-        this.$route.name
+        false
       )
       for (const resource of movedResources) {
         this.REMOVE_FILES([resource])
diff --git a/packages/web-app-files/src/views/spaces/Project.vue b/packages/web-app-files/src/views/spaces/Project.vue
index 55fd470a466..e84303e8b9e 100644
--- a/packages/web-app-files/src/views/spaces/Project.vue
+++ b/packages/web-app-files/src/views/spaces/Project.vue
@@ -397,7 +397,7 @@ export default defineComponent({
         this.$gettext,
         this.$gettextInterpolate,
         this.$ngettext,
-        this.$route.name
+        false
       )
       for (const resource of movedResources) {
         this.REMOVE_FILES([resource])
diff --git a/packages/web-app-files/tests/unit/components/AppBar/CreateAndUpload.spec.js b/packages/web-app-files/tests/unit/components/AppBar/CreateAndUpload.spec.js
index a76b4c4782c..c686803f4b6 100644
--- a/packages/web-app-files/tests/unit/components/AppBar/CreateAndUpload.spec.js
+++ b/packages/web-app-files/tests/unit/components/AppBar/CreateAndUpload.spec.js
@@ -310,6 +310,7 @@ function createStore(state = { currentFolder: {} }, fileHandlers = []) {
         },
         getters: {
           currentFolder: () => state.currentFolder,
+          clipboardResources: () => [],
           selectedFiles: () => []
         }
       }
diff --git a/packages/web-app-files/tests/unit/components/FilesList/__snapshots__/ContextActions.spec.js.snap b/packages/web-app-files/tests/unit/components/FilesList/__snapshots__/ContextActions.spec.js.snap
index cc2eff92aee..8f05246e316 100644
--- a/packages/web-app-files/tests/unit/components/FilesList/__snapshots__/ContextActions.spec.js.snap
+++ b/packages/web-app-files/tests/unit/components/FilesList/__snapshots__/ContextActions.spec.js.snap
@@ -6,58 +6,71 @@ exports[`ContextActions menu items renders a list of actions for a file 1`] = `
     <li class="oc-files-context-action oc-px-s oc-rounded oc-menu-item-hover"><button type="button" class="oc-button oc-rounded oc-button-s oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw oc-files-actions-text-editor-trigger action-menu-item" data-testid="action-handler">
         <oc-icon-stub name="file-text" filltype="line" accessiblelabel="" type="span" size="medium" variation="passive" color="" data-testid="action-icon"></oc-icon-stub> <span data-testid="action-label" class="oc-files-context-action-label">Open in editor</span>
         <!---->
+        <!---->
       </button></li>
     <li class="oc-files-context-action oc-px-s oc-rounded oc-menu-item-hover"><button type="button" class="oc-button oc-rounded oc-button-s oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw oc-files-actions-exampleName1-trigger action-menu-item" data-testid="action-handler">
         <oc-img-stub src="exampleIcon1" alt="" loadingtype="eager" data-testid="action-img" class="oc-icon oc-icon-m"></oc-img-stub> <span data-testid="action-label" class="oc-files-context-action-label">Open in exampleName1</span>
         <!---->
+        <!---->
       </button></li>
     <li class="oc-files-context-action oc-px-s oc-rounded oc-menu-item-hover"><button type="button" class="oc-button oc-rounded oc-button-s oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw oc-files-actions-exampleName2-trigger action-menu-item" data-testid="action-handler">
         <oc-img-stub src="exampleIcon2" alt="" loadingtype="eager" data-testid="action-img" class="oc-icon oc-icon-m"></oc-img-stub> <span data-testid="action-label" class="oc-files-context-action-label">Open in exampleName2</span>
         <!---->
+        <!---->
       </button></li>
     <li class="oc-files-context-action oc-px-s oc-rounded oc-menu-item-hover"><button type="button" class="oc-button oc-rounded oc-button-s oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw oc-files-actions-exampleName3-trigger action-menu-item" data-testid="action-handler">
         <oc-img-stub src="exampleIcon3" alt="" loadingtype="eager" data-testid="action-img" class="oc-icon oc-icon-m"></oc-img-stub> <span data-testid="action-label" class="oc-files-context-action-label">Open in exampleName3</span>
         <!---->
+        <!---->
       </button></li>
     <li class="oc-files-context-action oc-px-s oc-rounded oc-menu-item-hover"><button type="button" class="oc-button oc-rounded oc-button-s oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw oc-files-actions-download-file-trigger action-menu-item" data-testid="action-handler">
         <oc-icon-stub name="download" filltype="line" accessiblelabel="" type="span" size="medium" variation="passive" color="" data-testid="action-icon"></oc-icon-stub> <span data-testid="action-label" class="oc-files-context-action-label">Download</span>
         <!---->
+        <!---->
       </button></li>
     <li class="oc-files-context-action oc-px-s oc-rounded oc-menu-item-hover"><button type="button" class="oc-button oc-rounded oc-button-s oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw oc-files-actions-create-public-link-trigger action-menu-item" data-testid="action-handler">
         <oc-icon-stub name="links" filltype="line" accessiblelabel="" type="span" size="medium" variation="passive" color="" data-testid="action-icon"></oc-icon-stub> <span data-testid="action-label" class="oc-files-context-action-label">Create link</span>
         <!---->
+        <!---->
       </button></li>
     <li class="oc-files-context-action oc-px-s oc-rounded oc-menu-item-hover"><button type="button" class="oc-button oc-rounded oc-button-s oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw oc-files-actions-show-shares-trigger action-menu-item" data-testid="action-handler">
         <oc-icon-stub name="group" filltype="line" accessiblelabel="" type="span" size="medium" variation="passive" color="" data-testid="action-icon"></oc-icon-stub> <span data-testid="action-label" class="oc-files-context-action-label">Share</span>
         <!---->
+        <!---->
       </button></li>
   </oc-list-stub>
   <oc-list-stub id="oc-files-context-actions-actions" class="oc-files-context-actions oc-pb-s oc-pt-s oc-files-context-actions-border">
     <li class="oc-files-context-action oc-px-s oc-rounded oc-menu-item-hover"><button type="button" class="oc-button oc-rounded oc-button-s oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw oc-files-actions-rename-trigger action-menu-item" data-testid="action-handler">
         <oc-icon-stub name="pencil" filltype="line" accessiblelabel="" type="span" size="medium" variation="passive" color="" data-testid="action-icon"></oc-icon-stub> <span data-testid="action-label" class="oc-files-context-action-label">Edit</span>
         <!---->
+        <!---->
       </button></li>
     <li class="oc-files-context-action oc-px-s oc-rounded oc-menu-item-hover"><button type="button" class="oc-button oc-rounded oc-button-s oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw oc-files-actions-move-trigger action-menu-item" data-testid="action-handler">
         <oc-icon-stub name="folder-shared" filltype="line" accessiblelabel="" type="span" size="medium" variation="passive" color="" data-testid="action-icon"></oc-icon-stub> <span data-testid="action-label" class="oc-files-context-action-label">Move</span>
         <!---->
+        <!---->
       </button></li>
     <li class="oc-files-context-action oc-px-s oc-rounded oc-menu-item-hover"><button type="button" class="oc-button oc-rounded oc-button-s oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw oc-files-actions-copy-trigger action-menu-item" data-testid="action-handler">
         <oc-icon-stub name="file-copy" filltype="line" accessiblelabel="" type="span" size="medium" variation="passive" color="" data-testid="action-icon"></oc-icon-stub> <span data-testid="action-label" class="oc-files-context-action-label">Copy</span>
         <!---->
+        <!---->
       </button></li>
     <li class="oc-files-context-action oc-px-s oc-rounded oc-menu-item-hover"><button type="button" class="oc-button oc-rounded oc-button-s oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw oc-files-actions-delete-trigger action-menu-item" data-testid="action-handler">
         <oc-icon-stub name="delete-bin-5" filltype="line" accessiblelabel="" type="span" size="medium" variation="passive" color="" data-testid="action-icon"></oc-icon-stub> <span data-testid="action-label" class="oc-files-context-action-label">Delete</span>
         <!---->
+        <!---->
       </button></li>
     <li class="oc-files-context-action oc-px-s oc-rounded oc-menu-item-hover"><button type="button" class="oc-button oc-rounded oc-button-s oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw oc-files-actions-show-actions-trigger action-menu-item" data-testid="action-handler">
         <oc-icon-stub name="slideshow" filltype="line" accessiblelabel="" type="span" size="medium" variation="passive" color="" data-testid="action-icon"></oc-icon-stub> <span data-testid="action-label" class="oc-files-context-action-label">All actions</span>
         <!---->
+        <!---->
       </button></li>
   </oc-list-stub>
   <oc-list-stub id="oc-files-context-actions-sidebar" class="oc-files-context-actions oc-pt-s">
     <li class="oc-files-context-action oc-px-s oc-rounded oc-menu-item-hover"><button type="button" class="oc-button oc-rounded oc-button-s oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw oc-files-actions-show-details-trigger action-menu-item" data-testid="action-handler">
         <oc-icon-stub name="information" filltype="line" accessiblelabel="" type="span" size="medium" variation="passive" color="" data-testid="action-icon"></oc-icon-stub> <span data-testid="action-label" class="oc-files-context-action-label">Details</span>
         <!---->
+        <!---->
       </button></li>
   </oc-list-stub>
 </div>
@@ -69,58 +82,71 @@ exports[`ContextActions menu items renders a list of actions for a folder 1`] =
     <li class="oc-files-context-action oc-px-s oc-rounded oc-menu-item-hover"><button type="button" class="oc-button oc-rounded oc-button-s oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw oc-files-actions-text-editor-trigger action-menu-item" data-testid="action-handler">
         <oc-icon-stub name="file-text" filltype="line" accessiblelabel="" type="span" size="medium" variation="passive" color="" data-testid="action-icon"></oc-icon-stub> <span data-testid="action-label" class="oc-files-context-action-label">Open in editor</span>
         <!---->
+        <!---->
       </button></li>
     <li class="oc-files-context-action oc-px-s oc-rounded oc-menu-item-hover"><button type="button" class="oc-button oc-rounded oc-button-s oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw oc-files-actions-exampleName1-trigger action-menu-item" data-testid="action-handler">
         <oc-img-stub src="exampleIcon1" alt="" loadingtype="eager" data-testid="action-img" class="oc-icon oc-icon-m"></oc-img-stub> <span data-testid="action-label" class="oc-files-context-action-label">Open in exampleName1</span>
         <!---->
+        <!---->
       </button></li>
     <li class="oc-files-context-action oc-px-s oc-rounded oc-menu-item-hover"><button type="button" class="oc-button oc-rounded oc-button-s oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw oc-files-actions-exampleName2-trigger action-menu-item" data-testid="action-handler">
         <oc-img-stub src="exampleIcon2" alt="" loadingtype="eager" data-testid="action-img" class="oc-icon oc-icon-m"></oc-img-stub> <span data-testid="action-label" class="oc-files-context-action-label">Open in exampleName2</span>
         <!---->
+        <!---->
       </button></li>
     <li class="oc-files-context-action oc-px-s oc-rounded oc-menu-item-hover"><button type="button" class="oc-button oc-rounded oc-button-s oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw oc-files-actions-exampleName3-trigger action-menu-item" data-testid="action-handler">
         <oc-img-stub src="exampleIcon3" alt="" loadingtype="eager" data-testid="action-img" class="oc-icon oc-icon-m"></oc-img-stub> <span data-testid="action-label" class="oc-files-context-action-label">Open in exampleName3</span>
         <!---->
+        <!---->
       </button></li>
     <li class="oc-files-context-action oc-px-s oc-rounded oc-menu-item-hover"><button type="button" class="oc-button oc-rounded oc-button-s oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw oc-files-actions-download-file-trigger action-menu-item" data-testid="action-handler">
         <oc-icon-stub name="download" filltype="line" accessiblelabel="" type="span" size="medium" variation="passive" color="" data-testid="action-icon"></oc-icon-stub> <span data-testid="action-label" class="oc-files-context-action-label">Download</span>
         <!---->
+        <!---->
       </button></li>
     <li class="oc-files-context-action oc-px-s oc-rounded oc-menu-item-hover"><button type="button" class="oc-button oc-rounded oc-button-s oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw oc-files-actions-create-public-link-trigger action-menu-item" data-testid="action-handler">
         <oc-icon-stub name="links" filltype="line" accessiblelabel="" type="span" size="medium" variation="passive" color="" data-testid="action-icon"></oc-icon-stub> <span data-testid="action-label" class="oc-files-context-action-label">Create link</span>
         <!---->
+        <!---->
       </button></li>
     <li class="oc-files-context-action oc-px-s oc-rounded oc-menu-item-hover"><button type="button" class="oc-button oc-rounded oc-button-s oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw oc-files-actions-show-shares-trigger action-menu-item" data-testid="action-handler">
         <oc-icon-stub name="group" filltype="line" accessiblelabel="" type="span" size="medium" variation="passive" color="" data-testid="action-icon"></oc-icon-stub> <span data-testid="action-label" class="oc-files-context-action-label">Share</span>
         <!---->
+        <!---->
       </button></li>
   </oc-list-stub>
   <oc-list-stub id="oc-files-context-actions-actions" class="oc-files-context-actions oc-pb-s oc-pt-s oc-files-context-actions-border">
     <li class="oc-files-context-action oc-px-s oc-rounded oc-menu-item-hover"><button type="button" class="oc-button oc-rounded oc-button-s oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw oc-files-actions-rename-trigger action-menu-item" data-testid="action-handler">
         <oc-icon-stub name="pencil" filltype="line" accessiblelabel="" type="span" size="medium" variation="passive" color="" data-testid="action-icon"></oc-icon-stub> <span data-testid="action-label" class="oc-files-context-action-label">Edit</span>
         <!---->
+        <!---->
       </button></li>
     <li class="oc-files-context-action oc-px-s oc-rounded oc-menu-item-hover"><button type="button" class="oc-button oc-rounded oc-button-s oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw oc-files-actions-move-trigger action-menu-item" data-testid="action-handler">
         <oc-icon-stub name="folder-shared" filltype="line" accessiblelabel="" type="span" size="medium" variation="passive" color="" data-testid="action-icon"></oc-icon-stub> <span data-testid="action-label" class="oc-files-context-action-label">Move</span>
         <!---->
+        <!---->
       </button></li>
     <li class="oc-files-context-action oc-px-s oc-rounded oc-menu-item-hover"><button type="button" class="oc-button oc-rounded oc-button-s oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw oc-files-actions-copy-trigger action-menu-item" data-testid="action-handler">
         <oc-icon-stub name="file-copy" filltype="line" accessiblelabel="" type="span" size="medium" variation="passive" color="" data-testid="action-icon"></oc-icon-stub> <span data-testid="action-label" class="oc-files-context-action-label">Copy</span>
         <!---->
+        <!---->
       </button></li>
     <li class="oc-files-context-action oc-px-s oc-rounded oc-menu-item-hover"><button type="button" class="oc-button oc-rounded oc-button-s oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw oc-files-actions-delete-trigger action-menu-item" data-testid="action-handler">
         <oc-icon-stub name="delete-bin-5" filltype="line" accessiblelabel="" type="span" size="medium" variation="passive" color="" data-testid="action-icon"></oc-icon-stub> <span data-testid="action-label" class="oc-files-context-action-label">Delete</span>
         <!---->
+        <!---->
       </button></li>
     <li class="oc-files-context-action oc-px-s oc-rounded oc-menu-item-hover"><button type="button" class="oc-button oc-rounded oc-button-s oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw oc-files-actions-show-actions-trigger action-menu-item" data-testid="action-handler">
         <oc-icon-stub name="slideshow" filltype="line" accessiblelabel="" type="span" size="medium" variation="passive" color="" data-testid="action-icon"></oc-icon-stub> <span data-testid="action-label" class="oc-files-context-action-label">All actions</span>
         <!---->
+        <!---->
       </button></li>
   </oc-list-stub>
   <oc-list-stub id="oc-files-context-actions-sidebar" class="oc-files-context-actions oc-pt-s">
     <li class="oc-files-context-action oc-px-s oc-rounded oc-menu-item-hover"><button type="button" class="oc-button oc-rounded oc-button-s oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw oc-files-actions-show-details-trigger action-menu-item" data-testid="action-handler">
         <oc-icon-stub name="information" filltype="line" accessiblelabel="" type="span" size="medium" variation="passive" color="" data-testid="action-icon"></oc-icon-stub> <span data-testid="action-label" class="oc-files-context-action-label">Details</span>
         <!---->
+        <!---->
       </button></li>
   </oc-list-stub>
 </div>
diff --git a/packages/web-app-files/tests/unit/components/Spaces/__snapshots__/SpaceContextActions.spec.js.snap b/packages/web-app-files/tests/unit/components/Spaces/__snapshots__/SpaceContextActions.spec.js.snap
index 6a43c8e2d3c..4f0fc98c045 100644
--- a/packages/web-app-files/tests/unit/components/Spaces/__snapshots__/SpaceContextActions.spec.js.snap
+++ b/packages/web-app-files/tests/unit/components/Spaces/__snapshots__/SpaceContextActions.spec.js.snap
@@ -6,16 +6,19 @@ exports[`SpaceContextActions action handlers renders actions that are always ava
     <ul id="oc-files-context-actions-members" class="oc-list oc-my-rm oc-mx-rm oc-files-context-actions oc-pb-s oc-files-context-actions-border">
       <li class="oc-files-context-action oc-px-s oc-rounded oc-menu-item-hover"><button type="button" class="oc-button oc-rounded oc-button-s oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw oc-files-actions-show-details-trigger action-menu-item" data-testid="action-handler"><span class="oc-icon oc-icon-m oc-icon-passive" data-testid="action-icon"><!----></span> <span data-testid="action-label" class="oc-files-context-action-label">Members</span>
           <!---->
+          <!---->
         </button></li>
     </ul>
     <ul id="oc-files-context-actions-trashBin" class="oc-list oc-my-rm oc-mx-rm oc-files-context-actions oc-pb-s oc-pt-s oc-files-context-actions-border">
       <li class="oc-files-context-action oc-px-s oc-rounded oc-menu-item-hover"><button type="button" class="oc-button oc-rounded oc-button-s oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw oc-files-actions-delete-trigger action-menu-item" data-testid="action-handler"><span class="oc-icon oc-icon-m oc-icon-passive" data-testid="action-icon"><!----></span> <span data-testid="action-label" class="oc-files-context-action-label">Deleted files</span>
           <!---->
+          <!---->
         </button></li>
     </ul>
     <ul id="oc-files-context-actions-sidebar" class="oc-list oc-my-rm oc-mx-rm oc-files-context-actions oc-pt-s">
       <li class="oc-files-context-action oc-px-s oc-rounded oc-menu-item-hover"><button type="button" class="oc-button oc-rounded oc-button-s oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw oc-files-actions-show-details-trigger action-menu-item" data-testid="action-handler"><span class="oc-icon oc-icon-m oc-icon-passive" data-testid="action-icon"><!----></span> <span data-testid="action-label" class="oc-files-context-action-label">Details</span>
           <!---->
+          <!---->
         </button></li>
     </ul>
   </div>
diff --git a/packages/web-app-files/tests/unit/helpers/resource/copyMove.spec.ts b/packages/web-app-files/tests/unit/helpers/resource/copyMove.spec.ts
index d710144d785..35e10c91426 100644
--- a/packages/web-app-files/tests/unit/helpers/resource/copyMove.spec.ts
+++ b/packages/web-app-files/tests/unit/helpers/resource/copyMove.spec.ts
@@ -67,7 +67,7 @@ describe('copyMove', () => {
         jest.fn(),
         jest.fn(),
         jest.fn(),
-        dataSet.publicFiles ? 'files-public-files' : '',
+        dataSet.publicFiles,
         ''
       )
       if (dataSet.publicFiles) {
@@ -89,7 +89,7 @@ describe('copyMove', () => {
         jest.fn(),
         jest.fn(),
         jest.fn(),
-        dataSet.publicFiles ? 'files-public-files' : '',
+        dataSet.publicFiles,
         ''
       )
       if (dataSet.publicFiles) {
diff --git a/packages/web-app-files/tests/unit/views/LocationPicker.spec.ts b/packages/web-app-files/tests/unit/views/LocationPicker.spec.ts
deleted file mode 100644
index 4fbe323db2e..00000000000
--- a/packages/web-app-files/tests/unit/views/LocationPicker.spec.ts
+++ /dev/null
@@ -1,508 +0,0 @@
-import { createFile, getStore, localVue } from './views.setup.js'
-import LocationPicker from '@files/src/views/LocationPicker.vue'
-import { mount, RouterLinkStub, shallowMount } from '@vue/test-utils'
-import { createLocationOperations } from '../../../src/router'
-import omit from 'lodash-es/omit'
-import { Store } from 'vuex'
-
-const component = { ...LocationPicker, mounted: jest.fn() }
-
-const defaultStubs = {
-  'oc-breadcrumb': true,
-  'oc-grid': true,
-  'oc-button': true,
-  'oc-icon': true,
-  'oc-table-files': true
-}
-
-localVue.prototype.$client.files = {
-  list: async () => [],
-  // eslint-disable-next-line @typescript-eslint/no-empty-function
-  move: async () => {}
-}
-localVue.prototype.$client.publicFiles = {
-  list: async () => [],
-  // eslint-disable-next-line @typescript-eslint/no-empty-function
-  move: async () => {}
-}
-
-const router = {
-  push: jest.fn(),
-  afterEach: jest.fn(),
-  currentRoute: {
-    ...createLocationOperations('files-operations-location-picker'),
-    query: {}
-  },
-  resolve: (r) => {
-    return { href: r.name }
-  }
-}
-
-const user = { id: 'test' }
-
-const listLoaderStub = 'app-loading-spinner-stub'
-const breadcrumbStub = 'oc-breadcrumb-stub'
-const listInfoStub = 'list-info-stub'
-const filesPaginationStub = 'pagination-stub'
-const translateStub = 'translate-stub'
-
-const selectors = {
-  selectionInfo: '.location-picker-selection-info',
-  currentHint: '[data-testid="location-picker-current-hint"]',
-  cancelButton: '#location-picker-btn-cancel',
-  confirmButton: '#location-picker-btn-confirm',
-  filesView: '#files-view',
-  noContentMessage: '#files-location-picker-empty',
-  filesTable: '#files-location-picker-table',
-  paginationCurrentItem: '.oc-pagination-list-item-current'
-}
-
-describe('LocationPicker', () => {
-  describe('files app bar', () => {
-    it.each([
-      { action: 'move', item: '' },
-      { action: 'copy', item: '' },
-      { action: 'move', item: '/parent/child' },
-      { action: 'move', item: '/parent' },
-      { action: 'copy', item: '/parent/child' },
-      { action: 'copy', item: '/parent' },
-      { action: 'random-action', item: '/सिम्पल फोल्डर/टेश्ट' },
-      { action: '', item: '/parent/child' },
-      {
-        action: 'random-action',
-        item: '/सिम्पल फोल्डर/टेश्ट फोल्डर'
-      },
-      {
-        action: 'random-action',
-        item: '/123/456'
-      },
-      {
-        action: 'random-action',
-        item: '/😂/🔥'
-      }
-    ])('should show location picker selection info according to route action and item', (input) => {
-      const wrapper = getShallowWrapper({
-        $route: getRoute({ action: input.action, item: input.item })
-      })
-
-      const selection = wrapper.find(selectors.selectionInfo)
-
-      expect(selection.exists()).toBeTruthy()
-      expect(selection).toMatchSnapshot()
-    })
-    it.each(['copy', 'move'])(
-      'should show current hint according to the current route action',
-      (action) => {
-        const wrapper = getShallowWrapper({ $route: getRoute({ action: action }) })
-        const currentHint = wrapper.find(selectors.currentHint)
-
-        expect(currentHint.exists()).toBeTruthy()
-        expect(currentHint).toMatchSnapshot()
-      }
-    )
-    describe('should display breadcrumb with items', () => {
-      it.each(['parent/child', 'parent//child', '/parent/child', '/parent/child/'])(
-        'if route params context is public',
-        (input) => {
-          const route = getRoute({ context: 'public', item: input })
-          const wrapper = getShallowWrapper({ $route: route })
-          const breadcrumbItems = wrapper.find(breadcrumbStub).props().items
-
-          expect(breadcrumbItems.length).toBe(2)
-          expect(breadcrumbItems[0]).toMatchObject({
-            index: 0,
-            text: 'Public link',
-            to: {
-              name: route.name,
-              params: {
-                action: route.params.action,
-                item: 'parent'
-              },
-              query: {
-                resource: [route.query.resource]
-              }
-            }
-          })
-          expect(breadcrumbItems[1]).toMatchObject({
-            index: 2,
-            text: 'child'
-          })
-          expect(breadcrumbItems[1].to).toBeUndefined()
-        }
-      )
-      it.each(['parent/child', 'parent//child', '/parent/child', '/parent/child/'])(
-        'if route params context is not public',
-        (input) => {
-          const route = getRoute({ item: input })
-          const wrapper = getShallowWrapper({ $route: route })
-          const breadcrumbItems = wrapper.find(breadcrumbStub).props().items
-
-          expect(breadcrumbItems.length).toBe(3)
-          expect(omit(breadcrumbItems[0], ['text'])).toMatchObject({
-            index: 0,
-            to: {
-              name: route.name,
-              params: { action: route.params.action, item: '/' },
-              query: {
-                resource: [route.query.resource]
-              }
-            }
-          })
-          expect(breadcrumbItems[1]).toMatchObject({
-            index: 1,
-            text: 'parent',
-            to: {
-              name: route.name,
-              params: { action: route.params.action, item: 'parent' },
-              query: {
-                resource: [route.query.resource]
-              }
-            }
-          })
-          expect(breadcrumbItems[2]).toMatchObject({
-            index: 2,
-            text: 'child'
-          })
-          expect(breadcrumbItems[2].to).toBeUndefined()
-        }
-      )
-    })
-    describe('cancel button', () => {
-      it('should show the location picker cancel button', () => {
-        const wrapper = getShallowWrapper()
-        const cancelButton = wrapper.find(selectors.cancelButton)
-
-        expect(cancelButton.exists()).toBeTruthy()
-        expect(cancelButton.find(translateStub).exists()).toBeTruthy()
-      })
-      it('should call "leaveLocationPicker" method when clicked', async () => {
-        const spyLeaveLocationPicker = jest.spyOn(
-          (LocationPicker as any).methods,
-          'leaveLocationPicker'
-        )
-        const spyRouterPush = jest.spyOn(router, 'push')
-
-        const wrapper = getMountedWrapper()
-        const cancelButton = wrapper.find(selectors.cancelButton)
-
-        await cancelButton.trigger('click')
-
-        expect(spyLeaveLocationPicker).toHaveBeenCalledTimes(1)
-        expect(spyLeaveLocationPicker).toHaveBeenCalledWith('/some/item')
-        expect(spyRouterPush).toHaveBeenCalledTimes(1)
-        expect(spyRouterPush).toHaveBeenCalledWith({
-          name: 'files-spaces-personal',
-          params: {
-            storageId: user.id
-          }
-        })
-      })
-    })
-    describe('should show the location picker confirm button', () => {
-      it('should be disabled if no current folder', () => {
-        const wrapper = getShallowWrapper()
-
-        const confirmButton = wrapper.find(selectors.confirmButton)
-
-        expect(confirmButton.exists()).toBeTruthy()
-        expect(confirmButton.attributes().disabled).toBe('true')
-      })
-      it('should be disabled if current folder does not have "canCreate" property', () => {
-        const route = getRoute()
-        const store = createStore({ currentFolder: { canCreate: jest.fn(() => false) } })
-        const wrapper = getShallowWrapper({ store: store, $route: route })
-
-        const confirmButton = wrapper.find(selectors.confirmButton)
-
-        expect(confirmButton.exists()).toBeTruthy()
-        expect(confirmButton.attributes().disabled).toBe('true')
-      })
-      it.each([
-        { action: 'move', expectedText: 'Move here' },
-        { action: 'copy', expectedText: 'Paste here' },
-        { action: 'anything else', expectedText: 'Confirm' }
-      ])('should set button text according to current action', (input) => {
-        const wrapper = getShallowWrapper({
-          store: createStore({ currentFolder: { canCreate: jest.fn(() => true) } }),
-          $route: getRoute({ action: input.action })
-        })
-
-        const confirmButton = wrapper.find(selectors.confirmButton)
-
-        expect(confirmButton.exists()).toBeTruthy()
-        expect(confirmButton.attributes().disabled).toBeUndefined()
-        expect(confirmButton.text()).toBe(input.expectedText)
-      })
-      it('should call "confirmAction" method when clicked', async () => {
-        const spyConfirmAction = jest.spyOn((LocationPicker as any).methods, 'confirmAction')
-        const wrapper = getMountedWrapper({
-          store: createStore({ currentFolder: { canCreate: jest.fn(() => true) } })
-        })
-        const confirmButton = wrapper.find(selectors.confirmButton)
-
-        await confirmButton.trigger('click')
-        expect(spyConfirmAction).toHaveBeenCalledTimes(1)
-      })
-    })
-  })
-
-  describe('files view', () => {
-    describe('when the view is still loading', () => {
-      let filesView
-      beforeEach(() => {
-        const wrapper = getShallowWrapper({ loading: true })
-        filesView = wrapper.find(selectors.filesView)
-      })
-      it('should show app-loading-spinner component', () => {
-        expect(filesView.find(listLoaderStub).exists()).toBeTruthy()
-        expect(filesView.find(listLoaderStub)).toMatchSnapshot()
-      })
-      it('should not show no content message', () => {
-        expect(filesView.find(selectors.noContentMessage).exists()).toBeFalsy()
-      })
-      it('should not show no location picker table', () => {
-        expect(filesView.find(selectors.filesTable).exists()).toBeFalsy()
-      })
-    })
-    describe('when the view is not loading anymore', () => {
-      const wrapper = getShallowWrapper()
-      const filesView = wrapper.find(selectors.filesView)
-      it('should not show app-loading-spinner component', () => {
-        expect(filesView.find(listLoaderStub).exists()).toBeFalsy()
-      })
-      it('should show no content message if active files length is less than one', () => {
-        expect(filesView.find(selectors.noContentMessage).exists()).toBeTruthy()
-        expect(filesView.find(selectors.noContentMessage)).toMatchSnapshot()
-      })
-      describe('when active files length is one or more', () => {
-        const expectedResources = [
-          { id: 100, name: 'file0.txt', type: 'file', path: '/home/file0.txt' }
-        ]
-        const store = createStore({
-          totalFilesCount: { files: 2, folders: 0 },
-          totalFilesSize: 0
-        })
-        const route = getRoute({ resource: '/home/file0.txt' })
-        const wrapper = getShallowWrapper({
-          store: store,
-          $route: route,
-          setup: {
-            paginatedResources: expectedResources
-          }
-        })
-        const filesView = wrapper.find(selectors.filesView)
-
-        it('should not show the no content message component', () => {
-          expect(filesView.find(selectors.noContentMessage).exists()).toBeFalsy()
-        })
-        it('should show location picker table', () => {
-          expect(filesView.find(selectors.filesTable).exists()).toBeTruthy()
-
-          const actualProps = filesView.find(selectors.filesTable).props()
-          expect(actualProps.resources).toMatchObject(expectedResources)
-          expect(actualProps.targetRoute).toMatchObject({
-            name: route.name,
-            query: {
-              resource: [route.query.resource]
-            },
-            params: { action: route.params.action }
-          })
-          expect(actualProps.disabled).toMatchObject([expectedResources[0].id])
-        })
-        it.each([
-          {
-            id: 100,
-            name: 'file0.txt',
-            type: 'file',
-            path: '/home/file0.txt',
-            expectedState: [100]
-          },
-          {
-            id: 101,
-            name: 'some-resource',
-            type: 'file',
-            path: '/home/some-resource',
-            expectedState: [101]
-          },
-          {
-            id: 102,
-            name: 'some-resource',
-            type: 'folder',
-            path: '/home/some-resource',
-            expectedState: [102]
-          },
-          {
-            id: 103,
-            name: 'simple-folder',
-            type: 'folder',
-            path: '/simple-folder',
-            expectedState: []
-          }
-        ])(
-          'should set location item as disabled if not a folder or if its path is included in the active resource',
-          (input) => {
-            const route = getRoute({ resource: '/home/some-resource' })
-            const wrapper = getShallowWrapper({
-              $route: route,
-              setup: {
-                paginatedResources: [input]
-              }
-            })
-
-            const filesView = wrapper.find(selectors.filesView)
-            expect(filesView.find(selectors.filesTable).props().disabled).toMatchObject(
-              input.expectedState
-            )
-          }
-        )
-
-        it('should show pagination if there is one or more pages', () => {
-          const expectedResources = [createFile({ id: 100 }), createFile({ id: 101 })]
-          const store = createStore({
-            totalFilesCount: { files: 1000, folders: 1000 },
-            totalFilesSize: 100000
-          })
-          const route = getRoute({ resource: '/home/some-resource' })
-          const setup = {
-            paginatedResources: expectedResources,
-            paginationPages: 2,
-            paginationPage: 1
-          }
-          const wrapper = getMountedWrapper({
-            store: store,
-            $route: route,
-            setup: setup
-          })
-          const filesView = wrapper.find(selectors.filesView)
-          const tablePagination = filesView.find(filesPaginationStub)
-
-          expect(tablePagination.exists()).toBeTruthy()
-          expect(tablePagination.props()).toMatchObject({
-            pages: setup.paginationPages,
-            currentPage: setup.paginationPage
-          })
-        })
-
-        it('should load list info component with correct prop values', () => {
-          const expectedResources = [createFile({ id: 100 }), createFile({ id: 101 })]
-          const store = createStore({
-            totalFilesCount: { files: 1, folders: 1 },
-            totalFilesSize: 100
-          })
-          const route = getRoute({ resource: '/home/some-resource' })
-          const wrapper = getMountedWrapper({
-            store: store,
-            $route: route,
-            setup: {
-              paginatedResources: expectedResources
-            }
-          })
-          const filesView = wrapper.find(selectors.filesView)
-          const listInfo = filesView.find(listInfoStub)
-
-          expect(listInfo.exists()).toBeTruthy()
-          expect(listInfo.props()).toMatchObject({
-            files: store.getters['Files/totalFilesCount'].files,
-            folders: store.getters['Files/totalFilesCount'].folders,
-            size: store.getters['Files/totalFilesSize']
-          })
-        })
-      })
-    })
-  })
-
-  function getRoute({
-    name = 'some-name',
-    path = '/some/path',
-    action = 'move',
-    context = null,
-    item = '/some/item',
-    resource = 'some-resource'
-  } = {}) {
-    return {
-      name: name,
-      path: path,
-      params: {
-        action: action,
-        item: item,
-        context: context
-      },
-      query: {
-        resource: resource
-      }
-    }
-  }
-
-  function createStore({
-    publicLinkPassword = null,
-    currentFolder = null,
-    totalFilesCount = { files: null, folders: null },
-    totalFilesSize = null,
-    generalThemeName = ''
-  } = {}) {
-    return getStore({
-      publicLinkPassword: publicLinkPassword,
-      currentFolder: currentFolder,
-      totalFilesSize: totalFilesSize,
-      totalFilesCount: totalFilesCount,
-      generalThemeName: generalThemeName,
-      user
-    })
-  }
-
-  function mountOptions(store, $route, loading, setup = {}, stubs: any = defaultStubs) {
-    return {
-      localVue,
-      store,
-      stubs,
-      mocks: {
-        $route,
-        $router: router
-      },
-      setup: () => ({
-        loadResourcesTask: {
-          isRunning: loading,
-          perform: jest.fn()
-        },
-        ...setup
-      })
-    }
-  }
-
-  function getShallowWrapper({
-    store = createStore(),
-    $route = getRoute(),
-    loading = false,
-    setup
-  }: {
-    store?: Store<any>
-    $route?: unknown
-    loading?: boolean
-    setup?: unknown
-  } = {}) {
-    return shallowMount(component, mountOptions(store, $route, loading, setup))
-  }
-
-  function getMountedWrapper({
-    store = createStore(),
-    $route = getRoute(),
-    loading = false,
-    setup
-  }: {
-    store?: Store<any>
-    $route?: unknown
-    loading?: boolean
-    setup?: unknown
-  } = {}) {
-    return mount(
-      component,
-      mountOptions(store, $route, loading, setup, {
-        'oc-button': false,
-        'list-info': true,
-        translate: true,
-        pagination: true,
-        RouterLink: RouterLinkStub
-      })
-    )
-  }
-})
diff --git a/packages/web-app-files/tests/unit/views/__snapshots__/LocationPicker.spec.ts.snap b/packages/web-app-files/tests/unit/views/__snapshots__/LocationPicker.spec.ts.snap
deleted file mode 100644
index af725284c1c..00000000000
--- a/packages/web-app-files/tests/unit/views/__snapshots__/LocationPicker.spec.ts.snap
+++ /dev/null
@@ -1,31 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`LocationPicker files app bar should show current hint according to the current route action 1`] = `<p data-testid="location-picker-current-hint" class="oc-text-muted oc-text-meta">Navigate to the desired destination to copy the selected files and folders to. The selected files and folders will be copied into the folder where you are currently located.</p>`;
-
-exports[`LocationPicker files app bar should show current hint according to the current route action 2`] = `<p data-testid="location-picker-current-hint" class="oc-text-muted oc-text-meta">Navigate to the desired destination to move the selected files and folders to. The selected files and folders will be moved into the folder where you are currently located.</p>`;
-
-exports[`LocationPicker files app bar should show location picker selection info according to route action and item 1`] = `<h1 class="location-picker-selection-info oc-mb">Move into »Personal«</h1>`;
-
-exports[`LocationPicker files app bar should show location picker selection info according to route action and item 2`] = `<h1 class="location-picker-selection-info oc-mb">Copy into »Personal«</h1>`;
-
-exports[`LocationPicker files app bar should show location picker selection info according to route action and item 3`] = `<h1 class="location-picker-selection-info oc-mb">Move into »Personal«</h1>`;
-
-exports[`LocationPicker files app bar should show location picker selection info according to route action and item 4`] = `<h1 class="location-picker-selection-info oc-mb">Move into »Personal«</h1>`;
-
-exports[`LocationPicker files app bar should show location picker selection info according to route action and item 5`] = `<h1 class="location-picker-selection-info oc-mb">Copy into »Personal«</h1>`;
-
-exports[`LocationPicker files app bar should show location picker selection info according to route action and item 6`] = `<h1 class="location-picker-selection-info oc-mb">Copy into »Personal«</h1>`;
-
-exports[`LocationPicker files app bar should show location picker selection info according to route action and item 7`] = `<h1 class="location-picker-selection-info oc-mb">Copy into »Personal«</h1>`;
-
-exports[`LocationPicker files app bar should show location picker selection info according to route action and item 8`] = `<h1 class="location-picker-selection-info oc-mb">Copy into »Personal«</h1>`;
-
-exports[`LocationPicker files app bar should show location picker selection info according to route action and item 9`] = `<h1 class="location-picker-selection-info oc-mb">Copy into »Personal«</h1>`;
-
-exports[`LocationPicker files app bar should show location picker selection info according to route action and item 10`] = `<h1 class="location-picker-selection-info oc-mb">Copy into »Personal«</h1>`;
-
-exports[`LocationPicker files app bar should show location picker selection info according to route action and item 11`] = `<h1 class="location-picker-selection-info oc-mb">Copy into »Personal«</h1>`;
-
-exports[`LocationPicker files view when the view is not loading anymore should show no content message if active files length is less than one 1`] = `<no-content-message-stub icon="folder" id="files-location-picker-empty" class="files-empty"></no-content-message-stub>`;
-
-exports[`LocationPicker files view when the view is still loading should show app-loading-spinner component 1`] = `<app-loading-spinner-stub></app-loading-spinner-stub>`;
diff --git a/packages/web-app-files/tests/unit/views/shares/__snapshots__/SharedWithOthers.spec.js.snap b/packages/web-app-files/tests/unit/views/shares/__snapshots__/SharedWithOthers.spec.js.snap
index b4faf78480d..df7d22ad5b2 100644
--- a/packages/web-app-files/tests/unit/views/shares/__snapshots__/SharedWithOthers.spec.js.snap
+++ b/packages/web-app-files/tests/unit/views/shares/__snapshots__/SharedWithOthers.spec.js.snap
@@ -28,7 +28,7 @@ exports[`SharedWithOthers view when the wrapper is not loading anymore when leng
       </td>
       <td class="oc-td oc-table-cell oc-table-cell-align-left oc-table-cell-align-middle oc-table-cell-width-expand oc-text-truncate oc-table-data-cell oc-table-data-cell-name">
         <div class="resource-table-resource-wrapper resource-table-resource-wrapper-limit-max-width">
-          <oc-resource-stub folderlink="[object Object]" parentfolderlink="[object Object]" resource="[object Object]" parentfoldernamedefault="All files and folders" ispathdisplayed="true" isextensiondisplayed="true" isresourceclickable="true"></oc-resource-stub>
+          <oc-resource-stub folderlink="[object Object]" parentfolderlink="[object Object]" resource="[object Object]" parentfoldernamedefault="All files and folders" ispathdisplayed="true" isextensiondisplayed="true" isresourceclickable="true" class=""></oc-resource-stub>
           <oc-button-stub type="button" size="medium" submit="button" variation="passive" appearance="raw" justifycontent="center" gapsize="medium" class="resource-table-edit-name"><span class="oc-icon oc-icon-s oc-icon-passive"><!----></span></oc-button-stub>
         </div>
       </td>
@@ -51,7 +51,7 @@ exports[`SharedWithOthers view when the wrapper is not loading anymore when leng
       </td>
       <td class="oc-td oc-table-cell oc-table-cell-align-left oc-table-cell-align-middle oc-table-cell-width-expand oc-text-truncate oc-table-data-cell oc-table-data-cell-name">
         <div class="resource-table-resource-wrapper resource-table-resource-wrapper-limit-max-width">
-          <oc-resource-stub folderlink="[object Object]" parentfolderlink="[object Object]" resource="[object Object]" parentfoldernamedefault="All files and folders" ispathdisplayed="true" isextensiondisplayed="true" isresourceclickable="true"></oc-resource-stub>
+          <oc-resource-stub folderlink="[object Object]" parentfolderlink="[object Object]" resource="[object Object]" parentfoldernamedefault="All files and folders" ispathdisplayed="true" isextensiondisplayed="true" isresourceclickable="true" class=""></oc-resource-stub>
           <oc-button-stub type="button" size="medium" submit="button" variation="passive" appearance="raw" justifycontent="center" gapsize="medium" class="resource-table-edit-name"><span class="oc-icon oc-icon-s oc-icon-passive"><!----></span></oc-button-stub>
         </div>
       </td>
@@ -74,7 +74,7 @@ exports[`SharedWithOthers view when the wrapper is not loading anymore when leng
       </td>
       <td class="oc-td oc-table-cell oc-table-cell-align-left oc-table-cell-align-middle oc-table-cell-width-expand oc-text-truncate oc-table-data-cell oc-table-data-cell-name">
         <div class="resource-table-resource-wrapper resource-table-resource-wrapper-limit-max-width">
-          <oc-resource-stub folderlink="[object Object]" parentfolderlink="[object Object]" resource="[object Object]" parentfoldernamedefault="All files and folders" ispathdisplayed="true" isextensiondisplayed="true" isresourceclickable="true"></oc-resource-stub>
+          <oc-resource-stub folderlink="[object Object]" parentfolderlink="[object Object]" resource="[object Object]" parentfoldernamedefault="All files and folders" ispathdisplayed="true" isextensiondisplayed="true" isresourceclickable="true" class=""></oc-resource-stub>
           <oc-button-stub type="button" size="medium" submit="button" variation="passive" appearance="raw" justifycontent="center" gapsize="medium" class="resource-table-edit-name"><span class="oc-icon oc-icon-s oc-icon-passive"><!----></span></oc-button-stub>
         </div>
       </td>
@@ -97,7 +97,7 @@ exports[`SharedWithOthers view when the wrapper is not loading anymore when leng
       </td>
       <td class="oc-td oc-table-cell oc-table-cell-align-left oc-table-cell-align-middle oc-table-cell-width-expand oc-text-truncate oc-table-data-cell oc-table-data-cell-name">
         <div class="resource-table-resource-wrapper resource-table-resource-wrapper-limit-max-width">
-          <oc-resource-stub folderlink="[object Object]" parentfolderlink="[object Object]" resource="[object Object]" parentfoldernamedefault="All files and folders" ispathdisplayed="true" isextensiondisplayed="true" isresourceclickable="true"></oc-resource-stub>
+          <oc-resource-stub folderlink="[object Object]" parentfolderlink="[object Object]" resource="[object Object]" parentfoldernamedefault="All files and folders" ispathdisplayed="true" isextensiondisplayed="true" isresourceclickable="true" class=""></oc-resource-stub>
           <oc-button-stub type="button" size="medium" submit="button" variation="passive" appearance="raw" justifycontent="center" gapsize="medium" class="resource-table-edit-name"><span class="oc-icon oc-icon-s oc-icon-passive"><!----></span></oc-button-stub>
         </div>
       </td>
diff --git a/packages/web-app-files/tests/unit/views/spaces/__snapshots__/Projects.spec.js.snap b/packages/web-app-files/tests/unit/views/spaces/__snapshots__/Projects.spec.js.snap
index 464c24dd08d..0ad272bc4d6 100644
--- a/packages/web-app-files/tests/unit/views/spaces/__snapshots__/Projects.spec.js.snap
+++ b/packages/web-app-files/tests/unit/views/spaces/__snapshots__/Projects.spec.js.snap
@@ -32,16 +32,19 @@ exports[`Spaces projects view should list spaces 1`] = `
                           <ul id="oc-files-context-actions-members" class="oc-list oc-my-rm oc-mx-rm oc-files-context-actions oc-pb-s oc-files-context-actions-border">
                             <li class="oc-files-context-action oc-px-s oc-rounded oc-menu-item-hover"><button type="button" class="oc-button oc-rounded oc-button-s oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw oc-files-actions-show-details-trigger action-menu-item" data-testid="action-handler"><span class="oc-icon oc-icon-m oc-icon-passive" data-testid="action-icon"><!----></span> <span data-testid="action-label" class="oc-files-context-action-label">Members</span>
                                 <!---->
+                                <!---->
                               </button></li>
                           </ul>
                           <ul id="oc-files-context-actions-trashBin" class="oc-list oc-my-rm oc-mx-rm oc-files-context-actions oc-pb-s oc-pt-s oc-files-context-actions-border">
                             <li class="oc-files-context-action oc-px-s oc-rounded oc-menu-item-hover"><button type="button" class="oc-button oc-rounded oc-button-s oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw oc-files-actions-delete-trigger action-menu-item" data-testid="action-handler"><span class="oc-icon oc-icon-m oc-icon-passive" data-testid="action-icon"><!----></span> <span data-testid="action-label" class="oc-files-context-action-label">Deleted files</span>
                                 <!---->
+                                <!---->
                               </button></li>
                           </ul>
                           <ul id="oc-files-context-actions-sidebar" class="oc-list oc-my-rm oc-mx-rm oc-files-context-actions oc-pt-s">
                             <li class="oc-files-context-action oc-px-s oc-rounded oc-menu-item-hover"><button type="button" class="oc-button oc-rounded oc-button-s oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw oc-files-actions-show-details-trigger action-menu-item" data-testid="action-handler"><span class="oc-icon oc-icon-m oc-icon-passive" data-testid="action-icon"><!----></span> <span data-testid="action-label" class="oc-files-context-action-label">Details</span>
                                 <!---->
+                                <!---->
                               </button></li>
                           </ul>
                         </div>
diff --git a/packages/web-runtime/src/components/SidebarNav/SidebarNavItem.vue b/packages/web-runtime/src/components/SidebarNav/SidebarNavItem.vue
index 48015afbe20..6d0f9cca90b 100644
--- a/packages/web-runtime/src/components/SidebarNav/SidebarNavItem.vue
+++ b/packages/web-runtime/src/components/SidebarNav/SidebarNavItem.vue
@@ -144,5 +144,9 @@ export default {
   &.active {
     overflow: hidden;
   }
+
+  .oc-icon svg {
+    transition: all 0.3s;
+  }
 }
 </style>
diff --git a/tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature b/tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature
index f9fe0ae5894..07fab67b621 100644
--- a/tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature
+++ b/tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature
@@ -249,10 +249,10 @@ Feature: deleting files and folders
       | lorem.txt     |
       | simple-folder |
     When the user deletes file "lorem.txt" using the webUI
-    Then the error message with header 'Failed to delete "lorem.txt"' should be displayed on the webUI
+    Then the "error" message with header 'Failed to delete "lorem.txt"' should be displayed on the webUI
     When the user clears all error message from the webUI
     And the user deletes folder "simple-folder" using the webUI
-    Then the error message with header 'Failed to delete "simple-folder"' should be displayed on the webUI
+    Then the "error" message with header 'Failed to delete "simple-folder"' should be displayed on the webUI
     When the user reloads the current page of the webUI
     Then file "lorem.txt" should not be listed on the webUI
     And folder "simple-folder" should not be listed on the webUI
diff --git a/tests/acceptance/features/webUIFavorites/favoritesFile.feature b/tests/acceptance/features/webUIFavorites/favoritesFile.feature
index f2eca1baa80..ad742681404 100644
--- a/tests/acceptance/features/webUIFavorites/favoritesFile.feature
+++ b/tests/acceptance/features/webUIFavorites/favoritesFile.feature
@@ -111,11 +111,11 @@ Feature: Mark file as favorite
       | lorem.txt     |
       | simple-folder |
     When the user marks file "lorem.txt" as favorite using the webUI
-    Then the error message with header 'Failed to change favorite state of "lorem.txt"' should be displayed on the webUI
+    Then the "error" message with header 'Failed to change favorite state of "lorem.txt"' should be displayed on the webUI
     And file "lorem.txt" should not be marked as favorite on the webUI
     When the user clears all error message from the webUI
     And the user marks folder "simple-folder" as favorite using the webUI
-    Then the error message with header 'Failed to change favorite state of "simple-folder"' should be displayed on the webUI
+    Then the "error" message with header 'Failed to change favorite state of "simple-folder"' should be displayed on the webUI
     And folder "simple-folder" should not be marked as favorite on the webUI
     And as "Alice" file "lorem.txt" should not exist in the server
     And as "Alice" folder "simple-folder" should not exist in the server
diff --git a/tests/acceptance/features/webUIFavorites/unfavoriteFile.feature b/tests/acceptance/features/webUIFavorites/unfavoriteFile.feature
index 9b81b584475..6d16e302bd5 100644
--- a/tests/acceptance/features/webUIFavorites/unfavoriteFile.feature
+++ b/tests/acceptance/features/webUIFavorites/unfavoriteFile.feature
@@ -110,11 +110,11 @@ Feature: Unmark file/folder as favorite
       | lorem.txt     |
       | simple-folder |
     When the user unmarks the favorited file "lorem.txt" using the webUI
-    Then the error message with header 'Failed to change favorite state of "lorem.txt"' should be displayed on the webUI
+    Then the "error" message with header 'Failed to change favorite state of "lorem.txt"' should be displayed on the webUI
     And file "lorem.txt" should be marked as favorite on the webUI
     When the user clears all error message from the webUI
     And the user unmarks the favorited folder "simple-folder" using the webUI
-    Then the error message with header 'Failed to change favorite state of "simple-folder"' should be displayed on the webUI
+    Then the "error" message with header 'Failed to change favorite state of "simple-folder"' should be displayed on the webUI
     And folder "simple-folder" should be marked as favorite on the webUI
     And as "Alice" file "lorem.txt" should not exist in the server
     And as "Alice" folder "simple-folder" should not exist in the server
diff --git a/tests/acceptance/features/webUIFiles/batchAction.feature b/tests/acceptance/features/webUIFiles/batchAction.feature
index a3f26178168..9188d39fea0 100644
--- a/tests/acceptance/features/webUIFiles/batchAction.feature
+++ b/tests/acceptance/features/webUIFiles/batchAction.feature
@@ -16,7 +16,7 @@ Feature: Visibility of the batch actions menu
     When the user marks the folder "simple-folder" using the webUI
     Then the following batch action buttons should be visible
       | buttonName |
-      | Move       |
+      | Cut        |
       | Copy       |
       | Delete     |
 
@@ -29,7 +29,7 @@ Feature: Visibility of the batch actions menu
       | buttonName |
       | Download   |
       | Delete     |
-      | Move       |
+      | Cut        |
       | Copy       |
 
 
@@ -43,7 +43,7 @@ Feature: Visibility of the batch actions menu
     Then the following batch action buttons should be visible
       | buttonName |
       | Delete     |
-      | Move       |
+      | Cut        |
       | Copy       |
 
   @skipOnOCIS
@@ -93,7 +93,7 @@ Feature: Visibility of the batch actions menu
     Then the following batch action buttons should not be visible
       | buttonName |
       | Delete     |
-      | Move       |
+      | Cut        |
       | Copy       |
 
 
@@ -106,7 +106,7 @@ Feature: Visibility of the batch actions menu
     Then the following batch action buttons should not be visible
       | buttonName |
       | Delete     |
-      | Move       |
+      | Cut        |
       | Copy       |
 
 
diff --git a/tests/acceptance/features/webUIFiles/download.feature b/tests/acceptance/features/webUIFiles/download.feature
index 4b23ccb97eb..0482cbd9d92 100644
--- a/tests/acceptance/features/webUIFiles/download.feature
+++ b/tests/acceptance/features/webUIFiles/download.feature
@@ -14,7 +14,7 @@ Feature: download files
       | name      |
       | lorem.txt |
     When the user downloads file "lorem.txt" using the webUI
-    Then the error message with header 'Download failed' should be displayed on the webUI
+    Then the "error" message with header 'Download failed' should be displayed on the webUI
     When the user reloads the current page of the webUI
     Then file "lorem.txt" should not be listed on the webUI
     And as "Alice" file "lorem.txt" should not exist in the server
diff --git a/tests/acceptance/features/webUIFilesActionMenu/fileFolderActionMenu.feature b/tests/acceptance/features/webUIFilesActionMenu/fileFolderActionMenu.feature
index dca6cb35a00..a99efc04848 100644
--- a/tests/acceptance/features/webUIFilesActionMenu/fileFolderActionMenu.feature
+++ b/tests/acceptance/features/webUIFilesActionMenu/fileFolderActionMenu.feature
@@ -17,9 +17,9 @@ Feature: User can see the file or folder actions menu options
     When the user opens the actions sidebar panel of file "lorem.txt" on the webUI
     Then the app-sidebar for file "lorem.txt" should be visible on the webUI
     And only the following items with default items should be visible in the actions menu on the webUI
-      | items                  |
+      | items               |
       | open in text editor |
-      | download               |
+      | download            |
     When the user opens the actions sidebar panel of file "lorem.pdf" on the webUI
     Then the app-sidebar for file "lorem.pdf" should be visible on the webUI
     And only the following items with default items should be visible in the actions menu on the webUI
@@ -29,9 +29,9 @@ Feature: User can see the file or folder actions menu options
     When the user opens the actions sidebar panel of file "testavatar.png" on the webUI
     Then the app-sidebar for file "testavatar.png" should be visible on the webUI
     And only the following items with default items should be visible in the actions menu on the webUI
-      | items               |
-      | preview |
-      | download            |
+      | items    |
+      | preview  |
+      | download |
 
 
   Scenario: observe different actions menu options on selecting a folder
diff --git a/tests/acceptance/features/webUIFilesCopy/copy.feature b/tests/acceptance/features/webUIFilesCopy/copy.feature
index fb335234dfb..a25a180e9a5 100644
--- a/tests/acceptance/features/webUIFilesCopy/copy.feature
+++ b/tests/acceptance/features/webUIFilesCopy/copy.feature
@@ -32,7 +32,7 @@ Feature: copy files and folders
     And user "Alice" has logged in using the webUI
     And the user has browsed to the personal page
     When the user tries to copy file "strängé filename (duplicate #2 &).txt" into folder "strängé नेपाली folder" using the webUI
-    Then the error message with header 'Failed to copy "strängé filename (duplicate #2 &).txt"' should be displayed on the webUI
+    Then the "modal error" message with header 'File with name strängé filename (duplicate #2 &).txt already exists.' should be displayed on the webUI
 
   @smokeTest @ocisSmokeTest
   Scenario: Copy multiple files at once
@@ -78,7 +78,7 @@ Feature: copy files and folders
     And user "Alice" has created folder "simple-folder/simple-empty-folder" in the server
     And user "Alice" has uploaded file "data.zip" to "simple-folder/data.zip" in the server
     And user "Alice" has shared folder "simple-folder" with link with "read, update, create, delete" permissions in the server
-    And the public uses the webUI to access the last public link created by user "Alice" in a new session
+    When the public uses the webUI to access the last public link created by user "Alice" in a new session
     And the user copies file "data.zip" into folder "simple-empty-folder" using the webUI
     Then breadcrumb for folder "simple-empty-folder" should be displayed on the webUI
     And file "data.zip" should be listed on the webUI
@@ -113,7 +113,7 @@ Feature: copy files and folders
     Given user "Alice" has created folder "simple-empty-folder" in the server
     And user "Alice" has logged in using the webUI
     When the user tries to copy folder "simple-empty-folder" into folder "simple-empty-folder" using the webUI
-    Then the error message with header 'Failed to copy "simple-empty-folder"' should be displayed on the webUI
+    Then the "error" message with header "You can't paste the selected file at this location because you can't paste an item into itself." should be displayed on the webUI
     And as "Alice" file "simple-empty-folder/simple-empty-folder" should not exist in the server
 
 
@@ -127,40 +127,3 @@ Feature: copy files and folders
     And folder "simple-empty-folder" should be listed on the webUI
     And as "Alice" folder "folder with space/simple-empty-folder/simple-empty-folder" should exist in the server
     And as "Alice" folder "simple-empty-folder" should exist in the server
-
-  Scenario: cancel copying a file
-    Given user "Alice" has uploaded file "data.zip" to "data.zip" in the server
-    And user "Alice" has created folder "simple-empty-folder" in the server
-    And user "Alice" has logged in using the webUI
-    And the user has browsed to the personal page
-    When the user selects copy action for folder "data.zip" using the webUI
-    And the user selects the folder "simple-empty-folder" as a place to copy the file using the webUI
-    And the user cancels the attempt to copy resources using the webUI
-    Then file "data.zip" should be listed on the webUI
-    But  file "data.zip" should not be listed in the folder "simple-empty-folder" on the webUI
-
-  Scenario: cancel copying of multiple files at once
-    Given user "Alice" has uploaded file "data.zip" to "data.zip" in the server
-    And user "Alice" has uploaded file "new-data.zip" to "testapp.zip" in the server
-    And user "Alice" has created file "lorem.txt" in the server
-    And user "Alice" has created folder "simple-empty-folder" in the server
-    And user "Alice" has logged in using the webUI
-    And the user has browsed to the personal page
-    When the user marks these files for batch action using the webUI
-      | file_name   |
-      | data.zip    |
-      | lorem.txt   |
-      | testapp.zip |
-    And the user selects the copy button to copy files using the webUI
-    And the user selects the folder "simple-empty-folder" as a place to copy the files using the webUI
-    And the user cancels the attempt to copy resources using the webUI
-    Then the following files should be listed on the webUI
-      | file_name   |
-      | data.zip    |
-      | lorem.txt   |
-      | testapp.zip |
-    But these resources should not be listed in the folder "simple-empty-folder" on the webUI
-      | file_name   |
-      | data.zip    |
-      | lorem.txt   |
-      | testapp.zip |
diff --git a/tests/acceptance/features/webUIMoveFilesFolders/moveFiles.feature b/tests/acceptance/features/webUIMoveFilesFolders/moveFiles.feature
index 89b2439faa1..3c3337fbef4 100644
--- a/tests/acceptance/features/webUIMoveFilesFolders/moveFiles.feature
+++ b/tests/acceptance/features/webUIMoveFilesFolders/moveFiles.feature
@@ -45,7 +45,7 @@ Feature: move files
     And user "Alice" has uploaded file "lorem.txt" to "simple-folder/lorem.txt" in the server
     And the user has browsed to the personal page
     When the user tries to move file "lorem.txt" into folder "simple-folder" using the webUI
-    Then the error message with header 'Failed to move "lorem.txt"' should be displayed on the webUI
+    Then the "modal error" message with header 'File with name lorem.txt already exists.' should be displayed on the webUI
 
   @smokeTest @ocisSmokeTest  @disablePreviews
   Scenario: Move multiple files at once
@@ -102,38 +102,38 @@ Feature: move files
     When the user tries to move file "lorem.txt" into folder "simple-folder (2)" using the webUI
     Then as "Alice" file "simple-folder (2)/lorem.txt" should not exist in the server
 
-  Scenario: cancel moving a file
-    Given user "Alice" has logged in using the webUI
-    And the user has browsed to the personal page
-    And the user selects move action for file "lorem.txt" using the webUI
-    And the user selects the folder "simple-folder" as a place to move the file using the webUI
-    And the user cancels the attempt to move resources using the webUI
-    Then file "lorem.txt" should be listed on the webUI
-    But  file "lorem.txt" should not be listed in the folder "simple-folder" on the webUI
 
-  Scenario: cancel moving of multiple files at once
-    Given user "Alice" has logged in using the webUI
-    And user "Alice" has uploaded file "data.zip" to "data.zip" in the server
-    And user "Alice" has uploaded file "data.zip" to "testapp.zip" in the server
-    And the user has browsed to the personal page
-    When the user marks these files for batch action using the webUI
-      | file_name   |
-      | data.zip    |
-      | lorem.txt   |
-      | testapp.zip |
-    And the user selects the move button to move files using the webUI
-    And the user selects the folder "simple-folder" as a place to move the files using the webUI
-    And the user cancels the attempt to move resources using the webUI
-    Then the following files should be listed on the webUI
-      | file_name   |
-      | data.zip    |
-      | lorem.txt   |
-      | testapp.zip |
-    But these resources should not be listed in the folder "simple-folder" on the webUI
-      | file_name   |
-      | data.zip    |
-      | lorem.txt   |
-      | testapp.zip |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
   @issue-ocis-873
   Scenario: sharee moves a file shared by sharer into another folder
diff --git a/tests/acceptance/features/webUIMoveFilesFolders/moveFolders.feature b/tests/acceptance/features/webUIMoveFilesFolders/moveFolders.feature
index 0fbaffb6eb0..bad48860f0e 100644
--- a/tests/acceptance/features/webUIMoveFilesFolders/moveFolders.feature
+++ b/tests/acceptance/features/webUIMoveFilesFolders/moveFolders.feature
@@ -35,7 +35,7 @@ Feature: move folders
     And user "Alice" has logged in using the webUI
     And the user has browsed to the personal page
     When the user tries to move folder "simple-empty-folder" into folder "simple-folder" using the webUI
-    Then the error message with header 'Failed to move "simple-empty-folder"' should be displayed on the webUI
+    Then the "modal error" message with header 'Folder with name simple-empty-folder already exists.' should be displayed on the webUI
 
   @smokeTest
   Scenario: Move multiple folders at once
@@ -81,7 +81,7 @@ Feature: move folders
   Scenario: move a folder into the same folder
     Given user "Alice" has logged in using the webUI
     When the user tries to move folder "simple-empty-folder" into folder "simple-empty-folder" using the webUI
-    Then the error message with header 'Failed to move "simple-empty-folder"' should be displayed on the webUI
+    Then the "error" message with header "You can't paste the selected file at this location because you can't paste an item into itself." should be displayed on the webUI
     And as "Alice" folder "simple-empty-folder/simple-empty-folder" should not exist in the server
 
 
diff --git a/tests/acceptance/features/webUIRenameFiles/renameFiles.feature b/tests/acceptance/features/webUIRenameFiles/renameFiles.feature
index a78d7400d8f..972d16d34df 100644
--- a/tests/acceptance/features/webUIRenameFiles/renameFiles.feature
+++ b/tests/acceptance/features/webUIRenameFiles/renameFiles.feature
@@ -113,7 +113,7 @@ Feature: rename files
   Scenario Outline: Try to rename a file using forbidden characters
     Given user "Alice" has logged in using the webUI
     When the user tries to rename file "data.zip" to "<filename>" using the webUI
-    Then the error message with header 'Failed to rename "data.zip" to "<filename>"' should be displayed on the webUI
+    Then the "error" message with header 'Failed to rename "data.zip" to "<filename>"' should be displayed on the webUI
     And file "data.zip" should be listed on the webUI
     And file "<filename>" should not be listed on the webUI
     Examples:
@@ -182,7 +182,7 @@ Feature: rename files
   Scenario: Rename a file to .part (on oc10)
     Given user "Alice" has logged in using the webUI
     When the user tries to rename file "data.zip" to "data.part" using the webUI
-    Then the error message with header 'Failed to rename "data.zip" to "data.part"' should be displayed on the webUI
+    Then the "error" message with header 'Failed to rename "data.zip" to "data.part"' should be displayed on the webUI
 
   @skipOnOC10
   Scenario: Rename a file to .part
@@ -272,7 +272,7 @@ Feature: rename files
       | name      |
       | lorem.txt |
     When the user tries to rename file "lorem.txt" to "new-lorem.txt" using the webUI
-    Then the error message with header 'Failed to rename "lorem.txt" to "new-lorem.txt"' should be displayed on the webUI
+    Then the "error" message with header 'Failed to rename "lorem.txt" to "new-lorem.txt"' should be displayed on the webUI
     When the user reloads the current page of the webUI
     Then file "lorem.txt" should not be listed on the webUI
     And file "new-lorem.txt" should not be listed on the webUI
diff --git a/tests/acceptance/features/webUIRenameFolders/renameFolders.feature b/tests/acceptance/features/webUIRenameFolders/renameFolders.feature
index 4eeae6d5eeb..5c3b8ac6857 100644
--- a/tests/acceptance/features/webUIRenameFolders/renameFolders.feature
+++ b/tests/acceptance/features/webUIRenameFolders/renameFolders.feature
@@ -104,7 +104,7 @@ Feature: rename folders
   Scenario Outline: Rename a folder using forbidden characters
     Given user "Alice" has logged in using the webUI
     When the user tries to rename folder <from_name> to <to_name> using the webUI
-    Then the error message with header '<alert_message>' should be displayed on the webUI
+    Then the "error" message with header '<alert_message>' should be displayed on the webUI
     And folder "simple-folder" should be listed on the webUI
     Examples:
       | from_name       | to_name           | alert_message                                         |
@@ -140,7 +140,7 @@ Feature: rename folders
   Scenario: Rename a folder to .part (on oc10)
     Given user "Alice" has logged in using the webUI
     When the user tries to rename folder "simple-folder" to "simple.part" using the webUI
-    Then the error message with header 'Failed to rename "simple-folder" to "simple.part"' should be displayed on the webUI
+    Then the "error" message with header 'Failed to rename "simple-folder" to "simple.part"' should be displayed on the webUI
 
   @skipOnOC10
   Scenario: Rename a folder to .part (on ocis)
@@ -154,7 +154,7 @@ Feature: rename folders
       | name          |
       | simple-folder |
     When the user tries to rename folder "simple-folder" to "new-simple-folder" using the webUI
-    Then the error message with header 'Failed to rename "simple-folder" to "new-simple-folder"' should be displayed on the webUI
+    Then the "error" message with header 'Failed to rename "simple-folder" to "new-simple-folder"' should be displayed on the webUI
     When the user reloads the current page of the webUI
     Then folder "simple-folder" should not be listed on the webUI
     And folder "new-simple-folder" should not be listed on the webUI
diff --git a/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature b/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature
index 4450b51cc1a..64e1e4050da 100644
--- a/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature
+++ b/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature
@@ -166,11 +166,11 @@ Feature: Sharing files and folders with internal users
       | lorem.txt     |
       | simple-folder |
     When the user shares file "lorem.txt" with user "Brian Murphy" as "Editor" using the webUI
-    Then the error message with header 'Error while sharing.' should be displayed on the webUI
+    Then the "error" message with header 'Error while sharing.' should be displayed on the webUI
     And user "Brian Murphy" should not be listed in the collaborators list on the webUI
     When the user clears all error message from the webUI
     And the user shares folder "simple-folder" with user "Brian Murphy" as "Editor" using the webUI
-    Then the error message with header 'Error while sharing.' should be displayed on the webUI
+    Then the "error" message with header 'Error while sharing.' should be displayed on the webUI
     And user "Brian Murphy" should not be listed in the collaborators list on the webUI
     When the user reloads the current page of the webUI
     Then file "lorem.txt" should not be listed on the webUI
diff --git a/tests/acceptance/features/webUISharingInternalUsersToRoot/shareWithUsers.feature b/tests/acceptance/features/webUISharingInternalUsersToRoot/shareWithUsers.feature
index d3473718ea9..66cf4233bd6 100644
--- a/tests/acceptance/features/webUISharingInternalUsersToRoot/shareWithUsers.feature
+++ b/tests/acceptance/features/webUISharingInternalUsersToRoot/shareWithUsers.feature
@@ -163,11 +163,11 @@ Feature: Sharing files and folders with internal users
       | lorem.txt     |
       | simple-folder |
     When the user shares file "lorem.txt" with user "Brian Murphy" as "Editor" using the webUI
-    Then the error message with header 'Error while sharing.' should be displayed on the webUI
+    Then the "error" message with header 'Error while sharing.' should be displayed on the webUI
     And user "UserTwo" should not be listed in the collaborators list on the webUI
     When the user clears all error message from the webUI
     And the user shares folder "simple-folder" with user "Brian Murphy" as "Editor" using the webUI
-    Then the error message with header 'Error while sharing.' should be displayed on the webUI
+    Then the "error" message with header 'Error while sharing.' should be displayed on the webUI
     And user "UserTwo" should not be listed in the collaborators list on the webUI
     When the user reloads the current page of the webUI
     Then file "lorem.txt" should not be listed on the webUI
diff --git a/tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature b/tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature
index adab3b43432..70085782ac6 100644
--- a/tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature
+++ b/tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature
@@ -47,7 +47,7 @@ Feature: files and folders can be deleted from the trashbin
   # after the issue is fixed delete this scenario and use the one above
   Scenario: Delete folders and check that they are gone (ocis bug demonstration)
     When the user deletes folder "simple-folder" using the webUI
-    Then the error message with header 'Failed to delete "simple-folder"' should be displayed on the webUI
+    Then the "error" message with header 'Failed to delete "simple-folder"' should be displayed on the webUI
     And folder "simple-folder" should be listed on the webUI
     When the user deletes folder "Folder,With,Comma" using the webUI
     Then folder "Folder,With,Comma" should not be listed on the webUI
@@ -98,7 +98,7 @@ Feature: files and folders can be deleted from the trashbin
   @issue-product-139
   Scenario: Clear trashbin
     When the user clears the trashbin
-    Then the success message with header "All deleted files were removed" should be displayed on the webUI
+    Then the "success" message with header "All deleted files were removed" should be displayed on the webUI
     And there should be no resources listed on the webUI
 
 
diff --git a/tests/acceptance/features/webUITrashbinRestore/trashbinRestore.feature b/tests/acceptance/features/webUITrashbinRestore/trashbinRestore.feature
index dbf20a55009..0ef7b168453 100644
--- a/tests/acceptance/features/webUITrashbinRestore/trashbinRestore.feature
+++ b/tests/acceptance/features/webUITrashbinRestore/trashbinRestore.feature
@@ -230,7 +230,7 @@ Feature: Restore deleted files/folders
       | lorem.txt |
     When the user browses to the trashbin page
     And the user restores file "lorem.txt" from the trashbin using the webUI
-    Then the success message with header "lorem.txt was restored successfully" should be displayed on the webUI
+    Then the "success" message with header "lorem.txt was restored successfully" should be displayed on the webUI
     And file "lorem.txt" should not be listed on the webUI
     And folder "lorem.txt" should be listed on the webUI
     When the user browses to the files page using the webUI
@@ -249,7 +249,7 @@ Feature: Restore deleted files/folders
       | lorem.txt |
     When the user browses to the trashbin page
     And the user restores folder "lorem.txt" from the trashbin using the webUI
-    Then the success message with header "lorem.txt was restored successfully" should be displayed on the webUI
+    Then the "success" message with header "lorem.txt was restored successfully" should be displayed on the webUI
     And folder "lorem.txt" should not be listed on the webUI
     And file "lorem.txt" should be listed on the webUI
     When the user browses to the files page using the webUI
@@ -272,7 +272,7 @@ Feature: Restore deleted files/folders
     And the user browses to the trashbin page
     Then as "Alice" file "fileToShare.txt" should exist in the trashbin in the server
     When the user restores file "…/folder-to-share/fileToShare.txt" from the trashbin using the webUI
-    Then the success message with header "fileToShare.txt was restored successfully" should be displayed on the webUI
+    Then the "success" message with header "fileToShare.txt was restored successfully" should be displayed on the webUI
     And as "Alice" file "/Shares/folder-to-share/fileToShare.txt" should exist in the server
 
   @issue-1502
diff --git a/tests/acceptance/pageObjects/FilesPageElement/appSideBar.js b/tests/acceptance/pageObjects/FilesPageElement/appSideBar.js
index 13b1e08dd01..0821e056fc4 100644
--- a/tests/acceptance/pageObjects/FilesPageElement/appSideBar.js
+++ b/tests/acceptance/pageObjects/FilesPageElement/appSideBar.js
@@ -132,7 +132,7 @@ module.exports = {
       return items
     },
     getActionsMenuItemsExceptDefaults: async function () {
-      const defaultItems = ['add to favorites', 'copy', 'move', 'rename', 'delete']
+      const defaultItems = ['add to favorites', 'copy', 'cut', 'rename', 'delete']
       const items = []
       let elements
       await this.api.elements('@panelActionsItems', function (result) {
diff --git a/tests/acceptance/pageObjects/FilesPageElement/filesList.js b/tests/acceptance/pageObjects/FilesPageElement/filesList.js
index fbf57a64dd7..0a8ea383121 100644
--- a/tests/acceptance/pageObjects/FilesPageElement/filesList.js
+++ b/tests/acceptance/pageObjects/FilesPageElement/filesList.js
@@ -610,19 +610,17 @@ module.exports = {
       await fileActionsMenu.move()
 
       // Execute move
-      await client.page.locationPicker().selectFolderAndConfirm(target)
+      await this.selectFolderAndPasteFiles(target)
 
       return this
     },
 
-    cancelResourceMoveOrCopyProgress: async function () {
-      // cancel copy or move
-      await this.waitForElementVisible(this.elements.cancelMoveCopyBtn.selector).click(
-        this.elements.cancelMoveCopyBtn.selector
-      )
-      await this.waitForLoadingFinished()
+    moveMultipleResources: async function (target) {
+      // Trigger move
+      await this.click('@moveSelectedBtn')
 
-      return this
+      // Execute move
+      return await this.selectFolderAndPasteFiles(target)
     },
 
     copyResource: async function (resource, target) {
@@ -631,11 +629,45 @@ module.exports = {
       await fileActionsMenu.copy()
 
       // Execute copy
-      await client.page.locationPicker().selectFolderAndConfirm(target)
+      await this.selectFolderAndPasteFiles(target)
 
       return this
     },
 
+    copyMultipleResources: async function (target) {
+      // Trigger copy
+      await this.click('@copySelectedBtn')
+
+      // Execute copy
+      return await this.selectFolderAndPasteFiles(target)
+    },
+
+    selectFolderAndPasteFiles: async function (target) {
+      if (target.startsWith('/')) {
+        // if the target is absolute, we need to go to the root element first
+        await this.waitForElementVisible('@firstBreadcrumbLink').click('@firstBreadcrumbLink')
+      }
+      const targetSplitted = target.replace(/^(\/|\\)+/, '').split('/')
+      for (let i = 0; i < targetSplitted.length; i++) {
+        await client.page.FilesPageElement.filesList().navigateToFolder(targetSplitted[i])
+      }
+
+      await this.initAjaxCounters()
+        .waitForElementVisible('@pasteSelectedBtn')
+        .click('@pasteSelectedBtn')
+        .waitForAjaxCallsToStartAndFinish()
+      try {
+        await this.waitForElementNotPresent({
+          selector: '@pasteSelectedBtn',
+          timeout: 200
+        })
+      } catch (e) {
+        console.error(e)
+        throw new Error('ElementPresentError')
+      }
+      return this
+    },
+
     clickOnFileName: function (fileName) {
       const file = this.getFileLinkSelectorByFileName(fileName, 'file')
       return this.useXpath().waitForElementVisible(file).click(file).useCss()
@@ -767,15 +799,25 @@ module.exports = {
       selector: '//img[contains(@class, "oc-resource-thumbnail")]',
       locateStrategy: 'xpath'
     },
-    cancelMoveCopyBtn: {
-      selector: '#location-picker-btn-cancel'
-    },
     btnToggleSideBar: {
       selector: '#files-toggle-sidebar'
     },
     sharedWithToggleButton: {
       selector: '//*[contains(@class, "sharee-avatars")]/ancestor::button',
       locateStrategy: 'xpath'
+    },
+    firstBreadcrumbLink: {
+      selector: '//nav[contains(@class, "oc-breadcrumb")]/ol/li[1]/a',
+      locateStrategy: 'xpath'
+    },
+    moveSelectedBtn: {
+      selector: '.oc-files-actions-move-trigger'
+    },
+    copySelectedBtn: {
+      selector: '.oc-files-actions-copy-trigger'
+    },
+    pasteSelectedBtn: {
+      selector: '#clipboard-btns button:first-child'
     }
   }
 }
diff --git a/tests/acceptance/pageObjects/locationPicker.js b/tests/acceptance/pageObjects/locationPicker.js
deleted file mode 100644
index 7e36cd50600..00000000000
--- a/tests/acceptance/pageObjects/locationPicker.js
+++ /dev/null
@@ -1,43 +0,0 @@
-const { client } = require('nightwatch-api')
-
-module.exports = {
-  commands: {
-    selectFolderAndConfirm: async function (target) {
-      await this.selectFolder(target)
-      await this.initAjaxCounters()
-        .waitForElementVisible('@confirmBtn')
-        .click('@confirmBtn')
-        .waitForAjaxCallsToStartAndFinish()
-      try {
-        await this.waitForElementNotPresent({
-          selector: '@confirmBtn',
-          timeout: 200
-        })
-      } catch (e) {
-        console.error(e)
-        throw new Error('ElementPresentError')
-      }
-      return this
-    },
-    selectFolder: async function (target) {
-      if (target.startsWith('/')) {
-        // if the target is absolute, we need to go to the root element first
-        await this.waitForElementVisible('@firstBreadcrumbLink').click('@firstBreadcrumbLink')
-      }
-      const targetSplitted = target.replace(/^(\/|\\)+/, '').split('/')
-      for (let i = 0; i < targetSplitted.length; i++) {
-        await client.page.FilesPageElement.filesList().navigateToFolder(targetSplitted[i])
-      }
-      return this
-    }
-  },
-  elements: {
-    firstBreadcrumbLink: {
-      selector: '//nav[contains(@class, "oc-breadcrumb")]/ol/li[1]/a',
-      locateStrategy: 'xpath'
-    },
-    confirmBtn: {
-      selector: 'button#location-picker-btn-confirm'
-    }
-  }
-}
diff --git a/tests/acceptance/pageObjects/personalPage.js b/tests/acceptance/pageObjects/personalPage.js
index 73f937b321b..45d29b77766 100644
--- a/tests/acceptance/pageObjects/personalPage.js
+++ b/tests/acceptance/pageObjects/personalPage.js
@@ -250,22 +250,6 @@ module.exports = {
       return this.waitForElementVisible('@dialogConfirmBtnDisabled')
     },
 
-    moveMultipleResources: async function (target) {
-      // Trigger move
-      await this.click('@moveSelectedBtn')
-
-      // Execute move
-      return await client.page.locationPicker().selectFolderAndConfirm(target)
-    },
-
-    copyMultipleResources: async function (target) {
-      // Trigger copy
-      await this.click('@copySelectedBtn')
-
-      // Execute copy
-      return await client.page.locationPicker().selectFolderAndConfirm(target)
-    },
-
     /**
      * Create a md file with the given name
      *
@@ -313,15 +297,6 @@ module.exports = {
       })
       return searchBar.length > 0
     },
-    clearSelection: async function () {
-      await this.useXpath()
-        .waitForElementVisible('@clearSelectionBtn')
-        .click('@clearSelectionBtn')
-        .waitForElementNotPresent('@clearSelectionBtn')
-    },
-    checkForButtonMoveHereDisabled: function () {
-      return this.waitForElementVisible('@moveHereConfirmBtn')
-    },
     clearFileSelectionIfAny: async function () {
       let activeFileSelection = false
       await this.isVisible(
@@ -430,20 +405,11 @@ module.exports = {
     dialogInput: {
       selector: '.oc-modal-body-input .oc-text-input'
     },
-    moveSelectedBtn: {
-      selector: '.oc-files-actions-move-trigger'
-    },
-    copySelectedBtn: {
-      selector: '.oc-files-actions-copy-trigger'
-    },
     clearSelectionBtn: {
       selector: '#files-clear-selection'
     },
     dialogBoxInputTextInRed: {
       selector: '.oc-text-input-danger'
-    },
-    moveHereConfirmBtn: {
-      selector: '#location-picker-btn-confirm:disabled'
     }
   }
 }
diff --git a/tests/acceptance/pageObjects/webPage.js b/tests/acceptance/pageObjects/webPage.js
index 500cf11ede0..5d64483bc4b 100644
--- a/tests/acceptance/pageObjects/webPage.js
+++ b/tests/acceptance/pageObjects/webPage.js
@@ -216,6 +216,8 @@ module.exports = {
       let selector = titleOnly ? '@message' : '@messages'
       if (type === 'error') {
         selector = titleOnly ? '@errorMessage' : '@errorMessages'
+      } else if (type === 'modal error') {
+        selector = '@modalErrorMessage'
       }
       await this.waitForElementVisible(selector)
       await this.api.element(selector, (result) => {
@@ -281,6 +283,10 @@ module.exports = {
         '//*[contains(@class, "oc-notification-message-danger")]//div[contains(@class, "oc-notification-message-title")]',
       locateStrategy: 'xpath'
     },
+    modalErrorMessage: {
+      selector: '//div[@class=\'oc-modal-body\']/p[contains(@class, "oc-modal-body-message")]',
+      locateStrategy: 'xpath'
+    },
     errorMessages: {
       selector: '//*[contains(@class, "oc-notification-message-danger")]',
       locateStrategy: 'xpath'
diff --git a/tests/acceptance/stepDefinitions/filesContext.js b/tests/acceptance/stepDefinitions/filesContext.js
index ca866d80a27..38743369b6c 100644
--- a/tests/acceptance/stepDefinitions/filesContext.js
+++ b/tests/acceptance/stepDefinitions/filesContext.js
@@ -1234,22 +1234,6 @@ When(
   }
 )
 
-Then('the move here file/folder button should be disabled', function () {
-  return client.page.personalPage().checkForButtonMoveHereDisabled()
-})
-
-When(
-  'the user selects move action for folder/file {string} using the webUI',
-  async function (resource) {
-    await client.page.FilesPageElement.filesList().openFileActionsMenu(resource)
-    return await client.page.FilesPageElement.fileActionsMenu().move()
-  }
-)
-
-When('the user cancels the attempt to move/copy resources using the webUI', function () {
-  return client.page.FilesPageElement.filesList().cancelResourceMoveOrCopyProgress()
-})
-
 When(
   'the user batch moves these files/folders into folder {string} using the webUI',
   async function (target, resources) {
@@ -1257,25 +1241,10 @@ When(
       await client.page.FilesPageElement.filesList().toggleFileOrFolderCheckbox('enable', item[0])
     }
 
-    return client.page.personalPage().moveMultipleResources(target)
-  }
-)
-
-When(
-  'the user tries to batch move these files/folders into folder {string} using the webUI',
-  async function (target, resources) {
-    for (const item of resources.rows()) {
-      await client.page.FilesPageElement.filesList().toggleFileOrFolderCheckbox('enable', item[0])
-    }
-
-    return client.page.personalPage().attemptToMoveMultipleResources(target)
+    return client.page.FilesPageElement.filesList().moveMultipleResources(target)
   }
 )
 
-When('the user selects the move button to move files using the webUI', function () {
-  return client.page.personalPage().click('@moveSelectedBtn')
-})
-
 When(
   'the user copies file/folder {string} into folder {string} using the webUI',
   function (resource, target) {
@@ -1296,21 +1265,6 @@ When(
   }
 )
 
-When(
-  'the user selects copy action for file/folder {string} using the webUI',
-  async function (resource) {
-    await client.page.FilesPageElement.filesList().openFileActionsMenu(resource)
-    return await client.page.FilesPageElement.fileActionsMenu().copy()
-  }
-)
-
-When(
-  'the user selects the folder {string} as a place to copy/move the file/files/folder/folders using the webUI',
-  async function (target) {
-    await client.page.locationPicker().selectFolder(target)
-  }
-)
-
 When(
   'the user batch copies these files/folders into folder {string} using the webUI',
   async function (target, resources) {
@@ -1318,14 +1272,10 @@ When(
       await client.page.FilesPageElement.filesList().toggleFileOrFolderCheckbox('enable', item[0])
     }
 
-    return await client.page.personalPage().copyMultipleResources(target)
+    return await client.page.FilesPageElement.filesList().copyMultipleResources(target)
   }
 )
 
-When('the user selects the copy button to copy files using the webUI', function () {
-  return client.page.personalPage().click('@copySelectedBtn')
-})
-
 When(
   'the user creates a markdown file with the name {string} using the webUI',
   function (fileName) {
@@ -1365,7 +1315,6 @@ Then(
   async function (table) {
     const visibleItems =
       await client.page.FilesPageElement.appSideBar().getActionsMenuItemsExceptDefaults()
-
     const tableItems = table.rows()
     const expectedVisibleItems = []
     tableItems.forEach((element) => {
diff --git a/tests/acceptance/stepDefinitions/generalContext.js b/tests/acceptance/stepDefinitions/generalContext.js
index 0edbc1cf9aa..2b3f34c789f 100644
--- a/tests/acceptance/stepDefinitions/generalContext.js
+++ b/tests/acceptance/stepDefinitions/generalContext.js
@@ -73,13 +73,20 @@ Given('the property {string} has been deleted in web config file', function (key
 })
 
 Then(
-  'the {word} message with header {string} should be displayed on the webUI',
+  'the {string} message with header {string} should be displayed on the webUI',
   async function (type, message) {
     const text = await client.page.webPage().getDisplayedMessage(type, true)
     assert.strictEqual(text, message)
 
-    const element = type === 'error' ? '@errorMessage' : '@message'
-    return await client.page.webPage().waitForElementNotPresent(element)
+    const element =
+      type === 'error'
+        ? '@errorMessage'
+        : type === 'modal error'
+        ? '@modalErrorMessage'
+        : '@message'
+    if (type === 'error') {
+      return await client.page.webPage().waitForElementNotPresent(element)
+    }
   }
 )
 
diff --git a/tests/e2e/support/objects/app-files/resource/actions.ts b/tests/e2e/support/objects/app-files/resource/actions.ts
index 65fc49a124c..b9d565ec386 100644
--- a/tests/e2e/support/objects/app-files/resource/actions.ts
+++ b/tests/e2e/support/objects/app-files/resource/actions.ts
@@ -19,7 +19,7 @@ const resourceUploadButton = '#upload-menu-btn'
 const fileUploadInput = '#files-file-upload-input'
 const uploadInfoCloseButton = '#close-upload-info-btn'
 const filesAction = `.oc-files-actions-%s-trigger`
-const locationConfirmButton = '#location-picker-btn-confirm'
+const clipboardBtns = '#clipboard-btns'
 const breadcrumbRoot = '//nav[contains(@class, "oc-breadcrumb")]/ol/li[1]/a'
 const fileRenameInput = '.oc-text-input'
 const deleteButton = 'button.oc-files-actions-delete-trigger'
@@ -229,15 +229,7 @@ export const moveOrCopyResource = async (args: moveOrCopyResourceArgs): Promise<
     await clickResource({ page: page, path: newLocation })
   }
 
-  await Promise.all([
-    page.waitForResponse(
-      (resp) =>
-        resp.url().endsWith(resourceBase) &&
-        resp.status() === 201 &&
-        resp.request().method() === action.toUpperCase()
-    ),
-    page.locator(locationConfirmButton).click()
-  ])
+  await page.locator(clipboardBtns).first().click()
 
   await waitForResources({
     page,