diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index e63e3012f24e..f9c47737a0b1 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -512,7 +512,7 @@ table td.filename .uploadtext {
 }
 
 /* File checkboxes */
-html:not(.ie8) #fileList tr td.filename > .selectCheckBox + label:before {
+#fileList tr td.filename > .selectCheckBox + label:before {
 	opacity: 0;
 	position: absolute;
 	bottom: 4px;
@@ -520,13 +520,21 @@ html:not(.ie8) #fileList tr td.filename > .selectCheckBox + label:before {
 	z-index: 10;
 }
 
-html.ie8 #fileList tr td.filename > .selectCheckBox {
-	filter: alpha(opacity=0);
-	opacity: 0;
-	float: left;
-	top: 0;
-	margin: 32px 0 4px 32px;
-	/* bigger clickable area doesn’t work in FF width:2.8em; height:2.4em;*/
+#fileList tr:not(:hover):not(.selected) td.filename .thumbnail.sharetree-item:after {
+	position: absolute;
+	display: block;
+	content: '';
+	bottom: 0px;
+	right: -5px;
+	z-index: 10;
+	background-image: url(../../../core/img/actions/shared.svg);
+	width: 14px;
+	height: 14px;
+	background-repeat: no-repeat;
+	background-position: center;
+	background-size: 10px;
+	background-color: #bfbfbf;
+	border-radius: 50%;
 }
 
 /* Show checkbox when hovering, checked, or selected */
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index e76008dc344b..2ff6f92a2ce2 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -168,6 +168,13 @@
 		 */
 		_sortComparator: null,
 
