diff --git a/tests/acceptance/pageObjects/FilesPageElement/filesList.js b/tests/acceptance/pageObjects/FilesPageElement/filesList.js
index 4144ba6bfb8..0efc9bf6f38 100644
--- a/tests/acceptance/pageObjects/FilesPageElement/filesList.js
+++ b/tests/acceptance/pageObjects/FilesPageElement/filesList.js
@@ -274,10 +274,8 @@ module.exports = {
     restoreSelected: function () {
       return this.waitForElementVisible('@restoreSelectedButton')
         .initAjaxCounters()
-        .useXpath()
         .click('@restoreSelectedButton')
         .waitForOutstandingAjaxCalls()
-        .useCss()
     },
 
     /**
@@ -709,8 +707,7 @@ module.exports = {
       locateStrategy: 'xpath'
     },
     restoreSelectedButton: {
-      selector: '//span[contains(text(),"Restore")]',
-      locateStrategy: 'xpath'
+      selector: '.oc-files-actions-restore-trigger'
     },
     collaboratorsList: {
       selector: '.files-collaborators-lists'
diff --git a/tests/acceptance/pageObjects/personalPage.js b/tests/acceptance/pageObjects/personalPage.js
index acfd6cb78b3..116dcc69040 100644
--- a/tests/acceptance/pageObjects/personalPage.js
+++ b/tests/acceptance/pageObjects/personalPage.js
@@ -321,7 +321,7 @@ module.exports = {
       selector: '#new-file-menu-btn:enabled'
     },
     deleteSelectedButton: {
-      selector: '#delete-selected-btn'
+      selector: '.oc-files-actions-delete-trigger'
     },
     newResourceDropdown: {
       selector: '#new-file-menu-drop'
@@ -341,9 +341,6 @@ module.exports = {
     newFileInput: {
       selector: '#new-file-input'
     },
-    newFolderOkButton: {
-      selector: '#new-folder-ok'
-    },
     breadcrumb: {
       selector: '#files-breadcrumb li:nth-of-type(2)'
     },
@@ -393,10 +390,10 @@ module.exports = {
       selector: '.oc-modal-body-input .oc-text-input'
     },
     moveSelectedBtn: {
-      selector: '#move-selected-btn'
+      selector: '.oc-files-actions-move-trigger'
     },
     copySelectedBtn: {
-      selector: '#copy-selected-btn'
+      selector: '.oc-files-actions-copy-trigger'
     },
     editorCloseBtn: {
       selector: '#markdown-editor-app-bar .uk-text-right .oc-button'
diff --git a/tests/acceptance/pageObjects/sharedWithMePage.js b/tests/acceptance/pageObjects/sharedWithMePage.js
index d37c3b00cb2..1e3593939b5 100644
--- a/tests/acceptance/pageObjects/sharedWithMePage.js
+++ b/tests/acceptance/pageObjects/sharedWithMePage.js
@@ -159,7 +159,7 @@ module.exports = {
       locateStrategy: 'xpath'
     },
     batchDeclineSharesButton: {
-      selector: '#decline-selected-shares-btn'
+      selector: '.oc-files-actions-decline-share-trigger'
     }
   }
 }
diff --git a/tests/acceptance/pageObjects/trashbinPage.js b/tests/acceptance/pageObjects/trashbinPage.js
index e9803898b05..bfdb1c443f6 100644
--- a/tests/acceptance/pageObjects/trashbinPage.js
+++ b/tests/acceptance/pageObjects/trashbinPage.js
@@ -23,7 +23,7 @@ module.exports = {
   },
   elements: {
     clearTrashbin: {
-      selector: '#delete-selected-btn'
+      selector: '.oc-files-actions-empty-trash-bin-trigger'
     }
   }
 }