diff --git a/web-src/src/components/TabsAudiobooks.vue b/web-src/src/components/TabsAudiobooks.vue
index f7e462ae..f2cbec84 100644
--- a/web-src/src/components/TabsAudiobooks.vue
+++ b/web-src/src/components/TabsAudiobooks.vue
@@ -17,7 +17,7 @@
                       name="account-music"
                       size="16"
                     />
-                    <span v-text="$t('tabs.audiobooks.authors')" />
+                    <span v-text="$t('page.audiobooks.tabs.authors')" />
                   </a>
                 </li>
               </router-link>
@@ -29,7 +29,7 @@
                 <li :class="{ 'is-active': isActive }">
                   <a @click="navigate" @keypress.enter="navigate">
                     <mdicon class="icon is-small" name="album" size="16" />
-                    <span v-text="$t('tabs.audiobooks.audiobooks')" />
+                    <span v-text="$t('page.audiobooks.tabs.audiobooks')" />
                   </a>
                 </li>
               </router-link>
diff --git a/web-src/src/components/TabsMusic.vue b/web-src/src/components/TabsMusic.vue
index bdf40324..5de08ede 100644
--- a/web-src/src/components/TabsMusic.vue
+++ b/web-src/src/components/TabsMusic.vue
@@ -13,7 +13,7 @@
                 <li :class="{ 'is-active': isActive }">
                   <a @click="navigate" @keypress.enter="navigate">
                     <mdicon class="icon is-small" name="web" size="16" />
-                    <span v-text="$t('page.settings.tabs.music.browse')" />
+                    <span v-text="$t('page.browse.tabs.browse')" />
                   </a>
                 </li>
               </router-link>
@@ -29,7 +29,7 @@
                       name="account-music"
                       size="16"
                     />
-                    <span v-text="$t('page.settings.tabs.music.artists')" />
+                    <span v-text="$t('page.browse.tabs.artists')" />
                   </a>
                 </li>
               </router-link>
@@ -41,7 +41,7 @@
                 <li :class="{ 'is-active': isActive }">
                   <a @click="navigate" @keypress.enter="navigate">
                     <mdicon class="icon is-small" name="album" size="16" />
-                    <span v-text="$t('page.settings.tabs.music.albums')" />
+                    <span v-text="$t('page.browse.tabs.albums')" />
                   </a>
                 </li>
               </router-link>
@@ -53,7 +53,7 @@
                 <li :class="{ 'is-active': isActive }">
                   <a @click="navigate" @keypress.enter="navigate">
                     <mdicon class="icon is-small" name="speaker" size="16" />
-                    <span v-text="$t('page.settings.tabs.music.genres')" />
+                    <span v-text="$t('page.browse.tabs.genres')" />
                   </a>
                 </li>
               </router-link>
@@ -69,7 +69,7 @@
                       name="book-open-page-variant"
                       size="16"
                     />
-                    <span v-text="$t('page.settings.tabs.music.composers')" />
+                    <span v-text="$t('page.browse.tabs.composers')" />
                   </a>
                 </li>
               </router-link>
@@ -82,7 +82,7 @@
                 <li :class="{ 'is-active': isActive }">
                   <a @click="navigate" @keypress.enter="navigate">
                     <mdicon class="icon is-small" name="spotify" size="16" />
-                    <span v-text="$t('page.settings.tabs.music.spotify')" />
+                    <span v-text="$t('page.browse.tabs.spotify')" />
                   </a>
                 </li>
               </router-link>
diff --git a/web-src/src/components/TabsSearch.vue b/web-src/src/components/TabsSearch.vue
index 660b925a..2539b077 100644
--- a/web-src/src/components/TabsSearch.vue
+++ b/web-src/src/components/TabsSearch.vue
@@ -12,7 +12,7 @@
               >
                 <a @click="search_library">
                   <mdicon class="icon is-small" name="bookshelf" size="16" />
-                  <span v-text="$t('page.settings.tabs.search.library')" />
+                  <span v-text="$t('page.search.tabs.library')" />
                 </a>
               </li>
               <li