+		/**
+		 * Stores shareTree items and infos
+		 * 
+		 * @type Array
+		 */
+		_shareTreeCache: {},
+
 		/**
 		 * Whether to do a client side sort.
 		 * When false, clicking on a table header will call reload().
@@ -379,6 +386,7 @@
 			// remove summary
 			this.$el.find('tfoot tr.summary').remove();
 			this.$fileList.empty();
+
 		},
 
 		/**
@@ -1048,6 +1056,7 @@
 			$(window).scrollTop(0);
 
 			this.$fileList.trigger(jQuery.Event('updated'));
+			
 			_.defer(function() {
 				self.$el.closest('#app-content').trigger(jQuery.Event('apprendered'));
 			});
@@ -1389,6 +1398,10 @@
 				tr.addClass('hidden-file');
 			}
 
+			if(_.keys(this._shareTreeCache).length) {
+				filenameTd.find('.thumbnail:not(.sharetree-item)').addClass('sharetree-item');
+			}
+
 			// display actions
 			this.fileActions.display(filenameTd, !options.silent, this);
 
@@ -1445,17 +1458,28 @@
 			var self = this;
 			var currentDir = this.getCurrentDirectory();
 			targetDir = targetDir || '/';
-			if (!force && currentDir === targetDir) {
-				return;
-			}
-			this._setCurrentDir(targetDir, changeUrl, fileId);
-			// discard finished uploads list, we'll get it through a regular reload
-			this._uploads = {};
-			this.reload().then(function(success){
-				if (!success) {
-					self.changeDirectory(currentDir, true);
+
+			return new Promise(function(resolve, reject) {
+
+				if (!force && currentDir === targetDir) {
+					resolve()
+					return
 				}
-			});
+				self._setCurrentDir(targetDir, changeUrl, fileId);
+				// discard finished uploads list, we'll get it through a regular reload
+				self._uploads = {};
+				self.reload().then(function(success){
+					if (!success) {
+						self.changeDirectory(currentDir, true);
+						reject()
+					}
+					resolve()
+				});
+
+				self._updateShareTree().then(function() {
+					self._setShareTreeIcons();
+				})
+			})
 		},
 		linkTo: function(dir) {
 			return OC.linkTo('files', 'index.php')+"?dir="+ encodeURIComponent(dir).replace(/%2F/g, '/');
@@ -1723,6 +1747,197 @@
 			return OC.linkToRemoteBase('dav') + '/files/' + uid + encodedPath;
 		},
 
+		/**
+		 * Fetch shareTypes of a certain directory
+		 * @param {String} dir directory string
+		 * @return {Promise} object with name and shareTypes
+		 */
+		getDirShareInfo: function(dir) {
+			// Dir can't be empty
+			if (typeof dir !== 'string' || dir.length === 0) {
+				return Promise.reject('getDirShareInfo(). param must be typeof string and can not be empty!')
+			}
+
+			// avoiding a unnessesary API calls
+			if (typeof this._shareTreeCache[dir] !== 'undefined' || dir === '/') {
+				return Promise.resolve()
+			}
+
+			// trim trailing slashes
+			dir = dir.replace(/\/$/, "")
+
+			var self       = this;
+			var client     = this.filesClient;
+			var options    = {
+				properties : ['{' + OC.Files.Client.NS_OWNCLOUD + '}share-types']
+			}
+
+			return new Promise( function(resolve, reject) {
+				client.getFileInfo(dir, options).done(function(s, dir) {
+
+					var path = OC.joinPaths(dir.path, dir.name)
+
+					if (dir.shareTypes !== undefined) {
+						// Fetch all shares for directory in question
+						$.get( OC.linkToOCS('apps/files_sharing/api/v1', 2) + 'shares?' + OC.buildQueryString({format: 'json', path: path }), function(e) {
+							self._shareTreeCache[path] = {
+								name : dir.name,
+								shares : e.ocs.data
+							}
+							resolve()
+						})
+					}
+					else {
+						resolve()
+					}
+				}).fail(function(error) {
+					reject(error)
+				})
+			})
+		},
+
+		/**
+		 * Fetch shareInfos recursively from current
+		 * directory down to root
+		 * @param {String} dir directory string
+		 * @return {Promise} array of objects with name and shareTypes
+		 */
+		getPathShareInfo: function(path) {
+			if (typeof path !== 'string') {
+				console.error('getDirShareInfo(). param must be typeof string!')
+				return false
+			}
+
+			var crumbs     = [];
+			var pathToHere = '';
+			var parts      = (path === '/' || path.length === 0) ? ['/'] : path.split('/')
+
+			for (var i = 0; i < parts.length; i++) {
+				var part = parts[i];
+				pathToHere += part + '/';
+
+				crumbs.push(this.getDirShareInfo(pathToHere))
+			}
+
+			return Promise.all(crumbs)
+		},
+
+		_updateShareTree: function() {
+			var self = this;
+			var dir  = this.getCurrentDirectory();
+
+			// Purge shareTreeCache in root dir
+			if (dir === '/') {
+				this._purgeShareTreeCache()
+				return Promise.resolve()
+			}
+
+			return this.getPathShareInfo(dir).then(function () {
+				var breadcrumbs = dir.split('/')
+
+				// Diff keys in shareTreeCache agains the current dir
+				// removing deeper nested shares
+				var cache = _.omit(self._shareTreeCache, function(value, key) {
+					var diffs = _.difference(key.split('/'), breadcrumbs)
+					return diffs.length > 0
+				});
+
+				self._setShareTreeCache(cache)
+			})
+
+		},
+
+		_setShareTreeCache: function(data) {
+			this._shareTreeCache = data;
+		},
+
+		_purgeShareTreeCache: function() {
+			this._setShareTreeCache({});
+		},
+
+		_setShareTreeIcons: function() {
+			// Add share-tree icon to files and folders
+			// each per <tr> in the table
+
+			if (_.keys(this._shareTreeCache).length > 0)
+				this.$fileList.find('tr td.filename .thumbnail:not(.sharetree-item)').addClass('sharetree-item')
+			else
+				this.$fileList.find('tr td.filename .thumbnail.sharetree-item').removeClass('sharetree-item')
+
+		},
+
+		_setShareTreeUserGroupView: function() {
+			var self  = this;
+			var $list = $('<ul>', { id : 'shareTreeUserGroupList' });
+
+			if (! _.keys(self._shareTreeCache).length > 0)
+				return
+
+			$('.shareeTreeUserGroupListView').html($list)
+
+			// Shared folders
+			_.each(self._shareTreeCache, function(folder) {
+
+				var shares = _.filter(folder.shares, function(share) {
+					return (
+						share.share_type === OC.Share.SHARE_TYPE_USER ||
+						share.share_type === OC.Share.SHARE_TYPE_GROUP ||
+						share.share_type === OC.Share.SHARE_TYPE_GUEST ||
+						share.share_type === OC.Share.SHARE_TYPE_REMOTE )
+				})
+
+				_.each(shares, function(share) {
+
+					var $path = $('<span>',   { class : 'shareTree-item-path', text : t('core', 'via') + " " + folder.name })
+					var $name = $('<strong>', { class : 'shareTree-item-name', text : share.share_with_displayname })
+					var $icon = $('<div>',    { class : 'shareTree-item-avatar' })
+
+					$icon.avatar(share.share_with, 32)
+
+					$('<li class="shareTree-item">').append( $icon, $name, $path).appendTo($list).click(function() {
+						self.changeDirectory(share.path.replace(folder.name, ''), true).then(function() {
+							self._updateDetailsView(folder.name, true)
+						}).catch(function(e) {
+							console.error(e)
+						})
+					})
+				})
+			})
+		},
+
+		_setShareTreeLinkView: function() {
+			var self  = this;
+			var $list = $('<ul>', { id : 'shareTreeLinkList' });
+
+			if (! _.keys(self._shareTreeCache).length > 0)
+				return
+
+			$('.shareeTreeLinkListView').html($list)
+
+			// Shared folders
+			_.each(self._shareTreeCache, function(folder) {
+
+				var shares = _.filter(folder.shares, function(share) {
+					return share.share_type === OC.Share.SHARE_TYPE_LINK
+				})
+
+				_.each(shares, function(share) {
+
+					var $path = $('<span>',   { class : 'shareTree-item-path', text : t('core', 'via') + " " + folder.name })
+					var $name = $('<strong>', { class : 'shareTree-item-name', text : share.name })
+					var $icon = $('<span>',   { class : 'shareTree-item-icon link-entry--icon icon-public-white' })
+
+					$('<li class="shareTree-item">').append( $icon, $name, $path).appendTo($list).click(function() {
+						self.changeDirectory(share.path.replace(folder.name, ''), true).then(function() {
+							self._updateDetailsView(folder.name, true)
+						}).catch(function(e) {
+							console.error(e)
+						})
+					})
+				})
+			})
+		},
+
 		/**
 		 * Generates a preview URL based on the URL space.
 		 * @param urlSpec attributes for the URL
diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js
index 8df835155e4e..317d41af5205 100644
--- a/apps/files/tests/js/filelistSpec.js
+++ b/apps/files/tests/js/filelistSpec.js
@@ -1024,6 +1024,24 @@ describe('OCA.Files.FileList tests', function() {
 			expect($summary.find('.dirinfo').hasClass('hidden')).toEqual(true);
 			expect($summary.find('.fileinfo').text()).toEqual('1 file');
 		});
+		it('shows icon for shareTree items if parent is shared', function() {
+			fileList._setShareTreeCache({
+				'/folder' : {
+					name: "folder",
+					shares : [{
+						share_type: 0,
+						share_with_displayname: "Demo user",
+					}]
+				}
+			});
+			fileList.setFiles(testFiles)
+			expect($('#fileList tr:first-of-type td .sharetree-item').length).toEqual(1)
+		});
+		it('does not show shareTree items if shareTree is empty', function() {
+			fileList._purgeShareTreeCache()
+			fileList.setFiles(testFiles)
+			expect($('#fileList tr td .sharetree-item').length).toEqual(0)
+		})
 	});
 	describe('Filtered list rendering', function() {
 		it('filters the list of files using filter()', function() {
diff --git a/apps/files_sharing/css/sharetabview.css b/apps/files_sharing/css/sharetabview.css
index 3b3cf35e6580..43e1ed2d7458 100644
--- a/apps/files_sharing/css/sharetabview.css
+++ b/apps/files_sharing/css/sharetabview.css
@@ -76,6 +76,38 @@
 	margin-right: 8px;
 }
 
+#shareDialogLinkList .link-shares + #shareTreeUserGroupList {
+	margin-top: -20px;
+}
+
+#shareWithList + #shareTreeUserGroupList {
+	margin-top: -16px;
+}
+
+#shareTreeLinkList .shareTree-item,
+#shareTreeUserGroupList .shareTree-item {
+	display: flex;
+	justify-content: flex-start;
+	align-items: center;
+
+	padding-top: 5px;
+    padding-bottom: 5px;
+}
+
+.shareTree-item * {
+	cursor: pointer;
+}
+
+.shareTree-item-avatar {
+	border-radius: 50%;
+	float: left;
+}
+
+.shareTree-item-avatar + .shareTree-item-name,
+.shareTree-item-name + .shareTree-item-path {
+	margin-left: 8px;
+}
+
 .shareTabView .icon-loading-small {
 	display         : inline-block;
 	z-index         : 1;
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index bd0842a2bcb8..b285e098c665 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -198,6 +198,9 @@
 					// (FIXME: yes, this is hacky)
 					icon: $tr.attr('data-icon')
 				});
+
+				fileList._setShareTreeLinkView();
+				fileList._setShareTreeUserGroupView();
 			});
 			fileList.registerTabView(shareTab);
 		},
diff --git a/apps/files_sharing/tests/js/publicAppSpec.js b/apps/files_sharing/tests/js/publicAppSpec.js
index 87437bc029a2..e25bc23d6aa7 100644
--- a/apps/files_sharing/tests/js/publicAppSpec.js
+++ b/apps/files_sharing/tests/js/publicAppSpec.js
@@ -94,7 +94,7 @@ describe('OCA.Sharing.PublicApp tests', function() {
 			// uploader function messes up with fakeServer
 			var uploaderDetectStub = sinon.stub(OC.Uploader.prototype, '_supportAjaxUploadWithProgress');
 			App.initialize($('#preview'));
-			expect(fakeServer.requests.length).toEqual(1);
+			expect(fakeServer.requests.length).toEqual(2);
 			expect(fakeServer.requests[0].method).toEqual('PROPFIND');
 			expect(fakeServer.requests[0].url).toEqual('https://example.com:9876/owncloud/public.php/webdav/subdir');
 			expect(fakeServer.requests[0].requestHeaders.Authorization).toEqual('Basic c2g0dG9rOm51bGw=');
diff --git a/core/js/apps.js b/core/js/apps.js
index d8f4bfdf1c54..64644458c0ae 100644
--- a/core/js/apps.js
+++ b/core/js/apps.js
@@ -44,6 +44,17 @@
 		$('#app-content').removeClass('with-app-sidebar').trigger(new $.Event('appresized'));
 	};
 
+	/**
+	 * Check if sidebar is visible/hidden
+	 *
+	 * @param {Object} [$el] sidebar element to check, defaults to $('#app-sidebar')
+	 */
+
+	exports.Apps.AppSidebarVisible = function($el) {
+		var $appSidebar = $el || $('#app-sidebar');
+		return !$appSidebar.hasClass('disappear');
+	};
+
 	/**
 	 * Provides a way to slide down a target area through a button and slide it
 	 * up if the user clicks somewhere else. Used for the news app settings and
diff --git a/core/js/share.js b/core/js/share.js
index 2899df98507e..28de617b055d 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -53,6 +53,7 @@ OC.Share = _.extend(OC.Share || {}, {
 	 * @param fileList file list instance, defaults to OCA.Files.App.fileList
 	 * @param callback function to call after the shares were loaded
 	 */
