diff --git a/apps/files/src/components/Collaborators/AdditionalPermissions.vue b/apps/files/src/components/Collaborators/AdditionalPermissions.vue
index 9a656f9c113..5d63171adcc 100644
--- a/apps/files/src/components/Collaborators/AdditionalPermissions.vue
+++ b/apps/files/src/components/Collaborators/AdditionalPermissions.vue
@@ -1,8 +1,9 @@
 <template>
   <oc-grid gutter="small">
-    <label v-for="permission in permissions" :key="permission.name">
+    <label v-for="permission in permissions" :key="permission.name" class="files-collaborators-permission-label">
       <oc-checkbox
-        class="uk-margin-xsmall-right"
+        :id="`files-collaborators-permission-${permission.name}`"
+        class="uk-margin-xsmall-right files-collaborators-permission-checkbox"
         v-model="permission.value"
         @change="permissionChecked"
       />
diff --git a/apps/files/src/components/Collaborators/Collaborator.vue b/apps/files/src/components/Collaborators/Collaborator.vue
index 556e981cc34..8289f102a3b 100644
--- a/apps/files/src/components/Collaborators/Collaborator.vue
+++ b/apps/files/src/components/Collaborators/Collaborator.vue
@@ -1,5 +1,9 @@
 <template>
-  <oc-accordion-item class="files-collaborators-collaborator uk-margin-small-bottom" :class="{ 'oc-disabled uk-disabled' : collaboratorsEditInProgress && !editing }">
+  <oc-accordion-item
+    class="files-collaborators-collaborator uk-margin-small-bottom"
+    :class="{ 'oc-disabled uk-disabled' : collaboratorsEditInProgress && !editing }"
+    :key="collaborator.id"
+  >
     <template slot="title">
       <div v-if="user.id !== collaborator.info.uid_owner" class="uk-text-meta uk-flex uk-flex-middle uk-margin-small-bottom"><oc-icon name="repeat" class="uk-margin-small-right" /> {{ collaborator.info.displayname_owner }}</div>
       <div class="files-collaborators-collaborator-information uk-flex uk-flex-wrap uk-flex-middle">
@@ -26,7 +30,7 @@
     <template slot="content">
       <collaborators-edit-options
         :existingRole="collaborator.role"
-        :collaboratorsPermissions="collaborator.customPermissions"
+        :collaboratorsPermissions="collaboratorsPermissions"
         @optionChange="collaboratorOptionChanged"
         class="uk-margin-bottom"
       />
@@ -47,7 +51,8 @@
 <script>
 import { mapGetters, mapActions } from 'vuex'
 import Mixins from '../../mixins/collaborators'
-import { roleToBitmask } from '../../helpers/collaborators'
+import { roleToBitmask, bitmaskToRole } from '../../helpers/collaborators'
+import filterObject from 'filter-obj'
 
 const CollaboratorsEditOptions = () => import('./CollaboratorsEditOptions.vue')
 
@@ -88,6 +93,12 @@ export default {
       }
 
       return this.roles[this.collaborator.role.name]
