diff --git a/packages/pl-fe/src/components/dropdown-navigation.tsx b/packages/pl-fe/src/components/dropdown-navigation.tsx
index 83a017dea..f980319ee 100644
--- a/packages/pl-fe/src/components/dropdown-navigation.tsx
+++ b/packages/pl-fe/src/components/dropdown-navigation.tsx
@@ -207,7 +207,7 @@ const DropdownNavigation: React.FC = React.memo((): JSX.Element | null => {
                 <DropdownNavigationLink
                   to='/follow_requests'
                   icon={require('@phosphor-icons/core/regular/user-plus.svg')}
-                  text={<FormattedMessage id='navigation_bar.follow_requests' defaultMessage='Follow requests' />}
+                  text={<FormattedMessage id='column.follow_requests' defaultMessage='Follow requests' />}
                   onClick={closeSidebar}
                 />
               )}
@@ -216,7 +216,7 @@ const DropdownNavigation: React.FC = React.memo((): JSX.Element | null => {
                 <DropdownNavigationLink
                   to='/interaction_requests'
                   icon={require('@phosphor-icons/core/regular/heart-half.svg')}
-                  text={<FormattedMessage id='navigation.interaction_requests' defaultMessage='Interaction requests' />}
+                  text={<FormattedMessage id='column.interaction_requests' defaultMessage='Interaction requests' />}
                   onClick={closeSidebar}
                 />
               )}
@@ -225,7 +225,7 @@ const DropdownNavigation: React.FC = React.memo((): JSX.Element | null => {
                 <DropdownNavigationLink
                   to='/conversations'
                   icon={require('@phosphor-icons/core/regular/envelope-simple.svg')}
-                  text={<FormattedMessage id='navigation.direct_messages' defaultMessage='Direct messages' />}
+                  text={<FormattedMessage id='column.direct' defaultMessage='Direct messages' />}
                   onClick={closeSidebar}
                 />
               )}
@@ -288,7 +288,7 @@ const DropdownNavigation: React.FC = React.memo((): JSX.Element | null => {
                 <DropdownNavigationLink
                   to='/directory'
                   icon={require('@phosphor-icons/core/regular/address-book.svg')}
-                  text={<FormattedMessage id='navigation_bar.profile_directory' defaultMessage='Profile directory' />}
+                  text={<FormattedMessage id='column.directory' defaultMessage='Profile directory' />}
                   onClick={closeSidebar}
                 />
               )}
@@ -306,7 +306,7 @@ const DropdownNavigation: React.FC = React.memo((): JSX.Element | null => {
                 <DropdownNavigationLink
                   to='/draft_statuses'
                   icon={require('@phosphor-icons/core/regular/pencil-simple.svg')}
-                  text={<FormattedMessage id='navigation.drafts' defaultMessage='Drafts' />}
+                  text={<FormattedMessage id='column.draft_statuses' defaultMessage='Drafts' />}
                   onClick={closeSidebar}
                 />
               )}