+
 	loadIcons:function(itemType, fileList, callback) {
 		var path = fileList.dirInfo.path;
 		if (path === '/') {
@@ -431,6 +432,4 @@ $(document).ready(function() {
 		}
 	});
 
-
-
 });
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index ee4453769013..2b011920c9ae 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -29,11 +29,15 @@
 		'        <div class="oneline">' +
 		'            <input id="shareWith-{{cid}}" class="shareWithField" type="text" placeholder="{{sharePlaceholder}}" />' +
 		'            <span class="shareWithLoading icon-loading-small hidden"></span>'+
-		'{{{remoteShareInfo}}}' +
+		'            {{{remoteShareInfo}}}' +
 		'        </div>' +
 		'        <div class="shareeListView subView"></div>' +
+		'        <div class="shareeTreeUserGroupListView subView"></div>' +
+		'    </div>' +
+		'    <div class="linkShareView tab hidden" style="padding-left:0;padding-right:0;">' +
+		'        <div class="linkListView"></div>' +
+		'        <div class="shareeTreeLinkListView subView"></div>' +
 		'    </div>' +
-		'    <div class="linkShareView subView tab hidden" style="padding-left:0;padding-right:0;"></div>' +
 		'</div>' +
 		'{{else}}' +
 		'<div class="noSharingPlaceholder">{{noSharingPlaceholder}}</div>' +
