diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index f83d5556..2380fc80 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -27,7 +27,7 @@
     "/chunks/database.js": "/chunks/database.js?id=a6f7e8d1696493c60072",
     "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=1d8ee4bfbcde69c97021",
     "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=f56517bee181ef89921f",
-    "/chunks/files.js": "/chunks/files.js?id=e3c6ea1a30b677daea6f",
+    "/chunks/files.js": "/chunks/files.js?id=ab5e91e9877f2478d323",
     "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/trash~chunks~3ea7670b.js": "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/trash~chunks~3ea7670b.js?id=335030ccf561b022c47f",
     "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js?id=fe3fac648fc629b4dd8e",
     "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=06fc72f0d9a057bb8f18",
@@ -61,7 +61,7 @@
     "/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=63c4118231cfa758568a",
     "/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=c980f249fc2160857d83",
     "/chunks/subscription-service.js": "/chunks/subscription-service.js?id=00c4ca867ef06d26531f",
-    "/chunks/trash.js": "/chunks/trash.js?id=23a7513cb5cf933ac4ae",
+    "/chunks/trash.js": "/chunks/trash.js?id=858de1ee82d7211430ae",
     "/chunks/upgrade.js": "/chunks/upgrade.js?id=162c5e25074368ca36d1",
     "/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js?id=638ac716c4995894563c",
     "/chunks/upgrade-billing~chunks/upgrade-plan.js": "/chunks/upgrade-billing~chunks/upgrade-plan.js?id=e912e466f43f90392e50",
@@ -228,5 +228,34 @@
     "/js/main.a7e0ee0912b0c6965dfb.hot-update.js": "/js/main.a7e0ee0912b0c6965dfb.hot-update.js",
     "/js/main.d9b86a7675569dbff5b0.hot-update.js": "/js/main.d9b86a7675569dbff5b0.hot-update.js",
     "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.b466240212bb08f60c81.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.b466240212bb08f60c81.hot-update.js",