@@ -22,7 +22,7 @@
               >
                 <a @click="search_spotify">
                   <mdicon class="icon is-small" name="spotify" size="16" />
-                  <span v-text="$t('page.settings.tabs.search.spotify')" />
+                  <span v-text="$t('page.search.tabs.spotify')" />
                 </a>
               </li>
             </ul>
diff --git a/web-src/src/components/TabsSettings.vue b/web-src/src/components/TabsSettings.vue
index d120e047..0ea5b396 100644
--- a/web-src/src/components/TabsSettings.vue
+++ b/web-src/src/components/TabsSettings.vue
@@ -12,7 +12,7 @@
               >
                 <li :class="{ 'is-active': isActive }">
                   <a @click="navigate" @keypress.enter="navigate">
-                    <span v-text="$t('page.settings.tabs.settings.general')" />
+                    <span v-text="$t('page.settings.tabs.general')" />
                   </a>
                 </li>
               </router-link>
@@ -25,7 +25,7 @@
                   <a @click="navigate" @keypress.enter="navigate">
                     <span
                       v-text="
-                        $t('page.settings.tabs.settings.remotes-and-outputs')
+                        $t('page.settings.tabs.remotes-and-outputs')
                       "
                     />
                   </a>
@@ -38,7 +38,7 @@
               >
                 <li :class="{ 'is-active': isActive }">
                   <a @click="navigate" @keypress.enter="navigate">
-                    <span v-text="$t('page.settings.tabs.settings.artwork')" />
+                    <span v-text="$t('page.settings.tabs.artwork')" />
                   </a>
                 </li>
               </router-link>
@@ -50,7 +50,7 @@
                 <li :class="{ 'is-active': isActive }">
                   <a @click="navigate" @keypress.enter="navigate">
                     <span
-                      v-text="$t('page.settings.tabs.settings.online-services')"
+                      v-text="$t('page.settings.tabs.online-services')"
                     />
                   </a>
                 </li>
