diff --git a/res/template/fragments/page_wrap.html b/res/template/fragments/page_wrap.html
index 7d1f486..d5c203c 100644
--- a/res/template/fragments/page_wrap.html
+++ b/res/template/fragments/page_wrap.html
@@ -8,7 +8,7 @@
 	<a href="/user/filemanager#files">My Files</a>
 	<a href="/user/filemanager#lists">My Albums</a>
 	{{if .User.IsAdmin}}
-		<a href="/user/buckets">Buckets</a>
+		<a href="/d/me">Filesystem</a>
 		<a href="/admin">Admin Panel</a>
 	{{end}}
 	<a href="/logout">Log out</a>
diff --git a/svelte/src/filesystem/filemanager/GalleryView.svelte b/svelte/src/filesystem/filemanager/GalleryView.svelte
index f972387..ff2d360 100644
--- a/svelte/src/filesystem/filemanager/GalleryView.svelte
+++ b/svelte/src/filesystem/filemanager/GalleryView.svelte
@@ -7,7 +7,12 @@ export let state
 
 const node_icon = node => {
 	if (node.type === "dir") {
-		return "/res/img/mime/folder.png"
+		// Folders with an ID are publically shared, use the shared folder icon
+		if (node.id) {
+			return "/res/img/mime/folder-remote.png"
+		} else {
+			return "/res/img/mime/folder.png"
+		}
 	}
 
 	switch (node.file_type) {
diff --git a/svelte/src/filesystem/filemanager/ListView.svelte b/svelte/src/filesystem/filemanager/ListView.svelte
index 1e47935..2211361 100644
--- a/svelte/src/filesystem/filemanager/ListView.svelte
+++ b/svelte/src/filesystem/filemanager/ListView.svelte
@@ -8,7 +8,12 @@ export let state
 
 const node_icon = node => {
 	if (node.type === "dir") {
-		return "/res/img/mime/folder.png"
+		// Folders with an ID are publically shared, use the shared folder icon
+		if (node.id) {
+			return "/res/img/mime/folder-remote.png"
+		} else {
+			return "/res/img/mime/folder.png"
+		}
 	}
 
 	switch (node.file_type) {
diff --git a/webcontroller/filesystem.go b/webcontroller/filesystem.go
index 4827ebf..ad7438c 100644
--- a/webcontroller/filesystem.go
+++ b/webcontroller/filesystem.go
@@ -23,6 +23,8 @@ func (wc *WebController) serveDirectory(w http.ResponseWriter, r *http.Request,
 	if err != nil {
 		if err.Error() == "not_found" || err.Error() == "path_not_found" {
 			wc.templates.Get().ExecuteTemplate(w, "404", td)
+		} else if err.Error() == "authentication_required" {
+			http.Redirect(w, r, "/login", http.StatusSeeOther)
 		} else {
 			log.Error("Failed to get path: %s", err)
 			wc.templates.Get().ExecuteTemplate(w, "500", td)