diff --git a/changelog/unreleased/enhancement-share-batch-actions b/changelog/unreleased/enhancement-share-batch-actions
new file mode 100644
index 00000000000..9fdfe3811db
--- /dev/null
+++ b/changelog/unreleased/enhancement-share-batch-actions
@@ -0,0 +1,9 @@
+Enhancement: Batch actions for accepting and declining shares
+
+We've added batch actions for accepting and declining multiple selected incoming shares at once.
+
+https://github.com/owncloud/web/issues/5204
+https://github.com/owncloud/web/pull/5374
+https://github.com/owncloud/web/issues/2513
+https://github.com/owncloud/web/issues/3101
+https://github.com/owncloud/web/issues/5435
diff --git a/packages/web-app-files/src/App.vue b/packages/web-app-files/src/App.vue
index d8bf99dd68d..dc25553a238 100644
--- a/packages/web-app-files/src/App.vue
+++ b/packages/web-app-files/src/App.vue
@@ -17,7 +17,7 @@
       ref="filesSidebar"
       tabindex="-1"
       class="uk-width-1-1 uk-width-1-2@m uk-width-1-3@xl"
-      @reset="setHighlightedFile(null)"
+      @reset="$_destroySideBar_hideDetails"
       @beforeDestroy="focusSideBar"
       @mounted="focusSideBar"
       @fileChanged="focusSideBar"
@@ -27,6 +27,7 @@
 <script>
 import Mixins from './mixins'
 import MixinRoutes from './mixins/routes'
+import MixinDestroySideBar from './mixins/sidebar/destroySideBar'
 import { mapActions, mapGetters, mapMutations } from 'vuex'
 import AppBar from './components/AppBar/AppBar.vue'
 import ProgressBar from './components/Upload/ProgressBar.vue'
@@ -38,7 +39,7 @@ export default {
     ProgressBar,
     SideBar
   },