@@ -156,6 +160,7 @@
 			this.$('.localShareView').toggleClass('hidden', !$target.hasClass('subtab-localshare'));
 
 			var $linkShareView = this.$('.linkShareView');
+			var $linkListView = this.$('.linkListView');
 			if ($linkShareView.length) {
 				$linkShareView.toggleClass('hidden', !$target.hasClass('subtab-publicshare'));
 
@@ -166,7 +171,7 @@
 						itemModel: this.model
 					});
 					this.linkShareView.render();
-					$linkShareView.append(this.linkShareView.$el);
+					$linkListView.html(this.linkShareView.$el);
 				}
 			}
 		},
diff --git a/core/js/tests/specs/sharedialogviewSpec.js b/core/js/tests/specs/sharedialogviewSpec.js
index 04c58ae704ff..271ec48c10d6 100644
--- a/core/js/tests/specs/sharedialogviewSpec.js
+++ b/core/js/tests/specs/sharedialogviewSpec.js
@@ -35,6 +35,7 @@ describe('OC.Share.ShareDialogView', function() {
 	var configModel;
 	var shareModel;
 	var fileInfoModel;
+	var fileList;
 	var dialog;
 
 	beforeEach(function() {
@@ -963,11 +964,55 @@ describe('OC.Share.ShareDialogView', function() {
 			expect(dialog.$('.tabsContainer>.tab:eq(1)').hasClass('hidden')).toEqual(false);
 		});
 		it('creates link share view only after selecting tab', function() {
-			expect(dialog.$('.linkShareView').is(':empty')).toEqual(true);
+			expect(dialog.$('.linkListView').is(':empty')).toEqual(true);
 			
 			dialog.$('.subTabHeaders>.subTabHeader:eq(1)').click();
 
-			expect(dialog.$('.linkShareView').is(':empty')).toEqual(false);
+			expect(dialog.$('.linkListView').is(':empty')).toEqual(false);
 		});
 	});
+	describe('shareTree', function() {
+		beforeEach(function() {
+			dialog.render();
+
+			$('#testArea').append('<div id="filelist"></div>')
+			fileList = new OCA.Files.FileList($('#filelist'));
+			fileList._setShareTreeCache({
+				'/folder' : {
+					name: "folder",
+					shares : [{
+						share_type: 0,
+						share_with_displayname: "Demo user",
+					}, {
+						share_type: 1,
+						share_with_displayname: "Demo group",
+					}, {
+						share_type: 3,
+						share_with_displayname: "Demo link #1",
+					}, {
+						share_type: 3,
+						share_with_displayname: "Demo link #2",
+					}, {
+						share_type: 4,
+						share_with_displayname: "Demo guest",
+					}, {
+						share_type: 6,
+						share_with_displayname: "Demo remote user",
+					}]
+				}
+			});
+		})
+		afterEach(function() {
+			fileList.destroy();
+			$('#filelist').remove()
+		});
+		it('renders parent user/groups shares', function() {
+			fileList._setShareTreeUserGroupView()
+			expect(dialog.$el.find('#shareTreeUserGroupList li').length).toEqual(4);
+		})
+		it('renders parent link shares', function() {
+			fileList._setShareTreeLinkView()
+			expect(dialog.$el.find('#shareTreeLinkList li').length).toEqual(2);
+		})
+	});
 });