-    "/js/main.0144cb83b62ec5df33ec.hot-update.js": "/js/main.0144cb83b62ec5df33ec.hot-update.js"
+    "/js/main.0144cb83b62ec5df33ec.hot-update.js": "/js/main.0144cb83b62ec5df33ec.hot-update.js",
+    "/chunks/files.7c1ab1d6aa243a75662c.hot-update.js": "/chunks/files.7c1ab1d6aa243a75662c.hot-update.js",
+    "/chunks/files.35421ebd1f54be7c94ca.hot-update.js": "/chunks/files.35421ebd1f54be7c94ca.hot-update.js",
+    "/chunks/files.e07ed5471a8429c2fb33.hot-update.js": "/chunks/files.e07ed5471a8429c2fb33.hot-update.js",
+    "/chunks/files.27da7912e4499b5a8854.hot-update.js": "/chunks/files.27da7912e4499b5a8854.hot-update.js",
+    "/chunks/files.be6162bf354ed5fd5a3b.hot-update.js": "/chunks/files.be6162bf354ed5fd5a3b.hot-update.js",
+    "/chunks/files.acf14af7dab5ad3cc755.hot-update.js": "/chunks/files.acf14af7dab5ad3cc755.hot-update.js",
+    "/js/main.9efef46a124f1f10205b.hot-update.js": "/js/main.9efef46a124f1f10205b.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.js?id=e2ca36edc63a7302336d",
+    "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/user-subscription.js": "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/user-subscription.js?id=e285e842f58178d681c4",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.js": "/chunks/files~chunks/shared-files~chunks/shared-page.js?id=45fda8f6cfee1ae1289f",
+    "/chunks/trash.9efef46a124f1f10205b.hot-update.js": "/chunks/trash.9efef46a124f1f10205b.hot-update.js",
+    "/js/main.21d38cf664bf36a3218d.hot-update.js": "/js/main.21d38cf664bf36a3218d.hot-update.js",
+    "/js/main.c0bd185ce5cf6d0f42fe.hot-update.js": "/js/main.c0bd185ce5cf6d0f42fe.hot-update.js",
+    "/js/main.2b4f0d55d74d9376dc97.hot-update.js": "/js/main.2b4f0d55d74d9376dc97.hot-update.js",
+    "/js/main.a83317b5c21fd312880d.hot-update.js": "/js/main.a83317b5c21fd312880d.hot-update.js",
+    "/js/main.eb444d340edc27fb4306.hot-update.js": "/js/main.eb444d340edc27fb4306.hot-update.js",
+    "/js/main.92a0c47caf92d5513e27.hot-update.js": "/js/main.92a0c47caf92d5513e27.hot-update.js",
+    "/chunks/files.0a44809aa04c98dc77f0.hot-update.js": "/chunks/files.0a44809aa04c98dc77f0.hot-update.js",
+    "/js/main.610ae15e30ce0bad02e3.hot-update.js": "/js/main.610ae15e30ce0bad02e3.hot-update.js",
+    "/js/main.f1feddde73f2d92b644f.hot-update.js": "/js/main.f1feddde73f2d92b644f.hot-update.js",
+    "/js/main.ccf2331964e8ad03311f.hot-update.js": "/js/main.ccf2331964e8ad03311f.hot-update.js",
+    "/js/main.1e3f69887fecaf4a3b38.hot-update.js": "/js/main.1e3f69887fecaf4a3b38.hot-update.js",
+    "/chunks/files.d02b0e6f0915db18a034.hot-update.js": "/chunks/files.d02b0e6f0915db18a034.hot-update.js",
+    "/chunks/files.4a15f2423fd82ae2afcd.hot-update.js": "/chunks/files.4a15f2423fd82ae2afcd.hot-update.js",
+    "/js/main.95d913389693387ea34d.hot-update.js": "/js/main.95d913389693387ea34d.hot-update.js",
+    "/js/main.3295b76e0199daee33ab.hot-update.js": "/js/main.3295b76e0199daee33ab.hot-update.js",
+    "/js/main.5cadc640fd72e10023d0.hot-update.js": "/js/main.5cadc640fd72e10023d0.hot-update.js",
+    "/js/main.c19b586ae30be0c51c01.hot-update.js": "/js/main.c19b586ae30be0c51c01.hot-update.js",
+    "/js/main.c65cb1734de918f616d0.hot-update.js": "/js/main.c65cb1734de918f616d0.hot-update.js"
 }
diff --git a/resources/js/components/Sidebar/MenuBar.vue b/resources/js/components/Sidebar/MenuBar.vue
index 8e7fe432..00674c8d 100644
--- a/resources/js/components/Sidebar/MenuBar.vue
+++ b/resources/js/components/Sidebar/MenuBar.vue
@@ -20,19 +20,13 @@
                 </div>
             </router-link>
 
-            <router-link :to="{name: 'Trash'}" :title="$t('locations.trash')" class="icon-navigation-item trash">
-                <div class="button-icon">
-                    <trash-2-icon size="19"></trash-2-icon>
-                </div>
-            </router-link>
-
-            <router-link :to="{name: 'Profile'}" :class="{'is-active': isUserProfileRoute}" class="icon-navigation-item settings">
+            <router-link :to="{name: 'Profile'}" :class="{'is-active': isUserProfileRoute}" :title="$t('locations.profile')" class="icon-navigation-item settings">
                 <div class="button-icon">
                     <user-icon size="19"></user-icon>
                 </div>
             </router-link>
 
-            <router-link v-if="user.data.attributes.role === 'admin'" :to="{name: 'Dashboard'}" :class="{'is-active': $isThisRoute($route, adminRoutes)}" class="icon-navigation-item users">
+            <router-link v-if="user.data.attributes.role === 'admin'" :to="{name: 'Dashboard'}" :class="{'is-active': $isThisRoute($route, adminRoutes)}" :title="$t('locations.settings')" class="icon-navigation-item users">
                 <div class="button-icon">
                     <settings-icon size="19"></settings-icon>
                 </div>
@@ -41,7 +35,7 @@
 
         <!--User avatar & Logout-->
         <ul class="icon-navigation logout">