+    },
+
+    collaboratorsPermissions () {
+      const permissions = this.collaborator.customPermissions
+
+      return filterObject(permissions, (key, value) => value)
     }
   },
   mounted () {
@@ -106,11 +117,24 @@ export default {
     },
     saveChanges (collaborator) {
       if (!this.selectedRole) this.selectedRole = this.roles[collaborator.role.name]
+      let permissions = this.additionalPermissions
+
+      if (!permissions) {
+        permissions = []
+        for (const permission in this.collaboratorsPermissions) {
+          permissions.push(permission)
+        }
+      }
+
+      const bitmask = roleToBitmask(this.selectedRole, permissions, this.highlightedFile.type === 'folder')
+
       this.changeShare({
         client: this.$client,
         share: collaborator,
-        role: this.selectedRole,
-        permissions: roleToBitmask(this.selectedRole, this.additionalPermissions, this.highlightedFile.type === 'folder')
+        // TODO: After changing to tabs view, this can be dropped
+        // Map bitmask to role to get the correct role in case the advanced role was mapped to existing role
+        role: bitmaskToRole(bitmask, this.highlightedFile.type === 'folder'),
+        permissions: bitmask
       })
         .then(() => {
           this.editing = false
diff --git a/apps/files/src/components/Collaborators/CollaboratorsEditOptions.vue b/apps/files/src/components/Collaborators/CollaboratorsEditOptions.vue
index fa761f4ee01..b15f91dde37 100644
--- a/apps/files/src/components/Collaborators/CollaboratorsEditOptions.vue
+++ b/apps/files/src/components/Collaborators/CollaboratorsEditOptions.vue
@@ -54,7 +54,7 @@ export default {
 
       if (
         (
-          this.existingRole && this.existingRole.name === 'advancedRole'
+          this.existingRole && this.existingRole.name === 'advancedRole' && !this.selectedRole
         ) || (
           this.selectedRole && this.selectedRole.name === 'advancedRole'
         )
diff --git a/apps/files/src/helpers/collaborators.js b/apps/files/src/helpers/collaborators.js
index 3228910ab3c..e9b03906821 100644
--- a/apps/files/src/helpers/collaborators.js
+++ b/apps/files/src/helpers/collaborators.js
@@ -27,7 +27,9 @@ export function roleToBitmask (role, additionalPermissions = []) {
 
   if (additionalPermissions) {
     for (const additionalPermission of additionalPermissions) {
-      bitmask |= permissionsBitmask[additionalPermission]
+      if (role.additionalPermissions[additionalPermission]) {
+        bitmask |= permissionsBitmask[additionalPermission]
+      }
     }
   }
 
@@ -64,7 +66,7 @@ export function bitmaskToRole (bitmask, isFolder) {
       rolePermissionsBitmask |= permissionsBitmask[additionalPermissions[additionalPermission].name]
     }
 
-    // TODO: Use bitmask
+    // TODO: Use bitmask to cover cases of more then one additional permission
     if (
       rolePermissionsBitmask === bitmask ||
       roleBasicPermissionsBitmask === bitmask
diff --git a/apps/files/src/store/actions.js b/apps/files/src/store/actions.js
index 8e919001add..8ad037ddf61 100644
--- a/apps/files/src/store/actions.js
+++ b/apps/files/src/store/actions.js
@@ -1,5 +1,5 @@
 import moment from 'moment'
-import { bitmaskToRole } from '../helpers/collaborators'
+import { bitmaskToRole, permissionsBitmask } from '../helpers/collaborators'
 
 function _buildFile (file) {
   let ext = ''
@@ -223,10 +223,10 @@ function _buildShare (s, file) {
       share.displayName = s.share_with_displayname
       // TODO: Refactor to work with roles / prepare for roles API
       share.customPermissions = {
-        update: s.permissions === '3' || s.permissions === '15' || s.permissions === '19' || s.permissions === '31',
-        create: s.permissions === '5' || s.permissions === '15' || s.permissions === '21' || s.permissions === '31',
-        delete: s.permissions === '9' || s.permissions === '15' || s.permissions === '25' || s.permissions === '31',
-        share: s.permissions === '17' || s.permissions === '19' || s.permissions === '21' || s.permissions === '25' || s.permissions === '31'
+        update: s.permissions & permissionsBitmask.update,
+        create: s.permissions & permissionsBitmask.create,
+        delete: s.permissions & permissionsBitmask.delete,
+        share: s.permissions & permissionsBitmask.share
       }
       // share.email = 'foo@djungle.com' // hm, where do we get the mail from? share_with_additional_info:Object?
       break
diff --git a/tests/acceptance/features/webUIFiles/deleteFilesFolders.feature b/tests/acceptance/features/webUIFiles/deleteFilesFolders.feature
index e27ef3ee29e..90830c831c5 100644
--- a/tests/acceptance/features/webUIFiles/deleteFilesFolders.feature
+++ b/tests/acceptance/features/webUIFiles/deleteFilesFolders.feature
@@ -140,7 +140,7 @@ Feature: deleting files and folders
     Then file "lorem.txt" should not be listed on the webUI
 
   Scenario: delete a file on a public share
-    Given user "user1" has shared folder "simple-folder" with link with "read, change, create, delete" permissions
+    Given user "user1" has shared folder "simple-folder" with link with "read, update, create, delete" permissions
     When the public uses the webUI to access the last public link created by user "user1"
     And the user deletes the following elements using the webUI
       | name                                  |
@@ -161,7 +161,7 @@ Feature: deleting files and folders
       |                          | "double" quotes |
       |                          | question?       |
       |                          | &and#hash       |
-    And user "user1" has shared folder "simple-folder" with link with "read, change, create, delete" permissions
+    And user "user1" has shared folder "simple-folder" with link with "read, update, create, delete" permissions
     When the public uses the webUI to access the last public link created by user "user1"
     And the user deletes the following file using the webUI
       | name-parts      |
@@ -185,7 +185,7 @@ Feature: deleting files and folders
 
   @skip @yetToImplement
   Scenario: Delete multiple files at once on a public share
-    Given user "user1" has shared folder "simple-folder" with link with "read, change, create, delete" permissions
+    Given user "user1" has shared folder "simple-folder" with link with "read, update, create, delete" permissions
     When the public uses the webUI to access the last public link created by user "user1"
     And the user batch deletes these files using the webUI
       | name                |
diff --git a/tests/acceptance/features/webUIResharing/reshareUsers.feature b/tests/acceptance/features/webUIResharing/reshareUsers.feature
index 07acfd94fbe..ad24ea80a74 100644
--- a/tests/acceptance/features/webUIResharing/reshareUsers.feature
+++ b/tests/acceptance/features/webUIResharing/reshareUsers.feature
@@ -46,12 +46,12 @@ Feature: Resharing shared files with different permissions
     | item_type   | folder             |
     | permissions | <permissions>      |
     Examples:
-    | role        | displayed-role | collaborators-permissions     | displayed-permissions | permissions                         |
-    | Viewer      | Viewer         | share                         | share                 | read, share                         |
-    | Editor      | Editor         | share                         | share                 | all                                 |
-    | Custom Role | Custom role    | share, create                 | share, create         | read, share, create                 |
-    | Custom Role | Editor         | change, share                 | share                 | read, change, share                 |
-    | Custom Role | Editor         | delete, share, create, change | share                 | read, share, delete, change, create |
+    | role                 | displayed-role          | collaborators-permissions     | displayed-permissions | permissions                         |
+    | Viewer               | Viewer                  | share                         | share                 | read, share                         |
+    | Editor               | Editor                  | share                         | share                 | all                                 |
+    | Advanced permissions | Advanced permissions    | share, create                 | share, create         | read, share, create                 |
+    | Advanced permissions | Editor                  | update, share                 | share                 | read, update, share                 |
+    | Advanced permissions | Editor                  | delete, share, create, update | share                 | read, share, delete, update, create |
 
   Scenario Outline: share a received folder with another user with same permissions(including share permissions) and check if the user is displayed in collaborators list for original owner
     Given user "user2" has shared folder "simple-folder" with user "user1" with "<permissions>" permissions
@@ -77,12 +77,12 @@ Feature: Resharing shared files with different permissions
     | item_type   | folder             |
     | permissions | <permissions>      |
     Examples:
-    | role        | displayed-role | collaborators-permissions     | displayed-permissions | permissions                         |
-    | Viewer      | Viewer         | share                         | share                 | read, share                         |
-    | Editor      | Editor         | share                         | share                 | all                                 |
-    | Custom Role | Custom role    | share, create                 | share, create         | read, share, create                 |
-    | Custom Role | Editor         | change, share                 | share                 | read, change, share                 |
-    | Custom Role | Editor         | delete, share, create, change | share                 | read, share, delete, change, create |
+    | role                 | displayed-role          | collaborators-permissions     | displayed-permissions | permissions                         |
+    | Viewer               | Viewer                  | share                         | share                 | read, share                         |
+    | Editor               | Editor                  | share                         | share                 | all                                 |
+    | Advanced permissions | Advanced permissions    | share, create                 | share, create         | read, share, create                 |
+    | Advanced permissions | Editor                  | update, share                 | share                 | read, update, share                 |
+    | Advanced permissions | Editor                  | delete, share, create, update | share                 | read, share, delete, update, create |
 
   Scenario: share a folder with another user with share permissions and reshare without share permissions to different user, and check if user is displayed for original sharer
     Given user "user2" has shared folder "simple-folder" with user "user1" with "read, share" permissions
@@ -144,7 +144,7 @@ Feature: Resharing shared files with different permissions
   Scenario: User is allowed to reshare a file/folder with the equivalent received permissions, and collaborators should not be listed for the receiver
     Given user "user2" has shared folder "simple-folder" with user "user1" with "read, share, delete" permissions
     And user "user1" has logged in using the webUI
-    When the user shares folder "simple-folder (2)" with user "User Three" as "Custom role" with permissions "share, delete" using the webUI
+    When the user shares folder "simple-folder (2)" with user "User Three" as "Advanced permissions" with permissions "share, delete" using the webUI
     And the user re-logs in as "user3" using the webUI
     Then the collaborators list for folder "simple-folder (2)" should be empty
     And user "user3" should have received a share with these details:
@@ -158,11 +158,11 @@ Feature: Resharing shared files with different permissions
   Scenario: User is allowed to reshare a file/folder with the lesser permissions, and check if it is listed for original owner
     Given user "user2" has shared folder "simple-folder" with user "user1" with "read, share, delete" permissions
     And user "user1" has logged in using the webUI
-    When the user shares folder "simple-folder (2)" with user "User Three" as "Custom role" with permissions "delete" using the webUI
+    When the user shares folder "simple-folder (2)" with user "User Three" as "Advanced permissions" with permissions "delete" using the webUI
     And the user re-logs in as "user2" using the webUI
-    Then user "User One" should be listed as "Custom role" in the collaborators list for folder "simple-folder" on the webUI
+    Then user "User One" should be listed as "Advanced permissions" in the collaborators list for folder "simple-folder" on the webUI
     And custom permissions "share, delete" should be set for user "User One" for folder "simple-folder" on the webUI
-    And user "User Three" should be listed as "Custom role" in the collaborators list for folder "simple-folder" on the webUI
+    And user "User Three" should be listed as "Advanced permissions" in the collaborators list for folder "simple-folder" on the webUI
     And custom permissions "delete" should be set for user "User Three" for folder "simple-folder" on the webUI
     And user "user3" should have received a share with these details:
     | field       | value              |
@@ -175,7 +175,7 @@ Feature: Resharing shared files with different permissions
   Scenario: User is not allowed to reshare a file/folder with the higher permissions
     Given user "user2" has shared folder "simple-folder" with user "user1" with "read, share, delete" permissions
     And user "user1" has logged in using the webUI
-    When the user shares folder "simple-folder (2)" with user "User Three" as "Custom role" with permissions "share, delete, change" using the webUI
+    When the user shares folder "simple-folder (2)" with user "User Three" as "Advanced permissions" with permissions "share, delete, update" using the webUI
     Then the error message "Error while sharing." should be displayed on the webUI
     And as "user3" folder "simple-folder (2)" should not exist
 
diff --git a/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature b/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature
index 27bb4cce262..88f83133c12 100644
--- a/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature
+++ b/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature
@@ -49,10 +49,10 @@ Feature: Sharing files and folders with internal groups
     Then folder "simple-folder (2)" should be marked as shared by "User Three" on the webUI
     And file "testimage (2).jpg" should be marked as shared by "User Three" on the webUI
     Examples:
-      | set-role    | expected-role | permissions-folder         | permissions-file |
-      | Viewer      | Viewer        | read                       | read             |
-      | Editor      | Editor        | read,change,create, delete | read,change      |
-      | Custom Role | Viewer        | read                       | read             |
+      | set-role             | expected-role | permissions-folder         | permissions-file |
+      | Viewer               | Viewer        | read                       | read             |
+      | Editor               | Editor        | read,update,create, delete | read,update      |
+      | Advanced permissions | Viewer        | read                       | read             |
 
   Scenario: share a file with an internal group a member overwrites and unshares the file
     Given user "user3" has logged in using the webUI
diff --git a/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature b/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature
index 5b3365d962b..e9d47120c43 100644
--- a/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature
+++ b/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature
@@ -45,10 +45,10 @@ Feature: Sharing files and folders with internal users
     #    And folder "simple-folder (2)" should be marked as shared by "User Two" on the webUI
     #    And file "testimage (2).jpg" should be marked as shared by "User Two" on the webUI
     Examples:
-      | set-role    | expected-role | permissions-folder        | permissions-file |
-      | Viewer      | Viewer        | read                      | read             |
-      | Editor      | Editor        | read,change,create,delete | read,change      |
-      | Custom Role | Viewer        | read                      | read             |
+      | set-role             | expected-role | permissions-folder        | permissions-file |
+      | Viewer               | Viewer        | read                      | read             |
+      | Editor               | Editor        | read,update,create,delete | read,update      |
+      | Advanced permissions | Viewer        | read                      | read             |
 
   Scenario Outline: change the collaborators of a file & folder
     Given user "user2" has logged in using the webUI
@@ -66,11 +66,11 @@ Feature: Sharing files and folders with internal users
       | item_type   | folder                 |
       | permissions | <expected-permissions> |
     Examples:
-      | initial-permissions | set-role    | expected-role | expected-permissions      |
-      | read,change,create  | Viewer      | Viewer        | read                      |
-      | read                | Editor      | Editor        | read,change,create,delete |
-      | read                | Custom role | Viewer        | read                      |
-      | all                 | Custom role | Editor        | all                       |
+      | initial-permissions | set-role             | expected-role | expected-permissions      |
+      | read,update,create  | Viewer               | Viewer        | read                      |
+      | read                | Editor               | Editor        | read,update,create,delete |
+      | read                | Advanced permissions | Viewer        | read                      |
+      | all                 | Advanced permissions | Editor        | all                       |
 
   Scenario: share a file with another internal user who overwrites and unshares the file
     Given user "user2" has logged in using the webUI
diff --git a/tests/acceptance/features/webUISharingPermissionMultipleUsers/shareWithMultipleUsers.feature b/tests/acceptance/features/webUISharingPermissionMultipleUsers/shareWithMultipleUsers.feature
index 30df180f9be..2ba348f0bb3 100644
--- a/tests/acceptance/features/webUISharingPermissionMultipleUsers/shareWithMultipleUsers.feature
+++ b/tests/acceptance/features/webUISharingPermissionMultipleUsers/shareWithMultipleUsers.feature
@@ -50,32 +50,30 @@ Feature: Sharing files and folders with multiple internal users with different p
     And user "User Four" should not be listed in the collaborators list on the webUI
     And as "user4" folder "simple-folder (2)" should not exist
     Examples:
-      | role        | displayed-role | extra-permissions             | displayed-permissions | actual-permissions           |
-      | Viewer      | Viewer         | share                         | share                 | read, share                  |
-      | Viewer      | Viewer         | ,                             | ,                     | read                         |
-      | Editor      | Editor         | share                         | share                 | all                          |
-      | Editor      | Editor         | ,                             | ,                     | read, change, delete, create |
-      | Custom Role | Viewer         | ,                             | ,                     | read                         |
-      | Custom Role | Viewer         | share                         | share                 | read, share                  |
-      | Custom Role | Custom role    | delete                        | delete                | read, delete                 |
-      # issue-1897: Displayed role below should have been 'Custom role'
-      | Custom Role | Editor         | change                        | ,                     | read, change                 |
-      | Custom Role | Custom role    | create                        | create                | read, create                 |
-      | Custom Role | Custom role    | share, delete                 | share, delete         | read, share, delete          |
-      # issue-1897: Displayed role below should have been 'Custom role'
-      | Custom Role | Editor         | share, change                 | share                 | read, change, share          |
-      | Custom Role | Custom role    | share, create                 | share, create         | read, share, create          |
-      | Custom Role | Custom role    | delete, change                | delete, change        | read, delete, change         |
-      | Custom Role | Custom role    | delete, create                | delete, create        | read, delete, create         |
-      | Custom Role | Custom role    | change, create                | change, create        | read, change, create         |
-      # issue-1837: Displayed Permissions below should have been 'share, delete, change'
-      | Custom Role | Custom role    | share, delete, change         | ,                     | read, share, delete, change  |
+      | role                 | displayed-role          | extra-permissions             | displayed-permissions | actual-permissions           |
+      | Viewer               | Viewer                  | share                         | share                 | read, share                  |
+      | Viewer               | Viewer                  | ,                             | ,                     | read                         |
+      | Editor               | Editor                  | share                         | share                 | all                          |
+      | Editor               | Editor                  | ,                             | ,                     | read, update, delete, create |
+      | Advanced permissions | Viewer                  | ,                             | ,                     | read                         |
+      | Advanced permissions | Viewer                  | share                         | share                 | read, share                  |
+      | Advanced permissions | Advanced role           | delete                        | delete                | read, delete                 |
+      | Advanced permissions | Advanced permissions    | update                        | ,                     | read, update                 |
+      | Advanced permissions | Advanced permissions    | create                        | create                | read, create                 |
+      | Advanced permissions | Advanced permissions    | share, delete                 | share, delete         | read, share, delete          |
+      | Advanced permissions | Advanced permissions    | share, update                 | share                 | read, update, share          |
+      | Advanced permissions | Advanced permissions    | share, create                 | share, create         | read, share, create          |
+      | Advanced permissions | Advanced permissions    | delete, update                | delete, update        | read, delete, update         |
+      | Advanced permissions | Advanced permissions    | delete, create                | delete, create        | read, delete, create         |
+      | Advanced permissions | Advanced permissions    | update, create                | update, create        | read, update, create         |
+      # issue-1837: Displayed Permissions below should have been 'share, delete, update'
+      | Advanced permissions | Advanced permissions    | share, delete, update         | ,                     | read, share, delete, update  |
       # issue-1837: Displayed Permissions below should have been 'share, create, delete'.
-      | Custom Role | Custom role    | share, create, delete         | ,                     | read, share, delete, create  |
-      # issue-1837: Displayed Permissions below should have been 'share, change, create'.
-      | Custom Role | Custom role    | share, change, create         | ,                     | read, share, change, create  |
-      | Custom Role | Editor         | delete, change, create        | ,                     | read, delete, change, create |
-      | Custom Role | Editor         | share, delete, change, create | share                 | all                          |
+      | Advanced permissions | Advanced permissions    | share, create, delete         | ,                     | read, share, delete, create  |
+      # issue-1837: Displayed Permissions below should have been 'share, update, create'.
+      | Advanced permissions | Advanced permissions    | share, update, create         | ,                     | read, share, update, create  |
+      | Advanced permissions | Editor                  | delete, update, create        | ,                     | read, delete, update, create |
+      | Advanced permissions | Editor                  | share, delete, update, create | share                 | all                          |
 
   Scenario Outline: share a file with multiple users with different roles and permissions
     Given these users have been created with default attributes:
@@ -117,12 +115,12 @@ Feature: Sharing files and folders with multiple internal users with different p
     And user "User Four" should not be listed in the collaborators list on the webUI
     And as "user4" file "lorem(2).txt" should not exist
     Examples:
-      | role        | displayed-role | extra-permissions | displayed-permissions | actual-permissions  |
-      | Viewer      | Viewer         | share             | share                 | read, share         |
-      | Viewer      | Viewer         | ,                 | ,                     | read                |
-      | Editor      | Editor         | share             | share                 | share, read, change |
-      | Editor      | Editor         | ,                 | ,                     | read, change        |
-      | Custom Role | Viewer         | ,                 | ,                     | read                |
-      | Custom Role | Viewer         | share             | share                 | read, share         |
-      | Custom Role | Editor         | change            | ,                     | read, change        |
-      | Custom Role | Editor         | share, change     | share                 | read, change, share |
+      | role                 | displayed-role | extra-permissions | displayed-permissions | actual-permissions  |
+      | Viewer               | Viewer         | share             | share                 | read, share         |
+      | Viewer               | Viewer         | ,                 | ,                     | read                |
+      | Editor               | Editor         | share             | share                 | share, read, update |
+      | Editor               | Editor         | ,                 | ,                     | read, update        |
+      | Advanced permissions | Viewer         | ,                 | ,                     | read                |
+      | Advanced permissions | Viewer         | share             | share                 | read, share         |
+      | Advanced permissions | Editor         | update            | ,                     | read, update        |
+      | Advanced permissions | Editor         | share, update     | share                 | read, update, share |
diff --git a/tests/acceptance/features/webUISharingPermissionsGroups/sharePermissionsGroup.feature b/tests/acceptance/features/webUISharingPermissionsGroups/sharePermissionsGroup.feature
index 393956f41f1..48c52b18ee9 100644
--- a/tests/acceptance/features/webUISharingPermissionsGroups/sharePermissionsGroup.feature
+++ b/tests/acceptance/features/webUISharingPermissionsGroups/sharePermissionsGroup.feature
@@ -50,15 +50,15 @@ Feature: Sharing files and folders with internal groups with permissions
     And group "grp1" should not be listed in the collaborators list on the webUI
     And as "user1" file "lorem (2).txt" should not exist
     Examples:
-    | role        | displayed-role | extra-permissions | displayed-permissions | actual-permissions  |
-    | Viewer      | Viewer         | share             | share                 | read, share         |
-    | Viewer      | Viewer         | ,                 | ,                     | read                |
-    | Editor      | Editor         | share             | share                 | share, read, change |
-    | Editor      | Editor         | ,                 | ,                     | read, change        |
-    | Custom Role | Viewer         | ,                 | ,                     | read                |
-    | Custom Role | Viewer         | share             | share                 | read, share         |
-    | Custom Role | Editor         | change            | ,                     | read, change        |
-    | Custom Role | Editor         | share, change     | share                 | read, change, share |
+    | role                 | displayed-role | extra-permissions | displayed-permissions | actual-permissions  |
+    | Viewer               | Viewer         | share             | share                 | read, share         |
+    | Viewer               | Viewer         | ,                 | ,                     | read                |
+    | Editor               | Editor         | share             | share                 | share, read, update |
+    | Editor               | Editor         | ,                 | ,                     | read, update        |
+    | Advanced permissions | Viewer         | ,                 | ,                     | read                |
+    | Advanced permissions | Viewer         | share             | share                 | read, share         |
+    | Advanced permissions | Editor         | update            | ,                     | read, update        |
+    | Advanced permissions | Editor         | share, update     | share                 | read, update, share |
 
   @issue-1837 @issue-1897
   Scenario Outline: share a folder with multiple users with different roles and permissions
@@ -96,29 +96,27 @@ Feature: Sharing files and folders with internal groups with permissions
     And group "grp1" should not be listed in the collaborators list on the webUI
     And as "user1" folder "simple-folder (2)" should not exist
     Examples:
-    | role        | displayed-role | extra-permissions             | displayed-permissions | actual-permissions           |
-    | Viewer      | Viewer         | share                         | share                 | read, share                  |
-    | Viewer      | Viewer         | ,                             | ,                     | read                         |
-    | Editor      | Editor         | share                         | share                 | all                          |
-    | Editor      | Editor         | ,                             | ,                     | read, change, delete, create |
-    | Custom Role | Viewer         | ,                             | ,                     | read                         |
-    | Custom Role | Viewer         | share                         | share                 | read, share                  |
-    | Custom Role | Custom role    | delete                        | delete                | read, delete                 |
-          # issue-1897: Displayed role below should have been 'Custom role'
-    | Custom Role | Editor         | change                        | ,                     | read, change                 |
-    | Custom Role | Custom role    | create                        | create                | read, create                 |
-    | Custom Role | Custom role    | share, delete                 | share, delete         | read, share, delete          |
-          # issue-1897: Displayed role below should have been 'Custom role'
-    | Custom Role | Editor         | share, change                 | share                 | read, change, share          |
-    | Custom Role | Custom role    | share, create                 | share, create         | read, share, create          |
-    | Custom Role | Custom role    | delete, change                | delete, change        | read, delete, change         |
-    | Custom Role | Custom role    | delete, create                | delete, create        | read, delete, create         |
-    | Custom Role | Custom role    | change, create                | change, create        | read, change, create         |
-          # issue-1837: Displayed Permissions below should have been 'share, delete, change'
-    | Custom Role | Custom role    | share, delete, change         | ,                     | read, share, delete, change  |
+    | role                 | displayed-role          | extra-permissions             | displayed-permissions | actual-permissions           |
+    | Viewer               | Viewer                  | share                         | share                 | read, share                  |
+    | Viewer               | Viewer                  | ,                             | ,                     | read                         |
+    | Editor               | Editor                  | share                         | share                 | all                          |
+    | Editor               | Editor                  | ,                             | ,                     | read, update, delete, create |
+    | Advanced permissions | Viewer                  | ,                             | ,                     | read                         |
+    | Advanced permissions | Viewer                  | share                         | share                 | read, share                  |
+    | Advanced permissions | Advanced permissions    | delete                        | delete                | read, delete                 |
+    | Advanced permissions | Advanced permissions    | update                        | ,                     | read, update                 |
+    | Advanced permissions | Advanced permissions    | create                        | create                | read, create                 |
+    | Advanced permissions | Advanced permissions    | share, delete                 | share, delete         | read, share, delete          |
+    | Advanced permissions | Advanced permissions    | share, update                 | share                 | read, update, share          |
+    | Advanced permissions | Advanced permissions    | share, create                 | share, create         | read, share, create          |
+    | Advanced permissions | Advanced permissions    | delete, update                | delete, update        | read, delete, update         |
+    | Advanced permissions | Advanced permissions    | delete, create                | delete, create        | read, delete, create         |
+    | Advanced permissions | Advanced permissions    | update, create                | update, create        | read, update, create         |
+          # issue-1837: Displayed Permissions below should have been 'share, delete, update'
+    | Advanced permissions | Advanced permissions    | share, delete, update         | ,                     | read, share, delete, update  |
           # issue-1837: Displayed Permissions below should have been 'share, create, delete'.
-    | Custom Role | Custom role    | share, create, delete         | ,                     | read, share, delete, create  |
-          # issue-1837: Displayed Permissions below should have been 'share, change, create'.
-    | Custom Role | Custom role    | share, change, create         | ,                     | read, share, change, create  |
-    | Custom Role | Editor         | delete, change, create        | ,                     | read, delete, change, create |
-    | Custom Role | Editor         | share, delete, change, create | share                 | all                          |
+    | Advanced permissions | Advanced permissions    | share, create, delete         | ,                     | read, share, delete, create  |
+          # issue-1837: Displayed Permissions below should have been 'share, update, create'.
+    | Advanced permissions | Advanced permissions    | share, update, create         | ,                     | read, share, update, create  |
+    | Advanced permissions | Editor                  | delete, update, create        | ,                     | read, delete, update, create |
+    | Advanced permissions | Editor                  | share, delete, update, create | share                 | all                          |
diff --git a/tests/acceptance/features/webUISharingPermissionsUsers/sharePermissionsUsers.feature b/tests/acceptance/features/webUISharingPermissionsUsers/sharePermissionsUsers.feature
index f859603e9e6..e6fe22af589 100644
--- a/tests/acceptance/features/webUISharingPermissionsUsers/sharePermissionsUsers.feature
+++ b/tests/acceptance/features/webUISharingPermissionsUsers/sharePermissionsUsers.feature
@@ -23,15 +23,13 @@ Feature: Sharing files and folders with internal users with different permission
       | item_type   | folder             |
       | permissions | read, share        |
 
-  @issue-1853 @issue-1837
+  @issue-1853
   Scenario: Change permissions of the previously shared folder
     Given user "user2" has shared folder "simple-folder" with user "user1" with "read, share, create, delete" permissions
     And user "user2" has logged in using the webUI
-    Then no custom permissions should be set for collaborator "User One" for folder "simple-folder" on the webUI
-    #    Then custom permissions "share, create, delete" should be set for user "User One" for folder "simple-folder" on the webUI
+    Then custom permissions "share, create, delete" should be set for user "User One" for folder "simple-folder" on the webUI
     When the user sets custom permission for current role of collaborator "User One" for folder "simple-folder" to "create, delete, share" using the webUI
-    Then no custom permissions should be set for collaborator "User One" for folder "simple-folder" on the webUI
-    #    Then custom permission "share, create, delete" should be set for user "User One" for folder "simple-folder" on the webUI
+    Then custom permission "share, create, delete" should be set for user "User One" for folder "simple-folder" on the webUI
     And user "user1" should have received a share with these details:
       | field       | value                       |
       | uid_owner   | user2                       |
@@ -40,21 +38,20 @@ Feature: Sharing files and folders with internal users with different permission
       | item_type   | folder                      |
       | permissions | read, share, create, delete |
 
-  @issue-1853 @issue-1837
+  @issue-1853
   Scenario: Change permissions of the previously shared folder
     Given user "user2" has shared folder "simple-folder" with user "user1" with "read, share, create" permissions
     And user "user2" has logged in using the webUI
     Then custom permissions "share, create" should be set for user "User One" for folder "simple-folder" on the webUI
-    When the user sets custom permission for current role of collaborator "User One" for folder "simple-folder" to "delete, change" using the webUI
-    Then no custom permissions should be set for collaborator "User One" for folder "simple-folder" on the webUI
-    #    Then custom permission "delete, change" should be set for user "User One" for folder "simple-folder" on the webUI
+    When the user sets custom permission for current role of collaborator "User One" for folder "simple-folder" to "delete, update" using the webUI
+    Then custom permission "delete, update" should be set for user "User One" for folder "simple-folder" on the webUI
     And user "user1" should have received a share with these details:
       | field       | value                |
       | uid_owner   | user2                |
       | share_with  | user1                |
       | file_target | /simple-folder (2)   |
       | item_type   | folder               |
-      | permissions | read, change, delete |
+      | permissions | read, update, delete |
 
   Scenario: Change permissions of the previously shared folder
     Given user "user2" has shared folder "simple-folder" with user "user1" with "read, delete" permissions
@@ -83,12 +80,12 @@ Feature: Sharing files and folders with internal users with different permission
       | item_type   | folder             |
       | permissions | <permissions>      |
     Examples:
-      | role        | displayed-role | extra-permissions             | displayed-permissions | permissions                         |
-      | Viewer      | Viewer         | share                         | share                 | read, share                         |
-      | Editor      | Editor         | share                         | share                 | all                                 |
-      | Custom Role | Custom role    | share, create                 | share, create         | read, share, create                 |
-      | Custom Role | Editor         | change, share                 | share                 | read, change, share                 |
-      | Custom Role | Editor         | delete, share, create, change | share                 | read, share, delete, change, create |
+      | role                 | displayed-role          | extra-permissions             | displayed-permissions | permissions                         |
+      | Viewer               | Viewer                  | share                         | share                 | read, share                         |
+      | Editor               | Editor                  | share                         | share                 | all                                 |
+      | Advanced permissions | Advanced permissions    | share, create                 | share, create         | read, share, create                 |
+      | Advanced permissions | Advanced permissions    | update, share                 | share                 | read, update, share                 |
+      | Advanced permissions | Editor                  | delete, share, create, update | share                 | read, share, delete, update, create |
 
   Scenario Outline: Change permissions of the previously shared file
     Given user "user2" has shared file "lorem.txt" with user "user1" with "<initial-permissions>" permissions
@@ -105,7 +102,7 @@ Feature: Sharing files and folders with internal users with different permission
       | permissions | <permissions>  |
     Examples:
       | initial-permissions | permissions         |
-      | read, change        | read, share, change |
+      | read, update        | read, share, update |
       | read                | read, share         |
 
   Scenario: Delete all custom permissions of the previously shared file
@@ -135,10 +132,10 @@ Feature: Sharing files and folders with internal users with different permission
       | item_type   | file           |
       | permissions | <permissions>  |
     Examples:
-      | role        | displayed-role | collaborators-permissions | displayed-permissions | permissions         |
-      | Viewer      | Viewer         | share                     | share                 | read, share         |
-      | Editor      | Editor         | share                     | share                 | read, share, change |
-      | Custom Role | Editor         | share, change             | share                 | read, share, change |
+      | role                 | displayed-role | collaborators-permissions | displayed-permissions | permissions         |
+      | Viewer               | Viewer         | share                     | share                 | read, share         |
+      | Editor               | Editor         | share                     | share                 | read, share, update |
+      | Advanced permissions | Editor         | share, update             | share                 | read, share, update |
 
   Scenario: Share a folder without share permissions using API and check if it is listed on the collaborators list for original owner
     Given user "user2" has shared folder "simple-folder" with user "user1" with "read" permissions
@@ -152,32 +149,32 @@ Feature: Sharing files and folders with internal users with different permission
     And user "user2" has shared folder "simple-folder" with user "user1" with "read, share, delete" permissions
     And user "user1" has shared folder "simple-folder (2)" with user "user3" with "read, delete" permissions
     And user "user2" has logged in using the webUI
-    When the user sets custom permission for current role of collaborator "User Three" for folder "simple-folder" to "delete, change" using the webUI
-    Then custom permissions "delete, change" should be set for user "User Three" for folder "simple-folder" on the webUI
+    When the user sets custom permission for current role of collaborator "User Three" for folder "simple-folder" to "delete, update" using the webUI
+    Then custom permissions "delete, update" should be set for user "User Three" for folder "simple-folder" on the webUI
     And user "user3" should have received a share with these details:
       | field       | value                |
       | uid_owner   | user1                |
       | share_with  | user3                |
       | file_target | /simple-folder (2)   |
       | item_type   | folder               |
-      | permissions | delete, read, change |
+      | permissions | delete, read, update |
 
   Scenario: User is not allowed to reshare sub-folder with more permissions
     Given user "user3" has been created with default attributes
     And user "user2" has shared folder "simple-folder" with user "user1" with "read, share, delete" permissions
     And user "user1" has logged in using the webUI
     When the user browses to the folder "simple-folder (2)" on the files page
-    And the user shares folder "simple-empty-folder" with user "User Three" as "Custom role" with permissions "share, delete, change" using the webUI
+    And the user shares folder "simple-empty-folder" with user "User Three" as "Advanced permissions" with permissions "share, delete, update" using the webUI
     Then the error message "Error while sharing." should be displayed on the webUI
     And as "user3" folder "simple-empty-folder (2)" should not exist
 
   Scenario: User is not allowed to update permissions of a reshared sub-folder to higher permissions than what user has received
     Given user "user3" has been created with default attributes
-    And user "user2" has shared folder "simple-folder" with user "user1" with "read, share, delete, change" permissions
+    And user "user2" has shared folder "simple-folder" with user "user1" with "read, share, delete, update" permissions
     And user "user1" has shared folder "simple-folder (2)" with user "user3" with "share, delete" permissions
     And user "user1" has logged in using the webUI
     When the user browses to the folder "simple-folder (2)" on the files page
-    And the user shares folder "simple-empty-folder" with user "User Three" as "Custom role" with permissions "share, delete, change, create" using the webUI
+    And the user shares folder "simple-empty-folder" with user "User Three" as "Advanced permissions" with permissions "share, delete, update, create" using the webUI
     Then the error message "Error while sharing." should be displayed on the webUI
     And as "user3" folder "simple-empty-folder (2)" should not exist
 
@@ -187,7 +184,7 @@ Feature: Sharing files and folders with internal users with different permission
     And user "user1" has shared folder "simple-folder (2)" with user "user3" with "share, delete" permissions
     And user "user1" has logged in using the webUI
     When the user browses to the folder "simple-folder (2)" on the files page
-    And the user shares folder "simple-empty-folder" with user "User Three" as "Custom role" with permissions "share, delete, create, change" using the webUI
+    And the user shares folder "simple-empty-folder" with user "User Three" as "Advanced permissions" with permissions "share, delete, create, update" using the webUI
     Then user "user3" should have received a share with these details:
       | field       | value                    |
       | uid_owner   | user1                    |
diff --git a/tests/acceptance/features/webUISharingPublic/shareByPublicLink.feature b/tests/acceptance/features/webUISharingPublic/shareByPublicLink.feature
index 2e7b2111a58..3d6c772d589 100644
--- a/tests/acceptance/features/webUISharingPublic/shareByPublicLink.feature
+++ b/tests/acceptance/features/webUISharingPublic/shareByPublicLink.feature
@@ -48,7 +48,7 @@ Feature: Share by public link
     Examples:
       | role        | permissions                  |
       | Viewer      | read                         |
-      | Editor      | read, change, create, delete |
+      | Editor      | read, update, create, delete |
       | Contributor | read, create                 |
 
   Scenario: sharing by public link with "Uploader" role
@@ -74,7 +74,7 @@ Feature: Share by public link
     But file "data.zip" should not be listed on the webUI
 
   Scenario: creating a public link with "Editor" role makes it possible to delete files via the link
-    Given user "user1" has shared folder "simple-folder" with link with "read, change, create, delete" permissions
+    Given user "user1" has shared folder "simple-folder" with link with "read, update, create, delete" permissions
     When the public uses the webUI to access the last public link created by user "user1"
     And the user deletes the following elements using the webUI
       | name                                  |
@@ -86,7 +86,7 @@ Feature: Share by public link
     And the deleted elements should not be listed on the webUI after a page reload
 
   Scenario: creating a public link with "Editor" role makes it possible to delete files via the link even with password set
-    Given user "user1" has shared folder "simple-folder" with link with "read, change, create, delete" permissions and password "pass123"
+    Given user "user1" has shared folder "simple-folder" with link with "read, update, create, delete" permissions and password "pass123"
     When the public uses the webUI to access the last public link created by user "user1" with password "pass123"
     And the user deletes the following elements using the webUI
       | name                                  |
@@ -102,14 +102,14 @@ Feature: Share by public link
     Then it should not be possible to delete file "lorem.txt" using the webUI
 
   Scenario: creating a public link with "Editor" role makes it possible to upload a file
-    Given user "user1" has shared folder "simple-folder" with link with "read, change, create, delete" permissions
+    Given user "user1" has shared folder "simple-folder" with link with "read, update, create, delete" permissions
     When the public uses the webUI to access the last public link created by user "user1"
     And the user uploads file "new-lorem.txt" using the webUI
     Then file "new-lorem.txt" should be listed on the webUI
     And as "user1" file "simple-folder/new-lorem.txt" should exist
 
   Scenario: creating a public link with "Editor" role makes it possible to upload a file inside a subdirectory with password set
-    Given user "user1" has shared folder "simple-folder" with link with "read, change, create, delete" permissions and password "pass123"
+    Given user "user1" has shared folder "simple-folder" with link with "read, update, create, delete" permissions and password "pass123"
     When the public uses the webUI to access the last public link created by user "user1" with password "pass123"
     And the user opens folder "simple-empty-folder" using the webUI
     And the user uploads file "new-lorem.txt" using the webUI
@@ -117,7 +117,7 @@ Feature: Share by public link
     And as "user1" file "simple-folder/simple-empty-folder/new-lorem.txt" should exist
 
   Scenario: creating a public link with "Editor" role makes it possible to upload a folder
-    Given user "user1" has shared folder "simple-folder" with link with "read, change, create, delete" permissions
+    Given user "user1" has shared folder "simple-folder" with link with "read, update, create, delete" permissions
     When the public uses the webUI to access the last public link created by user "user1"
     And the user uploads folder "PARENT" using the webUI
     Then folder "PARENT" should be listed on the webUI
@@ -126,7 +126,7 @@ Feature: Share by public link
     And as "user1" file "simple-folder/PARENT/CHILD/child.txt" should exist
 
   Scenario: creating a public link with "Editor" role makes it possible to upload a folder inside a subdirectory
-    Given user "user1" has shared folder "simple-folder" with link with "read, change, create, delete" permissions
+    Given user "user1" has shared folder "simple-folder" with link with "read, update, create, delete" permissions
     When the public uses the webUI to access the last public link created by user "user1"
     And the user opens folder "simple-empty-folder" using the webUI
     And the user uploads folder "PARENT" using the webUI
@@ -136,14 +136,14 @@ Feature: Share by public link
     And as "user1" file "simple-folder/simple-empty-folder/PARENT/CHILD/child.txt" should exist
 
   Scenario: creating a public link with "Editor" role makes it possible to upload files via the link even with password set
-    Given user "user1" has shared folder "simple-folder" with link with "read, change, create, delete" permissions and password "pass123"
+    Given user "user1" has shared folder "simple-folder" with link with "read, update, create, delete" permissions and password "pass123"
     When the public uses the webUI to access the last public link created by user "user1" with password "pass123"
     And the user uploads file "new-lorem.txt" using the webUI
     Then file "new-lorem.txt" should be listed on the webUI
     And as "user1" file "simple-folder/new-lorem.txt" should exist
 
   Scenario: creating a public link with "Editor" role makes it possible to upload files inside a subdirectory
-    Given user "user1" has shared folder "simple-folder" with link with "read, change, create, delete" permissions
+    Given user "user1" has shared folder "simple-folder" with link with "read, update, create, delete" permissions
     When the public uses the webUI to access the last public link created by user "user1"
     And the user uploads folder "PARENT" using the webUI
     Then folder "PARENT" should be listed on the webUI
@@ -152,7 +152,7 @@ Feature: Share by public link
     And as "user1" file "simple-folder/PARENT/CHILD/child.txt" should exist
 
   Scenario: creating a public link with "Editor" role makes it possible to upload a folder even with password set
-    Given user "user1" has shared folder "simple-folder" with link with "read, change, create, delete" permissions and password "pass123"
+    Given user "user1" has shared folder "simple-folder" with link with "read, update, create, delete" permissions and password "pass123"
     When the public uses the webUI to access the last public link created by user "user1" with password "pass123"
     And the user uploads folder "PARENT" using the webUI
     Then folder "PARENT" should be listed on the webUI
@@ -161,7 +161,7 @@ Feature: Share by public link
     And as "user1" file "simple-folder/PARENT/CHILD/child.txt" should exist
 
   Scenario: creating a public link with "Editor" role makes it possible to upload a folder inside a sub-directory even with password set
-    Given user "user1" has shared folder "simple-folder" with link with "read, change, create, delete" permissions and password "pass123"
+    Given user "user1" has shared folder "simple-folder" with link with "read, update, create, delete" permissions and password "pass123"
     When the public uses the webUI to access the last public link created by user "user1" with password "pass123"
     And the user opens folder "simple-empty-folder" using the webUI
     And the user uploads folder "PARENT" using the webUI
@@ -285,7 +285,7 @@ Feature: Share by public link
     And the content of "lorem.txt" on the remote server should be the same as the local "lorem.txt"
 
   Scenario: public should be able to access a public link with correct password
-    Given user "user1" has shared folder "simple-folder" with link with "read, change, create, delete" permissions and password "pass123"
+    Given user "user1" has shared folder "simple-folder" with link with "read, update, create, delete" permissions and password "pass123"
     When the public uses the webUI to access the last public link created by user "user1" with password "pass123"
     Then file "lorem.txt" should be listed on the webUI
 
diff --git a/tests/acceptance/helpers/sharingHelper.js b/tests/acceptance/helpers/sharingHelper.js
index c5496a54f9a..dd15688dcc8 100644
--- a/tests/acceptance/helpers/sharingHelper.js
+++ b/tests/acceptance/helpers/sharingHelper.js
@@ -12,7 +12,7 @@ module.exports = {
   }),
   PERMISSION_TYPES: Object.freeze({
     read: 1,
-    change: 2,
+    update: 2,
     create: 4,
     delete: 8,
     share: 16,
diff --git a/tests/acceptance/pageObjects/FilesPageElement/filesList.js b/tests/acceptance/pageObjects/FilesPageElement/filesList.js
index f23bd6cb593..6a5f8968043 100644
--- a/tests/acceptance/pageObjects/FilesPageElement/filesList.js
+++ b/tests/acceptance/pageObjects/FilesPageElement/filesList.js
@@ -658,6 +658,9 @@ module.exports = {
     versionsElement: {
       selector: '//div//a[normalize-space(.)="Versions"]',
       locateStrategy: 'xpath'
+    },
+    collaboratorsList: {
+      selector: '.files-collaborators-lists'
     }
   }
 }
diff --git a/tests/acceptance/pageObjects/FilesPageElement/sharingDialog.js b/tests/acceptance/pageObjects/FilesPageElement/sharingDialog.js
index 9974e398109..9e4ab66d194 100644
--- a/tests/acceptance/pageObjects/FilesPageElement/sharingDialog.js
+++ b/tests/acceptance/pageObjects/FilesPageElement/sharingDialog.js
@@ -3,7 +3,7 @@ const userSharePostfix = '\nUser'
 const util = require('util')
 const _ = require('lodash')
 
-const collaboratorPermissionArray = ['share', 'change', 'create', 'delete']
+const collaboratorPermissionArray = ['share', 'update', 'create', 'delete']
 
 module.exports = {
   commands: {
@@ -19,8 +19,8 @@ module.exports = {
      *
      * @param {string} permission
      */
-    getPermissionSwitchXpath: function (permission) {
-      return util.format(this.elements.permissionButton.selector, permission)
+    getPermissionCheckbox: function (permission) {
+      return util.format(this.elements.permissionCheckbox.selector, permission)
     },
 
     assertSharingNotAllowed: function () {
@@ -125,10 +125,10 @@ module.exports = {
     selectPermissionsOnPendingShare: async function (permissions) {
       const permissionArray = this.getArrayFromPermissionString(permissions)
       for (const permission of permissionArray) {
-        const permissionSwitchXpath = this.getPermissionSwitchXpath(permission)
-        const elementID = await this.getVisibleElementID('xpath', permissionSwitchXpath)
+        const permissionCheckbox = this.getPermissionCheckbox(permission)
+        const elementID = await this.getVisibleElementID('xpath', permissionCheckbox)
         if (elementID === null) {
-          throw new Error('Button is not visible for permission:', permission)
+          throw new Error('Checkbox is not visible for permission:', permission)
         }
         await this.api.elementIdClick(elementID)
       }
@@ -197,8 +197,8 @@ module.exports = {
      * @param {string} permission
      */
     toggleSinglePermission: async function (permission) {
-      const permissionXpath = this.getPermissionSwitchXpath(permission)
-      const elementID = await this.getVisibleElementID('xpath', permissionXpath)
+      const permissionCheckbox = this.getPermissionCheckbox(permission)
+      const elementID = await this.getVisibleElementID('xpath', permissionCheckbox)
       if (!elementID) {
         throw new Error(`permission ${permission} is not visible `)
       }
@@ -217,23 +217,23 @@ module.exports = {
     getSharePermissions: async function (collaborator) {
       const permissions = {}
       let collaboratorElementXpath
-      let permissionToggle
+      let permissionCheckbox
       for (let i = 0; i < collaboratorPermissionArray.length; i++) {
         collaboratorElementXpath = util.format(
           this.elements.collaboratorInformationByCollaboratorName.selector,
           collaborator
         )
-        permissionToggle = collaboratorElementXpath + util.format(
-          this.elements.permissionButton.selector,
+        permissionCheckbox = collaboratorElementXpath + util.format(
+          this.elements.permissionCheckbox.selector,
           collaboratorPermissionArray[i]
         )
 
-        await this.api.element('xpath', permissionToggle, result => {
+        await this.api.element('xpath', permissionCheckbox, result => {
           if (!result.value.ELEMENT) {
             return
           }
-          return this.api.elementIdAttribute(result.value.ELEMENT, 'data-state', result => {
-            permissions[collaboratorPermissionArray[i]] = result.value === 'on'
+          return this.api.elementIdSelected(result.value.ELEMENT, result => {
+            permissions[collaboratorPermissionArray[i]] = result.value
           })
         })
       }
@@ -267,17 +267,32 @@ module.exports = {
     /**
      * asserts that the permission is set to "off" or not displayed at all
      *
-     * @param {string} permissionXpath
+     * @param {string} permissionCheckbox
      */
-    assertPermissionDataStateIsOff: function (permissionXpath) {
-      return this.api.isVisible(permissionXpath, result => {
+    assertPermissionDataStateIsOff: async function (permissionCheckbox) {
+      // TODO: Improve performance. Permissions which are not displayed are slowing this function down
+      return this.isVisible(permissionCheckbox, result => {
         if (result.value === true) {
+          // TODO: Find if this causes some side effects or if there's a better solution
+          // eslint-disable-next-line no-unused-expressions
           this
-            .assert
-            .attributeEquals(permissionXpath, 'data-state', 'off', `data-state of xpath ${permissionXpath} is set `)
+            .expect
+            .element(permissionCheckbox)
+            .to.not.be.selected
         }
       })
     },
+    /**
+     * asserts that the permission is set to "on" or not displayed at all
+     *
+     * @param {string} permissionCheckbox
+     */
+    assertPermissionDataStateIsOn: function (permissionCheckbox) {
+      return this
+        .expect
+        .element(permissionCheckbox)
+        .to.be.selected
+    },
     /**
      *
      * @param {string} collaborator
@@ -291,22 +306,22 @@ module.exports = {
       this.expandInformationSelector(collaborator)
 
       for (let i = 0; i < collaboratorPermissionArray.length; i++) {
-        const permissionXpath = this.getPermissionSwitchXpath(collaboratorPermissionArray[i])
+        const permissionCheckbox = this.getPermissionCheckbox(collaboratorPermissionArray[i])
         if (permissions !== undefined) {
           // check all the required permissions are set
           if (requiredPermissionArray.includes(collaboratorPermissionArray[i])) {
-            await this
-              .assert
-              .attributeEquals(permissionXpath, 'data-state', 'on', `data-state of xpath ${permissionXpath} is not set`)
+            await this.assertPermissionDataStateIsOn(permissionCheckbox)
           } else {
             // check unexpected permissions are not set
-            return this.assertPermissionDataStateIsOff(permissionXpath)
+            await this.assertPermissionDataStateIsOff(permissionCheckbox)
           }
         } else {
           // check all the permissions are not set
-          return this.assertPermissionDataStateIsOff(permissionXpath)
+          await this.assertPermissionDataStateIsOff(permissionCheckbox)
         }
       }
+
+      return this
     },
     /**
      *
@@ -517,8 +532,8 @@ module.exports = {
     newCollaboratorRemoveButton: {
       selector: "//span[contains(@class, 'oc-icon-danger')]"
     },
-    newCollaboratorRoleCustomRole: {
-      selector: '#files-collaborator-new-collaborator-role-custom'
+    newCollaboratorRoleAdvancedPermissions: {
+      selector: '#files-collaborator-new-collaborator-role-advancedRole'
     },
     selectRoleButtonInCollaboratorInformation: {
       selector: '//button[contains(@class, "files-collaborators-role-button")]',
@@ -533,12 +548,13 @@ module.exports = {
       selector: '//ul[contains(@class,"oc-autocomplete-suggestion-list")]//span[translate(.,"ABCDEFGHJIKLMNOPQRSTUVWXYZ","abcdefghjiklmnopqrstuvwxyz") ="%s"]',
       locateStrategy: 'xpath'
     },
-    permissionButton: {
-      selector: '//span[.="Can %s"]/parent::div/div',
+    permissionCheckbox: {
+      selector: '//input[@id="files-collaborators-permission-%s"]',
       locateStrategy: 'xpath'
     },
-    permissionButtons: {
-      selector: '//span[contains(., "Can")]/parent::div/div[contains(@class, "oc-switch")]'
+    permissionCheckboxes: {
+      selector: '//input[contains(@class, "files-collaborators-permission-checkbox")]',
+      locateStrategy: 'xpath'
     }
   }
 }