diff --git a/.storybook/main.ts b/.storybook/main.ts
index 638806c085..ba0ac2ae52 100644
--- a/.storybook/main.ts
+++ b/.storybook/main.ts
@@ -11,6 +11,7 @@ const config: StorybookConfig = {
     name: '@storybook/react-vite',
     options: {},
   },
+  staticDirs: ['./static'],
 };
 
 export default config;
diff --git a/.storybook/preview.ts b/.storybook/preview.ts
deleted file mode 100644
index a0bec9085f..0000000000
--- a/.storybook/preview.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import type { Preview } from '@storybook/react-vite';
-
-// If you want to run the dark theme during development,
-// you can change the below to `/application.scss`
-import '../app/javascript/styles/mastodon-light.scss';
-
-const preview: Preview = {
-  // Auto-generate docs: https://storybook.js.org/docs/writing-docs/autodocs
-  tags: ['autodocs'],
-  parameters: {
-    layout: 'centered',
-
-    controls: {
-      matchers: {
-        color: /(background|color)$/i,
-        date: /Date$/i,
-      },
-    },
-
-    a11y: {
-      // 'todo' - show a11y violations in the test UI only
-      // 'error' - fail CI on a11y violations
-      // 'off' - skip a11y checks entirely
-      test: 'todo',
-    },
-  },
-};
-
-export default preview;
diff --git a/.storybook/preview.tsx b/.storybook/preview.tsx
new file mode 100644
index 0000000000..c879cf10d1
--- /dev/null
+++ b/.storybook/preview.tsx
@@ -0,0 +1,136 @@
+import { useEffect, useState } from 'react';
+
+import { IntlProvider } from 'react-intl';
+
+import { configureStore } from '@reduxjs/toolkit';
+import { Provider } from 'react-redux';
+
+import type { Preview } from '@storybook/react-vite';
+import { http, passthrough } from 'msw';
+import { initialize, mswLoader } from 'msw-storybook-addon';
+
+import type { LocaleData } from '@/mastodon/locales';
+import { reducerWithInitialState, rootReducer } from '@/mastodon/reducers';
+import { defaultMiddleware } from '@/mastodon/store/store';
+
+// If you want to run the dark theme during development,
+// you can change the below to `/application.scss`
+import '../app/javascript/styles/mastodon-light.scss';
+
+const localeFiles = import.meta.glob('@/mastodon/locales/*.json', {
+  query: { as: 'json' },
+});
+
+// Initialize MSW
+initialize();
+
+const preview: Preview = {
+  // Auto-generate docs: https://storybook.js.org/docs/writing-docs/autodocs
+  tags: ['autodocs'],
+  globalTypes: {
+    locale: {
+      description: 'Locale for the story',
+      toolbar: {
+        title: 'Locale',
+        icon: 'globe',
+        items: Object.keys(localeFiles).map((path) =>
+          path.replace('/mastodon/locales/', '').replace('.json', ''),
+        ),
+        dynamicTitle: true,
+      },
+    },
+  },
+  initialGlobals: {
+    locale: 'en',
+  },
+  decorators: [
+    (Story, { parameters }) => {
+      const { state = {} } = parameters;
+      let reducer = rootReducer;
+      if (typeof state === 'object' && state) {
+        reducer = reducerWithInitialState(state as Record<string, unknown>);
+      }
+      const store = configureStore({
+        reducer,
+        middleware(getDefaultMiddleware) {
+          return getDefaultMiddleware(defaultMiddleware);
+        },
+      });
+      return (
+        <Provider store={store}>
+          <Story />
+        </Provider>
+      );
+    },
+    (Story, { globals }) => {
+      const currentLocale = (globals.locale as string) || 'en';
+      const [messages, setMessages] = useState<
+        Record<string, Record<string, string>>
+      >({});
+      const currentLocaleData = messages[currentLocale];
+
+      useEffect(() => {
+        async function loadLocaleData() {
+          const { default: localeFile } = (await import(
+            `@/mastodon/locales/${currentLocale}.json`
+          )) as { default: LocaleData['messages'] };
+          setMessages((prevLocales) => ({
+            ...prevLocales,
+            [currentLocale]: localeFile,
+          }));
+        }
+        if (!currentLocaleData) {
+          void loadLocaleData();
+        }
+      }, [currentLocale, currentLocaleData]);
+
+      return (
+        <IntlProvider
+          locale={currentLocale}
+          messages={currentLocaleData}
+          textComponent='span'
+        >
+          <Story />
+        </IntlProvider>
+      );
+    },
+  ],
+  loaders: [mswLoader],
+  parameters: {
+    layout: 'centered',
+
+    controls: {
+      matchers: {
+        color: /(background|color)$/i,
+        date: /Date$/i,
+      },
+    },
+
+    a11y: {
+      // 'todo' - show a11y violations in the test UI only
+      // 'error' - fail CI on a11y violations
+      // 'off' - skip a11y checks entirely
+      test: 'todo',
+    },
+
+    state: {},
+
+    // Force docs to use an iframe as it breaks MSW handlers.
+    // See: https://github.com/mswjs/msw-storybook-addon/issues/83
+    docs: {
+      story: {
+        inline: false,
+      },
+    },
+
+    msw: {
+      handlers: [
+        http.get('/index.json', passthrough),
+        http.get('/packs-dev/*', passthrough),
+        http.get('/sounds/*', passthrough),
+      ],
+    },
+  },
+};
+
+export default preview;
diff --git a/.storybook/static/mockServiceWorker.js b/.storybook/static/mockServiceWorker.js
new file mode 100644
index 0000000000..de7bc0f292
--- /dev/null
+++ b/.storybook/static/mockServiceWorker.js
@@ -0,0 +1,344 @@
+/* eslint-disable */
+/* tslint:disable */
+
+/**
+ * Mock Service Worker.
+ * @see https://github.com/mswjs/msw
+ * - Please do NOT modify this file.
+ */
+
+const PACKAGE_VERSION = '2.10.2'
+const INTEGRITY_CHECKSUM = 'f5825c521429caf22a4dd13b66e243af'
+const IS_MOCKED_RESPONSE = Symbol('isMockedResponse')
+const activeClientIds = new Set()
+
+addEventListener('install', function () {
+  self.skipWaiting()
+})
+
+addEventListener('activate', function (event) {
+  event.waitUntil(self.clients.claim())
+})
+
+addEventListener('message', async function (event) {
+  const clientId = Reflect.get(event.source || {}, 'id')
+
+  if (!clientId || !self.clients) {
+    return
+  }
+
+  const client = await self.clients.get(clientId)
+
+  if (!client) {
+    return
+  }
+
+  const allClients = await self.clients.matchAll({
+    type: 'window',
+  })
+
+  switch (event.data) {
+    case 'KEEPALIVE_REQUEST': {
+      sendToClient(client, {
+        type: 'KEEPALIVE_RESPONSE',
+      })
+      break
+    }
+
+    case 'INTEGRITY_CHECK_REQUEST': {
+      sendToClient(client, {
+        type: 'INTEGRITY_CHECK_RESPONSE',
+        payload: {
+          packageVersion: PACKAGE_VERSION,
+          checksum: INTEGRITY_CHECKSUM,
+        },
+      })
+      break
+    }
+
+    case 'MOCK_ACTIVATE': {
+      activeClientIds.add(clientId)
+
+      sendToClient(client, {
+        type: 'MOCKING_ENABLED',
+        payload: {
+          client: {
+            id: client.id,
+            frameType: client.frameType,
+          },
+        },
+      })
+      break
+    }
+
+    case 'MOCK_DEACTIVATE': {
+      activeClientIds.delete(clientId)
+      break
+    }
+
+    case 'CLIENT_CLOSED': {
+      activeClientIds.delete(clientId)
+
+      const remainingClients = allClients.filter((client) => {
+        return client.id !== clientId
+      })
+
+      // Unregister itself when there are no more clients
+      if (remainingClients.length === 0) {
+        self.registration.unregister()
+      }
+
+      break
+    }
+  }
+})
+
+addEventListener('fetch', function (event) {
+  // Bypass navigation requests.
+  if (event.request.mode === 'navigate') {
+    return
+  }
+
+  // Opening the DevTools triggers the "only-if-cached" request
+  // that cannot be handled by the worker. Bypass such requests.
+  if (
+    event.request.cache === 'only-if-cached' &&
+    event.request.mode !== 'same-origin'
+  ) {
+    return
+  }
+
+  // Bypass all requests when there are no active clients.
+  // Prevents the self-unregistered worked from handling requests
+  // after it's been deleted (still remains active until the next reload).
+  if (activeClientIds.size === 0) {
+    return
+  }
+
+  const requestId = crypto.randomUUID()
+  event.respondWith(handleRequest(event, requestId))
+})
+
+/**
+ * @param {FetchEvent} event
+ * @param {string} requestId
+ */
+async function handleRequest(event, requestId) {
+  const client = await resolveMainClient(event)
+  const requestCloneForEvents = event.request.clone()
+  const response = await getResponse(event, client, requestId)
+
+  // Send back the response clone for the "response:*" life-cycle events.
+  // Ensure MSW is active and ready to handle the message, otherwise
+  // this message will pend indefinitely.
+  if (client && activeClientIds.has(client.id)) {
+    const serializedRequest = await serializeRequest(requestCloneForEvents)
+
+    // Clone the response so both the client and the library could consume it.
+    const responseClone = response.clone()
+
+    sendToClient(
+      client,
+      {
+        type: 'RESPONSE',
+        payload: {
+          isMockedResponse: IS_MOCKED_RESPONSE in response,
+          request: {
+            id: requestId,
+            ...serializedRequest,
+          },
+          response: {
+            type: responseClone.type,
+            status: responseClone.status,
+            statusText: responseClone.statusText,
+            headers: Object.fromEntries(responseClone.headers.entries()),
+            body: responseClone.body,
+          },
+        },
+      },
+      responseClone.body ? [serializedRequest.body, responseClone.body] : [],
+    )
+  }
+
+  return response
+}
+
+/**
+ * Resolve the main client for the given event.
+ * Client that issues a request doesn't necessarily equal the client
+ * that registered the worker. It's with the latter the worker should
+ * communicate with during the response resolving phase.
+ * @param {FetchEvent} event
+ * @returns {Promise<Client | undefined>}
+ */
+async function resolveMainClient(event) {
+  const client = await self.clients.get(event.clientId)
+
+  if (activeClientIds.has(event.clientId)) {
+    return client
+  }
+
+  if (client?.frameType === 'top-level') {
+    return client
+  }
+
+  const allClients = await self.clients.matchAll({
+    type: 'window',
+  })
+
+  return allClients
+    .filter((client) => {
+      // Get only those clients that are currently visible.
+      return client.visibilityState === 'visible'
+    })
+    .find((client) => {
+      // Find the client ID that's recorded in the
+      // set of clients that have registered the worker.
+      return activeClientIds.has(client.id)
+    })
+}
+
+/**
+ * @param {FetchEvent} event
+ * @param {Client | undefined} client
+ * @param {string} requestId
+ * @returns {Promise<Response>}
+ */
+async function getResponse(event, client, requestId) {
+  // Clone the request because it might've been already used
+  // (i.e. its body has been read and sent to the client).
+  const requestClone = event.request.clone()
+
+  function passthrough() {
+    // Cast the request headers to a new Headers instance
+    // so the headers can be manipulated with.
+    const headers = new Headers(requestClone.headers)
+
+    // Remove the "accept" header value that marked this request as passthrough.
+    // This prevents request alteration and also keeps it compliant with the
+    // user-defined CORS policies.
+    const acceptHeader = headers.get('accept')
+    if (acceptHeader) {
+      const values = acceptHeader.split(',').map((value) => value.trim())
+      const filteredValues = values.filter(
+        (value) => value !== 'msw/passthrough',
+      )
+
+      if (filteredValues.length > 0) {
+        headers.set('accept', filteredValues.join(', '))
+      } else {
+        headers.delete('accept')
+      }
+    }
+
+    return fetch(requestClone, { headers })
+  }
+
+  // Bypass mocking when the client is not active.
+  if (!client) {
+    return passthrough()
+  }
+
+  // Bypass initial page load requests (i.e. static assets).
+  // The absence of the immediate/parent client in the map of the active clients
+  // means that MSW hasn't dispatched the "MOCK_ACTIVATE" event yet
+  // and is not ready to handle requests.
+  if (!activeClientIds.has(client.id)) {
+    return passthrough()
+  }
+
+  // Notify the client that a request has been intercepted.
+  const serializedRequest = await serializeRequest(event.request)
+  const clientMessage = await sendToClient(
+    client,
+    {
+      type: 'REQUEST',
+      payload: {
+        id: requestId,
+        ...serializedRequest,
+      },
+    },
+    [serializedRequest.body],
+  )
+
+  switch (clientMessage.type) {
+    case 'MOCK_RESPONSE': {
+      return respondWithMock(clientMessage.data)
+    }
+
+    case 'PASSTHROUGH': {
+      return passthrough()
+    }
+  }
+
+  return passthrough()
+}
+
+/**
+ * @param {Client} client
+ * @param {any} message
+ * @param {Array<Transferable>} transferrables
+ * @returns {Promise<any>}
+ */
+function sendToClient(client, message, transferrables = []) {
+  return new Promise((resolve, reject) => {
+    const channel = new MessageChannel()
+
+    channel.port1.onmessage = (event) => {
+      if (event.data && event.data.error) {
+        return reject(event.data.error)
+      }
+
+      resolve(event.data)
+    }
+
+    client.postMessage(message, [
+      channel.port2,
+      ...transferrables.filter(Boolean),
+    ])
+  })
+}
+
+/**
+ * @param {Response} response
+ * @returns {Response}
+ */
+function respondWithMock(response) {
+  // Setting response status code to 0 is a no-op.
+  // However, when responding with a "Response.error()", the produced Response
+  // instance will have status code set to 0. Since it's not possible to create
+  // a Response instance with status code 0, handle that use-case separately.
+  if (response.status === 0) {
+    return Response.error()
+  }
+
+  const mockedResponse = new Response(response.body, response)
+
+  Reflect.defineProperty(mockedResponse, IS_MOCKED_RESPONSE, {
+    value: true,
+    enumerable: true,
+  })
+
+  return mockedResponse
+}
+
+/**
+ * @param {Request} request
+ */
+async function serializeRequest(request) {
+  return {
+    url: request.url,
+    mode: request.mode,
+    method: request.method,
+    headers: Object.fromEntries(request.headers.entries()),
+    cache: request.cache,
+    credentials: request.credentials,
+    destination: request.destination,
+    integrity: request.integrity,
+    redirect: request.redirect,
+    referrer: request.referrer,
+    referrerPolicy: request.referrerPolicy,
+    body: await request.arrayBuffer(),
+    keepalive: request.keepalive,
+  }
+}
diff --git a/Gemfile.lock b/Gemfile.lock
index 84dfce44aa..ed1cffefe5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -121,7 +121,7 @@ GEM
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
       rouge (>= 1.0.0)
-    bigdecimal (3.1.9)
+    bigdecimal (3.2.2)
     bindata (2.5.1)
     binding_of_caller (1.0.1)
       debug_inspector (>= 1.2.0)
@@ -287,7 +287,7 @@ GEM
       activesupport (>= 5.1)
       haml (>= 4.0.6)
       railties (>= 5.1)
-    haml_lint (0.62.0)
+    haml_lint (0.63.0)
       haml (>= 5.0)
       parallel (~> 1.10)
       rainbow
@@ -855,8 +855,8 @@ GEM
     stoplight (4.1.1)
       redlock (~> 1.0)
     stringio (3.1.7)
-    strong_migrations (2.3.0)
-      activerecord (>= 7)
+    strong_migrations (2.4.0)
+      activerecord (>= 7.1)
     swd (2.0.3)
       activesupport (>= 3)
       attr_required (>= 0.0.5)
diff --git a/app/controllers/admin/trends/tags_controller.rb b/app/controllers/admin/trends/tags_controller.rb
index 1ccd740686..cff25a254b 100644
--- a/app/controllers/admin/trends/tags_controller.rb
+++ b/app/controllers/admin/trends/tags_controller.rb
@@ -4,7 +4,7 @@ class Admin::Trends::TagsController < Admin::BaseController
   def index
     authorize :tag, :review?
 
-    @pending_tags_count = Tag.pending_review.async_count
+    @pending_tags_count = pending_tags.async_count
     @tags = filtered_tags.page(params[:page])
     @form = Trends::TagBatch.new
   end
@@ -22,6 +22,10 @@ class Admin::Trends::TagsController < Admin::BaseController
 
   private
 
+  def pending_tags
+    Trends::TagFilter.new(status: :pending_review).results
+  end
+
   def filtered_tags
     Trends::TagFilter.new(filter_params).results
   end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index f8ce94a7d2..6dd5af111e 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -101,7 +101,7 @@ class ApplicationController < ActionController::Base
   end
 
   def after_sign_out_path_for(_resource_or_scope)
-    if ENV['OMNIAUTH_ONLY'] == 'true' && ENV['OIDC_ENABLED'] == 'true'
+    if ENV['OMNIAUTH_ONLY'] == 'true' && Rails.configuration.x.omniauth.oidc_enabled?
       '/auth/auth/openid_connect/logout'
     else
       new_user_session_path
diff --git a/app/javascript/mastodon/components/alt_text_badge.tsx b/app/javascript/mastodon/components/alt_text_badge.tsx
index 701cfbe8b4..07369795ac 100644
--- a/app/javascript/mastodon/components/alt_text_badge.tsx
+++ b/app/javascript/mastodon/components/alt_text_badge.tsx
@@ -33,6 +33,7 @@ export const AltTextBadge: React.FC<{
   return (
     <>
       <button
+        type='button'
         ref={anchorRef}
         className='media-gallery__alt__label'
         onClick={handleClick}
diff --git a/app/javascript/mastodon/components/autosuggest_textarea.jsx b/app/javascript/mastodon/components/autosuggest_textarea.jsx
index 07fbccacc9..c7ec3779f3 100644
--- a/app/javascript/mastodon/components/autosuggest_textarea.jsx
+++ b/app/javascript/mastodon/components/autosuggest_textarea.jsx
@@ -162,6 +162,14 @@ const AutosuggestTextarea = forwardRef(({
     }
   }, [suggestions, textareaRef, setSuggestionsHidden]);
 
+  // Hack to force Firefox to change language in autocorrect
+  useEffect(() => {
+    if (lang && textareaRef.current && textareaRef.current === document.activeElement) {
+      textareaRef.current.blur();
+      textareaRef.current.focus();
+    }
+  }, [lang]);
+
   const renderSuggestion = (suggestion, i) => {
     let inner, key;
 
diff --git a/app/javascript/mastodon/components/button/button.stories.tsx b/app/javascript/mastodon/components/button/button.stories.tsx
index b4cca32abd..4bcb9edbb8 100644
--- a/app/javascript/mastodon/components/button/button.stories.tsx
+++ b/app/javascript/mastodon/components/button/button.stories.tsx
@@ -11,6 +11,7 @@ const meta = {
     compact: false,
     dangerous: false,
     disabled: false,
+    loading: false,
     onClick: fn(),
   },
   argTypes: {
@@ -36,19 +37,11 @@ export default meta;
 type Story = StoryObj<typeof meta>;
 
 const buttonTest: Story['play'] = async ({ args, canvas, userEvent }) => {
-  await userEvent.click(canvas.getByRole('button'));
+  const button = await canvas.findByRole('button');
+  await userEvent.click(button);
   await expect(args.onClick).toHaveBeenCalled();
 };
 
-const disabledButtonTest: Story['play'] = async ({
-  args,
-  canvas,
-  userEvent,
-}) => {
-  await userEvent.click(canvas.getByRole('button'));
-  await expect(args.onClick).not.toHaveBeenCalled();
-};
-
 export const Primary: Story = {
   args: {
     children: 'Primary button',
@@ -80,6 +73,18 @@ export const Dangerous: Story = {
   play: buttonTest,
 };
 
+const disabledButtonTest: Story['play'] = async ({
+  args,
+  canvas,
+  userEvent,
+}) => {
+  const button = await canvas.findByRole('button');
+  await userEvent.click(button);
+  // Disabled controls can't be focused
+  await expect(button).not.toHaveFocus();
+  await expect(args.onClick).not.toHaveBeenCalled();
+};
+
 export const PrimaryDisabled: Story = {
   args: {
     ...Primary.args,
@@ -95,3 +100,24 @@ export const SecondaryDisabled: Story = {
   },
   play: disabledButtonTest,
 };
+
+const loadingButtonTest: Story['play'] = async ({
+  args,
+  canvas,
+  userEvent,
+}) => {
+  const button = await canvas.findByRole('button', {
+    name: 'Primary button Loading…',
+  });
+  await userEvent.click(button);
+  await expect(button).toHaveFocus();
+  await expect(args.onClick).not.toHaveBeenCalled();
+};
+
+export const Loading: Story = {
+  args: {
+    ...Primary.args,
+    loading: true,
+  },
+  play: loadingButtonTest,
+};
diff --git a/app/javascript/mastodon/components/button/index.tsx b/app/javascript/mastodon/components/button/index.tsx
index 43f5901c74..6d2a37cf85 100644
--- a/app/javascript/mastodon/components/button/index.tsx
+++ b/app/javascript/mastodon/components/button/index.tsx
@@ -3,12 +3,15 @@ import { useCallback } from 'react';
 
 import classNames from 'classnames';
 
+import { LoadingIndicator } from 'mastodon/components/loading_indicator';
+
 interface BaseProps
   extends Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, 'children'> {
   block?: boolean;
   secondary?: boolean;
   compact?: boolean;
   dangerous?: boolean;
+  loading?: boolean;
 }
 
 interface PropsChildren extends PropsWithChildren<BaseProps> {
@@ -34,6 +37,7 @@ export const Button: React.FC<Props> = ({
   secondary,
   compact,
   dangerous,
+  loading,
   className,
   title,
   text,
@@ -42,13 +46,18 @@ export const Button: React.FC<Props> = ({
 }) => {
   const handleClick = useCallback<React.MouseEventHandler<HTMLButtonElement>>(
     (e) => {
-      if (!disabled && onClick) {
+      if (disabled || loading) {
+        e.stopPropagation();
+        e.preventDefault();
+      } else if (onClick) {
         onClick(e);
       }
     },
-    [disabled, onClick],
+    [disabled, loading, onClick],
   );
 
+  const label = text ?? children;
+
   return (
     <button
       className={classNames('button', className, {
@@ -56,14 +65,27 @@ export const Button: React.FC<Props> = ({
         'button--compact': compact,
         'button--block': block,
         'button--dangerous': dangerous,
+        loading,
       })}
-      disabled={disabled}
+      // Disabled buttons can't have focus, so we don't really
+      // disable the button during loading
+      disabled={disabled && !loading}
+      aria-disabled={loading}
+      // If the loading prop is used, announce label changes
+      aria-live={loading !== undefined ? 'polite' : undefined}
       onClick={handleClick}
       title={title}
       type={type}
       {...props}
     >
-      {text ?? children}
+      {loading ? (
+        <>
+          <span className='button__label-wrapper'>{label}</span>
+          <LoadingIndicator role='none' />
+        </>
+      ) : (
+        label
+      )}
     </button>
   );
 };
diff --git a/app/javascript/mastodon/components/icon.tsx b/app/javascript/mastodon/components/icon.tsx
index f388380c44..165c214c10 100644
--- a/app/javascript/mastodon/components/icon.tsx
+++ b/app/javascript/mastodon/components/icon.tsx
@@ -13,14 +13,13 @@ interface Props extends React.SVGProps<SVGSVGElement> {
   children?: never;
   id: string;
   icon: IconProp;
-  title?: string;
 }
 
 export const Icon: React.FC<Props> = ({
   id,
   icon: IconComponent,
   className,
-  title: titleProp,
+  'aria-label': ariaLabel,
   ...other
 }) => {
   // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
@@ -34,18 +33,19 @@ export const Icon: React.FC<Props> = ({
     IconComponent = CheckBoxOutlineBlankIcon;
   }
 
-  const ariaHidden = titleProp ? undefined : true;
+  const ariaHidden = ariaLabel ? undefined : true;
   const role = !ariaHidden ? 'img' : undefined;
 
   // Set the title to an empty string to remove the built-in SVG one if any
   // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-  const title = titleProp || '';
+  const title = ariaLabel || '';
 
   return (
     <IconComponent
       className={classNames('icon', `icon-${id}`, className)}
       title={title}
       aria-hidden={ariaHidden}
+      aria-label={ariaLabel}
       role={role}
       {...other}
     />
diff --git a/app/javascript/mastodon/components/loading_indicator.tsx b/app/javascript/mastodon/components/loading_indicator.tsx
index fcdbe80d8a..53d216a994 100644
--- a/app/javascript/mastodon/components/loading_indicator.tsx
+++ b/app/javascript/mastodon/components/loading_indicator.tsx
@@ -6,15 +6,34 @@ const messages = defineMessages({
   loading: { id: 'loading_indicator.label', defaultMessage: 'Loading…' },
 });
 
-export const LoadingIndicator: React.FC = () => {
+interface LoadingIndicatorProps {
+  /**
+   * Use role='none' to opt out of the current default role 'progressbar'
+   * and aria attributes which we should re-visit to check if they're appropriate.
+   * In Firefox the aria-label is not applied, instead an implied value of `50` is
+   * used as the label.
+   */
+  role?: string;
+}
+
+export const LoadingIndicator: React.FC<LoadingIndicatorProps> = ({
+  role = 'progressbar',
+}) => {
   const intl = useIntl();
 
+  const a11yProps =
+    role === 'progressbar'
+      ? ({
+          role,
+          'aria-busy': true,
+          'aria-live': 'polite',
+        } as const)
+      : undefined;
+
   return (
     <div
       className='loading-indicator'
-      role='progressbar'
-      aria-busy
-      aria-live='polite'
+      {...a11yProps}
       aria-label={intl.formatMessage(messages.loading)}
     >
       <CircularProgress size={50} strokeWidth={6} />
diff --git a/app/javascript/mastodon/components/poll.tsx b/app/javascript/mastodon/components/poll.tsx
index e9b3b2b672..d9e76617d0 100644
--- a/app/javascript/mastodon/components/poll.tsx
+++ b/app/javascript/mastodon/components/poll.tsx
@@ -318,7 +318,7 @@ const PollOption: React.FC<PollOptionProps> = (props) => {
               id='check'
               icon={CheckIcon}
               className='poll__voted__mark'
-              title={intl.formatMessage(messages.voted)}
+              aria-label={intl.formatMessage(messages.voted)}
             />
           </span>
         )}
diff --git a/app/javascript/mastodon/components/visibility_icon.tsx b/app/javascript/mastodon/components/visibility_icon.tsx
index 3a310cbae2..293b5253cb 100644
--- a/app/javascript/mastodon/components/visibility_icon.tsx
+++ b/app/javascript/mastodon/components/visibility_icon.tsx
@@ -58,7 +58,7 @@ export const VisibilityIcon: React.FC<{ visibility: StatusVisibility }> = ({
     <Icon
       id={visibilityIcon.icon}
       icon={visibilityIcon.iconComponent}
-      title={visibilityIcon.text}
+      aria-label={visibilityIcon.text}
     />
   );
 };
diff --git a/app/javascript/mastodon/features/account_timeline/components/account_header.tsx b/app/javascript/mastodon/features/account_timeline/components/account_header.tsx
index 18807ecf85..30433151c6 100644
--- a/app/javascript/mastodon/features/account_timeline/components/account_header.tsx
+++ b/app/javascript/mastodon/features/account_timeline/components/account_header.tsx
@@ -768,7 +768,7 @@ export const AccountHeader: React.FC<{
       <Icon
         id='lock'
         icon={LockIcon}
-        title={intl.formatMessage(messages.account_locked)}
+        aria-label={intl.formatMessage(messages.account_locked)}
       />
     );
   }
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.jsx b/app/javascript/mastodon/features/compose/components/compose_form.jsx
index 3611a74b4f..6dd3dbd054 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.jsx
+++ b/app/javascript/mastodon/features/compose/components/compose_form.jsx
@@ -12,9 +12,10 @@ import { length } from 'stringz';
 
 import { missingAltTextModal } from 'mastodon/initial_state';
 
-import AutosuggestInput from '../../../components/autosuggest_input';
-import AutosuggestTextarea from '../../../components/autosuggest_textarea';
-import { Button } from '../../../components/button';
+import AutosuggestInput from 'mastodon/components/autosuggest_input';
+import AutosuggestTextarea from 'mastodon/components/autosuggest_textarea';
+import { Button } from 'mastodon/components/button';
+import { LoadingIndicator } from 'mastodon/components/loading_indicator';
 import EmojiPickerDropdown from '../containers/emoji_picker_dropdown_container';
 import PollButtonContainer from '../containers/poll_button_container';
 import PrivacyDropdownContainer from '../containers/privacy_dropdown_container';
@@ -225,9 +226,8 @@ class ComposeForm extends ImmutablePureComponent {
   };
 
   render () {
-    const { intl, onPaste, autoFocus, withoutNavigation, maxChars } = this.props;
+    const { intl, onPaste, autoFocus, withoutNavigation, maxChars, isSubmitting } = this.props;
     const { highlighted } = this.state;
-    const disabled = this.props.isSubmitting;
 
     return (
       <form className='compose-form' onSubmit={this.handleSubmit}>
@@ -246,7 +246,7 @@ class ComposeForm extends ImmutablePureComponent {
                 <AutosuggestInput
                   placeholder={intl.formatMessage(messages.spoiler_placeholder)}
                   value={this.props.spoilerText}
-                  disabled={disabled}
+                  disabled={isSubmitting}
                   onChange={this.handleChangeSpoilerText}
                   onKeyDown={this.handleKeyDown}
                   ref={this.setSpoilerText}
@@ -268,7 +268,7 @@ class ComposeForm extends ImmutablePureComponent {
             <AutosuggestTextarea
               ref={this.textareaRef}
               placeholder={intl.formatMessage(messages.placeholder)}
-              disabled={disabled}
+              disabled={isSubmitting}
               value={this.props.text}
               onChange={this.handleChange}
               suggestions={this.props.suggestions}
@@ -305,9 +305,15 @@ class ComposeForm extends ImmutablePureComponent {
                 <Button
                   type='submit'
                   compact
-                  text={intl.formatMessage(this.props.isEditing ? messages.saveChanges : (this.props.isInReply ? messages.reply : messages.publish))}
                   disabled={!this.canSubmit()}
-                />
+                  loading={isSubmitting}
+                >
+                  {intl.formatMessage(
+                    this.props.isEditing ?
+                      messages.saveChanges : 
+                      (this.props.isInReply ? messages.reply : messages.publish)
+                  )}
+                </Button>
               </div>
             </div>
           </div>
diff --git a/app/javascript/mastodon/features/compose/components/search.tsx b/app/javascript/mastodon/features/compose/components/search.tsx
index 30a7a84db6..ae242190e8 100644
--- a/app/javascript/mastodon/features/compose/components/search.tsx
+++ b/app/javascript/mastodon/features/compose/components/search.tsx
@@ -29,6 +29,7 @@ import { HASHTAG_REGEX } from 'mastodon/utils/hashtags';
 
 const messages = defineMessages({
   placeholder: { id: 'search.placeholder', defaultMessage: 'Search' },
+  clearSearch: { id: 'search.clear', defaultMessage: 'Clear search' },
   placeholderSignedIn: {
     id: 'search.search_or_paste',
     defaultMessage: 'Search or paste URL',
@@ -50,6 +51,34 @@ const unfocus = () => {
   document.querySelector('.ui')?.parentElement?.focus();
 };
 
+const ClearButton: React.FC<{
+  onClick: () => void;
+  hasValue: boolean;
+}> = ({ onClick, hasValue }) => {
+  const intl = useIntl();
+
+  return (
+    <div
+      className={classNames('search__icon-wrapper', { 'has-value': hasValue })}
+    >
+      <Icon id='search' icon={SearchIcon} className='search__icon' />
+      <button
+        type='button'
+        onClick={onClick}
+        className='search__icon search__icon--clear-button'
+        tabIndex={hasValue ? undefined : -1}
+        aria-hidden={!hasValue}
+      >
+        <Icon
+          id='times-circle'
+          icon={CancelIcon}
+          aria-label={intl.formatMessage(messages.clearSearch)}
+        />
+      </button>
+    </div>
+  );
+};
+
 interface SearchOption {
   key: string;
   label: React.ReactNode;
@@ -380,6 +409,7 @@ export const Search: React.FC<{
     setValue('');
     setQuickActions([]);
     setSelectedOption(-1);
+    unfocus();
   }, [setValue, setQuickActions, setSelectedOption]);
 
   const handleKeyDown = useCallback(
@@ -474,19 +504,7 @@ export const Search: React.FC<{
         onBlur={handleBlur}
       />
 
-      <button type='button' className='search__icon' onClick={handleClear}>
-        <Icon
-          id='search'
-          icon={SearchIcon}
-          className={hasValue ? '' : 'active'}
-        />
-        <Icon
-          id='times-circle'
-          icon={CancelIcon}
-          className={hasValue ? 'active' : ''}
-          aria-label={intl.formatMessage(messages.placeholder)}
-        />
-      </button>
+      <ClearButton hasValue={hasValue} onClick={handleClear} />
 
       <div className='search__popout'>
         {!hasValue && (
diff --git a/app/javascript/mastodon/locales/af.json b/app/javascript/mastodon/locales/af.json
index b5c7040d0b..4c846e212f 100644
--- a/app/javascript/mastodon/locales/af.json
+++ b/app/javascript/mastodon/locales/af.json
@@ -95,7 +95,6 @@
   "column_header.pin": "Maak vas",
   "column_header.show_settings": "Wys instellings",
   "column_header.unpin": "Maak los",
-  "column_subheading.settings": "Instellings",
   "community.column_settings.local_only": "Slegs plaaslik",
   "community.column_settings.media_only": "Slegs media",
   "community.column_settings.remote_only": "Slegs elders",
@@ -217,15 +216,10 @@
   "moved_to_account_banner.text": "Jou rekening {disabledAccount} is tans gedeaktiveer omdat jy na {movedToAccount} verhuis het.",
   "navigation_bar.about": "Oor",
   "navigation_bar.bookmarks": "Boekmerke",
-  "navigation_bar.community_timeline": "Plaaslike tydlyn",
-  "navigation_bar.compose": "Skep nuwe plasing",
   "navigation_bar.domain_blocks": "Geblokkeerde domeine",
   "navigation_bar.lists": "Lyste",
   "navigation_bar.logout": "Teken uit",
-  "navigation_bar.personal": "Persoonlik",
-  "navigation_bar.pins": "Vasgemaakte plasings",
   "navigation_bar.preferences": "Voorkeure",
-  "navigation_bar.public_timeline": "Gefedereerde tydlyn",
   "navigation_bar.search": "Soek",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.reblog": "{name} het jou plasing aangestuur",
diff --git a/app/javascript/mastodon/locales/an.json b/app/javascript/mastodon/locales/an.json
index 3649e27a68..6002d55ecf 100644
--- a/app/javascript/mastodon/locales/an.json
+++ b/app/javascript/mastodon/locales/an.json
@@ -105,7 +105,6 @@
   "column_header.pin": "Fixar",
   "column_header.show_settings": "Amostrar achustes",
   "column_header.unpin": "Deixar de fixar",
-  "column_subheading.settings": "Achustes",
   "community.column_settings.local_only": "Solo local",
   "community.column_settings.media_only": "Solo media",
   "community.column_settings.remote_only": "Solo remoto",
@@ -289,23 +288,15 @@
   "navigation_bar.about": "Sobre",
   "navigation_bar.blocks": "Usuarios blocaus",
   "navigation_bar.bookmarks": "Marcadors",
-  "navigation_bar.community_timeline": "Linia de tiempo local",
-  "navigation_bar.compose": "Escribir nueva publicación",
-  "navigation_bar.discover": "Descubrir",
   "navigation_bar.domain_blocks": "Dominios amagaus",
-  "navigation_bar.explore": "Explorar",
   "navigation_bar.filters": "Parolas silenciadas",
   "navigation_bar.follow_requests": "Solicitutz pa seguir-te",
   "navigation_bar.follows_and_followers": "Seguindo y seguidores",
   "navigation_bar.lists": "Listas",
   "navigation_bar.logout": "Zarrar sesión",
   "navigation_bar.mutes": "Usuarios silenciaus",
-  "navigation_bar.personal": "Personal",
-  "navigation_bar.pins": "Publicacions fixadas",
   "navigation_bar.preferences": "Preferencias",
-  "navigation_bar.public_timeline": "Linia de tiempo federada",
   "navigation_bar.search": "Buscar",
-  "navigation_bar.security": "Seguranza",
   "not_signed_in_indicator.not_signed_in": "Amenestes iniciar sesión pa acceder ta este recurso.",
   "notification.admin.report": "{name} informó {target}",
   "notification.admin.sign_up": "{name} se rechistró",
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index 758e7e4dbd..6a94bcfeda 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -141,7 +141,6 @@
   "column_header.show_settings": "إظهار الإعدادات",
   "column_header.unpin": "إلغاء التَّثبيت",
   "column_search.cancel": "إلغاء",
-  "column_subheading.settings": "الإعدادات",
   "community.column_settings.local_only": "المحلي فقط",
   "community.column_settings.media_only": "الوسائط فقط",
   "community.column_settings.remote_only": "عن بُعد فقط",
@@ -445,12 +444,8 @@
   "navigation_bar.advanced_interface": "افتحه في واجهة الويب المتقدمة",
   "navigation_bar.blocks": "الحسابات المحجوبة",
   "navigation_bar.bookmarks": "الفواصل المرجعية",
-  "navigation_bar.community_timeline": "الخيط المحلي",
-  "navigation_bar.compose": "تحرير منشور جديد",
   "navigation_bar.direct": "الإشارات الخاصة",
-  "navigation_bar.discover": "اكتشف",
   "navigation_bar.domain_blocks": "النطاقات المحظورة",
-  "navigation_bar.explore": "استكشف",
   "navigation_bar.favourites": "المفضلة",
   "navigation_bar.filters": "الكلمات المكتومة",
   "navigation_bar.follow_requests": "طلبات المتابعة",
@@ -461,12 +456,8 @@
   "navigation_bar.moderation": "الإشراف",
   "navigation_bar.mutes": "الحسابات المكتومة",
   "navigation_bar.opened_in_classic_interface": "تُفتَح المنشورات والحسابات وغيرها من الصفحات الخاصة بشكل مبدئي على واجهة الويب التقليدية.",
-  "navigation_bar.personal": "شخصي",
-  "navigation_bar.pins": "المنشورات المُثَبَّتَة",
   "navigation_bar.preferences": "التفضيلات",
-  "navigation_bar.public_timeline": "الخيط الفيدرالي",
   "navigation_bar.search": "البحث",
-  "navigation_bar.security": "الأمان",
   "not_signed_in_indicator.not_signed_in": "تحتاج إلى تسجيل الدخول للوصول إلى هذا المصدر.",
   "notification.admin.report": "{name} أبلغ عن {target}",
   "notification.admin.sign_up": "أنشأ {name} حسابًا",
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
index 3777d31e2b..64fe9ddcb3 100644
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@@ -121,7 +121,6 @@
   "column_header.show_settings": "Amosar la configuración",
   "column_header.unpin": "Lliberar",
   "column_search.cancel": "Encaboxar",
-  "column_subheading.settings": "Configuración",
   "community.column_settings.media_only": "Namás el conteníu multimedia",
   "community.column_settings.remote_only": "Namás lo remoto",
   "compose.language.change": "Camudar la llingua",
@@ -342,10 +341,8 @@
   "navigation_bar.about": "Tocante a",
   "navigation_bar.blocks": "Perfiles bloquiaos",
   "navigation_bar.bookmarks": "Marcadores",
-  "navigation_bar.community_timeline": "Llinia de tiempu llocal",
   "navigation_bar.direct": "Menciones privaes",
   "navigation_bar.domain_blocks": "Dominios bloquiaos",
-  "navigation_bar.explore": "Esploración",
   "navigation_bar.favourites": "Favoritos",
   "navigation_bar.filters": "Pallabres desactivaes",
   "navigation_bar.follow_requests": "Solicitúes de siguimientu",
@@ -356,11 +353,7 @@
   "navigation_bar.moderation": "Moderación",
   "navigation_bar.mutes": "Perfiles colos avisos desactivaos",
   "navigation_bar.opened_in_classic_interface": "Los artículos, les cuentes y otres páxines específiques ábrense por defeutu na interfaz web clásica.",
-  "navigation_bar.personal": "Personal",
-  "navigation_bar.pins": "Artículos fixaos",
   "navigation_bar.preferences": "Preferencies",
-  "navigation_bar.public_timeline": "Llinia de tiempu federada",
-  "navigation_bar.security": "Seguranza",
   "not_signed_in_indicator.not_signed_in": "Tienes d'aniciar la sesión p'acceder a esti recursu.",
   "notification.admin.report": "{name} informó de: {target}",
   "notification.admin.sign_up": "{name} rexistróse",
diff --git a/app/javascript/mastodon/locales/az.json b/app/javascript/mastodon/locales/az.json
index abcf6d1fde..c8663b5102 100644
--- a/app/javascript/mastodon/locales/az.json
+++ b/app/javascript/mastodon/locales/az.json
@@ -169,7 +169,6 @@
   "column_header.show_settings": "Parametrləri göstər",
   "column_header.unpin": "Bərkitmə",
   "column_search.cancel": "İmtina",
-  "column_subheading.settings": "Parametrlər",
   "community.column_settings.local_only": "Sadəcə lokalda",
   "community.column_settings.media_only": "Sadəcə media",
   "community.column_settings.remote_only": "Sadəcə uzaq serverlər",
diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index 482dbd4a61..619db68b11 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -161,7 +161,6 @@
   "column_header.show_settings": "Паказаць налады",
   "column_header.unpin": "Адмацаваць",
   "column_search.cancel": "Скасаваць",
-  "column_subheading.settings": "Налады",
   "community.column_settings.local_only": "Толькі лакальныя",
   "community.column_settings.media_only": "Толькі медыя",
   "community.column_settings.remote_only": "Толькі дыстанцыйна",
@@ -483,12 +482,8 @@
   "navigation_bar.advanced_interface": "Адкрыць у пашыраным вэб-інтэрфейсе",
   "navigation_bar.blocks": "Заблакіраваныя карыстальнікі",
   "navigation_bar.bookmarks": "Закладкі",
-  "navigation_bar.community_timeline": "Лакальная стужка",
-  "navigation_bar.compose": "Стварыць новы допіс",
   "navigation_bar.direct": "Асабістыя згадванні",
-  "navigation_bar.discover": "Даведайцесь",
   "navigation_bar.domain_blocks": "Заблакіраваныя дамены",
-  "navigation_bar.explore": "Агляд",
   "navigation_bar.favourites": "Упадабанае",
   "navigation_bar.filters": "Ігнараваныя словы",
   "navigation_bar.follow_requests": "Запыты на падпіску",
@@ -499,12 +494,8 @@
   "navigation_bar.moderation": "Мадэрацыя",
   "navigation_bar.mutes": "Ігнараваныя карыстальнікі",
   "navigation_bar.opened_in_classic_interface": "Допісы, уліковыя запісы і іншыя спецыфічныя старонкі па змоўчанні адчыняюцца ў класічным вэб-інтэрфейсе.",
-  "navigation_bar.personal": "Асабістае",
-  "navigation_bar.pins": "Замацаваныя допісы",
   "navigation_bar.preferences": "Налады",
-  "navigation_bar.public_timeline": "Глабальная стужка",
   "navigation_bar.search": "Пошук",
-  "navigation_bar.security": "Бяспека",
   "not_signed_in_indicator.not_signed_in": "Вам трэба ўвайсці каб атрымаць доступ да гэтага рэсурсу.",
   "notification.admin.report": "{name} паскардзіўся на {target}",
   "notification.admin.report_account": "{name} паскардзіўся на {count, plural, one {# допіс} many {# допісаў} other {# допіса}} ад {target} з прычыны {category}",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 1428f83e61..d1f44b8362 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -180,7 +180,6 @@
   "column_header.show_settings": "Показване на настройките",
   "column_header.unpin": "Разкачане",
   "column_search.cancel": "Отказ",
-  "column_subheading.settings": "Настройки",
   "community.column_settings.local_only": "Само локално",
   "community.column_settings.media_only": "Само мултимедия",
   "community.column_settings.remote_only": "Само отдалечено",
@@ -538,12 +537,8 @@
   "navigation_bar.advanced_interface": "Отваряне в разширен уебинтерфейс",
   "navigation_bar.blocks": "Блокирани потребители",
   "navigation_bar.bookmarks": "Отметки",
-  "navigation_bar.community_timeline": "Локална хронология",
-  "navigation_bar.compose": "Съставяне на нова публикация",
   "navigation_bar.direct": "Частни споменавания",
-  "navigation_bar.discover": "Откриване",
   "navigation_bar.domain_blocks": "Блокирани домейни",
-  "navigation_bar.explore": "Разглеждане",
   "navigation_bar.favourites": "Любими",
   "navigation_bar.filters": "Заглушени думи",
   "navigation_bar.follow_requests": "Заявки за последване",
@@ -554,12 +549,8 @@
   "navigation_bar.moderation": "Модериране",
   "navigation_bar.mutes": "Заглушени потребители",
   "navigation_bar.opened_in_classic_interface": "Публикации, акаунти и други особени страници се отварят по подразбиране в класическия мрежови интерфейс.",
-  "navigation_bar.personal": "Лично",
-  "navigation_bar.pins": "Закачени публикации",
   "navigation_bar.preferences": "Предпочитания",
-  "navigation_bar.public_timeline": "Федеративна хронология",
   "navigation_bar.search": "Търсене",
-  "navigation_bar.security": "Сигурност",
   "not_signed_in_indicator.not_signed_in": "Трябва ви вход за достъп до ресурса.",
   "notification.admin.report": "{name} докладва {target}",
   "notification.admin.report_account": "{name} докладва {count, plural, one {публикация} other {# публикации}} от {target} за {category}",
diff --git a/app/javascript/mastodon/locales/bn.json b/app/javascript/mastodon/locales/bn.json
index f6fc54a3f0..b8bc590464 100644
--- a/app/javascript/mastodon/locales/bn.json
+++ b/app/javascript/mastodon/locales/bn.json
@@ -121,7 +121,6 @@
   "column_header.pin": "পিন দিয়ে রাখুন",
   "column_header.show_settings": "সেটিং দেখান",
   "column_header.unpin": "পিন খুলুন",
-  "column_subheading.settings": "সেটিং",
   "community.column_settings.local_only": "শুধুমাত্র স্থানীয়",
   "community.column_settings.media_only": "শুধুমাত্র ছবি বা ভিডিও",
   "community.column_settings.remote_only": "শুধুমাত্র দূরবর্তী",
@@ -279,11 +278,7 @@
   "navigation_bar.about": "পরিচিতি",
   "navigation_bar.blocks": "বন্ধ করা ব্যবহারকারী",
   "navigation_bar.bookmarks": "বুকমার্ক",
-  "navigation_bar.community_timeline": "স্থানীয় সময়রেখা",
-  "navigation_bar.compose": "নতুন টুট লিখুন",
-  "navigation_bar.discover": "ঘুরে দেখুন",
   "navigation_bar.domain_blocks": "লুকানো ডোমেনগুলি",
-  "navigation_bar.explore": "পরিব্রাজন",
   "navigation_bar.favourites": "পছন্দসমূহ",
   "navigation_bar.filters": "বন্ধ করা শব্দ",
   "navigation_bar.follow_requests": "অনুসরণের অনুরোধগুলি",
@@ -291,12 +286,8 @@
   "navigation_bar.lists": "তালিকাগুলো",
   "navigation_bar.logout": "বাইরে যান",
   "navigation_bar.mutes": "যাদের কার্যক্রম দেখা বন্ধ আছে",
-  "navigation_bar.personal": "নিজস্ব",
-  "navigation_bar.pins": "পিন দেওয়া টুট",
   "navigation_bar.preferences": "পছন্দসমূহ",
-  "navigation_bar.public_timeline": "যুক্তবিশ্বের সময়রেখা",
   "navigation_bar.search": "অনুসন্ধান",
-  "navigation_bar.security": "নিরাপত্তা",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.follow": "{name} আপনাকে অনুসরণ করেছেন",
   "notification.follow_request": "{name} আপনাকে অনুসরণ করার জন্য অনুরধ করেছে",
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index b6cec5267f..8b318752a3 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -139,7 +139,6 @@
   "column_header.show_settings": "Diskouez an arventennoù",
   "column_header.unpin": "Dispilhennañ",
   "column_search.cancel": "Nullañ",
-  "column_subheading.settings": "Arventennoù",
   "community.column_settings.local_only": "Nemet lec'hel",
   "community.column_settings.media_only": "Nemet Mediaoù",
   "community.column_settings.remote_only": "Nemet a-bell",
@@ -374,12 +373,8 @@
   "navigation_bar.automated_deletion": "Dilemel an embannadenn ent-emgefreek",
   "navigation_bar.blocks": "Implijer·ezed·ien berzet",
   "navigation_bar.bookmarks": "Sinedoù",
-  "navigation_bar.community_timeline": "Red-amzer lec'hel",
-  "navigation_bar.compose": "Skrivañ un toud nevez",
   "navigation_bar.direct": "Menegoù prevez",
-  "navigation_bar.discover": "Dizoleiñ",
   "navigation_bar.domain_blocks": "Domanioù kuzhet",
-  "navigation_bar.explore": "Furchal",
   "navigation_bar.favourites": "Muiañ-karet",
   "navigation_bar.filters": "Gerioù kuzhet",
   "navigation_bar.follow_requests": "Pedadoù heuliañ",
@@ -390,13 +385,9 @@
   "navigation_bar.logout": "Digennaskañ",
   "navigation_bar.more": "Muioc'h",
   "navigation_bar.mutes": "Implijer·ion·ezed kuzhet",
-  "navigation_bar.personal": "Personel",
-  "navigation_bar.pins": "Toudoù spilhennet",
   "navigation_bar.preferences": "Gwellvezioù",
-  "navigation_bar.public_timeline": "Red-amzer kevredet",
   "navigation_bar.search": "Klask",
   "navigation_bar.search_trends": "Klask / Diouzh ar c'hiz",
-  "navigation_bar.security": "Diogelroez",
   "not_signed_in_indicator.not_signed_in": "Ret eo deoc'h kevreañ evit tizhout an danvez-se.",
   "notification.admin.report": "Disklêriet eo bet {target} gant {name}",
   "notification.admin.sign_up": "{name} en·he deus lakaet e·hec'h anv",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index fba081e70d..ee598afd4b 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -184,7 +184,6 @@
   "column_header.show_settings": "Mostra la configuració",
   "column_header.unpin": "Desfixa",
   "column_search.cancel": "Cancel·la",
-  "column_subheading.settings": "Configuració",
   "community.column_settings.local_only": "Només local",
   "community.column_settings.media_only": "Només contingut",
   "community.column_settings.remote_only": "Només remot",
@@ -554,12 +553,8 @@
   "navigation_bar.automated_deletion": "Esborrat automàtic de publicacions",
   "navigation_bar.blocks": "Usuaris blocats",
   "navigation_bar.bookmarks": "Marcadors",
-  "navigation_bar.community_timeline": "Línia de temps local",
-  "navigation_bar.compose": "Redacta un tut",
   "navigation_bar.direct": "Mencions privades",
-  "navigation_bar.discover": "Descobreix",
   "navigation_bar.domain_blocks": "Dominis blocats",
-  "navigation_bar.explore": "Explora",
   "navigation_bar.favourites": "Favorits",
   "navigation_bar.filters": "Paraules silenciades",
   "navigation_bar.follow_requests": "Sol·licituds de seguiment",
@@ -572,13 +567,9 @@
   "navigation_bar.more": "Més",
   "navigation_bar.mutes": "Usuaris silenciats",
   "navigation_bar.opened_in_classic_interface": "Els tuts, comptes i altres pàgines especifiques s'obren per defecte en la interfície web clàssica.",
-  "navigation_bar.personal": "Personal",
-  "navigation_bar.pins": "Tuts fixats",
   "navigation_bar.preferences": "Preferències",
   "navigation_bar.privacy_and_reach": "Privacitat i abast",
-  "navigation_bar.public_timeline": "Línia de temps federada",
   "navigation_bar.search": "Cerca",
-  "navigation_bar.security": "Seguretat",
   "navigation_panel.collapse_lists": "Tanca el menú",
   "navigation_panel.expand_lists": "Expandeix el menú",
   "not_signed_in_indicator.not_signed_in": "Cal que iniciïs la sessió per a accedir a aquest recurs.",
diff --git a/app/javascript/mastodon/locales/ckb.json b/app/javascript/mastodon/locales/ckb.json
index afc1633f2b..483b36b498 100644
--- a/app/javascript/mastodon/locales/ckb.json
+++ b/app/javascript/mastodon/locales/ckb.json
@@ -121,7 +121,6 @@
   "column_header.pin": "سنجاق",
   "column_header.show_settings": "نیشاندانی رێکخستنەکان",
   "column_header.unpin": "سنجاق نەکردن",
-  "column_subheading.settings": "رێکخستنەکان",
   "community.column_settings.local_only": "تەنها خۆماڵی",
   "community.column_settings.media_only": "تەنها میدیا",
   "community.column_settings.remote_only": "تەنها بۆ دوور",
@@ -333,12 +332,8 @@
   "navigation_bar.about": "دەربارە",
   "navigation_bar.blocks": "بەکارهێنەرە بلۆککراوەکان",
   "navigation_bar.bookmarks": "نیشانکراوەکان",
-  "navigation_bar.community_timeline": "دەمنامەی ناوخۆیی",
-  "navigation_bar.compose": "نووسینی توتی نوێ",
   "navigation_bar.direct": "ئاماژەی تایبەت",
-  "navigation_bar.discover": "دۆزینەوە",
   "navigation_bar.domain_blocks": "دۆمەینە بلۆک کراوەکان",
-  "navigation_bar.explore": "گەڕان",
   "navigation_bar.filters": "وشە کپەکان",
   "navigation_bar.follow_requests": "بەدواداچوی داواکاریەکان بکە",
   "navigation_bar.followed_tags": "هاشتاگی بەدوادا هات",
@@ -346,12 +341,8 @@
   "navigation_bar.lists": "لیستەکان",
   "navigation_bar.logout": "دەرچوون",
   "navigation_bar.mutes": "کپکردنی بەکارهێنەران",
-  "navigation_bar.personal": "کەسی",
-  "navigation_bar.pins": "توتی چەسپاو",
   "navigation_bar.preferences": "پەسەندەکان",
-  "navigation_bar.public_timeline": "نووسراوەکانی هەمووشوێنێک",
   "navigation_bar.search": "گەڕان",
-  "navigation_bar.security": "ئاسایش",
   "not_signed_in_indicator.not_signed_in": "پێویستە بچیتە ژوورەوە بۆ دەستگەیشتن بەم سەرچاوەیە.",
   "notification.admin.report": "{name} ڕاپۆرت کراوە {target}",
   "notification.admin.sign_up": "{name} تۆمارکرا",
diff --git a/app/javascript/mastodon/locales/co.json b/app/javascript/mastodon/locales/co.json
index 0e5ba3694e..e2568c215a 100644
--- a/app/javascript/mastodon/locales/co.json
+++ b/app/javascript/mastodon/locales/co.json
@@ -62,7 +62,6 @@
   "column_header.pin": "Puntarulà",
   "column_header.show_settings": "Mustrà i parametri",
   "column_header.unpin": "Spuntarulà",
-  "column_subheading.settings": "Parametri",
   "community.column_settings.local_only": "Solu lucale",
   "community.column_settings.media_only": "Solu media",
   "community.column_settings.remote_only": "Solu distante",
@@ -200,9 +199,6 @@
   "load_pending": "{count, plural, one {# entrata nova} other {# entrate nove}}",
   "navigation_bar.blocks": "Utilizatori bluccati",
   "navigation_bar.bookmarks": "Segnalibri",
-  "navigation_bar.community_timeline": "Linea pubblica lucale",
-  "navigation_bar.compose": "Scrive un novu statutu",
-  "navigation_bar.discover": "Scopre",
   "navigation_bar.domain_blocks": "Duminii piattati",
   "navigation_bar.filters": "Parolle silenzate",
   "navigation_bar.follow_requests": "Dumande d'abbunamentu",
@@ -210,11 +206,7 @@
   "navigation_bar.lists": "Liste",
   "navigation_bar.logout": "Scunnettassi",
   "navigation_bar.mutes": "Utilizatori piattati",
-  "navigation_bar.personal": "Persunale",
-  "navigation_bar.pins": "Statuti puntarulati",
   "navigation_bar.preferences": "Preferenze",
-  "navigation_bar.public_timeline": "Linea pubblica glubale",
-  "navigation_bar.security": "Sicurità",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.follow": "{name} v'hà seguitatu",
   "notification.follow_request": "{name} vole abbunassi à u vostru contu",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index dc6acbfd94..892bc0e87a 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -184,7 +184,6 @@
   "column_header.show_settings": "Zobrazit nastavení",
   "column_header.unpin": "Odepnout",
   "column_search.cancel": "Zrušit",
-  "column_subheading.settings": "Nastavení",
   "community.column_settings.local_only": "Pouze místní",
   "community.column_settings.media_only": "Pouze média",
   "community.column_settings.remote_only": "Pouze vzdálené",
@@ -555,12 +554,8 @@
   "navigation_bar.automated_deletion": "Automatické mazání příspěvků",
   "navigation_bar.blocks": "Blokovaní uživatelé",
   "navigation_bar.bookmarks": "Záložky",
-  "navigation_bar.community_timeline": "Místní časová osa",
-  "navigation_bar.compose": "Vytvořit nový příspěvek",
   "navigation_bar.direct": "Soukromé zmínky",
-  "navigation_bar.discover": "Objevit",
   "navigation_bar.domain_blocks": "Blokované domény",
-  "navigation_bar.explore": "Prozkoumat",
   "navigation_bar.favourites": "Oblíbené",
   "navigation_bar.filters": "Skrytá slova",
   "navigation_bar.follow_requests": "Žádosti o sledování",
@@ -568,19 +563,17 @@
   "navigation_bar.follows_and_followers": "Sledovaní a sledující",
   "navigation_bar.import_export": "Import a export",
   "navigation_bar.lists": "Seznamy",
+  "navigation_bar.live_feed_local": "Živý kanál (místní)",
+  "navigation_bar.live_feed_public": "Živý kanál (veřejný)",
   "navigation_bar.logout": "Odhlásit se",
   "navigation_bar.moderation": "Moderace",
   "navigation_bar.more": "Více",
   "navigation_bar.mutes": "Skrytí uživatelé",
   "navigation_bar.opened_in_classic_interface": "Příspěvky, účty a další specifické stránky jsou ve výchozím nastavení otevřeny v klasickém webovém rozhraní.",
-  "navigation_bar.personal": "Osobní",
-  "navigation_bar.pins": "Připnuté příspěvky",
   "navigation_bar.preferences": "Předvolby",
   "navigation_bar.privacy_and_reach": "Soukromí a dosah",
-  "navigation_bar.public_timeline": "Federovaná časová osa",
   "navigation_bar.search": "Hledat",
   "navigation_bar.search_trends": "Hledat / Populární",
-  "navigation_bar.security": "Zabezpečení",
   "navigation_panel.collapse_followed_tags": "Sbalit menu sledovaných hashtagů",
   "navigation_panel.collapse_lists": "Sbalit menu",
   "navigation_panel.expand_followed_tags": "Rozbalit menu sledovaných hashtagů",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index 4a669eb5d0..58db2335b4 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -184,7 +184,6 @@
   "column_header.show_settings": "Dangos gosodiadau",
   "column_header.unpin": "Dadbinio",
   "column_search.cancel": "Diddymu",
-  "column_subheading.settings": "Gosodiadau",
   "community.column_settings.local_only": "Lleol yn unig",
   "community.column_settings.media_only": "Cyfryngau yn unig",
   "community.column_settings.remote_only": "Pell yn unig",
@@ -555,12 +554,8 @@
   "navigation_bar.automated_deletion": "Dileu postiadau'n awtomatig",
   "navigation_bar.blocks": "Defnyddwyr wedi'u rhwystro",
   "navigation_bar.bookmarks": "Nodau Tudalen",
-  "navigation_bar.community_timeline": "Ffrwd leol",
-  "navigation_bar.compose": "Cyfansoddi post newydd",
   "navigation_bar.direct": "Crybwylliadau preifat",
-  "navigation_bar.discover": "Darganfod",
   "navigation_bar.domain_blocks": "Parthau wedi'u rhwystro",
-  "navigation_bar.explore": "Darganfod",
   "navigation_bar.favourites": "Ffefrynnau",
   "navigation_bar.filters": "Geiriau wedi'u tewi",
   "navigation_bar.follow_requests": "Ceisiadau dilyn",
@@ -573,14 +568,10 @@
   "navigation_bar.more": "Rhagor",
   "navigation_bar.mutes": "Defnyddwyr wedi'u tewi",
   "navigation_bar.opened_in_classic_interface": "Mae postiadau, cyfrifon a thudalennau penodol eraill yn cael eu hagor fel rhagosodiad yn y rhyngwyneb gwe clasurol.",
-  "navigation_bar.personal": "Personol",
-  "navigation_bar.pins": "Postiadau wedi eu pinio",
   "navigation_bar.preferences": "Dewisiadau",
   "navigation_bar.privacy_and_reach": "Preifatrwydd a chyrhaeddiad",
-  "navigation_bar.public_timeline": "Ffrwd y ffederasiwn",
   "navigation_bar.search": "Chwilio",
   "navigation_bar.search_trends": "Chwilio / Trendio",
-  "navigation_bar.security": "Diogelwch",
   "navigation_panel.collapse_followed_tags": "Cau dewislen hashnodau dilyn",
   "navigation_panel.collapse_lists": "Cau dewislen y rhestr",
   "navigation_panel.expand_followed_tags": "Agor dewislen hashnodau dilyn",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index ed8e1e41c4..5fab19b38f 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -184,7 +184,6 @@
   "column_header.show_settings": "Vis indstillinger",
   "column_header.unpin": "Frigør",
   "column_search.cancel": "Afbryd",
-  "column_subheading.settings": "Indstillinger",
   "community.column_settings.local_only": "Kun lokalt",
   "community.column_settings.media_only": "Kun medier",
   "community.column_settings.remote_only": "Kun udefra",
@@ -554,12 +553,8 @@
   "navigation_bar.automated_deletion": "Automatiseret sletning af indlæg",
   "navigation_bar.blocks": "Blokerede brugere",
   "navigation_bar.bookmarks": "Bogmærker",
-  "navigation_bar.community_timeline": "Lokal tidslinje",
-  "navigation_bar.compose": "Skriv nyt indlæg",
   "navigation_bar.direct": "Private omtaler",
-  "navigation_bar.discover": "Opdag",
   "navigation_bar.domain_blocks": "Blokerede domæner",
-  "navigation_bar.explore": "Udforsk",
   "navigation_bar.favourites": "Favoritter",
   "navigation_bar.filters": "Skjulte ord",
   "navigation_bar.follow_requests": "Følgeanmodninger",
@@ -567,19 +562,17 @@
   "navigation_bar.follows_and_followers": "Følges og følgere",
   "navigation_bar.import_export": "Import og eksport",
   "navigation_bar.lists": "Lister",
+  "navigation_bar.live_feed_local": "Live feed (lokalt)",
+  "navigation_bar.live_feed_public": "Live feed (offentligt)",
   "navigation_bar.logout": "Log af",
   "navigation_bar.moderation": "Moderering",
   "navigation_bar.more": "Mere",
   "navigation_bar.mutes": "Skjulte brugere",
   "navigation_bar.opened_in_classic_interface": "Indlæg, konti og visse andre sider åbnes som standard i den klassiske webgrænseflade.",
-  "navigation_bar.personal": "Personlig",
-  "navigation_bar.pins": "Fastgjorte indlæg",
   "navigation_bar.preferences": "Præferencer",
   "navigation_bar.privacy_and_reach": "Fortrolighed og udbredelse",
-  "navigation_bar.public_timeline": "Fælles tidslinje",
   "navigation_bar.search": "Søg",
   "navigation_bar.search_trends": "Søg/Populære",
-  "navigation_bar.security": "Sikkerhed",
   "navigation_panel.collapse_followed_tags": "Sammenfold menuen Fulgte hashtags",
   "navigation_panel.expand_followed_tags": "Udfold menuen Fulgte hashtags",
   "not_signed_in_indicator.not_signed_in": "Log ind for at tilgå denne ressource.",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index bd76a35769..50da7c9038 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -184,7 +184,6 @@
   "column_header.show_settings": "Einstellungen anzeigen",
   "column_header.unpin": "Lösen",
   "column_search.cancel": "Abbrechen",
-  "column_subheading.settings": "Einstellungen",
   "community.column_settings.local_only": "Nur lokal",
   "community.column_settings.media_only": "Nur Beiträge mit Medien",
   "community.column_settings.remote_only": "Nur andere Mastodon-Server",
@@ -555,12 +554,8 @@
   "navigation_bar.automated_deletion": "Automatisiertes Löschen",
   "navigation_bar.blocks": "Blockierte Profile",
   "navigation_bar.bookmarks": "Lesezeichen",
-  "navigation_bar.community_timeline": "Lokale Timeline",
-  "navigation_bar.compose": "Neuen Beitrag verfassen",
   "navigation_bar.direct": "Private Erwähnungen",
-  "navigation_bar.discover": "Entdecken",
   "navigation_bar.domain_blocks": "Blockierte Domains",
-  "navigation_bar.explore": "Entdecken",
   "navigation_bar.favourites": "Favoriten",
   "navigation_bar.filters": "Stummgeschaltete Wörter",
   "navigation_bar.follow_requests": "Follower-Anfragen",
@@ -568,19 +563,17 @@
   "navigation_bar.follows_and_followers": "Follower und Folge ich",
   "navigation_bar.import_export": "Importieren und exportieren",
   "navigation_bar.lists": "Listen",
+  "navigation_bar.live_feed_local": "Live-Feed (lokal)",
+  "navigation_bar.live_feed_public": "Live-Feed (öffentlich)",
   "navigation_bar.logout": "Abmelden",
   "navigation_bar.moderation": "Moderation",
   "navigation_bar.more": "Mehr",
   "navigation_bar.mutes": "Stummgeschaltete Profile",
   "navigation_bar.opened_in_classic_interface": "Beiträge, Konten und andere bestimmte Seiten werden standardmäßig im klassischen Webinterface geöffnet.",
-  "navigation_bar.personal": "Persönlich",
-  "navigation_bar.pins": "Angeheftete Beiträge",
   "navigation_bar.preferences": "Einstellungen",
   "navigation_bar.privacy_and_reach": "Datenschutz und Reichweite",
-  "navigation_bar.public_timeline": "Föderierte Timeline",
   "navigation_bar.search": "Suche",
   "navigation_bar.search_trends": "Suche / Angesagt",
-  "navigation_bar.security": "Sicherheit",
   "navigation_panel.collapse_followed_tags": "Menü für gefolgte Hashtags schließen",
   "navigation_panel.collapse_lists": "Listen-Menü schließen",
   "navigation_panel.expand_followed_tags": "Menü für gefolgte Hashtags öffnen",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index 4ac1e70634..d6d029c989 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -184,7 +184,6 @@
   "column_header.show_settings": "Εμφάνιση ρυθμίσεων",
   "column_header.unpin": "Ξεκαρφίτσωμα",
   "column_search.cancel": "Ακύρωση",
-  "column_subheading.settings": "Ρυθμίσεις",
   "community.column_settings.local_only": "Τοπικά μόνο",
   "community.column_settings.media_only": "Μόνο πολυμέσα",
   "community.column_settings.remote_only": "Απομακρυσμένα μόνο",
@@ -555,12 +554,8 @@
   "navigation_bar.automated_deletion": "Αυτοματοποιημένη διαγραφή αναρτήσεων",
   "navigation_bar.blocks": "Αποκλεισμένοι χρήστες",
   "navigation_bar.bookmarks": "Σελιδοδείκτες",
-  "navigation_bar.community_timeline": "Τοπική ροή",
-  "navigation_bar.compose": "Γράψε νέα ανάρτηση",
   "navigation_bar.direct": "Ιδιωτικές επισημάνσεις",
-  "navigation_bar.discover": "Ανακάλυψη",
   "navigation_bar.domain_blocks": "Αποκλεισμένοι τομείς",
-  "navigation_bar.explore": "Εξερεύνηση",
   "navigation_bar.favourites": "Αγαπημένα",
   "navigation_bar.filters": "Αποσιωπημένες λέξεις",
   "navigation_bar.follow_requests": "Αιτήματα ακολούθησης",
@@ -573,14 +568,10 @@
   "navigation_bar.more": "Περισσότερα",
   "navigation_bar.mutes": "Αποσιωπημένοι χρήστες",
   "navigation_bar.opened_in_classic_interface": "Δημοσιεύσεις, λογαριασμοί και άλλες συγκεκριμένες σελίδες ανοίγονται από προεπιλογή στην κλασική διεπαφή ιστού.",
-  "navigation_bar.personal": "Προσωπικά",
-  "navigation_bar.pins": "Καρφιτσωμένες αναρτήσεις",
   "navigation_bar.preferences": "Προτιμήσεις",
   "navigation_bar.privacy_and_reach": "Ιδιωτικότητα και προσιτότητα",
-  "navigation_bar.public_timeline": "Ροή συναλλαγών",
   "navigation_bar.search": "Αναζήτηση",
   "navigation_bar.search_trends": "Αναζήτηση / Τάσεις",
-  "navigation_bar.security": "Ασφάλεια",
   "navigation_panel.collapse_followed_tags": "Σύμπτυξη μενού ετικετών που ακολουθούνται",
   "navigation_panel.collapse_lists": "Σύμπτυξη μενού λίστας",
   "navigation_panel.expand_followed_tags": "Επέκταση μενού ετικετών που ακολουθούνται",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index 0e95bcb45d..1e303200cd 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -184,7 +184,6 @@
   "column_header.show_settings": "Show settings",
   "column_header.unpin": "Unpin",
   "column_search.cancel": "Cancel",
-  "column_subheading.settings": "Settings",
   "community.column_settings.local_only": "Local only",
   "community.column_settings.media_only": "Media Only",
   "community.column_settings.remote_only": "Remote only",
@@ -552,12 +551,8 @@
   "navigation_bar.advanced_interface": "Open in advanced web interface",
   "navigation_bar.blocks": "Blocked users",
   "navigation_bar.bookmarks": "Bookmarks",
-  "navigation_bar.community_timeline": "Local timeline",
-  "navigation_bar.compose": "Compose new post",
   "navigation_bar.direct": "Private mentions",
-  "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Blocked domains",
-  "navigation_bar.explore": "Explore",
   "navigation_bar.favourites": "Favourites",
   "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Follow requests",
@@ -568,12 +563,8 @@
   "navigation_bar.moderation": "Moderation",
   "navigation_bar.mutes": "Muted users",
   "navigation_bar.opened_in_classic_interface": "Posts, accounts, and other specific pages are opened by default in the classic web interface.",
-  "navigation_bar.personal": "Personal",
-  "navigation_bar.pins": "Pinned posts",
   "navigation_bar.preferences": "Preferences",
-  "navigation_bar.public_timeline": "Federated timeline",
   "navigation_bar.search": "Search",
-  "navigation_bar.security": "Security",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.admin.report": "{name} reported {target}",
   "notification.admin.report_account": "{name} reported {count, plural, one {one post} other {# posts}} from {target} for {category}",
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 0f53dbe576..6a2a7a885b 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -804,6 +804,7 @@
   "report_notification.categories.violation": "Rule violation",
   "report_notification.categories.violation_sentence": "rule violation",
   "report_notification.open": "Open report",
+  "search.clear": "Clear search",
   "search.no_recent_searches": "No recent searches",
   "search.placeholder": "Search",
   "search.quick_action.account_search": "Profiles matching {x}",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index ad57876965..f35dbe0423 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -178,7 +178,6 @@
   "column_header.show_settings": "Montri agordojn",
   "column_header.unpin": "Malfiksi",
   "column_search.cancel": "Nuligi",
-  "column_subheading.settings": "Agordoj",
   "community.column_settings.local_only": "Nur loka",
   "community.column_settings.media_only": "Nur aŭdovidaĵoj",
   "community.column_settings.remote_only": "Nur fora",
@@ -538,12 +537,8 @@
   "navigation_bar.advanced_interface": "Malfermi altnivelan retpaĝan interfacon",
   "navigation_bar.blocks": "Blokitaj uzantoj",
   "navigation_bar.bookmarks": "Legosignoj",
-  "navigation_bar.community_timeline": "Loka templinio",
-  "navigation_bar.compose": "Redakti novan afiŝon",
   "navigation_bar.direct": "Privataj mencioj",
-  "navigation_bar.discover": "Malkovri",
   "navigation_bar.domain_blocks": "Blokitaj domajnoj",
-  "navigation_bar.explore": "Esplori",
   "navigation_bar.favourites": "Stelumoj",
   "navigation_bar.filters": "Silentigitaj vortoj",
   "navigation_bar.follow_requests": "Petoj de sekvado",
@@ -554,12 +549,8 @@
   "navigation_bar.moderation": "Modereco",
   "navigation_bar.mutes": "Silentigitaj uzantoj",
   "navigation_bar.opened_in_classic_interface": "Afiŝoj, kontoj, kaj aliaj specifaj paĝoj kiuj estas malfermititaj defaulta en la klasika reta interfaco.",
-  "navigation_bar.personal": "Persone",
-  "navigation_bar.pins": "Alpinglitaj afiŝoj",
   "navigation_bar.preferences": "Preferoj",
-  "navigation_bar.public_timeline": "Fratara templinio",
   "navigation_bar.search": "Serĉi",
-  "navigation_bar.security": "Sekureco",
   "not_signed_in_indicator.not_signed_in": "Necesas saluti por aliri tiun rimedon.",
   "notification.admin.report": "{name} raportis {target}",
   "notification.admin.report_account": "{name} raportis {count, plural, one {afiŝon} other {# afiŝojn}} de {target} por {category}",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 61392fc123..f9571cf96d 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -184,7 +184,6 @@
   "column_header.show_settings": "Mostrar configuración",
   "column_header.unpin": "Dejar de fijar",
   "column_search.cancel": "Cancelar",
-  "column_subheading.settings": "Configuración",
   "community.column_settings.local_only": "Sólo local",
   "community.column_settings.media_only": "Sólo medios",
   "community.column_settings.remote_only": "Sólo remoto",
@@ -555,12 +554,8 @@
   "navigation_bar.automated_deletion": "Eliminación auto. de mensajes",
   "navigation_bar.blocks": "Usuarios bloqueados",
   "navigation_bar.bookmarks": "Marcadores",
-  "navigation_bar.community_timeline": "Línea temporal local",
-  "navigation_bar.compose": "Redactar un nuevo mensaje",
   "navigation_bar.direct": "Menciones privadas",
-  "navigation_bar.discover": "Descubrir",
   "navigation_bar.domain_blocks": "Dominios bloqueados",
-  "navigation_bar.explore": "Explorá",
   "navigation_bar.favourites": "Favoritos",
   "navigation_bar.filters": "Palabras silenciadas",
   "navigation_bar.follow_requests": "Solicitudes de seguimiento",
@@ -568,19 +563,17 @@
   "navigation_bar.follows_and_followers": "Cuentas seguidas y seguidores",
   "navigation_bar.import_export": "Importación y exportación",
   "navigation_bar.lists": "Listas",
+  "navigation_bar.live_feed_local": "Cronología local",
+  "navigation_bar.live_feed_public": "Cronología pública",
   "navigation_bar.logout": "Cerrar sesión",
   "navigation_bar.moderation": "Moderación",
   "navigation_bar.more": "Más",
   "navigation_bar.mutes": "Usuarios silenciados",
   "navigation_bar.opened_in_classic_interface": "Los mensajes, las cuentas y otras páginas específicas se abren predeterminadamente en la interface web clásica.",
-  "navigation_bar.personal": "Personal",
-  "navigation_bar.pins": "Mensajes fijados",
   "navigation_bar.preferences": "Configuración",
   "navigation_bar.privacy_and_reach": "Privacidad y alcance",
-  "navigation_bar.public_timeline": "Línea temporal federada",
   "navigation_bar.search": "Buscar",
   "navigation_bar.search_trends": "Búsqueda / Tendencia",
-  "navigation_bar.security": "Seguridad",
   "navigation_panel.collapse_followed_tags": "Contraer menú de etiquetas seguidas",
   "navigation_panel.collapse_lists": "Colapsar menú de lista",
   "navigation_panel.expand_followed_tags": "Expandir menú de etiquetas seguidas",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index 8d6708b799..89600d7c01 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -5,7 +5,7 @@
   "about.disclaimer": "Mastodon es software libre de código abierto, y una marca comercial de Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Motivo no disponible",
   "about.domain_blocks.preamble": "Mastodon generalmente te permite ver contenido e interactuar con usuarios de cualquier otro servidor del fediverso. Estas son las excepciones que se han hecho en este servidor en particular.",
-  "about.domain_blocks.silenced.explanation": "Normalmente no verás perfiles y contenido de este servidor, a menos que lo busques explicitamente o vayas a el siguiendo alguna cuenta.",
+  "about.domain_blocks.silenced.explanation": "Por lo general, no verás perfiles ni contenidos de este servidor, a menos que los busques explícitamente o que optes por seguirlo.",
   "about.domain_blocks.silenced.title": "Limitado",
   "about.domain_blocks.suspended.explanation": "Ningún dato de este servidor será procesado, almacenado o intercambiado, haciendo cualquier interacción o comunicación con los usuarios de este servidor imposible.",
   "about.domain_blocks.suspended.title": "Suspendido",
@@ -184,7 +184,6 @@
   "column_header.show_settings": "Mostrar ajustes",
   "column_header.unpin": "Desfijar",
   "column_search.cancel": "Cancelar",
-  "column_subheading.settings": "Ajustes",
   "community.column_settings.local_only": "Solo local",
   "community.column_settings.media_only": "Solo media",
   "community.column_settings.remote_only": "Solo remoto",
@@ -555,12 +554,8 @@
   "navigation_bar.automated_deletion": "Eliminación automática de publicaciones",
   "navigation_bar.blocks": "Usuarios bloqueados",
   "navigation_bar.bookmarks": "Marcadores",
-  "navigation_bar.community_timeline": "Historia local",
-  "navigation_bar.compose": "Redactar una nueva publicación",
   "navigation_bar.direct": "Menciones privadas",
-  "navigation_bar.discover": "Descubrir",
   "navigation_bar.domain_blocks": "Dominios ocultos",
-  "navigation_bar.explore": "Explorar",
   "navigation_bar.favourites": "Favoritos",
   "navigation_bar.filters": "Palabras silenciadas",
   "navigation_bar.follow_requests": "Solicitudes para seguirte",
@@ -568,19 +563,17 @@
   "navigation_bar.follows_and_followers": "Siguiendo y seguidores",
   "navigation_bar.import_export": "Importar y exportar",
   "navigation_bar.lists": "Listas",
+  "navigation_bar.live_feed_local": "Cronología local",
+  "navigation_bar.live_feed_public": "Cronología pública",
   "navigation_bar.logout": "Cerrar sesión",
   "navigation_bar.moderation": "Moderación",
   "navigation_bar.more": "Más",
   "navigation_bar.mutes": "Usuarios silenciados",
   "navigation_bar.opened_in_classic_interface": "Publicaciones, cuentas y otras páginas específicas se abren por defecto en la interfaz web clásica.",
-  "navigation_bar.personal": "Personal",
-  "navigation_bar.pins": "Publicaciones fijadas",
   "navigation_bar.preferences": "Preferencias",
   "navigation_bar.privacy_and_reach": "Privacidad y alcance",
-  "navigation_bar.public_timeline": "Historia federada",
   "navigation_bar.search": "Buscar",
   "navigation_bar.search_trends": "Búsqueda / Tendencia",
-  "navigation_bar.security": "Seguridad",
   "navigation_panel.collapse_followed_tags": "Minimizar menú de etiquetas seguidas",
   "navigation_panel.collapse_lists": "Contraer el menú de la lista",
   "navigation_panel.expand_followed_tags": "Expandir menú de etiquetas seguidas",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 404c8c7902..5510fc28a7 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -184,7 +184,6 @@
   "column_header.show_settings": "Mostrar ajustes",
   "column_header.unpin": "Dejar de fijar",
   "column_search.cancel": "Cancelar",
-  "column_subheading.settings": "Ajustes",
   "community.column_settings.local_only": "Solo local",
   "community.column_settings.media_only": "Solo multimedia",
   "community.column_settings.remote_only": "Solo remoto",
@@ -555,12 +554,8 @@
   "navigation_bar.automated_deletion": "Eliminación automática de publicaciones",
   "navigation_bar.blocks": "Usuarios bloqueados",
   "navigation_bar.bookmarks": "Marcadores",
-  "navigation_bar.community_timeline": "Cronología local",
-  "navigation_bar.compose": "Escribir nueva publicación",
   "navigation_bar.direct": "Menciones privadas",
-  "navigation_bar.discover": "Descubrir",
   "navigation_bar.domain_blocks": "Dominios ocultos",
-  "navigation_bar.explore": "Explorar",
   "navigation_bar.favourites": "Favoritos",
   "navigation_bar.filters": "Palabras silenciadas",
   "navigation_bar.follow_requests": "Solicitudes para seguirte",
@@ -568,19 +563,17 @@
   "navigation_bar.follows_and_followers": "Siguiendo y seguidores",
   "navigation_bar.import_export": "Importar y exportar",
   "navigation_bar.lists": "Listas",
+  "navigation_bar.live_feed_local": "Cronología local",
+  "navigation_bar.live_feed_public": "Cronología pública",
   "navigation_bar.logout": "Cerrar sesión",
   "navigation_bar.moderation": "Moderación",
   "navigation_bar.more": "Más",
   "navigation_bar.mutes": "Usuarios silenciados",
   "navigation_bar.opened_in_classic_interface": "Publicaciones, cuentas y otras páginas específicas se abren por defecto en la interfaz web clásica.",
-  "navigation_bar.personal": "Personal",
-  "navigation_bar.pins": "Publicaciones fijadas",
   "navigation_bar.preferences": "Preferencias",
   "navigation_bar.privacy_and_reach": "Privacidad y alcance",
-  "navigation_bar.public_timeline": "Cronología federada",
   "navigation_bar.search": "Buscar",
   "navigation_bar.search_trends": "Búsqueda / Tendencia",
-  "navigation_bar.security": "Seguridad",
   "navigation_panel.collapse_followed_tags": "Minimizar menú de etiquetas seguidas",
   "navigation_panel.collapse_lists": "Contraer el menú de la lista",
   "navigation_panel.expand_followed_tags": "Expandir menú de etiquetas seguidas",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index 3d094146ac..37477740c0 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -184,7 +184,6 @@
   "column_header.show_settings": "Näita sätteid",
   "column_header.unpin": "Eemalda kinnitus",
   "column_search.cancel": "Tühista",
-  "column_subheading.settings": "Sätted",
   "community.column_settings.local_only": "Ainult kohalik",
   "community.column_settings.media_only": "Ainult meedia",
   "community.column_settings.remote_only": "Ainult kaug",
@@ -555,12 +554,8 @@
   "navigation_bar.automated_deletion": "Postituste automaatne kustutamine",
   "navigation_bar.blocks": "Blokeeritud kasutajad",
   "navigation_bar.bookmarks": "Järjehoidjad",
-  "navigation_bar.community_timeline": "Kohalik ajajoon",
-  "navigation_bar.compose": "Koosta uus postitus",
   "navigation_bar.direct": "Privaatsed mainimised",
-  "navigation_bar.discover": "Avasta",
   "navigation_bar.domain_blocks": "Peidetud domeenid",
-  "navigation_bar.explore": "Avasta",
   "navigation_bar.favourites": "Lemmikud",
   "navigation_bar.filters": "Vaigistatud sõnad",
   "navigation_bar.follow_requests": "Jälgimistaotlused",
@@ -573,13 +568,9 @@
   "navigation_bar.more": "Lisavalikud",
   "navigation_bar.mutes": "Vaigistatud kasutajad",
   "navigation_bar.opened_in_classic_interface": "Postitused, kontod ja teised spetsiaalsed lehed avatakse vaikimisi klassikalises veebiliideses.",
-  "navigation_bar.personal": "Isiklik",
-  "navigation_bar.pins": "Kinnitatud postitused",
   "navigation_bar.preferences": "Eelistused",
   "navigation_bar.privacy_and_reach": "Privaatsus ja ulatus",
-  "navigation_bar.public_timeline": "Föderatiivne ajajoon",
   "navigation_bar.search": "Otsing",
-  "navigation_bar.security": "Turvalisus",
   "navigation_panel.collapse_lists": "Ahenda loendimenüü",
   "navigation_panel.expand_lists": "Laienda loendimenüüd",
   "not_signed_in_indicator.not_signed_in": "Pead sisse logima, et saada ligipääsu sellele ressursile.",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index 94d1af1600..0979559ef2 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -157,7 +157,6 @@
   "column_header.show_settings": "Erakutsi ezarpenak",
   "column_header.unpin": "Desfinkatu",
   "column_search.cancel": "Utzi",
-  "column_subheading.settings": "Ezarpenak",
   "community.column_settings.local_only": "Lokala soilik",
   "community.column_settings.media_only": "Edukiak soilik",
   "community.column_settings.remote_only": "Urrunekoa soilik",
@@ -480,12 +479,8 @@
   "navigation_bar.advanced_interface": "Ireki web interfaze aurreratuan",
   "navigation_bar.blocks": "Blokeatutako erabiltzaileak",
   "navigation_bar.bookmarks": "Laster-markak",
-  "navigation_bar.community_timeline": "Denbora-lerro lokala",
-  "navigation_bar.compose": "Idatzi bidalketa berria",
   "navigation_bar.direct": "Aipamen pribatuak",
-  "navigation_bar.discover": "Aurkitu",
   "navigation_bar.domain_blocks": "Ezkutatutako domeinuak",
-  "navigation_bar.explore": "Arakatu",
   "navigation_bar.favourites": "Gogokoak",
   "navigation_bar.filters": "Mutututako hitzak",
   "navigation_bar.follow_requests": "Jarraitzeko eskaerak",
@@ -496,12 +491,8 @@
   "navigation_bar.moderation": "Moderazioa",
   "navigation_bar.mutes": "Mutututako erabiltzaileak",
   "navigation_bar.opened_in_classic_interface": "Argitalpenak, kontuak eta beste orri jakin batzuk lehenespenez irekitzen dira web-interfaze klasikoan.",
-  "navigation_bar.personal": "Pertsonala",
-  "navigation_bar.pins": "Finkatutako bidalketak",
   "navigation_bar.preferences": "Hobespenak",
-  "navigation_bar.public_timeline": "Federatutako denbora-lerroa",
   "navigation_bar.search": "Bilatu",
-  "navigation_bar.security": "Segurtasuna",
   "not_signed_in_indicator.not_signed_in": "Baliabide honetara sarbidea izateko saioa hasi behar duzu.",
   "notification.admin.report": "{name} erabiltzaileak {target} salatu du",
   "notification.admin.report_account": "{name}-(e)k {target}-ren {count, plural, one {bidalketa bat} other {# bidalketa}} salatu zituen {category} delakoagatik",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index 2f1c074b57..008c13ce17 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -184,7 +184,6 @@
   "column_header.show_settings": "نمایش تنظیمات",
   "column_header.unpin": "برداشتن سنجاق",
   "column_search.cancel": "لغو",
-  "column_subheading.settings": "تنظیمات",
   "community.column_settings.local_only": "فقط محلی",
   "community.column_settings.media_only": "فقط رسانه",
   "community.column_settings.remote_only": "تنها دوردست",
@@ -555,12 +554,8 @@
   "navigation_bar.automated_deletion": "حذف خودکار فرسته",
   "navigation_bar.blocks": "کاربران مسدود شده",
   "navigation_bar.bookmarks": "نشانک‌ها",
-  "navigation_bar.community_timeline": "خط زمانی محلی",
-  "navigation_bar.compose": "نوشتن فرستهٔ تازه",
   "navigation_bar.direct": "اشاره‌های خصوصی",
-  "navigation_bar.discover": "گشت و گذار",
   "navigation_bar.domain_blocks": "دامنه‌های مسدود شده",
-  "navigation_bar.explore": "کاوش",
   "navigation_bar.favourites": "برگزیده‌ها",
   "navigation_bar.filters": "واژه‌های خموش",
   "navigation_bar.follow_requests": "درخواست‌های پی‌گیری",
@@ -573,13 +568,9 @@
   "navigation_bar.more": "بیشتر",
   "navigation_bar.mutes": "کاربران خموشانده",
   "navigation_bar.opened_in_classic_interface": "فرسته‌ها، حساب‌ها و دیگر صفحه‌های خاص به طور پیش‌گزیده در میانای وب کلاسیک گشوده می‌شوند.",
-  "navigation_bar.personal": "شخصی",
-  "navigation_bar.pins": "فرسته‌های سنجاق شده",
   "navigation_bar.preferences": "ترجیحات",
-  "navigation_bar.public_timeline": "خط زمانی همگانی",
   "navigation_bar.search": "جست‌وجو",
   "navigation_bar.search_trends": "جستجو \\ پرطرفدار",
-  "navigation_bar.security": "امنیت",
   "not_signed_in_indicator.not_signed_in": "برای دسترسی به این منبع باید وارد شوید.",
   "notification.admin.report": "{name}، {target} را گزارش داد",
   "notification.admin.report_account": "{name} {count, plural, one {یک پست} other {پست}} از {target} برای {category} را گزارش داد",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index e8e2c0a626..e5549021dd 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -184,7 +184,6 @@
   "column_header.show_settings": "Näytä asetukset",
   "column_header.unpin": "Irrota",
   "column_search.cancel": "Peruuta",
-  "column_subheading.settings": "Asetukset",
   "community.column_settings.local_only": "Vain paikalliset",
   "community.column_settings.media_only": "Vain media",
   "community.column_settings.remote_only": "Vain etätilit",
@@ -555,12 +554,8 @@
   "navigation_bar.automated_deletion": "Julkaisujen automaattipoisto",
   "navigation_bar.blocks": "Estetyt käyttäjät",
   "navigation_bar.bookmarks": "Kirjanmerkit",
-  "navigation_bar.community_timeline": "Paikallinen aikajana",
-  "navigation_bar.compose": "Luo uusi julkaisu",
   "navigation_bar.direct": "Yksityismaininnat",
-  "navigation_bar.discover": "Löydä uutta",
   "navigation_bar.domain_blocks": "Estetyt verkkotunnukset",
-  "navigation_bar.explore": "Selaa",
   "navigation_bar.favourites": "Suosikit",
   "navigation_bar.filters": "Mykistetyt sanat",
   "navigation_bar.follow_requests": "Seurantapyynnöt",
@@ -568,19 +563,17 @@
   "navigation_bar.follows_and_followers": "Seurattavat ja seuraajat",
   "navigation_bar.import_export": "Tuonti ja vienti",
   "navigation_bar.lists": "Listat",
+  "navigation_bar.live_feed_local": "Livesyöte (paikallinen)",
+  "navigation_bar.live_feed_public": "Livesyöte (julkinen)",
   "navigation_bar.logout": "Kirjaudu ulos",
   "navigation_bar.moderation": "Moderointi",
   "navigation_bar.more": "Lisää",
   "navigation_bar.mutes": "Mykistetyt käyttäjät",
   "navigation_bar.opened_in_classic_interface": "Julkaisut, profiilit ja tietyt muut sivut avautuvat oletuksena perinteiseen selainkäyttöliittymään.",
-  "navigation_bar.personal": "Henkilökohtaiset",
-  "navigation_bar.pins": "Kiinnitetyt julkaisut",
   "navigation_bar.preferences": "Asetukset",
   "navigation_bar.privacy_and_reach": "Yksityisyys ja tavoittavuus",
-  "navigation_bar.public_timeline": "Yleinen aikajana",
   "navigation_bar.search": "Haku",
   "navigation_bar.search_trends": "Haku / Suosittua",
-  "navigation_bar.security": "Turvallisuus",
   "navigation_panel.collapse_followed_tags": "Supista seurattavien aihetunnisteiden valikko",
   "navigation_panel.collapse_lists": "Supista listavalikko",
   "navigation_panel.expand_followed_tags": "Laajenna seurattavien aihetunnisteiden valikko",
diff --git a/app/javascript/mastodon/locales/fil.json b/app/javascript/mastodon/locales/fil.json
index bc66eb679c..5a4d99872b 100644
--- a/app/javascript/mastodon/locales/fil.json
+++ b/app/javascript/mastodon/locales/fil.json
@@ -108,7 +108,6 @@
   "column_header.pin": "I-paskil",
   "column_header.show_settings": "Ipakita ang mga setting",
   "column_header.unpin": "Tanggalin sa pagkapaskil",
-  "column_subheading.settings": "Mga setting",
   "community.column_settings.local_only": "Lokal lamang",
   "community.column_settings.media_only": "Medya Lamang",
   "community.column_settings.remote_only": "Liblib lamang",
@@ -244,13 +243,10 @@
   "navigation_bar.about": "Tungkol dito",
   "navigation_bar.blocks": "Nakaharang na mga tagagamit",
   "navigation_bar.direct": "Mga palihim na banggit",
-  "navigation_bar.discover": "Tuklasin",
-  "navigation_bar.explore": "Tuklasin",
   "navigation_bar.favourites": "Mga paborito",
   "navigation_bar.follow_requests": "Mga hiling sa pagsunod",
   "navigation_bar.follows_and_followers": "Mga sinusundan at tagasunod",
   "navigation_bar.lists": "Mga listahan",
-  "navigation_bar.public_timeline": "Pinagsamang timeline",
   "navigation_bar.search": "Maghanap",
   "notification.admin.report": "Iniulat ni {name} si {target}",
   "notification.admin.report_statuses_other": "Iniulat ni {name} si {target}",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index 4bbfb8c49d..aabbdee1d8 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -184,7 +184,6 @@
   "column_header.show_settings": "Vís stillingar",
   "column_header.unpin": "Loys",
   "column_search.cancel": "Angra",
-  "column_subheading.settings": "Stillingar",
   "community.column_settings.local_only": "Einans lokalt",
   "community.column_settings.media_only": "Einans miðlar",
   "community.column_settings.remote_only": "Einans útifrá",
@@ -555,12 +554,8 @@
   "navigation_bar.automated_deletion": "Sjálvvirkandi striking av postum",
   "navigation_bar.blocks": "Bannaðir brúkarar",
   "navigation_bar.bookmarks": "Goymd",
-  "navigation_bar.community_timeline": "Lokal tíðarlinja",
-  "navigation_bar.compose": "Skriva nýggjan post",
   "navigation_bar.direct": "Privatar umrøður",
-  "navigation_bar.discover": "Uppdaga",
   "navigation_bar.domain_blocks": "Bannað økisnøvn",
-  "navigation_bar.explore": "Rannsaka",
   "navigation_bar.favourites": "Dámdir postar",
   "navigation_bar.filters": "Doyvd orð",
   "navigation_bar.follow_requests": "Umbønir um at fylgja",
@@ -568,19 +563,17 @@
   "navigation_bar.follows_and_followers": "Fylgd og fylgjarar",
   "navigation_bar.import_export": "Innflyt og útflyt",
   "navigation_bar.lists": "Listar",
+  "navigation_bar.live_feed_local": "Beinleiðis rásir (lokalar)",
+  "navigation_bar.live_feed_public": "Beinleiðis rásir (almennar)",
   "navigation_bar.logout": "Rita út",
   "navigation_bar.moderation": "Umsjón",
   "navigation_bar.more": "Meira",
   "navigation_bar.mutes": "Doyvdir brúkarar",
   "navigation_bar.opened_in_classic_interface": "Postar, kontur og aðrar serstakar síður verða - um ikki annað er ásett - latnar upp í klassiska vev-markamótinum.",
-  "navigation_bar.personal": "Persónligt",
-  "navigation_bar.pins": "Festir postar",
   "navigation_bar.preferences": "Stillingar",
   "navigation_bar.privacy_and_reach": "Privatlív og skotmál",
-  "navigation_bar.public_timeline": "Felags tíðarlinja",
   "navigation_bar.search": "Leita",
   "navigation_bar.search_trends": "Leita / Rák",
-  "navigation_bar.security": "Trygd",
   "navigation_panel.collapse_followed_tags": "Minka valmynd við fylgdum frámerkjum",
   "navigation_panel.collapse_lists": "Minka listavalmynd",
   "navigation_panel.expand_followed_tags": "Víðka valmynd við fylgdum frámerkjum",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index 2b130e722b..050e53d9bb 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -171,7 +171,6 @@
   "column_header.show_settings": "Afficher les paramètres",
   "column_header.unpin": "Désépingler",
   "column_search.cancel": "Annuler",
-  "column_subheading.settings": "Paramètres",
   "community.column_settings.local_only": "Local seulement",
   "community.column_settings.media_only": "Média seulement",
   "community.column_settings.remote_only": "À distance seulement",
@@ -522,12 +521,8 @@
   "navigation_bar.advanced_interface": "Ouvrir dans l’interface avancée",
   "navigation_bar.blocks": "Comptes bloqués",
   "navigation_bar.bookmarks": "Signets",
-  "navigation_bar.community_timeline": "Fil local",
-  "navigation_bar.compose": "Rédiger un nouveau message",
   "navigation_bar.direct": "Mention privée",
-  "navigation_bar.discover": "Découvrir",
   "navigation_bar.domain_blocks": "Domaines bloqués",
-  "navigation_bar.explore": "Explorer",
   "navigation_bar.favourites": "Favoris",
   "navigation_bar.filters": "Mots masqués",
   "navigation_bar.follow_requests": "Demandes d'abonnements",
@@ -538,12 +533,8 @@
   "navigation_bar.moderation": "Modération",
   "navigation_bar.mutes": "Utilisateurs masqués",
   "navigation_bar.opened_in_classic_interface": "Les messages, les comptes et les pages spécifiques sont ouvertes dans l’interface classique.",
-  "navigation_bar.personal": "Personnel",
-  "navigation_bar.pins": "Publications épinglés",
   "navigation_bar.preferences": "Préférences",
-  "navigation_bar.public_timeline": "Fil global",
   "navigation_bar.search": "Rechercher",
-  "navigation_bar.security": "Sécurité",
   "not_signed_in_indicator.not_signed_in": "Vous devez vous connecter pour accéder à cette ressource.",
   "notification.admin.report": "{name} a signalé {target}",
   "notification.admin.report_account": "{name} a signalé {count, plural, one {un message} other {# messages}} de {target} pour {category}",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index de501ce1a3..5272f88470 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -171,7 +171,6 @@
   "column_header.show_settings": "Afficher les paramètres",
   "column_header.unpin": "Désépingler",
   "column_search.cancel": "Annuler",
-  "column_subheading.settings": "Paramètres",
   "community.column_settings.local_only": "Local seulement",
   "community.column_settings.media_only": "Média uniquement",
   "community.column_settings.remote_only": "Distant seulement",
@@ -522,12 +521,8 @@
   "navigation_bar.advanced_interface": "Ouvrir dans l’interface avancée",
   "navigation_bar.blocks": "Comptes bloqués",
   "navigation_bar.bookmarks": "Marque-pages",
-  "navigation_bar.community_timeline": "Fil public local",
-  "navigation_bar.compose": "Rédiger un nouveau message",
   "navigation_bar.direct": "Mention privée",
-  "navigation_bar.discover": "Découvrir",
   "navigation_bar.domain_blocks": "Domaines bloqués",
-  "navigation_bar.explore": "Explorer",
   "navigation_bar.favourites": "Favoris",
   "navigation_bar.filters": "Mots masqués",
   "navigation_bar.follow_requests": "Demandes d’abonnement",
@@ -538,12 +533,8 @@
   "navigation_bar.moderation": "Modération",
   "navigation_bar.mutes": "Comptes masqués",
   "navigation_bar.opened_in_classic_interface": "Les messages, les comptes et les pages spécifiques sont ouvertes dans l’interface classique.",
-  "navigation_bar.personal": "Personnel",
-  "navigation_bar.pins": "Messages épinglés",
   "navigation_bar.preferences": "Préférences",
-  "navigation_bar.public_timeline": "Fil fédéré",
   "navigation_bar.search": "Rechercher",
-  "navigation_bar.security": "Sécurité",
   "not_signed_in_indicator.not_signed_in": "Vous devez vous connecter pour accéder à cette ressource.",
   "notification.admin.report": "{name} a signalé {target}",
   "notification.admin.report_account": "{name} a signalé {count, plural, one {un message} other {# messages}} de {target} pour {category}",
diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json
index c5f35bce6d..ca33bd77bf 100644
--- a/app/javascript/mastodon/locales/fy.json
+++ b/app/javascript/mastodon/locales/fy.json
@@ -184,7 +184,6 @@
   "column_header.show_settings": "Ynstellingen toane",
   "column_header.unpin": "Losmeitsje",
   "column_search.cancel": "Annulearje",
-  "column_subheading.settings": "Ynstellingen",
   "community.column_settings.local_only": "Allinnich lokaal",
   "community.column_settings.media_only": "Allinnich media",
   "community.column_settings.remote_only": "Allinnich oare servers",
@@ -555,12 +554,8 @@
   "navigation_bar.automated_deletion": "Automatysk berjochten fuortsmite",
   "navigation_bar.blocks": "Blokkearre brûkers",
   "navigation_bar.bookmarks": "Blêdwizers",
-  "navigation_bar.community_timeline": "Lokale tiidline",
-  "navigation_bar.compose": "Nij berjocht skriuwe",
   "navigation_bar.direct": "Priveefermeldingen",
-  "navigation_bar.discover": "Untdekke",
   "navigation_bar.domain_blocks": "Blokkearre domeinen",
-  "navigation_bar.explore": "Ferkenne",
   "navigation_bar.favourites": "Favoriten",
   "navigation_bar.filters": "Negearre wurden",
   "navigation_bar.follow_requests": "Folchfersiken",
@@ -573,14 +568,10 @@
   "navigation_bar.more": "Mear",
   "navigation_bar.mutes": "Negearre brûkers",
   "navigation_bar.opened_in_classic_interface": "Berjochten, accounts en oare spesifike siden, wurde standert iepene yn de klassike webinterface.",
-  "navigation_bar.personal": "Persoanlik",
-  "navigation_bar.pins": "Fêstsette berjochten",
   "navigation_bar.preferences": "Ynstellingen",
   "navigation_bar.privacy_and_reach": "Privacy en berik",
-  "navigation_bar.public_timeline": "Globale tiidline",
   "navigation_bar.search": "Sykje",
   "navigation_bar.search_trends": "Sykje / Populêr",
-  "navigation_bar.security": "Befeiliging",
   "navigation_panel.collapse_followed_tags": "Menu foar folge hashtags ynklappe",
   "navigation_panel.collapse_lists": "Listmenu ynklappe",
   "navigation_panel.expand_followed_tags": "Menu foar folge hashtags útklappe",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index bd9e4dfe2a..32a35c62ad 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -184,7 +184,6 @@
   "column_header.show_settings": "Taispeáin socruithe",
   "column_header.unpin": "Bain pionna",
   "column_search.cancel": "Cealaigh",
-  "column_subheading.settings": "Socruithe",
   "community.column_settings.local_only": "Áitiúil amháin",
   "community.column_settings.media_only": "Meáin Amháin",
   "community.column_settings.remote_only": "Cian amháin",
@@ -555,12 +554,8 @@
   "navigation_bar.automated_deletion": "Scriosadh uathoibrithe postála",
   "navigation_bar.blocks": "Cuntais bhactha",
   "navigation_bar.bookmarks": "Leabharmharcanna",
-  "navigation_bar.community_timeline": "Amlíne áitiúil",
-  "navigation_bar.compose": "Cum postáil nua",
   "navigation_bar.direct": "Luann príobháideach",
-  "navigation_bar.discover": "Faigh amach",
   "navigation_bar.domain_blocks": "Fearainn bhactha",
-  "navigation_bar.explore": "Féach thart",
   "navigation_bar.favourites": "Ceanáin",
   "navigation_bar.filters": "Focail bhalbhaithe",
   "navigation_bar.follow_requests": "Iarratais leanúnaí",
@@ -573,14 +568,10 @@
   "navigation_bar.more": "Tuilleadh",
   "navigation_bar.mutes": "Úsáideoirí balbhaithe",
   "navigation_bar.opened_in_classic_interface": "Osclaítear poist, cuntais agus leathanaigh shonracha eile de réir réamhshocraithe sa chomhéadan gréasáin clasaiceach.",
-  "navigation_bar.personal": "Pearsanta",
-  "navigation_bar.pins": "Postálacha pionnáilte",
   "navigation_bar.preferences": "Sainroghanna pearsanta",
   "navigation_bar.privacy_and_reach": "Príobháideacht agus rochtain",
-  "navigation_bar.public_timeline": "Amlíne cónaidhmithe",
   "navigation_bar.search": "Cuardaigh",
   "navigation_bar.search_trends": "Cuardaigh / Treochtaí",
-  "navigation_bar.security": "Slándáil",
   "navigation_panel.collapse_followed_tags": "Laghdaigh roghchlár hashtaganna leantóirí",
   "navigation_panel.collapse_lists": "Laghdaigh roghchlár an liosta",
   "navigation_panel.expand_followed_tags": "Leathnaigh roghchlár na hashtaganna a leanann tú",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index 61f31d3185..98fe010677 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -184,7 +184,6 @@
   "column_header.show_settings": "Seall na roghainnean",
   "column_header.unpin": "Dì-phrìnich",
   "column_search.cancel": "Sguir dheth",
-  "column_subheading.settings": "Roghainnean",
   "community.column_settings.local_only": "Feadhainn ionadail a-mhàin",
   "community.column_settings.media_only": "Meadhanan a-mhàin",
   "community.column_settings.remote_only": "Feadhainn chèin a-mhàin",
@@ -555,12 +554,8 @@
   "navigation_bar.automated_deletion": "Sguabadh às phostaichean",
   "navigation_bar.blocks": "Cleachdaichean bacte",
   "navigation_bar.bookmarks": "Comharran-lìn",
-  "navigation_bar.community_timeline": "Loidhne-ama ionadail",
-  "navigation_bar.compose": "Sgrìobh post ùr",
   "navigation_bar.direct": "Iomraidhean prìobhaideach",
-  "navigation_bar.discover": "Rùraich",
   "navigation_bar.domain_blocks": "Àrainnean bacte",
-  "navigation_bar.explore": "Rùraich",
   "navigation_bar.favourites": "Annsachdan",
   "navigation_bar.filters": "Faclan mùchte",
   "navigation_bar.follow_requests": "Iarrtasan leantainn",
@@ -573,13 +568,9 @@
   "navigation_bar.more": "Barrachd",
   "navigation_bar.mutes": "Cleachdaichean mùchte",
   "navigation_bar.opened_in_classic_interface": "Thèid postaichean, cunntasan ’s duilleagan sònraichte eile fhosgladh san eadar-aghaidh-lìn chlasaigeach a ghnàth.",
-  "navigation_bar.personal": "Pearsanta",
-  "navigation_bar.pins": "Postaichean prìnichte",
   "navigation_bar.preferences": "Roghainnean",
   "navigation_bar.privacy_and_reach": "Prìobhaideachd ’s ruigse",
-  "navigation_bar.public_timeline": "Loidhne-ama cho-naisgte",
   "navigation_bar.search": "Lorg",
-  "navigation_bar.security": "Tèarainteachd",
   "navigation_panel.collapse_lists": "Co-theannaich clàr-taice na liosta",
   "navigation_panel.expand_lists": "Leudaich clàr-taice na liosta",
   "not_signed_in_indicator.not_signed_in": "Feumaidh tu clàradh a-steach mus fhaigh thu cothrom air a’ ghoireas seo.",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 96ee2d93eb..b6d08ceb7c 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -184,7 +184,6 @@
   "column_header.show_settings": "Amosar axustes",
   "column_header.unpin": "Desapegar",
   "column_search.cancel": "Cancelar",
-  "column_subheading.settings": "Axustes",
   "community.column_settings.local_only": "Só local",
   "community.column_settings.media_only": "Só multimedia",
   "community.column_settings.remote_only": "Só remoto",
@@ -555,12 +554,8 @@
   "navigation_bar.automated_deletion": "Borrado automático das publicacións",
   "navigation_bar.blocks": "Usuarias bloqueadas",
   "navigation_bar.bookmarks": "Marcadores",
-  "navigation_bar.community_timeline": "Cronoloxía local",
-  "navigation_bar.compose": "Escribir unha nova publicación",
   "navigation_bar.direct": "Mencións privadas",
-  "navigation_bar.discover": "Descubrir",
   "navigation_bar.domain_blocks": "Dominios agochados",
-  "navigation_bar.explore": "Descubrir",
   "navigation_bar.favourites": "Favoritas",
   "navigation_bar.filters": "Palabras silenciadas",
   "navigation_bar.follow_requests": "Peticións de seguimento",
@@ -573,14 +568,10 @@
   "navigation_bar.more": "Máis",
   "navigation_bar.mutes": "Usuarias silenciadas",
   "navigation_bar.opened_in_classic_interface": "Publicacións, contas e outras páxinas dedicadas ábrense por defecto na interface web clásica.",
-  "navigation_bar.personal": "Persoal",
-  "navigation_bar.pins": "Publicacións fixadas",
   "navigation_bar.preferences": "Preferencias",
   "navigation_bar.privacy_and_reach": "Privacidade e alcance",
-  "navigation_bar.public_timeline": "Cronoloxía federada",
   "navigation_bar.search": "Buscar",
   "navigation_bar.search_trends": "Buscar / Popular",
-  "navigation_bar.security": "Seguranza",
   "navigation_panel.collapse_followed_tags": "Pregar o menú de cancelos seguidos",
   "navigation_panel.collapse_lists": "Pregar menú da lista",
   "navigation_panel.expand_followed_tags": "Despregar menú de cancelos seguidos",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 7c73e31304..1bbd41e4db 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -184,7 +184,6 @@
   "column_header.show_settings": "הצגת העדפות",
   "column_header.unpin": "שחרור הצמדה",
   "column_search.cancel": "ביטול",
-  "column_subheading.settings": "הגדרות",
   "community.column_settings.local_only": "מקומי בלבד",
   "community.column_settings.media_only": "מדיה בלבד",
   "community.column_settings.remote_only": "מרוחק בלבד",
@@ -555,12 +554,8 @@
   "navigation_bar.automated_deletion": "מחיקת הודעות אוטומטית",
   "navigation_bar.blocks": "משתמשים חסומים",
   "navigation_bar.bookmarks": "סימניות",
-  "navigation_bar.community_timeline": "פיד שרת מקומי",
-  "navigation_bar.compose": "צור הודעה חדשה",
   "navigation_bar.direct": "הודעות פרטיות",
-  "navigation_bar.discover": "גלה",
   "navigation_bar.domain_blocks": "קהילות (שמות מתחם) חסומות",
-  "navigation_bar.explore": "סיור",
   "navigation_bar.favourites": "חיבובים",
   "navigation_bar.filters": "מילים מושתקות",
   "navigation_bar.follow_requests": "בקשות מעקב",
@@ -568,19 +563,17 @@
   "navigation_bar.follows_and_followers": "נעקבים ועוקבים",
   "navigation_bar.import_export": "יבוא ויצוא",
   "navigation_bar.lists": "רשימות",
+  "navigation_bar.live_feed_local": "פיד ההודעות בזמן אמת (מקומי)",
+  "navigation_bar.live_feed_public": "פיד ההודעות בזמן אמת (פומבי)",
   "navigation_bar.logout": "התנתקות",
   "navigation_bar.moderation": "הנחיית דיונים",
   "navigation_bar.more": "עוד",
   "navigation_bar.mutes": "משתמשים בהשתקה",
   "navigation_bar.opened_in_classic_interface": "הודעות, חשבונות ושאר עמודי רשת יפתחו כברירת מחדל בדפדפן רשת קלאסי.",
-  "navigation_bar.personal": "אישי",
-  "navigation_bar.pins": "הודעות נעוצות",
   "navigation_bar.preferences": "העדפות",
   "navigation_bar.privacy_and_reach": "פרטיות ומידת חשיפה",
-  "navigation_bar.public_timeline": "פיד כללי (כל השרתים)",
   "navigation_bar.search": "חיפוש",
   "navigation_bar.search_trends": "חיפוש \\ מגמות",
-  "navigation_bar.security": "אבטחה",
   "navigation_panel.collapse_followed_tags": "קיפול תפריט תגיות במעקב",
   "navigation_panel.collapse_lists": "קיפול תפריט רשימות",
   "navigation_panel.expand_followed_tags": "פתיחת תפריט תגיות במעקב",
diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json
index 7e317fbc3d..bd62063fba 100644
--- a/app/javascript/mastodon/locales/hi.json
+++ b/app/javascript/mastodon/locales/hi.json
@@ -129,7 +129,6 @@
   "column_header.pin": "पिन",
   "column_header.show_settings": "सेटिंग्स दिखाएँ",
   "column_header.unpin": "अनपिन",
-  "column_subheading.settings": "सेटिंग्स",
   "community.column_settings.local_only": "स्थानीय ही",
   "community.column_settings.media_only": "सिर्फ़ मीडिया",
   "community.column_settings.remote_only": "केवल सुदूर",
@@ -344,12 +343,8 @@
   "navigation_bar.about": "विवरण",
   "navigation_bar.blocks": "ब्लॉक्ड यूज़र्स",
   "navigation_bar.bookmarks": "पुस्तकचिह्न:",
-  "navigation_bar.community_timeline": "लोकल टाइम्लाइन",
-  "navigation_bar.compose": "नया टूट् लिखें",
   "navigation_bar.direct": "निजी संदेश",
-  "navigation_bar.discover": "खोजें",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.explore": "अन्वेषण करें",
   "navigation_bar.favourites": "पसंदीदा",
   "navigation_bar.filters": "वारित शब्द",
   "navigation_bar.follow_requests": "अनुसरण करने के अनुरोध",
@@ -357,11 +352,8 @@
   "navigation_bar.lists": "सूचियाँ",
   "navigation_bar.logout": "बाहर जाए",
   "navigation_bar.mutes": "शांत किए गए सभ्य",
-  "navigation_bar.personal": "निजी",
-  "navigation_bar.pins": "Pinned toots",
   "navigation_bar.preferences": "पसंदे",
   "navigation_bar.search": "ढूंढें",
-  "navigation_bar.security": "सुरक्षा",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.reblog": "{name} boosted your status",
   "notification.status": "{name} ने अभी पोस्ट किया",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index 6d451428fc..b2fbdb45ff 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -115,7 +115,6 @@
   "column_header.pin": "Prikvači",
   "column_header.show_settings": "Prikaži postavke",
   "column_header.unpin": "Otkvači",
-  "column_subheading.settings": "Postavke",
   "community.column_settings.local_only": "Samo lokalno",
   "community.column_settings.media_only": "Samo medijski sadržaj",
   "community.column_settings.remote_only": "Samo udaljeno",
@@ -293,12 +292,8 @@
   "navigation_bar.about": "O aplikaciji",
   "navigation_bar.advanced_interface": "Otvori u naprednom web sučelju",
   "navigation_bar.blocks": "Blokirani korisnici",
-  "navigation_bar.community_timeline": "Lokalna vremenska crta",
-  "navigation_bar.compose": "Compose new toot",
   "navigation_bar.direct": "Privatna spominjanja",
-  "navigation_bar.discover": "Istraživanje",
   "navigation_bar.domain_blocks": "Blokirane domene",
-  "navigation_bar.explore": "Istraži",
   "navigation_bar.favourites": "Favoriti",
   "navigation_bar.filters": "Utišane riječi",
   "navigation_bar.follow_requests": "Zahtjevi za praćenje",
@@ -306,12 +301,8 @@
   "navigation_bar.lists": "Liste",
   "navigation_bar.logout": "Odjavi se",
   "navigation_bar.mutes": "Utišani korisnici",
-  "navigation_bar.personal": "Osobno",
-  "navigation_bar.pins": "Prikvačeni tootovi",
   "navigation_bar.preferences": "Postavke",
-  "navigation_bar.public_timeline": "Federalna vremenska crta",
   "navigation_bar.search": "Traži",
-  "navigation_bar.security": "Sigurnost",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.follow": "{name} Vas je počeo/la pratiti",
   "notification.follow_request": "{name} zatražio/la je da Vas prati",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 3670c167c8..4f231089ed 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -184,7 +184,6 @@
   "column_header.show_settings": "Beállítások megjelenítése",
   "column_header.unpin": "Kitűzés eltávolítása",
   "column_search.cancel": "Mégse",
-  "column_subheading.settings": "Beállítások",
   "community.column_settings.local_only": "Csak helyi",
   "community.column_settings.media_only": "Csak média",
   "community.column_settings.remote_only": "Csak távoli",
@@ -555,12 +554,8 @@
   "navigation_bar.automated_deletion": "Bejegyzések automatikus törlése",
   "navigation_bar.blocks": "Letiltott felhasználók",
   "navigation_bar.bookmarks": "Könyvjelzők",
-  "navigation_bar.community_timeline": "Helyi idővonal",
-  "navigation_bar.compose": "Új bejegyzés írása",
   "navigation_bar.direct": "Személyes említések",
-  "navigation_bar.discover": "Felfedezés",
   "navigation_bar.domain_blocks": "Letiltott domainek",
-  "navigation_bar.explore": "Felfedezés",
   "navigation_bar.favourites": "Kedvencek",
   "navigation_bar.filters": "Némított szavak",
   "navigation_bar.follow_requests": "Követési kérések",
@@ -568,19 +563,17 @@
   "navigation_bar.follows_and_followers": "Követések és követők",
   "navigation_bar.import_export": "Importálás és exportálás",
   "navigation_bar.lists": "Listák",
+  "navigation_bar.live_feed_local": "Élő hírfolyam (helyi)",
+  "navigation_bar.live_feed_public": "Élő hírfolyam (nyilvános)",
   "navigation_bar.logout": "Kijelentkezés",
   "navigation_bar.moderation": "Moderáció",
   "navigation_bar.more": "Továbbiak",
   "navigation_bar.mutes": "Némított felhasználók",
   "navigation_bar.opened_in_classic_interface": "A bejegyzések, fiókok és más speciális oldalak alapértelmezés szerint a klasszikus webes felületen nyílnak meg.",
-  "navigation_bar.personal": "Személyes",
-  "navigation_bar.pins": "Kitűzött bejegyzések",
   "navigation_bar.preferences": "Beállítások",
   "navigation_bar.privacy_and_reach": "Adatvédelem és elérés",
-  "navigation_bar.public_timeline": "Föderációs idővonal",
   "navigation_bar.search": "Keresés",
   "navigation_bar.search_trends": "Keresés / felkapott",
-  "navigation_bar.security": "Biztonság",
   "navigation_panel.collapse_followed_tags": "Követett hashtagek menü összecsukása",
   "navigation_panel.collapse_lists": "Listamenü összecsukása",
   "navigation_panel.expand_followed_tags": "Követett hashtagek menü kibontása",
diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json
index cbabd544fc..c5cf4f4c4e 100644
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@@ -96,7 +96,6 @@
   "column_header.pin": "Ամրացնել",
   "column_header.show_settings": "Ցուցադրել կարգաւորումները",
   "column_header.unpin": "Հանել",
-  "column_subheading.settings": "Կարգաւորումներ",
   "community.column_settings.local_only": "Միայն տեղական",
   "community.column_settings.media_only": "Միայն մեդիա",
   "community.column_settings.remote_only": "Միայն հեռակայ",
@@ -273,12 +272,8 @@
   "navigation_bar.about": "Մասին",
   "navigation_bar.blocks": "Արգելափակուած օգտատէրեր",
   "navigation_bar.bookmarks": "Էջանիշեր",
-  "navigation_bar.community_timeline": "Տեղական հոսք",
-  "navigation_bar.compose": "Ստեղծել նոր գրառում",
   "navigation_bar.direct": "Մասնաւոր յիշատակումներ",
-  "navigation_bar.discover": "Բացայայտել",
   "navigation_bar.domain_blocks": "Թաքցուած տիրոյթներ",
-  "navigation_bar.explore": "Բացայայտել",
   "navigation_bar.favourites": "Հաւանածներ",
   "navigation_bar.filters": "Լռեցուած բառեր",
   "navigation_bar.follow_requests": "Հետեւելու հայցեր",
@@ -287,12 +282,8 @@
   "navigation_bar.lists": "Ցանկեր",
   "navigation_bar.logout": "Դուրս գալ",
   "navigation_bar.mutes": "Լռեցրած օգտատէրեր",
-  "navigation_bar.personal": "Անձնական",
-  "navigation_bar.pins": "Ամրացուած գրառումներ",
   "navigation_bar.preferences": "Նախապատուութիւններ",
-  "navigation_bar.public_timeline": "Դաշնային հոսք",
   "navigation_bar.search": "Որոնել",
-  "navigation_bar.security": "Անվտանգութիւն",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.admin.sign_up": "{name}-ը գրանցուած է",
   "notification.favourite": "{name}-ը հաւանել է քո գրառումը",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index ab5bd0a168..69a9a4b072 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -181,7 +181,6 @@
   "column_header.show_settings": "Monstrar le parametros",
   "column_header.unpin": "Disfixar",
   "column_search.cancel": "Cancellar",
-  "column_subheading.settings": "Parametros",
   "community.column_settings.local_only": "Solmente local",
   "community.column_settings.media_only": "Solmente multimedia",
   "community.column_settings.remote_only": "A distantia solmente",
@@ -539,12 +538,8 @@
   "navigation_bar.advanced_interface": "Aperir in le interfacie web avantiate",
   "navigation_bar.blocks": "Usatores blocate",
   "navigation_bar.bookmarks": "Marcapaginas",
-  "navigation_bar.community_timeline": "Chronologia local",
-  "navigation_bar.compose": "Componer un nove message",
   "navigation_bar.direct": "Mentiones private",
-  "navigation_bar.discover": "Discoperir",
   "navigation_bar.domain_blocks": "Dominios blocate",
-  "navigation_bar.explore": "Explorar",
   "navigation_bar.favourites": "Favorites",
   "navigation_bar.filters": "Parolas silentiate",
   "navigation_bar.follow_requests": "Requestas de sequimento",
@@ -555,12 +550,8 @@
   "navigation_bar.moderation": "Moderation",
   "navigation_bar.mutes": "Usatores silentiate",
   "navigation_bar.opened_in_classic_interface": "Messages, contos e altere paginas specific es aperite per predefinition in le interfacie web classic.",
-  "navigation_bar.personal": "Personal",
-  "navigation_bar.pins": "Messages fixate",
   "navigation_bar.preferences": "Preferentias",
-  "navigation_bar.public_timeline": "Chronologia federate",
   "navigation_bar.search": "Cercar",
-  "navigation_bar.security": "Securitate",
   "not_signed_in_indicator.not_signed_in": "Es necessari aperir session pro acceder a iste ressource.",
   "notification.admin.report": "{name} ha reportate {target}",
   "notification.admin.report_account": "{name} ha reportate {count, plural, one {un message} other {# messages}} de {target} per {category}",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index 607c01e784..dd41c5c125 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -139,7 +139,6 @@
   "column_header.pin": "Sematkan",
   "column_header.show_settings": "Tampilkan pengaturan",
   "column_header.unpin": "Lepaskan",
-  "column_subheading.settings": "Pengaturan",
   "community.column_settings.local_only": "Hanya lokal",
   "community.column_settings.media_only": "Hanya media",
   "community.column_settings.remote_only": "Hanya jarak jauh",
@@ -393,11 +392,7 @@
   "navigation_bar.about": "Tentang",
   "navigation_bar.blocks": "Pengguna diblokir",
   "navigation_bar.bookmarks": "Markah",
-  "navigation_bar.community_timeline": "Linimasa lokal",
-  "navigation_bar.compose": "Tulis toot baru",
-  "navigation_bar.discover": "Temukan",
   "navigation_bar.domain_blocks": "Domain tersembunyi",
-  "navigation_bar.explore": "Jelajahi",
   "navigation_bar.filters": "Kata yang dibisukan",
   "navigation_bar.follow_requests": "Permintaan mengikuti",
   "navigation_bar.followed_tags": "Tagar yang diikuti",
@@ -405,12 +400,8 @@
   "navigation_bar.lists": "Daftar",
   "navigation_bar.logout": "Keluar",
   "navigation_bar.mutes": "Pengguna dibisukan",
-  "navigation_bar.personal": "Personal",
-  "navigation_bar.pins": "Toot tersemat",
   "navigation_bar.preferences": "Pengaturan",
-  "navigation_bar.public_timeline": "Linimasa gabungan",
   "navigation_bar.search": "Cari",
-  "navigation_bar.security": "Keamanan",
   "not_signed_in_indicator.not_signed_in": "Anda harus masuk untuk mengakses sumber daya ini.",
   "notification.admin.report": "{name} melaporkan {target}",
   "notification.admin.sign_up": "{name} mendaftar",
diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json
index 9479090dc8..410792985d 100644
--- a/app/javascript/mastodon/locales/ie.json
+++ b/app/javascript/mastodon/locales/ie.json
@@ -129,7 +129,6 @@
   "column_header.pin": "Pinglar",
   "column_header.show_settings": "Monstrar parametres",
   "column_header.unpin": "Despinglar",
-  "column_subheading.settings": "Parametres",
   "community.column_settings.local_only": "Solmen local",
   "community.column_settings.media_only": "Solmen medie",
   "community.column_settings.remote_only": "Solmen external",
@@ -398,12 +397,8 @@
   "navigation_bar.advanced_interface": "Aperter in li web-interfacie avansat",
   "navigation_bar.blocks": "Bloccat usatores",
   "navigation_bar.bookmarks": "Marcatores",
-  "navigation_bar.community_timeline": "Local témpor-linea",
-  "navigation_bar.compose": "Composir un nov posta",
   "navigation_bar.direct": "Privat mentiones",
-  "navigation_bar.discover": "Decovrir",
   "navigation_bar.domain_blocks": "Bloccat dominias",
-  "navigation_bar.explore": "Explorar",
   "navigation_bar.favourites": "Favorites",
   "navigation_bar.filters": "Silentiat paroles",
   "navigation_bar.follow_requests": "Petitiones de sequer",
@@ -413,12 +408,8 @@
   "navigation_bar.logout": "Exear",
   "navigation_bar.mutes": "Silentiat usatores",
   "navigation_bar.opened_in_classic_interface": "Postas, contos e altri specific págines es customalmen apertet in li classic web-interfacie.",
-  "navigation_bar.personal": "Personal",
-  "navigation_bar.pins": "Pinglat postas",
   "navigation_bar.preferences": "Preferenties",
-  "navigation_bar.public_timeline": "Federat témpor-linea",
   "navigation_bar.search": "Sercha",
-  "navigation_bar.security": "Securitá",
   "not_signed_in_indicator.not_signed_in": "On deve aperter session por accesser ti-ci ressurse.",
   "notification.admin.report": "{name} raportat {target}",
   "notification.admin.sign_up": "{name} adheret",
diff --git a/app/javascript/mastodon/locales/ig.json b/app/javascript/mastodon/locales/ig.json
index e2d5e10177..4a93bf6c4b 100644
--- a/app/javascript/mastodon/locales/ig.json
+++ b/app/javascript/mastodon/locales/ig.json
@@ -28,7 +28,6 @@
   "column.pins": "Pinned post",
   "column_header.pin": "Gbado na profaịlụ gị",
   "column_header.show_settings": "Gosi mwube",
-  "column_subheading.settings": "Mwube",
   "community.column_settings.media_only": "Media only",
   "compose.language.change": "Gbanwee asụsụ",
   "compose.language.search": "Chọọ asụsụ...",
@@ -109,7 +108,6 @@
   "lists.edit": "Dezie ndepụta",
   "navigation_bar.about": "Maka",
   "navigation_bar.bookmarks": "Ebenrụtụakā",
-  "navigation_bar.discover": "Chọpụta",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.favourites": "Mmasị",
   "navigation_bar.lists": "Ndepụta",
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index 80a6738b56..c5e8fbc771 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -167,7 +167,6 @@
   "column_header.show_settings": "Montrez ajusti",
   "column_header.unpin": "Depinglagez",
   "column_search.cancel": "Nuligar",
-  "column_subheading.settings": "Ajusti",
   "community.column_settings.local_only": "Lokala nur",
   "community.column_settings.media_only": "Nur audvidaji",
   "community.column_settings.remote_only": "Fora nur",
@@ -518,12 +517,8 @@
   "navigation_bar.advanced_interface": "Apertez per retintervizajo",
   "navigation_bar.blocks": "Blokusita uzeri",
   "navigation_bar.bookmarks": "Lektosigni",
-  "navigation_bar.community_timeline": "Lokala tempolineo",
-  "navigation_bar.compose": "Compose new toot",
   "navigation_bar.direct": "Privata mencioni",
-  "navigation_bar.discover": "Deskovrez",
   "navigation_bar.domain_blocks": "Blokusita domeni",
-  "navigation_bar.explore": "Explorez",
   "navigation_bar.favourites": "Favoriziti",
   "navigation_bar.filters": "Silencigita vorti",
   "navigation_bar.follow_requests": "Demandi di sequado",
@@ -534,12 +529,8 @@
   "navigation_bar.moderation": "Jero",
   "navigation_bar.mutes": "Celita uzeri",
   "navigation_bar.opened_in_classic_interface": "Posti, konti e altra pagini specifika apertesas en la retovidilo klasika.",
-  "navigation_bar.personal": "Personala",
-  "navigation_bar.pins": "Adpinglita afishi",
   "navigation_bar.preferences": "Preferi",
-  "navigation_bar.public_timeline": "Federata tempolineo",
   "navigation_bar.search": "Serchez",
-  "navigation_bar.security": "Sekureso",
   "not_signed_in_indicator.not_signed_in": "Vu mustas enirar por acesar ca moyeno.",
   "notification.admin.report": "{name} raportizis {target}",
   "notification.admin.report_account": "{name} raportis {count, plural,one {1 posto} other {# posti}} de {target} pro {category}",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index f63330b756..6e724ca384 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -184,7 +184,6 @@
   "column_header.show_settings": "Birta stillingar",
   "column_header.unpin": "Losa",
   "column_search.cancel": "Hætta við",
-  "column_subheading.settings": "Stillingar",
   "community.column_settings.local_only": "Einungis staðvært",
   "community.column_settings.media_only": "Einungis myndskrár",
   "community.column_settings.remote_only": "Einungis fjartengt",
@@ -555,12 +554,8 @@
   "navigation_bar.automated_deletion": "Sjálfvirk eyðing færslna",
   "navigation_bar.blocks": "Útilokaðir notendur",
   "navigation_bar.bookmarks": "Bókamerki",
-  "navigation_bar.community_timeline": "Staðvær tímalína",
-  "navigation_bar.compose": "Semja nýja færslu",
   "navigation_bar.direct": "Einkaspjall",
-  "navigation_bar.discover": "Uppgötva",
   "navigation_bar.domain_blocks": "Útilokuð lén",
-  "navigation_bar.explore": "Kanna",
   "navigation_bar.favourites": "Eftirlæti",
   "navigation_bar.filters": "Þögguð orð",
   "navigation_bar.follow_requests": "Beiðnir um að fylgjast með",
@@ -573,14 +568,10 @@
   "navigation_bar.more": "Meira",
   "navigation_bar.mutes": "Þaggaðir notendur",
   "navigation_bar.opened_in_classic_interface": "Færslur, notendaaðgangar og aðrar sérhæfðar síður eru sjálfgefið opnaðar í klassíska vefviðmótinu.",
-  "navigation_bar.personal": "Einka",
-  "navigation_bar.pins": "Festar færslur",
   "navigation_bar.preferences": "Kjörstillingar",
   "navigation_bar.privacy_and_reach": "Gagnaleynd og útbreiðsla",
-  "navigation_bar.public_timeline": "Sameiginleg tímalína",
   "navigation_bar.search": "Leita",
   "navigation_bar.search_trends": "Leita / Vinsælt",
-  "navigation_bar.security": "Öryggi",
   "navigation_panel.collapse_followed_tags": "Fella saman valmynd myllumerkja sem fylgst er með",
   "navigation_panel.collapse_lists": "Fella saman valmyndalista",
   "navigation_panel.expand_followed_tags": "Fletta út valmynd myllumerkja sem fylgst er með",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 8fe140eaf3..d1fdb0d6db 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -184,7 +184,6 @@
   "column_header.show_settings": "Mostra le impostazioni",
   "column_header.unpin": "Non fissare",
   "column_search.cancel": "Annulla",
-  "column_subheading.settings": "Impostazioni",
   "community.column_settings.local_only": "Solo Locale",
   "community.column_settings.media_only": "Solo Media",
   "community.column_settings.remote_only": "Solo Remoto",
@@ -555,12 +554,8 @@
   "navigation_bar.automated_deletion": "Cancellazione automatica dei post",
   "navigation_bar.blocks": "Utenti bloccati",
   "navigation_bar.bookmarks": "Segnalibri",
-  "navigation_bar.community_timeline": "Cronologia locale",
-  "navigation_bar.compose": "Componi nuovo toot",
   "navigation_bar.direct": "Menzioni private",
-  "navigation_bar.discover": "Scopri",
   "navigation_bar.domain_blocks": "Domini bloccati",
-  "navigation_bar.explore": "Esplora",
   "navigation_bar.favourites": "Preferiti",
   "navigation_bar.filters": "Parole silenziate",
   "navigation_bar.follow_requests": "Richieste di seguirti",
@@ -573,13 +568,9 @@
   "navigation_bar.more": "Altro",
   "navigation_bar.mutes": "Utenti silenziati",
   "navigation_bar.opened_in_classic_interface": "Post, account e altre pagine specifiche sono aperti per impostazione predefinita nella classica interfaccia web.",
-  "navigation_bar.personal": "Personale",
-  "navigation_bar.pins": "Post fissati",
   "navigation_bar.preferences": "Preferenze",
   "navigation_bar.privacy_and_reach": "Privacy e copertura",
-  "navigation_bar.public_timeline": "Cronologia federata",
   "navigation_bar.search": "Cerca",
-  "navigation_bar.security": "Sicurezza",
   "navigation_panel.collapse_lists": "Chiudi il menu elenco",
   "navigation_panel.expand_lists": "Espandi il menu elenco",
   "not_signed_in_indicator.not_signed_in": "Devi accedere per consultare questa risorsa.",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 22e24e84db..159523b1e3 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -184,7 +184,6 @@
   "column_header.show_settings": "設定を表示",
   "column_header.unpin": "ピン留めを外す",
   "column_search.cancel": "キャンセル",
-  "column_subheading.settings": "設定",
   "community.column_settings.local_only": "ローカルのみ表示",
   "community.column_settings.media_only": "メディアのみ表示",
   "community.column_settings.remote_only": "リモートのみ表示",
@@ -550,12 +549,8 @@
   "navigation_bar.advanced_interface": "上級者向けUIに戻る",
   "navigation_bar.blocks": "ブロックしたユーザー",
   "navigation_bar.bookmarks": "ブックマーク",
-  "navigation_bar.community_timeline": "ローカルタイムライン",
-  "navigation_bar.compose": "投稿の新規作成",
   "navigation_bar.direct": "非公開の返信",
-  "navigation_bar.discover": "見つける",
   "navigation_bar.domain_blocks": "ブロックしたドメイン",
-  "navigation_bar.explore": "探索する",
   "navigation_bar.favourites": "お気に入り",
   "navigation_bar.filters": "フィルター設定",
   "navigation_bar.follow_requests": "フォローリクエスト",
@@ -566,12 +561,8 @@
   "navigation_bar.moderation": "モデレーション",
   "navigation_bar.mutes": "ミュートしたユーザー",
   "navigation_bar.opened_in_classic_interface": "投稿やプロフィールを直接開いた場合は一時的に標準UIで表示されます。",
-  "navigation_bar.personal": "個人用",
-  "navigation_bar.pins": "固定した投稿",
   "navigation_bar.preferences": "ユーザー設定",
-  "navigation_bar.public_timeline": "連合タイムライン",
   "navigation_bar.search": "検索",
-  "navigation_bar.security": "セキュリティ",
   "not_signed_in_indicator.not_signed_in": "この機能を使うにはログインする必要があります。",
   "notification.admin.report": "{name}さんが{target}さんを通報しました",
   "notification.admin.report_account": "{name}さんが{target}さんの投稿{count, plural, other {#件}}を「{category}」として通報しました",
diff --git a/app/javascript/mastodon/locales/ka.json b/app/javascript/mastodon/locales/ka.json
index 166b145cee..9831d8b1a9 100644
--- a/app/javascript/mastodon/locales/ka.json
+++ b/app/javascript/mastodon/locales/ka.json
@@ -54,7 +54,6 @@
   "column_header.pin": "მიმაგრება",
   "column_header.show_settings": "პარამეტრების ჩვენება",
   "column_header.unpin": "მოხსნა",
-  "column_subheading.settings": "პარამეტრები",
   "community.column_settings.media_only": "მხოლოდ მედია",
   "compose_form.direct_message_warning_learn_more": "გაიგე მეტი",
   "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
@@ -143,20 +142,13 @@
   "lists.delete": "სიის წაშლა",
   "lists.edit": "სიის შეცვლა",
   "navigation_bar.blocks": "დაბლოკილი მომხმარებლები",
-  "navigation_bar.community_timeline": "ლოკალური თაიმლაინი",
-  "navigation_bar.compose": "Compose new toot",
-  "navigation_bar.discover": "აღმოაჩინე",
   "navigation_bar.domain_blocks": "დამალული დომენები",
   "navigation_bar.filters": "გაჩუმებული სიტყვები",
   "navigation_bar.follow_requests": "დადევნების მოთხოვნები",
   "navigation_bar.lists": "სიები",
   "navigation_bar.logout": "გასვლა",
   "navigation_bar.mutes": "გაჩუმებული მომხმარებლები",
-  "navigation_bar.personal": "პირადი",
-  "navigation_bar.pins": "აპინული ტუტები",
   "navigation_bar.preferences": "პრეფერენსიები",
-  "navigation_bar.public_timeline": "ფედერალური თაიმლაინი",
-  "navigation_bar.security": "უსაფრთხოება",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.follow": "{name} გამოგყვათ",
   "notification.reblog": "{name}-მა დაბუსტა თქვენი სტატუსი",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index 48c18e3ca2..fd4cecc88b 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -130,7 +130,6 @@
   "column_header.show_settings": "Ssken iɣewwaṛen",
   "column_header.unpin": "Kkes asenteḍ",
   "column_search.cancel": "Semmet",
-  "column_subheading.settings": "Iɣewwaṛen",
   "community.column_settings.local_only": "Adigan kan",
   "community.column_settings.media_only": "Imidyaten kan",
   "community.column_settings.remote_only": "Anmeggag kan",
@@ -392,12 +391,8 @@
   "navigation_bar.advanced_interface": "Ldi deg ugrudem n web leqqayen",
   "navigation_bar.blocks": "Iseqdacen yettusḥebsen",
   "navigation_bar.bookmarks": "Ticraḍ",
-  "navigation_bar.community_timeline": "Tasuddemt tadigant",
-  "navigation_bar.compose": "Aru tajewwiqt tamaynut",
   "navigation_bar.direct": "Tibdarin tusligin",
-  "navigation_bar.discover": "Ẓer",
   "navigation_bar.domain_blocks": "Tiɣula yeffren",
-  "navigation_bar.explore": "Snirem",
   "navigation_bar.favourites": "Imenyafen",
   "navigation_bar.filters": "Awalen i yettwasgugmen",
   "navigation_bar.follow_requests": "Isuturen n teḍfeṛt",
@@ -408,12 +403,8 @@
   "navigation_bar.moderation": "Aseɣyed",
   "navigation_bar.mutes": "Iseqdacen yettwasusmen",
   "navigation_bar.opened_in_classic_interface": "Tisuffaɣ, imiḍanen akked isebtar-nniḍen igejdanen ldin-d s wudem amezwer deg ugrudem web aklasiki.",
-  "navigation_bar.personal": "Udmawan",
-  "navigation_bar.pins": "Tisuffaɣ yettwasenṭḍen",
   "navigation_bar.preferences": "Imenyafen",
-  "navigation_bar.public_timeline": "Tasuddemt tazayezt tamatut",
   "navigation_bar.search": "Nadi",
-  "navigation_bar.security": "Taɣellist",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.admin.report": "Yemla-t-id {name} {target}",
   "notification.admin.sign_up": "Ijerred {name}",
diff --git a/app/javascript/mastodon/locales/kk.json b/app/javascript/mastodon/locales/kk.json
index 1c1c1ec4eb..bdd5225134 100644
--- a/app/javascript/mastodon/locales/kk.json
+++ b/app/javascript/mastodon/locales/kk.json
@@ -115,7 +115,6 @@
   "column_header.pin": "Жабыстыру",
   "column_header.show_settings": "Баптауларды көрсет",
   "column_header.unpin": "Алып тастау",
-  "column_subheading.settings": "Баптаулар",
   "community.column_settings.local_only": "Тек жергілікті",
   "community.column_settings.media_only": "Тек медиа",
   "community.column_settings.remote_only": "Тек сыртқы",
@@ -245,9 +244,6 @@
   "load_pending": "{count, plural, one {# жаңа нәрсе} other {# жаңа нәрсе}}",
   "navigation_bar.blocks": "Бұғатталғандар",
   "navigation_bar.bookmarks": "Бетбелгілер",
-  "navigation_bar.community_timeline": "Жергілікті желі",
-  "navigation_bar.compose": "Жаңа жазба бастау",
-  "navigation_bar.discover": "шарлау",
   "navigation_bar.domain_blocks": "Жабық домендер",
   "navigation_bar.filters": "Үнсіз сөздер",
   "navigation_bar.follow_requests": "Жазылуға сұранғандар",
@@ -255,11 +251,7 @@
   "navigation_bar.lists": "Тізімдер",
   "navigation_bar.logout": "Шығу",
   "navigation_bar.mutes": "Үнсіз қолданушылар",
-  "navigation_bar.personal": "Жеке",
-  "navigation_bar.pins": "Жабыстырылғандар",
   "navigation_bar.preferences": "Басымдықтар",
-  "navigation_bar.public_timeline": "Жаһандық желі",
-  "navigation_bar.security": "Қауіпсіздік",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.follow": "{name} сізге жазылды",
   "notification.follow_request": "{name} сізге жазылғысы келеді",
diff --git a/app/javascript/mastodon/locales/kn.json b/app/javascript/mastodon/locales/kn.json
index c5b7582bac..ae4e4dd7b3 100644
--- a/app/javascript/mastodon/locales/kn.json
+++ b/app/javascript/mastodon/locales/kn.json
@@ -64,9 +64,7 @@
   "keyboard_shortcuts.toot": "to start a brand new toot",
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "to move up in the list",
-  "navigation_bar.compose": "Compose new toot",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.pins": "Pinned toots",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.reblog": "{name} boosted your status",
   "notifications.column_settings.status": "New toots:",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index a1bd7cdb0a..28898529f0 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -184,7 +184,6 @@
   "column_header.show_settings": "설정 보이기",
   "column_header.unpin": "고정 해제",
   "column_search.cancel": "취소",
-  "column_subheading.settings": "설정",
   "community.column_settings.local_only": "로컬만",
   "community.column_settings.media_only": "미디어만",
   "community.column_settings.remote_only": "원격지만",
@@ -555,12 +554,8 @@
   "navigation_bar.automated_deletion": "게시물 자동 삭제",
   "navigation_bar.blocks": "차단한 사용자",
   "navigation_bar.bookmarks": "북마크",
-  "navigation_bar.community_timeline": "로컬 타임라인",
-  "navigation_bar.compose": "새 게시물 작성",
   "navigation_bar.direct": "개인적인 멘션",
-  "navigation_bar.discover": "발견하기",
   "navigation_bar.domain_blocks": "차단한 도메인",
-  "navigation_bar.explore": "둘러보기",
   "navigation_bar.favourites": "좋아요",
   "navigation_bar.filters": "뮤트한 단어",
   "navigation_bar.follow_requests": "팔로우 요청",
@@ -573,14 +568,10 @@
   "navigation_bar.more": "더 보기",
   "navigation_bar.mutes": "뮤트한 사용자",
   "navigation_bar.opened_in_classic_interface": "게시물, 계정, 기타 특정 페이지들은 기본적으로 기존 웹 인터페이스로 열리게 됩니다.",
-  "navigation_bar.personal": "개인용",
-  "navigation_bar.pins": "고정된 게시물",
   "navigation_bar.preferences": "환경설정",
   "navigation_bar.privacy_and_reach": "개인정보와 도달",
-  "navigation_bar.public_timeline": "연합 타임라인",
   "navigation_bar.search": "검색",
   "navigation_bar.search_trends": "검색 / 유행",
-  "navigation_bar.security": "보안",
   "navigation_panel.collapse_followed_tags": "팔로우 중인 해시태그 메뉴 접기",
   "navigation_panel.collapse_lists": "리스트 메뉴 접기",
   "navigation_panel.expand_followed_tags": "팔로우 중인 해시태그 메뉴 펼치기",
diff --git a/app/javascript/mastodon/locales/ku.json b/app/javascript/mastodon/locales/ku.json
index 527d6acf56..7a911c7edb 100644
--- a/app/javascript/mastodon/locales/ku.json
+++ b/app/javascript/mastodon/locales/ku.json
@@ -135,7 +135,6 @@
   "column_header.show_settings": "Sazkariyan nîşan bide",
   "column_header.unpin": "Bi derzî neke",
   "column_search.cancel": "Têk bibe",
-  "column_subheading.settings": "Sazkarî",
   "community.column_settings.local_only": "Tenê herêmî",
   "community.column_settings.media_only": "Tenê media",
   "community.column_settings.remote_only": "Tenê ji dûr ve",
@@ -337,12 +336,8 @@
   "navigation_bar.about": "Derbar",
   "navigation_bar.blocks": "Bikarhênerên astengkirî",
   "navigation_bar.bookmarks": "Şûnpel",
-  "navigation_bar.community_timeline": "Demnameya herêmî",
-  "navigation_bar.compose": "Şandiyeke nû binivsîne",
   "navigation_bar.direct": "Payemên taybet",
-  "navigation_bar.discover": "Vekolê",
   "navigation_bar.domain_blocks": "Navperên astengkirî",
-  "navigation_bar.explore": "Vekole",
   "navigation_bar.filters": "Peyvên bêdengkirî",
   "navigation_bar.follow_requests": "Daxwazên şopandinê",
   "navigation_bar.followed_tags": "Etîketên şopandî",
@@ -350,12 +345,8 @@
   "navigation_bar.lists": "Lîste",
   "navigation_bar.logout": "Derkeve",
   "navigation_bar.mutes": "Bikarhênerên bêdengkirî",
-  "navigation_bar.personal": "Kesanî",
-  "navigation_bar.pins": "Şandiya derzîkirî",
   "navigation_bar.preferences": "Sazkarî",
-  "navigation_bar.public_timeline": "Demnameya giştî",
   "navigation_bar.search": "Bigere",
-  "navigation_bar.security": "Ewlehî",
   "not_signed_in_indicator.not_signed_in": "Divê tu têketinê bikî da ku tu bigihîjî vê çavkaniyê.",
   "notification.admin.report": "{name} hate ragihandin {target}",
   "notification.admin.sign_up": "{name} tomar bû",
diff --git a/app/javascript/mastodon/locales/kw.json b/app/javascript/mastodon/locales/kw.json
index 4b1f9c9dfe..598dd3511b 100644
--- a/app/javascript/mastodon/locales/kw.json
+++ b/app/javascript/mastodon/locales/kw.json
@@ -62,7 +62,6 @@
   "column_header.pin": "Fastya",
   "column_header.show_settings": "Diskwedhes dewisyow",
   "column_header.unpin": "Anfastya",
-  "column_subheading.settings": "Dewisyow",
   "community.column_settings.local_only": "Leel hepken",
   "community.column_settings.media_only": "Myski hepken",
   "community.column_settings.remote_only": "A-bell hepken",
@@ -199,9 +198,6 @@
   "load_pending": "{count, plural, one {# daklennowydh} other {# a daklennow nowydh}}",
   "navigation_bar.blocks": "Devnydhyoryon lettys",
   "navigation_bar.bookmarks": "Folennosow",
-  "navigation_bar.community_timeline": "Amserlin leel",
-  "navigation_bar.compose": "Komposya post nowydh",
-  "navigation_bar.discover": "Diskudha",
   "navigation_bar.domain_blocks": "Gorfarthow lettys",
   "navigation_bar.filters": "Geryow tawhes",
   "navigation_bar.follow_requests": "Govynnow holya",
@@ -209,11 +205,7 @@
   "navigation_bar.lists": "Rolyow",
   "navigation_bar.logout": "Digelmi",
   "navigation_bar.mutes": "Devnydhyoryon tawhes",
-  "navigation_bar.personal": "Menebel",
-  "navigation_bar.pins": "Postow fastys",
   "navigation_bar.preferences": "Erviransow",
-  "navigation_bar.public_timeline": "Amserlin geffrysys",
-  "navigation_bar.security": "Diogeledh",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.follow": "{name} a wrug agas holya",
   "notification.follow_request": "{name} a bysis agas holya",
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index d0c4d0b367..666e20c65a 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -162,7 +162,6 @@
   "column_header.show_settings": "Amostra opsyones",
   "column_header.unpin": "Defiksar",
   "column_search.cancel": "Anula",
-  "column_subheading.settings": "Opsyones",
   "community.column_settings.local_only": "Solo lokalas",
   "community.column_settings.media_only": "Solo multimedia",
   "community.column_settings.remote_only": "Solo remotas",
@@ -469,12 +468,8 @@
   "navigation_bar.advanced_interface": "Avre en la enterfaz avanzada",
   "navigation_bar.blocks": "Utilizadores blokados",
   "navigation_bar.bookmarks": "Markadores",
-  "navigation_bar.community_timeline": "Linya de tiempo lokala",
-  "navigation_bar.compose": "Eskrivir mueva publikasyon",
   "navigation_bar.direct": "Enmentaduras privadas",
-  "navigation_bar.discover": "Diskuvre",
   "navigation_bar.domain_blocks": "Domenos blokados",
-  "navigation_bar.explore": "Eksplora",
   "navigation_bar.favourites": "Te plazen",
   "navigation_bar.filters": "Biervos silensiados",
   "navigation_bar.follow_requests": "Solisitudes de segimiento",
@@ -487,13 +482,9 @@
   "navigation_bar.more": "Mas",
   "navigation_bar.mutes": "Utilizadores silensiados",
   "navigation_bar.opened_in_classic_interface": "Publikasyones, kuentos i otras pajinas espesifikas se avren kon preferensyas predeterminadas en la enterfaz web klasika.",
-  "navigation_bar.personal": "Personal",
-  "navigation_bar.pins": "Publikasyones fiksadas",
   "navigation_bar.preferences": "Preferensyas",
   "navigation_bar.privacy_and_reach": "Privasita i alkanse",
-  "navigation_bar.public_timeline": "Linya federada",
   "navigation_bar.search": "Bushka",
-  "navigation_bar.security": "Segurita",
   "not_signed_in_indicator.not_signed_in": "Nesesitas konektarse kon tu kuento para akseder este rekurso.",
   "notification.admin.report": "{name} raporto {target}",
   "notification.admin.report_statuses": "{name} raporto {target} por {category}",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 2613938893..75e36c3aaa 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -178,7 +178,6 @@
   "column_header.show_settings": "Rodyti nustatymus",
   "column_header.unpin": "Atsegti",
   "column_search.cancel": "Atšaukti",
-  "column_subheading.settings": "Nustatymai",
   "community.column_settings.local_only": "Tik vietinis",
   "community.column_settings.media_only": "Tik medija",
   "community.column_settings.remote_only": "Tik nuotolinis",
@@ -531,12 +530,8 @@
   "navigation_bar.advanced_interface": "Atidaryti išplėstinę žiniatinklio sąsają",
   "navigation_bar.blocks": "Užblokuoti naudotojai",
   "navigation_bar.bookmarks": "Žymės",
-  "navigation_bar.community_timeline": "Vietinė laiko skalė",
-  "navigation_bar.compose": "Sukurti naują įrašą",
   "navigation_bar.direct": "Privatūs paminėjimai",
-  "navigation_bar.discover": "Atrasti",
   "navigation_bar.domain_blocks": "Užblokuoti domenai",
-  "navigation_bar.explore": "Naršyti",
   "navigation_bar.favourites": "Mėgstami",
   "navigation_bar.filters": "Nutildyti žodžiai",
   "navigation_bar.follow_requests": "Sekimo prašymai",
@@ -547,12 +542,8 @@
   "navigation_bar.moderation": "Prižiūrėjimas",
   "navigation_bar.mutes": "Nutildyti naudotojai",
   "navigation_bar.opened_in_classic_interface": "Įrašai, paskyros ir kiti konkretūs puslapiai pagal numatytuosius nustatymus atidaromi klasikinėje žiniatinklio sąsajoje.",
-  "navigation_bar.personal": "Asmeninis",
-  "navigation_bar.pins": "Prisegti įrašai",
   "navigation_bar.preferences": "Nuostatos",
-  "navigation_bar.public_timeline": "Federacinė laiko skalė",
   "navigation_bar.search": "Ieškoti",
-  "navigation_bar.security": "Apsauga",
   "not_signed_in_indicator.not_signed_in": "Norint pasiekti šį išteklį, reikia prisijungti.",
   "notification.admin.report": "{name} pranešė {target}",
   "notification.admin.report_account": "{name} pranešė {count, plural, one {# įrašą} few {# įrašus} many {# įrašo} other {# įrašų}} iš {target} kategorijai {category}",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index dfad5ccacc..9a26f9e9fe 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -178,7 +178,6 @@
   "column_header.show_settings": "Rādīt iestatījumus",
   "column_header.unpin": "Atspraust",
   "column_search.cancel": "Atcelt",
-  "column_subheading.settings": "Iestatījumi",
   "community.column_settings.local_only": "Tikai vietējie",
   "community.column_settings.media_only": "Tikai multivide",
   "community.column_settings.remote_only": "Tikai attālinātie",
@@ -495,12 +494,8 @@
   "navigation_bar.advanced_interface": "Atvērt paplašinātā tīmekļa saskarnē",
   "navigation_bar.blocks": "Bloķētie lietotāji",
   "navigation_bar.bookmarks": "Grāmatzīmes",
-  "navigation_bar.community_timeline": "Vietējā laika līnija",
-  "navigation_bar.compose": "Izveidot jaunu ierakstu",
   "navigation_bar.direct": "Privātas pieminēšanas",
-  "navigation_bar.discover": "Atklāt",
   "navigation_bar.domain_blocks": "Bloķētie domēni",
-  "navigation_bar.explore": "Izpētīt",
   "navigation_bar.favourites": "Izlase",
   "navigation_bar.filters": "Apklusinātie vārdi",
   "navigation_bar.follow_requests": "Sekošanas pieprasījumi",
@@ -511,12 +506,8 @@
   "navigation_bar.moderation": "Satura pārraudzība",
   "navigation_bar.mutes": "Apklusinātie lietotāji",
   "navigation_bar.opened_in_classic_interface": "Ieraksti, konti un citas noteiktas lapas pēc noklusējuma tiek atvērtas klasiskajā tīmekļa saskarnē.",
-  "navigation_bar.personal": "Personīgie",
-  "navigation_bar.pins": "Piespraustie ieraksti",
   "navigation_bar.preferences": "Iestatījumi",
-  "navigation_bar.public_timeline": "Apvienotā laika līnija",
   "navigation_bar.search": "Meklēt",
-  "navigation_bar.security": "Drošība",
   "not_signed_in_indicator.not_signed_in": "Ir jāpiesakās, lai piekļūtu šim resursam.",
   "notification.admin.report": "{name} ziņoja par {target}",
   "notification.admin.report_account": "{name} ziņoja par {count, plural, one {# ierakstu} other {# ierakstiem}} no {target} ar iemeslu: {category}",
diff --git a/app/javascript/mastodon/locales/mk.json b/app/javascript/mastodon/locales/mk.json
index f3a557cbe9..82d1d09c5f 100644
--- a/app/javascript/mastodon/locales/mk.json
+++ b/app/javascript/mastodon/locales/mk.json
@@ -64,7 +64,6 @@
   "column_header.moveLeft_settings": "Премести колона влево",
   "column_header.moveRight_settings": "Премести колона вдесно",
   "column_header.show_settings": "Прикажи подесувања",
-  "column_subheading.settings": "Подесувања",
   "community.column_settings.media_only": "Само медиа",
   "compose_form.direct_message_warning_learn_more": "Научи повеќе",
   "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
@@ -159,7 +158,6 @@
   "keyboard_shortcuts.toot": "to start a brand new toot",
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "to move up in the list",
-  "navigation_bar.compose": "Compose new toot",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.filters": "Замолќени зборови",
   "navigation_bar.follow_requests": "Следи покани",
@@ -167,10 +165,6 @@
   "navigation_bar.lists": "Листи",
   "navigation_bar.logout": "Одјави се",
   "navigation_bar.mutes": "Заќутени корисници",
-  "navigation_bar.personal": "Лично",
-  "navigation_bar.pins": "Pinned toots",
-  "navigation_bar.public_timeline": "Федеративен времеплов",
-  "navigation_bar.security": "Безбедност",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.reblog": "{name} boosted your status",
   "notifications.column_settings.poll": "Резултати од анкета:",
diff --git a/app/javascript/mastodon/locales/ml.json b/app/javascript/mastodon/locales/ml.json
index 2e6ad8d845..cafb8626de 100644
--- a/app/javascript/mastodon/locales/ml.json
+++ b/app/javascript/mastodon/locales/ml.json
@@ -102,7 +102,6 @@
   "column_header.pin": "ഉറപ്പിച്ചു നിറുത്തുക",
   "column_header.show_settings": "ക്രമീകരണങ്ങൾ കാണിക്കുക",
   "column_header.unpin": "ഇളക്കി മാറ്റുക",
-  "column_subheading.settings": "ക്രമീകരണങ്ങള്‍",
   "community.column_settings.local_only": "പ്രാദേശികം മാത്രം",
   "community.column_settings.media_only": "മാധ്യമങ്ങൾ മാത്രം",
   "community.column_settings.remote_only": "വിദൂര മാത്രം",
@@ -270,21 +269,14 @@
   "media_gallery.hide": "മറയ്ക്കുക",
   "navigation_bar.blocks": "തടയപ്പെട്ട ഉപയോക്താക്കൾ",
   "navigation_bar.bookmarks": "ബുക്ക്മാർക്കുകൾ",
-  "navigation_bar.community_timeline": "പ്രാദേശിക സമയരേഖ",
-  "navigation_bar.compose": "പുതിയ ടൂട്ട് എഴുതുക",
-  "navigation_bar.discover": "കണ്ടെത്തുക",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.explore": "ആരായുക",
   "navigation_bar.favourites": "പ്രിയപ്പെട്ടതു്",
   "navigation_bar.follow_requests": "പിന്തുടരാനുള്ള അഭ്യർത്ഥനകൾ",
   "navigation_bar.lists": "ലിസ്റ്റുകൾ",
   "navigation_bar.logout": "ലോഗൗട്ട്",
   "navigation_bar.mutes": "നിശബ്ദമാക്കപ്പെട്ട ഉപയോക്താക്കൾ",
-  "navigation_bar.personal": "സ്വകാര്യ",
-  "navigation_bar.pins": "Pinned toots",
   "navigation_bar.preferences": "ക്രമീകരണങ്ങൾ",
   "navigation_bar.search": "തിരയുക",
-  "navigation_bar.security": "സുരക്ഷ",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.follow": "{name} നിങ്ങളെ പിന്തുടർന്നു",
   "notification.follow_request": "{name} നിങ്ങളെ പിന്തുടരാൻ അഭ്യർത്ഥിച്ചു",
diff --git a/app/javascript/mastodon/locales/mr.json b/app/javascript/mastodon/locales/mr.json
index 5bf7c1a2ca..8186fec9db 100644
--- a/app/javascript/mastodon/locales/mr.json
+++ b/app/javascript/mastodon/locales/mr.json
@@ -89,7 +89,6 @@
   "column_header.pin": "टाचण",
   "column_header.show_settings": "सेटिंग्स दाखवा",
   "column_header.unpin": "अनपिन करा",
-  "column_subheading.settings": "सेटिंग्ज",
   "community.column_settings.media_only": "केवळ मीडिया",
   "compose_form.direct_message_warning_learn_more": "अधिक जाणून घ्या",
   "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
@@ -170,9 +169,7 @@
   "lists.replies_policy.list": "यादीतील सदस्य",
   "lists.replies_policy.none": "कोणीच नाही",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
-  "navigation_bar.compose": "Compose new toot",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.pins": "Pinned toots",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.reblog": "{name} boosted your status",
   "notifications.column_settings.push": "सूचना",
diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json
index 4ea1adb774..a16aaa4cb6 100644
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@@ -171,7 +171,6 @@
   "column_header.show_settings": "Tunjukkan tetapan",
   "column_header.unpin": "Nyahsemat",
   "column_search.cancel": "Batal",
-  "column_subheading.settings": "Tetapan",
   "community.column_settings.local_only": "Tempatan sahaja",
   "community.column_settings.media_only": "Media sahaja",
   "community.column_settings.remote_only": "Jauh sahaja",
@@ -441,12 +440,8 @@
   "navigation_bar.advanced_interface": "Buka dalam antara muka web lanjutan",
   "navigation_bar.blocks": "Pengguna tersekat",
   "navigation_bar.bookmarks": "Tanda buku",
-  "navigation_bar.community_timeline": "Garis masa tempatan",
-  "navigation_bar.compose": "Karang hantaran baharu",
   "navigation_bar.direct": "Sebutan peribadi",
-  "navigation_bar.discover": "Teroka",
   "navigation_bar.domain_blocks": "Domain tersekat",
-  "navigation_bar.explore": "Teroka",
   "navigation_bar.favourites": "Sukaan",
   "navigation_bar.filters": "Perkataan teredam",
   "navigation_bar.follow_requests": "Permintaan ikutan",
@@ -456,12 +451,8 @@
   "navigation_bar.logout": "Log keluar",
   "navigation_bar.mutes": "Pengguna teredam",
   "navigation_bar.opened_in_classic_interface": "Kiriman, akaun dan halaman tertentu yang lain dibuka secara lalai di antara muka web klasik.",
-  "navigation_bar.personal": "Peribadi",
-  "navigation_bar.pins": "Hantaran disemat",
   "navigation_bar.preferences": "Keutamaan",
-  "navigation_bar.public_timeline": "Garis masa bersekutu",
   "navigation_bar.search": "Cari",
-  "navigation_bar.security": "Keselamatan",
   "not_signed_in_indicator.not_signed_in": "Anda perlu daftar masuk untuk mencapai sumber ini.",
   "notification.admin.report": "{name} melaporkan {target}",
   "notification.admin.sign_up": "{name} mendaftar",
diff --git a/app/javascript/mastodon/locales/my.json b/app/javascript/mastodon/locales/my.json
index 975ac77b78..b2ac67a618 100644
--- a/app/javascript/mastodon/locales/my.json
+++ b/app/javascript/mastodon/locales/my.json
@@ -120,7 +120,6 @@
   "column_header.pin": "ထိပ်တွင်တွဲထားမည်",
   "column_header.show_settings": "ဆက်တင်များကို ပြပါ။",
   "column_header.unpin": "မတွဲတော့ပါ",
-  "column_subheading.settings": "ဆက်တင်များ",
   "community.column_settings.local_only": "ပြည်တွင်း၌သာ",
   "community.column_settings.media_only": "Media only",
   "community.column_settings.remote_only": "အဝေးမှသာ",
@@ -335,12 +334,8 @@
   "navigation_bar.advanced_interface": "အဆင့်မြင့်ဝဘ်ပုံစံ ဖွင့်ပါ",
   "navigation_bar.blocks": "ဘလော့ထားသောအကောင့်များ",
   "navigation_bar.bookmarks": "မှတ်ထားသည်များ",
-  "navigation_bar.community_timeline": "ဒေသစံတော်ချိန်",
-  "navigation_bar.compose": "ပို့စ်အသစ်ရေးပါ",
   "navigation_bar.direct": "သီးသန့်ဖော်ပြချက်များ",
-  "navigation_bar.discover": "ရှာဖွေပါ",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.explore": "စူးစမ်းရန်",
   "navigation_bar.favourites": "Favorites",
   "navigation_bar.filters": "စကားလုံးများ ပိတ်ထားပါ",
   "navigation_bar.follow_requests": "စောင့်ကြည့်ရန် တောင်းဆိုမှုများ",
@@ -350,12 +345,8 @@
   "navigation_bar.logout": "ထွက်မယ်",
   "navigation_bar.mutes": "အသုံးပြုသူများကို ပိတ်ထားပါ",
   "navigation_bar.opened_in_classic_interface": "ပို့စ်များ၊ အကောင့်များနှင့် အခြားသီးခြားစာမျက်နှာများကို classic ဝဘ်အင်တာဖေ့စ်တွင် ဖွင့်ထားသည်။",
-  "navigation_bar.personal": "ကိုယ်ရေးကိုယ်တာ",
-  "navigation_bar.pins": "ပင်တွဲထားသောပို့စ်များ",
   "navigation_bar.preferences": "စိတ်ကြိုက်သတ်မှတ်ချက်များ",
-  "navigation_bar.public_timeline": "ဖက်ဒီစာမျက်နှာ",
   "navigation_bar.search": "ရှာရန်",
-  "navigation_bar.security": "လုံခြုံရေး",
   "not_signed_in_indicator.not_signed_in": "ဤရင်းမြစ်သို့ ဝင်ရောက်ရန်အတွက် သင်သည် အကောင့်ဝင်ရန် လိုအပ်ပါသည်။",
   "notification.admin.report": "{name} က {target} ကို တိုင်ကြားခဲ့သည်",
   "notification.admin.sign_up": "{name} က အကောင့်ဖွင့်ထားသည်",
diff --git a/app/javascript/mastodon/locales/nan.json b/app/javascript/mastodon/locales/nan.json
index e8adef47e3..6bd1b2aca4 100644
--- a/app/javascript/mastodon/locales/nan.json
+++ b/app/javascript/mastodon/locales/nan.json
@@ -184,7 +184,6 @@
   "column_header.show_settings": "顯示設定",
   "column_header.unpin": "Pak掉",
   "column_search.cancel": "取消",
-  "column_subheading.settings": "設定",
   "community.column_settings.local_only": "Kan-ta展示本地ê",
   "community.column_settings.media_only": "Kan-ta展示媒體",
   "community.column_settings.remote_only": "Kan-ta展示遠距離ê",
@@ -555,12 +554,8 @@
   "navigation_bar.automated_deletion": "自動thâi PO文",
   "navigation_bar.blocks": "封鎖ê用者",
   "navigation_bar.bookmarks": "冊籤",
-  "navigation_bar.community_timeline": "本地ê時間線",
-  "navigation_bar.compose": "寫新ê PO文",
   "navigation_bar.direct": "私人ê提起",
-  "navigation_bar.discover": "發現",
   "navigation_bar.domain_blocks": "封鎖ê域名",
-  "navigation_bar.explore": "探查",
   "navigation_bar.favourites": "Siōng kah意",
   "navigation_bar.filters": "消音ê詞",
   "navigation_bar.follow_requests": "跟tuè請求",
@@ -573,14 +568,10 @@
   "navigation_bar.more": "其他",
   "navigation_bar.mutes": "消音ê用者",
   "navigation_bar.opened_in_classic_interface": "PO文、口座kap其他指定ê頁面，預設ē佇經典ê網頁界面內phah開。",
-  "navigation_bar.personal": "個人",
-  "navigation_bar.pins": "釘起來ê PO文",
   "navigation_bar.preferences": "偏愛ê設定",
   "navigation_bar.privacy_and_reach": "隱私kap資訊ê及至",
-  "navigation_bar.public_timeline": "聯邦ê時間線",
   "navigation_bar.search": "Tshiau-tshuē",
   "navigation_bar.search_trends": "Tshiau-tshuē / 趨勢",
-  "navigation_bar.security": "安全",
   "navigation_panel.collapse_followed_tags": "Kā跟tuè ê hashtag目錄嵌起來",
   "navigation_panel.collapse_lists": "Khàm掉列單目錄",
   "navigation_panel.expand_followed_tags": "Kā跟tuè ê hashtag目錄thián開",
diff --git a/app/javascript/mastodon/locales/ne.json b/app/javascript/mastodon/locales/ne.json
index 7dd610bc10..f3b5a67b1d 100644
--- a/app/javascript/mastodon/locales/ne.json
+++ b/app/javascript/mastodon/locales/ne.json
@@ -101,7 +101,6 @@
   "column_header.pin": "पिन गर्नुहोस्",
   "column_header.unpin": "अनपिन गर्नुहोस्",
   "column_search.cancel": "रद्द गर्नुहोस्",
-  "column_subheading.settings": "सेटिङहरू",
   "community.column_settings.media_only": "मिडिया मात्र",
   "compose.language.change": "भाषा परिवर्तन गर्नुहोस्",
   "compose.language.search": "भाषाहरू खोज्नुहोस्...",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index e78b1476b6..2593541c9d 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -184,7 +184,6 @@
   "column_header.show_settings": "Instellingen tonen",
   "column_header.unpin": "Losmaken",
   "column_search.cancel": "Annuleren",
-  "column_subheading.settings": "Instellingen",
   "community.column_settings.local_only": "Alleen lokaal",
   "community.column_settings.media_only": "Alleen media",
   "community.column_settings.remote_only": "Alleen andere servers",
@@ -555,12 +554,8 @@
   "navigation_bar.automated_deletion": "Automatisch berichten verwijderen",
   "navigation_bar.blocks": "Geblokkeerde gebruikers",
   "navigation_bar.bookmarks": "Bladwijzers",
-  "navigation_bar.community_timeline": "Lokale tijdlijn",
-  "navigation_bar.compose": "Nieuw bericht schrijven",
   "navigation_bar.direct": "Privéberichten",
-  "navigation_bar.discover": "Ontdekken",
   "navigation_bar.domain_blocks": "Geblokkeerde servers",
-  "navigation_bar.explore": "Verkennen",
   "navigation_bar.favourites": "Favorieten",
   "navigation_bar.filters": "Filters",
   "navigation_bar.follow_requests": "Volgverzoeken",
@@ -573,14 +568,10 @@
   "navigation_bar.more": "Meer",
   "navigation_bar.mutes": "Genegeerde gebruikers",
   "navigation_bar.opened_in_classic_interface": "Berichten, accounts en andere specifieke pagina’s, worden standaard geopend in de klassieke webinterface.",
-  "navigation_bar.personal": "Persoonlijk",
-  "navigation_bar.pins": "Vastgemaakte berichten",
   "navigation_bar.preferences": "Instellingen",
   "navigation_bar.privacy_and_reach": "Privacy en bereik",
-  "navigation_bar.public_timeline": "Globale tijdlijn",
   "navigation_bar.search": "Zoeken",
   "navigation_bar.search_trends": "Zoeken / Trends",
-  "navigation_bar.security": "Beveiliging",
   "navigation_panel.collapse_followed_tags": "Menu voor gevolgde hashtags inklappen",
   "navigation_panel.collapse_lists": "Lijstmenu inklappen",
   "navigation_panel.expand_followed_tags": "Menu voor gevolgde hashtags uitklappen",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index 91f61358b4..ef04b58154 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -184,7 +184,6 @@
   "column_header.show_settings": "Vis innstillingar",
   "column_header.unpin": "Løys",
   "column_search.cancel": "Avbryt",
-  "column_subheading.settings": "Innstillingar",
   "community.column_settings.local_only": "Berre lokalt",
   "community.column_settings.media_only": "Berre media",
   "community.column_settings.remote_only": "Berre eksternt",
@@ -555,12 +554,8 @@
   "navigation_bar.automated_deletion": "Automatisert sletting av innlegg",
   "navigation_bar.blocks": "Blokkerte brukarar",
   "navigation_bar.bookmarks": "Bokmerke",
-  "navigation_bar.community_timeline": "Lokal tidsline",
-  "navigation_bar.compose": "Lag nytt tut",
   "navigation_bar.direct": "Private omtaler",
-  "navigation_bar.discover": "Oppdag",
   "navigation_bar.domain_blocks": "Skjulte domene",
-  "navigation_bar.explore": "Utforsk",
   "navigation_bar.favourites": "Favorittar",
   "navigation_bar.filters": "Målbundne ord",
   "navigation_bar.follow_requests": "Fylgjeførespurnader",
@@ -573,13 +568,9 @@
   "navigation_bar.more": "Mer",
   "navigation_bar.mutes": "Målbundne brukarar",
   "navigation_bar.opened_in_classic_interface": "Innlegg, kontoar, og enkelte andre sider blir opna som standard i det klassiske webgrensesnittet.",
-  "navigation_bar.personal": "Personleg",
-  "navigation_bar.pins": "Festa tut",
   "navigation_bar.preferences": "Innstillingar",
   "navigation_bar.privacy_and_reach": "Personvern og rekkevidde",
-  "navigation_bar.public_timeline": "Føderert tidsline",
   "navigation_bar.search": "Søk",
-  "navigation_bar.security": "Tryggleik",
   "navigation_panel.collapse_lists": "Skjul listemeny",
   "navigation_panel.expand_lists": "Utvid listemeny",
   "not_signed_in_indicator.not_signed_in": "Du må logga inn for å få tilgang til denne ressursen.",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index 6cb9238490..1f1f16bfac 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -184,7 +184,6 @@
   "column_header.show_settings": "Vis innstillinger",
   "column_header.unpin": "Løsne",
   "column_search.cancel": "Avbryt",
-  "column_subheading.settings": "Innstillinger",
   "community.column_settings.local_only": "Kun lokalt",
   "community.column_settings.media_only": "Media only",
   "community.column_settings.remote_only": "Kun eksternt",
@@ -555,12 +554,8 @@
   "navigation_bar.automated_deletion": "Automatisert sletting av innlegg",
   "navigation_bar.blocks": "Blokkerte brukere",
   "navigation_bar.bookmarks": "Bokmerker",
-  "navigation_bar.community_timeline": "Lokal tidslinje",
-  "navigation_bar.compose": "Skriv et nytt innlegg",
   "navigation_bar.direct": "Private omtaler",
-  "navigation_bar.discover": "Oppdag",
   "navigation_bar.domain_blocks": "Skjulte domener",
-  "navigation_bar.explore": "Utforsk",
   "navigation_bar.favourites": "Favoritter",
   "navigation_bar.filters": "Stilnede ord",
   "navigation_bar.follow_requests": "Følgeforespørsler",
@@ -573,13 +568,9 @@
   "navigation_bar.more": "Mer",
   "navigation_bar.mutes": "Dempede brukere",
   "navigation_bar.opened_in_classic_interface": "Innlegg, kontoer og andre spesifikke sider åpnes som standard i det klassiske webgrensesnittet.",
-  "navigation_bar.personal": "Personlig",
-  "navigation_bar.pins": "Festede innlegg",
   "navigation_bar.preferences": "Innstillinger",
   "navigation_bar.privacy_and_reach": "Personvern og rekkevidde",
-  "navigation_bar.public_timeline": "Felles tidslinje",
   "navigation_bar.search": "Søk",
-  "navigation_bar.security": "Sikkerhet",
   "navigation_panel.collapse_lists": "Skjul listemeny",
   "navigation_panel.expand_lists": "Utvid listemeny",
   "not_signed_in_indicator.not_signed_in": "Du må logge inn for å få tilgang til denne ressursen.",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index a6605b3156..bd09c958e1 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -117,7 +117,6 @@
   "column_header.pin": "Penjar",
   "column_header.show_settings": "Mostrar los paramètres",
   "column_header.unpin": "Despenjar",
-  "column_subheading.settings": "Paramètres",
   "community.column_settings.local_only": "Sonque local",
   "community.column_settings.media_only": "Solament los mèdias",
   "community.column_settings.remote_only": "Sonque alonhat",
@@ -318,12 +317,8 @@
   "navigation_bar.advanced_interface": "Dobrir l’interfàcia web avançada",
   "navigation_bar.blocks": "Personas blocadas",
   "navigation_bar.bookmarks": "Marcadors",
-  "navigation_bar.community_timeline": "Flux public local",
-  "navigation_bar.compose": "Escriure un nòu tut",
   "navigation_bar.direct": "Mencions privadas",
-  "navigation_bar.discover": "Trobar",
   "navigation_bar.domain_blocks": "Domenis resconduts",
-  "navigation_bar.explore": "Explorar",
   "navigation_bar.favourites": "Favorits",
   "navigation_bar.filters": "Mots ignorats",
   "navigation_bar.follow_requests": "Demandas d’abonament",
@@ -332,12 +327,8 @@
   "navigation_bar.lists": "Listas",
   "navigation_bar.logout": "Desconnexion",
   "navigation_bar.mutes": "Personas rescondudas",
-  "navigation_bar.personal": "Personal",
-  "navigation_bar.pins": "Tuts penjats",
   "navigation_bar.preferences": "Preferéncias",
-  "navigation_bar.public_timeline": "Flux public global",
   "navigation_bar.search": "Recercar",
-  "navigation_bar.security": "Seguretat",
   "not_signed_in_indicator.not_signed_in": "Devètz vos connectar per accedir a aquesta ressorsa.",
   "notification.admin.report": "{name} senhalèt {target}",
   "notification.admin.sign_up": "{name} se marquèt",
diff --git a/app/javascript/mastodon/locales/pa.json b/app/javascript/mastodon/locales/pa.json
index 07b425ee17..73a0746f8c 100644
--- a/app/javascript/mastodon/locales/pa.json
+++ b/app/javascript/mastodon/locales/pa.json
@@ -108,7 +108,6 @@
   "column_header.show_settings": "ਸੈਟਿੰਗਾਂ ਦਿਖਾਓ",
   "column_header.unpin": "ਲਾਹੋ",
   "column_search.cancel": "ਰੱਦ ਕਰੋ",
-  "column_subheading.settings": "ਸੈਟਿੰਗਾਂ",
   "community.column_settings.local_only": "ਸਿਰਫ ਲੋਕਲ ਹੀ",
   "community.column_settings.media_only": "ਸਿਰਫ ਮੀਡੀਆ ਹੀ",
   "community.column_settings.remote_only": "ਸਿਰਫ਼ ਰਿਮੋਟ ਹੀ",
@@ -340,12 +339,8 @@
   "navigation_bar.advanced_interface": "ਤਕਨੀਕੀ ਵੈੱਬ ਇੰਟਰਫੇਸ ਵਿੱਚ ਖੋਲ੍ਹੋ",
   "navigation_bar.blocks": "ਪਾਬੰਦੀ ਲਾਏ ਵਰਤੋਂਕਾਰ",
   "navigation_bar.bookmarks": "ਬੁੱਕਮਾਰਕ",
-  "navigation_bar.community_timeline": "ਲੋਕਲ ਸਮਾਂ-ਲਾਈਨ",
-  "navigation_bar.compose": "ਨਵੀਂ ਪੋਸਟ ਲਿਖੋ",
   "navigation_bar.direct": "ਨਿੱਜੀ ਜ਼ਿਕਰ",
-  "navigation_bar.discover": "ਖੋਜ",
   "navigation_bar.domain_blocks": "ਪਾਬੰਦੀ ਲਾਏ ਡੋਮੇਨ",
-  "navigation_bar.explore": "ਪੜਚੋਲ ਕਰੋ",
   "navigation_bar.favourites": "ਮਨਪਸੰਦ",
   "navigation_bar.filters": "ਮੌਨ ਕੀਤੇ ਸ਼ਬਦ",
   "navigation_bar.follow_requests": "ਫ਼ਾਲੋ ਦੀਆਂ ਬੇਨਤੀਆਂ",
@@ -354,11 +349,8 @@
   "navigation_bar.lists": "ਸੂਚੀਆਂ",
   "navigation_bar.logout": "ਲਾਗ ਆਉਟ",
   "navigation_bar.mutes": "ਮੌਨ ਕੀਤੇ ਵਰਤੋਂਕਾਰ",
-  "navigation_bar.personal": "ਨਿੱਜੀ",
-  "navigation_bar.pins": "ਟੰਗੀਆਂ ਪੋਸਟਾਂ",
   "navigation_bar.preferences": "ਪਸੰਦਾਂ",
   "navigation_bar.search": "ਖੋਜੋ",
-  "navigation_bar.security": "ਸੁਰੱਖਿਆ",
   "not_signed_in_indicator.not_signed_in": "ਇਹ ਸਰੋਤ ਵਰਤਣ ਲਈ ਤੁਹਾਨੂੰ ਲਾਗਇਨ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।",
   "notification.admin.sign_up": "{name} ਨੇ ਸਾਈਨ ਅੱਪ ਕੀਤਾ",
   "notification.follow": "{name} ਨੇ ਤੁਹਾਨੂੰ ਫ਼ਾਲੋ ਕੀਤਾ",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 7973c6c97c..e0eda6c10a 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -167,7 +167,6 @@
   "column_header.show_settings": "Pokaż ustawienia",
   "column_header.unpin": "Odepnij",
   "column_search.cancel": "Anuluj",
-  "column_subheading.settings": "Ustawienia",
   "community.column_settings.local_only": "Tylko lokalne",
   "community.column_settings.media_only": "Tylko multimedia",
   "community.column_settings.remote_only": "Tylko zdalne",
@@ -518,12 +517,8 @@
   "navigation_bar.advanced_interface": "Otwórz w widoku zaawansowanym",
   "navigation_bar.blocks": "Zablokowani",
   "navigation_bar.bookmarks": "Zakładki",
-  "navigation_bar.community_timeline": "Lokalna oś czasu",
-  "navigation_bar.compose": "Utwórz nowy wpis",
   "navigation_bar.direct": "Wzmianki bezpośrednie",
-  "navigation_bar.discover": "Odkrywaj",
   "navigation_bar.domain_blocks": "Zablokowane domeny",
-  "navigation_bar.explore": "Odkrywaj",
   "navigation_bar.favourites": "Polubione",
   "navigation_bar.filters": "Wyciszone słowa",
   "navigation_bar.follow_requests": "Prośby o obserwowanie",
@@ -534,12 +529,8 @@
   "navigation_bar.moderation": "Moderacja",
   "navigation_bar.mutes": "Wyciszeni",
   "navigation_bar.opened_in_classic_interface": "Wpisy, konta i inne określone strony są domyślnie otwierane w widoku klasycznym.",
-  "navigation_bar.personal": "Osobiste",
-  "navigation_bar.pins": "Przypięte wpisy",
   "navigation_bar.preferences": "Ustawienia",
-  "navigation_bar.public_timeline": "Globalna oś czasu",
   "navigation_bar.search": "Szukaj",
-  "navigation_bar.security": "Bezpieczeństwo",
   "not_signed_in_indicator.not_signed_in": "Zaloguj się, aby uzyskać dostęp.",
   "notification.admin.report": "{name} zgłosił {target}",
   "notification.admin.report_account": "{name} zgłosił(a) {count, plural, one {1 wpis} few {# wpisy} other {# wpisów}} z {target} w kategorii {category}",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index bf88c770f0..7c34dada8d 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -182,7 +182,6 @@
   "column_header.show_settings": "Mostrar configurações",
   "column_header.unpin": "Desafixar",
   "column_search.cancel": "Cancelar",
-  "column_subheading.settings": "Configurações",
   "community.column_settings.local_only": "Somente local",
   "community.column_settings.media_only": "Somente mídia",
   "community.column_settings.remote_only": "Somente global",
@@ -542,12 +541,8 @@
   "navigation_bar.advanced_interface": "Ativar na interface web avançada",
   "navigation_bar.blocks": "Usuários bloqueados",
   "navigation_bar.bookmarks": "Salvos",
-  "navigation_bar.community_timeline": "Linha do tempo local",
-  "navigation_bar.compose": "Compor novo toot",
   "navigation_bar.direct": "Menções privadas",
-  "navigation_bar.discover": "Descobrir",
   "navigation_bar.domain_blocks": "Domínios bloqueados",
-  "navigation_bar.explore": "Explorar",
   "navigation_bar.favourites": "Favoritos",
   "navigation_bar.filters": "Palavras filtradas",
   "navigation_bar.follow_requests": "Seguidores pendentes",
@@ -558,12 +553,8 @@
   "navigation_bar.moderation": "Moderação",
   "navigation_bar.mutes": "Usuários silenciados",
   "navigation_bar.opened_in_classic_interface": "Publicações, contas e outras páginas específicas são abertas por padrão na interface 'web' clássica.",
-  "navigation_bar.personal": "Pessoal",
-  "navigation_bar.pins": "Toots fixados",
   "navigation_bar.preferences": "Preferências",
-  "navigation_bar.public_timeline": "Linha global",
   "navigation_bar.search": "Buscar",
-  "navigation_bar.security": "Segurança",
   "not_signed_in_indicator.not_signed_in": "Você precisa se autenticar para acessar este recurso.",
   "notification.admin.report": "{name} denunciou {target}",
   "notification.admin.report_account": "{name} reportou {count, plural, one {Um post} other {# posts}} de {target} para {category}",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index bda5eacaf6..3a9ea4275d 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -184,7 +184,6 @@
   "column_header.show_settings": "Mostrar configurações",
   "column_header.unpin": "Desafixar",
   "column_search.cancel": "Cancelar",
-  "column_subheading.settings": "Configurações",
   "community.column_settings.local_only": "Apenas local",
   "community.column_settings.media_only": "Apenas multimédia",
   "community.column_settings.remote_only": "Apenas remoto",
@@ -555,12 +554,8 @@
   "navigation_bar.automated_deletion": "Eliminação automática de publicações",
   "navigation_bar.blocks": "Utilizadores bloqueados",
   "navigation_bar.bookmarks": "Marcadores",
-  "navigation_bar.community_timeline": "Cronologia local",
-  "navigation_bar.compose": "Escrever nova publicação",
   "navigation_bar.direct": "Menções privadas",
-  "navigation_bar.discover": "Descobrir",
   "navigation_bar.domain_blocks": "Domínios escondidos",
-  "navigation_bar.explore": "Explorar",
   "navigation_bar.favourites": "Favoritos",
   "navigation_bar.filters": "Palavras ocultadas",
   "navigation_bar.follow_requests": "Seguidores pendentes",
@@ -573,13 +568,9 @@
   "navigation_bar.more": "Mais",
   "navigation_bar.mutes": "Utilizadores ocultados",
   "navigation_bar.opened_in_classic_interface": "Por norma, publicações, contas e outras páginas específicas são abertas na interface web clássica.",
-  "navigation_bar.personal": "Pessoal",
-  "navigation_bar.pins": "Publicações fixadas",
   "navigation_bar.preferences": "Preferências",
   "navigation_bar.privacy_and_reach": "Privacidade e alcance",
-  "navigation_bar.public_timeline": "Cronologia federada",
   "navigation_bar.search": "Pesquisar",
-  "navigation_bar.security": "Segurança",
   "navigation_panel.collapse_lists": "Recolher lista de menu",
   "navigation_panel.expand_lists": "Expandir lista de menu",
   "not_signed_in_indicator.not_signed_in": "Tens de iniciar a sessão para utilizares esta funcionalidade.",
diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json
index f233fdca62..817cdb3ace 100644
--- a/app/javascript/mastodon/locales/ro.json
+++ b/app/javascript/mastodon/locales/ro.json
@@ -139,7 +139,6 @@
   "column_header.pin": "Fixează",
   "column_header.show_settings": "Afișare setări",
   "column_header.unpin": "Anulează fixarea",
-  "column_subheading.settings": "Setări",
   "community.column_settings.local_only": "Doar local",
   "community.column_settings.media_only": "Doar media",
   "community.column_settings.remote_only": "Doar la distanţă",
@@ -354,11 +353,7 @@
   "navigation_bar.advanced_interface": "Deschide în interfața web avansată",
   "navigation_bar.blocks": "Utilizatori blocați",
   "navigation_bar.bookmarks": "Marcaje",
-  "navigation_bar.community_timeline": "Cronologie locală",
-  "navigation_bar.compose": "Compune o nouă postare",
-  "navigation_bar.discover": "Descoperă",
   "navigation_bar.domain_blocks": "Domenii blocate",
-  "navigation_bar.explore": "Explorează",
   "navigation_bar.filters": "Cuvinte ignorate",
   "navigation_bar.follow_requests": "Cereri de abonare",
   "navigation_bar.followed_tags": "Hashtag-uri urmărite",
@@ -367,12 +362,8 @@
   "navigation_bar.logout": "Deconectare",
   "navigation_bar.mutes": "Utilizatori ignorați",
   "navigation_bar.opened_in_classic_interface": "Postările, conturile și alte pagini specifice sunt deschise implicit în interfața web clasică.",
-  "navigation_bar.personal": "Personal",
-  "navigation_bar.pins": "Postări fixate",
   "navigation_bar.preferences": "Preferințe",
-  "navigation_bar.public_timeline": "Cronologie globală",
   "navigation_bar.search": "Caută",
-  "navigation_bar.security": "Securitate",
   "not_signed_in_indicator.not_signed_in": "Trebuie să te conectezi pentru a accesa această resursă.",
   "notification.admin.report": "{name} a raportat pe {target}",
   "notification.admin.sign_up": "{name} s-a înscris",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index c693081878..807f9860b3 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -184,7 +184,6 @@
   "column_header.show_settings": "Показать настройки",
   "column_header.unpin": "Открепить",
   "column_search.cancel": "Отмена",
-  "column_subheading.settings": "Настройки",
   "community.column_settings.local_only": "Только локальные",
   "community.column_settings.media_only": "Только с медиафайлами",
   "community.column_settings.remote_only": "Только с других серверов",
@@ -555,12 +554,8 @@
   "navigation_bar.automated_deletion": "Автоудаление постов",
   "navigation_bar.blocks": "Заблокированные пользователи",
   "navigation_bar.bookmarks": "Закладки",
-  "navigation_bar.community_timeline": "Локальная лента",
-  "navigation_bar.compose": "Создать новый пост",
   "navigation_bar.direct": "Личные упоминания",
-  "navigation_bar.discover": "Обзор",
   "navigation_bar.domain_blocks": "Заблокированные домены",
-  "navigation_bar.explore": "Обзор",
   "navigation_bar.favourites": "Избранное",
   "navigation_bar.filters": "Игнорируемые слова",
   "navigation_bar.follow_requests": "Запросы на подписку",
@@ -573,14 +568,10 @@
   "navigation_bar.more": "Ещё",
   "navigation_bar.mutes": "Игнорируемые пользователи",
   "navigation_bar.opened_in_classic_interface": "Посты, профили пользователей и некоторые другие страницы по умолчанию открываются в классическом веб-интерфейсе.",
-  "navigation_bar.personal": "Личное",
-  "navigation_bar.pins": "Закреплённые посты",
   "navigation_bar.preferences": "Настройки",
   "navigation_bar.privacy_and_reach": "Приватность и видимость",
-  "navigation_bar.public_timeline": "Глобальная лента",
   "navigation_bar.search": "Поиск",
   "navigation_bar.search_trends": "Поиск / Актуальное",
-  "navigation_bar.security": "Безопасность",
   "navigation_panel.collapse_followed_tags": "Свернуть меню подписок на хештеги",
   "navigation_panel.collapse_lists": "Свернуть меню списков",
   "navigation_panel.expand_followed_tags": "Развернуть меню подписок на хештеги",
diff --git a/app/javascript/mastodon/locales/ry.json b/app/javascript/mastodon/locales/ry.json
index e2f3c2f76c..708334c1d2 100644
--- a/app/javascript/mastodon/locales/ry.json
+++ b/app/javascript/mastodon/locales/ry.json
@@ -119,7 +119,6 @@
   "column_header.pin": "Закріпити",
   "column_header.show_settings": "Указати штімованя",
   "column_header.unpin": "Удкріпити",
-  "column_subheading.settings": "Штімованя",
   "community.column_settings.local_only": "Лем локалноє",
   "community.column_settings.media_only": "Лем медіа",
   "compose.language.change": "Поміняти язык",
diff --git a/app/javascript/mastodon/locales/sa.json b/app/javascript/mastodon/locales/sa.json
index e9922ab165..92aab39b66 100644
--- a/app/javascript/mastodon/locales/sa.json
+++ b/app/javascript/mastodon/locales/sa.json
@@ -108,7 +108,6 @@
   "column_header.pin": "कीलयतु",
   "column_header.show_settings": "विन्यासाः दृश्यन्ताम्",
   "column_header.unpin": "कीलनं नाशय",
-  "column_subheading.settings": "विन्यासाः",
   "community.column_settings.local_only": "केवलं स्थानीयम्",
   "community.column_settings.media_only": "सामग्री केवलम्",
   "community.column_settings.remote_only": "दर्गमः केवलम्",
@@ -300,12 +299,8 @@
   "navigation_bar.about": "विषये",
   "navigation_bar.blocks": "निषिद्धभोक्तारः",
   "navigation_bar.bookmarks": "पुटचिह्नानि",
-  "navigation_bar.community_timeline": "स्थानीयसमयतालिका",
-  "navigation_bar.compose": "नूतनपत्रं रचय",
   "navigation_bar.direct": "गोपनीयरूपेण उल्लिखितानि",
-  "navigation_bar.discover": "आविष्कुरु",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.explore": "अन्विच्छ",
   "navigation_bar.filters": "मूकीकृतानि पदानि",
   "navigation_bar.follow_requests": "अनुसरणानुरोधाः",
   "navigation_bar.followed_tags": "अनुसरितानि प्रचलितवस्तूनि",
@@ -313,12 +308,8 @@
   "navigation_bar.lists": "सूचयः",
   "navigation_bar.logout": "निष्क्रमणं कुरु",
   "navigation_bar.mutes": "निःशब्दा भोक्तारः",
-  "navigation_bar.personal": "व्यक्तिगतम्",
-  "navigation_bar.pins": "कीलितपत्राणि",
   "navigation_bar.preferences": "अधिकरुचयः",
-  "navigation_bar.public_timeline": "सङ्घीयसमयतालिका",
   "navigation_bar.search": "अन्विच्छ",
-  "navigation_bar.security": "सुरक्षा",
   "not_signed_in_indicator.not_signed_in": "उपायमिमं लब्धुं सम्प्रवेश आवश्यकः।",
   "notification.admin.report": "{name} {target} प्रतिवेदयञ्चकार",
   "notification.admin.sign_up": "{name} संविवेश",
diff --git a/app/javascript/mastodon/locales/sc.json b/app/javascript/mastodon/locales/sc.json
index 8e9e32ab0d..b4de3985a8 100644
--- a/app/javascript/mastodon/locales/sc.json
+++ b/app/javascript/mastodon/locales/sc.json
@@ -135,7 +135,6 @@
   "column_header.pin": "Apica",
   "column_header.show_settings": "Ammustra is cunfiguratziones",
   "column_header.unpin": "Boga dae pitzu",
-  "column_subheading.settings": "Cunfiguratziones",
   "community.column_settings.local_only": "Isceti locale",
   "community.column_settings.media_only": "Isceti multimediale",
   "community.column_settings.remote_only": "Isceti remotu",
@@ -400,12 +399,8 @@
   "navigation_bar.advanced_interface": "Aberi s'interfache web avantzada",
   "navigation_bar.blocks": "Persones blocadas",
   "navigation_bar.bookmarks": "Sinnalibros",
-  "navigation_bar.community_timeline": "Lìnia de tempus locale",
-  "navigation_bar.compose": "Cumpone una publicatzione noa",
   "navigation_bar.direct": "Mentziones privadas",
-  "navigation_bar.discover": "Iscoberi",
   "navigation_bar.domain_blocks": "Domìnios blocados",
-  "navigation_bar.explore": "Esplora",
   "navigation_bar.favourites": "Preferidos",
   "navigation_bar.filters": "Faeddos a sa muda",
   "navigation_bar.follow_requests": "Rechestas de sighidura",
@@ -416,12 +411,8 @@
   "navigation_bar.moderation": "Moderatzione",
   "navigation_bar.mutes": "Persones a sa muda",
   "navigation_bar.opened_in_classic_interface": "Publicatziones, contos e àteras pàginas ispetzìficas sunt abertas in manera predefinida in s'interfache web clàssica.",
-  "navigation_bar.personal": "Informatziones personales",
-  "navigation_bar.pins": "Publicatziones apicadas",
   "navigation_bar.preferences": "Preferèntzias",
-  "navigation_bar.public_timeline": "Lìnia de tempus federada",
   "navigation_bar.search": "Chirca",
-  "navigation_bar.security": "Seguresa",
   "not_signed_in_indicator.not_signed_in": "Ti depes identificare pro atzèdere a custa resursa.",
   "notification.admin.report": "{name} at sinnaladu a {target}",
   "notification.admin.report_account": "{name} at sinnaladu {count, plural, one {una publicatzione} other {# publicatziones}} dae {target} pro {category}",
diff --git a/app/javascript/mastodon/locales/sco.json b/app/javascript/mastodon/locales/sco.json
index ab5ed96137..ff655d9fbc 100644
--- a/app/javascript/mastodon/locales/sco.json
+++ b/app/javascript/mastodon/locales/sco.json
@@ -109,7 +109,6 @@
   "column_header.pin": "Preen",
   "column_header.show_settings": "Shaw settins",
   "column_header.unpin": "Unpreen",
-  "column_subheading.settings": "Settins",
   "community.column_settings.local_only": "Local ainly",
   "community.column_settings.media_only": "Media ainly",
   "community.column_settings.remote_only": "Remote ainly",
@@ -294,23 +293,15 @@
   "navigation_bar.about": "Aboot",
   "navigation_bar.blocks": "Dingied uisers",
   "navigation_bar.bookmarks": "Buikmairks",
-  "navigation_bar.community_timeline": "Local timeline",
-  "navigation_bar.compose": "Scrieve new post",
-  "navigation_bar.discover": "Fin",
   "navigation_bar.domain_blocks": "Dingied domains",
-  "navigation_bar.explore": "Splore",
   "navigation_bar.filters": "Wheesht wirds",
   "navigation_bar.follow_requests": "Follae requests",
   "navigation_bar.follows_and_followers": "Follaes an follaers",
   "navigation_bar.lists": "Leets",
   "navigation_bar.logout": "Logoot",
   "navigation_bar.mutes": "Wheesht uisers",
-  "navigation_bar.personal": "Personal",
-  "navigation_bar.pins": "Preenit posts",
   "navigation_bar.preferences": "Preferences",
-  "navigation_bar.public_timeline": "Federatit timeline",
   "navigation_bar.search": "Seirch",
-  "navigation_bar.security": "Security",
   "not_signed_in_indicator.not_signed_in": "Ye'r needin tae sign in fir tae access this resoorce.",
   "notification.admin.report": "{name} reportit {target}",
   "notification.admin.sign_up": "{name} signed up",
diff --git a/app/javascript/mastodon/locales/si.json b/app/javascript/mastodon/locales/si.json
index 6a3526834c..34cbf0d844 100644
--- a/app/javascript/mastodon/locales/si.json
+++ b/app/javascript/mastodon/locales/si.json
@@ -181,7 +181,6 @@
   "column_header.show_settings": "සැකසුම් පෙන්වන්න",
   "column_header.unpin": "ගළවන්න",
   "column_search.cancel": "අවලංගු කරන්න",
-  "column_subheading.settings": "සැකසුම්",
   "community.column_settings.local_only": "ස්ථානීයව පමණයි",
   "community.column_settings.media_only": "මාධ්‍ය පමණයි",
   "community.column_settings.remote_only": "දුරස්ථව පමණයි",
@@ -541,12 +540,8 @@
   "navigation_bar.advanced_interface": "උසස් වෙබ් අතුරු මුහුණතකින් විවෘත කරන්න",
   "navigation_bar.blocks": "අවහිර කළ අය",
   "navigation_bar.bookmarks": "පොත්යොමු",
-  "navigation_bar.community_timeline": "ස්ථානීය කාලරේඛාව",
-  "navigation_bar.compose": "නව ලිපියක් ලියන්න",
   "navigation_bar.direct": "පෞද්ගලික සැඳහුම්",
-  "navigation_bar.discover": "සොයා ගන්න",
   "navigation_bar.domain_blocks": "අවහිර කළ වසම්",
-  "navigation_bar.explore": "ගවේශනය",
   "navigation_bar.favourites": "ප්‍රියතමයන්",
   "navigation_bar.filters": "නිහඬ කළ වචන",
   "navigation_bar.follow_requests": "අනුගමන ඉල්ලීම්",
@@ -557,12 +552,8 @@
   "navigation_bar.moderation": "මධ්‍යස්ථභාවය",
   "navigation_bar.mutes": "නිහඬ කළ අය",
   "navigation_bar.opened_in_classic_interface": "සම්භාව්‍ය වෙබ් අතුරුමුහුණත තුළ පළ කිරීම්, ගිණුම් සහ අනෙකුත් නිශ්චිත පිටු පෙරනිමියෙන් විවෘත වේ.",
-  "navigation_bar.personal": "පුද්ගලික",
-  "navigation_bar.pins": "ඇමිණූ ලිපි",
   "navigation_bar.preferences": "අභිප්‍රේත",
-  "navigation_bar.public_timeline": "ඒකාබද්ධ කාලරේඛාව",
   "navigation_bar.search": "සොයන්න",
-  "navigation_bar.security": "ආරක්ෂාව",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.admin.report": "{name} වාර්තා කර ඇත {target}",
   "notification.admin.report_statuses": "{category}සඳහා {name} {target} වාර්තා කරන ලදී",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index e94326f3dc..a852cea8b8 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -161,7 +161,6 @@
   "column_header.show_settings": "Zobraziť nastavenia",
   "column_header.unpin": "Odopnúť",
   "column_search.cancel": "Zruš",
-  "column_subheading.settings": "Nastavenia",
   "community.column_settings.local_only": "Iba miestne",
   "community.column_settings.media_only": "Iba médiá",
   "community.column_settings.remote_only": "Iba vzdialené",
@@ -493,12 +492,8 @@
   "navigation_bar.advanced_interface": "Otvoriť v pokročilom webovom rozhraní",
   "navigation_bar.blocks": "Blokované účty",
   "navigation_bar.bookmarks": "Záložky",
-  "navigation_bar.community_timeline": "Miestna časová os",
-  "navigation_bar.compose": "Vytvoriť nový príspevok",
   "navigation_bar.direct": "Súkromné označenia",
-  "navigation_bar.discover": "Objavovanie",
   "navigation_bar.domain_blocks": "Blokované domény",
-  "navigation_bar.explore": "Objavovať",
   "navigation_bar.favourites": "Ohviezdičkované",
   "navigation_bar.filters": "Filtrované slová",
   "navigation_bar.follow_requests": "Žiadosti o sledovanie",
@@ -509,12 +504,8 @@
   "navigation_bar.moderation": "Moderovanie",
   "navigation_bar.mutes": "Stíšené účty",
   "navigation_bar.opened_in_classic_interface": "Príspevky, účty a iné špeciálne stránky sú predvolene otvárané v klasickom webovom rozhraní.",
-  "navigation_bar.personal": "Osobné",
-  "navigation_bar.pins": "Pripnuté príspevky",
   "navigation_bar.preferences": "Nastavenia",
-  "navigation_bar.public_timeline": "Federovaná časová os",
   "navigation_bar.search": "Hľadať",
-  "navigation_bar.security": "Zabezpečenie",
   "not_signed_in_indicator.not_signed_in": "Ak chcete získať prístup k tomuto zdroju, prihláste sa.",
   "notification.admin.report": "Účet {name} nahlásil {target}",
   "notification.admin.report_statuses": "{name} nahlásil/a {target} za {category}",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index 2cfff14316..349b7e3df9 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -167,7 +167,6 @@
   "column_header.show_settings": "Pokaži nastavitve",
   "column_header.unpin": "Odpni",
   "column_search.cancel": "Prekliči",
-  "column_subheading.settings": "Nastavitve",
   "community.column_settings.local_only": "Samo krajevno",
   "community.column_settings.media_only": "Samo predstavnosti",
   "community.column_settings.remote_only": "Samo oddaljeno",
@@ -518,12 +517,8 @@
   "navigation_bar.advanced_interface": "Odpri v naprednem spletnem vmesniku",
   "navigation_bar.blocks": "Blokirani uporabniki",
   "navigation_bar.bookmarks": "Zaznamki",
-  "navigation_bar.community_timeline": "Krajevna časovnica",
-  "navigation_bar.compose": "Sestavi novo objavo",
   "navigation_bar.direct": "Zasebne omembe",
-  "navigation_bar.discover": "Odkrijte",
   "navigation_bar.domain_blocks": "Blokirane domene",
-  "navigation_bar.explore": "Razišči",
   "navigation_bar.favourites": "Priljubljeni",
   "navigation_bar.filters": "Utišane besede",
   "navigation_bar.follow_requests": "Prošnje za sledenje",
@@ -534,12 +529,8 @@
   "navigation_bar.moderation": "Moderiranje",
   "navigation_bar.mutes": "Utišani uporabniki",
   "navigation_bar.opened_in_classic_interface": "Objave, računi in druge specifične strani se privzeto odprejo v klasičnem spletnem vmesniku.",
-  "navigation_bar.personal": "Osebno",
-  "navigation_bar.pins": "Pripete objave",
   "navigation_bar.preferences": "Nastavitve",
-  "navigation_bar.public_timeline": "Združena časovnica",
   "navigation_bar.search": "Iskanje",
-  "navigation_bar.security": "Varnost",
   "not_signed_in_indicator.not_signed_in": "Za dostop do tega vira se morate prijaviti.",
   "notification.admin.report": "{name} je prijavil/a {target}",
   "notification.admin.report_account": "{name} je prijavil/a {count, plural, one {# objavo} two {# objavi} few {# objave} other {# objav}} od {target} zaradi {category}",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index cc042b7fa0..62aa48505d 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -179,7 +179,6 @@
   "column_header.show_settings": "Shfaq rregullime",
   "column_header.unpin": "Shfiksoje",
   "column_search.cancel": "Anuloje",
-  "column_subheading.settings": "Rregullime",
   "community.column_settings.local_only": "Vetëm vendore",
   "community.column_settings.media_only": "Vetëm Media",
   "community.column_settings.remote_only": "Vetëm të largëta",
@@ -550,12 +549,8 @@
   "navigation_bar.automated_deletion": "Fshirje e automatizuar postimesh",
   "navigation_bar.blocks": "Përdorues të bllokuar",
   "navigation_bar.bookmarks": "Faqerojtës",
-  "navigation_bar.community_timeline": "Rrjedhë kohore vendore",
-  "navigation_bar.compose": "Hartoni mesazh të ri",
   "navigation_bar.direct": "Përmendje private",
-  "navigation_bar.discover": "Zbuloni",
   "navigation_bar.domain_blocks": "Përkatësi të bllokuara",
-  "navigation_bar.explore": "Eksploroni",
   "navigation_bar.favourites": "Të parapëlqyer",
   "navigation_bar.filters": "Fjalë të heshtuara",
   "navigation_bar.follow_requests": "Kërkesa për ndjekje",
@@ -568,14 +563,10 @@
   "navigation_bar.more": "Më tepër",
   "navigation_bar.mutes": "Përdorues të heshtuar",
   "navigation_bar.opened_in_classic_interface": "Postime, llogari dhe të tjera faqe specifike, si parazgjedhje, hapen në ndërfaqe klasike web.",
-  "navigation_bar.personal": "Personale",
-  "navigation_bar.pins": "Mesazhe të fiksuar",
   "navigation_bar.preferences": "Parapëlqime",
   "navigation_bar.privacy_and_reach": "Privatësi dhe shtrirje",
-  "navigation_bar.public_timeline": "Rrjedhë kohore të federuarash",
   "navigation_bar.search": "Kërkoni",
   "navigation_bar.search_trends": "Kërkim / Në modë",
-  "navigation_bar.security": "Siguri",
   "navigation_panel.collapse_followed_tags": "Tkurre menunë e hashtag-ëve të ndjekur",
   "navigation_panel.collapse_lists": "Palose menunë listë",
   "navigation_panel.expand_followed_tags": "Zgjeroje menunë e hashtag-ëve të ndjekur",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index 17dbe6f18b..c43217152f 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -132,7 +132,6 @@
   "column_header.pin": "Zakači",
   "column_header.show_settings": "Prikaži podešavanja",
   "column_header.unpin": "Otkači",
-  "column_subheading.settings": "Podešavanja",
   "community.column_settings.local_only": "Samo lokalno",
   "community.column_settings.media_only": "Samo multimedija",
   "community.column_settings.remote_only": "Samo udaljeno",
@@ -403,12 +402,8 @@
   "navigation_bar.advanced_interface": "Otvori u naprednom veb okruženju",
   "navigation_bar.blocks": "Blokirani korisnici",
   "navigation_bar.bookmarks": "Obeleživači",
-  "navigation_bar.community_timeline": "Lokalna vremenska linija",
-  "navigation_bar.compose": "Sastavi novu objavu",
   "navigation_bar.direct": "Privatna pominjanja",
-  "navigation_bar.discover": "Otkrij",
   "navigation_bar.domain_blocks": "Blokirani domeni",
-  "navigation_bar.explore": "Istraži",
   "navigation_bar.favourites": "Omiljeno",
   "navigation_bar.filters": "Ignorisane reči",
   "navigation_bar.follow_requests": "Zahtevi za praćenje",
@@ -418,12 +413,8 @@
   "navigation_bar.logout": "Odjava",
   "navigation_bar.mutes": "Ignorisani korisnici",
   "navigation_bar.opened_in_classic_interface": "Objave, nalozi i druge specifične stranice se podrazumevano otvaraju u klasičnom veb okruženju.",
-  "navigation_bar.personal": "Lično",
-  "navigation_bar.pins": "Zakačene objave",
   "navigation_bar.preferences": "Podešavanja",
-  "navigation_bar.public_timeline": "Združena vremenska linija",
   "navigation_bar.search": "Pretraga",
-  "navigation_bar.security": "Bezbednost",
   "not_signed_in_indicator.not_signed_in": "Morate da se prijavite da biste pristupili ovom resursu.",
   "notification.admin.report": "{name} je prijavio/-la {target}",
   "notification.admin.sign_up": "{name} se registrovao/-la",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index 361c4bbc7c..d7faac4369 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -132,7 +132,6 @@
   "column_header.pin": "Закачи",
   "column_header.show_settings": "Прикажи подешавања",
   "column_header.unpin": "Откачи",
-  "column_subheading.settings": "Подешавања",
   "community.column_settings.local_only": "Само локално",
   "community.column_settings.media_only": "Само мултимедија",
   "community.column_settings.remote_only": "Само удаљено",
@@ -403,12 +402,8 @@
   "navigation_bar.advanced_interface": "Отвори у напредном веб окружењу",
   "navigation_bar.blocks": "Блокирани корисници",
   "navigation_bar.bookmarks": "Обележивачи",
-  "navigation_bar.community_timeline": "Локална временска линија",
-  "navigation_bar.compose": "Састави нову објаву",
   "navigation_bar.direct": "Приватна помињања",
-  "navigation_bar.discover": "Откриј",
   "navigation_bar.domain_blocks": "Блокирани домени",
-  "navigation_bar.explore": "Истражи",
   "navigation_bar.favourites": "Омиљено",
   "navigation_bar.filters": "Игнорисане речи",
   "navigation_bar.follow_requests": "Захтеви за праћење",
@@ -418,12 +413,8 @@
   "navigation_bar.logout": "Одјава",
   "navigation_bar.mutes": "Игнорисани корисници",
   "navigation_bar.opened_in_classic_interface": "Објаве, налози и друге специфичне странице се подразумевано отварају у класичном веб окружењу.",
-  "navigation_bar.personal": "Лично",
-  "navigation_bar.pins": "Закачене објаве",
   "navigation_bar.preferences": "Подешавања",
-  "navigation_bar.public_timeline": "Здружена временска линија",
   "navigation_bar.search": "Претрага",
-  "navigation_bar.security": "Безбедност",
   "not_signed_in_indicator.not_signed_in": "Морате да се пријавите да бисте приступили овом ресурсу.",
   "notification.admin.report": "{name} је пријавио/-ла {target}",
   "notification.admin.sign_up": "{name} се регистровао/-ла",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index cf2a47c186..5d78b5f9cb 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -184,7 +184,6 @@
   "column_header.show_settings": "Visa inställningar",
   "column_header.unpin": "Ångra fäst",
   "column_search.cancel": "Avbryt",
-  "column_subheading.settings": "Inställningar",
   "community.column_settings.local_only": "Endast lokalt",
   "community.column_settings.media_only": "Endast media",
   "community.column_settings.remote_only": "Endast fjärr",
@@ -555,12 +554,8 @@
   "navigation_bar.automated_deletion": "Automatisk radering av inlägg",
   "navigation_bar.blocks": "Blockerade användare",
   "navigation_bar.bookmarks": "Bokmärken",
-  "navigation_bar.community_timeline": "Lokal tidslinje",
-  "navigation_bar.compose": "Författa nytt inlägg",
   "navigation_bar.direct": "Privata omnämnande",
-  "navigation_bar.discover": "Upptäck",
   "navigation_bar.domain_blocks": "Dolda domäner",
-  "navigation_bar.explore": "Utforska",
   "navigation_bar.favourites": "Favoriter",
   "navigation_bar.filters": "Tystade ord",
   "navigation_bar.follow_requests": "Följförfrågningar",
@@ -573,14 +568,10 @@
   "navigation_bar.more": "Fler",
   "navigation_bar.mutes": "Tystade användare",
   "navigation_bar.opened_in_classic_interface": "Inlägg, konton och andra specifika sidor öppnas som standard i det klassiska webbgränssnittet.",
-  "navigation_bar.personal": "Personligt",
-  "navigation_bar.pins": "Fästa inlägg",
   "navigation_bar.preferences": "Inställningar",
   "navigation_bar.privacy_and_reach": "Integritet och räckvidd",
-  "navigation_bar.public_timeline": "Federerad tidslinje",
   "navigation_bar.search": "Sök",
   "navigation_bar.search_trends": "Sök / Trendar",
-  "navigation_bar.security": "Säkerhet",
   "navigation_panel.collapse_followed_tags": "Minska menyn för följda fyrkantstaggar",
   "navigation_panel.collapse_lists": "Komprimera listmenyn",
   "navigation_panel.expand_followed_tags": "Expandera menyn för följda fyrkantstaggar",
diff --git a/app/javascript/mastodon/locales/szl.json b/app/javascript/mastodon/locales/szl.json
index 963bfe302d..55913be924 100644
--- a/app/javascript/mastodon/locales/szl.json
+++ b/app/javascript/mastodon/locales/szl.json
@@ -65,9 +65,7 @@
   "keyboard_shortcuts.toot": "to start a brand new toot",
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "to move up in the list",
-  "navigation_bar.compose": "Compose new toot",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.pins": "Pinned toots",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.reblog": "{name} boosted your status",
   "notifications.column_settings.status": "New toots:",
diff --git a/app/javascript/mastodon/locales/ta.json b/app/javascript/mastodon/locales/ta.json
index 752981b3df..8e94a6bb58 100644
--- a/app/javascript/mastodon/locales/ta.json
+++ b/app/javascript/mastodon/locales/ta.json
@@ -97,7 +97,6 @@
   "column_header.pin": "பொருத்து",
   "column_header.show_settings": "அமைப்புகளைக் காட்டு",
   "column_header.unpin": "கழட்டு",
-  "column_subheading.settings": "அமைப்புகள்",
   "community.column_settings.local_only": "அருகிலிருந்து மட்டுமே",
   "community.column_settings.media_only": "படங்கள் மட்டுமே",
   "community.column_settings.remote_only": "தொலைவிலிருந்து மட்டுமே",
@@ -240,9 +239,6 @@
   "load_pending": "{count, plural,one {# புதியது}other {# புதியவை}}",
   "navigation_bar.blocks": "தடுக்கப்பட்ட பயனர்கள்",
   "navigation_bar.bookmarks": "அடையாளக்குறிகள்",
-  "navigation_bar.community_timeline": "உள்ளூர் காலக்கெடு",
-  "navigation_bar.compose": "புதியவற்றை எழுதுக toot",
-  "navigation_bar.discover": "கண்டு பிடி",
   "navigation_bar.domain_blocks": "மறைந்த களங்கள்",
   "navigation_bar.filters": "முடக்கப்பட்ட வார்த்தைகள்",
   "navigation_bar.follow_requests": "கோரிக்கைகளை பின்பற்றவும்",
@@ -250,11 +246,7 @@
   "navigation_bar.lists": "குதிரை வீர்ர்கள்",
   "navigation_bar.logout": "விடு பதிகை",
   "navigation_bar.mutes": "முடக்கப்பட்ட பயனர்கள்",
-  "navigation_bar.personal": "தனிப்பட்டவை",
-  "navigation_bar.pins": "பொருத்தப்பட்டன toots",
   "navigation_bar.preferences": "விருப்பங்கள்",
-  "navigation_bar.public_timeline": "கூட்டாட்சி காலக்கெடு",
-  "navigation_bar.security": "பத்திரம்",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.follow": "{name} உங்களைப் பின்தொடர்கிறார்",
   "notification.follow_request": "{name} உங்களைப் பின்தொடரக் கோருகிறார்",
diff --git a/app/javascript/mastodon/locales/tai.json b/app/javascript/mastodon/locales/tai.json
index e8c4f26401..3799455050 100644
--- a/app/javascript/mastodon/locales/tai.json
+++ b/app/javascript/mastodon/locales/tai.json
@@ -54,9 +54,7 @@
   "keyboard_shortcuts.toot": "to start a brand new toot",
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "to move up in the list",
-  "navigation_bar.compose": "Compose new toot",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.pins": "Pinned toots",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.reblog": "{name} boosted your status",
   "notifications.column_settings.status": "New toots:",
diff --git a/app/javascript/mastodon/locales/te.json b/app/javascript/mastodon/locales/te.json
index 3762d0dcea..e5529c9109 100644
--- a/app/javascript/mastodon/locales/te.json
+++ b/app/javascript/mastodon/locales/te.json
@@ -56,7 +56,6 @@
   "column_header.pin": "అతికించు",
   "column_header.show_settings": "అమర్పులను చూపించు",
   "column_header.unpin": "పీకివేయు",
-  "column_subheading.settings": "అమర్పులు",
   "community.column_settings.media_only": "మీడియా మాత్రమే",
   "compose_form.direct_message_warning_learn_more": "మరింత తెలుసుకోండి",
   "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
@@ -158,20 +157,13 @@
   "lists.delete": "జాబితాను తొలగించు",
   "lists.edit": "జాబితాను సవరించు",
   "navigation_bar.blocks": "బ్లాక్ చేయబడిన వినియోగదారులు",
-  "navigation_bar.community_timeline": "స్థానిక కాలక్రమం",
-  "navigation_bar.compose": "కొత్త టూట్ను రాయండి",
-  "navigation_bar.discover": "కనుగొను",
   "navigation_bar.domain_blocks": "దాచిన డొమైన్లు",
   "navigation_bar.filters": "మ్యూట్ చేయబడిన పదాలు",
   "navigation_bar.follow_requests": "అనుసరించడానికి అభ్యర్ధనలు",
   "navigation_bar.lists": "జాబితాలు",
   "navigation_bar.logout": "లాగ్ అవుట్ చేయండి",
   "navigation_bar.mutes": "మ్యూట్ చేయబడిన వినియోగదారులు",
-  "navigation_bar.personal": "వ్యక్తిగతం",
-  "navigation_bar.pins": "అతికించిన టూట్లు",
   "navigation_bar.preferences": "ప్రాధాన్యతలు",
-  "navigation_bar.public_timeline": "సమాఖ్య కాలక్రమం",
-  "navigation_bar.security": "భద్రత",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.follow": "{name} మిమ్మల్ని అనుసరిస్తున్నారు",
   "notification.reblog": "{name} మీ స్టేటస్ ను బూస్ట్ చేసారు",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 067df80cd8..66cc435afe 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -167,7 +167,6 @@
   "column_header.show_settings": "แสดงการตั้งค่า",
   "column_header.unpin": "ถอนหมุด",
   "column_search.cancel": "ยกเลิก",
-  "column_subheading.settings": "การตั้งค่า",
   "community.column_settings.local_only": "ในเซิร์ฟเวอร์เท่านั้น",
   "community.column_settings.media_only": "สื่อเท่านั้น",
   "community.column_settings.remote_only": "ระยะไกลเท่านั้น",
@@ -515,12 +514,8 @@
   "navigation_bar.advanced_interface": "เปิดในส่วนติดต่อเว็บขั้นสูง",
   "navigation_bar.blocks": "ผู้ใช้ที่ปิดกั้นอยู่",
   "navigation_bar.bookmarks": "ที่คั่นหน้า",
-  "navigation_bar.community_timeline": "เส้นเวลาในเซิร์ฟเวอร์",
-  "navigation_bar.compose": "เขียนโพสต์ใหม่",
   "navigation_bar.direct": "การกล่าวถึงแบบส่วนตัว",
-  "navigation_bar.discover": "ค้นพบ",
   "navigation_bar.domain_blocks": "โดเมนที่ปิดกั้นอยู่",
-  "navigation_bar.explore": "สำรวจ",
   "navigation_bar.favourites": "รายการโปรด",
   "navigation_bar.filters": "คำที่ซ่อนอยู่",
   "navigation_bar.follow_requests": "คำขอติดตาม",
@@ -531,12 +526,8 @@
   "navigation_bar.moderation": "การกลั่นกรอง",
   "navigation_bar.mutes": "ผู้ใช้ที่ซ่อนอยู่",
   "navigation_bar.opened_in_classic_interface": "จะเปิดโพสต์, บัญชี และหน้าที่เฉพาะเจาะจงอื่น ๆ เป็นค่าเริ่มต้นในส่วนติดต่อเว็บแบบคลาสสิก",
-  "navigation_bar.personal": "ส่วนบุคคล",
-  "navigation_bar.pins": "โพสต์ที่ปักหมุด",
   "navigation_bar.preferences": "การกำหนดลักษณะ",
-  "navigation_bar.public_timeline": "เส้นเวลาที่ติดต่อกับภายนอก",
   "navigation_bar.search": "ค้นหา",
-  "navigation_bar.security": "ความปลอดภัย",
   "not_signed_in_indicator.not_signed_in": "คุณจำเป็นต้องเข้าสู่ระบบเพื่อเข้าถึงทรัพยากรนี้",
   "notification.admin.report": "{name} ได้รายงาน {target}",
   "notification.admin.report_account": "{name} ได้รายงาน {count, plural, other {# โพสต์}}จาก {target} สำหรับ {category}",
diff --git a/app/javascript/mastodon/locales/tok.json b/app/javascript/mastodon/locales/tok.json
index b2f9b42356..75b8376cd0 100644
--- a/app/javascript/mastodon/locales/tok.json
+++ b/app/javascript/mastodon/locales/tok.json
@@ -184,7 +184,6 @@
   "column_header.show_settings": "o lukin e lawa",
   "column_header.unpin": "o sewi ala",
   "column_search.cancel": "o ala",
-  "column_subheading.settings": "ken ilo",
   "community.column_settings.local_only": "toki tan ni taso",
   "community.column_settings.media_only": "sitelen taso",
   "community.column_settings.remote_only": "toki tan ante taso",
@@ -459,15 +458,11 @@
   "mute_modal.title": "sina wile ala wile kute e jan ni?",
   "navigation_bar.about": "sona",
   "navigation_bar.blocks": "jan len",
-  "navigation_bar.compose": "o pali e toki sin",
-  "navigation_bar.discover": "o alasa",
   "navigation_bar.domain_blocks": "ma len",
-  "navigation_bar.explore": "o alasa",
   "navigation_bar.favourites": "ijo pona",
   "navigation_bar.filters": "nimi len",
   "navigation_bar.lists": "kulupu lipu",
   "navigation_bar.mutes": "sina wile ala kute e jan ni",
-  "navigation_bar.pins": "toki sewi",
   "navigation_bar.preferences": "wile sina",
   "navigation_bar.search": "o alasa",
   "notification.admin.report": "jan {name} li toki e jan {target} tawa lawa",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 6863af8589..dce92940ca 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -184,7 +184,6 @@
   "column_header.show_settings": "Ayarları göster",
   "column_header.unpin": "Sabitlemeyi kaldır",
   "column_search.cancel": "İptal",
-  "column_subheading.settings": "Ayarlar",
   "community.column_settings.local_only": "Sadece yerel",
   "community.column_settings.media_only": "Sadece medya",
   "community.column_settings.remote_only": "Sadece uzak",
@@ -555,12 +554,8 @@
   "navigation_bar.automated_deletion": "Otomatik gönderi silme",
   "navigation_bar.blocks": "Engellenen kullanıcılar",
   "navigation_bar.bookmarks": "Yer İşaretleri",
-  "navigation_bar.community_timeline": "Yerel ağ akışı",
-  "navigation_bar.compose": "Yeni gönderi yaz",
   "navigation_bar.direct": "Özel mesajlar",
-  "navigation_bar.discover": "Keşfet",
   "navigation_bar.domain_blocks": "Engellenen alan adları",
-  "navigation_bar.explore": "Keşfet",
   "navigation_bar.favourites": "Favorilerin",
   "navigation_bar.filters": "Sessize alınmış kelimeler",
   "navigation_bar.follow_requests": "Takip istekleri",
@@ -568,19 +563,17 @@
   "navigation_bar.follows_and_followers": "Takip edilenler ve takipçiler",
   "navigation_bar.import_export": "İçe ve dışa aktarma",
   "navigation_bar.lists": "Listeler",
+  "navigation_bar.live_feed_local": "Canlı akış (yerel)",
+  "navigation_bar.live_feed_public": "Canlı akış (herkese açık)",
   "navigation_bar.logout": "Oturumu kapat",
   "navigation_bar.moderation": "Moderasyon",
   "navigation_bar.more": "Daha fazla",
   "navigation_bar.mutes": "Sessize alınmış kullanıcılar",
   "navigation_bar.opened_in_classic_interface": "Gönderiler, hesaplar ve diğer belirli sayfalar klasik web arayüzünde varsayılan olarak açılıyorlar.",
-  "navigation_bar.personal": "Kişisel",
-  "navigation_bar.pins": "Sabitlenmiş gönderiler",
   "navigation_bar.preferences": "Tercihler",
   "navigation_bar.privacy_and_reach": "Gizlilik ve erişim",
-  "navigation_bar.public_timeline": "Federe ağ akışı",
   "navigation_bar.search": "Arama",
   "navigation_bar.search_trends": "Ara / Öne Çıkanlar",
-  "navigation_bar.security": "Güvenlik",
   "navigation_panel.collapse_followed_tags": "Takip edilen etiketler menüsünü daralt",
   "navigation_panel.collapse_lists": "Liste menüsünü daralt",
   "navigation_panel.expand_followed_tags": "Takip edilen etiketler menüsünü genişlet",
diff --git a/app/javascript/mastodon/locales/tt.json b/app/javascript/mastodon/locales/tt.json
index 29a11217d0..e866ee861f 100644
--- a/app/javascript/mastodon/locales/tt.json
+++ b/app/javascript/mastodon/locales/tt.json
@@ -118,7 +118,6 @@
   "column_header.pin": "Беркетү",
   "column_header.show_settings": "Көйләүләрне күрсәтү",
   "column_header.unpin": "Төзәтү түгел",
-  "column_subheading.settings": "Көйләүләр",
   "community.column_settings.local_only": "Җирле генә",
   "community.column_settings.media_only": "Media only",
   "community.column_settings.remote_only": "Дистанцион гына идарә итү",
@@ -282,18 +281,12 @@
   "navigation_bar.about": "Проект турында",
   "navigation_bar.blocks": "Блокланган кулланучылар",
   "navigation_bar.bookmarks": "Кыстыргычлар",
-  "navigation_bar.community_timeline": "Локаль вакыт сызыгы",
-  "navigation_bar.compose": "Compose new toot",
   "navigation_bar.direct": "Хосусый искә алулар",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.explore": "Күзәтү",
   "navigation_bar.lists": "Исемлекләр",
   "navigation_bar.logout": "Чыгу",
-  "navigation_bar.personal": "Шәхси",
-  "navigation_bar.pins": "Pinned toots",
   "navigation_bar.preferences": "Caylaw",
   "navigation_bar.search": "Эзләү",
-  "navigation_bar.security": "Хәвефсезлек",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.reblog": "{name} boosted your status",
   "notifications.clear": "Искәртүләрне чистарту",
diff --git a/app/javascript/mastodon/locales/ug.json b/app/javascript/mastodon/locales/ug.json
index 3252c187c8..85898d048a 100644
--- a/app/javascript/mastodon/locales/ug.json
+++ b/app/javascript/mastodon/locales/ug.json
@@ -64,9 +64,7 @@
   "keyboard_shortcuts.toot": "to start a brand new toot",
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "to move up in the list",
-  "navigation_bar.compose": "Compose new toot",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.pins": "Pinned toots",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.reblog": "{name} boosted your status",
   "notifications.column_settings.status": "New toots:",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 049957fcd4..c136834ad5 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -174,7 +174,6 @@
   "column_header.show_settings": "Показати налаштування",
   "column_header.unpin": "Відкріпити",
   "column_search.cancel": "Скасувати",
-  "column_subheading.settings": "Налаштування",
   "community.column_settings.local_only": "Лише локальні",
   "community.column_settings.media_only": "Лише з медіа",
   "community.column_settings.remote_only": "Лише віддалені",
@@ -530,12 +529,8 @@
   "navigation_bar.automated_deletion": "Автовидалення допису",
   "navigation_bar.blocks": "Заблоковані користувачі",
   "navigation_bar.bookmarks": "Закладки",
-  "navigation_bar.community_timeline": "Локальна стрічка",
-  "navigation_bar.compose": "Написати новий допис",
   "navigation_bar.direct": "Особисті згадки",
-  "navigation_bar.discover": "Дослідити",
   "navigation_bar.domain_blocks": "Заблоковані домени",
-  "navigation_bar.explore": "Огляд",
   "navigation_bar.favourites": "Уподобане",
   "navigation_bar.filters": "Приховані слова",
   "navigation_bar.follow_requests": "Запити на підписку",
@@ -543,19 +538,17 @@
   "navigation_bar.follows_and_followers": "Підписки та підписники",
   "navigation_bar.import_export": "Імпорт та експорт",
   "navigation_bar.lists": "Списки",
+  "navigation_bar.live_feed_local": "Онлайн стрічка (локальна)",
+  "navigation_bar.live_feed_public": "Онлайн стрічка (публічна)",
   "navigation_bar.logout": "Вийти",
   "navigation_bar.moderation": "Модерування",
   "navigation_bar.more": "Ще",
   "navigation_bar.mutes": "Приховані користувачі",
   "navigation_bar.opened_in_classic_interface": "Дописи, облікові записи та інші специфічні сторінки усталено відкриваються в класичному вебінтерфейсі.",
-  "navigation_bar.personal": "Особисте",
-  "navigation_bar.pins": "Закріплені дописи",
   "navigation_bar.preferences": "Налаштування",
   "navigation_bar.privacy_and_reach": "Приватність і досяжність",
-  "navigation_bar.public_timeline": "Глобальна стрічка",
   "navigation_bar.search": "Пошук",
   "navigation_bar.search_trends": "Пошук / Популярність",
-  "navigation_bar.security": "Безпека",
   "navigation_panel.collapse_followed_tags": "Згорнути меню хештегів",
   "navigation_panel.collapse_lists": "Згорнути меню списку",
   "navigation_panel.expand_followed_tags": "Розгорнути меню хештегів",
diff --git a/app/javascript/mastodon/locales/ur.json b/app/javascript/mastodon/locales/ur.json
index eb79724a0e..883b847fa1 100644
--- a/app/javascript/mastodon/locales/ur.json
+++ b/app/javascript/mastodon/locales/ur.json
@@ -96,7 +96,6 @@
   "column_header.pin": "چسپاں کریں",
   "column_header.show_settings": "ترتیبات دکھائیں",
   "column_header.unpin": "رہا کریں",
-  "column_subheading.settings": "ترتیبات",
   "community.column_settings.local_only": "صرف مقامی",
   "community.column_settings.media_only": "وسائل فقط",
   "community.column_settings.remote_only": "صرف خارجی",
@@ -209,9 +208,6 @@
   "keyboard_shortcuts.up": "to move up in the list",
   "navigation_bar.blocks": "مسدود صارفین",
   "navigation_bar.bookmarks": "بُک مارکس",
-  "navigation_bar.community_timeline": "مقامی ٹائم لائن",
-  "navigation_bar.compose": "Compose new toot",
-  "navigation_bar.discover": "دریافت کریں",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.filters": "خاموش کردہ الفاظ",
   "navigation_bar.follow_requests": "پیروی کی درخواستیں",
@@ -219,11 +215,7 @@
   "navigation_bar.lists": "فہرستیں",
   "navigation_bar.logout": "لاگ آؤٹ",
   "navigation_bar.mutes": "خاموش کردہ صارفین",
-  "navigation_bar.personal": "ذاتی",
-  "navigation_bar.pins": "Pinned toots",
   "navigation_bar.preferences": "ترجیحات",
-  "navigation_bar.public_timeline": "وفاقی ٹائم لائن",
-  "navigation_bar.security": "سیکورٹی",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.follow": "{name} آپ کی پیروی کی",
   "notification.follow_request": "{name} نے آپ کی پیروی کی درخواست کی",
diff --git a/app/javascript/mastodon/locales/uz.json b/app/javascript/mastodon/locales/uz.json
index 6244629292..01bf8839f0 100644
--- a/app/javascript/mastodon/locales/uz.json
+++ b/app/javascript/mastodon/locales/uz.json
@@ -105,7 +105,6 @@
   "column_header.pin": "Yopishtirish",
   "column_header.show_settings": "Sozlamalarni ko'rsatish",
   "column_header.unpin": "Olib qo‘yish",
-  "column_subheading.settings": "Sozlamalar",
   "community.column_settings.local_only": "Faqat mahalliy",
   "community.column_settings.media_only": "Faqat media",
   "community.column_settings.remote_only": "Faqat masofaviy",
@@ -284,23 +283,15 @@
   "navigation_bar.about": "Haqida",
   "navigation_bar.blocks": "Bloklangan foydalanuvchilar",
   "navigation_bar.bookmarks": "Xatcho‘plar",
-  "navigation_bar.community_timeline": "Mahalliy",
-  "navigation_bar.compose": "Yangi post yozing",
-  "navigation_bar.discover": "Kashf qilish",
   "navigation_bar.domain_blocks": "Bloklangan domenlar",
-  "navigation_bar.explore": "O‘rganish",
   "navigation_bar.filters": "E'tiborga olinmagan so'zlar",
   "navigation_bar.followed_tags": "Kuzatilgan hashtaglar",
   "navigation_bar.follows_and_followers": "Kuzatuvchilar va izdoshlar",
   "navigation_bar.lists": "Ro‘yxat",
   "navigation_bar.logout": "Chiqish",
   "navigation_bar.mutes": "Ovozsiz foydalanuvchilar",
-  "navigation_bar.personal": "Shaxsiy",
-  "navigation_bar.pins": "Belgilangan postlar",
   "navigation_bar.preferences": "Sozlamalar",
-  "navigation_bar.public_timeline": "Federatsiyalangan vaqt jadvali",
   "navigation_bar.search": "Izlash",
-  "navigation_bar.security": "Xavfsizlik",
   "not_signed_in_indicator.not_signed_in": "Ushbu manbaga kirish uchun tizimga kirishingiz kerak.",
   "notification.own_poll": "So‘rovingiz tugadi",
   "notification.reblog": "{name} boosted your status",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index ced1a043a4..4ef61c1177 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -184,7 +184,6 @@
   "column_header.show_settings": "Hiện bộ lọc",
   "column_header.unpin": "Không ghim",
   "column_search.cancel": "Hủy bỏ",
-  "column_subheading.settings": "Cài đặt",
   "community.column_settings.local_only": "Chỉ máy chủ của bạn",
   "community.column_settings.media_only": "Chỉ hiện tút có media",
   "community.column_settings.remote_only": "Chỉ người ở máy chủ khác",
@@ -555,12 +554,8 @@
   "navigation_bar.automated_deletion": "Tự động xóa tút cũ",
   "navigation_bar.blocks": "Người đã chặn",
   "navigation_bar.bookmarks": "Tút lưu",
-  "navigation_bar.community_timeline": "Cộng đồng",
-  "navigation_bar.compose": "Soạn tút mới",
   "navigation_bar.direct": "Nhắn riêng",
-  "navigation_bar.discover": "Khám phá",
   "navigation_bar.domain_blocks": "Máy chủ đã ẩn",
-  "navigation_bar.explore": "Xu hướng",
   "navigation_bar.favourites": "Tút thích",
   "navigation_bar.filters": "Từ khóa đã lọc",
   "navigation_bar.follow_requests": "Yêu cầu theo dõi",
@@ -568,19 +563,17 @@
   "navigation_bar.follows_and_followers": "Quan hệ",
   "navigation_bar.import_export": "Nhập và xuất",
   "navigation_bar.lists": "Danh sách",
+  "navigation_bar.live_feed_local": "Bảng tin (máy chủ)",
+  "navigation_bar.live_feed_public": "Bảng tin (công khai)",
   "navigation_bar.logout": "Đăng xuất",
   "navigation_bar.moderation": "Kiểm duyệt",
   "navigation_bar.more": "Khác",
   "navigation_bar.mutes": "Người đã ẩn",
   "navigation_bar.opened_in_classic_interface": "Tút, tài khoản và các trang cụ thể khác được mở theo mặc định trong giao diện web cổ điển.",
-  "navigation_bar.personal": "Cá nhân",
-  "navigation_bar.pins": "Tút ghim",
   "navigation_bar.preferences": "Thiết lập",
   "navigation_bar.privacy_and_reach": "Riêng tư và tiếp cận",
-  "navigation_bar.public_timeline": "Liên hợp",
   "navigation_bar.search": "Tìm kiếm",
   "navigation_bar.search_trends": "Tìm kiếm / Xu hướng",
-  "navigation_bar.security": "Bảo mật",
   "navigation_panel.collapse_followed_tags": "Thu gọn menu hashtag theo dõi",
   "navigation_panel.collapse_lists": "Thu gọn menu danh sách",
   "navigation_panel.expand_followed_tags": "Mở rộng menu hashtag theo dõi",
diff --git a/app/javascript/mastodon/locales/zgh.json b/app/javascript/mastodon/locales/zgh.json
index 1c5bc2d2d3..3c3c91d2ad 100644
--- a/app/javascript/mastodon/locales/zgh.json
+++ b/app/javascript/mastodon/locales/zgh.json
@@ -31,7 +31,6 @@
   "column_header.pin": "ⵖⵏⵙ",
   "column_header.show_settings": "ⵙⵎⴰⵍ ⵜⵉⵙⵖⴰⵍ",
   "column_header.unpin": "ⴽⴽⵙ ⴰⵖⵏⴰⵙ",
-  "column_subheading.settings": "ⵜⵉⵙⵖⴰⵍ",
   "community.column_settings.local_only": "ⵖⴰⵙ ⴰⴷⵖⴰⵔⴰⵏ",
   "community.column_settings.media_only": "ⵖⴰⵙ ⵉⵙⵏⵖⵎⵉⵙⵏ",
   "compose_form.direct_message_warning_learn_more": "ⵙⵙⵏ ⵓⴳⴳⴰⵔ",
@@ -107,12 +106,10 @@
   "lists.edit": "ⵙⵏⴼⵍ ⵜⴰⵍⴳⴰⵎⵜ",
   "lists.replies_policy.none": "ⴰⵡⴷ ⵢⴰⵏ",
   "load_pending": "{count, plural, one {# ⵓⴼⵔⴷⵉⵙ ⴰⵎⴰⵢⵏⵓ} other {# ⵉⴼⵔⴷⴰⵙ ⵉⵎⴰⵢⵏⵓⵜⵏ}}",
-  "navigation_bar.compose": "Compose new toot",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.follow_requests": "ⵜⵓⵜⵔⴰⵡⵉⵏ ⵏ ⵓⴹⴼⴰⵕ",
   "navigation_bar.lists": "ⵜⵉⵍⴳⴰⵎⵉⵏ",
   "navigation_bar.logout": "ⴼⴼⵖ",
-  "navigation_bar.pins": "Pinned toots",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.follow": "ⵉⴹⴼⴼⴰⵔ ⴽ {name}",
   "notification.reblog": "{name} boosted your status",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 1376806dbf..d7c63e54c9 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -183,7 +183,6 @@
   "column_header.show_settings": "显示设置",
   "column_header.unpin": "取消置顶",
   "column_search.cancel": "取消",
-  "column_subheading.settings": "设置",
   "community.column_settings.local_only": "仅限本站",
   "community.column_settings.media_only": "仅媒体",
   "community.column_settings.remote_only": "仅外站",
@@ -542,12 +541,8 @@
   "navigation_bar.advanced_interface": "在高级网页界面中打开",
   "navigation_bar.blocks": "已屏蔽的用户",
   "navigation_bar.bookmarks": "书签",
-  "navigation_bar.community_timeline": "本站时间线",
-  "navigation_bar.compose": "撰写新嘟文",
   "navigation_bar.direct": "私下提及",
-  "navigation_bar.discover": "发现",
   "navigation_bar.domain_blocks": "已屏蔽的域名",
-  "navigation_bar.explore": "探索",
   "navigation_bar.favourites": "喜欢",
   "navigation_bar.filters": "忽略的关键词",
   "navigation_bar.follow_requests": "关注请求",
@@ -558,12 +553,8 @@
   "navigation_bar.moderation": "审核",
   "navigation_bar.mutes": "已隐藏的用户",
   "navigation_bar.opened_in_classic_interface": "嘟文页、个人资料与其他某些页面默认在经典网页界面中打开。",
-  "navigation_bar.personal": "个人",
-  "navigation_bar.pins": "置顶嘟文",
   "navigation_bar.preferences": "偏好设置",
-  "navigation_bar.public_timeline": "跨站时间线",
   "navigation_bar.search": "搜索",
-  "navigation_bar.security": "安全",
   "not_signed_in_indicator.not_signed_in": "你需要登录才能访问此资源。",
   "notification.admin.report": "{name} 举报了 {target}",
   "notification.admin.report_account": "{name} 举报了来自 {target} 的 {count, plural, other {# 条嘟文}}，原因为 {category}",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index f20f950336..6fdcc19c66 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -148,7 +148,6 @@
   "column_header.show_settings": "顯示設定",
   "column_header.unpin": "取消置頂",
   "column_search.cancel": "取消",
-  "column_subheading.settings": "設定",
   "community.column_settings.local_only": "只顯示本站",
   "community.column_settings.media_only": "只顯示多媒體",
   "community.column_settings.remote_only": "只顯示外站",
@@ -434,12 +433,8 @@
   "navigation_bar.advanced_interface": "在進階網頁介面打開",
   "navigation_bar.blocks": "封鎖名單",
   "navigation_bar.bookmarks": "書籤",
-  "navigation_bar.community_timeline": "本站時間軸",
-  "navigation_bar.compose": "撰寫新文章",
   "navigation_bar.direct": "私人提及",
-  "navigation_bar.discover": "探索",
   "navigation_bar.domain_blocks": "封鎖的服務站",
-  "navigation_bar.explore": "探索",
   "navigation_bar.favourites": "最愛",
   "navigation_bar.filters": "靜音詞彙",
   "navigation_bar.follow_requests": "追蹤請求",
@@ -451,13 +446,9 @@
   "navigation_bar.more": "更多",
   "navigation_bar.mutes": "靜音名單",
   "navigation_bar.opened_in_classic_interface": "帖文、帳號及其他特定頁面將預設在經典網頁介面中打開。",
-  "navigation_bar.personal": "個人",
-  "navigation_bar.pins": "置頂文章",
   "navigation_bar.preferences": "偏好設定",
   "navigation_bar.privacy_and_reach": "私隱及觸及",
-  "navigation_bar.public_timeline": "跨站時間軸",
   "navigation_bar.search": "搜尋",
-  "navigation_bar.security": "安全",
   "not_signed_in_indicator.not_signed_in": "您需要登入才能存取此資源。",
   "notification.admin.report": "{name} 檢舉了 {target}",
   "notification.admin.sign_up": "{name} 已經註冊",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index b045d2d7f5..db58d86258 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -184,7 +184,6 @@
   "column_header.show_settings": "顯示設定",
   "column_header.unpin": "取消釘選",
   "column_search.cancel": "取消",
-  "column_subheading.settings": "設定",
   "community.column_settings.local_only": "只顯示本站",
   "community.column_settings.media_only": "只顯示媒體",
   "community.column_settings.remote_only": "只顯示遠端",
@@ -555,12 +554,8 @@
   "navigation_bar.automated_deletion": "自動嘟文刪除",
   "navigation_bar.blocks": "已封鎖的使用者",
   "navigation_bar.bookmarks": "書籤",
-  "navigation_bar.community_timeline": "本站時間軸",
-  "navigation_bar.compose": "撰寫新嘟文",
   "navigation_bar.direct": "私訊",
-  "navigation_bar.discover": "探索",
   "navigation_bar.domain_blocks": "已封鎖網域",
-  "navigation_bar.explore": "探索",
   "navigation_bar.favourites": "最愛",
   "navigation_bar.filters": "已靜音的關鍵字",
   "navigation_bar.follow_requests": "跟隨請求",
@@ -568,19 +563,17 @@
   "navigation_bar.follows_and_followers": "跟隨中與跟隨者",
   "navigation_bar.import_export": "匯入及匯出",
   "navigation_bar.lists": "列表",
+  "navigation_bar.live_feed_local": "即時內容（本站）",
+  "navigation_bar.live_feed_public": "即時內容（公開）",
   "navigation_bar.logout": "登出",
   "navigation_bar.moderation": "站務",
   "navigation_bar.more": "更多",
   "navigation_bar.mutes": "已靜音的使用者",
   "navigation_bar.opened_in_classic_interface": "預設於經典網頁介面中開啟嘟文、帳號與其他特定頁面。",
-  "navigation_bar.personal": "個人",
-  "navigation_bar.pins": "釘選的嘟文",
   "navigation_bar.preferences": "偏好設定",
   "navigation_bar.privacy_and_reach": "隱私權及觸及",
-  "navigation_bar.public_timeline": "聯邦時間軸",
   "navigation_bar.search": "搜尋",
   "navigation_bar.search_trends": "搜尋 / 熱門趨勢",
-  "navigation_bar.security": "安全性",
   "navigation_panel.collapse_followed_tags": "收合已跟隨主題標籤選單",
   "navigation_panel.collapse_lists": "收合列表選單",
   "navigation_panel.expand_followed_tags": "展開已跟隨主題標籤選單",
diff --git a/app/javascript/mastodon/reducers/index.ts b/app/javascript/mastodon/reducers/index.ts
index 794d993f75..cbf22b3118 100644
--- a/app/javascript/mastodon/reducers/index.ts
+++ b/app/javascript/mastodon/reducers/index.ts
@@ -1,4 +1,4 @@
-import { Record as ImmutableRecord } from 'immutable';
+import { Record as ImmutableRecord, mergeDeep } from 'immutable';
 
 import { loadingBarReducer } from 'react-redux-loading-bar';
 import { combineReducers } from 'redux-immutable';
@@ -98,6 +98,15 @@ const initialRootState = Object.fromEntries(
 
 const RootStateRecord = ImmutableRecord(initialRootState, 'RootState');
 
-const rootReducer = combineReducers(reducers, RootStateRecord);
+export const rootReducer = combineReducers(reducers, RootStateRecord);
 
-export { rootReducer };
+export function reducerWithInitialState(
+  stateOverrides: Record<string, unknown> = {},
+) {
+  const initialStateRecord = mergeDeep(initialRootState, stateOverrides);
+  const PatchedRootStateRecord = ImmutableRecord(
+    initialStateRecord,
+    'RootState',
+  );
+  return combineReducers(reducers, PatchedRootStateRecord);
+}
diff --git a/app/javascript/mastodon/store/store.ts b/app/javascript/mastodon/store/store.ts
index 9f43f58a43..9f83f2f3e1 100644
--- a/app/javascript/mastodon/store/store.ts
+++ b/app/javascript/mastodon/store/store.ts
@@ -6,24 +6,26 @@ import { errorsMiddleware } from './middlewares/errors';
 import { loadingBarMiddleware } from './middlewares/loading_bar';
 import { soundsMiddleware } from './middlewares/sounds';
 
+export const defaultMiddleware = {
+  // In development, Redux Toolkit enables 2 default middlewares to detect
+  // common issues with states. Unfortunately, our use of ImmutableJS for state
+  // triggers both, so lets disable them until our state is fully refactored
+
+  // https://redux-toolkit.js.org/api/serializabilityMiddleware
+  // This checks recursively that every values in the state are serializable in JSON
+  // Which is not the case, as we use ImmutableJS structures, but also File objects
+  serializableCheck: false,
+
+  // https://redux-toolkit.js.org/api/immutabilityMiddleware
+  // This checks recursively if every value in the state is immutable (ie, a JS primitive type)
+  // But this is not the case, as our Root State is an ImmutableJS map, which is an object
+  immutableCheck: false,
+} as const;
+
 export const store = configureStore({
   reducer: rootReducer,
   middleware: (getDefaultMiddleware) =>
-    getDefaultMiddleware({
-      // In development, Redux Toolkit enables 2 default middlewares to detect
-      // common issues with states. Unfortunately, our use of ImmutableJS for state
-      // triggers both, so lets disable them until our state is fully refactored
-
-      // https://redux-toolkit.js.org/api/serializabilityMiddleware
-      // This checks recursively that every values in the state are serializable in JSON
-      // Which is not the case, as we use ImmutableJS structures, but also File objects
-      serializableCheck: false,
-
-      // https://redux-toolkit.js.org/api/immutabilityMiddleware
-      // This checks recursively if every value in the state is immutable (ie, a JS primitive type)
-      // But this is not the case, as our Root State is an ImmutableJS map, which is an object
-      immutableCheck: false,
-    })
+    getDefaultMiddleware(defaultMiddleware)
       .concat(
         loadingBarMiddleware({
           promiseTypeSuffixes: ['REQUEST', 'SUCCESS', 'FAIL'],
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 81fde87822..c32110be8c 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -249,6 +249,21 @@
     width: 100%;
   }
 
+  &.loading {
+    cursor: wait;
+
+    .button__label-wrapper {
+      // Hide the label only visually, so that
+      // it keeps its layout and accessibility
+      opacity: 0;
+    }
+
+    .loading-indicator {
+      position: absolute;
+      inset: 0;
+    }
+  }
+
   .icon {
     width: 18px;
     height: 18px;
@@ -1410,9 +1425,10 @@ body > [data-popper-placement] {
 }
 
 .focusable {
-  &:focus {
+  &:focus-visible {
     outline: 0;
     background: rgba($ui-highlight-color, 0.05);
+    box-shadow: inset 0 0 0 2px $ui-button-focus-outline-color;
   }
 }
 
@@ -1815,7 +1831,7 @@ body > [data-popper-placement] {
     background: color.mix($ui-base-color, $ui-highlight-color, 95%);
   }
 
-  &:focus {
+  &:focus-visible {
     .detailed-status,
     .detailed-status__action-bar {
       background: color.mix(
@@ -4644,14 +4660,20 @@ a.status-card {
 .icon-button .loading-indicator {
   position: static;
   transform: none;
+  color: inherit;
 
   .circular-progress {
-    color: $primary-text-color;
+    color: inherit;
     width: 22px;
     height: 22px;
   }
 }
 
+.button--compact .loading-indicator .circular-progress {
+  width: 17px;
+  height: 17px;
+}
+
 .icon-button .loading-indicator .circular-progress {
   color: lighten($ui-base-color, 26%);
   width: 12px;
@@ -5648,18 +5670,47 @@ a.status-card {
   }
 }
 
-.search__icon {
-  background: transparent;
-  border: 0;
-  padding: 0;
+.search__icon-wrapper {
   position: absolute;
-  top: 12px + 2px;
-  cursor: default;
-  pointer-events: none;
+  top: 14px;
+  display: grid;
   margin-inline-start: 16px - 2px;
   width: 20px;
   height: 20px;
 
+  .icon {
+    width: 100%;
+    height: 100%;
+  }
+
+  &:not(.has-value) {
+    pointer-events: none;
+  }
+}
+
+.search__icon {
+  grid-area: 1 / 1;
+  transition: all 100ms linear;
+  transition-property: transform, opacity;
+  color: $darker-text-color;
+}
+
+.search__icon.icon-search {
+  .has-value & {
+    pointer-events: none;
+    opacity: 0;
+    transform: rotate(90deg);
+  }
+}
+
+.search__icon--clear-button {
+  background: transparent;
+  border: 0;
+  padding: 0;
+  width: 20px;
+  height: 20px;
+  border-radius: 100%;
+
   &::-moz-focus-inner {
     border: 0;
   }
@@ -5669,39 +5720,14 @@ a.status-card {
     outline: 0 !important;
   }
 
-  .icon {
-    position: absolute;
-    top: 0;
-    inset-inline-start: 0;
+  &:focus-visible {
+    box-shadow: 0 0 0 2px $ui-button-focus-outline-color;
+  }
+
+  &[aria-hidden='true'] {
+    pointer-events: none;
     opacity: 0;
-    transition: all 100ms linear;
-    transition-property: transform, opacity;
-    width: 20px;
-    height: 20px;
-    color: $darker-text-color;
-
-    &.active {
-      pointer-events: auto;
-      opacity: 1;
-    }
-  }
-
-  .icon-search {
-    transform: rotate(90deg);
-
-    &.active {
-      pointer-events: none;
-      transform: rotate(0deg);
-    }
-  }
-
-  .icon-times-circle {
-    transform: rotate(0deg);
-    cursor: pointer;
-
-    &.active {
-      transform: rotate(90deg);
-    }
+    transform: rotate(-90deg);
   }
 }
 
diff --git a/app/lib/annual_report/archetype.rb b/app/lib/annual_report/archetype.rb
index c02b28dfda..ff7e14e2a0 100644
--- a/app/lib/annual_report/archetype.rb
+++ b/app/lib/annual_report/archetype.rb
@@ -32,7 +32,7 @@ class AnnualReport::Archetype < AnnualReport::Source
   end
 
   def reblogs_count
-    @reblogs_count ||= report_statuses.where.not(reblog_of_id: nil).count
+    @reblogs_count ||= report_statuses.only_reblogs.count
   end
 
   def replies_count
diff --git a/app/lib/annual_report/most_reblogged_accounts.rb b/app/lib/annual_report/most_reblogged_accounts.rb
index a23734fce3..df4dedb734 100644
--- a/app/lib/annual_report/most_reblogged_accounts.rb
+++ b/app/lib/annual_report/most_reblogged_accounts.rb
@@ -18,7 +18,7 @@ class AnnualReport::MostRebloggedAccounts < AnnualReport::Source
   private
 
   def most_reblogged_accounts
-    report_statuses.where.not(reblog_of_id: nil).joins(reblog: :account).group(accounts: [:id]).having(minimum_reblog_count).order(count_all: :desc).limit(SET_SIZE).count
+    report_statuses.only_reblogs.joins(reblog: :account).group(accounts: [:id]).having(minimum_reblog_count).order(count_all: :desc).limit(SET_SIZE).count
   end
 
   def minimum_reblog_count
diff --git a/app/lib/annual_report/time_series.rb b/app/lib/annual_report/time_series.rb
index 65a188eda7..3f9f0d52e8 100644
--- a/app/lib/annual_report/time_series.rb
+++ b/app/lib/annual_report/time_series.rb
@@ -17,14 +17,34 @@ class AnnualReport::TimeSeries < AnnualReport::Source
   private
 
   def statuses_per_month
-    @statuses_per_month ||= report_statuses.group(:period).pluck(Arel.sql("date_part('month', created_at)::int AS period, count(*)")).to_h
+    @statuses_per_month ||= report_statuses.group(:period).pluck(date_part_month.as('period'), Arel.star.count).to_h
   end
 
   def following_per_month
-    @following_per_month ||= @account.active_relationships.where("date_part('year', created_at) = ?", @year).group(:period).pluck(Arel.sql("date_part('month', created_at)::int AS period, count(*)")).to_h
+    @following_per_month ||= annual_relationships_by_month(@account.active_relationships)
   end
 
   def followers_per_month
-    @followers_per_month ||= @account.passive_relationships.where("date_part('year', created_at) = ?", @year).group(:period).pluck(Arel.sql("date_part('month', created_at)::int AS period, count(*)")).to_h
+    @followers_per_month ||= annual_relationships_by_month(@account.passive_relationships)
+  end
+
+  def date_part_month
+    Arel.sql(<<~SQL.squish)
+      DATE_PART('month', created_at)::int
+    SQL
+  end
+
+  def annual_relationships_by_month(relationships)
+    relationships
+      .where(created_in_year, @year)
+      .group(:period)
+      .pluck(date_part_month.as('period'), Arel.star.count)
+      .to_h
+  end
+
+  def created_in_year
+    Arel.sql(<<~SQL.squish)
+      DATE_PART('year', created_at) = ?
+    SQL
   end
 end
diff --git a/app/lib/annual_report/type_distribution.rb b/app/lib/annual_report/type_distribution.rb
index fe38d8a8a2..bdafe34c13 100644
--- a/app/lib/annual_report/type_distribution.rb
+++ b/app/lib/annual_report/type_distribution.rb
@@ -5,7 +5,7 @@ class AnnualReport::TypeDistribution < AnnualReport::Source
     {
       type_distribution: {
         total: report_statuses.count,
-        reblogs: report_statuses.where.not(reblog_of_id: nil).count,
+        reblogs: report_statuses.only_reblogs.count,
         replies: report_statuses.where.not(in_reply_to_id: nil).where.not(in_reply_to_account_id: @account.id).count,
         standalone: report_statuses.without_replies.without_reblogs.count,
       },
diff --git a/app/models/account.rb b/app/models/account.rb
index d94e102583..25e644d303 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -89,6 +89,7 @@ class Account < ApplicationRecord
   include Account::FinderConcern
   include Account::Header
   include Account::Interactions
+  include Account::Mappings
   include Account::Merging
   include Account::Search
   include Account::Sensitizes
diff --git a/app/models/concerns/account/interactions.rb b/app/models/concerns/account/interactions.rb
index 33d51abed9..4eab55ca3e 100644
--- a/app/models/concerns/account/interactions.rb
+++ b/app/models/concerns/account/interactions.rb
@@ -3,74 +3,6 @@
 module Account::Interactions
   extend ActiveSupport::Concern
 
-  class_methods do
-    def following_map(target_account_ids, account_id)
-      Follow.where(target_account_id: target_account_ids, account_id: account_id).each_with_object({}) do |follow, mapping|
-        mapping[follow.target_account_id] = {
-          reblogs: follow.show_reblogs?,
-          notify: follow.notify?,
-          languages: follow.languages,
-        }
-      end
-    end
-
-    def followed_by_map(target_account_ids, account_id)
-      follow_mapping(Follow.where(account_id: target_account_ids, target_account_id: account_id), :account_id)
-    end
-
-    def blocking_map(target_account_ids, account_id)
-      follow_mapping(Block.where(target_account_id: target_account_ids, account_id: account_id), :target_account_id)
-    end
-
-    def blocked_by_map(target_account_ids, account_id)
-      follow_mapping(Block.where(account_id: target_account_ids, target_account_id: account_id), :account_id)
-    end
-
-    def muting_map(target_account_ids, account_id)
-      Mute.where(target_account_id: target_account_ids, account_id: account_id).each_with_object({}) do |mute, mapping|
-        mapping[mute.target_account_id] = {
-          notifications: mute.hide_notifications?,
-        }
-      end
-    end
-
-    def requested_map(target_account_ids, account_id)
-      FollowRequest.where(target_account_id: target_account_ids, account_id: account_id).each_with_object({}) do |follow_request, mapping|
-        mapping[follow_request.target_account_id] = {
-          reblogs: follow_request.show_reblogs?,
-          notify: follow_request.notify?,
-          languages: follow_request.languages,
-        }
-      end
-    end
-
-    def requested_by_map(target_account_ids, account_id)
-      follow_mapping(FollowRequest.where(account_id: target_account_ids, target_account_id: account_id), :account_id)
-    end
-
-    def endorsed_map(target_account_ids, account_id)
-      follow_mapping(AccountPin.where(account_id: account_id, target_account_id: target_account_ids), :target_account_id)
-    end
-
-    def account_note_map(target_account_ids, account_id)
-      AccountNote.where(target_account_id: target_account_ids, account_id: account_id).each_with_object({}) do |note, mapping|
-        mapping[note.target_account_id] = {
-          comment: note.comment,
-        }
-      end
-    end
-
-    def domain_blocking_map_by_domain(target_domains, account_id)
-      follow_mapping(AccountDomainBlock.where(account_id: account_id, domain: target_domains), :domain)
-    end
-
-    private
-
-    def follow_mapping(query, field)
-      query.pluck(field).index_with(true)
-    end
-  end
-
   included do
     # Follow relations
     has_many :follow_requests, dependent: :destroy
@@ -290,21 +222,6 @@ module Account::Interactions
     end
   end
 
-  def relations_map(account_ids, domains = nil, **options)
-    relations = {
-      blocked_by: Account.blocked_by_map(account_ids, id),
-      following: Account.following_map(account_ids, id),
-    }
-
-    return relations if options[:skip_blocking_and_muting]
-
-    relations.merge!({
-      blocking: Account.blocking_map(account_ids, id),
-      muting: Account.muting_map(account_ids, id),
-      domain_blocking_by_domain: Account.domain_blocking_map_by_domain(domains, id),
-    })
-  end
-
   def normalized_domain(domain)
     TagManager.instance.normalize_domain(domain)
   end
diff --git a/app/models/concerns/account/mappings.rb b/app/models/concerns/account/mappings.rb
new file mode 100644
index 0000000000..c4eddc1fc2
--- /dev/null
+++ b/app/models/concerns/account/mappings.rb
@@ -0,0 +1,108 @@
+# frozen_string_literal: true
+
+module Account::Mappings
+  extend ActiveSupport::Concern
+
+  class_methods do
+    def following_map(target_account_ids, account_id)
+      Follow.where(target_account_id: target_account_ids, account_id: account_id).each_with_object({}) do |follow, mapping|
+        mapping[follow.target_account_id] = {
+          reblogs: follow.show_reblogs?,
+          notify: follow.notify?,
+          languages: follow.languages,
+        }
+      end
+    end
+
+    def followed_by_map(target_account_ids, account_id)
+      build_mapping(
+        Follow.where(account_id: target_account_ids, target_account_id: account_id),
+        :account_id
+      )
+    end
+
+    def blocking_map(target_account_ids, account_id)
+      build_mapping(
+        Block.where(target_account_id: target_account_ids, account_id: account_id),
+        :target_account_id
+      )
+    end
+
+    def blocked_by_map(target_account_ids, account_id)
+      build_mapping(
+        Block.where(account_id: target_account_ids, target_account_id: account_id),
+        :account_id
+      )
+    end
+
+    def muting_map(target_account_ids, account_id)
+      Mute.where(target_account_id: target_account_ids, account_id: account_id).each_with_object({}) do |mute, mapping|
+        mapping[mute.target_account_id] = {
+          notifications: mute.hide_notifications?,
+        }
+      end
+    end
+
+    def requested_map(target_account_ids, account_id)
+      FollowRequest.where(target_account_id: target_account_ids, account_id: account_id).each_with_object({}) do |follow_request, mapping|
+        mapping[follow_request.target_account_id] = {
+          reblogs: follow_request.show_reblogs?,
+          notify: follow_request.notify?,
+          languages: follow_request.languages,
+        }
+      end
+    end
+
+    def requested_by_map(target_account_ids, account_id)
+      build_mapping(
+        FollowRequest.where(account_id: target_account_ids, target_account_id: account_id),
+        :account_id
+      )
+    end
+
+    def endorsed_map(target_account_ids, account_id)
+      build_mapping(
+        AccountPin.where(account_id: account_id, target_account_id: target_account_ids),
+        :target_account_id
+      )
+    end
+
+    def account_note_map(target_account_ids, account_id)
+      AccountNote.where(target_account_id: target_account_ids, account_id: account_id).each_with_object({}) do |note, mapping|
+        mapping[note.target_account_id] = {
+          comment: note.comment,
+        }
+      end
+    end
+
+    def domain_blocking_map_by_domain(target_domains, account_id)
+      build_mapping(
+        AccountDomainBlock.where(account_id: account_id, domain: target_domains),
+        :domain
+      )
+    end
+
+    private
+
+    def build_mapping(query, field)
+      query
+        .pluck(field)
+        .index_with(true)
+    end
+  end
+
+  def relations_map(account_ids, domains = nil, **options)
+    relations = {
+      blocked_by: Account.blocked_by_map(account_ids, id),
+      following: Account.following_map(account_ids, id),
+    }
+
+    return relations if options[:skip_blocking_and_muting]
+
+    relations.merge!({
+      blocking: Account.blocking_map(account_ids, id),
+      muting: Account.muting_map(account_ids, id),
+      domain_blocking_by_domain: Account.domain_blocking_map_by_domain(domains, id),
+    })
+  end
+end
diff --git a/app/models/rule.rb b/app/models/rule.rb
index c7b532fe5d..fc262d6b2f 100644
--- a/app/models/rule.rb
+++ b/app/models/rule.rb
@@ -42,6 +42,6 @@ class Rule < ApplicationRecord
 
   def translation_for(locale)
     @cached_translations ||= {}
-    @cached_translations[locale] ||= translations.where(language: [locale, locale.to_s.split('-').first]).order('length(language) desc').first || RuleTranslation.new(language: locale, text: text, hint: hint)
+    @cached_translations[locale] ||= translations.for_locale(locale).by_language_length.first || translations.build(language: locale, text: text, hint: hint)
   end
 end
diff --git a/app/models/rule_translation.rb b/app/models/rule_translation.rb
index 99991b2ee1..71e5773e5d 100644
--- a/app/models/rule_translation.rb
+++ b/app/models/rule_translation.rb
@@ -17,4 +17,7 @@ class RuleTranslation < ApplicationRecord
 
   validates :language, presence: true, uniqueness: { scope: :rule_id }
   validates :text, presence: true, length: { maximum: Rule::TEXT_SIZE_LIMIT }
+
+  scope :for_locale, ->(locale) { where(language: I18n::Locale::Tag.tag(locale).to_a.first) }
+  scope :by_language_length, -> { order(Arel.sql('LENGTH(LANGUAGE)').desc) }
 end
diff --git a/app/models/status.rb b/app/models/status.rb
index 402eaba291..b823718a31 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -123,6 +123,7 @@ class Status < ApplicationRecord
   scope :with_accounts, ->(ids) { where(id: ids).includes(:account) }
   scope :without_replies, -> { not_reply.or(reply_to_account) }
   scope :not_reply, -> { where(reply: false) }
+  scope :only_reblogs, -> { where.not(reblog_of_id: nil) }
   scope :reply_to_account, -> { where(arel_table[:in_reply_to_account_id].eq arel_table[:account_id]) }
   scope :without_reblogs, -> { where(statuses: { reblog_of_id: nil }) }
   scope :tagged_with, ->(tag_ids) { joins(:statuses_tags).where(statuses_tags: { tag_id: tag_ids }) }
diff --git a/app/workers/admin/distribute_announcement_notification_worker.rb b/app/workers/admin/distribute_announcement_notification_worker.rb
index a8b9a0bd94..636852ea1b 100644
--- a/app/workers/admin/distribute_announcement_notification_worker.rb
+++ b/app/workers/admin/distribute_announcement_notification_worker.rb
@@ -1,15 +1,18 @@
 # frozen_string_literal: true
 
 class Admin::DistributeAnnouncementNotificationWorker
-  include Sidekiq::Worker
+  include Sidekiq::IterableJob
+  include BulkMailer
 
-  def perform(announcement_id)
-    announcement = Announcement.find(announcement_id)
+  def build_enumerator(announcement_id, cursor:)
+    @announcement = Announcement.find(announcement_id)
 
-    announcement.scope_for_notification.find_each do |user|
-      UserMailer.announcement_published(user, announcement).deliver_later!
-    end
+    active_record_batches_enumerator(@announcement.scope_for_notification, cursor:)
   rescue ActiveRecord::RecordNotFound
-    true
+    nil
+  end
+
+  def each_iteration(batch_of_users, _announcement_id)
+    push_bulk_mailer(UserMailer, :announcement_published, batch_of_users.map { |user| [user, @announcement] })
   end
 end
diff --git a/app/workers/admin/distribute_terms_of_service_notification_worker.rb b/app/workers/admin/distribute_terms_of_service_notification_worker.rb
index 3e1f651060..5920f1594f 100644
--- a/app/workers/admin/distribute_terms_of_service_notification_worker.rb
+++ b/app/workers/admin/distribute_terms_of_service_notification_worker.rb
@@ -1,17 +1,22 @@
 # frozen_string_literal: true
 
 class Admin::DistributeTermsOfServiceNotificationWorker
-  include Sidekiq::Worker
+  include Sidekiq::IterableJob
+  include BulkMailer
 
-  def perform(terms_of_service_id)
-    terms_of_service = TermsOfService.find(terms_of_service_id)
+  def build_enumerator(terms_of_service_id, cursor:)
+    @terms_of_service = TermsOfService.find(terms_of_service_id)
 
-    terms_of_service.scope_for_interstitial.in_batches.update_all(require_tos_interstitial: true)
-
-    terms_of_service.scope_for_notification.find_each do |user|
-      UserMailer.terms_of_service_changed(user, terms_of_service).deliver_later!
-    end
+    active_record_batches_enumerator(@terms_of_service.scope_for_notification, cursor:)
   rescue ActiveRecord::RecordNotFound
-    true
+    nil
+  end
+
+  def each_iteration(batch_of_users, _terms_of_service_id)
+    push_bulk_mailer(UserMailer, :terms_of_service_changed, batch_of_users.map { |user| [user, @terms_of_service] })
+  end
+
+  def on_start
+    @terms_of_service.scope_for_interstitial.in_batches.update_all(require_tos_interstitial: true)
   end
 end
diff --git a/app/workers/concerns/bulk_mailer.rb b/app/workers/concerns/bulk_mailer.rb
new file mode 100644
index 0000000000..78cb3d82bc
--- /dev/null
+++ b/app/workers/concerns/bulk_mailer.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module BulkMailer
+  def push_bulk_mailer(mailer_class, mailer_method, args_array)
+    raise ArgumentError, "No method #{mailer_method} on class #{mailer_class.name}" unless mailer_class.respond_to?(mailer_method)
+
+    job_class = ActionMailer::MailDeliveryJob
+
+    Sidekiq::Client.push_bulk({
+      'class' => ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper,
+      'wrapped' => job_class,
+      'queue' => mailer_class.deliver_later_queue_name,
+      'args' => args_array.map do |args|
+        [
+          job_class.new(
+            mailer_class.name,
+            mailer_method.to_s,
+            'deliver_now',
+            args: args
+          ).serialize,
+        ]
+      end,
+    })
+  end
+end
diff --git a/config/application.rb b/config/application.rb
index 1195b9215c..82b08684ae 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -106,6 +106,7 @@ module Mastodon
     config.x.cache_buster = config_for(:cache_buster)
     config.x.captcha = config_for(:captcha)
     config.x.mastodon = config_for(:mastodon)
+    config.x.omniauth = config_for(:omniauth)
     config.x.translation = config_for(:translation)
     config.x.vapid = config_for(:vapid)
 
diff --git a/config/initializers/3_omniauth.rb b/config/initializers/3_omniauth.rb
index 607d9c15ba..1f6193abd1 100644
--- a/config/initializers/3_omniauth.rb
+++ b/config/initializers/3_omniauth.rb
@@ -10,7 +10,7 @@ end
 
 Devise.setup do |config|
   # CAS strategy
-  if ENV['CAS_ENABLED'] == 'true'
+  if Rails.configuration.x.omniauth.cas_enabled?
     cas_options = {}
     cas_options[:display_name] = ENV.fetch('CAS_DISPLAY_NAME', nil)
     cas_options[:url] = ENV['CAS_URL'] if ENV['CAS_URL']
@@ -39,7 +39,7 @@ Devise.setup do |config|
   end
 
   # SAML strategy
-  if ENV['SAML_ENABLED'] == 'true'
+  if Rails.configuration.x.omniauth.saml_enabled?
     saml_options = {}
     saml_options[:display_name] = ENV.fetch('SAML_DISPLAY_NAME', nil)
     saml_options[:assertion_consumer_service_url] = ENV['SAML_ACS_URL'] if ENV['SAML_ACS_URL']
@@ -71,7 +71,7 @@ Devise.setup do |config|
   end
 
   # OpenID Connect Strategy
-  if ENV['OIDC_ENABLED'] == 'true'
+  if Rails.configuration.x.omniauth.oidc_enabled?
     oidc_options = {}
     oidc_options[:display_name] = ENV.fetch('OIDC_DISPLAY_NAME', nil) # OPTIONAL
     oidc_options[:issuer] = ENV['OIDC_ISSUER'] if ENV['OIDC_ISSUER'] # NEED
diff --git a/config/omniauth.yml b/config/omniauth.yml
new file mode 100644
index 0000000000..a2aa692840
--- /dev/null
+++ b/config/omniauth.yml
@@ -0,0 +1,4 @@
+shared:
+  cas_enabled?: <%= ENV.fetch('CAS_ENABLED', 'false') == 'true' %>
+  oidc_enabled?: <%= ENV.fetch('OIDC_ENABLED', 'false') == 'true' %>
+  saml_enabled?: <%= ENV.fetch('SAML_ENABLED', 'false') == 'true' %>
diff --git a/eslint.config.mjs b/eslint.config.mjs
index 8c419cc079..9bf2f17084 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -277,7 +277,7 @@ export default tseslint.config([
             'app/javascript/**/*.stories.tsx',
             'app/javascript/**/*.test.ts',
             'app/javascript/**/*.test.tsx',
-            '.storybook/**/*.ts',
+            '.storybook/**/*',
           ],
         },
       ],
@@ -430,7 +430,7 @@ export default tseslint.config([
     },
   },
   {
-    files: ['**/*.stories.ts', '**/*.stories.tsx', '.storybook/**/*.ts'],
+    files: ['**/*.stories.ts', '**/*.stories.tsx', '.storybook/*'],
     rules: {
       'import/no-default-export': 'off',
     },
diff --git a/package.json b/package.json
index 793c5f40b0..3b61c89df2 100644
--- a/package.json
+++ b/package.json
@@ -175,6 +175,8 @@
     "globals": "^16.0.0",
     "husky": "^9.0.11",
     "lint-staged": "^16.0.0",
+    "msw": "^2.10.2",
+    "msw-storybook-addon": "^2.0.5",
     "playwright": "^1.52.0",
     "prettier": "^3.3.3",
     "react-test-renderer": "^18.2.0",
@@ -205,5 +207,10 @@
     "react-router-dom": {
       "optional": true
     }
+  },
+  "msw": {
+    "workerDirectory": [
+      ".storybook/static"
+    ]
   }
 }
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 06b7b78e64..994a475dd9 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -386,36 +386,6 @@ RSpec.describe Account do
     end
   end
 
-  describe '.following_map' do
-    it 'returns an hash' do
-      expect(described_class.following_map([], 1)).to be_a Hash
-    end
-  end
-
-  describe '.followed_by_map' do
-    it 'returns an hash' do
-      expect(described_class.followed_by_map([], 1)).to be_a Hash
-    end
-  end
-
-  describe '.blocking_map' do
-    it 'returns an hash' do
-      expect(described_class.blocking_map([], 1)).to be_a Hash
-    end
-  end
-
-  describe '.requested_map' do
-    it 'returns an hash' do
-      expect(described_class.requested_map([], 1)).to be_a Hash
-    end
-  end
-
-  describe '.requested_by_map' do
-    it 'returns an hash' do
-      expect(described_class.requested_by_map([], 1)).to be_a Hash
-    end
-  end
-
   describe 'MENTION_RE' do
     subject { described_class::MENTION_RE }
 
diff --git a/spec/models/concerns/account/interactions_spec.rb b/spec/models/concerns/account/interactions_spec.rb
index 010930fc66..e6e9076edb 100644
--- a/spec/models/concerns/account/interactions_spec.rb
+++ b/spec/models/concerns/account/interactions_spec.rb
@@ -4,101 +4,7 @@ require 'rails_helper'
 
 RSpec.describe Account::Interactions do
   let(:account)            { Fabricate(:account) }
-  let(:account_id)         { account.id }
-  let(:account_ids)        { [account_id] }
   let(:target_account)     { Fabricate(:account) }
-  let(:target_account_id)  { target_account.id }
-  let(:target_account_ids) { [target_account_id] }
-
-  describe '.following_map' do
-    subject { Account.following_map(target_account_ids, account_id) }
-
-    context 'when Account with Follow' do
-      it 'returns { target_account_id => true }' do
-        Fabricate(:follow, account: account, target_account: target_account)
-        expect(subject).to eq(target_account_id => { reblogs: true, notify: false, languages: nil })
-      end
-    end
-
-    context 'when Account with Follow but with reblogs disabled' do
-      it 'returns { target_account_id => { reblogs: false } }' do
-        Fabricate(:follow, account: account, target_account: target_account, show_reblogs: false)
-        expect(subject).to eq(target_account_id => { reblogs: false, notify: false, languages: nil })
-      end
-    end
-
-    context 'when Account without Follow' do
-      it 'returns {}' do
-        expect(subject).to eq({})
-      end
-    end
-  end
-
-  describe '.followed_by_map' do
-    subject { Account.followed_by_map(target_account_ids, account_id) }
-
-    context 'when Account with Follow' do
-      it 'returns { target_account_id => true }' do
-        Fabricate(:follow, account: target_account, target_account: account)
-        expect(subject).to eq(target_account_id => true)
-      end
-    end
-
-    context 'when Account without Follow' do
-      it 'returns {}' do
-        expect(subject).to eq({})
-      end
-    end
-  end
-
-  describe '.blocking_map' do
-    subject { Account.blocking_map(target_account_ids, account_id) }
-
-    context 'when Account with Block' do
-      it 'returns { target_account_id => true }' do
-        Fabricate(:block, account: account, target_account: target_account)
-        expect(subject).to eq(target_account_id => true)
-      end
-    end
-
-    context 'when Account without Block' do
-      it 'returns {}' do
-        expect(subject).to eq({})
-      end
-    end
-  end
-
-  describe '.muting_map' do
-    subject { Account.muting_map(target_account_ids, account_id) }
-
-    context 'when Account with Mute' do
-      before do
-        Fabricate(:mute, target_account: target_account, account: account, hide_notifications: hide)
-      end
-
-      context 'when Mute#hide_notifications?' do
-        let(:hide) { true }
-
-        it 'returns { target_account_id => { notifications: true } }' do
-          expect(subject).to eq(target_account_id => { notifications: true })
-        end
-      end
-
-      context 'when not Mute#hide_notifications?' do
-        let(:hide) { false }
-
-        it 'returns { target_account_id => { notifications: false } }' do
-          expect(subject).to eq(target_account_id => { notifications: false })
-        end
-      end
-    end
-
-    context 'when Account without Mute' do
-      it 'returns {}' do
-        expect(subject).to eq({})
-      end
-    end
-  end
 
   describe '#follow!' do
     it 'creates and returns Follow' do
diff --git a/spec/models/concerns/account/mappings_spec.rb b/spec/models/concerns/account/mappings_spec.rb
new file mode 100644
index 0000000000..18c936b892
--- /dev/null
+++ b/spec/models/concerns/account/mappings_spec.rb
@@ -0,0 +1,161 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Account::Mappings do
+  let(:account)            { Fabricate(:account) }
+  let(:account_id)         { account.id }
+  let(:account_ids)        { [account_id] }
+  let(:target_account)     { Fabricate(:account) }
+  let(:target_account_id)  { target_account.id }
+  let(:target_account_ids) { [target_account_id] }
+
+  describe '.following_map' do
+    subject { Account.following_map(target_account_ids, account_id) }
+
+    context 'when Account has a Follow' do
+      before { Fabricate(:follow, account: account, target_account: target_account) }
+
+      it { is_expected.to eq(target_account_id => { reblogs: true, notify: false, languages: nil }) }
+    end
+
+    context 'when Account is without Follow' do
+      it { is_expected.to eq({}) }
+    end
+
+    context 'when given empty values' do
+      let(:target_account_ids) { [] }
+      let(:account_id) { 1 }
+
+      it { is_expected.to be_a(Hash) }
+    end
+  end
+
+  describe '.followed_by_map' do
+    subject { Account.followed_by_map(target_account_ids, account_id) }
+
+    context 'when Account has a Follow' do
+      before { Fabricate(:follow, account: target_account, target_account: account) }
+
+      it { is_expected.to eq(target_account_id => true) }
+    end
+
+    context 'when Account is without Follow' do
+      it { is_expected.to eq({}) }
+    end
+
+    context 'when given empty values' do
+      let(:target_account_ids) { [] }
+      let(:account_id) { 1 }
+
+      it { is_expected.to be_a(Hash) }
+    end
+  end
+
+  describe '.blocking_map' do
+    subject { Account.blocking_map(target_account_ids, account_id) }
+
+    context 'when Account has a Block' do
+      before { Fabricate(:block, account: account, target_account: target_account) }
+
+      it { is_expected.to eq(target_account_id => true) }
+    end
+
+    context 'when Account is without Block' do
+      it { is_expected.to eq({}) }
+    end
+
+    context 'when given empty values' do
+      let(:target_account_ids) { [] }
+      let(:account_id) { 1 }
+
+      it { is_expected.to be_a(Hash) }
+    end
+  end
+
+  describe '.blocked_by_map' do
+    subject { Account.blocked_by_map(target_account_ids, account_id) }
+
+    context 'when given empty values' do
+      let(:target_account_ids) { [] }
+      let(:account_id) { 1 }
+
+      it { is_expected.to be_a(Hash) }
+    end
+  end
+
+  describe '.muting_map' do
+    subject { Account.muting_map(target_account_ids, account_id) }
+
+    context 'when Account has a Mute' do
+      before { Fabricate(:mute, target_account: target_account, account: account, hide_notifications: hide) }
+
+      context 'when Mute#hide_notifications?' do
+        let(:hide) { true }
+
+        it { is_expected.to eq(target_account_id => { notifications: true }) }
+      end
+
+      context 'when not Mute#hide_notifications?' do
+        let(:hide) { false }
+
+        it { is_expected.to eq(target_account_id => { notifications: false }) }
+      end
+    end
+
+    context 'when Account without Mute' do
+      it { is_expected.to eq({}) }
+    end
+
+    context 'when given empty values' do
+      let(:target_account_ids) { [] }
+      let(:account_id) { 1 }
+
+      it { is_expected.to be_a(Hash) }
+    end
+  end
+
+  describe '.requested_map' do
+    subject { Account.requested_map(target_account_ids, account_id) }
+
+    context 'when given empty values' do
+      let(:target_account_ids) { [] }
+      let(:account_id) { 1 }
+
+      it { is_expected.to be_a(Hash) }
+    end
+  end
+
+  describe '.requested_by_map' do
+    subject { Account.requested_by_map(target_account_ids, account_id) }
+
+    context 'when given empty values' do
+      let(:target_account_ids) { [] }
+      let(:account_id) { 1 }
+
+      it { is_expected.to be_a(Hash) }
+    end
+  end
+
+  describe '.endorsed_map' do
+    subject { Account.endorsed_map(target_account_ids, account_id) }
+
+    context 'when given empty values' do
+      let(:target_account_ids) { [] }
+      let(:account_id) { 1 }
+
+      it { is_expected.to be_a(Hash) }
+    end
+  end
+
+  describe '.account_note_map' do
+    subject { Account.account_note_map(target_account_ids, account_id) }
+
+    context 'when given empty values' do
+      let(:target_account_ids) { [] }
+      let(:account_id) { 1 }
+
+      it { is_expected.to be_a(Hash) }
+    end
+  end
+end
diff --git a/spec/models/rule_translation_spec.rb b/spec/models/rule_translation_spec.rb
new file mode 100644
index 0000000000..649bd5c0e4
--- /dev/null
+++ b/spec/models/rule_translation_spec.rb
@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe RuleTranslation do
+  describe 'Associations' do
+    it { is_expected.to belong_to(:rule) }
+  end
+
+  describe 'Validations' do
+    subject { Fabricate.build :rule_translation }
+
+    it { is_expected.to validate_presence_of(:language) }
+    it { is_expected.to validate_presence_of(:text) }
+    it { is_expected.to validate_length_of(:text).is_at_most(Rule::TEXT_SIZE_LIMIT) }
+    it { is_expected.to validate_uniqueness_of(:language).scoped_to(:rule_id) }
+  end
+
+  describe 'Scopes' do
+    describe '.for_locale' do
+      let!(:matching) { Fabricate :rule_translation, language: 'en' }
+      let!(:missing) { Fabricate :rule_translation, language: 'es' }
+
+      context 'when sent top-level string' do
+        it 'includes expected records' do
+          results = described_class.for_locale('en')
+
+          expect(results)
+            .to include(matching)
+            .and not_include(missing)
+        end
+      end
+
+      context 'when sent sub string' do
+        it 'includes expected records' do
+          results = described_class.for_locale('en-US')
+
+          expect(results)
+            .to include(matching)
+            .and not_include(missing)
+        end
+      end
+    end
+
+    describe '.by_language_length' do
+      let!(:top_level) { Fabricate :rule_translation, language: 'en' }
+      let!(:sub_level) { Fabricate :rule_translation, language: 'en-US' }
+
+      it 'returns results ordered by length' do
+        expect(described_class.by_language_length)
+          .to eq([sub_level, top_level])
+      end
+    end
+  end
+end
diff --git a/spec/models/status_spec.rb b/spec/models/status_spec.rb
index f3a4c78bfe..f79b9e9853 100644
--- a/spec/models/status_spec.rb
+++ b/spec/models/status_spec.rb
@@ -439,6 +439,17 @@ RSpec.describe Status do
     end
   end
 
+  describe '.only_reblogs' do
+    let!(:status) { Fabricate :status }
+    let!(:reblog) { Fabricate :status, reblog: Fabricate(:status) }
+
+    it 'returns the expected statuses' do
+      expect(described_class.only_reblogs)
+        .to include(reblog)
+        .and not_include(status)
+    end
+  end
+
   describe '.tagged_with' do
     let(:tag_cats) { Fabricate(:tag, name: 'cats') }
     let(:tag_dogs) { Fabricate(:tag, name: 'dogs') }
diff --git a/spec/requests/omniauth_callbacks_spec.rb b/spec/requests/omniauth_callbacks_spec.rb
index c71d025f9f..1be0f9843f 100644
--- a/spec/requests/omniauth_callbacks_spec.rb
+++ b/spec/requests/omniauth_callbacks_spec.rb
@@ -129,15 +129,15 @@ RSpec.describe 'OmniAuth callbacks' do
     end
   end
 
-  describe '#openid_connect', if: ENV['OIDC_ENABLED'] == 'true' && ENV['OIDC_SCOPE'].present? do
+  describe '#openid_connect', if: Rails.configuration.x.omniauth.oidc_enabled? && ENV['OIDC_SCOPE'].present? do
     it_behaves_like 'omniauth provider callbacks', :openid_connect
   end
 
-  describe '#cas', if: ENV['CAS_ENABLED'] == 'true' do
+  describe '#cas', if: Rails.configuration.x.omniauth.cas_enabled? do
     it_behaves_like 'omniauth provider callbacks', :cas
   end
 
-  describe '#saml', if: ENV['SAML_ENABLED'] == 'true' do
+  describe '#saml', if: Rails.configuration.x.omniauth.saml_enabled? do
     it_behaves_like 'omniauth provider callbacks', :saml
   end
 end
diff --git a/spec/system/admin/trends/tags_spec.rb b/spec/system/admin/trends/tags_spec.rb
index a7f00c0232..631288d4fc 100644
--- a/spec/system/admin/trends/tags_spec.rb
+++ b/spec/system/admin/trends/tags_spec.rb
@@ -7,6 +7,21 @@ RSpec.describe 'Admin::Trends::Tags' do
 
   before { sign_in current_user }
 
+  describe 'Viewing tags lists' do
+    context 'with a tag that needs review but is not trending' do
+      before { Fabricate :tag, requested_review_at: 5.minutes.ago }
+
+      it 'includes a correct pending tag count in navigation' do
+        visit admin_trends_tags_path
+
+        within('.filter-subset') do
+          expect(page)
+            .to have_content("#{I18n.t('admin.accounts.moderation.pending')} (0)")
+        end
+      end
+    end
+  end
+
   describe 'Performing batch updates' do
     context 'without selecting any records' do
       it 'displays a notice about selection' do
diff --git a/yarn.lock b/yarn.lock
index 866bef2e7c..9a811612cb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1189,6 +1189,34 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@bundled-es-modules/cookie@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "@bundled-es-modules/cookie@npm:2.0.1"
+  dependencies:
+    cookie: "npm:^0.7.2"
+  checksum: 10c0/dfac5e36127e827c5557b8577f17a8aa94c057baff6d38555917927b99da0ecf0b1357e7fedadc8853ecdbd4a8a7fa1f5e64111b2a656612f4a36376f5bdbe8d
+  languageName: node
+  linkType: hard
+
+"@bundled-es-modules/statuses@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "@bundled-es-modules/statuses@npm:1.0.1"
+  dependencies:
+    statuses: "npm:^2.0.1"
+  checksum: 10c0/c1a8ede3efa8da61ccda4b98e773582a9733edfbeeee569d4630785f8e018766202edb190a754a3ec7a7f6bd738e857829affc2fdb676b6dab4db1bb44e62785
+  languageName: node
+  linkType: hard
+
+"@bundled-es-modules/tough-cookie@npm:^0.1.6":
+  version: 0.1.6
+  resolution: "@bundled-es-modules/tough-cookie@npm:0.1.6"
+  dependencies:
+    "@types/tough-cookie": "npm:^4.0.5"
+    tough-cookie: "npm:^4.1.4"
+  checksum: 10c0/28bcac878bff6b34719ba3aa8341e9924772ee55de5487680ebe784981ec9fccb70ed5d46f563e2404855a04de606f9e56aa4202842d4f5835bc04a4fe820571
+  languageName: node
+  linkType: hard
+
 "@csstools/cascade-layer-name-parser@npm:^2.0.5":
   version: 2.0.5
   resolution: "@csstools/cascade-layer-name-parser@npm:2.0.5"
@@ -2412,6 +2440,61 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@inquirer/confirm@npm:^5.0.0":
+  version: 5.1.12
+  resolution: "@inquirer/confirm@npm:5.1.12"
+  dependencies:
+    "@inquirer/core": "npm:^10.1.13"
+    "@inquirer/type": "npm:^3.0.7"
+  peerDependencies:
+    "@types/node": ">=18"
+  peerDependenciesMeta:
+    "@types/node":
+      optional: true
+  checksum: 10c0/581aedfe8ce45e177fb4470a12f874f5162a4396636bf4140edc5812ffc8ed0d1fa7e9bbc3a7af618203089a084f489e0b32112947eedc6930a766fad992449e
+  languageName: node
+  linkType: hard
+
+"@inquirer/core@npm:^10.1.13":
+  version: 10.1.13
+  resolution: "@inquirer/core@npm:10.1.13"
+  dependencies:
+    "@inquirer/figures": "npm:^1.0.12"
+    "@inquirer/type": "npm:^3.0.7"
+    ansi-escapes: "npm:^4.3.2"
+    cli-width: "npm:^4.1.0"
+    mute-stream: "npm:^2.0.0"
+    signal-exit: "npm:^4.1.0"
+    wrap-ansi: "npm:^6.2.0"
+    yoctocolors-cjs: "npm:^2.1.2"
+  peerDependencies:
+    "@types/node": ">=18"
+  peerDependenciesMeta:
+    "@types/node":
+      optional: true
+  checksum: 10c0/919208a31307297d5a07a44b9ebe69a999ce1470b31a2e1b5a04538bc36624d2053808cd6c677637a61690af09bdbdd635bd7031b64e3dd86c5b18df3ca7c3f9
+  languageName: node
+  linkType: hard
+
+"@inquirer/figures@npm:^1.0.12":
+  version: 1.0.12
+  resolution: "@inquirer/figures@npm:1.0.12"
+  checksum: 10c0/08694288bdf9aa474571ca94272113a5ac443229519ce71447eba9eb7d5a2007901bdc3e92216d929a69746dcbac29683886c20e67b7864a7c7f6c59b99d3269
+  languageName: node
+  linkType: hard
+
+"@inquirer/type@npm:^3.0.7":
+  version: 3.0.7
+  resolution: "@inquirer/type@npm:3.0.7"
+  peerDependencies:
+    "@types/node": ">=18"
+  peerDependenciesMeta:
+    "@types/node":
+      optional: true
+  checksum: 10c0/bbaa33c274a10f70d3a587264e1db6dbfcd8c1458d595c54870d1d5b3fc113ab5063203ec12a098485bb9e2fcef1a87d8c6ecd2a6d44ddc575f5c4715379be5e
+  languageName: node
+  linkType: hard
+
 "@ioredis/commands@npm:^1.1.1":
   version: 1.2.0
   resolution: "@ioredis/commands@npm:1.2.0"
@@ -2611,6 +2694,8 @@ __metadata:
     lint-staged: "npm:^16.0.0"
     lodash: "npm:^4.17.21"
     marky: "npm:^1.2.5"
+    msw: "npm:^2.10.2"
+    msw-storybook-addon: "npm:^2.0.5"
     path-complete-extname: "npm:^1.0.0"
     playwright: "npm:^1.52.0"
     postcss-preset-env: "npm:^10.1.5"
@@ -2724,6 +2809,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@mswjs/interceptors@npm:^0.39.1":
+  version: 0.39.2
+  resolution: "@mswjs/interceptors@npm:0.39.2"
+  dependencies:
+    "@open-draft/deferred-promise": "npm:^2.2.0"
+    "@open-draft/logger": "npm:^0.3.0"
+    "@open-draft/until": "npm:^2.0.0"
+    is-node-process: "npm:^1.2.0"
+    outvariant: "npm:^1.4.3"
+    strict-event-emitter: "npm:^0.5.1"
+  checksum: 10c0/5698e33930a6b6e7cc78cf762291be60c91c6348faa22750acc41ef41528e7891e74541ccfb668ba470d964233fd2121c44d0224a2917eedeba2459cf0b78ca2
+  languageName: node
+  linkType: hard
+
 "@napi-rs/wasm-runtime@npm:^0.2.7":
   version: 0.2.7
   resolution: "@napi-rs/wasm-runtime@npm:0.2.7"
@@ -2784,6 +2883,30 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@open-draft/deferred-promise@npm:^2.2.0":
+  version: 2.2.0
+  resolution: "@open-draft/deferred-promise@npm:2.2.0"
+  checksum: 10c0/eafc1b1d0fc8edb5e1c753c5e0f3293410b40dde2f92688211a54806d4136887051f39b98c1950370be258483deac9dfd17cf8b96557553765198ef2547e4549
+  languageName: node
+  linkType: hard
+
+"@open-draft/logger@npm:^0.3.0":
+  version: 0.3.0
+  resolution: "@open-draft/logger@npm:0.3.0"
+  dependencies:
+    is-node-process: "npm:^1.2.0"
+    outvariant: "npm:^1.4.0"
+  checksum: 10c0/90010647b22e9693c16258f4f9adb034824d1771d3baa313057b9a37797f571181005bc50415a934eaf7c891d90ff71dcd7a9d5048b0b6bb438f31bef2c7c5c1
+  languageName: node
+  linkType: hard
+
+"@open-draft/until@npm:^2.0.0, @open-draft/until@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "@open-draft/until@npm:2.1.0"
+  checksum: 10c0/61d3f99718dd86bb393fee2d7a785f961dcaf12f2055f0c693b27f4d0cd5f7a03d498a6d9289773b117590d794a43cd129366fd8e99222e4832f67b1653d54cf
+  languageName: node
+  linkType: hard
+
 "@opentelemetry/api@npm:^1.4.0":
   version: 1.6.0
   resolution: "@opentelemetry/api@npm:1.6.0"
@@ -3091,10 +3214,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rolldown/pluginutils@npm:1.0.0-beta.11":
-  version: 1.0.0-beta.11
-  resolution: "@rolldown/pluginutils@npm:1.0.0-beta.11"
-  checksum: 10c0/140088e33a4dd3bc21d06fa0cbe79b52e95487c9737d425aa5729e52446dc70f066fbce632489a53e45bb567f1e86c19835677c98fe5d4123ae1e2fef53f8d97
+"@rolldown/pluginutils@npm:1.0.0-beta.19":
+  version: 1.0.0-beta.19
+  resolution: "@rolldown/pluginutils@npm:1.0.0-beta.19"
+  checksum: 10c0/e4205df56e6231a347ac601d044af365639741d51b5bea4e91ecc37e19e9777cb79d1daa924b8709ddf1f743ed6922e4e68e2445126434c4d420d9f4416f4feb
   languageName: node
   linkType: hard
 
@@ -3789,6 +3912,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/cookie@npm:^0.6.0":
+  version: 0.6.0
+  resolution: "@types/cookie@npm:0.6.0"
+  checksum: 10c0/5b326bd0188120fb32c0be086b141b1481fec9941b76ad537f9110e10d61ee2636beac145463319c71e4be67a17e85b81ca9e13ceb6e3bb63b93d16824d6c149
+  languageName: node
+  linkType: hard
+
 "@types/cors@npm:^2.8.16":
   version: 2.8.18
   resolution: "@types/cors@npm:2.8.18"
@@ -4204,6 +4334,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/statuses@npm:^2.0.4":
+  version: 2.0.6
+  resolution: "@types/statuses@npm:2.0.6"
+  checksum: 10c0/dd88c220b0e2c6315686289525fd61472d2204d2e4bef4941acfb76bda01d3066f749ac74782aab5b537a45314fcd7d6261eefa40b6ec872691f5803adaa608d
+  languageName: node
+  linkType: hard
+
+"@types/tough-cookie@npm:^4.0.5":
+  version: 4.0.5
+  resolution: "@types/tough-cookie@npm:4.0.5"
+  checksum: 10c0/68c6921721a3dcb40451543db2174a145ef915bc8bcbe7ad4e59194a0238e776e782b896c7a59f4b93ac6acefca9161fccb31d1ce3b3445cb6faa467297fb473
+  languageName: node
+  linkType: hard
+
 "@types/trusted-types@npm:^2.0.2":
   version: 2.0.3
   resolution: "@types/trusted-types@npm:2.0.3"
@@ -4580,18 +4724,18 @@ __metadata:
   linkType: hard
 
 "@vitejs/plugin-react@npm:^4.2.1":
-  version: 4.5.2
-  resolution: "@vitejs/plugin-react@npm:4.5.2"
+  version: 4.6.0
+  resolution: "@vitejs/plugin-react@npm:4.6.0"
   dependencies:
     "@babel/core": "npm:^7.27.4"
     "@babel/plugin-transform-react-jsx-self": "npm:^7.27.1"
     "@babel/plugin-transform-react-jsx-source": "npm:^7.27.1"
-    "@rolldown/pluginutils": "npm:1.0.0-beta.11"
+    "@rolldown/pluginutils": "npm:1.0.0-beta.19"
     "@types/babel__core": "npm:^7.20.5"
     react-refresh: "npm:^0.17.0"
   peerDependencies:
     vite: ^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0-beta.0
-  checksum: 10c0/37c58e6a9c953ab27eb6de42f0d317d26901117d4e4bec067b098c48353065888d240b819efc5b47e325f83532305d3cc51996fd3eb53f8649b199ecc4424746
+  checksum: 10c0/73b8f271978a0337debb255afd1667f49c2018c118962a8613120383375c4038255a5315cee2ef210dc7fd07cd30d5b12271077ad47db29980f8156b8a49be2c
   languageName: node
   linkType: hard
 
@@ -4885,6 +5029,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ansi-escapes@npm:^4.3.2":
+  version: 4.3.2
+  resolution: "ansi-escapes@npm:4.3.2"
+  dependencies:
+    type-fest: "npm:^0.21.3"
+  checksum: 10c0/da917be01871525a3dfcf925ae2977bc59e8c513d4423368645634bf5d4ceba5401574eb705c1e92b79f7292af5a656f78c5725a4b0e1cec97c4b413705c1d50
+  languageName: node
+  linkType: hard
+
 "ansi-escapes@npm:^7.0.0":
   version: 7.0.0
   resolution: "ansi-escapes@npm:7.0.0"
@@ -5668,6 +5821,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cli-width@npm:^4.1.0":
+  version: 4.1.0
+  resolution: "cli-width@npm:4.1.0"
+  checksum: 10c0/1fbd56413578f6117abcaf858903ba1f4ad78370a4032f916745fa2c7e390183a9d9029cf837df320b0fdce8137668e522f60a30a5f3d6529ff3872d265a955f
+  languageName: node
+  linkType: hard
+
 "cliui@npm:^8.0.1":
   version: 8.0.1
   resolution: "cliui@npm:8.0.1"
@@ -5818,6 +5978,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cookie@npm:^0.7.2":
+  version: 0.7.2
+  resolution: "cookie@npm:0.7.2"
+  checksum: 10c0/9596e8ccdbf1a3a88ae02cf5ee80c1c50959423e1022e4e60b91dd87c622af1da309253d8abdb258fb5e3eacb4f08e579dc58b4897b8087574eee0fd35dfa5d2
+  languageName: node
+  linkType: hard
+
 "core-js-compat@npm:^3.40.0":
   version: 3.41.0
   resolution: "core-js-compat@npm:3.41.0"
@@ -7729,6 +7896,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"graphql@npm:^16.8.1":
+  version: 16.11.0
+  resolution: "graphql@npm:16.11.0"
+  checksum: 10c0/124da7860a2292e9acf2fed0c71fc0f6a9b9ca865d390d112bdd563c1f474357141501c12891f4164fe984315764736ad67f705219c62f7580681d431a85db88
+  languageName: node
+  linkType: hard
+
 "has-bigints@npm:^1.0.2":
   version: 1.0.2
   resolution: "has-bigints@npm:1.0.2"
@@ -7786,6 +7960,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"headers-polyfill@npm:^4.0.2":
+  version: 4.0.3
+  resolution: "headers-polyfill@npm:4.0.3"
+  checksum: 10c0/53e85b2c6385f8d411945fb890c5369f1469ce8aa32a6e8d28196df38568148de640c81cf88cbc7c67767103dd9acba48f4f891982da63178fc6e34560022afe
+  languageName: node
+  linkType: hard
+
 "help-me@npm:^5.0.0":
   version: 5.0.0
   resolution: "help-me@npm:5.0.0"
@@ -8280,6 +8461,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-node-process@npm:^1.0.1, is-node-process@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "is-node-process@npm:1.2.0"
+  checksum: 10c0/5b24fda6776d00e42431d7bcd86bce81cb0b6cabeb944142fe7b077a54ada2e155066ad06dbe790abdb397884bdc3151e04a9707b8cd185099efbc79780573ed
+  languageName: node
+  linkType: hard
+
 "is-number-object@npm:^1.1.1":
   version: 1.1.1
   resolution: "is-number-object@npm:1.1.1"
@@ -9360,6 +9548,57 @@ __metadata:
   languageName: node
   linkType: hard
 
+"msw-storybook-addon@npm:^2.0.5":
+  version: 2.0.5
+  resolution: "msw-storybook-addon@npm:2.0.5"
+  dependencies:
+    is-node-process: "npm:^1.0.1"
+  peerDependencies:
+    msw: ^2.0.0
+  checksum: 10c0/3f26fd4a8a6b1b4da165a8940eca4da2e175a69036a1c85c07ec1952fbb595252db689c4380d8f88ec1cfaa66a6696e90ef0c26b2d1bf17c30092b81247d1d40
+  languageName: node
+  linkType: hard
+
+"msw@npm:^2.10.2":
+  version: 2.10.2
+  resolution: "msw@npm:2.10.2"
+  dependencies:
+    "@bundled-es-modules/cookie": "npm:^2.0.1"
+    "@bundled-es-modules/statuses": "npm:^1.0.1"
+    "@bundled-es-modules/tough-cookie": "npm:^0.1.6"
+    "@inquirer/confirm": "npm:^5.0.0"
+    "@mswjs/interceptors": "npm:^0.39.1"
+    "@open-draft/deferred-promise": "npm:^2.2.0"
+    "@open-draft/until": "npm:^2.1.0"
+    "@types/cookie": "npm:^0.6.0"
+    "@types/statuses": "npm:^2.0.4"
+    graphql: "npm:^16.8.1"
+    headers-polyfill: "npm:^4.0.2"
+    is-node-process: "npm:^1.2.0"
+    outvariant: "npm:^1.4.3"
+    path-to-regexp: "npm:^6.3.0"
+    picocolors: "npm:^1.1.1"
+    strict-event-emitter: "npm:^0.5.1"
+    type-fest: "npm:^4.26.1"
+    yargs: "npm:^17.7.2"
+  peerDependencies:
+    typescript: ">= 4.8.x"
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  bin:
+    msw: cli/index.js
+  checksum: 10c0/fb44961e17e12864b4764b4c015f6ce7c907081f8dcd237ecd635eab00b787847406fbd36a2bcf2ef4c21114a3610ac03c7f93f3080f509a69b0c1c5285fd683
+  languageName: node
+  linkType: hard
+
+"mute-stream@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "mute-stream@npm:2.0.0"
+  checksum: 10c0/2cf48a2087175c60c8dcdbc619908b49c07f7adcfc37d29236b0c5c612d6204f789104c98cc44d38acab7b3c96f4a3ec2cfdc4934d0738d876dbefa2a12c69f4
+  languageName: node
+  linkType: hard
+
 "nano-spawn@npm:^1.0.0":
   version: 1.0.1
   resolution: "nano-spawn@npm:1.0.1"
@@ -9642,6 +9881,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"outvariant@npm:^1.4.0, outvariant@npm:^1.4.3":
+  version: 1.4.3
+  resolution: "outvariant@npm:1.4.3"
+  checksum: 10c0/5976ca7740349cb8c71bd3382e2a762b1aeca6f33dc984d9d896acdf3c61f78c3afcf1bfe9cc633a7b3c4b295ec94d292048f83ea2b2594fae4496656eba992c
+  languageName: node
+  linkType: hard
+
 "own-keys@npm:^1.0.1":
   version: 1.0.1
   resolution: "own-keys@npm:1.0.1"
@@ -9795,6 +10041,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"path-to-regexp@npm:^6.3.0":
+  version: 6.3.0
+  resolution: "path-to-regexp@npm:6.3.0"
+  checksum: 10c0/73b67f4638b41cde56254e6354e46ae3a2ebc08279583f6af3d96fe4664fc75788f74ed0d18ca44fa4a98491b69434f9eee73b97bb5314bd1b5adb700f5c18d6
+  languageName: node
+  linkType: hard
+
 "path-type@npm:^4.0.0":
   version: 4.0.0
   resolution: "path-type@npm:4.0.0"
@@ -9816,17 +10069,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pg-cloudflare@npm:^1.2.5":
-  version: 1.2.5
-  resolution: "pg-cloudflare@npm:1.2.5"
-  checksum: 10c0/48b9105ef027c7b3f57ef88ceaec3634cd82120059bd68273cce06989a1ec547e0b0fbb5d1afdd0711824f409c8b410f9bdec2f6c8034728992d3658c0b36f86
+"pg-cloudflare@npm:^1.2.6":
+  version: 1.2.6
+  resolution: "pg-cloudflare@npm:1.2.6"
+  checksum: 10c0/db339518ed763982c45a94c96cedba1b25819fe32e9d3a4df6f82cd647c716ff9b5009f3c8b90f2940b0a1889387710ef764c9e3e7ddd8397d217309d663a2c8
   languageName: node
   linkType: hard
 
-"pg-connection-string@npm:^2.6.0, pg-connection-string@npm:^2.9.0":
-  version: 2.9.0
-  resolution: "pg-connection-string@npm:2.9.0"
-  checksum: 10c0/7145d00688200685a9d9931a7fc8d61c75f348608626aef88080ece956ceb4ff1cbdee29c3284e41b7a3345bab0e4f50f9edc256e270bfa3a563af4ea78bb490
+"pg-connection-string@npm:^2.6.0, pg-connection-string@npm:^2.9.1":
+  version: 2.9.1
+  resolution: "pg-connection-string@npm:2.9.1"
+  checksum: 10c0/9a646529bbc0843806fc5de98ce93735a4612b571f11867178a85665d11989a827e6fd157388ca0e34ec948098564fce836c178cfd499b9f0e8cd9972b8e2e5c
   languageName: node
   linkType: hard
 
@@ -9837,19 +10090,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pg-pool@npm:^3.10.0":
-  version: 3.10.0
-  resolution: "pg-pool@npm:3.10.0"
+"pg-pool@npm:^3.10.1":
+  version: 3.10.1
+  resolution: "pg-pool@npm:3.10.1"
   peerDependencies:
     pg: ">=8.0"
-  checksum: 10c0/b36162dc98c0ad88cd26f3d65f3e3932c3f870abe7a88905f16fc98282e8131692903e482720ebc9698cb08851c9b19242ff16a50af7f9434c8bb0b5d33a9a9a
+  checksum: 10c0/a00916b7df64226cc597fe769e3a757ff9b11562dc87ce5b0a54101a18c1fe282daaa2accaf27221e81e1e4cdf4da6a33dab09614734d32904d6c4e11c44a079
   languageName: node
   linkType: hard
 
-"pg-protocol@npm:*, pg-protocol@npm:^1.10.0":
-  version: 1.10.0
-  resolution: "pg-protocol@npm:1.10.0"
-  checksum: 10c0/7d0d64fe9df50262d907fd476454e1e36f41f5f66044c3ba6aa773fb8add1d350a9c162306e5c33e99bdfbdcc1140dd4ca74f66eda41d0aaceb5853244dcdb65
+"pg-protocol@npm:*, pg-protocol@npm:^1.10.2":
+  version: 1.10.2
+  resolution: "pg-protocol@npm:1.10.2"
+  checksum: 10c0/3f9b5aba3f356190738ea25ecded3cd033cd2218789acf9c67b75788932c4b594eeb7043481822b69eaae4d84401e00142a2ef156297a8347987a78a52afd50e
   languageName: node
   linkType: hard
 
@@ -9867,13 +10120,13 @@ __metadata:
   linkType: hard
 
 "pg@npm:^8.5.0":
-  version: 8.16.0
-  resolution: "pg@npm:8.16.0"
+  version: 8.16.2
+  resolution: "pg@npm:8.16.2"
   dependencies:
-    pg-cloudflare: "npm:^1.2.5"
-    pg-connection-string: "npm:^2.9.0"
-    pg-pool: "npm:^3.10.0"
-    pg-protocol: "npm:^1.10.0"
+    pg-cloudflare: "npm:^1.2.6"
+    pg-connection-string: "npm:^2.9.1"
+    pg-pool: "npm:^3.10.1"
+    pg-protocol: "npm:^1.10.2"
     pg-types: "npm:2.2.0"
     pgpass: "npm:1.0.5"
   peerDependencies:
@@ -9884,7 +10137,7 @@ __metadata:
   peerDependenciesMeta:
     pg-native:
       optional: true
-  checksum: 10c0/24542229c7e5cbf69d654de32e8cdc8302c73f1338e56728543cb16364fb319d5689e03fa704b69a208105c7065c867cfccb9dbccccea2020bb5c64ead785713
+  checksum: 10c0/e444103fda2fa236bb7951e534bbce52d81df8f0ca43b36cdd32da2e558946ae011fa6a0fcfea2e48d935addba821868e76d3f4f670b313f639a3d24fcd420af
   languageName: node
   linkType: hard
 
@@ -10597,6 +10850,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"psl@npm:^1.1.33":
+  version: 1.15.0
+  resolution: "psl@npm:1.15.0"
+  dependencies:
+    punycode: "npm:^2.3.1"
+  checksum: 10c0/d8d45a99e4ca62ca12ac3c373e63d80d2368d38892daa40cfddaa1eb908be98cd549ac059783ef3a56cfd96d57ae8e2fd9ae53d1378d90d42bc661ff924e102a
+  languageName: node
+  linkType: hard
+
 "pump@npm:^3.0.0":
   version: 3.0.0
   resolution: "pump@npm:3.0.0"
@@ -10614,7 +10876,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"punycode@npm:^2.1.0, punycode@npm:^2.3.0, punycode@npm:^2.3.1":
+"punycode@npm:^2.1.0, punycode@npm:^2.1.1, punycode@npm:^2.3.0, punycode@npm:^2.3.1":
   version: 2.3.1
   resolution: "punycode@npm:2.3.1"
   checksum: 10c0/14f76a8206bc3464f794fb2e3d3cc665ae416c01893ad7a02b23766eb07159144ee612ad67af5e84fa4479ccfe67678c4feb126b0485651b302babf66f04f9e9
@@ -10630,6 +10892,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"querystringify@npm:^2.1.1":
+  version: 2.2.0
+  resolution: "querystringify@npm:2.2.0"
+  checksum: 10c0/3258bc3dbdf322ff2663619afe5947c7926a6ef5fb78ad7d384602974c467fadfc8272af44f5eb8cddd0d011aae8fabf3a929a8eee4b86edcc0a21e6bd10f9aa
+  languageName: node
+  linkType: hard
+
 "queue-microtask@npm:^1.2.2":
   version: 1.2.3
   resolution: "queue-microtask@npm:1.2.3"
@@ -11324,6 +11593,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"requires-port@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "requires-port@npm:1.0.0"
+  checksum: 10c0/b2bfdd09db16c082c4326e573a82c0771daaf7b53b9ce8ad60ea46aa6e30aaf475fe9b164800b89f93b748d2c234d8abff945d2551ba47bf5698e04cd7713267
+  languageName: node
+  linkType: hard
+
 "reselect@npm:^5.1.0":
   version: 5.1.0
   resolution: "reselect@npm:5.1.0"
@@ -12164,6 +12440,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"statuses@npm:^2.0.1":
+  version: 2.0.2
+  resolution: "statuses@npm:2.0.2"
+  checksum: 10c0/a9947d98ad60d01f6b26727570f3bcceb6c8fa789da64fe6889908fe2e294d57503b14bf2b5af7605c2d36647259e856635cd4c49eab41667658ec9d0080ec3f
+  languageName: node
+  linkType: hard
+
 "std-env@npm:^3.9.0":
   version: 3.9.0
   resolution: "std-env@npm:3.9.0"
@@ -12204,6 +12487,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"strict-event-emitter@npm:^0.5.1":
+  version: 0.5.1
+  resolution: "strict-event-emitter@npm:0.5.1"
+  checksum: 10c0/f5228a6e6b6393c57f52f62e673cfe3be3294b35d6f7842fc24b172ae0a6e6c209fa83241d0e433fc267c503bc2f4ffdbe41a9990ff8ffd5ac425ec0489417f7
+  languageName: node
+  linkType: hard
+
 "string-argv@npm:^0.3.2":
   version: 0.3.2
   resolution: "string-argv@npm:0.3.2"
@@ -12837,6 +13127,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tough-cookie@npm:^4.1.4":
+  version: 4.1.4
+  resolution: "tough-cookie@npm:4.1.4"
+  dependencies:
+    psl: "npm:^1.1.33"
+    punycode: "npm:^2.1.1"
+    universalify: "npm:^0.2.0"
+    url-parse: "npm:^1.5.3"
+  checksum: 10c0/aca7ff96054f367d53d1e813e62ceb7dd2eda25d7752058a74d64b7266fd07be75908f3753a32ccf866a2f997604b414cfb1916d6e7f69bc64d9d9939b0d6c45
+  languageName: node
+  linkType: hard
+
 "tough-cookie@npm:^5.1.1":
   version: 5.1.2
   resolution: "tough-cookie@npm:5.1.2"
@@ -12973,6 +13275,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"type-fest@npm:^0.21.3":
+  version: 0.21.3
+  resolution: "type-fest@npm:0.21.3"
+  checksum: 10c0/902bd57bfa30d51d4779b641c2bc403cdf1371fb9c91d3c058b0133694fcfdb817aef07a47f40faf79039eecbaa39ee9d3c532deff244f3a19ce68cea71a61e8
+  languageName: node
+  linkType: hard
+
+"type-fest@npm:^4.26.1":
+  version: 4.41.0
+  resolution: "type-fest@npm:4.41.0"
+  checksum: 10c0/f5ca697797ed5e88d33ac8f1fec21921839871f808dc59345c9cf67345bfb958ce41bd821165dbf3ae591cedec2bf6fe8882098dfdd8dc54320b859711a2c1e4
+  languageName: node
+  linkType: hard
+
 "type-is@npm:~1.6.18":
   version: 1.6.18
   resolution: "type-is@npm:1.6.18"
@@ -13190,6 +13506,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"universalify@npm:^0.2.0":
+  version: 0.2.0
+  resolution: "universalify@npm:0.2.0"
+  checksum: 10c0/cedbe4d4ca3967edf24c0800cfc161c5a15e240dac28e3ce575c689abc11f2c81ccc6532c8752af3b40f9120fb5e454abecd359e164f4f6aa44c29cd37e194fe
+  languageName: node
+  linkType: hard
+
 "universalify@npm:^2.0.0":
   version: 2.0.1
   resolution: "universalify@npm:2.0.1"
@@ -13298,6 +13621,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"url-parse@npm:^1.5.3":
+  version: 1.5.10
+  resolution: "url-parse@npm:1.5.10"
+  dependencies:
+    querystringify: "npm:^2.1.1"
+    requires-port: "npm:^1.0.0"
+  checksum: 10c0/bd5aa9389f896974beb851c112f63b466505a04b4807cea2e5a3b7092f6fbb75316f0491ea84e44f66fed55f1b440df5195d7e3a8203f64fcefa19d182f5be87
+  languageName: node
+  linkType: hard
+
 "use-composed-ref@npm:^1.3.0":
   version: 1.3.0
   resolution: "use-composed-ref@npm:1.3.0"
@@ -14060,6 +14393,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"wrap-ansi@npm:^6.2.0":
+  version: 6.2.0
+  resolution: "wrap-ansi@npm:6.2.0"
+  dependencies:
+    ansi-styles: "npm:^4.0.0"
+    string-width: "npm:^4.1.0"
+    strip-ansi: "npm:^6.0.0"
+  checksum: 10c0/baad244e6e33335ea24e86e51868fe6823626e3a3c88d9a6674642afff1d34d9a154c917e74af8d845fd25d170c4ea9cf69a47133c3f3656e1252b3d462d9f6c
+  languageName: node
+  linkType: hard
+
 "wrap-ansi@npm:^8.1.0":
   version: 8.1.0
   resolution: "wrap-ansi@npm:8.1.0"
@@ -14179,7 +14523,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yargs@npm:^17.5.1":
+"yargs@npm:^17.5.1, yargs@npm:^17.7.2":
   version: 17.7.2
   resolution: "yargs@npm:17.7.2"
   dependencies:
@@ -14201,6 +14545,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"yoctocolors-cjs@npm:^2.1.2":
+  version: 2.1.2
+  resolution: "yoctocolors-cjs@npm:2.1.2"
+  checksum: 10c0/a0e36eb88fea2c7981eab22d1ba45e15d8d268626e6c4143305e2c1628fa17ebfaa40cd306161a8ce04c0a60ee0262058eab12567493d5eb1409780853454c6f
+  languageName: node
+  linkType: hard
+
 "zlibjs@npm:^0.3.1":
   version: 0.3.1
   resolution: "zlibjs@npm:0.3.1"