-            <li @click="$store.dispatch('logOut')" class="icon-navigation-item">
+            <li @click="$store.dispatch('logOut')" :title="$t('locations.logout')" class="icon-navigation-item">
                 <div class="button-icon">
                     <power-icon size="19"></power-icon>
                 </div>
diff --git a/resources/js/i18n/lang/cn.json b/resources/js/i18n/lang/cn.json
index ec9f289b..21d09088 100644
--- a/resources/js/i18n/lang/cn.json
+++ b/resources/js/i18n/lang/cn.json
@@ -357,7 +357,10 @@
 	"locations": {
 		"home": "首页",
 		"shared": "已分享",
-		"trash": "垃圾箱"
+		"trash": "垃圾箱",
+		"profile": "Profile",
+		"settings": "Settings",
+		"logout": "Log Out"
 	},
 	"menu": {
 		"admin": "Admin",
@@ -580,10 +583,6 @@
 		"message": "您的订阅已重新激活，并且将按原始计费周期计费。",
 		"title": "订阅已取消"
 	},
-	"popup_trashed": {
-		"message": "现在，您的垃圾箱已经被完全清空。",
-		"title": "您的垃圾箱已清空！"
-	},
 	"preview_type": {
 		"grid": "方块",
 		"list": "列表"
diff --git a/resources/js/i18n/lang/en.json b/resources/js/i18n/lang/en.json
index 7e7a0ecf..3c4320e0 100644
--- a/resources/js/i18n/lang/en.json
+++ b/resources/js/i18n/lang/en.json
@@ -359,7 +359,10 @@
 	"locations": {
 		"home": "Home",
 		"shared": "Shared",
-		"trash": "Trash"
+		"trash": "Trash",
+		"profile": "Profile",
+		"settings": "Settings",
+		"logout": "Log Out"
 	},
 	"menu": {
 		"admin": "Administration",
@@ -582,10 +585,6 @@
 		"message": "Your subscription was re-activated, and they will be billed on the original billing cycle.",
 		"title": "Subscription Was Resumed"
 	},
-	"popup_trashed": {
-		"message": "So now, you have clear and empty trash.",
-		"title": "Your trash was erased!"
-	},
 	"preview_type": {
 		"grid": "Grid",
 		"list": "List"
diff --git a/resources/js/i18n/lang/sk.json b/resources/js/i18n/lang/sk.json
index 601d4565..b492510d 100644
--- a/resources/js/i18n/lang/sk.json
+++ b/resources/js/i18n/lang/sk.json
@@ -359,7 +359,10 @@
 	"locations": {
 		"home": "Domov",
 		"shared": "Zdieľané",
-		"trash": "Kôš"
+		"trash": "Kôš",
+		"profile": "Profil",
+		"settings": "Nastavenia",
+		"logout": "Odhlásiť sa"
 	},
 	"menu": {
 		"admin": "Administrácia",
@@ -582,10 +585,6 @@
 		"message": "Váš odber bol znova aktivovaný a budú vám účtované poplatky podľa pôvodného fakturačného cyklu.",
 		"title": "Predplatné bolo obnovené"
 	},
-	"popup_trashed": {
-		"message": "Od teraz máte prázdny a čistý kôš",
-		"title": "Váš kôš bol vymazaný!"
-	},
 	"preview_type": {
 		"grid": "Mriežka",
 		"list": "List"
diff --git a/resources/js/router.js b/resources/js/router.js
index 23c86ba0..e9f282f8 100644
--- a/resources/js/router.js
+++ b/resources/js/router.js
@@ -382,15 +382,6 @@ const routesUser = [
             requiresAuth: true
         },
     },
-    {
-        name: 'Trash',
-        path: '/trash',
-        component: () =>
-            import(/* webpackChunkName: "chunks/trash" */ './views/FilePages/Trash'),
-        meta: {
-            requiresAuth: true
-        },
-    },
     {
         name: 'Settings',
         path: '/settings',
diff --git a/resources/js/store/modules/fileFunctions.js b/resources/js/store/modules/fileFunctions.js
index 86e495a7..a1f8a873 100644
--- a/resources/js/store/modules/fileFunctions.js
+++ b/resources/js/store/modules/fileFunctions.js
@@ -293,12 +293,6 @@ const actions = {
 
                 // Remove file preview
                 commit('CLEAR_FILEINFO_DETAIL')
-
-                // Show success message
-                events.$emit('success:open', {
-                    title: i18n.t('popup_trashed.title'),
-                    message: i18n.t('popup_trashed.message'),
-                })
             })
             .catch(() => isSomethingWrong())
     },
diff --git a/resources/js/views/FilePages/Files.vue b/resources/js/views/FilePages/Files.vue
index 1e035340..0908b7f4 100644
--- a/resources/js/views/FilePages/Files.vue
+++ b/resources/js/views/FilePages/Files.vue
@@ -28,6 +28,15 @@
                             {{ $t('sidebar.latest') }}
                         </div>
                     </a>
+                    <a class="menu-list-item link trash" :class="{'is-active-trash': $isThisLocation(['trash', 'trash-root'])}"
+                       @click="getTrash">
+                        <div class="icon">
+                            <trash2-icon size="17"></trash2-icon>
+                        </div>
+                        <div class="label">
+                            {{ $t('locations.trash') }}
+                        </div>
+                    </a>
                 </div>
             </ContentGroup>
 
@@ -85,6 +94,7 @@
     import {
         UploadCloudIcon,
         FolderIcon,
+        Trash2Icon,
         HomeIcon,
         XIcon,
     } from 'vue-feather-icons'
@@ -99,6 +109,7 @@
             UploadCloudIcon,
             ContentGroup,
             FolderIcon,
+            Trash2Icon,
             HomeIcon,
             XIcon,
         },