diff --git a/tests/acceptance/features/bootstrap/WebUISharingContext.php b/tests/acceptance/features/bootstrap/WebUISharingContext.php
index f3053ffd6a4f..badbf6d9d816 100644
--- a/tests/acceptance/features/bootstrap/WebUISharingContext.php
+++ b/tests/acceptance/features/bootstrap/WebUISharingContext.php
@@ -1601,4 +1601,68 @@ public function tearDownScenario() {
 			);
 		}
 	}
+
+	/**
+	 * @Then /^(file|folder) "([^"]*)" should have share indicator on the webUI$/
+	 *
+	 * @param string $fileOrFolder
+	 * @param string $filename name of resource
+	 *
+	 * @return void
+	 * @throws Exception
+	 */
+	public function folderShouldHaveShareIndicatorOnTheWebUI($fileOrFolder, $filename) {
+		$isMarked = $this->filesPage->isShareIndicatorPresent(
+			$filename
+		);
+		Assert::assertEquals(true, $isMarked, "Expected: " . $fileOrFolder . " to be marked as shared but found: " . \strval($isMarked));
+	}
+
+	/**
+	 * @Then /^(file|folder) "([^"]*)" should not have share indicator on the webUI$/
+	 *
+	 * @param string $fileOrFolder
+	 * @param string $filename name of resource
+	 *
+	 * @return void
+	 * @throws Exception
+	 */
+	public function folderShouldNotHaveShareIndicatorOnTheWebUI($fileOrFolder, $filename) {
+		$isMarked = $this->filesPage->isShareIndicatorPresent(
+			$filename
+		);
+		Assert::assertEquals(false, $isMarked, "Expected: " . $fileOrFolder . " not to be marked as shared but found: " . \strval($isMarked));
+	}
+
+	/**
+	 * @Then following resources should have share indicators on the webUI
+	 *
+	 * @param TableNode $resourceTable
+	 *
+	 * @return void
+	 * @throws Exception
+	 */
+	public function followingResourcesShouldHaveShareIndicatorOnTheWebUI(TableNode $resourceTable) {
+		$elementRows = $resourceTable->getRows();
+		$elements = $this->featureContext->simplifyArray($elementRows);
+		foreach ($elements as $element) {
+			$this->folderShouldHaveShareIndicatorOnTheWebUI(null, $element);
+		}
+	}
+
+	/**
+	 * @Then following resources should not have share indicators on the webUI
+	 *
+	 * @param TableNode $resourceTable table headings: must be: |name|
+	 *
+	 * @return void
+	 * @throws Exception
+	 */
+	public function followingResourcesShouldNotHaveShareIndicatorOnTheWebUI(TableNode $resourceTable) {
+		$elementRows = $resourceTable->getRows();
+		$elements = $this->featureContext->simplifyArray($elementRows);
+		foreach ($elements as $element) {
+			$this->folderShouldNotHaveShareIndicatorOnTheWebUI(null, $element);
+		}
+	}
 }
