diff --git a/apps/files/src/components/AllFilesList.vue b/apps/files/src/components/AllFilesList.vue
index edb86a430a4..8468cec1ea5 100644
--- a/apps/files/src/components/AllFilesList.vue
+++ b/apps/files/src/components/AllFilesList.vue
@@ -8,14 +8,6 @@
     :is-action-enabled="isActionEnabled"
   >
     <template #headerColumns>
-      <div v-if="!publicPage()">
-        <span class="oc-visually-hidden" v-text="favoritesHeaderText" />
-        <oc-star
-          id="files-table-header-star"
-          aria-hidden="true"
-          class="uk-display-block uk-disabled"
-        />
-      </div>
       <div ref="headerNameColumn" class="uk-text-truncate uk-text-meta uk-width-expand">
         <sortable-column-header
           :aria-label="$gettext('Sort files by name')"
@@ -60,13 +52,6 @@
       </div>
     </template>
     <template #rowColumns="{ item: rowItem, index }">
-      <div v-if="!publicPage()">
-        <oc-star
-          class="uk-display-block"
-          :shining="rowItem.starred"
-          @click.native.stop="toggleFileFavorite(rowItem)"
-        />
-      </div>
       <div
         :ref="index === 0 ? 'firstRowNameColumn' : null"
         class="uk-text-truncate uk-width-expand"
@@ -341,12 +326,6 @@ export default {
           })
         })
     },
-    toggleFileFavorite(item) {
-      this.markFavorite({
-        client: this.$client,
-        file: item
-      })
-    },
 
     isActionEnabled(item, action) {
       return action.isEnabled(item, this.parentFolder)
diff --git a/apps/files/src/components/FileDetails.vue b/apps/files/src/components/FileDetails.vue
index c1ed8c3dcb9..2f8c5698db1 100644
--- a/apps/files/src/components/FileDetails.vue
+++ b/apps/files/src/components/FileDetails.vue
@@ -19,7 +19,13 @@
           />
         </div>
         <div v-if="$route.name !== 'files-shared-with-others'">
-          <oc-star v-if="!publicPage()" class="uk-inline" :shining="highlightedFile.starred" />
+          <oc-star
+            v-if="!publicPage()"
+            id="files-sidebar-star-icon"
+            class="uk-inline"
+            :shining="highlightedFile.starred"
+            @click.native.stop="toggleFileFavorite(highlightedFile)"
+          />
           <template v-if="highlightedFile.size > -1">
             {{ highlightedFile.size | fileSize }},
           </template>
@@ -96,13 +102,19 @@ export default {
     this.activeTab = this.defaultTab
   },
   methods: {
-    ...mapActions('Files', ['deleteFiles']),
+    ...mapActions('Files', ['deleteFiles', 'markFavorite']),
     ...mapActions(['showMessage']),
     close() {
       this.$emit('reset')
     },
     showSidebar(app) {
       this.activeTab = app
+    },
+    toggleFileFavorite(file) {
+      this.markFavorite({
+        client: this.$client,
+        file: file
+      })
     }
   }
 }
