diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
index 86bb7deba..5a2e94205 100644
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -10,7 +10,7 @@
         "goToPage": "go to page",
         "moveToBottom": "move to bottom",
         "moveToTop": "move to top",
-        "refresh": "$t(glossary.refresh)",
+        "refresh": "$t(common.refresh)",
         "removeFromFavorites": "remove from $t(entity.favorite_other)",
         "removeFromPlaylist": "remove from $t(entity.playlist_one)",
         "removeFromQueue": "remove from queue",
@@ -19,37 +19,68 @@
         "viewPlaylists": "view $t(entity.playlist_other)"
     },
     "common": {
+        "action_one": "action",
+        "action_other": "actions",
         "add": "add",
         "areYouSure": "are you sure?",
+        "ascending": "ascending",
         "backward": "backward",
+        "biography": "biography",
+        "bitrate": "bitrate",
+        "bpm": "bpm",
         "cancel": "cancel",
         "center": "center",
+        "channel_one": "channel",
+        "channel_other": "channels",
+        "clear": "clear",
+        "collapse": "collapse",
         "comingSoon": "coming soon...",
+        "configure": "configure",
         "confirm": "confirm",
         "create": "create",
         "currentSong": "current $t(entity.track_one)",
         "decrease": "decrease",
         "delete": "delete",
+        "descending": "descending",
+        "description": "description",
         "disable": "disable",
+        "disc": "disc",
         "dismiss": "dismiss",
+        "duration": "duration",
         "edit": "edit",
         "enable": "enable",
+        "expand": "expand",
+        "favorite": "favorite",
+        "filter_one": "filter",
+        "filter_other": "filters",
         "filters": "filters",
         "forceRestartRequired": "restart to apply changes... close the notification to restart",
         "forward": "forward",
+        "gap": "gap",
+        "home": "home",
         "increase": "increase",
         "left": "left",
+        "limit": "limit",
         "manage": "manage",
         "maximize": "maximize",
+        "menu": "menu",
         "minimize": "minimize",
         "modified": "modified",
+        "name": "name",
         "no": "no",
         "none": "none",
         "noResultsFromQuery": "the query returned no results",
+        "note": "note",
         "ok": "ok",
+        "owner": "owner",
+        "path": "path",
         "playerMustBePaused": "player must be paused",
         "previousSong": "previous $t(entity.track_one)",
         "quit": "quit",
+        "random": "random",
+        "rating": "rating",
+        "refresh": "refresh",
+        "reset": "reset",
         "resetToDefault": "reset to default",
         "restartRequired": "restart required",
         "right": "right",
@@ -57,7 +88,15 @@
         "saveAndReplace": "save and replace",
         "saveAs": "save as",
         "search": "search",
+        "setting": "setting",
+        "setting_other": "settings",
+        "size": "size",
+        "sortOrder": "order",
+        "title": "title",
+        "trackNumber": "track",
         "unknown": "unknown",
+        "version": "version",
+        "year": "year",
         "yes": "yes"
     },
     "entity": {
@@ -170,9 +209,9 @@
             "title": "add to $t(entity.playlist_one)"
         },
         "createPlaylist": {
-            "input_description": "$t(glossary.description)",
-            "input_name": "$t(glossary.name)",
-            "input_owner": "$t(glossary.owner)",
+            "input_description": "$t(common.description)",
+            "input_name": "$t(common.name)",
+            "input_owner": "$t(common.owner)",
             "input_public": "public",
             "success": "$t(entity.playlist_one) created successfully",
             "title": "create $t(entity.playlist_one)"
@@ -187,7 +226,7 @@
         },
         "lyricSearch": {
             "input_artist": "$t(entity.artist_one)",
-            "input_name": "$t(glossary.name)",
+            "input_name": "$t(common.name)",
             "title": "lyric search"
         },
         "queryEditor": {
@@ -199,48 +238,6 @@
             "title": "update server"
         }
     },