diff --git a/tests/acceptance/features/lib/FilesPage.php b/tests/acceptance/features/lib/FilesPage.php
index 82415dcdd8cc..64bdc106813d 100644
--- a/tests/acceptance/features/lib/FilesPage.php
+++ b/tests/acceptance/features/lib/FilesPage.php
@@ -43,6 +43,7 @@ class FilesPage extends FilesPageBasic {
 	protected $deleteAllSelectedBtnXpath = ".//*[@id='app-content-files']//*[@class='delete-selected']";
 	protected $homePageIconXpath = "//div[@class='breadcrumb']//img[@alt='Home']";
 	protected $folderBreadCrumbXpath = "//div[@class='breadcrumb']//a[contains(@href,'%s')]";
+	protected $resourceSharedIndicatorXpath = "//table[@id='filestable']//span[normalize-space(.)='%s']/../..//div[contains(@class, 'sharetree-item')]";
 
 	/**
 	 *
@@ -399,4 +400,17 @@ public function browseToFolder($folderName) {
 	public function waitForUploadProgressbarToFinish() {
 		$this->filesPageCRUDFunctions->waitForUploadProgressbarToFinish();
 	}
+
+	/**
+	 * checks whether given resource is marked as shared or not
+	 *
+	 * @param $fileName
+	 *
+	 * @return bool
+	 */
+	public function isShareIndicatorPresent($fileName) {
+		$resourceMarkedSharedXpath = \sprintf($this->resourceSharedIndicatorXpath, $fileName);
+		$markedElement = $this->find("xpath", $resourceMarkedSharedXpath);
+		return $markedElement !== null;
+	}
 }