@@ -354,7 +354,7 @@ const DropdownNavigation: React.FC = React.memo((): JSX.Element | null => {
               <DropdownNavigationLink
                 to='/settings'
                 icon={require('@phosphor-icons/core/regular/sliders-horizontal.svg')}
-                text={<FormattedMessage id='navigation_bar.preferences' defaultMessage='Preferences' />}
+                text={<FormattedMessage id='column.preferences' defaultMessage='Preferences' />}
                 onClick={closeSidebar}
               />
 
@@ -362,7 +362,7 @@ const DropdownNavigation: React.FC = React.memo((): JSX.Element | null => {
                 <DropdownNavigationLink
                   to='/followed_tags'
                   icon={require('@phosphor-icons/core/regular/hash.svg')}
-                  text={<FormattedMessage id='navigation_bar.followed_tags' defaultMessage='Followed hashtags' />}
+                  text={<FormattedMessage id='column.followed_tags' defaultMessage='Followed hashtags' />}
                   onClick={closeSidebar}
                 />
               )}
@@ -371,7 +371,7 @@ const DropdownNavigation: React.FC = React.memo((): JSX.Element | null => {
                 <DropdownNavigationLink
                   to='/pl-fe/admin'
                   icon={require('@phosphor-icons/core/regular/gauge.svg')}
-                  text={<FormattedMessage id='navigation.dashboard' defaultMessage='Dashboard' />}
+                  text={<FormattedMessage id='column.admin.dashboard' defaultMessage='Dashboard' />}
                   onClick={closeSidebar}
                   // count={dashboardCount} WIP
                 />
diff --git a/packages/pl-fe/src/components/sidebar-navigation.tsx b/packages/pl-fe/src/components/sidebar-navigation.tsx
index 93ef72856..f3138c8be 100644
--- a/packages/pl-fe/src/components/sidebar-navigation.tsx
+++ b/packages/pl-fe/src/components/sidebar-navigation.tsx
@@ -30,17 +30,17 @@ import SiteLogo from './site-logo';
 import Avatar from './ui/avatar';
 
 const messages = defineMessages({
-  followRequests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
+  followRequests: { id: 'column.follow_requests', defaultMessage: 'Follow requests' },
   bookmarks: { id: 'column.bookmarks', defaultMessage: 'Bookmarks' },
   lists: { id: 'column.lists', defaultMessage: 'Lists' },
   circles: { id: 'column.circles', defaultMessage: 'Circles' },
   events: { id: 'column.events', defaultMessage: 'Events' },
-  profileDirectory: { id: 'navigation_bar.profile_directory', defaultMessage: 'Profile directory' },
-  followedTags: { id: 'navigation_bar.followed_tags', defaultMessage: 'Followed hashtags' },
+  profileDirectory: { id: 'column.directory', defaultMessage: 'Profile directory' },
+  followedTags: { id: 'column.followed_tags', defaultMessage: 'Followed hashtags' },
   scheduledStatuses: { id: 'column.scheduled_statuses', defaultMessage: 'Scheduled posts' },
-  drafts: { id: 'navigation.drafts', defaultMessage: 'Drafts' },
-  conversations: { id: 'navigation.direct_messages', defaultMessage: 'Direct messages' },
-  interactionRequests: { id: 'navigation.interaction_requests', defaultMessage: 'Interaction requests' },
+  drafts: { id: 'column.draft_statuses', defaultMessage: 'Drafts' },
+  conversations: { id: 'column.direct', defaultMessage: 'Direct messages' },
+  interactionRequests: { id: 'column.interaction_requests', defaultMessage: 'Interaction requests' },
   help: { id: 'navigation.help', defaultMessage: 'Help' },
   keyboardShortcuts: { id: 'navigation.keyboard_shortcuts', defaultMessage: 'Keyboard shortcuts' },
   sourceCode: { id: 'navigation.source_code', defaultMessage: 'Source code' },
@@ -262,7 +262,7 @@ const SidebarNavigation: React.FC<ISidebarNavigation> = React.memo(({ shrink })
                 activeIcon={require('@phosphor-icons/core/fill/chats-teardrop-fill.svg')}
                 count={unreadChatsCount}
                 countMax={9}
-                text={<FormattedMessage id='navigation.chats' defaultMessage='Chats' />}
+                text={<FormattedMessage id='column.chats' defaultMessage='Chats' />}
               />
             )}
 
@@ -271,7 +271,7 @@ const SidebarNavigation: React.FC<ISidebarNavigation> = React.memo(({ shrink })
                 to='/conversations'
                 icon={require('@phosphor-icons/core/regular/envelope-simple.svg')}
                 activeIcon={require('@phosphor-icons/core/fill/envelope-simple-fill.svg')}
-                text={<FormattedMessage id='navigation.direct_messages' defaultMessage='Direct messages' />}
+                text={<FormattedMessage id='column.direct' defaultMessage='Direct messages' />}
               />
             )}
 
diff --git a/packages/pl-fe/src/components/thumb-navigation.tsx b/packages/pl-fe/src/components/thumb-navigation.tsx
index 2cd8c11a3..f700662db 100644
--- a/packages/pl-fe/src/components/thumb-navigation.tsx
+++ b/packages/pl-fe/src/components/thumb-navigation.tsx
@@ -17,10 +17,10 @@ import { useIsSidebarOpen, useUiStoreActions } from 'pl-fe/stores/ui';
 import { isStandalone } from 'pl-fe/utils/state';
 
 const messages = defineMessages({
-  home: { id: 'navigation.home', defaultMessage: 'Home' },
-  search: { id: 'navigation.search', defaultMessage: 'Search' },
-  notifications: { id: 'navigation.notifications', defaultMessage: 'Notifications' },
-  chats: { id: 'navigation.chats', defaultMessage: 'Chats' },
+  home: { id: 'column.home', defaultMessage: 'Home' },
+  search: { id: 'column.search', defaultMessage: 'Search' },
+  notifications: { id: 'column.notifications', defaultMessage: 'Notifications' },
+  chats: { id: 'column.chats', defaultMessage: 'Chats' },
   compose: { id: 'navigation.compose', defaultMessage: 'Compose' },
   openSidebar: { id: 'navigation.sidebar', defaultMessage: 'Open sidebar' },
   closeSidebar: { id: 'navigation.sidebar.close', defaultMessage: 'Close sidebar' },
diff --git a/packages/pl-fe/src/features/account/components/header.tsx b/packages/pl-fe/src/features/account/components/header.tsx
index 716b750c5..e48b3a97b 100644
--- a/packages/pl-fe/src/features/account/components/header.tsx
+++ b/packages/pl-fe/src/features/account/components/header.tsx
@@ -67,11 +67,11 @@ const messages = defineMessages({
   unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unhide {domain}' },
   hideReblogs: { id: 'account.hide_reblogs', defaultMessage: 'Hide reposts from @{name}' },
   showReblogs: { id: 'account.show_reblogs', defaultMessage: 'Show reposts from @{name}' },
-  preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
-  follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
-  blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocks' },
-  domain_blocks: { id: 'navigation_bar.domain_blocks', defaultMessage: 'Domain blocks' },
-  mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Mutes' },
+  preferences: { id: 'column.preferences', defaultMessage: 'Preferences' },
+  follow_requests: { id: 'column.follow_requests', defaultMessage: 'Follow requests' },
+  blocks: { id: 'column.blocks', defaultMessage: 'Blocks' },
+  domain_blocks: { id: 'column.domain_blocks', defaultMessage: 'Domain blocks' },
+  mutes: { id: 'column.mutes', defaultMessage: 'Mutes' },
   endorse: { id: 'account.endorse', defaultMessage: 'Feature on profile' },
   unendorse: { id: 'account.unendorse', defaultMessage: 'Don\'t feature on profile' },
   bite: { id: 'account.bite', defaultMessage: 'Bite @{name}' },
diff --git a/packages/pl-fe/src/locales/en.json b/packages/pl-fe/src/locales/en.json
index 3b96893d0..397b96318 100644
--- a/packages/pl-fe/src/locales/en.json
+++ b/packages/pl-fe/src/locales/en.json
@@ -404,7 +404,7 @@
   "column.direct": "Direct messages",
   "column.directory": "Browse profiles",
   "column.dislikes": "Dislikes",
-  "column.domain_blocks": "Hidden domains",
+  "column.domain_blocks": "Domain blocks",
   "column.draft_statuses": "Drafts",
   "column.drive": "Drive",
   "column.edit_profile": "Edit profile",
@@ -416,7 +416,7 @@
   "column.favourited_statuses": "Liked posts",
   "column.favourites": "Likes",
   "column.federation_restrictions": "Federation restrictions",
-  "column.filters": "Muted words",
+  "column.filters": "Filters",
   "column.filters.accounts": "Accounts",
   "column.filters.add_new": "Add new filter",
   "column.filters.conversations": "Conversations",
@@ -470,7 +470,7 @@
   "column.mfa_confirm_button": "Confirm",
   "column.mfa_disable_button": "Disable",
   "column.mfa_setup": "Proceed to setup",
-  "column.migration": "Account migration",
+  "column.migration": "Move account",
   "column.mutes": "Mutes",
   "column.notifications": "Notifications",
   "column.outgoing_follow_requests": "Outgoing follow requests",
@@ -1282,24 +1282,13 @@
   "mute_modal.note.label.add": "Add account note",
   "mute_modal.note.label.edit": "Edit account note",
   "my_groups_panel.title": "My groups",
-  "navigation.chats": "Chats",
   "navigation.compose": "Compose",
   "navigation.compose_group": "Compose to group",
-  "navigation.dashboard": "Dashboard",
-  "navigation.developers": "Developers",
-  "navigation.direct_messages": "Direct messages",
-  "navigation.drafts": "Drafts",
   "navigation.help": "Help",
-  "navigation.home": "Home",
-  "navigation.interaction_requests": "Interaction requests",
   "navigation.keyboard_shortcuts": "Keyboard shortcuts",
-  "navigation.notifications": "Notifications",
-  "navigation.search": "Search",
   "navigation.sidebar": "Open sidebar",
   "navigation.sidebar.close": "Close sidebar",
   "navigation.source_code": "Source code",
-  "navigation_bar.account_aliases": "Account aliases",
-  "navigation_bar.blocks": "Blocks",
   "navigation_bar.compose": "Compose a post",
   "navigation_bar.compose_direct": "Direct message",
   "navigation_bar.compose_draft": "Edit draft post",
@@ -1311,21 +1300,12 @@
   "navigation_bar.compose_reply": "Reply to post",
   "navigation_bar.create_event": "Create new event",
   "navigation_bar.create_group": "Create group",
-  "navigation_bar.domain_blocks": "Domain blocks",
   "navigation_bar.edit_group": "Edit Group",
   "navigation_bar.favourites": "Likes",
-  "navigation_bar.filters": "Filters",
-  "navigation_bar.follow_requests": "Follow requests",
-  "navigation_bar.followed_tags": "Followed hashtags",
-  "navigation_bar.import_data": "Import data",
   "navigation_bar.in_reply_to": "In reply to",
   "navigation_bar.interaction_policy": "Status interaction rules",
   "navigation_bar.logout": "Logout",
   "navigation_bar.manage_event": "Manage event",
-  "navigation_bar.mutes": "Mutes",
-  "navigation_bar.plfe_config": "Front-end configuration",
-  "navigation_bar.preferences": "Preferences",
-  "navigation_bar.profile_directory": "Profile directory",
   "new_event_panel.action": "Create event",
   "new_event_panel.subtitle": "Can't find what you're looking for? Schedule your own event.",
   "new_event_panel.title": "Create new event",
@@ -1653,18 +1633,14 @@
   "select.no_options": "No options available",
   "select.placeholder": "Select",
   "select_bookmark_folder_modal.header_title": "Select folder",
-  "settings.account_migration": "Move account",
-  "settings.blocks": "Blocks",
   "settings.change_email": "Change email",
   "settings.change_password": "Change password",
   "settings.configure_mfa": "Configure MFA",
   "settings.delete_account": "Delete account",
   "settings.edit_profile": "Edit profile",
   "settings.messages.label": "Allow users to start a new chat with you",
-  "settings.mutes": "Mutes",
   "settings.mutes_blocks": "Mutes and blocks",
   "settings.other": "Other options",
-  "settings.preferences": "Preferences",
   "settings.privacy": "Privacy",
   "settings.profile": "Profile",
   "settings.save.success": "Your preferences have been saved!",
diff --git a/packages/pl-fe/src/pages/dashboard/dashboard.tsx b/packages/pl-fe/src/pages/dashboard/dashboard.tsx
index b1190e701..8a9220fb2 100644
--- a/packages/pl-fe/src/pages/dashboard/dashboard.tsx
+++ b/packages/pl-fe/src/pages/dashboard/dashboard.tsx
@@ -173,7 +173,7 @@ const Dashboard: React.FC = () => {
           {features.pleromaAdminAccounts && account.is_admin && (
             <ListItem
               to='/pl-fe/config'
-              label={<FormattedMessage id='navigation_bar.plfe_config' defaultMessage='Front-end configuration' />}
+              label={<FormattedMessage id='column.plfe_config' defaultMessage='Front-end configuration' />}
             />
           )}
 
diff --git a/packages/pl-fe/src/pages/settings/settings.tsx b/packages/pl-fe/src/pages/settings/settings.tsx
index 9db15c762..c7b55395f 100644
--- a/packages/pl-fe/src/pages/settings/settings.tsx
+++ b/packages/pl-fe/src/pages/settings/settings.tsx
@@ -12,27 +12,27 @@ import { useOwnAccount } from 'pl-fe/hooks/use-own-account';
 import { useMfaConfig } from 'pl-fe/queries/security/use-mfa';
 
 const messages = defineMessages({
-  accountAliases: { id: 'navigation_bar.account_aliases', defaultMessage: 'Account aliases' },
-  accountMigration: { id: 'settings.account_migration', defaultMessage: 'Move account' },
+  accountAliases: { id: 'column.aliases', defaultMessage: 'Account aliases' },
+  accountMigration: { id: 'column.migration', defaultMessage: 'Move account' },
   backups: { id: 'column.backups', defaultMessage: 'Backups' },
-  blocks: { id: 'settings.blocks', defaultMessage: 'Blocks' },
+  blocks: { id: 'column.blocks', defaultMessage: 'Blocks' },
   changeEmail: { id: 'settings.change_email', defaultMessage: 'Change email' },
   changePassword: { id: 'settings.change_password', defaultMessage: 'Change password' },
   configureMfa: { id: 'settings.configure_mfa', defaultMessage: 'Configure MFA' },
   deleteAccount: { id: 'settings.delete_account', defaultMessage: 'Delete account' },
-  developers: { id: 'navigation.developers', defaultMessage: 'Developers' },
-  domainBlocks: { id: 'navigation_bar.domain_blocks', defaultMessage: 'Domain blocks' },
+  developers: { id: 'column.developers', defaultMessage: 'Developers' },
+  domainBlocks: { id: 'column.domain_blocks', defaultMessage: 'Domain blocks' },
   editProfile: { id: 'settings.edit_profile', defaultMessage: 'Edit profile' },
   exportData: { id: 'column.export_data', defaultMessage: 'Export data' },
-  filters: { id: 'navigation_bar.filters', defaultMessage: 'Filters' },
-  importData: { id: 'navigation_bar.import_data', defaultMessage: 'Import data' },
+  filters: { id: 'column.filters', defaultMessage: 'Filters' },
+  importData: { id: 'column.import_data', defaultMessage: 'Import data' },
   interactionPolicies: { id: 'column.interaction_policies', defaultMessage: 'Interaction policies' },
   mfaDisabled: { id: 'mfa.disabled', defaultMessage: 'Disabled' },
   mfaEnabled: { id: 'mfa.enabled', defaultMessage: 'Enabled' },
-  mutes: { id: 'settings.mutes', defaultMessage: 'Mutes' },
+  mutes: { id: 'column.mutes', defaultMessage: 'Mutes' },
   mutesAndBlocks: { id: 'settings.mutes_blocks', defaultMessage: 'Mutes and blocks' },
   other: { id: 'settings.other', defaultMessage: 'Other options' },
-  preferences: { id: 'settings.preferences', defaultMessage: 'Preferences' },
+  preferences: { id: 'column.preferences', defaultMessage: 'Preferences' },
   profile: { id: 'settings.profile', defaultMessage: 'Profile' },
   security: { id: 'settings.security', defaultMessage: 'Security' },
   sessions: { id: 'settings.sessions', defaultMessage: 'Active sessions' },