diff --git a/components/views/files/grid/item/Item.vue b/components/views/files/grid/item/Item.vue
index 9d4d298417..14c2a7defd 100644
--- a/components/views/files/grid/item/Item.vue
+++ b/components/views/files/grid/item/Item.vue
@@ -106,28 +106,28 @@ export default Vue.extend({
     },
     /**
      * @method rename
-     * @description Emit to rename item - pages/files/browse/index.vue
+     * @description Emit to rename item - pages/files/index.vue
      */
     rename() {
       this.$emit('rename', this.item)
     },
     /**
      * @method like
-     * @description Emit to like item - pages/files/browse/index.vue
+     * @description Emit to like item - pages/files/index.vue
      */
     like(event: MouseEvent) {
       this.$emit('like', this.item)
     },
     /**
      * @method share
-     * @description Emit to share item - pages/files/browse/index.vue
+     * @description Emit to share item - pages/files/index.vue
      */
     share() {
       this.$emit('share', this.item)
     },
     /**
      * @method remove
-     * @description Emit to delete item - pages/files/browse/index.vue
+     * @description Emit to delete item - pages/files/index.vue
      */
     remove() {
       this.$emit('remove', this.item)
diff --git a/components/views/files/list/row/Row.vue b/components/views/files/list/row/Row.vue
index 68eaf9b357..be31d36dec 100644
--- a/components/views/files/list/row/Row.vue
+++ b/components/views/files/list/row/Row.vue
@@ -76,7 +76,7 @@ export default Vue.extend({
   methods: {
     /**
      * @method handle
-     * @description Emit to handle item - pages/files/browse/index.vue
+     * @description Emit to handle item - pages/files/index.vue
      */
     handle() {
       if (this.$data.menuHover) {
@@ -86,28 +86,28 @@ export default Vue.extend({
     },
     /**
      * @method rename
-     * @description Emit to rename item - pages/files/browse/index.vue
+     * @description Emit to rename item - pages/files/index.vue
      */
     rename() {
       this.$emit('rename', this.item)
     },
     /**
      * @method like
-     * @description Emit to like item - pages/files/browse/index.vue
+     * @description Emit to like item - pages/files/index.vue
      */
     like() {
       this.$emit('like', this.item)
     },
     /**
      * @method share
-     * @description Emit to share item - pages/files/browse/index.vue
+     * @description Emit to share item - pages/files/index.vue
      */
     share() {
       this.$emit('share', this.item)
     },
     /**
      * @method remove
-     * @description Emit to delete item - pages/files/browse/index.vue
+     * @description Emit to delete item - pages/files/index.vue
      */
     remove() {
       this.$emit('remove', this.item)
diff --git a/components/views/files/mobileList/item/Item.vue b/components/views/files/mobileList/item/Item.vue
index d9fc0d1d0a..8afad12ee0 100644
--- a/components/views/files/mobileList/item/Item.vue
+++ b/components/views/files/mobileList/item/Item.vue
@@ -118,28 +118,28 @@ export default Vue.extend({
     },
     /**
      * @method rename
-     * @description Emit to rename item - pages/files/browse/index.vue
+     * @description Emit to rename item - pages/files/index.vue
      */
     rename() {
       this.$emit('rename', this.item)
     },
     /**
      * @method like
-     * @description Emit to like item - pages/files/browse/index.vue
+     * @description Emit to like item - pages/files/index.vue
      */
     like() {
       this.$emit('like', this.item)
     },
     /**
      * @method share
-     * @description Emit to share item - pages/files/browse/index.vue
+     * @description Emit to share item - pages/files/index.vue
      */
     share() {
       this.$emit('share', this.item)
     },
     /**
      * @method remove
-     * @description Emit to delete item - pages/files/browse/index.vue
+     * @description Emit to delete item - pages/files/index.vue
      */
     remove() {
       this.$emit('remove', this.item)
diff --git a/components/views/navigation/mobile/nav/Nav.vue b/components/views/navigation/mobile/nav/Nav.vue
index d36d73e425..4f2f30d3b7 100644
--- a/components/views/navigation/mobile/nav/Nav.vue
+++ b/components/views/navigation/mobile/nav/Nav.vue
@@ -46,15 +46,15 @@ export default Vue.extend({
     },
     /**
      * @method navigateToFriend
-     * @description Navigate to chat "/friends/list" showing slide 1 ('friends list slide')
+     * @description Navigate to chat "/friends" showing slide 1 ('friends list slide')
      */
     navigateToFriend() {
       this.$store.commit('ui/setSwiperSlideIndex', 1)
       this.$store.commit('ui/showSidebar', false)
-      this.$router.push('/friends/list')
+      this.$router.push('/friends')
     },
     navigateToFiles() {
-      this.$router.push('/files/browse')
+      this.$router.push('/files')
     },
   },
 })
diff --git a/components/views/navigation/mobile/sidebar/sidebar.vue b/components/views/navigation/mobile/sidebar/sidebar.vue
index 2858eb1218..39a48b213a 100644
--- a/components/views/navigation/mobile/sidebar/sidebar.vue
+++ b/components/views/navigation/mobile/sidebar/sidebar.vue
@@ -40,15 +40,15 @@
       <div v-if="!$device.isMobile" class="sidebar-nav">
         <div style="position: relative">
           <InteractablesButton
-            :inactive="$route.path.includes('/friends/list') ? false : true"
+            :inactive="$route.path.includes('/friends') ? false : true"
             class="sidebar-full-btn"
-            :type="$route.path.includes('/friends/list') ? 'primary' : 'dark'"
+            :type="$route.path.includes('/friends') ? 'primary' : 'dark'"
             size="small"
             :action="
               () => {
                 friends.incomingRequests.length
-                  ? $router.push('/friends/list?tab=requests')
-                  : $router.push('/friends/list')
+                  ? $router.push('/friends?tab=requests')
+                  : $router.push('/friends')
               }
             "
             :text="$t('friends.friends')"
@@ -58,9 +58,7 @@
           <span
             v-if="friends.incomingRequests.length"
             :class="
-              $route.path.includes('/friends/list')
-                ? 'label tag-inverted'
-                : 'label'
+              $route.path.includes('/friends') ? 'label tag-inverted' : 'label'
             "
           >
             {{ friends.incomingRequests.length }}
@@ -71,7 +69,7 @@
           class="sidebar-full-btn"
           :type="$route.path.includes('/files') ? 'primary' : 'dark'"
           size="small"
-          :action="() => $router.push('/files/browse')"
+          :action="() => $router.push('/files')"
           :text="$t('files.files')"
         >
           <folder-icon size="1.2x" />
@@ -262,14 +260,14 @@ export default Vue.extend({
     },
     /**
      * @name gotoAddFriends
-     * @description go to 'friends/list'
+     * @description go to 'friends'
      */
     gotoAddFriends() {
       this.$router.push({ path: '/friends/mobile/add' })
     },
     /**
      * @name gotoNewMessage
-     * @description go to 'friends/list'
+     * @description go to 'friends'
      */
     gotoNewMessage() {
       if (this.$device.isMobile) {
diff --git a/components/views/navigation/sidebar/Sidebar.html b/components/views/navigation/sidebar/Sidebar.html
index 992875cec7..50b212243d 100644
--- a/components/views/navigation/sidebar/Sidebar.html
+++ b/components/views/navigation/sidebar/Sidebar.html
@@ -21,12 +21,12 @@
     </div>
     <div class="sidebar-nav">
       <InteractablesButton
-        :inactive="!$route.path.includes('/friends/list')"
+        :inactive="!$route.path.includes('/friends')"
         class="sidebar-full-btn"
         data-cy="sidebar-friends"
-        :type="$route.path.includes('/friends/list') ? 'primary' : 'dark'"
+        :type="$route.path.includes('/friends') ? 'primary' : 'dark'"
         size="small"
-        :action="() => $router.push('/friends/list')"
+        :action="() => $router.push('/friends')"
         :text="$t('friends.friends')"
       >
         <users-icon size="1.2x" />
@@ -34,7 +34,7 @@
       <span
         v-if="incomingRequestsLength"
         class="label"
-        :class="{inverted : $route.path.includes('/friends/list')}"
+        :class="{inverted : $route.path.includes('/friends')}"
       >
         {{incomingRequestsLength}}
       </span>
@@ -44,7 +44,7 @@
         data-cy="sidebar-files"
         :type="$route.path.includes('/files') ? 'primary' : 'dark'"
         size="small"
-        :action="() => $router.push('/files/browse')"
+        :action="() => $router.push('/files')"
         :text="$t('files.files')"
       >
         <folder-icon size="1.2x" />
diff --git a/components/views/navigation/sidebar/list/List.vue b/components/views/navigation/sidebar/list/List.vue
index db69394972..7e1bebd7e2 100644
--- a/components/views/navigation/sidebar/list/List.vue
+++ b/components/views/navigation/sidebar/list/List.vue
@@ -19,7 +19,7 @@ export default Vue.extend({
           this.$store.commit('ui/showSidebar', false)
         }
       } else {
-        this.$router.push({ path: '/friends/list' })
+        this.$router.push({ path: '/friends' })
       }
     },
   },
diff --git a/nuxt.config.js b/nuxt.config.js
index 3b21653183..38fe449c96 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -24,9 +24,9 @@ export default defineNuxtConfig({
     middleware: ['authenticated'],
     extendRoutes(routes, resolve) {
       routes.push({
-        path: '/friends/list/:id',
+        path: '/friends/:id',
         components: {
-          default: resolve(__dirname, 'pages/friends/list'),
+          default: resolve(__dirname, 'pages/friends'),
         },
       })
     },
diff --git a/pages/allcomponents.vue b/pages/allcomponents.vue
index b4692e1d11..93b42c93e8 100644
--- a/pages/allcomponents.vue
+++ b/pages/allcomponents.vue
@@ -26,8 +26,8 @@
         <ul class="menu-list">
           <li><NuxtLink to="settings/profile">Settings</NuxtLink></li>
           <li><NuxtLink to="chat/direct">Chat</NuxtLink></li>
-          <li><NuxtLink to="friends/list">Friends</NuxtLink></li>
-          <li><NuxtLink to="files/browse">Files</NuxtLink></li>
+          <li><NuxtLink to="friends">Friends</NuxtLink></li>
+          <li><NuxtLink to="files">Files</NuxtLink></li>
         </ul>
       </aside>
     </div>
diff --git a/pages/auth/register/index.vue b/pages/auth/register/index.vue
index 5622d2729b..3ea28e6d19 100644
--- a/pages/auth/register/index.vue
+++ b/pages/auth/register/index.vue
@@ -47,12 +47,12 @@ export default Vue.extend({
   watch: {
     allPrerequisitesReady(nextValue) {
       if (!nextValue) return
-      this.$router.replace('/friends/list')
+      this.$router.replace('/friends')
     },
   },
   mounted() {
     if (this.allPrerequisitesReady) {
-      this.$router.replace('/friends/list')
+      this.$router.replace('/friends')
     }
   },
   methods: {
diff --git a/pages/files/browse/Browse.html b/pages/files/Files.html
similarity index 100%
rename from pages/files/browse/Browse.html
rename to pages/files/Files.html
diff --git a/pages/files/browse/Browse.less b/pages/files/Files.less
similarity index 100%
rename from pages/files/browse/Browse.less
rename to pages/files/Files.less
diff --git a/pages/files/browse/index.vue b/pages/files/index.vue
similarity index 96%
rename from pages/files/browse/index.vue
rename to pages/files/index.vue
index c674c1de2c..6557b39a3d 100644
--- a/pages/files/browse/index.vue
+++ b/pages/files/index.vue
@@ -1,4 +1,4 @@
-<template src="./Browse.html"></template>
+<template src="./Files.html"></template>
 
 <script lang="ts">
 import Vue from 'vue'
@@ -11,7 +11,6 @@ import { FileRouteEnum } from '~/libraries/Enums/enums'
 
 export default Vue.extend({
   name: 'Files',
-
   layout: 'basic',
   data() {
     return {
@@ -101,4 +100,4 @@ export default Vue.extend({
 })
 </script>
 
-<style scoped lang="less" src="./Browse.less"></style>
+<style scoped lang="less" src="./Files.less"></style>
diff --git a/pages/friends/list/FriendsList.html b/pages/friends/Friends.html
similarity index 100%
rename from pages/friends/list/FriendsList.html
rename to pages/friends/Friends.html
diff --git a/pages/friends/list/FriendsList.less b/pages/friends/Friends.less
similarity index 100%
rename from pages/friends/list/FriendsList.less
rename to pages/friends/Friends.less
diff --git a/pages/friends/list/index.vue b/pages/friends/index.vue
similarity index 88%
rename from pages/friends/list/index.vue
rename to pages/friends/index.vue
index d7ccc96800..e25aa9e560 100644
--- a/pages/friends/list/index.vue
+++ b/pages/friends/index.vue
@@ -1,4 +1,4 @@
-<template src="./FriendsList.html"></template>
+<template src="./Friends.html"></template>
 
 <script lang="ts">
 import Vue from 'vue'
@@ -8,7 +8,7 @@ import type { Friend, FriendRequest } from '~/libraries/Iridium/friends/types'
 import { RootState } from '~/types/store/store'
 
 export default Vue.extend({
-  name: 'FriendsList',
+  name: 'Friends',
   layout: 'basic',
   data() {
     return {
@@ -38,4 +38,4 @@ export default Vue.extend({
 })
 </script>
 
-<style scoped lang="less" src="./FriendsList.less"></style>
+<style scoped lang="less" src="./Friends.less"></style>
diff --git a/pages/index.vue b/pages/index.vue
index 7462613c58..bd9e8a5c67 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -56,7 +56,7 @@ export default Vue.extend({
   methods: {
     eventuallyRedirect() {
       if (this.accounts.lastVisited === this.$route.path) {
-        this.$router.replace('/friends/list')
+        this.$router.replace('/friends')
         return
       }
 
@@ -65,7 +65,7 @@ export default Vue.extend({
         this.$router.replace(this.accounts.lastVisited)
       }
 
-      this.$router.replace('/friends/list')
+      this.$router.replace('/friends')
     },
     /**
      * @method loadAccount