diff --git a/tests/acceptance/features/lib/SharedByLinkPage.php b/tests/acceptance/features/lib/SharedByLinkPage.php
index 13857140cebc..6900586046a2 100644
--- a/tests/acceptance/features/lib/SharedByLinkPage.php
+++ b/tests/acceptance/features/lib/SharedByLinkPage.php
@@ -37,7 +37,7 @@ class SharedByLinkPage extends FilesPageCRUD {
 	protected $path = '/index.php/apps/files/?view=sharinglinks';
 	protected $fileNamesXpath = "//span[contains(@class,'nametext') and not(contains(@class,'innernametext'))]";
 	protected $fileNameMatchXpath = "//span[contains(@class,'nametext') and not(contains(@class,'innernametext')) and .=%s]";
-	protected $fileListXpath = ".//div[@id='app-content-sharinglinks']//tbody[@id='fileList']";
+	protected $fileListXpath = ".//div[@id='app-content']//tbody[@id='fileList' and count(*) >= 1]";
 	protected $emptyContentXpath = ".//div[@id='app-content-sharinglinks']//div[@id='emptycontent']";
 	protected $deleteAllSelectedBtnXpath = ".//*[@id='app-content-files']//*[@class='delete-selected']";
 	/**
diff --git a/tests/acceptance/features/lib/SharedWithOthersPage.php b/tests/acceptance/features/lib/SharedWithOthersPage.php
index eba44c258292..6d18761e72f9 100644
--- a/tests/acceptance/features/lib/SharedWithOthersPage.php
+++ b/tests/acceptance/features/lib/SharedWithOthersPage.php
@@ -39,7 +39,7 @@ class SharedWithOthersPage extends FilesPageBasic {
 	protected $path = '/index.php/apps/files/?view=sharingout';
 	protected $fileNamesXpath = "//span[contains(@class,'nametext') and not(contains(@class,'innernametext'))]";
 	protected $fileNameMatchXpath = "//span[contains(@class,'nametext') and not(contains(@class,'innernametext')) and .=%s]";
-	protected $fileListXpath = ".//div[@id='app-content-sharingout']//tbody[@id='fileList']";
+	protected $fileListXpath = ".//div[contains(@id, 'app-content')]//tbody[@id='fileList' and count(*) >= 1]";
 	protected $emptyContentXpath = ".//div[@id='app-content-sharingout']//div[@id='emptycontent']";
 	protected $filePathInRowXpath = ".//div[@id='app-content-sharingout']//tbody[@id='fileList']//tr";
 	protected $deleteAllSelectedBtnXpath = ".//*[@id='app-content-files']//*[@class='delete-selected']";
diff --git a/tests/acceptance/features/lib/SharedWithYouPage.php b/tests/acceptance/features/lib/SharedWithYouPage.php
index 8ba6560b013f..f713b3ae9617 100644
--- a/tests/acceptance/features/lib/SharedWithYouPage.php
+++ b/tests/acceptance/features/lib/SharedWithYouPage.php
@@ -28,7 +28,7 @@
  * Shared with you page.
  */
 class SharedWithYouPage extends FilesPageBasic {
-	
+
 	/**
 	 *
 	 * @var string $path
@@ -36,30 +36,30 @@ class SharedWithYouPage extends FilesPageBasic {
 	protected $path = '/index.php/apps/files/?view=sharingin';
 	protected $fileNamesXpath = "//span[contains(@class,'nametext') and not(contains(@class,'innernametext'))]";
 	protected $fileNameMatchXpath = "//span[contains(@class,'nametext') and not(contains(@class,'innernametext')) and .=%s]";
-	protected $fileListXpath = ".//div[@id='app-content-sharingin']//tbody[@id='fileList']";
+	protected $fileListXpath = ".//div[@id='app-content']//tbody[@id='fileList' and count(*) >= 1]";
 	protected $emptyContentXpath = ".//div[@id='app-content-sharingin']//div[@id='emptycontent']";
-	
+
 	/**
 	 * @return string
 	 */
 	protected function getFileListXpath() {
 		return $this->fileListXpath;
 	}
-	
+
 	/**
 	 * @return string
 	 */
 	protected function getFileNamesXpath() {
 		return $this->fileNamesXpath;
 	}
-	
+
 	/**
 	 * @return string
 	 */
 	protected function getFileNameMatchXpath() {
 		return $this->fileNameMatchXpath;
 	}
-	
+
 	/**
 	 * @return string
 	 */
@@ -95,7 +95,7 @@ public function declineFile(
 	) {
 		$this->initAjaxCounters($session);
 		$this->resetSumStartedAjaxRequests($session);
-		
+
 		for ($counter = 0; $counter < $maxRetries; $counter++) {
 			$row = $this->findFileRowByName($name, $session);
 			try {
diff --git a/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature b/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature
index 266673d59091..92e8bd3f07d4 100644
--- a/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature
+++ b/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature
@@ -659,3 +659,193 @@ Feature: Sharing files and folders with internal users
     And the option to delete file "lorem.txt" should not be available on the webUI
     When the user shares file "lorem.txt" with user "User Three" using the webUI
     Then as "user3" file "lorem.txt" should exist
+
+  Scenario: Create share with internal users and view those shared resources in files page and shared-with-others page
+    Given these users have been created with default attributes and skeleton files:
+      | username |
+      | user1    |
+      | user2    |
+    And user "user2" has logged in using the webUI
+    When the user shares folder "simple-folder" with user "User One" using the webUI
+    And the user shares file "lorem.txt" with user "User One" using the webUI
+    Then folder "simple-folder" should not have share indicator on the webUI
+    And file "lorem.txt" should not have share indicator on the webUI
+    When the user opens folder "simple-folder" using the webUI
+    Then following resources should have share indicators on the webUI
+      | simple-empty-folder                   |
+      | lorem.txt                             |
+      | block-aligned.txt                     |
+      | testavatar.png                        |
+      | testapp.zip                           |
+    When the user opens folder "simple-empty-folder" using the webUI
+    And the user uploads file "new-lorem.txt" using the webUI
+    And the user creates a folder with the name "XYZ" using the webUI
+    Then file "new-lorem.txt" should have share indicator on the webUI
+    And folder "XYZ" should have share indicator on the webUI
+    When the user browses to the shared-with-others page
+    Then following resources should not have share indicators on the webUI
+      | simple-folder                   |
+      | lorem.txt                       |
+    When the user opens folder "simple-folder" using the webUI
+    Then following resources should have share indicators on the webUI
+      | simple-empty-folder                   |
+      | lorem.txt                             |
+      | block-aligned.txt                     |
+      | testavatar.png                        |
+      | testapp.zip                           |
+
+  Scenario: Create share for a folder within a group and view the shared folder in files page and shared-with-others page
+    Given these users have been created with default attributes and skeleton files:
+      | username |
+      | user1    |
+      | user2    |
+    And group "grp1" has been created
+    And user "user1" has been added to group "grp1"
+    And user "user2" has logged in using the webUI
+    When the user shares folder "simple-folder" with group "grp1" using the webUI
+    And the user opens folder "simple-folder" using the webUI
+    Then following resources should have share indicators on the webUI
+      | simple-empty-folder                   |
+      | lorem.txt                             |
+      | block-aligned.txt                     |
+      | testavatar.png                        |
+      | testapp.zip                           |
+    When the user opens folder "simple-empty-folder" using the webUI
+    And the user uploads file "new-lorem.txt" using the webUI
+    And the user creates a folder with the name "XYZ" using the webUI
+    Then file "new-lorem.txt" should have share indicator on the webUI
+    And folder "XYZ" should have share indicator on the webUI
+    When the user browses to the shared-with-others page
+    Then following resources should not have share indicators on the webUI
+      | simple-folder                   |
+
+  Scenario: user receives a share from another user and view that received share in files page and shared-wih-you page when auto-accept-share is enabled
+    Given the setting "Automatically accept new incoming local user shares" in the section "Sharing" has been enabled
+    And these users have been created with default attributes and skeleton files:
+      | username |
+      | user1    |
+      | user2    |
+    And user "user1" has logged in using the webUI
+    And the user has shared folder "simple-folder" with user "User Two" using the webUI
+    And the user re-logs in as "user2" using the webUI
+    When the user opens folder "simple-folder (2)" using the webUI
+    Then following resources should not have share indicators on the webUI
+      | simple-empty-folder                   |
+      | lorem.txt                             |
+      | block-aligned.txt                     |
+      | testavatar.png                        |
+      | testapp.zip                           |
+    When the user browses to the shared-with-you page
+    Then following resources should not have share indicators on the webUI
+      | simple-folder (2)                     |
+    When the user opens folder "simple-folder (2)" using the webUI
+    Then following resources should not have share indicators on the webUI
+      | simple-empty-folder                   |
+      | lorem.txt                             |
+      | block-aligned.txt                     |
+      | testavatar.png                        |
+      | testapp.zip                           |
+
+  Scenario: user creates a public link for a folder and views the shared folder from files page, shared-with-others page
+    and shared-by-link page
+    Given these users have been created with default attributes and skeleton files:
+      | username |
+      | user1    |
+    And user "user1" has logged in using the webUI
+    When the user creates a new public link for folder "simple-folder" using the webUI
+    And the user closes the share dialog
+    And the user opens folder "simple-folder" using the webUI
+    Then following resources should have share indicators on the webUI
+      | simple-empty-folder                   |
+      | lorem.txt                             |
+      | block-aligned.txt                     |
+      | testavatar.png                        |
+      | testapp.zip                           |
+    When the user browses to the shared-with-others page
+    And the user opens folder "simple-folder" using the webUI
+    Then following resources should have share indicators on the webUI
+      | simple-empty-folder                   |
+      | lorem.txt                             |
+      | block-aligned.txt                     |
+      | testavatar.png                        |
+      | testapp.zip                           |
+    When the user browses to the shared-by-link page
+    And the user opens folder "simple-folder" using the webUI
+    Then following resources should have share indicators on the webUI
+      | simple-empty-folder                   |
+      | lorem.txt                             |
+      | block-aligned.txt                     |
+      | testavatar.png                        |
+      | testapp.zip                           |
+
+  Scenario: resharing by public link and view the shared resource from different pages
+    Given these users have been created with default attributes and skeleton files:
+      | username |
+      | user1    |
+      | user2    |
+    And user "user1" has shared folder "/simple-folder" with user "user2" with permissions "share,read"
+    And user "user2" has logged in using the webUI
+    When the user creates a new public link for folder "simple-folder (2)" using the webUI with
+      | name | Public link |
+    And the user closes the share dialog
+    And the user opens folder "simple-folder (2)" using the webUI
+    Then following resources should have share indicators on the webUI
+      | simple-empty-folder                   |
+      | lorem.txt                             |
+      | block-aligned.txt                     |
+      | testavatar.png                        |
+      | testapp.zip                           |
+    When the user browses to the shared-with-you page
+    And the user opens folder "simple-folder (2)" using the webUI
+    Then following resources should have share indicators on the webUI
+      | simple-empty-folder                   |
+      | lorem.txt                             |
+      | block-aligned.txt                     |
+      | testavatar.png                        |
+      | testapp.zip                           |
+    When the user browses to the shared-by-link page
+    And the user opens folder "simple-folder (2)" using the webUI
+    Then following resources should have share indicators on the webUI
+      | simple-empty-folder                   |
+      | lorem.txt                             |
+      | block-aligned.txt                     |
+      | testavatar.png                        |
+      | testapp.zip                           |
+    When the user browses to the shared-with-others page
+    And the user opens folder "simple-folder (2)" using the webUI
+    Then following resources should have share indicators on the webUI
+      | simple-empty-folder                   |
+      | lorem.txt                             |
+      | block-aligned.txt                     |
+      | testavatar.png                        |
+      | testapp.zip                           |
+
+  Scenario: shares a sub folder and view the received share form files page and shared-with-you page
+    Given these users have been created with default attributes and skeleton files:
+      | username |
+      | user1    |
+      | user2    |
+    And user "user1" has uploaded file "filesForUpload/lorem.txt" to "simple-folder/simple-empty-folder/lorem.txt"
+    And user "user1" has shared folder "/simple-folder/simple-empty-folder" with user "user2"
+    And user "user2" has logged in using the webUI
+    When the user opens folder "simple-empty-folder (2)" using the webUI
+    Then file "lorem.txt" should not have share indicator on the webUI
+    When the user browses to the shared-with-you page
+    And the user opens folder "simple-empty-folder (2)" using the webUI
+    Then file "lorem.txt" should not have share indicator on the webUI
+
+  Scenario: shares a sub folder and view the shared resource form files page and shared-with-others page
+    Given these users have been created with default attributes and skeleton files:
+      | username |
+      | user1    |
+      | user2    |
+    And user "user1" has uploaded file "filesForUpload/lorem.txt" to "simple-folder/simple-empty-folder/lorem.txt"
+    And user "user1" has shared folder "/simple-folder/simple-empty-folder" with user "user2" with permissions "share,read"
+    And user "user1" has logged in using the webUI
+    When the user opens folder "simple-folder" using the webUI
+    Then folder "simple-empty-folder" should not have share indicator on the webUI
+    When the user opens folder "simple-empty-folder" using the webUI
+    Then file "lorem.txt" should have share indicator on the webUI
+    When the user browses to the shared-with-others page
+    And the user opens folder "simple-empty-folder" using the webUI
+    Then file "lorem.txt" should have share indicator on the webUI