-    "glossary": {
-        "action": "action",
-        "action_other": "actions",
-        "ascending": "ascending",
-        "biography": "biography",
-        "bitrate": "bitrate",
-        "bpm": "bpm",
-        "channel": "channel",
-        "channel_other": "channels",
-        "clear": "clear",
-        "collapse": "collapse",
-        "configure": "configure",
-        "descending": "descending",
-        "description": "description",
-        "disc": "disc",
-        "duration": "duration",
-        "expand": "expand",
-        "favorite": "favorite",
-        "filter_one": "filter",
-        "filter_other": "filters",
-        "gap": "gap",
-        "home": "home",
-        "limit": "limit",
-        "menu": "menu",
-        "name": "name",
-        "note": "note",
-        "owner": "owner",
-        "path": "path",
-        "random": "random",
-        "rating": "rating",
-        "refresh": "refresh",
-        "reset": "reset",
-        "search": "search",
-        "setting": "setting",
-        "setting_other": "settings",
-        "size": "size",
-        "sortOrder": "order",
-        "title": "title",
-        "trackNumber": "track",
-        "version": "version",
-        "year": "year"
-    },
     "page": {
         "albumArtistList": {
             "title": "$t(entity.albumArtist_other)"
@@ -261,7 +258,7 @@
             "openBrowserDevtools": "open browser devtools",
             "quit": "$t(common.quit)",
             "selectServer": "select server",
-            "settings": "$t(glossary.setting_other)",
+            "settings": "$t(common.setting_other)",
             "version": "version {{version}}"
         },
         "contextMenu": {
@@ -316,7 +313,7 @@
             "mostPlayed": "most played",
             "newlyAdded": "newly added releases",
             "recentlyPlayed": "recently played",
-            "title": "$t(glossary.home)"
+            "title": "$t(common.home)"
         },
         "playlistList": {
             "title": "$t(entity.playlist_other)"
@@ -333,10 +330,10 @@
             "artists": "$t(entity.artist_other)",
             "folders": "$t(entity.folder_other)",
             "genres": "$t(entity.genre_other)",
-            "home": "$t(glossary.home)",
+            "home": "$t(common.home)",
             "nowPlaying": "now playing",
             "playlists": "$t(entity.playlist_other)",
-            "search": "$t(glossary.search)",
+            "search": "$t(common.search)",
             "settings": "$t(entity.setting_other)",
             "tracks": "$t(entity.track_other)"
         },
@@ -547,7 +544,7 @@
             "biography": "biography",
             "bitrate": "bitrate",
             "bpm": "bpm",
-            "channels": "channels",
+            "channels": "$t(common.channel_other)",
             "comment": "comment",
             "dateAdded": "date added",
             "discNumber": "disc",
@@ -567,37 +564,37 @@
             "general": {
                 "autoFitColumns": "auto fit columns",
                 "displayType": "display type",
-                "gap": "$t(glossary.gap)",
-                "size": "$t(glossary.size)",
+                "gap": "$t(common.gap)",
+                "size": "$t(common.size)",
                 "tableColumns": "table columns"
             },
             "label": {
-                "actions": "$t(glossary.action_other)",
+                "actions": "$t(common.action_other)",
                 "album": "$t(entity.album_one)",
                 "albumArtist": "$t(entity.albumArtist_one)",
                 "artist": "$t(entity.artist_one)",
-                "biography": "$t(glossary.biography)",
-                "bitrate": "$t(glossary.bitrate)",
-                "bpm": "$t(glossary.bpm)",
-                "channels": "$t(glossary.channel_other)",
+                "biography": "$t(common.biography)",
+                "bitrate": "$t(common.bitrate)",
+                "bpm": "$t(common.bpm)",
+                "channels": "$t(common.channel_other)",
                 "dateAdded": "date added",
                 "discNumber": "disc number",
-                "duration": "$t(glossary.duration)",
-                "favorite": "$t(glossary.favorite)",
+                "duration": "$t(common.duration)",
+                "favorite": "$t(common.favorite)",
                 "genre": "$t(entity.genre_one)",
                 "lastPlayed": "last played",
-                "note": "$t(glossary.note)",
-                "owner": "$t(glossary.owner)",
-                "path": "$t(glossary.path)",
+                "note": "$t(common.note)",
+                "owner": "$t(common.owner)",
+                "path": "$t(common.path)",
                 "playCount": "play count",
-                "rating": "$t(glossary.rating)",
+                "rating": "$t(common.rating)",
                 "releaseDate": "release date",
                 "rowIndex": "row index",
-                "size": "$t(glossary.size)",
-                "title": "$t(glossary.title)",
-                "titleCombined": "$t(glossary.title) (combined)",
+                "size": "$t(common.size)",
+                "title": "$t(common.title)",
+                "titleCombined": "$t(common.title) (combined)",
                 "trackNumber": "track number",
-                "year": "$t(glossary.year)"
+                "year": "$t(common.year)"
             },
             "view": {
                 "card": "card",
diff --git a/src/renderer/features/albums/components/album-list-header-filters.tsx b/src/renderer/features/albums/components/album-list-header-filters.tsx
index 925f1fba9..268458b74 100644
--- a/src/renderer/features/albums/components/album-list-header-filters.tsx
+++ b/src/renderer/features/albums/components/album-list-header-filters.tsx
@@ -430,7 +430,7 @@ export const AlbumListHeaderFilters = ({ gridRef, tableRef }: AlbumListHeaderFil
                         },
                     }}
                     tooltip={{
-                        label: t('glossary.filter', { count: 2, postProcess: 'sentenceCase' }),
+                        label: t('common.filter', { count: 2, postProcess: 'sentenceCase' }),
                     }}
                     variant="subtle"
                     onClick={handleOpenFiltersModal}