diff --git a/apps/files/src/components/FileList.vue b/apps/files/src/components/FileList.vue
index 728f516c360..afe48e0cbca 100644
--- a/apps/files/src/components/FileList.vue
+++ b/apps/files/src/components/FileList.vue
@@ -185,7 +185,6 @@ export default {
   methods: {
     ...mapActions('Files', [
       'loadFolder',
-      'markFavorite',
       'setHighlightedFile',
       'setPublicLinkPassword',
       'resetFileSelection',
@@ -201,12 +200,6 @@ export default {
         true
       )
     },
-    toggleFileFavorite(item) {
-      this.markFavorite({
-        client: this.$client,
-        file: item
-      })
-    },
     $_ocFileName(item) {
       if (this.$route.name === 'files-favorites') {
         const pathSplit = item.path.substr(1).split('/')
diff --git a/apps/files/src/components/FilesLists/RowActionsDropdown.vue b/apps/files/src/components/FilesLists/RowActionsDropdown.vue
index e1cec20fd13..12e3c6198ff 100644
--- a/apps/files/src/components/FilesLists/RowActionsDropdown.vue
+++ b/apps/files/src/components/FilesLists/RowActionsDropdown.vue
@@ -9,17 +9,17 @@
     class="uk-open uk-drop-stack"
   >
     <ul class="uk-list">
-      <li v-for="action in actions" :key="action.ariaLabel">
+      <li v-for="action in actions" :key="action.ariaLabel(item)">
         <oc-button
           class="uk-width-1-1"
           :icon="action.icon"
-          :aria-label="action.ariaLabel"
+          :aria-Label="action.ariaLabel(item)"
           @click.native.stop="
             action.handler(item, action.handlerData)
             actionClicked()
           "
         >
-          {{ action.ariaLabel }}
+          {{ action.ariaLabel(item) }}
         </oc-button>
       </li>
     </ul>
diff --git a/apps/files/src/components/Trashbin.vue b/apps/files/src/components/Trashbin.vue
index 85a488746ac..f17eee2328d 100644
--- a/apps/files/src/components/Trashbin.vue
+++ b/apps/files/src/components/Trashbin.vue
@@ -130,13 +130,13 @@ export default {
       return [
         {
           icon: 'restore',
-          ariaLabel: this.$gettext('Restore'),
+          ariaLabel: () => this.$gettext('Restore'),
           handler: this.$_ocTrashbin_restoreFile,
           isEnabled: () => true
         },
         {
           icon: 'delete',
-          ariaLabel: this.$gettext('Delete'),
+          ariaLabel: () => this.$gettext('Delete'),
           handler: this.$_ocTrashbin_deleteFile,
           isEnabled: () => true
         }
diff --git a/apps/files/src/fileactions.js b/apps/files/src/fileactions.js
index fc21ca3fe2a..0a922bbb679 100644
--- a/apps/files/src/fileactions.js
+++ b/apps/files/src/fileactions.js
@@ -14,14 +14,16 @@ export default {
       'selectedFiles',
       'highlightedFile'
     ]),
-    ...mapGetters(['capabilities', 'fileSideBars']),
+    ...mapGetters(['capabilities', 'fileSideBars', 'isAuthenticated']),
     // Files lists
     actions() {
       const actions = [
         {
           icon: 'edit',
-          ariaLabel: this.$gettext('Rename'),
           handler: this.promptFileRename,
+          ariaLabel: () => {
+            return this.$gettext('Rename')
+          },
           isEnabled: function(item, parent) {
             if (parent && !parent.canRename()) {
               return false
@@ -32,21 +34,38 @@ export default {
         {
           icon: 'file_download',
           handler: this.downloadFile,
-          ariaLabel: this.$gettext('Download'),
+          ariaLabel: () => {
+            return this.$gettext('Download')
+          },
           isEnabled: function(item) {
             return item.canDownload()
           }
         },
         {
           icon: 'delete',
-          ariaLabel: this.$gettext('Delete'),
           handler: this.deleteFile,
+          ariaLabel: () => {
+            return this.$gettext('Delete')
+          },
           isEnabled: function(item, parent) {
             if (parent && !parent.canBeDeleted()) {
               return false
             }
             return item.canBeDeleted()
           }
+        },
+        {
+          icon: 'star',
+          handler: this.toggleFileFavorite,
+          ariaLabel: item => {
+            if (item.starred) {
+              return this.$gettext('Unmark as favorite')
+            }
+            return this.$gettext('Mark as favorite')
+          },
+          isEnabled: () => {
+            return this.isAuthenticated
+          }
         }
       ]
       // FIXME: we are assuming this.fileSideBars and others are available on object
@@ -57,7 +76,9 @@ export default {
         if (sideBar.quickAccess) {
           actions.push({
             icon: sideBar.quickAccess.icon,
-            ariaLabel: sideBar.quickAccess.ariaLabel,
+            ariaLabel: item => {
+              return sideBar.quickAccess.ariaLabel
+            },
             handler: this.openSideBar,
             handlerData: sideBar.app,
             isEnabled: function(item) {
@@ -77,7 +98,8 @@ export default {
       'closePromptFileRename',
       'deleteFiles',
       'promptFileDelete',
-      'closePromptFileDelete'
+      'closePromptFileDelete',
+      'markFavorite'
     ]),
     ...mapActions(['showMessage']),
 
@@ -131,7 +153,19 @@ export default {
           this.closePromptFileRename()
         })
     },
-
+    toggleFileFavorite(file) {
+      this.markFavorite({
+        client: this.$client,
+        file: file
+      }).catch(() => {
+        const translated = this.$gettext('Error while starring "%{file}"')
+        const title = this.$gettextInterpolate(translated, { file: file.name }, true)
+        this.showMessage({
+          title: title,
+          status: 'danger'
+        })
+      })
+    },
     cancelDeleteFile() {
       this.closePromptFileDelete()
     },
diff --git a/changelog/unreleased/3336 b/changelog/unreleased/3336
new file mode 100644
index 00000000000..c394bc356f5
--- /dev/null
+++ b/changelog/unreleased/3336
@@ -0,0 +1,8 @@
+Change: Removed favorite button from file list and added it in the sidebar
+
+We've removed the favorite star button in the file list and added instead a functionality 
+to the before non-working star button in the file's sidebar. We also added a new action in 
+the file action dropdown menu which allows you to toggle the favorite status of your file.
+
+https://github.com/owncloud/phoenix/issues/1987
+https://github.com/owncloud/phoenix/pull/3336
diff --git a/tests/acceptance/features/webUIFavorites/favoritesFile.feature b/tests/acceptance/features/webUIFavorites/favoritesFile.feature
index 2e6fdefcfbc..37524e5dbb5 100644
--- a/tests/acceptance/features/webUIFavorites/favoritesFile.feature
+++ b/tests/acceptance/features/webUIFavorites/favoritesFile.feature
@@ -14,33 +14,34 @@ Feature: Mark file as favorite
   Scenario: mark files as favorites
     When the user marks file "data.tar.gz" as favorite using the webUI
     And the user marks file "data.zip" as favorite using the webUI
-    Then file "data.tar.gz" should be marked as favorite on the webUI
-    And file "data.zip" should be marked as favorite on the webUI
-    When the user reloads the current page of the webUI
-    Then file "data.tar.gz" should be marked as favorite on the webUI
+    Then file "data.tar.gz" should be marked as favorite
+    And file "data.tar.gz" should be marked as favorite on the webUI
+    And file "data.zip" should be marked as favorite
     And file "data.zip" should be marked as favorite on the webUI
     When the user browses to the favorites page
     Then there should be 2 files/folders listed on the webUI
     And file "data.zip" should be listed on the webUI
-    And file "data.zip" should be marked as favorite on the webUI
     And file "data.tar.gz" should be listed on the webUI
-    And file "data.tar.gz" should be marked as favorite on the webUI
-    And file "lorem.txt" should not be listed on the webUI
 
   Scenario: mark folders as favorites
     When the user marks folder "simple-folder" as favorite using the webUI
     And the user marks folder "strängé नेपाली folder" as favorite using the webUI
-    Then folder "simple-folder" should be marked as favorite on the webUI
-    And folder "strängé नेपाली folder" should be marked as favorite on the webUI
-    When the user reloads the current page of the webUI
-    Then folder "simple-folder" should be marked as favorite on the webUI
+    Then folder "simple-folder" should be marked as favorite
+    And folder "simple-folder" should be marked as favorite on the webUI
+    And folder "strängé नेपाली folder" should be marked as favorite
     And folder "strängé नेपाली folder" should be marked as favorite on the webUI
     When the user browses to the favorites page
-    Then folder "simple-folder" should be listed on the webUI
-    And folder "simple-folder" should be marked as favorite on the webUI
+    Then there should be 2 files/folders listed on the webUI
+    And folder "simple-folder" should be listed on the webUI
     And folder "strängé नेपाली folder" should be listed on the webUI
-    And folder "strängé नेपाली folder" should be marked as favorite on the webUI
-    But folder "simple-folder-empty" should not be listed on the webUI
+
+  Scenario: mark files/folders as favorites using the sidebar
+    When the user marks folder "simple-folder" as favorite using the webUI sidebar
+    And the user marks file "data.zip" as favorite using the webUI sidebar
+    Then folder "simple-folder" should be marked as favorite on the webUI
+    And folder "simple-folder" should be marked as favorite
+    And file "data.zip" should be marked as favorite on the webUI
+    And file "data.zip" should be marked as favorite
 
   Scenario: navigate to an empty favorites page
     When the user browses to the favorites page
diff --git a/tests/acceptance/features/webUIFavorites/unfavoriteFile.feature b/tests/acceptance/features/webUIFavorites/unfavoriteFile.feature
index 7eea3127eb7..17da2fc8f02 100644
--- a/tests/acceptance/features/webUIFavorites/unfavoriteFile.feature
+++ b/tests/acceptance/features/webUIFavorites/unfavoriteFile.feature
@@ -16,13 +16,15 @@ Feature: Unmark file/folder as favorite
     And user "user1" has favorited element "lorem.txt"
     And the user has browsed to the files page
     When the user unmarks the favorited file "data.zip" using the webUI
-    Then file "data.zip" should not be marked as favorite on the webUI
-    But file "data.tar.gz" should be marked as favorite on the webUI
+    Then file "data.zip" should not be marked as favorite
+    And file "data.zip" should not be marked as favorite on the webUI
+    But file "data.tar.gz" should be marked as favorite
+    And file "data.tar.gz" should be marked as favorite on the webUI
+    And file "lorem.txt" should be marked as favorite
     And file "lorem.txt" should be marked as favorite on the webUI
     When the user browses to the favorites page
-    Then file "data.zip" should not be listed on the webUI
-    But file "data.tar.gz" should be listed on the webUI
-    And file "lorem.txt" should be listed on the webUI
+    Then there should be 2 files/folders listed on the webUI
+    But file "data.zip" should not be listed on the webUI
 
   Scenario: unmark a folder as favorite from files page
     Given user "user1" has favorited element "simple-folder"
@@ -30,13 +32,15 @@ Feature: Unmark file/folder as favorite
     And user "user1" has favorited element "0"
     And the user has browsed to the files page
     When the user unmarks the favorited folder "simple-folder" using the webUI
-    Then folder "simple-folder" should not be marked as favorite on the webUI
-    But folder "simple-empty-folder" should be marked as favorite on the webUI
+    Then folder "simple-folder" should not be marked as favorite
+    And folder "simple-folder" should not be marked as favorite on the webUI
+    But folder "simple-empty-folder" should be marked as favorite
+    And folder "simple-empty-folder" should be marked as favorite on the webUI
+    And folder "0" should be marked as favorite
     And folder "0" should be marked as favorite on the webUI
     When the user browses to the favorites page
-    Then folder "simple-folder" should not be listed on the webUI
-    But folder "0" should be listed on the webUI
-    And folder "simple-empty-folder" should be listed on the webUI
+    Then there should be 2 files/folders listed on the webUI
+    But folder "simple-folder" should not be listed on the webUI
 
   @smokeTest
   Scenario: unmark a file as favorite from favorite page
@@ -46,15 +50,10 @@ Feature: Unmark file/folder as favorite
     And the user has browsed to the favorites page
     When the user unmarks the favorited file "data.zip" using the webUI
     Then file "data.zip" should be listed on the webUI
-    But file "data.zip" should not be marked as favorite on the webUI
-    When the user reloads the current page of the webUI
-    Then file "data.zip" should not be listed on the webUI
+    And file "data.zip" should not be marked as favorite
+    And file "data.zip" should not be marked as favorite on the webUI
     But file "data.tar.gz" should be listed on the webUI
     And file "lorem.txt" should be listed on the webUI
-    When the user browses to the files page
-    Then file "data.zip" should not be marked as favorite on the webUI
-    But file "data.tar.gz" should be marked as favorite on the webUI
-    And file "lorem.txt" should be marked as favorite on the webUI
 
   Scenario: unmark a folder as favorite from favorite page
     Given user "user1" has favorited element "simple-folder"
@@ -63,21 +62,27 @@ Feature: Unmark file/folder as favorite
     And the user has browsed to the favorites page
     When the user unmarks the favorited folder "simple-folder" using the webUI
     Then folder "simple-folder" should be listed on the webUI
-    But folder "simple-folder" should not be marked as favorite on the webUI
-    When the user reloads the current page of the webUI
-    Then folder "simple-folder" should not be listed on the webUI
+    And folder "simple-folder" should not be marked as favorite
+    And folder "simple-folder" should not be marked as favorite on the webUI
     But folder "0" should be listed on the webUI
     And folder "simple-empty-folder" should be listed on the webUI
-    When the user browses to the files page
+
+  Scenario: unmark files/folders as favorites using the sidebar
+    Given user "user1" has favorited element "data.zip"
+    And user "user1" has favorited element "simple-folder"
+    And the user has browsed to the favorites page
+    When the user unmarks the favorited folder "simple-folder" using the webUI sidebar
+    And the user unmarks the favorited file "data.zip" using the webUI sidebar
     Then folder "simple-folder" should not be marked as favorite on the webUI
-    But folder "simple-empty-folder" should be marked as favorite on the webUI
-    And folder "0" should be marked as favorite on the webUI
+    And folder "simple-folder" should not be marked as favorite
+    And file "data.zip" should not be marked as favorite on the webUI
+    And file "data.zip" should not be marked as favorite
 
   @issue-1720
   Scenario: Try to unfavorite file and folder that used to exist but does not anymore
-    Given the user has browsed to the files page
-    And user "user1" has favorited element "simple-folder"
+    Given user "user1" has favorited element "simple-folder"
     And user "user1" has favorited element "lorem.txt"
+    And the user has browsed to the files page
     And the following files have been deleted by user "user1"
       | name          |
       | lorem.txt     |
@@ -85,11 +90,11 @@ Feature: Unmark file/folder as favorite
     When the user unmarks the favorited file "lorem.txt" using the webUI
     Then no message should be displayed on the webUI
     #    Then the error message with header 'Error while marking "lorem.txt" as favorite' should be displayed on the webUI
-    And file "lorem.txt" should not be marked as favorite on the webUI
+    And file "lorem.txt" should be marked as favorite on the webUI
     #    When the user clears all error message from the webUI
     When the user unmarks the favorited folder "simple-folder" using the webUI
     Then no message should be displayed on the webUI
     #    Then the error message with header 'Error while marking "simple-folder" as favorite' should be displayed on the webUI
-    And folder "simple-folder" should not be marked as favorite on the webUI
+    And folder "simple-folder" should be marked as favorite on the webUI
     And as "user1" file "lorem.txt" should not exist
     And as "user1" folder "simple-folder" should not exist
diff --git a/tests/acceptance/helpers/webdavHelper.js b/tests/acceptance/helpers/webdavHelper.js
index 17f48ec6a16..7907df029d3 100644
--- a/tests/acceptance/helpers/webdavHelper.js
+++ b/tests/acceptance/helpers/webdavHelper.js
@@ -72,7 +72,7 @@ exports.move = function(userId, fromName, toName) {
  * @param {number} folderDepth
  */
 exports.propfind = function(path, userId, properties, folderDepth = 1) {
-  const davPath = path
+  const davPath = encodeURI(path)
   let propertyBody = ''
   properties.map(prop => {
     propertyBody += `<${prop}/>`
diff --git a/tests/acceptance/pageObjects/FilesPageElement/appSideBar.js b/tests/acceptance/pageObjects/FilesPageElement/appSideBar.js
index 755aca6f02c..68620caf9ec 100644
--- a/tests/acceptance/pageObjects/FilesPageElement/appSideBar.js
+++ b/tests/acceptance/pageObjects/FilesPageElement/appSideBar.js
@@ -1,3 +1,5 @@
+/* eslint-disable no-unused-expressions */
+
 module.exports = {
   commands: {
     isThumbnailVisible: function() {
@@ -54,6 +56,19 @@ module.exports = {
      */
     isCollaboratorsTabPresentOnCurrentSidebar: function() {
       return this.isTabPresentOnCurrentSidebar(this.elements.sidebarCollaboratorsTab.selector)
+    },
+    markFavoriteSidebar: function() {
+      return this.useXpath()
+        .waitForElementVisible('@sideBar')
+        .waitForElementVisible('@favoriteStarDimm')
+        .click('@sidebarToggleFavoriteButton')
+        .waitForElementVisible('@favoriteStarShining')
+    },
+    unmarkFavoriteSidebar: function() {
+      return this.waitForElementVisible('@sideBar')
+        .waitForElementVisible('@favoriteStarShining')
+        .click('@sidebarToggleFavoriteButton')
+        .waitForElementVisible('@favoriteStarDimm')
     }
   },
   elements: {
@@ -78,6 +93,15 @@ module.exports = {
     sidebarVersionsTab: {
       selector: '//div//a[normalize-space(.)="Versions"]',
       locateStrategy: 'xpath'
+    },
+    sidebarToggleFavoriteButton: {
+      selector: '#files-sidebar-star-icon'
+    },
+    favoriteStarDimm: {
+      selector: '.oc-star-dimm'
+    },
+    favoriteStarShining: {
+      selector: '.oc-star-shining'
     }
   }
 }
diff --git a/tests/acceptance/pageObjects/FilesPageElement/fileActionsMenu.js b/tests/acceptance/pageObjects/FilesPageElement/fileActionsMenu.js
index dc89d506500..61642c63e22 100644
--- a/tests/acceptance/pageObjects/FilesPageElement/fileActionsMenu.js
+++ b/tests/acceptance/pageObjects/FilesPageElement/fileActionsMenu.js
@@ -7,6 +7,8 @@ module.exports = {
     FileAction: Object.freeze({
       download: 'download',
       delete: 'delete',
+      favorite: 'favorite',
+      unmarkFavorite: 'unmarkFavorite',
       restore: 'restore',
       share: 'share',
       rename: 'rename',
@@ -88,6 +90,20 @@ module.exports = {
 
       return this
     },
+    /**
+     * mark as favorite resource using fileActions 'favorite' button
+     * @returns {Promise<*>}
+     */
+    favorite: function() {
+      return this.performFileAction(this.FileAction.favorite)
+    },
+    /**
+     * unmark as favorite resource using fileActions 'favorite' button
+     * @returns {Promise<*>}
+     */
+    unmarkFavorite: function() {
+      return this.performFileAction(this.FileAction.unmarkFavorite)
+    },
     /**
      * opens sharing dialog for given resource
      * assumes filesAction menu for the resource to be opened
@@ -166,6 +182,14 @@ module.exports = {
       selector: '//button[@aria-label="Download"]',
       locateStrategy: 'xpath'
     },
+    favoriteButtonInFileRow: {
+      selector: '//button[@aria-label="Mark as favorite"]',
+      locateStrategy: 'xpath'
+    },
+    unmarkFavoriteButtonInFileRow: {
+      selector: '//button[@aria-label="Unmark as favorite"]',
+      locateStrategy: 'xpath'
+    },
     restoreButtonInFileRow: {
       selector: '//button[@aria-label="Restore"]',
       locateStrategy: 'xpath'
diff --git a/tests/acceptance/pageObjects/FilesPageElement/filesList.js b/tests/acceptance/pageObjects/FilesPageElement/filesList.js
index 9227876de46..194471abf34 100644
--- a/tests/acceptance/pageObjects/FilesPageElement/filesList.js
+++ b/tests/acceptance/pageObjects/FilesPageElement/filesList.js
@@ -62,6 +62,24 @@ module.exports = {
       await filesRow.openFileActionsMenu(fromName).rename(toName, expectToSucceed)
       return this
     },
+    /**
+     * @param {string} path
+     * @return {Promise<module.exports.commands>}
+     */
+    markFavorite: async function(path) {
+      await this.waitForFileVisible(path)
+      await filesRow.openFileActionsMenu(path).favorite()
+      return this
+    },
+    /**
+     * @param {string} path
+     * @return {Promise<module.exports.commands>}
+     */
+    unmarkFavorite: async function(path) {
+      await this.waitForFileVisible(path)
+      await filesRow.openFileActionsMenu(path).unmarkFavorite()
+      return this
+    },
     /**
      * @param {string} element
      * @param {string} elementType
@@ -708,14 +726,6 @@ module.exports = {
         '//span[contains(@class, "file-row-name") and (@data-preview-loaded="true" or not(@data-preview-loaded))]',
       locateStrategy: 'xpath'
     },
-    notMarkedFavoriteInFileRow: {
-      selector: '//span[contains(@class, "oc-star-dimm")]',
-      locateStrategy: 'xpath'
-    },
-    markedFavoriteInFileRow: {
-      selector: '//span[contains(@class, "oc-star-shining")]',
-      locateStrategy: 'xpath'
-    },
     collaboratorsInFileRow: {
       selector: '//*[contains(@class, "file-row-collaborator-name")]',
       locateStrategy: 'xpath'
diff --git a/tests/acceptance/pageObjects/FilesPageElement/filesRow.js b/tests/acceptance/pageObjects/FilesPageElement/filesRow.js
index 04e6e2061fc..1036930c5fd 100644
--- a/tests/acceptance/pageObjects/FilesPageElement/filesRow.js
+++ b/tests/acceptance/pageObjects/FilesPageElement/filesRow.js
@@ -3,60 +3,6 @@ const filesList = client.page.FilesPageElement.filesList()
 
 module.exports = {
   commands: {
-    /**
-     *
-     * @param {string} path
-     */
-    markAsFavorite: async function(path) {
-      await filesList.waitForFileVisible(path)
-
-      const favoriteIconButton =
-        filesList.getFileRowSelectorByFileName(path) +
-        this.elements.notMarkedFavoriteInFileRow.selector
-
-      await this.initAjaxCounters()
-        .useXpath()
-        .click(favoriteIconButton)
-        .waitForOutstandingAjaxCalls()
-        .useCss()
-
-      return this
-    },
-    /**
-     *
-     * @param {string} path
-     *
-     * @return {Promise<boolean>}
-     */
-    isMarkedFavorite: async function(path) {
-      let visible = false
-      const markedFavoriteIcon =
-        filesList.getFileRowSelectorByFileName(path) +
-        this.elements.markedFavoriteInFileRow.selector
-      await filesList.waitForFileVisible(path)
-      await this.api.element('xpath', markedFavoriteIcon, result => {
-        visible = !!result.value.ELEMENT
-      })
-      return visible
-    },
-    /**
-     * @param {string} path
-     */
-    unmarkFavorite: async function(path) {
-      const unFavoriteBtn =
-        filesList.getFileRowSelectorByFileName(path) +
-        this.elements.markedFavoriteInFileRow.selector
-
-      await filesList.waitForFileVisible(path)
-
-      await this.initAjaxCounters()
-        .useXpath()
-        .click(unFavoriteBtn)
-        .waitForOutstandingAjaxCalls()
-        .useCss()
-
-      return this
-    },
     /**
      * Get Selector for File Actions expander
      *
@@ -88,14 +34,6 @@ module.exports = {
     }
   },
   elements: {
-    notMarkedFavoriteInFileRow: {
-      selector: '//span[contains(@class, "oc-star-dimm")]',
-      locateStrategy: 'xpath'
-    },
-    markedFavoriteInFileRow: {
-      selector: '//span[contains(@class, "oc-star-shining")]',
-      locateStrategy: 'xpath'
-    },
     fileActionsButtonInFileRow: {
       selector: '//button[contains(@class, "files-list-row-show-actions")]',
       locateStrategy: 'xpath'
diff --git a/tests/acceptance/stepDefinitions/filesContext.js b/tests/acceptance/stepDefinitions/filesContext.js
index 5a947c341c1..11e269a917a 100644
--- a/tests/acceptance/stepDefinitions/filesContext.js
+++ b/tests/acceptance/stepDefinitions/filesContext.js
@@ -1,3 +1,4 @@
+/* eslint-disable no-unused-expressions */
 const { client } = require('nightwatch-api')
 const assert = require('assert')
 const { Given, When, Then, Before } = require('cucumber')
@@ -307,15 +308,33 @@ When('the user renames the following file/folder using the webUI', async functio
 })
 
 Given('the user has marked file/folder {string} as favorite using the webUI', function(path) {
-  return client.page.FilesPageElement.filesRow().markAsFavorite(path)
+  return client.page.FilesPageElement.filesList().markFavorite(path)
 })
 
 When('the user marks file/folder {string} as favorite using the webUI', function(path) {
-  return client.page.FilesPageElement.filesRow().markAsFavorite(path)
+  return client.page.FilesPageElement.filesList().markFavorite(path)
 })
 
 When('the user unmarks the favorited file/folder {string} using the webUI', function(path) {
-  return client.page.FilesPageElement.filesRow().unmarkFavorite(path)
+  return client.page.FilesPageElement.filesList().unmarkFavorite(path)
+})
+
+When('the user marks file/folder {string} as favorite using the webUI sidebar', async function(
+  path
+) {
+  const api = client.page.FilesPageElement
+  await api.filesList().clickRow(path)
+  api.appSideBar().markFavoriteSidebar()
+  return client
+})
+
+When('the user unmarks the favorited file/folder {string} using the webUI sidebar', async function(
+  path
+) {
+  const api = client.page.FilesPageElement
+  await api.filesList().clickRow(path)
+  api.appSideBar().unmarkFavoriteSidebar()
+  return client
 })
 
 Then('there should be no files/folders/resources listed on the webUI', async function() {
@@ -622,20 +641,38 @@ Then(
   }
 )
 
-Then('file/folder {string} should be marked as favorite on the webUI', function(path) {
-  return client.page.FilesPageElement.filesRow()
-    .isMarkedFavorite(path)
-    .then(result => {
-      assert.strictEqual(result, true, `${path} expected to be favorite but was not`)
-    })
+Then('file/folder {string} should be marked as favorite', async function(path) {
+  let isFavorite = await webdav.getProperties(path, client.globals.currentUser, ['oc:favorite'])
+  isFavorite = isFavorite['oc:favorite']
+
+  return assert.strictEqual(isFavorite, '1', `${path} expected to be favorite but was not`)
 })
 
-Then('file/folder {string} should not be marked as favorite on the webUI', function(path) {
-  return client.page.FilesPageElement.filesRow()
-    .isMarkedFavorite(path)
-    .then(result => {
-      assert.strictEqual(result, false, `not expected ${path} to be favorite but was`)
-    })
+Then('file/folder {string} should not be marked as favorite', async function(path) {
+  let isFavorite = await webdav.getProperties(path, client.globals.currentUser, ['oc:favorite'])
+  isFavorite = isFavorite['oc:favorite']
+
+  return assert.strictEqual(isFavorite, '0', `not expected ${path} to be favorite but was`)
+})
+
+Then('file/folder {string} should be marked as favorite on the webUI', async function(path) {
+  const selector = client.page.FilesPageElement.appSideBar().elements.favoriteStarShining
+  await client.page.FilesPageElement.filesList().clickRow(path)
+
+  client.expect.element(selector).to.be.visible
+  client.page.FilesPageElement.appSideBar().closeSidebar()
+
+  return client
+})
+
+Then('file/folder {string} should not be marked as favorite on the webUI', async function(path) {
+  const selector = client.page.FilesPageElement.appSideBar().elements.favoriteStarDimm
+  await client.page.FilesPageElement.filesList().clickRow(path)
+
+  client.expect.element(selector).to.be.visible
+  client.page.FilesPageElement.appSideBar().closeSidebar()
+
+  return client
 })
 
 Then(/there should be (\d+) files\/folders listed on the webUI/, async function(noOfItems) {