-  mixins: [Mixins, MixinRoutes],
+  mixins: [Mixins, MixinRoutes, MixinDestroySideBar],
   data() {
     return {
       createFolder: false,
@@ -63,7 +64,7 @@ export default {
   },
   watch: {
     $route() {
-      this.setHighlightedFile(null)
+      this.$_destroySideBar_hideDetails()
       this.resetFileSelection()
     }
   },
@@ -78,7 +79,7 @@ export default {
   },
 
   methods: {
-    ...mapActions('Files', ['dragOver', 'setHighlightedFile', 'resetFileSelection']),
+    ...mapActions('Files', ['dragOver', 'resetFileSelection']),
     ...mapActions(['showMessage']),
     ...mapMutations('Files', ['SET_APP_SIDEBAR_EXPANDED_ACCORDION']),
     ...mapMutations(['SET_SIDEBAR_FOOTER_CONTENT_COMPONENT']),
@@ -87,10 +88,6 @@ export default {
       console.info('trace', arguments)
     },
 
-    openSideBar(file, sideBarName) {
-      this.setHighlightedFile(file)
-      this.SET_APP_SIDEBAR_EXPANDED_ACCORDION(sideBarName)
-    },
     focusSideBar(component, event) {
       this.focus({
         from: document.activeElement,
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 b2b94236f6c..c9ec383470d 100644
--- a/packages/web-app-files/src/components/AppBar/SelectedResources/BatchActions.vue
+++ b/packages/web-app-files/src/components/AppBar/SelectedResources/BatchActions.vue
@@ -3,6 +3,7 @@
     <template v-if="isTrashbinRoute">
       <oc-button
         v-if="selectedFiles.length > 0"
+        id="restore-selected-btn"
         key="restore-btn"
         variation="primary"
         class="oc-mr-s"
@@ -56,18 +57,43 @@
           <translate>Delete</translate>
         </oc-button>
       </div>
+      <div v-if="canAccept">
+        <oc-button
+          id="accept-selected-shares-btn"
+          key="accept-shares-btn"
+          variation="primary"
+          @click="acceptShares()"
+        >
+          <oc-icon name="check" />
+          <translate>Accept</translate>
+        </oc-button>
+      </div>
+      <div v-if="canDecline">
+        <oc-button
+          id="decline-selected-shares-btn"
+          key="decline-shares-btn"
+          variation="primary"
+          @click="declineShares()"
+        >
+          <oc-icon name="not_interested" />
+          <translate>Decline</translate>
+        </oc-button>
+      </div>
     </oc-grid>
   </div>
 </template>
 
 <script>
-import { mapGetters, mapActions } from 'vuex'
+import { mapGetters, mapActions, mapMutations } from 'vuex'
 
 import MixinRoutes from '../../../mixins/routes'
 import MixinDeleteResources from '../../../mixins/deleteResources'
 import { cloneStateObject } from '../../../helpers/store'
 import { canBeMoved } from '../../../helpers/permissions'
 import { checkRoute } from '../../../helpers/route'
+import { shareStatus } from '../../../helpers/shareStatus'
+import { triggerShareAction } from '../../../helpers/share/triggerShareAction'
+import PQueue from 'p-queue'
 
 export default {
   mixins: [MixinRoutes, MixinDeleteResources],
@@ -110,6 +136,10 @@ export default {
     },
 
     canDelete() {
+      if (this.isSharedWithMeRoute) {
+        return false
+      }
+
       if (this.isPublicFilesRoute) {
         return this.currentFolder.canBeDeleted()
       }
@@ -117,6 +147,31 @@ export default {
       return true
     },
 
+    canAccept() {
+      if (!this.isSharedWithMeRoute) {
+        return false
+      }
+      let canAccept = true
+      this.selectedFiles.forEach(file => {
+        if (file.status === shareStatus.accepted) {
+          canAccept = false
+        }
+      })
+
+      return canAccept
+    },
+
+    canDecline() {
+      if (!this.isSharedWithMeRoute) {
+        return false
+      }
+      let canDecline = true
+      this.selectedFiles.forEach(file => {
+        if (file.status === shareStatus.declined) canDecline = false
+      })
+      return canDecline
+    },
+
     displayBulkActions() {
       return this.$route.meta.hasBulkActions && this.selectedFiles.length > 0
     },
@@ -129,6 +184,7 @@ export default {
   methods: {
     ...mapActions('Files', ['removeFilesFromTrashbin', 'resetFileSelection', 'setHighlightedFile']),
     ...mapActions(['showMessage']),
+    ...mapMutations('Files', ['SELECT_RESOURCES', 'UPDATE_RESOURCE']),
 
     restoreFiles(resources = this.selectedFiles) {
       for (const resource of resources) {
@@ -189,6 +245,68 @@ export default {
           })
         }
       })
+    },
+
+    acceptShares() {
+      this.triggerShareActions(shareStatus.accepted)
+    },
+
+    declineShares() {
+      this.triggerShareActions(shareStatus.declined)
+    },
+
+    async triggerShareActions(newShareStatus) {
+      const errors = []
+      const triggerPromises = []
+      const triggerQueue = new PQueue({ concurrency: 4 })
+      this.selectedFiles.forEach(resource => {
+        triggerPromises.push(
+          triggerQueue.add(async () => {
+            try {
+              const share = await triggerShareAction(
+                resource,
+                newShareStatus,
+                !this.isOcis,
+                this.$client
+              )
+              if (share) {
+                this.UPDATE_RESOURCE(share)
+              }
+            } catch (error) {
+              errors.push(error)
+            }
+          })
+        )
+      })
+      await Promise.all(triggerPromises)
+
+      if (errors.length === 0) {
+        this.SELECT_RESOURCES([])
+        return
+      }
+
+      console.log(errors)
+      if (newShareStatus === shareStatus.accepted) {
+        this.showMessage({
+          title: this.$ngettext(
+            'Error while accepting the selected share.',
+            'Error while accepting selected shares.',
+            this.selectedFiles.length
+          ),
+          status: 'danger'
+        })
+        return
+      }
+      if (newShareStatus === shareStatus.declined) {
+        this.showMessage({
+          title: this.$ngettext(
+            'Error while declining the selected share.',
+            'Error while declining selected shares.',
+            this.selectedFiles.length
+          ),
+          status: 'danger'
+        })
+      }
     }
   }
 }
diff --git a/packages/web-app-files/src/helpers/resources.js b/packages/web-app-files/src/helpers/resources.js
index c5048ffa4f5..797294155da 100644
--- a/packages/web-app-files/src/helpers/resources.js
+++ b/packages/web-app-files/src/helpers/resources.js
@@ -30,7 +30,7 @@ function _getFileExtension(name) {
 export function buildResource(resource) {
   const isFolder = resource.type === 'dir'
   const extension = _getFileExtension(resource.name)
-  return {
+  const result = {
     id: resource.fileInfo['{http://owncloud.org/ns}fileid'],
     fileId: resource.fileInfo['{http://owncloud.org/ns}fileid'],
     icon: isFolder ? 'folder' : getFileIcon(extension),
@@ -83,6 +83,7 @@ export function buildResource(resource) {
       return this.permissions.indexOf('S') >= 0
     }
   }
+  return result
 }
 
 export function attachIndicators(resource, sharesTree) {
diff --git a/packages/web-app-files/src/helpers/share/triggerShareAction.js b/packages/web-app-files/src/helpers/share/triggerShareAction.js
new file mode 100644
index 00000000000..cac8cf01988
--- /dev/null
+++ b/packages/web-app-files/src/helpers/share/triggerShareAction.js
@@ -0,0 +1,43 @@
+import { buildSharedResource } from '../resources'
+import { shareStatus } from '../shareStatus'
+
+export async function triggerShareAction(resource, status, allowReSharing, $client) {
+  const method = _getRequestMethod(status)
+  if (!method) {
+    throw new Error('invalid new share status')
+  }
+
+  // exec share action
+  let response = await $client.requests.ocs({
+    service: 'apps/files_sharing',
+    action: `api/v1/shares/pending/${resource.share.id}`,
+    method
+  })
+
+  // exit on failure
+  if (response.status !== 200) {
+    throw new Error(response.statusText)
+  }
+
+  // get updated share from response and transform & return it
+  if (parseInt(response.headers.get('content-length')) > 0) {
+    response = await response.json()
+    if (response.ocs.data.length > 0) {
+      const share = response.ocs.data[0]
+      return buildSharedResource(share, true, allowReSharing)
+    }
+  }
+
+  return null
+}
+
+function _getRequestMethod(status) {
+  switch (status) {
+    case shareStatus.accepted:
+      return 'POST'
+    case shareStatus.declined:
+      return 'DELETE'
+    default:
+      return null
+  }
+}
diff --git a/packages/web-app-files/src/mixins/actions/acceptShare.js b/packages/web-app-files/src/mixins/actions/acceptShare.js
new file mode 100644
index 00000000000..a546f0e4276
--- /dev/null
+++ b/packages/web-app-files/src/mixins/actions/acceptShare.js
@@ -0,0 +1,51 @@
+import { triggerShareAction } from '../../helpers/share/triggerShareAction'
+
+import { checkRoute } from '../../helpers/route'
+import MixinRoutes from '../routes'
+import { shareStatus } from '../../helpers/shareStatus'
+import { mapGetters, mapMutations } from 'vuex'
+
+export default {
+  mixins: [MixinRoutes],
+  computed: {
+    ...mapGetters(['isOcis']),
+    $_acceptShare_items() {
+      return [
+        {
+          icon: 'check',
+          handler: this.$_acceptShare_trigger,
+          label: () => this.$gettext('Accept share'),
+          isEnabled: ({ resource }) => {
+            if (!checkRoute(['files-shared-with-me'], this.$route.name)) {
+              return false
+            }
+
+            return [shareStatus.pending, shareStatus.declined].includes(resource.status)
+          },
+          componentType: 'oc-button',
+          class: 'oc-files-actions-sidebar-accept-share-trigger'
+        }
+      ]
+    }
+  },
+  methods: {
+    ...mapMutations('Files', ['UPDATE_RESOURCE']),
+    async $_acceptShare_trigger(resource) {
+      try {
+        const share = await triggerShareAction(
+          resource,
+          shareStatus.accepted,
+          !this.isOcis,
+          this.$client
+        )
+        this.UPDATE_RESOURCE(share)
+      } catch (error) {
+        console.log(error)
+        this.showMessage({
+          title: this.$gettext('Error while accepting the selected share.'),
+          status: 'danger'
+        })
+      }
+    }
+  }
+}
diff --git a/packages/web-app-files/src/mixins/actions/declineShare.js b/packages/web-app-files/src/mixins/actions/declineShare.js
new file mode 100644
index 00000000000..486a957f437
--- /dev/null
+++ b/packages/web-app-files/src/mixins/actions/declineShare.js
@@ -0,0 +1,51 @@
+import { triggerShareAction } from '../../helpers/share/triggerShareAction'
+
+import { checkRoute } from '../../helpers/route'
+import MixinRoutes from '../routes'
+import { shareStatus } from '../../helpers/shareStatus'
+import { mapGetters, mapMutations } from 'vuex'
+
+export default {
+  mixins: [MixinRoutes],
+  computed: {
+    ...mapGetters(['isOcis']),
+    $_declineShare_items() {
+      return [
+        {
+          icon: 'not_interested',
+          handler: this.$_declineShare_trigger,
+          label: () => this.$gettext('Decline share'),
+          isEnabled: ({ resource }) => {
+            if (!checkRoute(['files-shared-with-me'], this.$route.name)) {
+              return false
+            }
+
+            return [shareStatus.pending, shareStatus.accepted].includes(resource.status)
+          },
+          componentType: 'oc-button',
+          class: 'oc-files-actions-sidebar-decline-share-trigger'
+        }
+      ]
+    }
+  },
+  methods: {
+    ...mapMutations('Files', ['UPDATE_RESOURCE']),
+    async $_declineShare_trigger(resource) {
+      try {
+        const share = await triggerShareAction(
+          resource,
+          shareStatus.declined,
+          !this.isOcis,
+          this.$client
+        )
+        this.UPDATE_RESOURCE(share)
+      } catch (error) {
+        console.log(error)
+        this.showMessage({
+          title: this.$gettext('Error while declining the selected share.'),
+          status: 'danger'
+        })
+      }
+    }
+  }
+}
diff --git a/packages/web-app-files/src/mixins/actions/delete.js b/packages/web-app-files/src/mixins/actions/delete.js
index 26e6dc048f2..0e2fdac83d4 100644
--- a/packages/web-app-files/src/mixins/actions/delete.js
+++ b/packages/web-app-files/src/mixins/actions/delete.js
@@ -8,12 +8,10 @@ export default {
       return [
         {
           icon: 'delete',
-          label: () => {
-            return this.$gettext('Delete')
-          },
+          label: () => this.$gettext('Delete'),
           handler: this.$_delete_trigger,
           isEnabled: ({ resource }) => {
-            if (checkRoute(['files-trashbin'], this.$route.name)) {
+            if (checkRoute(['files-shared-with-me', 'files-trashbin'], this.$route.name)) {
               return false
             }
 
@@ -23,6 +21,7 @@ export default {
           class: 'oc-files-actions-sidebar-delete-trigger'
         },
         {
+          // this menu item is ONLY for the trashbin (permanently delete a file/folder)
           icon: 'delete',
           label: () => this.$gettext('Delete'),
           handler: this.$_delete_trigger,
diff --git a/packages/web-app-files/src/mixins/actions/navigate.js b/packages/web-app-files/src/mixins/actions/navigate.js
index 21acf5fbc5b..6c8413c2111 100644
--- a/packages/web-app-files/src/mixins/actions/navigate.js
+++ b/packages/web-app-files/src/mixins/actions/navigate.js
@@ -21,7 +21,7 @@ export default {
           canBeDefault: true,
           componentType: 'router-link',
           route: this.route,
-          class: 'oc-files-actions-sidebar-navigate'
+          class: 'oc-files-actions-sidebar-navigate-trigger'
         }
       ]
     },
diff --git a/packages/web-app-files/src/mixins/fileActions.js b/packages/web-app-files/src/mixins/fileActions.js
index 3927e51d0cf..a43ef5ae93a 100644
--- a/packages/web-app-files/src/mixins/fileActions.js
+++ b/packages/web-app-files/src/mixins/fileActions.js
@@ -1,7 +1,9 @@
 import { mapGetters, mapActions, mapState } from 'vuex'
 
 import { checkRoute } from '../helpers/route'
+import AcceptShare from './actions/acceptShare'
 import Copy from './actions/copy'
+import DeclineShare from './actions/declineShare'
 import Delete from './actions/delete'
 import Download from './actions/download'
 import Favorite from './actions/favorite'
@@ -21,14 +23,28 @@ const actionsMixins = [
   'move',
   'rename',
   'restore',
-  'delete'
+  'delete',
+  'acceptShare',
+  'declineShare'
 ]
 
 export const EDITOR_MODE_EDIT = 'edit'
 export const EDITOR_MODE_CREATE = 'create'
 
 export default {
-  mixins: [Copy, Delete, Download, Favorite, Fetch, Move, Navigate, Rename, Restore],
+  mixins: [
+    AcceptShare,
+    Copy,
+    DeclineShare,
+    Delete,
+    Download,
+    Favorite,
+    Fetch,
+    Move,
+    Navigate,
+    Rename,
+    Restore
+  ],
   computed: {
     ...mapState(['apps']),
     ...mapGetters('Files', ['highlightedFile', 'currentFolder']),
diff --git a/packages/web-app-files/src/mixins/sidebar/destroySideBar.js b/packages/web-app-files/src/mixins/sidebar/destroySideBar.js
new file mode 100644
index 00000000000..afd21b98feb
--- /dev/null
+++ b/packages/web-app-files/src/mixins/sidebar/destroySideBar.js
@@ -0,0 +1,10 @@
+import { mapActions } from 'vuex'
+
+export default {
+  methods: {
+    ...mapActions('Files', ['setHighlightedFile']),
+    $_destroySideBar_hideDetails() {
+      this.setHighlightedFile(null)
+    }
+  }
+}
diff --git a/packages/web-app-files/src/mixins/sidebar/mountSideBar.js b/packages/web-app-files/src/mixins/sidebar/mountSideBar.js
new file mode 100644
index 00000000000..2ff38ffbb81
--- /dev/null
+++ b/packages/web-app-files/src/mixins/sidebar/mountSideBar.js
@@ -0,0 +1,10 @@
+import { mapActions } from 'vuex'
+
+export default {
+  methods: {
+    ...mapActions('Files', ['setHighlightedFile']),
+    $_mountSideBar_showDetails(resource) {
+      this.setHighlightedFile(resource)
+    }
+  }
+}
diff --git a/packages/web-app-files/src/store/getters.js b/packages/web-app-files/src/store/getters.js
index 75831823d64..661eee8a5fe 100644
--- a/packages/web-app-files/src/store/getters.js
+++ b/packages/web-app-files/src/store/getters.js
@@ -81,13 +81,16 @@ export default {
     // whenever no file is selected / no sidebar is open.
     // else it means we're loading the shares only for the sidebar contents and shouldn't
     // be showing a progress bar for the whole folder
-    return state.loadingFolder || (state.highlightedFile === null && state.sharesTreeLoading)
+    return state.loadingFolder || (state.highlightedResourceId === null && state.sharesTreeLoading)
   },
   quota: state => {
     return state.quota
   },
-  highlightedFile: state => {
-    return state.highlightedFile
+  highlightedFile: (state, getters) => {
+    if (state.highlightedResourceId) {
+      return getters.filesAll.find(r => r.id === state.highlightedResourceId)
+    }
+    return null
   },
   publicLinkPassword: state => {
     // we need to use the state for reactivity
diff --git a/packages/web-app-files/src/store/mutations.js b/packages/web-app-files/src/store/mutations.js
index 36eef2a5cfd..944e587f894 100644
--- a/packages/web-app-files/src/store/mutations.js
+++ b/packages/web-app-files/src/store/mutations.js
@@ -116,11 +116,11 @@ export default {
   },
   UPDATE_CURRENT_FILE_SHARE_TYPES(state) {
     const files = [...state.files]
-    if (!state.highlightedFile) {
+    if (!state.highlightedResourceId) {
       return
     }
     const fileIndex = files.findIndex(f => {
-      return f.id === state.highlightedFile.id
+      return f.id === state.highlightedResourceId
     })
     files[fileIndex].shareTypes = computeShareTypes(state.currentFileOutgoingShares)
     state.files = files
@@ -222,7 +222,7 @@ export default {
       }
       file = state.files[fileIndex]
     }
-    state.highlightedFile = file
+    state.highlightedResourceId = file ? file.id : file
   },
   SET_PUBLIC_LINK_PASSWORD(state, password) {
     // cache into state for reactivity
@@ -249,7 +249,7 @@ export default {
   CLEAR_CURRENT_FILES_LIST(state) {
     state.currentFolder = null
     state.selected = []
-    state.highlightedFile = null
+    state.highlightedResourceId = null
     // release blob urls
     state.files.forEach(item => {
       if (item.previewUrl && item.previewUrl.startsWith('blob:')) {
diff --git a/packages/web-app-files/src/store/state.js b/packages/web-app-files/src/store/state.js
index 46376bc7e77..7760b34bc2d 100644
--- a/packages/web-app-files/src/store/state.js
+++ b/packages/web-app-files/src/store/state.js
@@ -47,7 +47,7 @@ export default {
   sharesTreeLoading: false,
 
   loadingFolder: false,
-  highlightedFile: null,
+  highlightedResourceId: null,
   publicLinkPassword: null,
   uploaded: [],
   actionsInProgress: [],
diff --git a/packages/web-app-files/src/views/Favorites.vue b/packages/web-app-files/src/views/Favorites.vue
index 0d3157937ee..484f646d668 100644
--- a/packages/web-app-files/src/views/Favorites.vue
+++ b/packages/web-app-files/src/views/Favorites.vue
@@ -19,7 +19,7 @@
         :target-route="targetRoute"
         :highlighted="highlightedFile ? highlightedFile.id : null"
         :header-position="headerPosition"
-        @showDetails="setHighlightedFile"
+        @showDetails="$_mountSideBar_showDetails"
         @fileClick="$_fileActions_triggerDefaultAction"
         @rowMounted="rowMounted"
       >
@@ -55,6 +55,7 @@ import { buildResource } from '../helpers/resources'
 import FileActions from '../mixins/fileActions'
 import MixinFilesListPositioning from '../mixins/filesListPositioning'
 import MixinFilesListPagination from '../mixins/filesListPagination'
+import MixinMountSideBar from '../mixins/sidebar/mountSideBar'
 
 import QuickActions from '../components/FilesList/QuickActions.vue'
 import ListLoader from '../components/FilesList/ListLoader.vue'
@@ -69,7 +70,7 @@ const visibilityObserver = new VisibilityObserver()
 export default {
   components: { QuickActions, ListLoader, NoContentMessage, ListInfo },
 
-  mixins: [FileActions, MixinFilesListPositioning, MixinFilesListPagination],
+  mixins: [FileActions, MixinFilesListPositioning, MixinFilesListPagination, MixinMountSideBar],
 
   data: () => ({
     loading: true
@@ -145,7 +146,7 @@ export default {
   },
 
   methods: {
-    ...mapActions('Files', ['setHighlightedFile', 'loadIndicators', 'loadPreview']),
+    ...mapActions('Files', ['loadIndicators', 'loadPreview']),
     ...mapMutations('Files', ['SELECT_RESOURCES', 'LOAD_FILES', 'CLEAR_CURRENT_FILES_LIST']),
     ...mapMutations(['SET_QUOTA']),
 
diff --git a/packages/web-app-files/src/views/Personal.vue b/packages/web-app-files/src/views/Personal.vue
index 89cc229de13..d5dd4d6b515 100644
--- a/packages/web-app-files/src/views/Personal.vue
+++ b/packages/web-app-files/src/views/Personal.vue
@@ -27,7 +27,7 @@
         :target-route="targetRoute"
         :highlighted="highlightedFile ? highlightedFile.id : null"
         :header-position="headerPosition"
-        @showDetails="setHighlightedFile"
+        @showDetails="$_mountSideBar_showDetails"
         @fileClick="$_fileActions_triggerDefaultAction"
         @rowMounted="rowMounted"
       >
@@ -71,6 +71,7 @@ import MixinFileActions from '../mixins/fileActions'
 import MixinFilesListScrolling from '../mixins/filesListScrolling'
 import MixinFilesListPositioning from '../mixins/filesListPositioning'
 import MixinFilesListPagination from '../mixins/filesListPagination'
+import MixinMountSideBar from '../mixins/sidebar/mountSideBar'
 import { buildResource } from '../helpers/resources'
 
 import QuickActions from '../components/FilesList/QuickActions.vue'
@@ -91,7 +92,8 @@ export default {
     MixinFileActions,
     MixinFilesListPositioning,
     MixinFilesListScrolling,
-    MixinFilesListPagination
+    MixinFilesListPagination,
+    MixinMountSideBar
   ],
 
   data: () => ({
@@ -190,7 +192,7 @@ export default {
   },
 
   methods: {
-    ...mapActions('Files', ['setHighlightedFile', 'loadIndicators', 'loadPreview']),
+    ...mapActions('Files', ['loadIndicators', 'loadPreview']),
     ...mapMutations('Files', [
       'SELECT_RESOURCES',
       'SET_CURRENT_FOLDER',
@@ -260,7 +262,7 @@ export default {
           const resource = this.activeFiles.find(r => r.name === resourceName)
 
           if (resource) {
-            this.setHighlightedFile(resource)
+            this.$_mountSideBar_showDetails(resource)
             this.scrollToResource(resource)
           }
         })
diff --git a/packages/web-app-files/src/views/PublicFiles.vue b/packages/web-app-files/src/views/PublicFiles.vue
index 1098bb6d43f..908f3d8f0f3 100644
--- a/packages/web-app-files/src/views/PublicFiles.vue
+++ b/packages/web-app-files/src/views/PublicFiles.vue
@@ -27,7 +27,7 @@
         :target-route="targetRoute"
         :highlighted="highlightedFile ? highlightedFile.id : null"
         :header-position="headerPosition"
-        @showDetails="setHighlightedFile"
+        @showDetails="$_mountSideBar_showDetails"
         @fileClick="$_fileActions_triggerDefaultAction"
         @rowMounted="rowMounted"
       >
@@ -59,6 +59,7 @@ import MixinAccessibleBreadcrumb from '../mixins/accessibleBreadcrumb'
 import MixinFileActions from '../mixins/fileActions'
 import MixinFilesListPositioning from '../mixins/filesListPositioning'
 import MixinFilesListPagination from '../mixins/filesListPagination'
+import MixinMountSideBar from '../mixins/sidebar/mountSideBar'
 
 import { buildResource } from '../helpers/resources'
 import ListLoader from '../components/FilesList/ListLoader.vue'
@@ -82,7 +83,8 @@ export default {
     MixinAccessibleBreadcrumb,
     MixinFileActions,
     MixinFilesListPositioning,
-    MixinFilesListPagination
+    MixinFilesListPagination,
+    MixinMountSideBar
   ],
 
   data: () => ({
@@ -161,7 +163,7 @@ export default {
     visibilityObserver.disconnect()
   },
   methods: {
-    ...mapActions('Files', ['setHighlightedFile', 'loadPreview']),
+    ...mapActions('Files', ['loadPreview']),
     ...mapMutations('Files', [
       'SELECT_RESOURCES',
       'SET_CURRENT_FOLDER',
diff --git a/packages/web-app-files/src/views/SharedViaLink.vue b/packages/web-app-files/src/views/SharedViaLink.vue
index 448e7c23d75..f50d347b8df 100644
--- a/packages/web-app-files/src/views/SharedViaLink.vue
+++ b/packages/web-app-files/src/views/SharedViaLink.vue
@@ -23,7 +23,7 @@
         :target-route="targetRoute"
         :highlighted="highlightedFile ? highlightedFile.id : null"
         :header-position="headerPosition"
-        @showDetails="setHighlightedFile"
+        @showDetails="$_mountSideBar_showDetails"
         @fileClick="$_fileActions_triggerDefaultAction"
         @rowMounted="rowMounted"
       >
@@ -56,6 +56,7 @@ import FileActions from '../mixins/fileActions'
 import MixinFilesListPositioning from '../mixins/filesListPositioning'
 import MixinResources from '../mixins/resources'
 import MixinFilesListPagination from '../mixins/filesListPagination'
+import MixinMountSideBar from '../mixins/sidebar/mountSideBar'
 
 import ListLoader from '../components/FilesList/ListLoader.vue'
 import NoContentMessage from '../components/FilesList/NoContentMessage.vue'
@@ -69,7 +70,13 @@ const visibilityObserver = new VisibilityObserver()
 export default {
   components: { ListLoader, NoContentMessage, ListInfo },
 
-  mixins: [FileActions, MixinFilesListPositioning, MixinResources, MixinFilesListPagination],
+  mixins: [
+    FileActions,
+    MixinFilesListPositioning,
+    MixinResources,
+    MixinFilesListPagination,
+    MixinMountSideBar
+  ],
 
   data: () => ({
     loading: true
@@ -144,7 +151,7 @@ export default {
   },
 
   methods: {
-    ...mapActions('Files', ['setHighlightedFile', 'loadIndicators', 'loadPreview']),
+    ...mapActions('Files', ['loadIndicators', 'loadPreview']),
     ...mapMutations('Files', ['LOAD_FILES', 'SELECT_RESOURCES', 'CLEAR_CURRENT_FILES_LIST']),
     ...mapMutations(['SET_QUOTA']),
 
diff --git a/packages/web-app-files/src/views/SharedWithMe.vue b/packages/web-app-files/src/views/SharedWithMe.vue
index dcfd7fd101d..ddb115c0582 100644
--- a/packages/web-app-files/src/views/SharedWithMe.vue
+++ b/packages/web-app-files/src/views/SharedWithMe.vue
@@ -25,7 +25,7 @@
         :target-route="targetRoute"
         :highlighted="highlightedFile ? highlightedFile.id : null"
         :header-position="headerPosition"
-        @showDetails="setHighlightedFile"
+        @showDetails="$_mountSideBar_showDetails"
         @fileClick="$_fileActions_triggerDefaultAction"
         @rowMounted="rowMounted"
       >
@@ -38,16 +38,18 @@
               v-if="[shareStatus.pending, shareStatus.declined].includes(resource.status)"
               size="small"
               class="file-row-share-status-action"
-              @click.stop="triggerShareAction(resource, 'POST')"
+              @click.stop="$_acceptShare_trigger(resource)"
             >
+              <oc-icon size="small" name="check" />
               <translate>Accept</translate>
             </oc-button>
             <oc-button
               v-if="[shareStatus.pending, shareStatus.accepted].includes(resource.status)"
               size="small"
               class="file-row-share-status-action oc-ml-s"
-              @click.stop="triggerShareAction(resource, 'DELETE')"
+              @click.stop="$_declineShare_trigger(resource)"
             >
+              <oc-icon size="small" name="not_interested" />
               <translate>Decline</translate>
             </oc-button>
             <span
@@ -80,10 +82,13 @@
 <script>
 import { mapGetters, mapState, mapActions, mapMutations } from 'vuex'
 import { shareStatus } from '../helpers/shareStatus'
-import { aggregateResourceShares, buildSharedResource } from '../helpers/resources'
+import { aggregateResourceShares } from '../helpers/resources'
 import FileActions from '../mixins/fileActions'
+import MixinAcceptShare from '../mixins/actions/acceptShare'
+import MixinDeclineShare from '../mixins/actions/declineShare'
 import MixinFilesListPositioning from '../mixins/filesListPositioning'
 import MixinFilesListPagination from '../mixins/filesListPagination'
+import MixinMountSideBar from '../mixins/sidebar/mountSideBar'
 
 import ListLoader from '../components/FilesList/ListLoader.vue'
 import NoContentMessage from '../components/FilesList/NoContentMessage.vue'
@@ -95,9 +100,20 @@ import debounce from 'lodash-es/debounce'
 const visibilityObserver = new VisibilityObserver()
 
 export default {
-  components: { ListLoader, NoContentMessage, ListInfo },
+  components: {
+    ListLoader,
+    NoContentMessage,
+    ListInfo
+  },
 
-  mixins: [FileActions, MixinFilesListPositioning, MixinFilesListPagination],
+  mixins: [
+    FileActions,
+    MixinAcceptShare,
+    MixinDeclineShare,
+    MixinFilesListPositioning,
+    MixinFilesListPagination,
+    MixinMountSideBar
+  ],
 
   data: () => ({
     loading: true,
@@ -172,7 +188,7 @@ export default {
   },
 
   methods: {
-    ...mapActions('Files', ['setHighlightedFile', 'loadIndicators', 'loadPreview', 'loadAvatars']),
+    ...mapActions('Files', ['loadIndicators', 'loadPreview', 'loadAvatars']),
     ...mapActions(['showMessage']),
     ...mapMutations('Files', [
       'LOAD_FILES',
@@ -198,7 +214,10 @@ export default {
         })
       }, 250)
 
-      visibilityObserver.observe(component.$el, { onEnter: debounced, onExit: debounced.cancel })
+      visibilityObserver.observe(component.$el, {
+        onEnter: debounced,
+        onExit: debounced.cancel
+      })
     },
 
     async loadResources() {
@@ -243,54 +262,6 @@ export default {
         default:
           return this.$gettext('Pending')
       }
-    },
-
-    async triggerShareAction(resource, type) {
-      try {
-        // exec share action
-        let response = await this.$client.requests.ocs({
-          service: 'apps/files_sharing',
-          action: `api/v1/shares/pending/${resource.share.id}`,
-          method: type
-        })
-
-        // exit on failure
-        if (response.status !== 200) {
-          throw new Error(response.statusText)
-        }
-        // get updated share from response or re-fetch it
-        let share = null
-        // oc10
-        if (parseInt(response.headers.get('content-length')) > 0) {
-          response = await response.json()
-
-          if (response.ocs.data.length > 0) {
-            share = response.ocs.data[0]
-          }
-        } else {
-          // ocis
-          const { shareInfo } = await this.$client.shares.getShare(resource.share.id)
-          share = shareInfo
-        }
-
-        // update share in store
-        if (share) {
-          const sharedResource = await buildSharedResource(
-            share,
-            true,
-            !this.isOcis,
-            this.configuration.server,
-            this.getToken
-          )
-          this.UPDATE_RESOURCE(sharedResource)
-        }
-      } catch (error) {
-        this.showMessage({
-          title: this.$gettext('Error while changing share state'),
-          desc: error.message,
-          status: 'danger'
-        })
-      }
     }
   }
 }
diff --git a/packages/web-app-files/src/views/SharedWithOthers.vue b/packages/web-app-files/src/views/SharedWithOthers.vue
index 1fd29a10aff..473cef11da4 100644
--- a/packages/web-app-files/src/views/SharedWithOthers.vue
+++ b/packages/web-app-files/src/views/SharedWithOthers.vue
@@ -25,7 +25,7 @@
         :target-route="targetRoute"
         :highlighted="highlightedFile ? highlightedFile.id : null"
         :header-position="headerPosition"
-        @showDetails="setHighlightedFile"
+        @showDetails="$_mountSideBar_showDetails"
         @fileClick="$_fileActions_triggerDefaultAction"
         @rowMounted="rowMounted"
       >
@@ -58,6 +58,7 @@ import FileActions from '../mixins/fileActions'
 import MixinFilesListPositioning from '../mixins/filesListPositioning'
 import MixinResources from '../mixins/resources'
 import MixinFilesListPagination from '../mixins/filesListPagination'
+import MixinMountSideBar from '../mixins/sidebar/mountSideBar'
 
 import ListLoader from '../components/FilesList/ListLoader.vue'
 import NoContentMessage from '../components/FilesList/NoContentMessage.vue'
@@ -71,7 +72,13 @@ const visibilityObserver = new VisibilityObserver()
 export default {
   components: { ListLoader, NoContentMessage, ListInfo },
 
-  mixins: [FileActions, MixinFilesListPositioning, MixinResources, MixinFilesListPagination],
+  mixins: [
+    FileActions,
+    MixinFilesListPositioning,
+    MixinResources,
+    MixinFilesListPagination,
+    MixinMountSideBar
+  ],
 
   data: () => ({
     loading: true
@@ -145,7 +152,7 @@ export default {
   },
 
   methods: {
-    ...mapActions('Files', ['setHighlightedFile', 'loadIndicators', 'loadPreview', 'loadAvatars']),
+    ...mapActions('Files', ['loadIndicators', 'loadPreview', 'loadAvatars']),
     ...mapMutations('Files', [
       'LOAD_FILES',
       'SELECT_RESOURCES',
diff --git a/packages/web-app-files/src/views/Trashbin.vue b/packages/web-app-files/src/views/Trashbin.vue
index 791ceeb59d7..90c57050580 100644
--- a/packages/web-app-files/src/views/Trashbin.vue
+++ b/packages/web-app-files/src/views/Trashbin.vue
@@ -24,7 +24,7 @@
         :highlighted="highlightedFile ? highlightedFile.id : null"
         :are-resources-clickable="false"
         :header-position="headerPosition"
-        @showDetails="setHighlightedFile"
+        @showDetails="$_mountSideBar_showDetails"
       >
         <template #footer>
           <oc-pagination
@@ -48,12 +48,13 @@
 </template>
 
 <script>
-import { mapGetters, mapActions, mapMutations, mapState } from 'vuex'
+import { mapGetters, mapMutations, mapState } from 'vuex'
 
 import { buildDeletedResource, buildResource } from '../helpers/resources'
 import MixinFilesListPositioning from '../mixins/filesListPositioning'
 import MixinResources from '../mixins/resources'
 import MixinFilesListPagination from '../mixins/filesListPagination'
+import MixinMountSideBar from '../mixins/sidebar/mountSideBar'
 
 import ListLoader from '../components/FilesList/ListLoader.vue'
 import NoContentMessage from '../components/FilesList/NoContentMessage.vue'
@@ -62,7 +63,7 @@ import ListInfo from '../components/FilesList/ListInfo.vue'
 export default {
   components: { ListLoader, NoContentMessage, ListInfo },
 
-  mixins: [MixinFilesListPositioning, MixinResources, MixinFilesListPagination],
+  mixins: [MixinFilesListPositioning, MixinResources, MixinFilesListPagination, MixinMountSideBar],
 
   data: () => ({
     loading: true
@@ -123,7 +124,6 @@ export default {
   },
 
   methods: {
-    ...mapActions('Files', ['setHighlightedFile']),
     ...mapMutations('Files', ['LOAD_FILES', 'SELECT_RESOURCES', 'CLEAR_CURRENT_FILES_LIST']),
 
     async loadResources() {
diff --git a/packages/web-app-files/tests/unit/helpers/share/triggerShareAction.spec.js b/packages/web-app-files/tests/unit/helpers/share/triggerShareAction.spec.js
new file mode 100644
index 00000000000..3bb562e85cb
--- /dev/null
+++ b/packages/web-app-files/tests/unit/helpers/share/triggerShareAction.spec.js
@@ -0,0 +1,50 @@
+import { triggerShareAction } from '../../../../src/helpers/share/triggerShareAction'
+import { shareStatus } from '../../../../src/helpers/shareStatus'
+
+import OwnCloud from 'owncloud-sdk'
+
+jest.unmock('axios')
+const $client = new OwnCloud()
+
+jest.mock('../../../../src/helpers/resources', () => ({
+  buildSharedResource: jest.fn(share => share)
+}))
+
+describe('method triggerShareAction', () => {
+  beforeEach(() => {
+    fetch.resetMocks()
+  })
+
+  it('throws error if invalid share status given', async () => {
+    const statusText = 'invalid new share status'
+    await expect(triggerShareAction(null, shareStatus.pending, true, null)).rejects.toThrow(
+      statusText
+    )
+  })
+
+  it('throws error if share action response status is not 200', async () => {
+    const statusText = 'status is not 200'
+    fetch.mockResponse(new Error(), { status: 404, statusText })
+    await expect(
+      triggerShareAction({ share: { id: 1 } }, shareStatus.accepted, true, $client)
+    ).rejects.toThrow(statusText)
+  })
+
+  it('silently fails when the response has a content-length header value of 0', async () => {
+    fetch.mockResponse('', {
+      headers: { 'content-length': 0 }
+    })
+    await expect(
+      triggerShareAction({ share: { id: 1 } }, shareStatus.accepted, true, $client)
+    ).resolves.toBeNull()
+  })
+
+  it('returns a resource of type share if content-length header is present and valid', async () => {
+    fetch.mockResponse(JSON.stringify({ ocs: { data: [{ id: 1 }] } }), {
+      headers: { 'content-length': 1 }
+    })
+    await expect(
+      triggerShareAction({ share: { id: 1 } }, shareStatus.accepted, true, $client)
+    ).resolves.toMatchObject({ id: 1 })
+  })
+})
diff --git a/packages/web-app-files/tests/unit/views/SharedWithMe.spec.js b/packages/web-app-files/tests/unit/views/SharedWithMe.spec.js
deleted file mode 100644
index 449a41e9cda..00000000000
--- a/packages/web-app-files/tests/unit/views/SharedWithMe.spec.js
+++ /dev/null
@@ -1,99 +0,0 @@
-import { localVue, getStore } from './views.setup'
-import { mount, config } from '@vue/test-utils'
-import SharedWithMe from '../../../src/views/SharedWithMe'
-
-config.mocks.$ngettext = str => str
-config.mocks.$gettextInterpolate = str => str
-
-const store = getStore()
-const wrapper = mount(
-  { ...SharedWithMe, created: jest.fn(), mounted: jest.fn() },
-  {
-    localVue,
-    store,
-    stubs: {
-      'router-link': true,
-      translate: true,
-      'oc-pagination': true
-    },
-    data: () => ({
-      loading: false
-    })
-  }
-)
-
-jest.mock('../../../src/helpers/resources', () => ({
-  buildSharedResource: jest.fn(share => share)
-}))
-
-const showMessage = jest.spyOn(wrapper.vm, 'showMessage').mockImplementation(v => v)
-const getShare = jest
-  .spyOn(localVue.prototype.$client.shares, 'getShare')
-  .mockImplementation(v => v)
-
-jest.unmock('axios')
-
-describe('SharedWithMe component', () => {
-  describe('method triggerShareAction', () => {
-    beforeEach(() => {
-      fetch.resetMocks()
-      store.reset()
-      showMessage.mockClear()
-      getShare.mockClear()
-    })
-
-    it('errors if status is not 200', async () => {
-      const statusText = 'status is not 200'
-      fetch.mockResponse(new Error(), { status: 404, statusText })
-      await wrapper
-        .findAll('.file-row-share-status-action')
-        .at(1)
-        .trigger('click')
-
-      expect(showMessage.mock.results[0].value.desc).toBe(statusText)
-    })
-
-    it('returns a share if content-length header is present and valid (oc10)', async () => {
-      fetch.mockResponse(JSON.stringify({ ocs: { data: [{ id: 1 }] } }), {
-        headers: { 'content-length': 1 }
-      })
-      await wrapper
-        .findAll('.file-row-share-status-action')
-        .at(1)
-        .trigger('click')
-      await wrapper.vm.$nextTick()
-
-      expect(store.state.Files.resource).toMatchObject({ id: 1 })
-      expect(getShare).toBeCalledTimes(0)
-    })
-
-    it('errors if content-length header is not valid (oc10)', async () => {
-      fetch.mockResponse(JSON.stringify({ ocs: { data: [{ id: 1 }] } }), {
-        headers: { 'content-length': 0 }
-      })
-
-      await wrapper
-        .findAll('.file-row-share-status-action')
-        .at(1)
-        .trigger('click')
-      await wrapper.vm.$nextTick()
-
-      expect(showMessage.mock.results[0]).toBeFalsy()
-    })
-
-    it('returns a share if content-length header is not present (ocis)', async () => {
-      const shareInfo = { id: 1, shareinfo: true }
-      fetch.mockResponse(JSON.stringify({ ocs: { data: [{ id: 1 }] } }), {})
-      getShare.mockReturnValueOnce({ shareInfo })
-
-      await wrapper
-        .findAll('.file-row-share-status-action')
-        .at(1)
-        .trigger('click')
-      await wrapper.vm.$nextTick()
-
-      expect(store.state.Files.resource).toMatchObject(shareInfo)
-      expect(getShare).toBeCalledTimes(1)
-    })
-  })
-})
diff --git a/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md b/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md
index 55ba9e87e07..5f554351505 100644
--- a/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md
+++ b/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md
@@ -62,6 +62,7 @@ Other free text and markdown formatting can be used elsewhere in the document if
 -   [webUISharingInternalUsersCollaborator/shareWithUsers.feature:36](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsersCollaborator/shareWithUsers.feature#L36)
 -   [webUISharingInternalUsersCollaborator/shareWithUsers.feature:37](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsersCollaborator/shareWithUsers.feature#L37)
 -   [webUISharingInternalUsersCollaborator/shareWithUsers.feature:38](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsersCollaborator/shareWithUsers.feature#L38)
+    [webUISharingInternalUsersShareWithPage/shareWithUsers.feature:92](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsersShareWithPage/shareWithUsers.feature#L92)
 -   [webUISharingInternalUsersShareWithPage/shareWithUsers.feature:119](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsersShareWithPage/shareWithUsers.feature#L119)
 -   [webUISharingInternalUsersShareWithPage/shareWithUsers.feature:155](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsersShareWithPage/shareWithUsers.feature#L155)
 -   [webUISharingInternalUsersShareWithPage/shareWithUsers.feature:159](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsersShareWithPage/shareWithUsers.feature#L159)
diff --git a/tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature b/tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature
index a70de1c2e52..d3e962087b1 100644
--- a/tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature
+++ b/tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature
@@ -239,8 +239,8 @@ Feature: deleting files and folders
     And user "Brian" has shared folder "simple-folder" with user "Alice"
     And user "Brian" has shared file "lorem.txt" with user "Alice"
     And the user has browsed to the shared-with-me page
-    When the user deletes folder "simple-folder" using the webUI
-    And the user deletes file "lorem.txt" using the webUI
+    When the user unshares folder "simple-folder" using the webUI
+    And the user unshares file "lorem.txt" using the webUI
     Then as "Alice" folder "simple-folder" should not exist
     And as "Alice" file "lorem.txt" should not exist
     And no message should be displayed on the webUI
diff --git a/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature b/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature
index 42d5e2ab618..f939e886839 100644
--- a/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature
+++ b/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature
@@ -39,7 +39,7 @@ Feature: accept/decline shares coming from internal users
     And the user has browsed to the files page
     And the user opens folder "Shares" using the webUI
     When the user shares folder "simple-folder" with group "grp1" as "Viewer" using the webUI
-    And the user unshares folder "simple-folder" using the webUI
+    And the user deletes folder "simple-folder" using the webUI
     And the user browses to the shared-with-me page using the webUI
     Then folder "simple-folder" shared by "Alice Hansen" should be in "Declined" state on the webUI
     And folder "simple-folder" shared by "Brian Murphy" should not be listed in the webUI
@@ -59,8 +59,8 @@ Feature: accept/decline shares coming from internal users
     And user "Brian" has accepted the share "testimage.jpg" offered by user "Alice"
     And the user has browsed to the files page
     When the user opens folder "Shares" using the webUI
-    And the user unshares folder "simple-folder" using the webUI
-    And the user unshares file "testimage.jpg" using the webUI
+    And the user deletes folder "simple-folder" using the webUI
+    And the user deletes file "testimage.jpg" using the webUI
     Then folder "simple-folder" should not be listed on the webUI
     And file "testimage.jpg" should not be listed on the webUI
     When the user browses to the shared-with-me page using the webUI
@@ -74,7 +74,7 @@ Feature: accept/decline shares coming from internal users
     And the user has browsed to the personal sharing settings page
     Then User-based auto accepting checkbox should not be displayed on the personal sharing settings page in the webUI
 
-  
+
   Scenario: User receives files when auto accept share is disabled
     Given user "Alice" has created file "toshare.txt"
     And user "Alice" has uploaded file with content "test" to "toshare.txt"
@@ -85,7 +85,7 @@ Feature: accept/decline shares coming from internal users
     Then file "toshare.txt" should not be listed on the webUI
     And folder "Shares" should not be listed on the webUI
 
-  
+
   Scenario: receive shares with same name from different users
     Given user "Carol" has been created with default attributes and without skeleton files
     And user "Carol" has created file "lorem.txt"
diff --git a/tests/acceptance/features/webUISharingAcceptSharesToRoot/acceptShares.feature b/tests/acceptance/features/webUISharingAcceptSharesToRoot/acceptShares.feature
index 860c5594831..2017e25eb48 100644
--- a/tests/acceptance/features/webUISharingAcceptSharesToRoot/acceptShares.feature
+++ b/tests/acceptance/features/webUISharingAcceptSharesToRoot/acceptShares.feature
@@ -40,7 +40,7 @@ Feature: accept/decline shares coming from internal users
     And user "Brian" has accepted the share "simple-folder" offered by user "Alice"
     And the user has browsed to the files page
     When the user shares folder "simple-folder (2)" with group "grp1" as "Viewer" using the webUI
-    And the user unshares folder "simple-folder (2)" using the webUI
+    And the user deletes folder "simple-folder (2)" using the webUI
     And the user browses to the shared-with-me page using the webUI
     Then folder "simple-folder (2)" shared by "Alice Hansen" should be in "Declined" state on the webUI
     And folder "simple-folder" shared by "Brian Murphy" should not be listed in the webUI
@@ -60,8 +60,8 @@ Feature: accept/decline shares coming from internal users
     And user "Brian" has accepted the share "simple-folder" offered by user "Alice"
     And user "Brian" has accepted the share "testimage.jpg" offered by user "Alice"
     And the user has browsed to the files page
-    When the user unshares folder "simple-folder" using the webUI
-    And the user unshares file "testimage.jpg" using the webUI
+    When the user deletes folder "simple-folder" using the webUI
+    And the user deletes file "testimage.jpg" using the webUI
     Then folder "simple-folder" should not be listed on the webUI
     And file "testimage.jpg" should not be listed on the webUI
     When the user browses to the shared-with-me page using the webUI
@@ -134,7 +134,7 @@ Feature: accept/decline shares coming from internal users
     And user "Alice" has shared folder "simple-folder" with user "Brian" with "create, read, share, update" permissions
     And user "Brian" has renamed folder "simple-folder" to "simple-folder-renamed"
     And the user has reloaded the current page of the webUI
-    When the user unshares folder "simple-folder-renamed" using the webUI
+    When the user deletes folder "simple-folder-renamed" using the webUI
     Then folder "simple-folder-renamed" should not be listed on the webUI
     When the user browses to the shared-with-me page using the webUI
     Then folder "simple-folder-renamed" shared by "Alice Hansen" should be in "Declined" state on the webUI
@@ -149,7 +149,7 @@ Feature: accept/decline shares coming from internal users
     And user "Brian" has moved folder "/simple-folder (2)" to "/simple-folder/shared"
     And the user has reloaded the current page of the webUI
     When the user opens folder "simple-folder" using the webUI
-    And the user unshares folder "shared" using the webUI
+    And the user deletes folder "shared" using the webUI
     Then folder "shared" should not be listed on the webUI
     When the user browses to the shared-with-me page using the webUI
     Then folder "shared" shared by "Alice Hansen" should be in "Declined" state on the webUI
@@ -161,7 +161,7 @@ Feature: accept/decline shares coming from internal users
     And user "Alice" has shared folder "/simple-folder" with user "Brian"
     And user "Brian" has renamed folder "/simple-folder" to "/simple-folder-renamed"
     And the user has reloaded the current page of the webUI
-    When the user unshares folder "simple-folder-renamed" using the webUI
+    When the user deletes folder "simple-folder-renamed" using the webUI
     And the user browses to the shared-with-me page using the webUI
     And the user accepts share "simple-folder-renamed" offered by user "Alice Hansen" using the webUI
     Then folder "simple-folder-renamed" shared by "Alice Hansen" should be in "Accepted" state on the webUI
diff --git a/tests/acceptance/features/webUISharingExternal/federationSharing.feature b/tests/acceptance/features/webUISharingExternal/federationSharing.feature
index f8fa965d0ed..7a6532aaaa5 100644
--- a/tests/acceptance/features/webUISharingExternal/federationSharing.feature
+++ b/tests/acceptance/features/webUISharingExternal/federationSharing.feature
@@ -168,7 +168,7 @@ Feature: Federation Sharing - sharing with users on other cloud storages
     And user "Alice" from remote server has shared "lorem.txt" with user "Alice" from local server
     And user "Alice" from server "LOCAL" has accepted the last pending share
     And the user has reloaded the current page of the webUI
-    When the user unshares file "lorem.txt" using the webUI
+    When the user deletes file "lorem.txt" using the webUI
     Then file "lorem.txt" should not be listed on the webUI
     And file "lorem.txt" should not be listed in the files page on the webUI
 
diff --git a/tests/acceptance/features/webUISharingExternalToRoot/federationSharing.feature b/tests/acceptance/features/webUISharingExternalToRoot/federationSharing.feature
index ddf1b39f0b3..9476f14d5a9 100644
--- a/tests/acceptance/features/webUISharingExternalToRoot/federationSharing.feature
+++ b/tests/acceptance/features/webUISharingExternalToRoot/federationSharing.feature
@@ -169,7 +169,7 @@ Feature: Federation Sharing - sharing with users on other cloud storages
     And user "Alice" from server "REMOTE" has shared "/lorem.txt" with user "Alice" from remote server
     And user "Alice" from server "LOCAL" has accepted the last pending share
     And the user has reloaded the current page of the webUI
-    When the user unshares file "lorem.txt" using the webUI
+    When the user deletes file "lorem.txt" using the webUI
     Then file "lorem.txt" should not be listed on the webUI
     And file "lorem.txt" should not be listed in the files page on the webUI
 
diff --git a/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature b/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature
index b4941ddc0cf..43886596e05 100644
--- a/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature
+++ b/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature
@@ -89,7 +89,7 @@ Feature: Sharing files and folders with internal groups
     Then file "new-lorem.txt" should be listed on the webUI
     And as "Alice" the content of "/Shares/new-lorem.txt" should be the same as the local "new-lorem.txt"
     # unshare the received shared file
-    When the user unshares file "new-lorem.txt" using the webUI
+    When the user deletes file "new-lorem.txt" using the webUI
     Then file "new-lorem.txt" should not be listed on the webUI
     # check that another group member can still see the file
     And as "Brian" the content of "/Shares/new-lorem.txt" should be the same as the local "new-lorem.txt"
diff --git a/tests/acceptance/features/webUISharingInternalGroupsToRoot/shareWithGroups.feature b/tests/acceptance/features/webUISharingInternalGroupsToRoot/shareWithGroups.feature
index c8adae82220..a88fd82b400 100644
--- a/tests/acceptance/features/webUISharingInternalGroupsToRoot/shareWithGroups.feature
+++ b/tests/acceptance/features/webUISharingInternalGroupsToRoot/shareWithGroups.feature
@@ -82,7 +82,7 @@ Feature: Sharing files and folders with internal groups
     Then file "new-lorem.txt" should be listed on the webUI
     And as "Alice" the content of "new-lorem.txt" should be the same as the local "new-lorem.txt"
     # unshare the received shared file
-    When the user unshares file "new-lorem.txt" using the webUI
+    When the user deletes file "new-lorem.txt" using the webUI
     Then file "new-lorem.txt" should not be listed on the webUI
     # check that another group member can still see the file
     When the user re-logs in as "Brian" using the webUI
diff --git a/tests/acceptance/features/webUISharingInternalUsersShareWithPage/shareWithUsers.feature b/tests/acceptance/features/webUISharingInternalUsersShareWithPage/shareWithUsers.feature
index affe6f3cead..af57a50da9e 100644
--- a/tests/acceptance/features/webUISharingInternalUsersShareWithPage/shareWithUsers.feature
+++ b/tests/acceptance/features/webUISharingInternalUsersShareWithPage/shareWithUsers.feature
@@ -89,18 +89,18 @@ Feature: Shares in share-with pages
     Then file "collaborate-on-this.txt" should be listed on the webUI
 
   @issue-ocis-730
-  Scenario: deleting an entry on the shared-with-me page unshares from self
+  Scenario: unsharing an entry on the shared-with-me page unshares from self
     Given user "Alice" has created folder "simple-folder"
     And user "Alice" has shared folder "simple-folder" with user "Brian"
     And user "Brian" has accepted the share "simple-folder" offered by user "Alice"
     And user "Brian" has logged in using the webUI
     When the user browses to the shared-with-me page using the webUI
-    And the user deletes folder "simple-folder" using the webUI
+    And the user unshares folder "simple-folder" using the webUI
     And the user browses to the folder "Shares" on the files page
     Then folder "simple-folder" should not be listed on the webUI
 
-  @issue-ocis-730 @skipOnOC10 @issue-4582
-  Scenario: deleting multiple entries on the shared-with-me page
+  @issue-ocis-730 @issue-4582
+  Scenario: unsharing multiple entries on the shared-with-me page
     Given user "Alice" has created folder "simple-folder"
     And user "Alice" has created file "lorem.txt"
     And user "Alice" has shared folder "simple-folder" with user "Brian"
@@ -109,11 +109,11 @@ Feature: Shares in share-with pages
     And user "Brian" has accepted the share "lorem.txt" offered by user "Alice"
     And user "Brian" has logged in using the webUI
     And the user browses to the shared-with-me page using the webUI
-    When the user batch deletes these files using the webUI
+    When the user batch unshares these files using the webUI
       | name          |
       | simple-folder |
       | lorem.txt     |
-    Then the deleted elements should not be listed on the webUI
+    Then the unshared elements should be in declined state on the webUI
 
   @issue-3040 @issue-4113 @ocis-reva-issue-39
   Scenario: see resource owner of parent shares in "shared with others" and "favorites" list
diff --git a/tests/acceptance/features/webUISharingInternalUsersToRootShareWithPage/shareWithUsers.feature b/tests/acceptance/features/webUISharingInternalUsersToRootShareWithPage/shareWithUsers.feature
index 05638a4536a..d534ebc77f5 100644
--- a/tests/acceptance/features/webUISharingInternalUsersToRootShareWithPage/shareWithUsers.feature
+++ b/tests/acceptance/features/webUISharingInternalUsersToRootShareWithPage/shareWithUsers.feature
@@ -76,13 +76,14 @@ Feature: Shares in share-with pages
     Then file "collaborate-on-this.txt" should be listed on the webUI
 
 
-  Scenario: deleting an entry on the shared-with-me page unshares from self
+  Scenario: unsharing an entry on the shared-with-me page results in declined share
     Given user "Alice" has shared folder "simple-folder" with user "Brian"
     And user "Brian" has logged in using the webUI
     When the user browses to the shared-with-me page using the webUI
-    And the user deletes folder "simple-folder" using the webUI
-    And the user browses to the files page
-    Then folder "simple-folder" should not be listed on the webUI
+    And the user unshares folder "simple-folder" using the webUI
+    And the user closes the app-sidebar using the webUI
+    Then folder "simple-folder" shared by "Alice Hansen" should be in "Declined" state on the webUI
+    And as "Brian" folder "simple-folder" should not exist
 
   @issue-2898
   Scenario: see resource owner for direct shares in "shared with me"
@@ -118,4 +119,4 @@ Feature: Shares in share-with pages
       | name              |
       | simple-folder     |
       | lorem.txt         |
-    Then the deleted elements should not be listed on the webUI
\ No newline at end of file
+    Then the deleted elements should not be listed on the webUI
diff --git a/tests/acceptance/features/webUIWebdavLocks/locks.feature b/tests/acceptance/features/webUIWebdavLocks/locks.feature
index f591a1589c2..5066dca71f8 100644
--- a/tests/acceptance/features/webUIWebdavLocks/locks.feature
+++ b/tests/acceptance/features/webUIWebdavLocks/locks.feature
@@ -338,8 +338,8 @@ Feature: Locks
     And user "sharer" has shared file "lorem.txt" with user "brand-new-user"
     And user "sharer" has shared folder "simple-folder" with user "brand-new-user"
     And the user has browsed to the files page
-    When the user unshares file "lorem (2).txt" using the webUI
-    And the user unshares folder "simple-folder (2)" using the webUI
+    When the user deletes file "lorem (2).txt" using the webUI
+    And the user deletes folder "simple-folder (2)" using the webUI
     Then notifications should be displayed on the webUI with the text
       | The file "lorem (2).txt" is locked and cannot be deleted.     |
       | The file "simple-folder (2)" is locked and cannot be deleted. |
diff --git a/tests/acceptance/pageObjects/FilesPageElement/fileActionsMenu.js b/tests/acceptance/pageObjects/FilesPageElement/fileActionsMenu.js
index 7cffb3f6f5d..7734bf9f9d0 100644
--- a/tests/acceptance/pageObjects/FilesPageElement/fileActionsMenu.js
+++ b/tests/acceptance/pageObjects/FilesPageElement/fileActionsMenu.js
@@ -5,7 +5,9 @@ module.exports = {
      * @readonly
      */
     FileAction: Object.freeze({
+      acceptShare: 'acceptShare',
       download: 'download',
+      declineShare: 'declineShare',
       delete: 'delete',
       favorite: 'favorite',
       unmarkFavorite: 'unmarkFavorite',
@@ -138,6 +140,18 @@ module.exports = {
     copy: function() {
       return this.performFileAction(this.FileAction.copy)
     },
+    /**
+     * Trigger accepting a share
+     */
+    acceptShare: function() {
+      return this.performFileAction(this.FileAction.acceptShare)
+    },
+    /**
+     * Trigger declining a share
+     */
+    declineShare: function() {
+      return this.performFileAction(this.FileAction.declineShare)
+    },
     /**
      * Open a resource in the media viewer via its file action
      */
@@ -160,11 +174,11 @@ module.exports = {
       locateStrategy: 'xpath'
     },
     deleteButtonInAccordion: {
-      selector: '//button[normalize-space()="Delete"]',
+      selector: '//button[contains(@class, "oc-files-actions-sidebar-delete-trigger")]',
       locateStrategy: 'xpath'
     },
     downloadButtonInAccordion: {
-      selector: '//button[normalize-space()="Download"]',
+      selector: '//button[contains(@class, "oc-files-actions-sidebar-download-trigger")]',
       locateStrategy: 'xpath'
     },
     favoriteButtonInAccordion: {
@@ -176,11 +190,11 @@ module.exports = {
       locateStrategy: 'xpath'
     },
     restoreButtonInAccordion: {
-      selector: '//button[normalize-space()="Restore"]',
+      selector: '//button[contains(@class, "oc-files-actions-sidebar-restore-trigger")]',
       locateStrategy: 'xpath'
     },
     renameButtonInAccordion: {
-      selector: '//button[normalize-space()="Rename"]',
+      selector: '//button[contains(@class, "oc-files-actions-sidebar-rename-trigger")]',
       locateStrategy: 'xpath'
     },
     // TODO: Merge with selectors in personalPage
@@ -194,11 +208,19 @@ module.exports = {
       selector: '.oc-modal-body-input .oc-text-input'
     },
     moveButtonInAccordion: {
-      selector: '//button[normalize-space()="Move"]',
+      selector: '//button[contains(@class, "oc-files-actions-sidebar-move-trigger")]',
       locateStrategy: 'xpath'
     },
     copyButtonInAccordion: {
-      selector: '//button[normalize-space()="Copy"]',
+      selector: '//button[contains(@class, "oc-files-actions-sidebar-copy-trigger")]',
+      locateStrategy: 'xpath'
+    },
+    acceptShareButtonInAccordion: {
+      selector: '//button[contains(@class, "oc-files-actions-sidebar-accept-share-trigger")]',
+      locateStrategy: 'xpath'
+    },
+    declineShareButtonInAccordion: {
+      selector: '//button[contains(@class, "oc-files-actions-sidebar-decline-share-trigger")]',
       locateStrategy: 'xpath'
     },
     mediaViewerButtonInAccordion: {
diff --git a/tests/acceptance/pageObjects/FilesPageElement/filesList.js b/tests/acceptance/pageObjects/FilesPageElement/filesList.js
index 2630c6c8dcc..529d5bc2768 100644
--- a/tests/acceptance/pageObjects/FilesPageElement/filesList.js
+++ b/tests/acceptance/pageObjects/FilesPageElement/filesList.js
@@ -48,6 +48,24 @@ module.exports = {
       await filesRow.openFileActionsMenu(resource).delete()
       return this
     },
+    /**
+     * @param {string} resource
+     * @returns {Promise<exports.commands>}
+     */
+    acceptShare: async function(resource) {
+      await this.waitForFileVisible(resource)
+      await filesRow.openFileActionsMenu(resource).acceptShare()
+      return this
+    },
+    /**
+     * @param {string} resource
+     * @returns {Promise<exports.commands>}
+     */
+    declineShare: async function(resource) {
+      await this.waitForFileVisible(resource)
+      await filesRow.openFileActionsMenu(resource).declineShare()
+      return this
+    },
     /**
      * @param {string} fromName
      * @param {string} toName
diff --git a/tests/acceptance/pageObjects/sharedWithMePage.js b/tests/acceptance/pageObjects/sharedWithMePage.js
index fd306772929..8b50a2dd1ae 100644
--- a/tests/acceptance/pageObjects/sharedWithMePage.js
+++ b/tests/acceptance/pageObjects/sharedWithMePage.js
@@ -43,6 +43,41 @@ module.exports = {
         .useCss()
       return status
     },
+    /**
+     * Gets the displayed share status of a file by its name.
+     * Important: this function ignores the user who shared the file. The same file/foldername could
+     * be shared by different users. In that case you need to use the more precise `getShareStatusOfResource`
+     * instead.
+     *
+     * @param {string} filename
+     *
+     * @returns {Promise<string>}
+     */
+    getShareStatusOfResourceByName: async function(filename) {
+      let status
+      const requiredXpath =
+        this.api.page.FilesPageElement.filesList().getFileRowSelectorByFileName(filename) +
+        '/' +
+        this.elements.shareStatusOnFileRow.selector
+      await this.useXpath()
+        .waitForAnimationToFinish()
+        .api.getText(requiredXpath, result => {
+          if (result.status === 0) {
+            status = result.value === '' ? 'Accepted' : result.value
+          } else {
+            throw new Error(
+              `Expected: share status of the resource but found unexpected response: ${result.value.error}`
+            )
+          }
+        })
+        .useCss()
+      return status
+    },
+    batchDeclineShares: function() {
+      return this.waitForElementVisible('@batchDeclineSharesButton')
+        .click('@batchDeclineSharesButton')
+        .waitForAjaxCallsToStartAndFinish()
+    },
     /**
      * @param {string} filename
      * @param {string} action - It takes one of the following : Decline and Accept
@@ -98,6 +133,11 @@ module.exports = {
         shareFound = result.value.length > 0
       })
       return shareFound
+    },
+    unshareAllCheckedFiles: function() {
+      return this.waitForElementVisible('@batchDeclineSharesButton')
+        .click('@batchDeclineSharesButton')
+        .waitForAjaxCallsToStartAndFinish()
     }
   },
   elements: {
@@ -122,6 +162,9 @@ module.exports = {
       selector:
         '/ancestor::tr[contains(@class, "oc-tbody-tr")]//button[contains(@class,"file-row-share-status-action")][normalize-space(.)="%s"]',
       locateStrategy: 'xpath'
+    },
+    batchDeclineSharesButton: {
+      selector: '#decline-selected-shares-btn'
     }
   }
 }
diff --git a/tests/acceptance/stepDefinitions/filesContext.js b/tests/acceptance/stepDefinitions/filesContext.js
index 3f49f6540c9..7dafef2656d 100644
--- a/tests/acceptance/stepDefinitions/filesContext.js
+++ b/tests/acceptance/stepDefinitions/filesContext.js
@@ -10,13 +10,15 @@ const backendHelper = require('../helpers/backendHelper')
 const { move } = require('../helpers/webdavHelper')
 const path = require('../helpers/path')
 const util = require('util')
-let deletedElements
 const { download } = require('../helpers/webdavHelper')
 const fs = require('fs')
 const sharingHelper = require('../helpers/sharingHelper')
 
+let deletedElements
+let unsharedElements
 Before(() => {
   deletedElements = []
+  unsharedElements = []
 })
 
 When('the user browses to the files page', () => {
@@ -264,7 +266,7 @@ Then('the following files should be listed on the files-drop page:', async funct
 })
 
 When('the user unshares file/folder {string} using the webUI', function(element) {
-  return client.page.FilesPageElement.filesList().deleteFile(element)
+  return client.page.FilesPageElement.filesList().declineShare(element)
 })
 
 When('the user uploads folder {string} using the webUI', function(element) {
@@ -439,6 +441,18 @@ Then('folder {string} should not be listed on the webUI', folder => {
     })
 })
 
+Then('the unshared elements should be in declined state on the webUI', async function() {
+  for (const element of unsharedElements) {
+    const state = await client.page.sharedWithMePage().getShareStatusOfResourceByName(element)
+    assert.strictEqual(
+      state,
+      'Declined',
+      `Expected resource '${element}' to be in 'Declined' state but found '${state}'`
+    )
+  }
+  return client
+})
+
 Then('the deleted elements should not be listed on the webUI', function() {
   return assertDeletedElementsAreNotListed()
 })
@@ -504,6 +518,15 @@ When('the user/public batch deletes the marked files using the webUI', function(
   return client.page.personalPage().deleteAllCheckedFiles()
 })
 
+When('the user batch unshares these files using the webUI', async function(shares) {
+  for (const item of shares.rows()) {
+    await client.page.FilesPageElement.filesList().toggleFileOrFolderCheckbox('enable', item[0])
+    unsharedElements.push(item[0])
+  }
+
+  return client.page.sharedWithMePage().unshareAllCheckedFiles()
+})
+
 When('the user batch deletes these files using the webUI', async function(fileOrFolders) {
   for (const item of fileOrFolders.rows()) {
     await client.page.FilesPageElement.filesList().toggleFileOrFolderCheckbox('enable', item[0])