@@ -441,7 +441,7 @@ export const AlbumListHeaderFilters = ({ gridRef, tableRef }: AlbumListHeaderFil
                 <Button
                     compact
                     size="md"
-                    tooltip={{ label: t('glossary.refresh', { postProcess: 'sentenceCase' }) }}
+                    tooltip={{ label: t('common.refresh', { postProcess: 'sentenceCase' }) }}
                     variant="subtle"
                     onClick={handleRefresh}
                 >
@@ -482,7 +482,7 @@ export const AlbumListHeaderFilters = ({ gridRef, tableRef }: AlbumListHeaderFil
                             icon={<RiRefreshLine />}
                             onClick={handleRefresh}
                         >
-                            {t('glossary.refresh', { postProcess: 'sentenceCase' })}
+                            {t('common.refresh', { postProcess: 'sentenceCase' })}
                         </DropdownMenu.Item>
                     </DropdownMenu.Dropdown>
                 </DropdownMenu>
@@ -500,7 +500,7 @@ export const AlbumListHeaderFilters = ({ gridRef, tableRef }: AlbumListHeaderFil
                             compact
                             size="md"
                             tooltip={{
-                                label: t('glossary.configure', { postProcess: 'sentenceCase' }),
+                                label: t('common.configure', { postProcess: 'sentenceCase' }),
                             }}
                             variant="subtle"
                         >
diff --git a/src/renderer/features/albums/components/navidrome-album-filters.tsx b/src/renderer/features/albums/components/navidrome-album-filters.tsx
index 753a4e034..efb39f61f 100644
--- a/src/renderer/features/albums/components/navidrome-album-filters.tsx
+++ b/src/renderer/features/albums/components/navidrome-album-filters.tsx
@@ -228,7 +228,7 @@ export const NavidromeAlbumFilters = ({
                 <NumberInput
                     defaultValue={filter._custom?.navidrome?.year}
                     hideControls={false}
-                    label={t('glossary.year', { postProcess: 'titleCase' })}
+                    label={t('common.year', { postProcess: 'titleCase' })}
                     max={5000}
                     min={0}
                     onChange={(e) => handleYearFilter(e)}
diff --git a/src/renderer/features/genres/components/genre-list-header-filters.tsx b/src/renderer/features/genres/components/genre-list-header-filters.tsx
index 7983c87f9..96c5bccd3 100644
--- a/src/renderer/features/genres/components/genre-list-header-filters.tsx
+++ b/src/renderer/features/genres/components/genre-list-header-filters.tsx
@@ -271,7 +271,7 @@ export const GenreListHeaderFilters = ({ gridRef, tableRef }: GenreListHeaderFil
                 <Button
                     compact
                     size="md"
-                    tooltip={{ label: t('glossary.refresh', { postProcess: 'titleCase' }) }}
+                    tooltip={{ label: t('common.refresh', { postProcess: 'titleCase' }) }}
                     variant="subtle"
                     onClick={handleRefresh}
                 >
@@ -293,7 +293,7 @@ export const GenreListHeaderFilters = ({ gridRef, tableRef }: GenreListHeaderFil
                             icon={<RiRefreshLine />}
                             onClick={handleRefresh}
                         >
-                            {t('glossary.refresh', { postProcess: 'titleCase' })}
+                            {t('common.refresh', { postProcess: 'titleCase' })}
                         </DropdownMenu.Item>
                     </DropdownMenu.Dropdown>
                 </DropdownMenu>
@@ -311,7 +311,7 @@ export const GenreListHeaderFilters = ({ gridRef, tableRef }: GenreListHeaderFil
                             compact
                             size="md"
                             tooltip={{
-                                label: t('glossary.configure', { postProcess: 'titleCase' }),
+                                label: t('common.configure', { postProcess: 'titleCase' }),
                             }}
                             variant="subtle"
                         >
diff --git a/src/renderer/features/lyrics/lyrics-actions.tsx b/src/renderer/features/lyrics/lyrics-actions.tsx
index 5944e1fd6..3ce52b13e 100644
--- a/src/renderer/features/lyrics/lyrics-actions.tsx
+++ b/src/renderer/features/lyrics/lyrics-actions.tsx
@@ -56,7 +56,7 @@ export const LyricsActions = ({
                             })
                         }
                     >
-                        {t('glossary.search', { postProcess: 'titleCase' })}
+                        {t('common.search', { postProcess: 'titleCase' })}
                     </Button>
                 ) : null}
                 <Button
@@ -92,7 +92,7 @@ export const LyricsActions = ({
                         variant="subtle"
                         onClick={onResetLyric}
                     >
-                        {t('glossary.reset', { postProcess: 'sentenceCase' })}
+                        {t('common.reset', { postProcess: 'sentenceCase' })}
                     </Button>
                 ) : null}
             </Group>
@@ -106,7 +106,7 @@ export const LyricsActions = ({
                         variant="subtle"
                         onClick={onRemoveLyric}
                     >
-                        {t('glossary.clear', { postProcess: 'sentenceCase' })}
+                        {t('common.clear', { postProcess: 'sentenceCase' })}
                     </Button>
                 ) : null}
             </Box>
diff --git a/src/renderer/features/now-playing/components/play-queue-list-controls.tsx b/src/renderer/features/now-playing/components/play-queue-list-controls.tsx
index cecacbd85..72879812a 100644
--- a/src/renderer/features/now-playing/components/play-queue-list-controls.tsx
+++ b/src/renderer/features/now-playing/components/play-queue-list-controls.tsx
@@ -172,7 +172,7 @@ export const PlayQueueListControls = ({ type, tableRef }: PlayQueueListOptionsPr
                             compact
                             size="md"
                             tooltip={{
-                                label: t('glossary.configure', { postProcess: 'sentenceCase' }),
+                                label: t('common.configure', { postProcess: 'sentenceCase' }),
                             }}
                             variant="subtle"
                         >
diff --git a/src/renderer/features/player/components/left-controls.tsx b/src/renderer/features/player/components/left-controls.tsx
index bf9b0887a..928f005e1 100644
--- a/src/renderer/features/player/components/left-controls.tsx
+++ b/src/renderer/features/player/components/left-controls.tsx
@@ -187,7 +187,7 @@ export const LeftControls = () => {
                                             top: 2,
                                         }}
                                         tooltip={{
-                                            label: t('glossary.expand', {
+                                            label: t('common.expand', {
                                                 postProcess: 'titleCase',
                                             }),
                                             openDelay: 500,
diff --git a/src/renderer/features/playlists/components/playlist-list-header-filters.tsx b/src/renderer/features/playlists/components/playlist-list-header-filters.tsx
index 536e408ea..1cbd23b20 100644
--- a/src/renderer/features/playlists/components/playlist-list-header-filters.tsx
+++ b/src/renderer/features/playlists/components/playlist-list-header-filters.tsx
@@ -287,7 +287,7 @@ export const PlaylistListHeaderFilters = ({
                 <Button
                     compact
                     size="md"
-                    tooltip={{ label: t('glossary.refresh', { postProcess: 'titleCase' }) }}
+                    tooltip={{ label: t('common.refresh', { postProcess: 'titleCase' }) }}
                     variant="subtle"
                     onClick={handleRefresh}
                 >
@@ -310,7 +310,7 @@ export const PlaylistListHeaderFilters = ({
                             icon={<RiRefreshLine />}
                             onClick={handleRefresh}
                         >
-                            {t('glossary.refresh', { postProcess: 'titleCase' })}
+                            {t('common.refresh', { postProcess: 'titleCase' })}
                         </DropdownMenu.Item>
                     </DropdownMenu.Dropdown>
                 </DropdownMenu>
diff --git a/src/renderer/features/playlists/components/playlist-query-builder.tsx b/src/renderer/features/playlists/components/playlist-query-builder.tsx
index 7674a091b..b8a5c8936 100644
--- a/src/renderer/features/playlists/components/playlist-query-builder.tsx
+++ b/src/renderer/features/playlists/components/playlist-query-builder.tsx
@@ -420,21 +420,21 @@ export const PlaylistQueryBuilder = forwardRef(
                         <Select
                             data={[
                                 {
-                                    label: t('glossary.ascending', { postProcess: 'titleCase' }),
+                                    label: t('common.ascending', { postProcess: 'titleCase' }),
                                     value: 'asc',
                                 },
                                 {
-                                    label: t('glossary.descending', { postProcess: 'titleCase' }),
+                                    label: t('common.descending', { postProcess: 'titleCase' }),
                                     value: 'desc',
                                 },
                             ]}
-                            label={t('glossary.order', { postProcess: 'titleCase' })}
+                            label={t('common.order', { postProcess: 'titleCase' })}
                             maxWidth="20%"
                             width={125}
                             {...extraFiltersForm.getInputProps('sortOrder')}
                         />
                         <NumberInput
-                            label={t('glossary.limit', { postProcess: 'titleCase' })}
+                            label={t('common.limit', { postProcess: 'titleCase' })}
                             maxWidth="20%"
                             width={75}
                             {...extraFiltersForm.getInputProps('limit')}
diff --git a/src/renderer/features/settings/components/settings-header.tsx b/src/renderer/features/settings/components/settings-header.tsx
index bc218e1b9..01fef382d 100644
--- a/src/renderer/features/settings/components/settings-header.tsx
+++ b/src/renderer/features/settings/components/settings-header.tsx
@@ -38,7 +38,7 @@ export const SettingsHeader = () => {
                         <Group noWrap>
                             <RiSettings2Fill size="2rem" />
                             <LibraryHeaderBar.Title>
-                                {t('glossary.setting', { count: 2, postProcess: 'titleCase' })}
+                                {t('common.setting', { count: 2, postProcess: 'titleCase' })}
                             </LibraryHeaderBar.Title>
                         </Group>
                         <Button
diff --git a/src/renderer/features/shared/components/order-toggle-button.tsx b/src/renderer/features/shared/components/order-toggle-button.tsx
index 3bd802300..44fafd6cc 100644
--- a/src/renderer/features/shared/components/order-toggle-button.tsx
+++ b/src/renderer/features/shared/components/order-toggle-button.tsx
@@ -16,8 +16,8 @@ export const OrderToggleButton = ({ sortOrder, onToggle, buttonProps }: OrderTog
         <Tooltip
             label={
                 sortOrder === SortOrder.ASC
-                    ? t('glossary.ascending', { postProcess: 'titleCase' })
-                    : t('glossary.descending', { postProcess: 'titleCase' })
+                    ? t('common.ascending', { postProcess: 'titleCase' })
+                    : t('common.descending', { postProcess: 'titleCase' })
             }
         >
             <Button
diff --git a/src/renderer/features/sidebar/components/collapsed-sidebar.tsx b/src/renderer/features/sidebar/components/collapsed-sidebar.tsx
index f89767e2a..5d0019dce 100644
--- a/src/renderer/features/sidebar/components/collapsed-sidebar.tsx
+++ b/src/renderer/features/sidebar/components/collapsed-sidebar.tsx
@@ -76,7 +76,7 @@ export const CollapsedSidebar = () => {
                             activeIcon={<RiMenuFill size="25" />}
                             component={UnstyledButton}
                             icon={<RiMenuFill size="25" />}
-                            label={t('glossary.menu', { postProcess: 'titleCase' })}
+                            label={t('common.menu', { postProcess: 'titleCase' })}
                         />
                     </DropdownMenu.Target>
                     <DropdownMenu.Dropdown>
diff --git a/src/renderer/features/sidebar/components/sidebar.tsx b/src/renderer/features/sidebar/components/sidebar.tsx
index 006b53a68..63a9fe9c8 100644
--- a/src/renderer/features/sidebar/components/sidebar.tsx
+++ b/src/renderer/features/sidebar/components/sidebar.tsx
@@ -263,7 +263,7 @@ export const Sidebar = () => {
                                 size="md"
                                 sx={{ cursor: 'default', position: 'absolute', right: 5, top: 5 }}
                                 tooltip={{
-                                    label: t('glossary.collapse', { postProcess: 'titleCase' }),
+                                    label: t('common.collapse', { postProcess: 'titleCase' }),
                                     openDelay: 500,
                                 }}
                                 variant="default"
diff --git a/src/renderer/features/songs/components/navidrome-song-filters.tsx b/src/renderer/features/songs/components/navidrome-song-filters.tsx
index a2d5fe6c8..96cce9952 100644
--- a/src/renderer/features/songs/components/navidrome-song-filters.tsx
+++ b/src/renderer/features/songs/components/navidrome-song-filters.tsx
@@ -121,7 +121,7 @@ export const NavidromeSongFilters = ({
             <Divider my="0.5rem" />
             <Group grow>
                 <NumberInput
-                    label={t('glossary.year', { postProcess: 'titleCase' })}
+                    label={t('common.year', { postProcess: 'titleCase' })}
                     max={5000}
                     min={0}
                     value={filter._custom?.navidrome?.year}
diff --git a/src/renderer/features/songs/components/song-list-header-filters.tsx b/src/renderer/features/songs/components/song-list-header-filters.tsx
index 9e477d999..64b953c8f 100644
--- a/src/renderer/features/songs/components/song-list-header-filters.tsx
+++ b/src/renderer/features/songs/components/song-list-header-filters.tsx
@@ -433,7 +433,7 @@ export const SongListHeaderFilters = ({ gridRef, tableRef }: SongListHeaderFilte
                 <Button
                     compact
                     size="md"
-                    tooltip={{ label: t('glossary.refresh', { postProcess: 'titleCase' }) }}
+                    tooltip={{ label: t('common.refresh', { postProcess: 'titleCase' }) }}
                     variant="subtle"
                     onClick={handleRefresh}
                 >