@@ -121,6 +132,9 @@
             }
         },
         methods: {
+            getTrash() {
+                this.$store.dispatch('getTrash')
+            },
             getLatest() {
                 this.$store.dispatch('getLatest')
             },
diff --git a/resources/js/views/FilePages/Trash.vue b/resources/js/views/FilePages/Trash.vue
deleted file mode 100644
index ba1050da..00000000
--- a/resources/js/views/FilePages/Trash.vue
+++ /dev/null
@@ -1,51 +0,0 @@
-<template>
-    <section id="viewport">
-        <ContentSidebar>
-
-            <!--Tools-->
-            <ContentGroup :title="$t('sidebar.tools_title')" class="navigator">
-                <div class="menu-list-wrapper vertical">
-                    <div class="menu-list-item link" @click="emptyTrash()">
-                        <div class="icon">
-                            <trash-icon size="17"></trash-icon>
-                        </div>
-                        <div class="label">
-                            {{ $t('context_menu.empty_trash') }}
-                        </div>
-                    </div>
-                </div>
-            </ContentGroup>
-        </ContentSidebar>
-        <ContentFileView/>
-    </section>
-</template>
-
-<script>
-    import ContentFileView from '@/components/Others/ContentFileView'
-    import ContentSidebar from '@/components/Sidebar/ContentSidebar'
-    import ContentGroup from '@/components/Sidebar/ContentGroup'
-    import {
-        TrashIcon,
-    } from 'vue-feather-icons'
-
-    export default {
-        name: 'FilesView',
-        components: {
-            ContentFileView,
-            ContentSidebar,
-            ContentGroup,
-            TrashIcon,
-        },
-        methods: {
-            emptyTrash() {
-                this.$store.dispatch('emptyTrash')
-            },
-        },
-        created() {
-            this.$store.dispatch('getTrash')
-        }
-    }
-</script>
-
-<style lang="scss" scoped>
-</style>
diff --git a/resources/sass/app.scss b/resources/sass/app.scss
index 70e2af8c..72479787 100644
--- a/resources/sass/app.scss
+++ b/resources/sass/app.scss
@@ -130,6 +130,22 @@
       display: flex;
       align-items: center;
 
+      &.trash {
+
+        &.is-active-trash,
+        &:hover {
+          svg {
+            path, line, polyline, rect, circle, ellipse {
+              stroke: $danger;
+            }
+          }
+
+          .label {
+            color: $danger;
+          }
+        }
+      }
+
       &.is-active,
       &.router-link-exact-active,
       &:hover {