diff --git a/web-src/src/locales/en.json b/web-src/src/locales/en.json
index 5bc7eba5..88889e9e 100644
--- a/web-src/src/locales/en.json
+++ b/web-src/src/locales/en.json
@@ -302,6 +302,10 @@
       "artists": {
         "count": "{count} authors",
         "title": "Authors"
+      },
+      "tabs": {
+        "authors": "Authors",
+        "audiobooks": "Audiobooks"
       }
     },
     "browse": {
@@ -315,6 +319,14 @@
       "recently-played": {
         "title": "Recently played",
         "tracks": "tracks"
+      },
+      "tabs": {
+        "albums": "Albums",
+        "artists": "Artists",
+        "browse": "Browse",
+        "composers": "Composers",
+        "genres": "Genres",
+        "spotify": "Spotify"
       }
     },
     "composer": {
@@ -409,7 +421,11 @@
       "show-playlists": "Show all {count} playlists",
       "show-podcasts": "Show all {count} podcasts",
       "show-tracks": "Show all {count} tracks",
-      "tracks": "Tracks"
+      "tracks": "Tracks",
+      "tabs": {
+        "library": "Library",
+        "spotify": "Spotify"
+      }
     },
     "settings": {
       "artwork": {
@@ -481,24 +497,10 @@
         "logout": "Logout"
       },
       "tabs": {
-        "music": {
-          "albums": "Albums",
-          "artists": "Artists",
-          "browse": "Browse",
-          "composers": "Composers",
-          "genres": "Genres",
-          "spotify": "Spotify"
-        },
-        "search": {
-          "library": "Library",
-          "spotify": "Spotify"
-        },
-        "settings": {
-          "artwork": "Artwork",
-          "general": "General",
-          "online-services": "Online Services",
-          "remotes-and-outputs": "Remotes and Outputs"
-        }
+        "artwork": "Artwork",
+        "general": "General",
+        "online-services": "Online Services",
+        "remotes-and-outputs": "Remotes and Outputs"
       }
     },
     "spotify": {
diff --git a/web-src/src/locales/fr.json b/web-src/src/locales/fr.json
index 78d3343c..e0cfa308 100644
--- a/web-src/src/locales/fr.json
+++ b/web-src/src/locales/fr.json
@@ -302,6 +302,10 @@
       "artists": {
         "count": "{count} auteurs",
         "title": "Auteurs"
+      },
+      "tabs": {
+        "authors": "Auteurs",
+        "audiobooks": "Livres audio"
       }
     },
     "browse": {
@@ -315,6 +319,14 @@
       "recently-played": {
         "title": "Lectures récentes",
         "pistes": "pistes"
+      },
+      "tabs": {
+        "albums": "Albums",
+        "artists": "Artistes",
+        "browse": "Parcourir",
+        "composers": "Compositeurs",
+        "genres": "Genres",
+        "spotify": "Spotify"
       }
     },
     "composer": {
@@ -409,7 +421,11 @@
       "show-playlists": "Afficher les {count} listes de lecture",
       "show-podcasts": "Afficher les {count} podcasts",
       "show-tracks": "Afficher les {count} pistes",
-      "pistes": "Pistes"
+      "pistes": "Pistes",
+      "tabs": {
+        "library": "Bibliothèque",
+        "spotify": "Spotify"
+      }
     },
     "settings": {
       "artwork": {
@@ -481,24 +497,10 @@
         "logout": "Se déconnecter"
       },
       "tabs": {
-        "music": {
-          "albums": "Albums",
-          "artists": "Artistes",
-          "browse": "Parcourir",
-          "composers": "Compositeurs",
-          "genres": "Genres",
-          "spotify": "Spotify"
-        },
-        "search": {
-          "library": "Library",
-          "spotify": "Spotify"
-        },
-        "settings": {
-          "artwork": "Illustrations",
-          "general": "Général",
-          "online-services": "Services en ligne",
-          "remotes-and-outputs": "Télécommandes et sorties"
-        }
+        "artwork": "Illustrations",
+        "general": "Général",
+        "online-services": "Services en ligne",
+        "remotes-and-outputs": "Télécommandes et sorties"
       }
     },
     "spotify": {
diff --git a/web-src/src/pages/PageAudiobooksArtists.vue b/web-src/src/pages/PageAudiobooksArtists.vue
index b97f5fa5..12b0e93d 100644
--- a/web-src/src/pages/PageAudiobooksArtists.vue
+++ b/web-src/src/pages/PageAudiobooksArtists.vue
@@ -9,7 +9,7 @@
         <p class="title is-4" v-text="$t('page.audiobooks.artists.title')" />
         <p
           class="heading"
-          v-text="$t('page.audiobooks.artists.count', { count: tists.count })"
+          v-text="$t('page.audiobooks.artists.count', { count: artists.count })"
         />
       </template>
       <template #heading-right />
diff --git a/web-src/src/pages/SettingsPageOnlineServices.vue b/web-src/src/pages/SettingsPageOnlineServices.vue
index da75696b..9ff0b44c 100644
--- a/web-src/src/pages/SettingsPageOnlineServices.vue
+++ b/web-src/src/pages/SettingsPageOnlineServices.vue
@@ -14,7 +14,7 @@
         </div>
         <div v-if="spotify.spotify_installed">
           <div class="notification is-size-7">
-            <b v-text="$t('page.settings.services.spotify.requirements')" />
+            <span v-text="$t('page.settings.services.spotify.requirements')" />
             <span
               v-if="use_libspotity"
               v-text="$t('page.settings.services.spotify.help')"
@@ -49,7 +49,7 @@
             </div>
             <p class="help">
               <span v-text="$t('page.settings.services.spotify.scopes')" />
-              <code v-text="spotify_required_scope.join()" />
+              <code v-text="spotify_required_scope.join(', ')" />
             </p>
             <div
               v-if="spotify.webapi_token_valid"