diff --git a/.github/renovate.json5 b/.github/renovate.json5
index ddca0bc239..076b2f9b1e 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -154,9 +154,15 @@
       groupName: 'opentelemetry-ruby (non-major)',
     },
     {
-      // Group Playwright Ruby & JS deps in the same PR, as they need to be in sync
-      matchManagers: ['bundler', 'npm'],
-      matchPackageNames: ['playwright-ruby-client', 'playwright'],
+      // The ruby portion of the Playwright group
+      matchManagers: ['bundler'],
+      matchPackageNames: ['playwright-ruby-client'],
+      groupName: 'Playwright',
+    },
+    {
+      // The node portion of the Playwright group
+      matchManagers: ['npm'],
+      matchPackageNames: ['playwright'],
       groupName: 'Playwright',
     },
     // Add labels depending on package manager
diff --git a/.rubocop/layout.yml b/.rubocop/layout.yml
index 487879ca2c..9396674995 100644
--- a/.rubocop/layout.yml
+++ b/.rubocop/layout.yml
@@ -4,3 +4,6 @@ Layout/FirstHashElementIndentation:
 
 Layout/LineLength:
   Max: 300 # Default of 120 causes a duplicate entry in generated todo file
+
+Layout/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
diff --git a/Gemfile.lock b/Gemfile.lock
index d734898522..31e331ea6e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -470,7 +470,7 @@ GEM
     net-smtp (0.5.1)
       net-protocol
     nio4r (2.7.5)
-    nokogiri (1.19.0)
+    nokogiri (1.19.1)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oj (3.16.15)
@@ -631,7 +631,7 @@ GEM
       activesupport (>= 3.0.0)
     raabro (1.4.0)
     racc (1.8.1)
-    rack (3.2.4)
+    rack (3.2.5)
     rack-attack (6.8.0)
       rack (>= 1.0, < 4)
     rack-cors (3.0.0)
@@ -741,7 +741,7 @@ GEM
     rspec-mocks (3.13.7)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (8.0.2)
+    rspec-rails (8.0.3)
       actionpack (>= 7.2)
       activesupport (>= 7.2)
       railties (>= 7.2)
@@ -755,7 +755,7 @@ GEM
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 9)
     rspec-support (3.13.7)
-    rubocop (1.84.0)
+    rubocop (1.84.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
diff --git a/app/chewy/public_statuses_index.rb b/app/chewy/public_statuses_index.rb
index 09a4dfc093..c847b0283d 100644
--- a/app/chewy/public_statuses_index.rb
+++ b/app/chewy/public_statuses_index.rb
@@ -53,9 +53,9 @@ class PublicStatusesIndex < Chewy::Index
   }
 
   index_scope ::Status.unscoped
-                      .kept
-                      .indexable
-                      .includes(:media_attachments, :preloadable_poll, :tags, preview_cards_status: :preview_card)
+    .kept
+    .indexable
+    .includes(:media_attachments, :preloadable_poll, :tags, preview_cards_status: :preview_card)
 
   root date_detection: false do
     field(:id, type: 'long')
diff --git a/app/controllers/admin/fasp/debug/callbacks_controller.rb b/app/controllers/admin/fasp/debug/callbacks_controller.rb
index 28aba5e489..acba4c51d8 100644
--- a/app/controllers/admin/fasp/debug/callbacks_controller.rb
+++ b/app/controllers/admin/fasp/debug/callbacks_controller.rb
@@ -5,8 +5,8 @@ class Admin::Fasp::Debug::CallbacksController < Admin::BaseController
     authorize [:admin, :fasp, :provider], :update?
 
     @callbacks = Fasp::DebugCallback
-                 .includes(:fasp_provider)
-                 .order(created_at: :desc)
+      .includes(:fasp_provider)
+      .order(created_at: :desc)
   end
 
   def destroy
diff --git a/app/controllers/api/v1/blocks_controller.rb b/app/controllers/api/v1/blocks_controller.rb
index d7516c927b..e79b292e5f 100644
--- a/app/controllers/api/v1/blocks_controller.rb
+++ b/app/controllers/api/v1/blocks_controller.rb
@@ -18,14 +18,14 @@ class Api::V1::BlocksController < Api::BaseController
 
   def paginated_blocks
     @paginated_blocks ||= Block.eager_load(target_account: [:account_stat, :user])
-                               .joins(:target_account)
-                               .merge(Account.without_suspended)
-                               .where(account: current_account)
-                               .paginate_by_max_id(
-                                 limit_param(DEFAULT_ACCOUNTS_LIMIT),
-                                 params[:max_id],
-                                 params[:since_id]
-                               )
+      .joins(:target_account)
+      .merge(Account.without_suspended)
+      .where(account: current_account)
+      .paginate_by_max_id(
+        limit_param(DEFAULT_ACCOUNTS_LIMIT),
+        params[:max_id],
+        params[:since_id]
+      )
   end
 
   def next_path
diff --git a/app/controllers/api/v1/conversations_controller.rb b/app/controllers/api/v1/conversations_controller.rb
index 60db082a8e..5f09d0c886 100644
--- a/app/controllers/api/v1/conversations_controller.rb
+++ b/app/controllers/api/v1/conversations_controller.rb
@@ -37,20 +37,20 @@ class Api::V1::ConversationsController < Api::BaseController
 
   def paginated_conversations
     AccountConversation.where(account: current_account)
-                       .includes(
-                         account: [:account_stat, user: :role],
-                         last_status: [
-                           :media_attachments,
-                           :status_stat,
-                           :tags,
-                           {
-                             preview_cards_status: { preview_card: { author_account: [:account_stat, user: :role] } },
-                             active_mentions: :account,
-                             account: [:account_stat, user: :role],
-                           },
-                         ]
-                       )
-                       .to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
+      .includes(
+        account: [:account_stat, user: :role],
+        last_status: [
+          :media_attachments,
+          :status_stat,
+          :tags,
+          {
+            preview_cards_status: { preview_card: { author_account: [:account_stat, user: :role] } },
+            active_mentions: :account,
+            account: [:account_stat, user: :role],
+          },
+        ]
+      )
+      .to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
   end
 
   def next_path
diff --git a/app/controllers/api/v1/mutes_controller.rb b/app/controllers/api/v1/mutes_controller.rb
index d2b50e3336..2c213ca202 100644
--- a/app/controllers/api/v1/mutes_controller.rb
+++ b/app/controllers/api/v1/mutes_controller.rb
@@ -18,14 +18,14 @@ class Api::V1::MutesController < Api::BaseController
 
   def paginated_mutes
     @paginated_mutes ||= Mute.eager_load(target_account: [:account_stat, :user])
-                             .joins(:target_account)
-                             .merge(Account.without_suspended)
-                             .where(account: current_account)
-                             .paginate_by_max_id(
-                               limit_param(DEFAULT_ACCOUNTS_LIMIT),
-                               params[:max_id],
-                               params[:since_id]
-                             )
+      .joins(:target_account)
+      .merge(Account.without_suspended)
+      .where(account: current_account)
+      .paginate_by_max_id(
+        limit_param(DEFAULT_ACCOUNTS_LIMIT),
+        params[:max_id],
+        params[:since_id]
+      )
   end
 
   def next_path
diff --git a/app/controllers/api/v1_alpha/collections_controller.rb b/app/controllers/api/v1_alpha/collections_controller.rb
index feea6c6b32..1ca1cd6923 100644
--- a/app/controllers/api/v1_alpha/collections_controller.rb
+++ b/app/controllers/api/v1_alpha/collections_controller.rb
@@ -72,10 +72,10 @@ class Api::V1Alpha::CollectionsController < Api::BaseController
 
   def set_collections
     @collections = @account.collections
-                           .with_tag
-                           .order(created_at: :desc)
-                           .offset(offset_param)
-                           .limit(limit_param(DEFAULT_COLLECTIONS_LIMIT))
+      .with_tag
+      .order(created_at: :desc)
+      .offset(offset_param)
+      .limit(limit_param(DEFAULT_COLLECTIONS_LIMIT))
     @collections = @collections.discoverable unless @account == current_account
   end
 
diff --git a/app/javascript/images/icons/icon_verified.svg b/app/javascript/images/icons/icon_verified.svg
index 65873b9dc4..62bdcb5710 100644
--- a/app/javascript/images/icons/icon_verified.svg
+++ b/app/javascript/images/icons/icon_verified.svg
@@ -2,9 +2,9 @@
   <path fill="url(#VerifiedGradient)" d="M8 .837a3.168 3.168 0 0 1 2.47 1.187 3.166 3.166 0 0 1 2.601.906 3.168 3.168 0 0 1 .905 2.6A3.167 3.167 0 0 1 15.164 8a3.172 3.172 0 0 1-1.188 2.47 3.167 3.167 0 0 1-.903 2.597 3.168 3.168 0 0 1-2.596.909 3.167 3.167 0 0 1-4.95.001 3.166 3.166 0 0 1-3.397-2.258 3.169 3.169 0 0 1-.107-1.24A3.168 3.168 0 0 1 .826 8a3.17 3.17 0 0 1 1.197-2.479 3.168 3.168 0 0 1 .91-2.593 3.166 3.166 0 0 1 2.596-.905A3.169 3.169 0 0 1 8 .837Z"/>
   <path stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.333" d="m6 8 1.333 1.333L10 6.667"/>
   <defs>
-    <linearGradient id="VerifiedGradient" x1="-.966" x2="12.162" y1="2.629" y2="17.493" gradientUnits="userSpaceOnUse">
-      <stop offset=".13" stop-color="#5638CC"/>
-      <stop offset=".995" stop-color="#DC03F0"/>
+    <linearGradient id="VerifiedGradient" x1="7.99512" y1="0.836914" x2="7.99512" y2="15.1689" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#00BC7D"/>
+      <stop offset="1" stop-color="#00BBA7"/>
     </linearGradient>
   </defs>
 </svg>
diff --git a/app/javascript/mastodon/api_types/collections.ts b/app/javascript/mastodon/api_types/collections.ts
index ec6eaabaa0..23f835f5fc 100644
--- a/app/javascript/mastodon/api_types/collections.ts
+++ b/app/javascript/mastodon/api_types/collections.ts
@@ -11,14 +11,14 @@ export interface ApiCollectionJSON {
   account_id: string;
 
   id: string;
-  uri: string;
+  uri: string | null;
   local: boolean;
   item_count: number;
 
   name: string;
   description: string;
-  tag?: ApiTagJSON;
-  language: string;
+  tag: ApiTagJSON | null;
+  language: string | null;
   sensitive: boolean;
   discoverable: boolean;
 
diff --git a/app/javascript/mastodon/components/__tests__/__snapshots__/avatar-test.jsx.snap b/app/javascript/mastodon/components/__tests__/__snapshots__/avatar-test.jsx.snap
index c25dc59c86..1b6647f91f 100644
--- a/app/javascript/mastodon/components/__tests__/__snapshots__/avatar-test.jsx.snap
+++ b/app/javascript/mastodon/components/__tests__/__snapshots__/avatar-test.jsx.snap
@@ -1,7 +1,7 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`<Avatar /> > Autoplay > renders a animated avatar 1`] = `
-<div
+<span
   className="account__avatar account__avatar--loading"
   onMouseEnter={[Function]}
   onMouseLeave={[Function]}
@@ -18,11 +18,11 @@ exports[`<Avatar /> > Autoplay > renders a animated avatar 1`] = `
     onLoad={[Function]}
     src="/animated/alice.gif"
   />
-</div>
+</span>
 `;
 
 exports[`<Avatar /> > Still > renders a still avatar 1`] = `
-<div
+<span
   className="account__avatar account__avatar--loading"
   onMouseEnter={[Function]}
   onMouseLeave={[Function]}
@@ -39,5 +39,5 @@ exports[`<Avatar /> > Still > renders a still avatar 1`] = `
     onLoad={[Function]}
     src="/static/alice.jpg"
   />
-</div>
+</span>
 `;
diff --git a/app/javascript/mastodon/components/account/index.tsx b/app/javascript/mastodon/components/account/index.tsx
index dafad0f707..7cceb2ce25 100644
--- a/app/javascript/mastodon/components/account/index.tsx
+++ b/app/javascript/mastodon/components/account/index.tsx
@@ -297,7 +297,7 @@ export const Account: React.FC<AccountProps> = ({
       >
         <div className='account__info-wrapper'>
           <Link
-            className='account__display-name'
+            className='account__display-name focusable'
             title={account?.acct}
             to={`/@${account?.acct}`}
             data-hover-card-account={id}
diff --git a/app/javascript/mastodon/components/avatar.tsx b/app/javascript/mastodon/components/avatar.tsx
index 2ae66ffa11..6e1c5dbfd4 100644
--- a/app/javascript/mastodon/components/avatar.tsx
+++ b/app/javascript/mastodon/components/avatar.tsx
@@ -53,7 +53,7 @@ export const Avatar: React.FC<Props> = ({
   }, [setError]);
 
   const avatar = (
-    <div
+    <span
       className={classNames(className, 'account__avatar', {
         'account__avatar--inline': inline,
         'account__avatar--loading': loading,
@@ -67,14 +67,14 @@ export const Avatar: React.FC<Props> = ({
       )}
 
       {counter && (
-        <div
+        <span
           className='account__avatar__counter'
           style={{ borderColor: counterBorderColor }}
         >
           {counter}
-        </div>
+        </span>
       )}
-    </div>
+    </span>
   );
 
   if (withLink) {
diff --git a/app/javascript/mastodon/components/column.tsx b/app/javascript/mastodon/components/column.tsx
index 01c75d85c0..2abe3425e4 100644
--- a/app/javascript/mastodon/components/column.tsx
+++ b/app/javascript/mastodon/components/column.tsx
@@ -1,6 +1,8 @@
 import { forwardRef, useRef, useImperativeHandle } from 'react';
 import type { Ref } from 'react';
 
+import classNames from 'classnames';
+
 import { scrollTop } from 'mastodon/scroll';
 
 export interface ColumnRef {
@@ -12,10 +14,11 @@ interface ColumnProps {
   children?: React.ReactNode;
   label?: string;
   bindToDocument?: boolean;
+  className?: string;
 }
 
 export const Column = forwardRef<ColumnRef, ColumnProps>(
-  ({ children, label, bindToDocument }, ref: Ref<ColumnRef>) => {
+  ({ children, label, bindToDocument, className }, ref: Ref<ColumnRef>) => {
     const nodeRef = useRef<HTMLDivElement>(null);
 
     useImperativeHandle(ref, () => ({
@@ -39,7 +42,12 @@ export const Column = forwardRef<ColumnRef, ColumnProps>(
     }));
 
     return (
-      <div role='region' aria-label={label} className='column' ref={nodeRef}>
+      <div
+        role='region'
+        aria-label={label}
+        className={classNames('column', className)}
+        ref={nodeRef}
+      >
         {children}
       </div>
     );
diff --git a/app/javascript/mastodon/components/column_header.tsx b/app/javascript/mastodon/components/column_header.tsx
index 06ba29cd26..64273ab214 100644
--- a/app/javascript/mastodon/components/column_header.tsx
+++ b/app/javascript/mastodon/components/column_header.tsx
@@ -73,6 +73,7 @@ export interface Props {
   iconComponent?: IconProp;
   active?: boolean;
   children?: React.ReactNode;
+  className?: string;
   pinned?: boolean;
   multiColumn?: boolean;
   extraButton?: React.ReactNode;
@@ -91,6 +92,7 @@ export const ColumnHeader: React.FC<Props> = ({
   iconComponent,
   active,
   children,
+  className,
   pinned,
   multiColumn,
   extraButton,
@@ -141,7 +143,7 @@ export const ColumnHeader: React.FC<Props> = ({
     onPin?.();
   }, [history, pinned, onPin]);
 
-  const wrapperClassName = classNames('column-header__wrapper', {
+  const wrapperClassName = classNames('column-header__wrapper', className, {
     active,
   });
 
@@ -256,7 +258,8 @@ export const ColumnHeader: React.FC<Props> = ({
   }
 
   const hasIcon = icon && iconComponent;
-  const hasTitle = hasIcon && title;
+  // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+  const hasTitle = (hasIcon || backButton) && title;
 
   const component = (
     <div className={wrapperClassName}>
@@ -270,7 +273,7 @@ export const ColumnHeader: React.FC<Props> = ({
               className='column-header__title'
               type='button'
             >
-              {!backButton && (
+              {!backButton && hasIcon && (
                 <Icon
                   id={icon}
                   icon={iconComponent}
diff --git a/app/javascript/mastodon/components/dropdown_menu.tsx b/app/javascript/mastodon/components/dropdown_menu.tsx
index 6ed138c301..b5ee0db34e 100644
--- a/app/javascript/mastodon/components/dropdown_menu.tsx
+++ b/app/javascript/mastodon/components/dropdown_menu.tsx
@@ -311,6 +311,7 @@ interface DropdownProps<Item extends object | null = MenuItem> {
   status?: ImmutableMap<string, unknown>;
   needsStatusRefresh?: boolean;
   forceDropdown?: boolean;
+  className?: string;
   renderItem?: RenderItemFn<Item>;
   renderHeader?: RenderHeaderFn<Item>;
   onOpen?: // Must use a union type for the full function as a union with void is not allowed.
@@ -335,6 +336,7 @@ export const Dropdown = <Item extends object | null = MenuItem>({
   status,
   needsStatusRefresh,
   forceDropdown = false,
+  className,
   renderItem,
   renderHeader,
   onOpen,
@@ -434,6 +436,7 @@ export const Dropdown = <Item extends object | null = MenuItem>({
               modalProps: {
                 actions: items,
                 onClick: handleItemClick,
+                className,
               },
             }),
           );
@@ -462,6 +465,7 @@ export const Dropdown = <Item extends object | null = MenuItem>({
       handleClose,
       statusId,
       needsStatusRefresh,
+      className,
     ],
   );
 
@@ -515,7 +519,7 @@ export const Dropdown = <Item extends object | null = MenuItem>({
         popperConfig={popperConfig}
       >
         {({ props, arrowProps, placement }) => (
-          <div {...props} id={menuId}>
+          <div {...props} className={className} id={menuId}>
             <div className={`dropdown-animation dropdown-menu ${placement}`}>
               <div
                 className={`dropdown-menu__arrow ${placement}`}
diff --git a/app/javascript/mastodon/components/follow_button.tsx b/app/javascript/mastodon/components/follow_button.tsx
index ffb2ed1e5b..719294f190 100644
--- a/app/javascript/mastodon/components/follow_button.tsx
+++ b/app/javascript/mastodon/components/follow_button.tsx
@@ -3,8 +3,10 @@ import { useCallback, useEffect } from 'react';
 import { useIntl, defineMessages } from 'react-intl';
 
 import classNames from 'classnames';
+import { Link } from 'react-router-dom';
 
 import { useIdentity } from '@/mastodon/identity_context';
+import { isClientFeatureEnabled } from '@/mastodon/utils/environment';
 import {
   fetchRelationships,
   followAccount,
@@ -158,14 +160,24 @@ export const FollowButton: React.FC<{
   }
 
   if (accountId === me) {
+    const buttonClasses = classNames(className, 'button button-secondary', {
+      'button--compact': compact,
+    });
+
+    if (isClientFeatureEnabled('profile_editing')) {
+      return (
+        <Link to='/profile/edit' className={buttonClasses}>
+          {label}
+        </Link>
+      );
+    }
+
     return (
       <a
         href='/settings/profile'
         target='_blank'
         rel='noopener'
-        className={classNames(className, 'button button-secondary', {
-          'button--compact': compact,
-        })}
+        className={buttonClasses}
       >
         {label}
       </a>
diff --git a/app/javascript/mastodon/features/account_edit/index.tsx b/app/javascript/mastodon/features/account_edit/index.tsx
new file mode 100644
index 0000000000..838a07f131
--- /dev/null
+++ b/app/javascript/mastodon/features/account_edit/index.tsx
@@ -0,0 +1,53 @@
+import type { FC } from 'react';
+
+import { FormattedMessage, useIntl } from 'react-intl';
+
+import { Link } from 'react-router-dom';
+
+import { Column } from '@/mastodon/components/column';
+import { ColumnHeader } from '@/mastodon/components/column_header';
+import { LoadingIndicator } from '@/mastodon/components/loading_indicator';
+import BundleColumnError from '@/mastodon/features/ui/components/bundle_column_error';
+import { useAccount } from '@/mastodon/hooks/useAccount';
+import { useCurrentAccountId } from '@/mastodon/hooks/useAccountId';
+
+import classes from './styles.module.scss';
+
+export const AccountEdit: FC<{ multiColumn: boolean }> = ({ multiColumn }) => {
+  const accountId = useCurrentAccountId();
+  const account = useAccount(accountId);
+  const intl = useIntl();
+
+  if (!accountId) {
+    return <BundleColumnError multiColumn={multiColumn} errorType='routing' />;
+  }
+
+  if (!account) {
+    return (
+      <Column bindToDocument={!multiColumn} className={classes.column}>
+        <LoadingIndicator />
+      </Column>
+    );
+  }
+
+  return (
+    <Column bindToDocument={!multiColumn} className={classes.column}>
+      <ColumnHeader
+        title={intl.formatMessage({
+          id: 'account_edit.column_title',
+          defaultMessage: 'Edit Profile',
+        })}
+        className={classes.header}
+        showBackButton
+        extraButton={
+          <Link to={`/@${account.acct}`} className='button'>
+            <FormattedMessage
+              id='account_edit.column_button'
+              defaultMessage='Done'
+            />
+          </Link>
+        }
+      />
+    </Column>
+  );
+};
diff --git a/app/javascript/mastodon/features/account_edit/styles.module.scss b/app/javascript/mastodon/features/account_edit/styles.module.scss
new file mode 100644
index 0000000000..3662b51443
--- /dev/null
+++ b/app/javascript/mastodon/features/account_edit/styles.module.scss
@@ -0,0 +1,26 @@
+.column {
+  border: 1px solid var(--color-border-primary);
+  border-top-width: 0;
+}
+
+.header {
+  :global(.column-header__buttons) {
+    align-items: center;
+    padding-inline-end: 16px;
+    height: auto;
+  }
+}
+
+.nav {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 8px;
+  padding: 24px 24px 12px;
+
+  > h1 {
+    flex-grow: 1;
+    font-weight: 600;
+    font-size: 15px;
+  }
+}
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 9f80bf0c6d..e31e13b8dd 100644
--- a/app/javascript/mastodon/features/account_timeline/components/account_header.tsx
+++ b/app/javascript/mastodon/features/account_timeline/components/account_header.tsx
@@ -214,7 +214,10 @@ export const AccountHeader: React.FC<{
                   <>
                     <AccountBio
                       accountId={accountId}
-                      className='account__header__content'
+                      className={classNames(
+                        'account__header__content',
+                        isRedesign && redesignClasses.bio,
+                      )}
                     />
                     <AccountHeaderFields accountId={accountId} />
                   </>
diff --git a/app/javascript/mastodon/features/account_timeline/components/fields.tsx b/app/javascript/mastodon/features/account_timeline/components/fields.tsx
index 5d22acc09a..539546759d 100644
--- a/app/javascript/mastodon/features/account_timeline/components/fields.tsx
+++ b/app/javascript/mastodon/features/account_timeline/components/fields.tsx
@@ -15,8 +15,7 @@ import { FormattedDateWrapper } from '@/mastodon/components/formatted_date';
 import { Icon } from '@/mastodon/components/icon';
 import { useElementHandledLink } from '@/mastodon/components/status/handled_link';
 import { useAccount } from '@/mastodon/hooks/useAccount';
-import type { Account } from '@/mastodon/models/account';
-import { isValidUrl } from '@/mastodon/utils/checks';
+import type { Account, AccountFieldShape } from '@/mastodon/models/account';
 import type { OnElementHandler } from '@/mastodon/utils/html';
 
 import { cleanExtraEmojis } from '../../emoji/normalize';
@@ -76,8 +75,8 @@ const RedesignAccountHeaderFields: FC<{ account: Account }> = ({ account }) => {
     [account.emojis],
   );
   const textHasCustomEmoji = useCallback(
-    (text: string) => {
-      if (!emojis) {
+    (text?: string | null) => {
+      if (!emojis || !text) {
         return false;
       }
       for (const emoji of Object.keys(emojis)) {
@@ -92,62 +91,96 @@ const RedesignAccountHeaderFields: FC<{ account: Account }> = ({ account }) => {
   const htmlHandlers = useElementHandledLink({
     hashtagAccountId: account.id,
   });
-  const intl = useIntl();
+
+  if (account.fields.isEmpty()) {
+    return null;
+  }
 
   return (
     <CustomEmojiProvider emojis={emojis}>
       <dl className={classes.fieldList}>
-        {account.fields.map(
-          (
-            { name, name_emojified, value_emojified, value_plain, verified_at },
-            key,
-          ) => (
-            <div
-              key={key}
-              className={classNames(
-                classes.fieldRow,
-                verified_at && classes.fieldVerified,
-              )}
-            >
-              <FieldHTML
-                as='dt'
-                text={name}
-                textEmojified={name_emojified}
-                textHasCustomEmoji={textHasCustomEmoji(name)}
-                titleLength={50}
-                className='translate'
-                {...htmlHandlers}
-              />
-              <FieldHTML
-                as='dd'
-                text={value_plain ?? ''}
-                textEmojified={value_emojified}
-                textHasCustomEmoji={textHasCustomEmoji(value_plain ?? '')}
-                titleLength={120}
-                {...htmlHandlers}
-              />
-              {verified_at && (
-                <Icon
-                  id='verified'
-                  icon={IconVerified}
-                  className={classes.fieldVerifiedIcon}
-                  aria-label={intl.formatMessage(verifyMessage, {
-                    date: intl.formatDate(verified_at, dateFormatOptions),
-                  })}
-                  noFill
-                />
-              )}
-            </div>
-          ),
-        )}
+        {account.fields.map((field, key) => (
+          <FieldRow
+            key={key}
+            {...field.toJSON()}
+            htmlHandlers={htmlHandlers}
+            textHasCustomEmoji={textHasCustomEmoji}
+          />
+        ))}
       </dl>
     </CustomEmojiProvider>
   );
 };
 
+const FieldRow: FC<
+  {
+    textHasCustomEmoji: (text?: string | null) => boolean;
+    htmlHandlers: ReturnType<typeof useElementHandledLink>;
+  } & AccountFieldShape
+> = ({
+  textHasCustomEmoji,
+  htmlHandlers,
+  name,
+  name_emojified,
+  value_emojified,
+  value_plain,
+  verified_at,
+}) => {
+  const intl = useIntl();
+  const [showAll, setShowAll] = useState(false);
+  const handleClick = useCallback(() => {
+    setShowAll((prev) => !prev);
+  }, []);
+
+  return (
+    /* eslint-disable -- This method of showing field contents is not very accessible, but it's what we've got for now */
+    <div
+      className={classNames(
+        classes.fieldRow,
+        verified_at && classes.fieldVerified,
+        showAll && classes.fieldShowAll,
+      )}
+      onClick={handleClick}
+      /* eslint-enable */
+    >
+      <FieldHTML
+        as='dt'
+        text={name}
+        textEmojified={name_emojified}
+        textHasCustomEmoji={textHasCustomEmoji(name)}
+        titleLength={50}
+        className='translate'
+        {...htmlHandlers}
+      />
+      <dd>
+        <FieldHTML
+          as='span'
+          text={value_plain ?? ''}
+          textEmojified={value_emojified}
+          textHasCustomEmoji={textHasCustomEmoji(value_plain ?? '')}
+          titleLength={120}
+          {...htmlHandlers}
+        />
+
+        {verified_at && (
+          <Icon
+            id='verified'
+            icon={IconVerified}
+            className={classes.fieldVerifiedIcon}
+            aria-label={intl.formatMessage(verifyMessage, {
+              date: intl.formatDate(verified_at, dateFormatOptions),
+            })}
+            noFill
+          />
+        )}
+      </dd>
+    </div>
+  );
+};
+
 const FieldHTML: FC<
   {
-    as: 'dd' | 'dt';
+    as?: 'span' | 'dt';
     text: string;
     textEmojified: string;
     textHasCustomEmoji: boolean;
@@ -164,11 +197,6 @@ const FieldHTML: FC<
   onElement,
   ...props
 }) => {
-  const [showAll, setShowAll] = useState(false);
-  const handleClick = useCallback(() => {
-    setShowAll((prev) => !prev);
-  }, []);
-
   const handleElement: OnElementHandler = useCallback(
     (element, props, children, extra) => {
       if (element instanceof HTMLAnchorElement) {
@@ -186,17 +214,13 @@ const FieldHTML: FC<
     },
     [onElement, textHasCustomEmoji],
   );
+
   return (
     <EmojiHTML
       as={as}
       htmlString={textEmojified}
       title={showTitleOnLength(text, titleLength)}
-      className={classNames(
-        className,
-        text && isValidUrl(text) && classes.fieldLink,
-        showAll && classes.fieldShowAll,
-      )}
-      onClick={handleClick}
+      className={className}
       onElement={handleElement}
       {...props}
     />
diff --git a/app/javascript/mastodon/features/account_timeline/components/menu.tsx b/app/javascript/mastodon/features/account_timeline/components/menu.tsx
index f03878eb8c..1fcd2f691e 100644
--- a/app/javascript/mastodon/features/account_timeline/components/menu.tsx
+++ b/app/javascript/mastodon/features/account_timeline/components/menu.tsx
@@ -42,6 +42,8 @@ import ShareIcon from '@/material-icons/400-24px/share.svg?react';
 
 import { isRedesignEnabled } from '../common';
 
+import classes from './redesign.module.scss';
+
 export const AccountMenu: FC<{ accountId: string }> = ({ accountId }) => {
   const intl = useIntl();
   const { signedIn, permissions } = useIdentity();
@@ -86,6 +88,7 @@ export const AccountMenu: FC<{ accountId: string }> = ({ accountId }) => {
       items={menuItems}
       icon='ellipsis-v'
       iconComponent={MoreHorizIcon}
+      className={classes.buttonMenu}
     />
   );
 };
diff --git a/app/javascript/mastodon/features/account_timeline/components/redesign.module.scss b/app/javascript/mastodon/features/account_timeline/components/redesign.module.scss
index a1ee827507..5d7a5fa650 100644
--- a/app/javascript/mastodon/features/account_timeline/components/redesign.module.scss
+++ b/app/javascript/mastodon/features/account_timeline/components/redesign.module.scss
@@ -24,11 +24,10 @@
 
 .name {
   flex-grow: 1;
-  font-size: 22px;
-  white-space: initial;
-  line-height: normal;
 
   > h1 {
+    font-size: 22px;
+    line-height: normal;
     white-space: initial;
   }
 }
@@ -149,11 +148,33 @@ $button-fallback-breakpoint: #{$button-breakpoint} + 55px;
   border-top: 1px solid var(--color-border-primary);
 }
 
+.buttonMenu {
+  // Override the modal for mobile.
+  &:global(.actions-modal) {
+    max-height: none;
+  }
+
+  li :global(.icon) {
+    width: 20px;
+    height: 20px;
+  }
+}
+
+.bio {
+  font-size: 15px;
+}
+
 .badge {
   background-color: var(--color-bg-secondary);
   border: none;
   color: var(--color-text-secondary);
   font-weight: 500;
+  padding: 4px;
+  font-size: 13px;
+
+  :global(.account__header__badges) > & {
+    line-height: 1;
+  }
 
   > span {
     font-weight: unset;
@@ -194,12 +215,13 @@ svg.badgeIcon {
 
 .fieldList {
   display: grid;
-  grid-template-columns: 160px 1fr min-content;
+  grid-template-columns: 160px 1fr;
   column-gap: 12px;
-  margin: 4px 0 16px;
+  margin: 16px 0;
+  border-top: 0.5px solid var(--color-border-primary);
 
   @container (width < 420px) {
-    grid-template-columns: 100px 1fr min-content;
+    grid-template-columns: 100px 1fr;
   }
 }
 
@@ -208,11 +230,10 @@ svg.badgeIcon {
   grid-column: 1 / -1;
   align-items: start;
   grid-template-columns: subgrid;
-  padding: 0 4px;
+  padding: 8px;
+  border-bottom: 0.5px solid var(--color-border-primary);
 
   > :is(dt, dd) {
-    margin: 8px 0;
-
     &:not(.fieldShowAll) {
       display: -webkit-box;
       -webkit-box-orient: vertical;
@@ -227,43 +248,34 @@ svg.badgeIcon {
     color: var(--color-text-secondary);
   }
 
-  &:not(.fieldVerified) > dd {
-    grid-column: span 2;
+  > dd {
+    display: flex;
+    align-items: center;
+    gap: 4px;
   }
 
   a {
-    font-weight: 500;
-    color: var(--color-text-brand);
+    color: inherit;
     text-decoration: none;
-    transition: 0.2s ease-in-out;
 
     &:hover,
     &:focus {
-      color: var(--color-text-brand-soft);
+      text-decoration: underline;
     }
   }
 }
 
 .fieldVerified {
-  background-color: var(--color-bg-brand-softer);
-}
-
-.fieldLink:is(dd, dt) {
-  margin: 0;
-}
-
-.fieldLink > a {
-  display: block;
-  padding: 8px 0;
+  background-color: var(--color-bg-success-softer);
 }
 
 .fieldVerifiedIcon {
   width: 16px;
   height: 16px;
-  margin-top: 8px;
 }
 
 .fieldNumbersWrapper {
+  font-size: 13px;
   padding: 0;
 
   a {
@@ -323,10 +335,15 @@ svg.badgeIcon {
   border-bottom: 1px solid var(--color-border-primary);
   display: flex;
   gap: 12px;
-  padding: 0 12px;
+  padding: 0 24px;
 
-  @container (width >= 500px) {
-    padding: 0 24px;
+  @container (width < 500px) {
+    padding: 0 12px;
+
+    a {
+      flex: 1 1 0px;
+      text-align: center;
+    }
   }
 
   a {
diff --git a/app/javascript/mastodon/features/account_timeline/v2/styles.module.scss b/app/javascript/mastodon/features/account_timeline/v2/styles.module.scss
index e16eca5254..a57a5e738a 100644
--- a/app/javascript/mastodon/features/account_timeline/v2/styles.module.scss
+++ b/app/javascript/mastodon/features/account_timeline/v2/styles.module.scss
@@ -39,6 +39,7 @@
     cursor: pointer;
     display: flex;
     align-items: center;
+    font-size: 15px;
   }
 }
 
diff --git a/app/javascript/mastodon/features/collections/styles.module.scss b/app/javascript/mastodon/features/collections/detail/collection_list_item.module.scss
similarity index 80%
rename from app/javascript/mastodon/features/collections/styles.module.scss
rename to app/javascript/mastodon/features/collections/detail/collection_list_item.module.scss
index ebcab70d59..74eac9f3e1 100644
--- a/app/javascript/mastodon/features/collections/styles.module.scss
+++ b/app/javascript/mastodon/features/collections/detail/collection_list_item.module.scss
@@ -1,4 +1,4 @@
-.collectionItemWrapper {
+.wrapper {
   display: flex;
   align-items: center;
   gap: 16px;
@@ -7,13 +7,13 @@
   border-bottom: 1px solid var(--color-border-primary);
 }
 
-.collectionItemContent {
+.content {
   position: relative;
   flex-grow: 1;
   padding: 15px 5px;
 }
 
-.collectionItemLink {
+.link {
   display: block;
   margin-bottom: 2px;
   font-size: 15px;
@@ -33,16 +33,19 @@
   }
 }
 
-.collectionItemInfo {
+.info {
+  font-size: 13px;
+  color: var(--color-text-secondary);
+}
+
+.metaList {
   --gap: 0.75ch;
 
   display: flex;
   gap: var(--gap);
-  font-size: 13px;
-  color: var(--color-text-secondary);
 
-  & > li:not(:first-child)::before {
+  & > li:not(:last-child)::after {
     content: '·';
-    margin-inline-end: var(--gap);
+    margin-inline-start: var(--gap);
   }
 }
diff --git a/app/javascript/mastodon/features/collections/detail/collection_list_item.tsx b/app/javascript/mastodon/features/collections/detail/collection_list_item.tsx
new file mode 100644
index 0000000000..51a7e67254
--- /dev/null
+++ b/app/javascript/mastodon/features/collections/detail/collection_list_item.tsx
@@ -0,0 +1,67 @@
+import { useId } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import classNames from 'classnames';
+import { Link } from 'react-router-dom';
+
+import type { ApiCollectionJSON } from 'mastodon/api_types/collections';
+import { RelativeTimestamp } from 'mastodon/components/relative_timestamp';
+
+import classes from './collection_list_item.module.scss';
+import { CollectionMenu } from './collection_menu';
+
+export const CollectionMetaData: React.FC<{
+  collection: ApiCollectionJSON;
+  className?: string;
+}> = ({ collection, className }) => {
+  return (
+    <ul className={classNames(classes.metaList, className)}>
+      <FormattedMessage
+        id='collections.account_count'
+        defaultMessage='{count, plural, one {# account} other {# accounts}}'
+        values={{ count: collection.item_count }}
+        tagName='li'
+      />
+      <FormattedMessage
+        id='collections.last_updated_at'
+        defaultMessage='Last updated: {date}'
+        values={{
+          date: (
+            <RelativeTimestamp
+              timestamp={collection.updated_at}
+              short={false}
+            />
+          ),
+        }}
+        tagName='li'
+      />
+    </ul>
+  );
+};
+
+export const CollectionListItem: React.FC<{
+  collection: ApiCollectionJSON;
+}> = ({ collection }) => {
+  const { id, name } = collection;
+  const linkId = useId();
+
+  return (
+    <article
+      className={classNames(classes.wrapper, 'focusable')}
+      tabIndex={-1}
+      aria-labelledby={linkId}
+    >
+      <div className={classes.content}>
+        <h2 id={linkId}>
+          <Link to={`/collections/${id}`} className={classes.link}>
+            {name}
+          </Link>
+        </h2>
+        <CollectionMetaData collection={collection} className={classes.info} />
+      </div>
+
+      <CollectionMenu context='list' collection={collection} />
+    </article>
+  );
+};
diff --git a/app/javascript/mastodon/features/collections/detail/collection_menu.tsx b/app/javascript/mastodon/features/collections/detail/collection_menu.tsx
new file mode 100644
index 0000000000..cf65be5496
--- /dev/null
+++ b/app/javascript/mastodon/features/collections/detail/collection_menu.tsx
@@ -0,0 +1,91 @@
+import { useCallback, useMemo } from 'react';
+
+import { defineMessages, useIntl } from 'react-intl';
+
+import MoreVertIcon from '@/material-icons/400-24px/more_vert.svg?react';
+import { openModal } from 'mastodon/actions/modal';
+import type { ApiCollectionJSON } from 'mastodon/api_types/collections';
+import { Dropdown } from 'mastodon/components/dropdown_menu';
+import { IconButton } from 'mastodon/components/icon_button';
+import { useAppDispatch } from 'mastodon/store';
+
+import { messages as editorMessages } from '../editor';
+
+const messages = defineMessages({
+  view: {
+    id: 'collections.view_collection',
+    defaultMessage: 'View collection',
+  },
+  delete: {
+    id: 'collections.delete_collection',
+    defaultMessage: 'Delete collection',
+  },
+  more: { id: 'status.more', defaultMessage: 'More' },
+});
+
+export const CollectionMenu: React.FC<{
+  collection: ApiCollectionJSON;
+  context: 'list' | 'collection';
+  className?: string;
+}> = ({ collection, context, className }) => {
+  const dispatch = useAppDispatch();
+  const intl = useIntl();
+
+  const { id, name } = collection;
+
+  const handleDeleteClick = useCallback(() => {
+    dispatch(
+      openModal({
+        modalType: 'CONFIRM_DELETE_COLLECTION',
+        modalProps: {
+          name,
+          id,
+        },
+      }),
+    );
+  }, [dispatch, id, name]);
+
+  const menu = useMemo(() => {
+    const commonItems = [
+      {
+        text: intl.formatMessage(editorMessages.manageAccounts),
+        to: `/collections/${id}/edit`,
+      },
+      {
+        text: intl.formatMessage(editorMessages.editDetails),
+        to: `/collections/${id}/edit/details`,
+      },
+      {
+        text: intl.formatMessage(editorMessages.editSettings),
+        to: `/collections/${id}/edit/settings`,
+      },
+      null,
+      {
+        text: intl.formatMessage(messages.delete),
+        action: handleDeleteClick,
+        dangerous: true,
+      },
+    ];
+
+    if (context === 'list') {
+      return [
+        { text: intl.formatMessage(messages.view), to: `/collections/${id}` },
+        null,
+        ...commonItems,
+      ];
+    } else {
+      return commonItems;
+    }
+  }, [intl, id, handleDeleteClick, context]);
+
+  return (
+    <Dropdown scrollKey='collections' items={menu}>
+      <IconButton
+        icon='menu-icon'
+        iconComponent={MoreVertIcon}
+        title={intl.formatMessage(messages.more)}
+        className={className}
+      />
+    </Dropdown>
+  );
+};
diff --git a/app/javascript/mastodon/features/collections/detail/index.tsx b/app/javascript/mastodon/features/collections/detail/index.tsx
new file mode 100644
index 0000000000..7b04800aab
--- /dev/null
+++ b/app/javascript/mastodon/features/collections/detail/index.tsx
@@ -0,0 +1,178 @@
+import { useCallback, useEffect } from 'react';
+
+import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
+
+import { Helmet } from 'react-helmet';
+import { useParams } from 'react-router';
+
+import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
+import ShareIcon from '@/material-icons/400-24px/share.svg?react';
+import { showAlert } from 'mastodon/actions/alerts';
+import type { ApiCollectionJSON } from 'mastodon/api_types/collections';
+import { Account } from 'mastodon/components/account';
+import { Avatar } from 'mastodon/components/avatar';
+import { Column } from 'mastodon/components/column';
+import { ColumnHeader } from 'mastodon/components/column_header';
+import { LinkedDisplayName } from 'mastodon/components/display_name';
+import { IconButton } from 'mastodon/components/icon_button';
+import ScrollableList from 'mastodon/components/scrollable_list';
+import { Tag } from 'mastodon/components/tags/tag';
+import { useAccount } from 'mastodon/hooks/useAccount';
+import { me } from 'mastodon/initial_state';
+import { fetchCollection } from 'mastodon/reducers/slices/collections';
+import { useAppDispatch, useAppSelector } from 'mastodon/store';
+
+import { CollectionMetaData } from './collection_list_item';
+import { CollectionMenu } from './collection_menu';
+import classes from './styles.module.scss';
+
+const messages = defineMessages({
+  empty: {
+    id: 'collections.accounts.empty_title',
+    defaultMessage: 'This collection is empty',
+  },
+  loading: {
+    id: 'collections.detail.loading',
+    defaultMessage: 'Loading collection…',
+  },
+  share: {
+    id: 'collections.detail.share',
+    defaultMessage: 'Share this collection',
+  },
+  accounts: {
+    id: 'collections.detail.accounts_heading',
+    defaultMessage: 'Accounts',
+  },
+});
+
+const AuthorNote: React.FC<{ id: string }> = ({ id }) => {
+  const account = useAccount(id);
+  const author = (
+    <span className={classes.displayNameWithAvatar}>
+      <Avatar size={18} account={account} />
+      <LinkedDisplayName displayProps={{ account, variant: 'simple' }} />
+    </span>
+  );
+
+  if (id === me) {
+    return (
+      <p className={classes.authorNote}>
+        <FormattedMessage
+          id='collections.detail.curated_by_you'
+          defaultMessage='Curated by you'
+        />
+      </p>
+    );
+  }
+  return (
+    <p className={classes.authorNote}>
+      <FormattedMessage
+        id='collections.detail.curated_by_author'
+        defaultMessage='Curated by {author}'
+        values={{ author }}
+      />
+    </p>
+  );
+};
+
+const CollectionHeader: React.FC<{ collection: ApiCollectionJSON }> = ({
+  collection,
+}) => {
+  const intl = useIntl();
+  const { name, description, tag } = collection;
+  const dispatch = useAppDispatch();
+
+  const handleShare = useCallback(() => {
+    dispatch(showAlert({ message: 'Collection sharing not yet implemented' }));
+  }, [dispatch]);
+
+  return (
+    <div className={classes.header}>
+      <div className={classes.titleWithMenu}>
+        <div className={classes.titleWrapper}>
+          {tag && (
+            // TODO: Make non-interactive tag component
+            <Tag name={tag.name} className={classes.tag} />
+          )}
+          <h2 className={classes.name}>{name}</h2>
+        </div>
+        <div className={classes.headerButtonWrapper}>
+          <IconButton
+            iconComponent={ShareIcon}
+            icon='share-icon'
+            title={intl.formatMessage(messages.share)}
+            className={classes.iconButton}
+            onClick={handleShare}
+          />
+          <CollectionMenu
+            context='collection'
+            collection={collection}
+            className={classes.iconButton}
+          />
+        </div>
+      </div>
+      {description && <p className={classes.description}>{description}</p>}
+      <AuthorNote id={collection.account_id} />
+      <CollectionMetaData
+        collection={collection}
+        className={classes.metaData}
+      />
+      <h2 className='sr-only'>{intl.formatMessage(messages.accounts)}</h2>
+    </div>
+  );
+};
+
+export const CollectionDetailPage: React.FC<{
+  multiColumn?: boolean;
+}> = ({ multiColumn }) => {
+  const intl = useIntl();
+  const dispatch = useAppDispatch();
+  const { id } = useParams<{ id?: string }>();
+  const collection = useAppSelector((state) =>
+    id ? state.collections.collections[id] : undefined,
+  );
+
+  const isLoading = !!id && !collection;
+
+  useEffect(() => {
+    if (id) {
+      void dispatch(fetchCollection({ collectionId: id }));
+    }
+  }, [dispatch, id]);
+
+  const pageTitle = collection?.name ?? intl.formatMessage(messages.loading);
+
+  return (
+    <Column bindToDocument={!multiColumn} label={pageTitle}>
+      <ColumnHeader
+        showBackButton
+        title={pageTitle}
+        icon='collection-icon'
+        iconComponent={ListAltIcon}
+        multiColumn={multiColumn}
+      />
+
+      <ScrollableList
+        scrollKey='collection-detail'
+        emptyMessage={intl.formatMessage(messages.empty)}
+        showLoading={isLoading}
+        bindToDocument={!multiColumn}
+        alwaysPrepend
+        prepend={
+          collection ? <CollectionHeader collection={collection} /> : null
+        }
+      >
+        {collection?.items.map(({ account_id }) =>
+          account_id ? (
+            <Account key={account_id} minimal id={account_id} />
+          ) : null,
+        )}
+      </ScrollableList>
+
+      <Helmet>
+        <title>{pageTitle}</title>
+        <meta name='robots' content='noindex' />
+      </Helmet>
+    </Column>
+  );
+};
diff --git a/app/javascript/mastodon/features/collections/detail/styles.module.scss b/app/javascript/mastodon/features/collections/detail/styles.module.scss
new file mode 100644
index 0000000000..cb94f2894c
--- /dev/null
+++ b/app/javascript/mastodon/features/collections/detail/styles.module.scss
@@ -0,0 +1,74 @@
+.header {
+  padding: 16px;
+  border-bottom: 1px solid var(--color-border-primary);
+}
+
+.titleWithMenu {
+  display: flex;
+  align-items: start;
+  gap: 10px;
+}
+
+.titleWrapper {
+  flex-grow: 1;
+  min-width: 0;
+}
+
+.tag {
+  margin-bottom: 4px;
+  margin-inline-start: -8px;
+}
+
+.name {
+  font-size: 28px;
+  line-height: 1.2;
+  overflow-wrap: anywhere;
+}
+
+.description {
+  font-size: 15px;
+  margin-top: 8px;
+}
+
+.headerButtonWrapper {
+  display: flex;
+  gap: 8px;
+}
+
+.iconButton {
+  box-sizing: content-box;
+  padding: 5px;
+  border-radius: 4px;
+  border: 1px solid var(--color-border-primary);
+}
+
+.authorNote {
+  margin-top: 8px;
+  font-size: 13px;
+  color: var(--color-text-secondary);
+}
+
+.metaData {
+  margin-top: 16px;
+  font-size: 15px;
+}
+
+.displayNameWithAvatar {
+  display: inline-flex;
+  gap: 4px;
+  align-items: baseline;
+
+  a {
+    color: inherit;
+    text-decoration: underline;
+
+    &:hover,
+    &:focus {
+      text-decoration: none;
+    }
+  }
+
+  > :global(.account__avatar) {
+    align-self: center;
+  }
+}
diff --git a/app/javascript/mastodon/features/collections/editor/details.tsx b/app/javascript/mastodon/features/collections/editor/details.tsx
index f931a42c6c..9d5a94b8aa 100644
--- a/app/javascript/mastodon/features/collections/editor/details.tsx
+++ b/app/javascript/mastodon/features/collections/editor/details.tsx
@@ -68,7 +68,7 @@ export const CollectionDetails: React.FC<{
         };
 
         void dispatch(updateCollection({ payload })).then(() => {
-          history.push(`/collections`);
+          history.push(`/collections/${id}`);
         });
       } else {
         const payload: Partial<ApiCreateCollectionPayload> = {
diff --git a/app/javascript/mastodon/features/collections/editor/settings.tsx b/app/javascript/mastodon/features/collections/editor/settings.tsx
index 10fb295f83..184b51187c 100644
--- a/app/javascript/mastodon/features/collections/editor/settings.tsx
+++ b/app/javascript/mastodon/features/collections/editor/settings.tsx
@@ -68,7 +68,7 @@ export const CollectionSettings: React.FC<{
         };
 
         void dispatch(updateCollection({ payload })).then(() => {
-          history.push(`/collections`);
+          history.push(`/collections/${id}`);
         });
       } else {
         const payload: ApiCreateCollectionPayload = {
diff --git a/app/javascript/mastodon/features/collections/index.tsx b/app/javascript/mastodon/features/collections/index.tsx
index dd26174f38..607d7fe4f3 100644
--- a/app/javascript/mastodon/features/collections/index.tsx
+++ b/app/javascript/mastodon/features/collections/index.tsx
@@ -1,22 +1,16 @@
-import { useEffect, useMemo, useCallback, useId } from 'react';
+import { useEffect } from 'react';
 
 import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
 
-import classNames from 'classnames';
 import { Helmet } from 'react-helmet';
 import { Link } from 'react-router-dom';
 
 import AddIcon from '@/material-icons/400-24px/add.svg?react';
 import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
-import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
 import SquigglyArrow from '@/svg-icons/squiggly_arrow.svg?react';
-import { openModal } from 'mastodon/actions/modal';
-import type { ApiCollectionJSON } from 'mastodon/api_types/collections';
 import { Column } from 'mastodon/components/column';
 import { ColumnHeader } from 'mastodon/components/column_header';
-import { Dropdown } from 'mastodon/components/dropdown_menu';
 import { Icon } from 'mastodon/components/icon';
-import { RelativeTimestamp } from 'mastodon/components/relative_timestamp';
 import ScrollableList from 'mastodon/components/scrollable_list';
 import {
   fetchAccountCollections,
@@ -24,119 +18,13 @@ import {
 } from 'mastodon/reducers/slices/collections';
 import { useAppSelector, useAppDispatch } from 'mastodon/store';
 
+import { CollectionListItem } from './detail/collection_list_item';
 import { messages as editorMessages } from './editor';
-import classes from './styles.module.scss';
 
 const messages = defineMessages({
   heading: { id: 'column.collections', defaultMessage: 'My collections' },
-  view: {
-    id: 'collections.view_collection',
-    defaultMessage: 'View collection',
-  },
-  delete: {
-    id: 'collections.delete_collection',
-    defaultMessage: 'Delete collection',
-  },
-  more: { id: 'status.more', defaultMessage: 'More' },
 });
 
-const CollectionItem: React.FC<{
-  collection: ApiCollectionJSON;
-}> = ({ collection }) => {
-  const dispatch = useAppDispatch();
-  const intl = useIntl();
-
-  const { id, name } = collection;
-
-  const handleDeleteClick = useCallback(() => {
-    dispatch(
-      openModal({
-        modalType: 'CONFIRM_DELETE_COLLECTION',
-        modalProps: {
-          name,
-          id,
-        },
-      }),
-    );
-  }, [dispatch, id, name]);
-
-  const menu = useMemo(
-    () => [
-      { text: intl.formatMessage(messages.view), to: `/collections/${id}` },
-      null,
-      {
-        text: intl.formatMessage(editorMessages.manageAccounts),
-        to: `/collections/${id}/edit`,
-      },
-      {
-        text: intl.formatMessage(editorMessages.editDetails),
-        to: `/collections/${id}/edit/details`,
-      },
-      {
-        text: intl.formatMessage(editorMessages.editSettings),
-        to: `/collections/${id}/edit/settings`,
-      },
-      null,
-      {
-        text: intl.formatMessage(messages.delete),
-        action: handleDeleteClick,
-        dangerous: true,
-      },
-    ],
-    [intl, id, handleDeleteClick],
-  );
-
-  const linkId = useId();
-
-  return (
-    <article
-      className={classNames(classes.collectionItemWrapper, 'focusable')}
-      tabIndex={-1}
-      aria-labelledby={linkId}
-    >
-      <div className={classes.collectionItemContent}>
-        <h2 id={linkId}>
-          <Link
-            to={`/collections/${id}/edit/details`}
-            className={classes.collectionItemLink}
-          >
-            {name}
-          </Link>
-        </h2>
-        <ul className={classes.collectionItemInfo}>
-          <FormattedMessage
-            id='collections.account_count'
-            defaultMessage='{count, plural, one {# account} other {# accounts}}'
-            values={{ count: collection.item_count }}
-            tagName='li'
-          />
-          <FormattedMessage
-            id='collections.last_updated_at'
-            defaultMessage='Last updated: {date}'
-            values={{
-              date: (
-                <RelativeTimestamp
-                  timestamp={collection.updated_at}
-                  short={false}
-                />
-              ),
-            }}
-            tagName='li'
-          />
-        </ul>
-      </div>
-
-      <Dropdown
-        scrollKey='collections'
-        items={menu}
-        icon='ellipsis-h'
-        iconComponent={MoreHorizIcon}
-        title={intl.formatMessage(messages.more)}
-      />
-    </article>
-  );
-};
-
 export const Collections: React.FC<{
   multiColumn?: boolean;
 }> = ({ multiColumn }) => {
@@ -202,7 +90,7 @@ export const Collections: React.FC<{
         bindToDocument={!multiColumn}
       >
         {collections.map((item) => (
-          <CollectionItem key={item.id} collection={item} />
+          <CollectionListItem key={item.id} collection={item} />
         ))}
       </ScrollableList>
 
diff --git a/app/javascript/mastodon/features/ui/components/actions_modal.tsx b/app/javascript/mastodon/features/ui/components/actions_modal.tsx
index 13deedcd1a..8d85f36f0c 100644
--- a/app/javascript/mastodon/features/ui/components/actions_modal.tsx
+++ b/app/javascript/mastodon/features/ui/components/actions_modal.tsx
@@ -11,8 +11,9 @@ import {
 export const ActionsModal: React.FC<{
   actions: MenuItem[];
   onClick: React.MouseEventHandler;
-}> = ({ actions, onClick }) => (
-  <div className='modal-root__modal actions-modal'>
+  className?: string;
+}> = ({ actions, onClick, className }) => (
+  <div className={classNames('modal-root__modal actions-modal', className)}>
     <ul>
       {actions.map((option, i: number) => {
         if (option === null) {
diff --git a/app/javascript/mastodon/features/ui/index.jsx b/app/javascript/mastodon/features/ui/index.jsx
index c2fcd2d02f..5a9cebe5f4 100644
--- a/app/javascript/mastodon/features/ui/index.jsx
+++ b/app/javascript/mastodon/features/ui/index.jsx
@@ -22,7 +22,7 @@ import { identityContextPropShape, withIdentity } from 'mastodon/identity_contex
 import { layoutFromWindow } from 'mastodon/is_mobile';
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 import { checkAnnualReport } from '@/mastodon/reducers/slices/annual_report';
-import { isServerFeatureEnabled } from '@/mastodon/utils/environment';
+import { isClientFeatureEnabled, isServerFeatureEnabled } from '@/mastodon/utils/environment';
 
 import { uploadCompose, resetCompose, changeComposeSpoilerness } from '../../actions/compose';
 import { clearHeight } from '../../actions/height_cache';
@@ -65,6 +65,7 @@ import {
   ListEdit,
   ListMembers,
   Collections,
+  CollectionDetail,
   CollectionsEditor,
   Blocks,
   DomainBlocks,
@@ -80,6 +81,7 @@ import {
   TermsOfService,
   AccountFeatured,
   AccountAbout,
+  AccountEdit,
   Quotes,
 } from './util/async-components';
 import { ColumnsContextProvider } from './util/columns_context';
@@ -232,6 +234,8 @@ class SwitchingColumnsArea extends PureComponent {
             <WrappedRoute path='/bookmarks' component={BookmarkedStatuses} content={children} />
             <WrappedRoute path='/pinned' component={PinnedStatuses} content={children} />
 
+            {isClientFeatureEnabled('profile_editing') && <WrappedRoute key="edit" path='/profile/edit' component={AccountEdit} content={children} />}
+
             <WrappedRoute path={['/start', '/start/profile']} exact component={OnboardingProfile} content={children} />
             <WrappedRoute path='/start/follows' component={OnboardingFollows} content={children} />
             <WrappedRoute path='/directory' component={Directory} content={children} />
@@ -266,12 +270,12 @@ class SwitchingColumnsArea extends PureComponent {
             <WrappedRoute path='/mutes' component={Mutes} content={children} />
             <WrappedRoute path='/lists' component={Lists} content={children} />
             {areCollectionsEnabled() &&
-              <WrappedRoute path={['/collections/new', '/collections/:id/edit']} component={CollectionsEditor} content={children} />
+              [
+                <WrappedRoute path={['/collections/new', '/collections/:id/edit']} component={CollectionsEditor} content={children} />,
+                <WrappedRoute path='/collections/:id' component={CollectionDetail} content={children} />,
+                <WrappedRoute path='/collections' component={Collections} content={children} />
+              ]
             }
-            {areCollectionsEnabled() &&
-              <WrappedRoute path='/collections' component={Collections} content={children} />
-            }
-
             <Route component={BundleColumnError} />
           </WrappedSwitch>
         </ColumnsAreaContainer>
diff --git a/app/javascript/mastodon/features/ui/util/async-components.js b/app/javascript/mastodon/features/ui/util/async-components.js
index 55fcc29fa4..2beedaba26 100644
--- a/app/javascript/mastodon/features/ui/util/async-components.js
+++ b/app/javascript/mastodon/features/ui/util/async-components.js
@@ -44,13 +44,19 @@ export function Lists () {
   return import('../../lists');
 }
 
-export function Collections () {
+export function Collections() {
   return import('../../collections').then(
     module => ({default: module.Collections})
   );
 }
 
-export function CollectionsEditor () {
+export function CollectionDetail() {
+  return import('../../collections/detail/index').then(
+    module => ({default: module.CollectionDetailPage})
+  );
+}
+
+export function CollectionsEditor() {
   return import('../../collections/editor').then(
     module => ({default: module.CollectionEditorPage})
   );
@@ -92,6 +98,11 @@ export function AccountAbout() {
     .then((module) => ({ default: module.AccountAbout }));
 }
 
+export function AccountEdit() {
+  return import('../../account_edit')
+  .then((module) => ({ default: module.AccountEdit }));
+}
+
 export function Followers () {
   return import('../../followers');
 }
diff --git a/app/javascript/mastodon/hooks/useAccountId.ts b/app/javascript/mastodon/hooks/useAccountId.ts
index cab8f48934..028d882445 100644
--- a/app/javascript/mastodon/hooks/useAccountId.ts
+++ b/app/javascript/mastodon/hooks/useAccountId.ts
@@ -55,3 +55,7 @@ export function useAccountId() {
 
   return accountId satisfies AccountId;
 }
+
+export function useCurrentAccountId() {
+  return useAppSelector((state) => state.meta.get('me', null) as string | null);
+}
diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index ad4183f01d..45acd59217 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -141,6 +141,8 @@
   "account.unmute": "Не ігнараваць @{name}",
   "account.unmute_notifications_short": "Апавяшчаць",
   "account.unmute_short": "Не ігнараваць",
+  "account_edit.column_button": "Гатова",
+  "account_edit.column_title": "Рэдагаваць профіль",
   "account_note.placeholder": "Націсніце, каб дадаць нататку",
   "admin.dashboard.daily_retention": "Штодзённы паказчык утрымання карыстальнікаў пасля рэгістрацыі",
   "admin.dashboard.monthly_retention": "Штомесячны паказчык утрымання карыстальнікаў пасля рэгістрацыі",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 7a582f43b6..581d5d4d0e 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -13,6 +13,7 @@
   "about.not_available": "Aquesta informació no és disponible en aquest servidor.",
   "about.powered_by": "Xarxa social descentralitzada impulsada per {mastodon}",
   "about.rules": "Normes del servidor",
+  "account.about": "Quant a",
   "account.account_note_header": "Nota personal",
   "account.activity": "Activitat",
   "account.add_note": "Afegeix una nota personal",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index 2d2f62ea72..56b5910a38 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -141,6 +141,8 @@
   "account.unmute": "Vis @{name} igen",
   "account.unmute_notifications_short": "Vis notifikationer igen",
   "account.unmute_short": "Vis igen",
+  "account_edit.column_button": "Færdig",
+  "account_edit.column_title": "Rediger profil",
   "account_note.placeholder": "Klik for at tilføje notat",
   "admin.dashboard.daily_retention": "Brugerfastholdelsesrate pr. dag efter tilmelding",
   "admin.dashboard.monthly_retention": "Brugerfastholdelsesrate pr. måned efter tilmelding",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index aadabedb85..8c19179ba0 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -141,6 +141,8 @@
   "account.unmute": "Stummschaltung von @{name} aufheben",
   "account.unmute_notifications_short": "Stummschaltung der Benachrichtigungen aufheben",
   "account.unmute_short": "Stummschaltung aufheben",
+  "account_edit.column_button": "Erledigt",
+  "account_edit.column_title": "Profil bearbeiten",
   "account_note.placeholder": "Klicken, um private Anmerkung hinzuzufügen",
   "admin.dashboard.daily_retention": "Verweildauer der Nutzer*innen pro Tag seit der Registrierung",
   "admin.dashboard.monthly_retention": "Verweildauer der Nutzer*innen pro Monat seit der Registrierung",
@@ -264,7 +266,7 @@
   "collections.edit_details": "Allgemeine Informationen bearbeiten",
   "collections.edit_settings": "Einstellungen bearbeiten",
   "collections.error_loading_collections": "Beim Laden deiner Sammlungen ist ein Fehler aufgetreten.",
-  "collections.hints.accounts_counter": "{count} / {max} Konten",
+  "collections.hints.accounts_counter": "{count}/{max} Konten",
   "collections.hints.add_more_accounts": "Füge mindestens {count, plural, one {# Konto} other {# Konten}} hinzu, um fortzufahren",
   "collections.hints.can_not_remove_more_accounts": "Sammlungen müssen mindestens {count, plural, one {# Konto} other {# Konten}} enthalten. Weitere Konten zu entfernen, ist daher nicht erlaubt.",
   "collections.last_updated_at": "Aktualisiert: {date}",
@@ -276,7 +278,7 @@
   "collections.new_collection": "Neue Sammlung",
   "collections.no_collections_yet": "Bisher keine Sammlungen vorhanden.",
   "collections.remove_account": "Dieses Konto entfernen",
-  "collections.search_accounts_label": "Konten suchen, um sie hinzuzufügen …",
+  "collections.search_accounts_label": "Suche nach Konten, um sie hinzuzufügen …",
   "collections.search_accounts_max_reached": "Du hast die Höchstzahl an Konten hinzugefügt",
   "collections.topic_hint": "Ein Hashtag für diese Sammlung kann anderen dabei helfen, dein Anliegen besser einordnen zu können.",
   "collections.view_collection": "Sammlungen anzeigen",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index fb34eb9ae4..102cf7e7d5 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -141,6 +141,8 @@
   "account.unmute": "Άρση σίγασης @{name}",
   "account.unmute_notifications_short": "Σίγαση ειδοποιήσεων",
   "account.unmute_short": "Κατάργηση σίγασης",
+  "account_edit.column_button": "Έγινε",
+  "account_edit.column_title": "Επεξεργασία Προφίλ",
   "account_note.placeholder": "Κάνε κλικ για να προσθέσεις σημείωση",
   "admin.dashboard.daily_retention": "Ποσοστό χρηστών που παραμένουν μετά την εγγραφή, ανά ημέρα",
   "admin.dashboard.monthly_retention": "Ποσοστό χρηστών που παραμένουν μετά την εγγραφή, ανά μήνα",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index 4060a66613..1e2acb5559 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -141,6 +141,8 @@
   "account.unmute": "Unmute @{name}",
   "account.unmute_notifications_short": "Unmute notifications",
   "account.unmute_short": "Unmute",
+  "account_edit.column_button": "Done",
+  "account_edit.column_title": "Edit Profile",
   "account_note.placeholder": "Click to add note",
   "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
   "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 6070aecbe8..9352ae5166 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -141,6 +141,8 @@
   "account.unmute": "Unmute @{name}",
   "account.unmute_notifications_short": "Unmute notifications",
   "account.unmute_short": "Unmute",
+  "account_edit.column_button": "Done",
+  "account_edit.column_title": "Edit Profile",
   "account_note.placeholder": "Click to add note",
   "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
   "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
@@ -261,6 +263,11 @@
   "collections.create_collection": "Create collection",
   "collections.delete_collection": "Delete collection",
   "collections.description_length_hint": "100 characters limit",
+  "collections.detail.accounts_heading": "Accounts",
+  "collections.detail.curated_by_author": "Curated by {author}",
+  "collections.detail.curated_by_you": "Curated by you",
+  "collections.detail.loading": "Loading collection…",
+  "collections.detail.share": "Share this collection",
   "collections.edit_details": "Edit basic details",
   "collections.edit_settings": "Edit settings",
   "collections.error_loading_collections": "There was an error when trying to load your collections.",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index bc46279ca9..d6856b63ac 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -141,6 +141,8 @@
   "account.unmute": "Dejar de silenciar a @{name}",
   "account.unmute_notifications_short": "Dejar de silenciar notificaciones",
   "account.unmute_short": "Dejar de silenciar",
+  "account_edit.column_button": "Listo",
+  "account_edit.column_title": "Editar perfil",
   "account_note.placeholder": "Hacé clic par agregar una nota",
   "admin.dashboard.daily_retention": "Tasa de retención de usuarios por día, después del registro",
   "admin.dashboard.monthly_retention": "Tasa de retención de usuarios por mes, después del registro",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index c00ce75d71..4f2110f181 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -72,11 +72,11 @@
   "account.go_to_profile": "Ir al perfil",
   "account.hide_reblogs": "Ocultar impulsos de @{name}",
   "account.in_memoriam": "En memoria.",
-  "account.joined_long": "Se unión el {date}",
+  "account.joined_long": "Se unió el {date}",
   "account.joined_short": "Se unió",
   "account.languages": "Cambiar idiomas suscritos",
-  "account.link_verified_on": "El proprietario de este enlace fue comprobado el {date}",
-  "account.locked_info": "El estado de privacidad de esta cuenta està configurado como bloqueado. El proprietario debe revisar manualmente quien puede seguirle.",
+  "account.link_verified_on": "Se verificó la propiedad de este enlace el {date}",
+  "account.locked_info": "El estado de privacidad de esta cuenta está configurado como bloqueado. El propietario revisa manualmente quién puede seguirlo.",
   "account.media": "Multimedia",
   "account.mention": "Mencionar a @{name}",
   "account.menu.add_to_list": "Añadir a lista…",
@@ -141,6 +141,8 @@
   "account.unmute": "Dejar de silenciar a @{name}",
   "account.unmute_notifications_short": "Dejar de silenciar notificaciones",
   "account.unmute_short": "Dejar de silenciar",
+  "account_edit.column_button": "Hecho",
+  "account_edit.column_title": "Editar perfil",
   "account_note.placeholder": "Haz clic para agregar una nota",
   "admin.dashboard.daily_retention": "Tasa de retención de usuarios por día después de unirse",
   "admin.dashboard.monthly_retention": "Tasa de retención de usuarios por mes después de unirse",
@@ -296,9 +298,9 @@
   "column.domain_blocks": "Dominios ocultados",
   "column.edit_list": "Editar lista",
   "column.favourites": "Favoritos",
-  "column.firehose": "Feeds en vivo",
-  "column.firehose_local": "Feed en vivo para este servidor",
-  "column.firehose_singular": "Feed en vivo",
+  "column.firehose": "Cronologías en vivo",
+  "column.firehose_local": "Cronología en vivo para este servidor",
+  "column.firehose_singular": "Cronología en vivo",
   "column.follow_requests": "Solicitudes de seguimiento",
   "column.home": "Inicio",
   "column.list_members": "Administrar miembros de la lista",
@@ -313,7 +315,7 @@
   "column_header.moveRight_settings": "Mover columna a la derecha",
   "column_header.pin": "Fijar",
   "column_header.show_settings": "Mostrar ajustes",
-  "column_header.unpin": "Desfijar",
+  "column_header.unpin": "Dejar de fijar",
   "column_search.cancel": "Cancelar",
   "combobox.close_results": "Cerrar resultados",
   "combobox.loading": "Cargando",
@@ -431,7 +433,7 @@
   "domain_block_modal.you_will_lose_num_followers": "Vas a perder {followersCount, plural, one {{followersCountDisplay} seguidor} other {{followersCountDisplay} seguidores}} y {followingCount, plural, one {{followingCountDisplay} persona a la que sigues} other {{followingCountDisplay} personas a las que sigas}}.",
   "domain_block_modal.you_will_lose_relationships": "Perderás todos los seguidores y las personas que sigues de este servidor.",
   "domain_block_modal.you_wont_see_posts": "No verás publicaciones ni notificaciones de usuarios en este servidor.",
-  "domain_pill.activitypub_lets_connect": "Te permite conectar e interactuar con personas no sólo en Mastodon, sino también a través de diferentes aplicaciones sociales.",
+  "domain_pill.activitypub_lets_connect": "Te permite conectarte e interactuar con personas no solo en Mastodon, sino también en diferentes aplicaciones sociales.",
   "domain_pill.activitypub_like_language": "ActivityPub es como el idioma que Mastodon habla con otras redes sociales.",
   "domain_pill.server": "Servidor",
   "domain_pill.their_handle": "Su alias:",
@@ -475,7 +477,7 @@
   "empty_column.bookmarked_statuses": "Aún no tienes ninguna publicación guardada como marcador. Cuando guardes una, se mostrará aquí.",
   "empty_column.community": "La cronología local está vacía. ¡Escribe algo públicamente para ponerla en marcha!",
   "empty_column.direct": "Aún no tienes ninguna mención privada. Cuando envíes o recibas una, aparecerá aquí.",
-  "empty_column.disabled_feed": "Este feed fue desactivado por los administradores de tu servidor.",
+  "empty_column.disabled_feed": "Esta cronología fue desactivada por los administradores de tu servidor.",
   "empty_column.domain_blocks": "Todavía no hay dominios ocultos.",
   "empty_column.explore_statuses": "Nada es tendencia en este momento. ¡Revisa más tarde!",
   "empty_column.favourited_statuses": "Todavía no tienes publicaciones favoritas. Cuando le des favorito a una publicación se mostrarán acá.",
@@ -506,9 +508,9 @@
   "featured_carousel.header": "{count, plural,one {Publicación fijada}other {Publicaciones fijadas}}",
   "featured_carousel.slide": "Publicación {current, number} de {max, number}",
   "featured_tags.more_items": "+{count}",
-  "filter_modal.added.context_mismatch_explanation": "Esta categoría de filtro no se aplica al contexto en el que has accedido a esta publlicación. Si quieres que la publicación sea filtrada también en este contexto, tendrás que editar el filtro.",
+  "filter_modal.added.context_mismatch_explanation": "Esta categoría de filtro no se aplica al contexto en el que has accedido a esta publicación. Si deseas que la publicación también se filtre en este contexto, tendrás que editar el filtro.",
   "filter_modal.added.context_mismatch_title": "¡El contexto no coincide!",
-  "filter_modal.added.expired_explanation": "Esta categoría de filtro ha caducado, necesitaras cambiar la fecha de caducidad para que se aplique.",
+  "filter_modal.added.expired_explanation": "Esta categoría de filtro ha caducado; deberás cambiar la fecha de caducidad para que se aplique.",
   "filter_modal.added.expired_title": "¡Filtro expirado!",
   "filter_modal.added.review_and_configure": "Para revisar y configurar esta categoría de filtros, vaya a {settings_link}.",
   "filter_modal.added.review_and_configure_title": "Ajustes de filtro",
@@ -746,7 +748,7 @@
   "notification.admin.report_account_other": "{name} reportó {count, plural, one {una publicación} other {# publicaciones}} de {target}",
   "notification.admin.report_statuses": "{name} reportó {target} por {category}",
   "notification.admin.report_statuses_other": "{name} reportó {target}",
-  "notification.admin.sign_up": "{name} se unio",
+  "notification.admin.sign_up": "{name} se registró",
   "notification.admin.sign_up.name_and_others": "{name} y {count, plural, one {# otro} other {# otros}} se registraron",
   "notification.annual_report.message": "¡Tu #Wrapstodon {year} te espera! ¡Desvela los momentos más destacados y memorables de tu año en Mastodon!",
   "notification.annual_report.view": "Ver #Wrapstodon",
@@ -866,17 +868,17 @@
   "onboarding.follows.empty": "Desafortunadamente, no se pueden mostrar resultados en este momento. Puedes intentar usar la búsqueda o navegar por la página de exploración para encontrar gente a la que seguir, o inténtalo de nuevo más tarde.",
   "onboarding.follows.search": "Buscar",
   "onboarding.follows.title": "Sigue personas para comenzar",
-  "onboarding.profile.discoverable": "Make my profile discoverable",
-  "onboarding.profile.discoverable_hint": "Cuando aceptas ser descubierto en Mastodon, tus publicaciones pueden aparecer en resultados de búsqueda y tendencias, y tu perfil puede ser sugerido a personas con intereses similares a los tuyos.",
-  "onboarding.profile.display_name": "Nombre a mostrar",
+  "onboarding.profile.discoverable": "Hacer que mi perfil aparezca en búsquedas",
+  "onboarding.profile.discoverable_hint": "Cuando permites que tu perfil aparezca en búsquedas en Mastodon, tus publicaciones pueden aparecer en los resultados de búsqueda y en las tendencias, y tu perfil puede ser sugerido a personas con intereses similares a los tuyos.",
+  "onboarding.profile.display_name": "Nombre para mostrar",
   "onboarding.profile.display_name_hint": "Tu nombre completo o tu apodo…",
   "onboarding.profile.note": "Biografía",
   "onboarding.profile.note_hint": "Puedes @mencionar a otras personas o #etiquetas…",
   "onboarding.profile.save_and_continue": "Guardar y continuar",
   "onboarding.profile.title": "Configuración del perfil",
   "onboarding.profile.upload_avatar": "Subir foto de perfil",
-  "onboarding.profile.upload_header": "Subir foto de cabecera",
-  "password_confirmation.exceeds_maxlength": "La contraseña de confirmación excede la longitud máxima de la contraseña",
+  "onboarding.profile.upload_header": "Subir encabezado de perfil",
+  "password_confirmation.exceeds_maxlength": "La contraseña de confirmación supera la longitud máxima permitida",
   "password_confirmation.mismatching": "La contraseña de confirmación no coincide",
   "picture_in_picture.restore": "Restaurar",
   "poll.closed": "Cerrada",
@@ -892,14 +894,14 @@
   "privacy.change": "Ajustar privacidad",
   "privacy.direct.long": "Todos los mencionados en la publicación",
   "privacy.direct.short": "Mención privada",
-  "privacy.private.long": "Sólo tus seguidores",
+  "privacy.private.long": "Solo tus seguidores",
   "privacy.private.short": "Seguidores",
   "privacy.public.long": "Cualquiera dentro y fuera de Mastodon",
   "privacy.public.short": "Público",
   "privacy.quote.anyone": "{visibility}, citas permitidas",
   "privacy.quote.disabled": "{visibility}, citas desactivadas",
   "privacy.quote.limited": "{visibility}, citas limitadas",
-  "privacy.unlisted.additional": "Esto se comporta exactamente igual que el público, excepto que el post no aparecerá en las cronologías en directo o en las etiquetas, la exploración o busquedas en Mastodon, incluso si está optado por activar la cuenta de usuario.",
+  "privacy.unlisted.additional": "Esto funciona exactamente igual que «público», excepto que la publicación no aparecerá en las transmisiones en vivo ni en las etiquetas, en «explorar» ni en la búsqueda de Mastodon, incluso si has optado por ello en toda tu cuenta.",
   "privacy.unlisted.long": "Oculto de los resultados de búsquedas, tendencias y cronologías públicas de Mastodon",
   "privacy.unlisted.short": "Pública, pero discreta",
   "privacy_policy.last_updated": "Actualizado por última vez {date}",
@@ -917,7 +919,7 @@
   "relative_time.days": "{number} d",
   "relative_time.full.days": "{number, plural, one {# día} other {# días hace}}",
   "relative_time.full.hours": "{number, plural, one {# hora} other {# horas}} hace",
-  "relative_time.full.just_now": "justo ahora",
+  "relative_time.full.just_now": "ahora mismo",
   "relative_time.full.minutes": "Hace {number, plural, one {# minute} other {# minutos}}",
   "relative_time.full.seconds": "Hace {number, plural, one {# second} other {# segundos}}",
   "relative_time.hours": "{number} h",
@@ -932,7 +934,7 @@
   "reply_indicator.cancel": "Cancelar",
   "reply_indicator.poll": "Encuesta",
   "report.block": "Bloquear",
-  "report.block_explanation": "No veras sus publicaciones. No podrán ver tus publicaciones ni seguirte. Podrán saber que están bloqueados.",
+  "report.block_explanation": "No verás sus publicaciones. Ellos no podrán ver tus publicaciones ni seguirte. Podrán saber que están bloqueados.",
   "report.categories.legal": "Legal",
   "report.categories.other": "Otro",
   "report.categories.spam": "Spam",
@@ -944,7 +946,7 @@
   "report.close": "Realizado",
   "report.comment.title": "¿Hay algo más que creas que deberíamos saber?",
   "report.forward": "Reenviar a {target}",
-  "report.forward_hint": "Esta cuenta es de otro servidor. ¿Enviar una copia anonimizada del informe allí también?",
+  "report.forward_hint": "La cuenta es de otro servidor. ¿Enviar también una copia anónima del informe allí?",
   "report.mute": "Silenciar",
   "report.mute_explanation": "No verás sus publicaciones. Todavía pueden seguirte y ver tus publicaciones y no sabrán que están silenciados.",
   "report.next": "Siguiente",
@@ -970,7 +972,7 @@
   "report.thanks.title": "¿No quieres ver esto?",
   "report.thanks.title_actionable": "Gracias por denunciar, revisaremos esto.",
   "report.unfollow": "Dejar de seguir @{name}",
-  "report.unfollow_explanation": "Estás siguiendo esta cuenta. Para no ver sus publicaciones en tu inicio, deja de seguirla.",
+  "report.unfollow_explanation": "Estás siguiendo esta cuenta. Para dejar de ver sus publicaciones en tu página de inicio, deja de seguirla.",
   "report_notification.attached_statuses": "{count, plural, one {{count} publicación} other {{count} publicaciones}} adjunta(s)",
   "report_notification.categories.legal": "Legal",
   "report_notification.categories.legal_sentence": "contenido ilegal",
@@ -991,7 +993,7 @@
   "search.quick_action.status_search": "Publicaciones que coinciden con {x}",
   "search.search_or_paste": "Buscar o pegar URL",
   "search_popout.full_text_search_disabled_message": "No disponible en {domain}.",
-  "search_popout.full_text_search_logged_out_message": "Sólo disponible al iniciar sesión.",
+  "search_popout.full_text_search_logged_out_message": "Solo disponible al iniciar sesión.",
   "search_popout.language_code": "Código de idioma ISO",
   "search_popout.options": "Opciones de búsqueda",
   "search_popout.quick_actions": "Acciones rápidas",
@@ -1049,8 +1051,8 @@
   "status.history.created": "{name} creó {date}",
   "status.history.edited": "{name} editado {date}",
   "status.load_more": "Cargar más",
-  "status.media.open": "Click para abrir",
-  "status.media.show": "Click para mostrar",
+  "status.media.open": "Haz clic para abrir",
+  "status.media.show": "Haz clic para mostrar",
   "status.media_hidden": "Contenido multimedia oculto",
   "status.mention": "Mencionar @{name}",
   "status.more": "Más",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 0853c5d24d..2ab912530a 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -141,6 +141,8 @@
   "account.unmute": "Kumoa käyttäjän @{name} mykistys",
   "account.unmute_notifications_short": "Kumoa ilmoitusten mykistys",
   "account.unmute_short": "Kumoa mykistys",
+  "account_edit.column_button": "Valmis",
+  "account_edit.column_title": "Muokkaa profiilia",
   "account_note.placeholder": "Lisää muistiinpano napsauttamalla",
   "admin.dashboard.daily_retention": "Käyttäjien pysyvyys päivittäin rekisteröitymisen jälkeen",
   "admin.dashboard.monthly_retention": "Käyttäjien pysyvyys kuukausittain rekisteröitymisen jälkeen",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index 38cf42d500..62a6da238a 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -141,6 +141,8 @@
   "account.unmute": "Doyv ikki @{name}",
   "account.unmute_notifications_short": "Tendra fráboðanir",
   "account.unmute_short": "Doyv ikki",
+  "account_edit.column_button": "Liðugt",
+  "account_edit.column_title": "Rætta vanga",
   "account_note.placeholder": "Klikka fyri at leggja viðmerking afturat",
   "admin.dashboard.daily_retention": "Hvussu nógvir brúkarar eru eftir, síðani tey skrásettu seg, roknað í døgum",
   "admin.dashboard.monthly_retention": "Hvussu nógvir brúkarar eru eftir síðani tey skrásettu seg, roknað í mánaðum",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 8a089aa603..e9a5392676 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -141,6 +141,8 @@
   "account.unmute": "Deixar de silenciar a @{name}",
   "account.unmute_notifications_short": "Reactivar notificacións",
   "account.unmute_short": "Non silenciar",
+  "account_edit.column_button": "Feito",
+  "account_edit.column_title": "Editar perfil",
   "account_note.placeholder": "Preme para engadir nota",
   "admin.dashboard.daily_retention": "Ratio de retención de usuarias diaria após rexistrarse",
   "admin.dashboard.monthly_retention": "Ratio de retención de usuarias mensual após o rexistro",
@@ -244,9 +246,12 @@
   "closed_registrations_modal.preamble": "Mastodon é descentralizado, así que non importa onde crees a conta, poderás seguir e interactuar con calquera conta deste servidor. Incluso podes ter o teu servidor!",
   "closed_registrations_modal.title": "Crear conta en Mastodon",
   "collections.account_count": "{count, plural, one {# conta} other {# contas}}",
+  "collections.accounts.empty_description": "Engade ata {count} contas que segues",
+  "collections.accounts.empty_title": "A colección está baleira",
   "collections.collection_description": "Descrición",
   "collections.collection_name": "Nome",
   "collections.collection_topic": "Temática",
+  "collections.confirm_account_removal": "Tes certeza de querer retirar esta conta desta colección?",
   "collections.content_warning": "Aviso sobre o contido",
   "collections.continue": "Continuar",
   "collections.create.accounts_subtitle": "Só se poden engadir contas que segues e que optaron por ser incluídas en descubrir.",
@@ -261,6 +266,9 @@
   "collections.edit_details": "Editar detalles básicos",
   "collections.edit_settings": "Editar axustes",
   "collections.error_loading_collections": "Houbo un erro ao intentar cargar as túas coleccións.",
+  "collections.hints.accounts_counter": "{count} / {max} contas",
+  "collections.hints.add_more_accounts": "Engade polo menos {count, plural, one {# conta} other {# contas}} para continuar",
+  "collections.hints.can_not_remove_more_accounts": "As coleccións teñen que conter polo menos {count, plural, one {# conta} other {# contas}}. Non é posible retirar máis contas.",
   "collections.last_updated_at": "Última actualización: {date}",
   "collections.manage_accounts": "Xestionar contas",
   "collections.manage_accounts_in_collection": "Xestionar as contas nesta colección",
@@ -269,6 +277,9 @@
   "collections.name_length_hint": "Límite de 100 caracteres",
   "collections.new_collection": "Nova colección",
   "collections.no_collections_yet": "Aínda non tes coleccións.",
+  "collections.remove_account": "Retirar esta conta",
+  "collections.search_accounts_label": "Buscar contas para engadir…",
+  "collections.search_accounts_max_reached": "Acadaches o máximo de contas permitidas",
   "collections.topic_hint": "Engadir un cancelo para que axudar a que outras persoas coñezan a temática desta colección.",
   "collections.view_collection": "Ver colección",
   "collections.visibility_public": "Pública",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 67ddd1c7c7..5a9bf30389 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -141,6 +141,8 @@
   "account.unmute": "הפסקת השתקת @{name}",
   "account.unmute_notifications_short": "הפעלת הודעות",
   "account.unmute_short": "ביטול השתקה",
+  "account_edit.column_button": "סיום",
+  "account_edit.column_title": "עריכת הפרופיל",
   "account_note.placeholder": "יש ללחוץ כדי להוסיף הערות",
   "admin.dashboard.daily_retention": "קצב שימור משתמשים יומי אחרי ההרשמה",
   "admin.dashboard.monthly_retention": "קצב שימור משתמשים (פר חודש) אחרי ההרשמה",
@@ -244,9 +246,12 @@
   "closed_registrations_modal.preamble": "מסטודון הוא רשת מבוזרת, כך שלא משנה היכן החשבון שלך, קיימת האפשרות לעקוב ולתקשר עם משתמשים בשרת הזה. אפשר אפילו להריץ שרת בעצמך!",
   "closed_registrations_modal.title": "להרשם למסטודון",
   "collections.account_count": "{count, plural, one {חשבון אחד} other {# חשבונות}}",
+  "collections.accounts.empty_description": "להוסיף עד ל־{count} חשבונות שאתם עוקבים אחריהם",
+  "collections.accounts.empty_title": "האוסף הזה ריק",
   "collections.collection_description": "תיאור",
   "collections.collection_name": "כינוי",
   "collections.collection_topic": "נושא",
+  "collections.confirm_account_removal": "בוודאות להסיר חשבון זה מהאוסף?",
   "collections.content_warning": "אזהרת תוכן",
   "collections.continue": "המשך",
   "collections.create.accounts_subtitle": "רק חשבונות נעקבים שבחרו להופיע ב\"תגליות\" ניתנים להוספה.",
@@ -261,6 +266,9 @@
   "collections.edit_details": "עריכת פרטים בסיסיים",
   "collections.edit_settings": "עריכת הגדרות",
   "collections.error_loading_collections": "חלה שגיאה בנסיון לטעון את אוספיך.",
+  "collections.hints.accounts_counter": "{count} \\ {max} חשבונות",
+  "collections.hints.add_more_accounts": "הוסיפו לפחות {count, plural,one {חשבון אחד}other {# חשבונות}} כדי להמשיך",
+  "collections.hints.can_not_remove_more_accounts": "אוספים חייבים להכיל לפחות {count, plural,one {חשבון אחד}other {# חשבונות}}. הסרת חשבונות נוספים איננה אפשרית.",
   "collections.last_updated_at": "עדכון אחרון: {date}",
   "collections.manage_accounts": "ניהול חשבונות",
   "collections.manage_accounts_in_collection": "ניהול החשבונות שבאוסף זה",
@@ -269,6 +277,9 @@
   "collections.name_length_hint": "מגבלה של 100 תווים",
   "collections.new_collection": "אוסף חדש",
   "collections.no_collections_yet": "עוד אין אוספים.",
+  "collections.remove_account": "הסר חשבון זה",
+  "collections.search_accounts_label": "לחפש חשבונות להוספה…",
+  "collections.search_accounts_max_reached": "הגעת למספר החשבונות המירבי",
   "collections.topic_hint": "הוספת תגית שמסייעת לאחרים להבין את הנושא הראשי של האוסף.",
   "collections.view_collection": "צפיה באוסף",
   "collections.visibility_public": "פומבי",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index 6b226b64dc..649128d9c5 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -141,6 +141,8 @@
   "account.unmute": "Hætta að þagga niður í @{name}",
   "account.unmute_notifications_short": "Hætta að þagga í tilkynningum",
   "account.unmute_short": "Hætta að þagga niður",
+  "account_edit.column_button": "Lokið",
+  "account_edit.column_title": "Breyta notandasniði",
   "account_note.placeholder": "Smelltu til að bæta við minnispunkti",
   "admin.dashboard.daily_retention": "Hlutfall virkra notenda eftir nýskráningu eftir dögum",
   "admin.dashboard.monthly_retention": "Hlutfall virkra notenda eftir nýskráningu eftir mánuðum",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 901b9b11bb..cf37f6b8e4 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -141,6 +141,8 @@
   "account.unmute": "Riattiva @{name}",
   "account.unmute_notifications_short": "Riattiva notifiche",
   "account.unmute_short": "Attiva audio",
+  "account_edit.column_button": "Fatto",
+  "account_edit.column_title": "Modifica il profilo",
   "account_note.placeholder": "Clicca per aggiungere una nota",
   "admin.dashboard.daily_retention": "Tasso di ritenzione dell'utente per giorno, dopo la registrazione",
   "admin.dashboard.monthly_retention": "Tasso di ritenzione dell'utente per mese, dopo la registrazione",
@@ -244,9 +246,12 @@
   "closed_registrations_modal.preamble": "Mastodon è decentralizzato, quindi, non importa dove crei il tuo profilo, potrai seguire e interagire con chiunque su questo server. Anche se sei tu stesso a ospitarlo!",
   "closed_registrations_modal.title": "Registrazione su Mastodon",
   "collections.account_count": "{count, plural, one {# account} other {# account}}",
+  "collections.accounts.empty_description": "Aggiungi fino a {count} account che segui",
+  "collections.accounts.empty_title": "Questa collezione è vuota",
   "collections.collection_description": "Descrizione",
   "collections.collection_name": "Nome",
   "collections.collection_topic": "Argomento",
+  "collections.confirm_account_removal": "Si è sicuri di voler rimuovere questo account da questa collezione?",
   "collections.content_warning": "Avviso sul contenuto",
   "collections.continue": "Continua",
   "collections.create.accounts_subtitle": "Possono essere aggiunti solo gli account che segui e che hanno aderito alla funzione di scoperta.",
@@ -261,6 +266,9 @@
   "collections.edit_details": "Modifica i dettagli di base",
   "collections.edit_settings": "Modifica impostazioni",
   "collections.error_loading_collections": "Si è verificato un errore durante il tentativo di caricare le tue collezioni.",
+  "collections.hints.accounts_counter": "{count} / {max} account",
+  "collections.hints.add_more_accounts": "Aggiungi almeno {count, plural, one {# account} other {# account}} per continuare",
+  "collections.hints.can_not_remove_more_accounts": "Le collezioni devono contenere almeno {count, plural, one {# account} other {# account}}. La rimozione di altri account, non è possibile.",
   "collections.last_updated_at": "Ultimo aggiornamento: {date}",
   "collections.manage_accounts": "Gestisci account",
   "collections.manage_accounts_in_collection": "Gestisci gli account in questa collezione",
@@ -269,6 +277,9 @@
   "collections.name_length_hint": "Limite di 100 caratteri",
   "collections.new_collection": "Nuova collezione",
   "collections.no_collections_yet": "Nessuna collezione ancora.",
+  "collections.remove_account": "Rimuovi questo account",
+  "collections.search_accounts_label": "Cerca account da aggiungere…",
+  "collections.search_accounts_max_reached": "Hai aggiunto il numero massimo di account",
   "collections.topic_hint": "Aggiungi un hashtag che aiuti gli altri a comprendere l'argomento principale di questa collezione.",
   "collections.view_collection": "Visualizza la collezione",
   "collections.visibility_public": "Pubblica",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index c43224de39..7895d20484 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -13,6 +13,7 @@
   "about.not_available": "Denne informasjonen er ikkje gjort tilgjengeleg på denne tenaren.",
   "about.powered_by": "Desentraliserte sosiale medium drive av {mastodon}",
   "about.rules": "Tenarreglar",
+  "account.about": "Om",
   "account.account_note_header": "Personleg notat",
   "account.activity": "Aktivitet",
   "account.add_note": "Legg til eit personleg notat",
@@ -87,6 +88,7 @@
   "account.menu.hide_reblogs": "Gøym framhevingar på tidslina",
   "account.menu.mention": "Omtale",
   "account.menu.mute": "Demp konto",
+  "account.menu.note.description": "Berre synleg for deg",
   "account.menu.open_original_page": "Vis på {domain}",
   "account.menu.remove_follower": "Fjern fylgjar",
   "account.menu.report": "Rapporter kontoen",
@@ -102,6 +104,13 @@
   "account.muted": "Målbunden",
   "account.muting": "Dempa",
   "account.mutual": "De fylgjer kvarandre",
+  "account.name.help.domain": "{domain} er tenaren som lagrar brukarprofilen og innlegga.",
+  "account.name.help.domain_self": "{domain} er tenaren som lagrar brukarprofilen og innlegga dine.",
+  "account.name.help.footer": "På same måten som du kan senda epost til folk med ulike epostprogram og -kontoar, kan du kommunisera med folk på andre Mastodon-tenarar, og med folk på andre sosiale nettverk som samhandlar på same måte som Mastodon. Det er ActivityPub-protokollen.",
+  "account.name.help.header": "Ei brukaradresse er som ei epostadresse",
+  "account.name.help.username": "{username} er brukarnamnet til denne kontoen på tenaren deira. Folk på andre tenarar kan ha same brukarnamnet.",
+  "account.name.help.username_self": "{username} er brukarnamnet ditt på denne tenaren. Folk på andre tenarar kan ha same brukarnamnet.",
+  "account.name_info": "Kva tyder dette?",
   "account.no_bio": "Inga skildring er gjeven.",
   "account.node_modal.callout": "Berre du kan sjå personlege notat.",
   "account.node_modal.edit_title": "Rediger det personlege notatet",
@@ -234,9 +243,13 @@
   "closed_registrations_modal.find_another_server": "Finn ein annan tenar",
   "closed_registrations_modal.preamble": "Mastodon er desentralisert, så uansett kvar du opprettar ein konto, vil du kunne fylgje og samhandle med alle på denne tenaren. Du kan til og med ha din eigen tenar!",
   "closed_registrations_modal.title": "Registrer deg på Mastodon",
+  "collections.account_count": "{count, plural, one {# konto} other {# kontoar}}",
+  "collections.accounts.empty_description": "Legg til opp til {count} kontoar du fylgjer",
+  "collections.accounts.empty_title": "Denne samlinga er tom",
   "collections.collection_description": "Skildring",
   "collections.collection_name": "Namn",
   "collections.collection_topic": "Emne",
+  "collections.confirm_account_removal": "Er du sikker på at du vil fjerna denne brukarkontoen frå samlinga?",
   "collections.content_warning": "Innhaldsåtvaring",
   "collections.continue": "Hald fram",
   "collections.create.accounts_subtitle": "Du kan berre leggja til kontoar du fylgjer og som har sagt ja til å bli oppdaga.",
@@ -251,6 +264,10 @@
   "collections.edit_details": "Rediger grunnleggjande opplysingar",
   "collections.edit_settings": "Rediger innstillingar",
   "collections.error_loading_collections": "Noko gjekk gale då me prøvde å henta samlingane dine.",
+  "collections.hints.accounts_counter": "{count} av {max} kontoar",
+  "collections.hints.add_more_accounts": "Legg til minst {count, plural, one {# konto} other {# kontoar}} for å halda fram",
+  "collections.hints.can_not_remove_more_accounts": "Samlingar må innehalda minst {count, plural, one {# konto} other {# kontoar}}. Du kan ikkje fjerna fleire kontoar.",
+  "collections.last_updated_at": "Sist oppdatert: {date}",
   "collections.manage_accounts": "Handter kontoar",
   "collections.manage_accounts_in_collection": "Handter kontoar i denne samlinga",
   "collections.mark_as_sensitive": "Merk som ømtolig",
@@ -258,6 +275,9 @@
   "collections.name_length_hint": "Maks 100 teikn",
   "collections.new_collection": "Ny samling",
   "collections.no_collections_yet": "Du har ingen samlingar enno.",
+  "collections.remove_account": "Fjern denne kontoen",
+  "collections.search_accounts_label": "Søk etter kontoar å leggja til…",
+  "collections.search_accounts_max_reached": "Du har nådd grensa for kor mange kontoar du kan leggja til",
   "collections.topic_hint": "Legg til ein emneknagg som hjelper andre å forstå hovudemnet for denne samlinga.",
   "collections.view_collection": "Sjå samlinga",
   "collections.visibility_public": "Offentleg",
@@ -442,6 +462,8 @@
   "emoji_button.search_results": "Søkeresultat",
   "emoji_button.symbols": "Symbol",
   "emoji_button.travel": "Reise & stader",
+  "empty_column.account_about.me": "Du har ikkje skrive noko om deg sjølv enno.",
+  "empty_column.account_about.other": "{acct} har ikkje skrive noko om seg sjølv enno.",
   "empty_column.account_featured.me": "Du har ikkje valt ut noko enno. Visste du at du kan velja ut emneknaggar du bruker mykje, og til og med venekontoar på profilen din?",
   "empty_column.account_featured.other": "{acct} har ikkje valt ut noko enno. Visste du at du kan velja ut emneknaggar du bruker mykje, og til og med venekontoar på profilen din?",
   "empty_column.account_featured_other.unknown": "Denne kontoen har ikkje valt ut noko enno.",
@@ -525,6 +547,8 @@
   "follow_suggestions.view_all": "Vis alle",
   "follow_suggestions.who_to_follow": "Kven du kan fylgja",
   "followed_tags": "Fylgde emneknaggar",
+  "followers.hide_other_followers": "Denne personen har valt å ikkje syna dei andre fylgjarane sine",
+  "following.hide_other_following": "Denne personen har valt å ikkje syna kven andre dei fylgjer",
   "footer.about": "Om",
   "footer.about_mastodon": "Om Mastodon",
   "footer.about_server": "Om {domain}",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index 220f50ab6a..e0ddb7fbaf 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -141,6 +141,8 @@
   "account.unmute": "Ktheji zërin @{name}",
   "account.unmute_notifications_short": "Shfaqi njoftimet",
   "account.unmute_short": "Çheshtoje",
+  "account_edit.column_button": "U bë",
+  "account_edit.column_title": "Përpunoni Profil",
   "account_note.placeholder": "Klikoni për të shtuar shënim",
   "admin.dashboard.daily_retention": "Shkallë mbajtjeje përdoruesi, në ditë, pas regjistrimit",
   "admin.dashboard.monthly_retention": "Shkallë mbajtjeje përdoruesi, në muaj, pas regjistrimit",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index 22255265ee..80a1fe8bf3 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -92,6 +92,8 @@
   "account.unmute": "Sluta tysta @{name}",
   "account.unmute_notifications_short": "Aktivera aviseringsljud",
   "account.unmute_short": "Avtysta",
+  "account_edit.column_button": "Klar",
+  "account_edit.column_title": "Redigera profil",
   "account_note.placeholder": "Klicka för att lägga till anteckning",
   "admin.dashboard.daily_retention": "Användarlojalitet per dag efter registrering",
   "admin.dashboard.monthly_retention": "Användarlojalitet per månad efter registrering",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 809307d038..6efc24ac74 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -244,9 +244,12 @@
   "closed_registrations_modal.preamble": "Mastodon merkeziyetsizdir, bu yüzden hesabınızı nerede oluşturursanız oluşturun, bu sunucudaki herhangi birini takip edebilecek veya onunla etkileşebileceksiniz. Hatta kendi sunucunuzu bile barındırabilirsiniz!",
   "closed_registrations_modal.title": "Mastodon'a kayıt olmak",
   "collections.account_count": "{count, plural, one {# hesap} other {# hesap}}",
+  "collections.accounts.empty_description": "Takip ettiğiniz hesapların sayısını {count} kadar artırın",
+  "collections.accounts.empty_title": "Bu koleksiyon boş",
   "collections.collection_description": "Açıklama",
   "collections.collection_name": "Ad",
   "collections.collection_topic": "Konu",
+  "collections.confirm_account_removal": "Bu hesabı bu koleksiyondan çıkarmak istediğinizden emin misiniz?",
   "collections.content_warning": "İçerik uyarısı",
   "collections.continue": "Devam et",
   "collections.create.accounts_subtitle": "Yalnızca keşif seçeneğini etkinleştirmiş takip ettiğiniz hesaplar eklenebilir.",
@@ -261,6 +264,9 @@
   "collections.edit_details": "Temel bilgileri düzenle",
   "collections.edit_settings": "Ayarları düzenle",
   "collections.error_loading_collections": "Koleksiyonlarınızı yüklemeye çalışırken bir hata oluştu.",
+  "collections.hints.accounts_counter": "{count} / {max} hesap",
+  "collections.hints.add_more_accounts": "Devam etmek için en az {count, plural, one {# hesap} other {# hesap}} ekleyin",
+  "collections.hints.can_not_remove_more_accounts": "Koleksiyonlar en azından {count, plural, one {# hesap} other {# hesap}} içermelidir. Daha fazla hesap çıkarmak mümkün değil.",
   "collections.last_updated_at": "Son güncelleme: {date}",
   "collections.manage_accounts": "Hesapları yönet",
   "collections.manage_accounts_in_collection": "Bu koleksiyondaki hesapları yönet",
@@ -269,6 +275,9 @@
   "collections.name_length_hint": "100 karakterle sınırlı",
   "collections.new_collection": "Yeni koleksiyon",
   "collections.no_collections_yet": "Henüz hiçbir koleksiyon yok.",
+  "collections.remove_account": "Bu hesabı çıkar",
+  "collections.search_accounts_label": "Eklemek için hesap arayın…",
+  "collections.search_accounts_max_reached": "Maksimum hesabı eklediniz",
   "collections.topic_hint": "Bu koleksiyonun ana konusunu başkalarının anlamasına yardımcı olacak bir etiket ekleyin.",
   "collections.view_collection": "Koleksiyonu görüntüle",
   "collections.visibility_public": "Herkese açık",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index d0fb3aac97..09deb8244f 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -141,6 +141,8 @@
   "account.unmute": "Bỏ phớt lờ @{name}",
   "account.unmute_notifications_short": "Bỏ phớt lờ thông báo",
   "account.unmute_short": "Bỏ phớt lờ",
+  "account_edit.column_button": "Xong",
+  "account_edit.column_title": "Sửa hồ sơ",
   "account_note.placeholder": "Nhấn để thêm",
   "admin.dashboard.daily_retention": "Tỉ lệ người dùng sau đăng ký ở lại theo ngày",
   "admin.dashboard.monthly_retention": "Tỉ lệ người dùng ở lại sau khi đăng ký",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index fed0065f88..b5798703f1 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -141,6 +141,8 @@
   "account.unmute": "解除靜音 @{name}",
   "account.unmute_notifications_short": "解除靜音推播通知",
   "account.unmute_short": "解除靜音",
+  "account_edit.column_button": "完成",
+  "account_edit.column_title": "編輯個人檔案",
   "account_note.placeholder": "點擊以新增備註",
   "admin.dashboard.daily_retention": "註冊後使用者存留率（日）",
   "admin.dashboard.monthly_retention": "註冊後使用者存留率（月）",
@@ -245,7 +247,7 @@
   "closed_registrations_modal.title": "註冊 Mastodon",
   "collections.account_count": "{count, plural, other {# 個帳號}}",
   "collections.accounts.empty_description": "加入最多 {count} 個您跟隨之帳號",
-  "collections.accounts.empty_title": "此收藏是名單空的",
+  "collections.accounts.empty_title": "此收藏名單是空的",
   "collections.collection_description": "說明",
   "collections.collection_name": "名稱",
   "collections.collection_topic": "主題",
diff --git a/app/javascript/mastodon/models/account.ts b/app/javascript/mastodon/models/account.ts
index bd099b2334..b834a022ad 100644
--- a/app/javascript/mastodon/models/account.ts
+++ b/app/javascript/mastodon/models/account.ts
@@ -14,7 +14,7 @@ import { CustomEmojiFactory } from './custom_emoji';
 import type { CustomEmoji } from './custom_emoji';
 
 // AccountField
-interface AccountFieldShape extends Required<ApiAccountFieldJSON> {
+export interface AccountFieldShape extends Required<ApiAccountFieldJSON> {
   name_emojified: string;
   value_emojified: string;
   value_plain: string | null;
diff --git a/app/javascript/mastodon/utils/environment.ts b/app/javascript/mastodon/utils/environment.ts
index 5f736fa80c..58421817ad 100644
--- a/app/javascript/mastodon/utils/environment.ts
+++ b/app/javascript/mastodon/utils/environment.ts
@@ -18,7 +18,7 @@ export function isServerFeatureEnabled(feature: ServerFeatures) {
   return initialState?.features.includes(feature) ?? false;
 }
 
-type ClientFeatures = 'collections';
+type ClientFeatures = 'collections' | 'profile_editing';
 
 export function isClientFeatureEnabled(feature: ClientFeatures) {
   try {
diff --git a/app/javascript/material-icons/400-24px/more_vert-fill.svg b/app/javascript/material-icons/400-24px/more_vert-fill.svg
new file mode 100644
index 0000000000..e172f878a6
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/more_vert-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M480-160q-33 0-56.5-23.5T400-240q0-33 23.5-56.5T480-320q33 0 56.5 23.5T560-240q0 33-23.5 56.5T480-160Zm0-240q-33 0-56.5-23.5T400-480q0-33 23.5-56.5T480-560q33 0 56.5 23.5T560-480q0 33-23.5 56.5T480-400Zm0-240q-33 0-56.5-23.5T400-720q0-33 23.5-56.5T480-800q33 0 56.5 23.5T560-720q0 33-23.5 56.5T480-640Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/more_vert.svg b/app/javascript/material-icons/400-24px/more_vert.svg
new file mode 100644
index 0000000000..e172f878a6
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/more_vert.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M480-160q-33 0-56.5-23.5T400-240q0-33 23.5-56.5T480-320q33 0 56.5 23.5T560-240q0 33-23.5 56.5T480-160Zm0-240q-33 0-56.5-23.5T400-480q0-33 23.5-56.5T480-560q33 0 56.5 23.5T560-480q0 33-23.5 56.5T480-400Zm0-240q-33 0-56.5-23.5T400-720q0-33 23.5-56.5T480-800q33 0 56.5 23.5T560-720q0 33-23.5 56.5T480-640Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index cd3c975279..cfa5d068d3 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -4192,7 +4192,8 @@ a.account__display-name {
     cursor: pointer;
 
     & > div {
-      background: rgb(from var(--color-shadow-primary) r g b / 60%);
+      color: var(--color-text-on-media);
+      background: rgb(from var(--color-bg-media) r g b / 60%);
       border-radius: 8px;
       padding: 12px 9px;
       backdrop-filter: $backdrop-blur-filter;
@@ -4205,7 +4206,7 @@ a.account__display-name {
     button,
     a {
       display: inline;
-      color: var(--color-text-primary);
+      color: var(--color-text-on-media);
       background: transparent;
       border: 0;
       padding: 0 8px;
@@ -4216,7 +4217,7 @@ a.account__display-name {
       &:hover,
       &:active,
       &:focus {
-        color: var(--color-text-primary);
+        color: var(--color-text-on-media);
       }
     }
 
diff --git a/app/lib/fasp/request.rb b/app/lib/fasp/request.rb
index 51950a004a..526a8bf31b 100644
--- a/app/lib/fasp/request.rb
+++ b/app/lib/fasp/request.rb
@@ -27,9 +27,9 @@ class Fasp::Request
     headers = request_headers(verb, url, body)
     key = Linzer.new_ed25519_key(@provider.server_private_key_pem, @provider.remote_identifier)
     response = HTTP
-               .headers(headers)
-               .use(http_signature: { key:, covered_components: COVERED_COMPONENTS })
-               .send(verb, url, body:)
+      .headers(headers)
+      .use(http_signature: { key:, covered_components: COVERED_COMPONENTS })
+      .send(verb, url, body:)
 
     validate!(response)
     @provider.delivery_failure_tracker.track_success!
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index 62a5563553..d5d1dce21a 100644
--- a/app/lib/feed_manager.rb
+++ b/app/lib/feed_manager.rb
@@ -239,10 +239,10 @@ class FeedManager
     # This is a bit tricky because we need posts tagged with this hashtag that are not
     # also tagged with another followed hashtag or from a followed user
     scope = from_tag.statuses
-                    .where(id: timeline_status_ids)
-                    .where.not(account: into_account)
-                    .where.not(account: into_account.following)
-                    .tagged_with_none(TagFollow.where(account: into_account).pluck(:tag_id))
+      .where(id: timeline_status_ids)
+      .where.not(account: into_account)
+      .where.not(account: into_account.following)
+      .tagged_with_none(TagFollow.where(account: into_account).pluck(:tag_id))
 
     scope.select(:id, :reblog_of_id).reorder(nil).find_each do |status|
       remove_from_feed(:home, into_account.id, status, aggregate_reblogs: into_account.user&.aggregates_reblogs?)
diff --git a/app/lib/vacuum/statuses_vacuum.rb b/app/lib/vacuum/statuses_vacuum.rb
index 92d3ccf4f4..3e3d55731d 100644
--- a/app/lib/vacuum/statuses_vacuum.rb
+++ b/app/lib/vacuum/statuses_vacuum.rb
@@ -18,8 +18,8 @@ class Vacuum::StatusesVacuum
       # Side-effects not covered by foreign keys, such
       # as the search index, must be handled first.
       statuses.direct_visibility
-              .includes(mentions: :account)
-              .find_each(&:unlink_from_conversations!)
+        .includes(mentions: :account)
+        .find_each(&:unlink_from_conversations!)
       if Chewy.enabled?
         remove_from_index(statuses.ids, 'chewy:queue:StatusesIndex')
         remove_from_index(statuses.ids, 'chewy:queue:PublicStatusesIndex')
@@ -33,8 +33,8 @@ class Vacuum::StatusesVacuum
 
   def statuses_scope
     Status.unscoped.kept
-          .joins(:account).merge(Account.remote)
-          .where(statuses: { id: ...retention_period_as_id })
+      .joins(:account).merge(Account.remote)
+      .where(statuses: { id: ...retention_period_as_id })
   end
 
   def retention_period_as_id
diff --git a/app/models/account.rb b/app/models/account.rb
index 31292d5eff..6538df90ab 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -46,6 +46,9 @@
 #  reviewed_at                   :datetime
 #  sensitized_at                 :datetime
 #  shared_inbox_url              :string           default(""), not null
+#  show_featured                 :boolean          default(TRUE), not null
+#  show_media                    :boolean          default(TRUE), not null
+#  show_media_replies            :boolean          default(TRUE), not null
 #  silenced_at                   :datetime
 #  suspended_at                  :datetime
 #  suspension_origin             :integer
diff --git a/app/models/concerns/account/interactions.rb b/app/models/concerns/account/interactions.rb
index e204ddb795..7020491f42 100644
--- a/app/models/concerns/account/interactions.rb
+++ b/app/models/concerns/account/interactions.rb
@@ -45,7 +45,7 @@ module Account::Interactions
 
   def follow!(other_account, reblogs: nil, notify: nil, languages: nil, uri: nil, rate_limit: false, bypass_limit: false)
     rel = active_relationships.create_with(show_reblogs: reblogs.nil? || reblogs, notify: notify.nil? ? false : notify, languages: languages, uri: uri, rate_limit: rate_limit, bypass_follow_limit: bypass_limit)
-                              .find_or_create_by!(target_account: other_account)
+      .find_or_create_by!(target_account: other_account)
 
     rel.show_reblogs = reblogs   unless reblogs.nil?
     rel.notify       = notify    unless notify.nil?
@@ -58,7 +58,7 @@ module Account::Interactions
 
   def request_follow!(other_account, reblogs: nil, notify: nil, languages: nil, uri: nil, rate_limit: false, bypass_limit: false)
     rel = follow_requests.create_with(show_reblogs: reblogs.nil? || reblogs, notify: notify.nil? ? false : notify, uri: uri, languages: languages, rate_limit: rate_limit, bypass_follow_limit: bypass_limit)
-                         .find_or_create_by!(target_account: other_account)
+      .find_or_create_by!(target_account: other_account)
 
     rel.show_reblogs = reblogs   unless reblogs.nil?
     rel.notify       = notify    unless notify.nil?
@@ -71,7 +71,7 @@ module Account::Interactions
 
   def block!(other_account, uri: nil)
     block_relationships.create_with(uri: uri)
-                       .find_or_create_by!(target_account: other_account)
+      .find_or_create_by!(target_account: other_account)
   end
 
   def mute!(other_account, notifications: nil, duration: 0)
@@ -215,14 +215,14 @@ module Account::Interactions
 
   def followers_for_local_distribution
     followers.local
-             .joins(:user)
-             .merge(User.signed_in_recently)
+      .joins(:user)
+      .merge(User.signed_in_recently)
   end
 
   def lists_for_local_distribution
     scope = lists.joins(account: :user)
     scope.where.not(list_accounts: { follow_id: nil }).or(scope.where(account_id: id))
-         .merge(User.signed_in_recently)
+      .merge(User.signed_in_recently)
   end
 
   def remote_followers_hash(url)
diff --git a/app/models/concerns/fasp/provider/debug_concern.rb b/app/models/concerns/fasp/provider/debug_concern.rb
index eee046a17f..2c0f73337d 100644
--- a/app/models/concerns/fasp/provider/debug_concern.rb
+++ b/app/models/concerns/fasp/provider/debug_concern.rb
@@ -5,6 +5,6 @@ module Fasp::Provider::DebugConcern
 
   def perform_debug_call
     Fasp::Request.new(self)
-                 .post('/debug/v0/callback/logs', body: { hello: 'world' })
+      .post('/debug/v0/callback/logs', body: { hello: 'world' })
   end
 end
diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb
index 0c8fecb198..7fdeda15aa 100644
--- a/app/models/media_attachment.rb
+++ b/app/models/media_attachment.rb
@@ -216,11 +216,11 @@ class MediaAttachment < ApplicationRecord
   scope :updated_before, ->(value) { where(arel_table[:updated_at].lt(value)) }
   scope :without_local_interaction, lambda {
     where.not(Favourite.joins(:account).merge(Account.local).where(Favourite.arel_table[:status_id].eq(MediaAttachment.arel_table[:status_id])).select(1).arel.exists)
-         .where.not(Bookmark.where(Bookmark.arel_table[:status_id].eq(MediaAttachment.arel_table[:status_id])).select(1).arel.exists)
-         .where.not(Status.local.where(Status.arel_table[:in_reply_to_id].eq(MediaAttachment.arel_table[:status_id])).select(1).arel.exists)
-         .where.not(Status.local.where(Status.arel_table[:reblog_of_id].eq(MediaAttachment.arel_table[:status_id])).select(1).arel.exists)
-         .where.not(Quote.joins(:status).merge(Status.local).where(Quote.arel_table[:quoted_status_id].eq(MediaAttachment.arel_table[:status_id])).select(1).arel.exists)
-         .where.not(Quote.joins(:quoted_status).merge(Status.local).where(Quote.arel_table[:status_id].eq(MediaAttachment.arel_table[:status_id])).select(1).arel.exists)
+      .where.not(Bookmark.where(Bookmark.arel_table[:status_id].eq(MediaAttachment.arel_table[:status_id])).select(1).arel.exists)
+      .where.not(Status.local.where(Status.arel_table[:in_reply_to_id].eq(MediaAttachment.arel_table[:status_id])).select(1).arel.exists)
+      .where.not(Status.local.where(Status.arel_table[:reblog_of_id].eq(MediaAttachment.arel_table[:status_id])).select(1).arel.exists)
+      .where.not(Quote.joins(:status).merge(Status.local).where(Quote.arel_table[:quoted_status_id].eq(MediaAttachment.arel_table[:status_id])).select(1).arel.exists)
+      .where.not(Quote.joins(:quoted_status).merge(Status.local).where(Quote.arel_table[:status_id].eq(MediaAttachment.arel_table[:status_id])).select(1).arel.exists)
   }
 
   attr_accessor :skip_download
diff --git a/app/models/tag.rb b/app/models/tag.rb
index 9c4e0510a9..b87fbc4246 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -135,8 +135,8 @@ class Tag < ApplicationRecord
       query = query.merge(matching_name(stripped_term).or(reviewed)) if options[:exclude_unreviewed]
 
       query.order(Arel.sql('LENGTH(name)').asc, name: :asc)
-           .limit(limit)
-           .offset(offset)
+        .limit(limit)
+        .offset(offset)
     end
 
     def find_normalized(name)
diff --git a/app/models/trends/preview_card_filter.rb b/app/models/trends/preview_card_filter.rb
index ef36ba9878..2af01afca3 100644
--- a/app/models/trends/preview_card_filter.rb
+++ b/app/models/trends/preview_card_filter.rb
@@ -30,9 +30,9 @@ class Trends::PreviewCardFilter
 
   def initial_scope
     PreviewCard.select(PreviewCard.arel_table[Arel.star])
-               .joins(:trend)
-               .eager_load(:trend)
-               .reorder(score: :desc)
+      .joins(:trend)
+      .eager_load(:trend)
+      .reorder(score: :desc)
   end
 
   def scope_for(key, value)
diff --git a/app/models/trends/status_filter.rb b/app/models/trends/status_filter.rb
index da240251fd..fc865265a0 100644
--- a/app/models/trends/status_filter.rb
+++ b/app/models/trends/status_filter.rb
@@ -30,9 +30,9 @@ class Trends::StatusFilter
 
   def initial_scope
     Status.select(Status.arel_table[Arel.star])
-          .joins(:trend)
-          .eager_load(:trend)
-          .reorder(score: :desc)
+      .joins(:trend)
+      .eager_load(:trend)
+      .reorder(score: :desc)
   end
 
   def scope_for(key, value)
diff --git a/app/models/trends/tag_filter.rb b/app/models/trends/tag_filter.rb
index 02d558ac25..7177331963 100644
--- a/app/models/trends/tag_filter.rb
+++ b/app/models/trends/tag_filter.rb
@@ -30,9 +30,9 @@ class Trends::TagFilter
 
   def initial_scope
     Tag.select(Tag.arel_table[Arel.star])
-       .joins(:trend)
-       .eager_load(:trend)
-       .reorder(score: :desc)
+      .joins(:trend)
+      .eager_load(:trend)
+      .reorder(score: :desc)
   end
 
   def scope_for(key, value)
diff --git a/app/serializers/rest/account_serializer.rb b/app/serializers/rest/account_serializer.rb
index 12a8472fca..2b2c74d879 100644
--- a/app/serializers/rest/account_serializer.rb
+++ b/app/serializers/rest/account_serializer.rb
@@ -8,7 +8,8 @@ class REST::AccountSerializer < ActiveModel::Serializer
 
   attributes :id, :username, :acct, :display_name, :locked, :bot, :discoverable, :indexable, :group, :created_at,
              :note, :url, :uri, :avatar, :avatar_static, :avatar_description, :header, :header_static, :header_description,
-             :followers_count, :following_count, :statuses_count, :last_status_at, :hide_collections
+             :followers_count, :following_count, :statuses_count, :last_status_at, :hide_collections,
+             :show_media, :show_media_replies, :show_featured
 
   has_one :moved_to_account, key: :moved, serializer: REST::AccountSerializer, if: :moved_and_not_nested?
 
diff --git a/app/services/activitypub/fetch_all_replies_service.rb b/app/services/activitypub/fetch_all_replies_service.rb
index a956e7c706..ab5f52761b 100644
--- a/app/services/activitypub/fetch_all_replies_service.rb
+++ b/app/services/activitypub/fetch_all_replies_service.rb
@@ -33,10 +33,10 @@ class ActivityPub::FetchAllRepliesService < ActivityPub::FetchRepliesService
     parent_id = Status.where(uri: @status_uri).pick(:id)
     unless parent_id.nil?
       unsubscribed_replies = Status
-                             .where.not(uri: uris)
-                             .where(in_reply_to_id: parent_id)
-                             .unsubscribed
-                             .pluck(:uri)
+        .where.not(uri: uris)
+        .where(in_reply_to_id: parent_id)
+        .unsubscribed
+        .pluck(:uri)
       uris.concat(unsubscribed_replies)
     end
 
diff --git a/app/workers/activitypub/post_upgrade_worker.rb b/app/workers/activitypub/post_upgrade_worker.rb
index 4154b8582b..8de4a07ec1 100644
--- a/app/workers/activitypub/post_upgrade_worker.rb
+++ b/app/workers/activitypub/post_upgrade_worker.rb
@@ -7,9 +7,9 @@ class ActivityPub::PostUpgradeWorker
 
   def perform(domain)
     Account.where(domain: domain)
-           .where(protocol: :ostatus)
-           .where.not(last_webfingered_at: nil)
-           .in_batches
-           .update_all(last_webfingered_at: nil)
+      .where(protocol: :ostatus)
+      .where.not(last_webfingered_at: nil)
+      .in_batches
+      .update_all(last_webfingered_at: nil)
   end
 end
diff --git a/app/workers/move_worker.rb b/app/workers/move_worker.rb
index faf576c731..76d3765c1c 100644
--- a/app/workers/move_worker.rb
+++ b/app/workers/move_worker.rb
@@ -48,11 +48,11 @@ class MoveWorker
     source_local_followers
       .where(account: @target_account.followers.local)
       .in_batches do |follows|
-      ListAccount.where(follow: follows).includes(:list).find_each do |list_account|
-        list_account.list.accounts << @target_account
-      rescue ActiveRecord::RecordInvalid
-        nil
-      end
+        ListAccount.where(follow: follows).includes(:list).find_each do |list_account|
+          list_account.list.accounts << @target_account
+        rescue ActiveRecord::RecordInvalid
+          nil
+        end
     end
 
     # Finally, handle the common case of accounts not following the new account
@@ -60,18 +60,18 @@ class MoveWorker
       .where.not(account: @target_account.followers.local)
       .where.not(account_id: @target_account.id)
       .in_batches do |follows|
-      ListAccount.where(follow: follows).in_batches.update_all(account_id: @target_account.id)
-      num_moved += follows.update_all(target_account_id: @target_account.id)
+        ListAccount.where(follow: follows).in_batches.update_all(account_id: @target_account.id)
+        num_moved += follows.update_all(target_account_id: @target_account.id)
 
-      # Clear any relationship cache, since callbacks are not called
-      Rails.cache.delete_multi(follows.flat_map do |follow|
-        [
-          ['relationships', follow.account_id, follow.target_account_id],
-          ['relationships', follow.target_account_id, follow.account_id],
-          ['relationships', follow.account_id, @target_account.id],
-          ['relationships', @target_account.id, follow.account_id],
-        ]
-      end)
+        # Clear any relationship cache, since callbacks are not called
+        Rails.cache.delete_multi(follows.flat_map do |follow|
+          [
+            ['relationships', follow.account_id, follow.target_account_id],
+            ['relationships', follow.target_account_id, follow.account_id],
+            ['relationships', follow.account_id, @target_account.id],
+            ['relationships', @target_account.id, follow.account_id],
+          ]
+        end)
     end
 
     num_moved
diff --git a/config/locales/doorkeeper.ar.yml b/config/locales/doorkeeper.ar.yml
index 62633ed22c..b26829cab2 100644
--- a/config/locales/doorkeeper.ar.yml
+++ b/config/locales/doorkeeper.ar.yml
@@ -83,7 +83,6 @@ ar:
         access_denied: لقد رفض مالك المَورِدِ أو تصريح السيرفر طلبك.
         credential_flow_not_configured: فشل تدفق بيانات اعتماد كلمة سر مالك المورد بسبب عدم تهيئة Doorkeeper.configure.resource_owner_from_credentials.
         invalid_client: فشلت المصادقة مع العميل لأنه العميل مجهول أو لغياب المصادقة ضمن العميل أو أنّ أسلوب المصادقة غير مدعومة.
-        invalid_code_challenge_method: يجب أن تكون طريقة تحدي الكود S256، البسيط غير مدعوم.
         invalid_grant: إنّ التصريح المقدَّم غير صالح، سواء انتهت مدة صلاحيته أو تم إلغاؤه أو أنه لا يتطابق مع عنوان إعادة التحويل في طلب التصريح أو أنّ هذا التصريح قد تم تقديمه لعميل آخر.
         invalid_redirect_uri: إنّ عنوان إعادة التحويل غير صالح.
         invalid_request:
diff --git a/config/locales/doorkeeper.be.yml b/config/locales/doorkeeper.be.yml
index 45fa4ba1be..ef130993b2 100644
--- a/config/locales/doorkeeper.be.yml
+++ b/config/locales/doorkeeper.be.yml
@@ -83,7 +83,10 @@ be:
         access_denied: Уласнік рэсурсу або сэрвер аўтарызацыі адхіліў ваш запыт.
         credential_flow_not_configured: Resource Owner Password Credentials flow не прайшоў з-за таго, што ўласцівасць Doorkeeper.configure.resource_owner_from_credentials была не вызначана.
         invalid_client: Збой аўтэнтыфікацыі кліента з-за невядомага кліента, адсутнасці аўтэнтыфікацыі кліента або метаду аўтэнтыфікацыі, які не падтрымліваецца.
-        invalid_code_challenge_method: Метад праверкі кода павінен быць S256, просты тэкст не падтрымліваецца.
+        invalid_code_challenge_method:
+          one: code_challenge_method павінен быць %{challenge_methods}.
+          other: code_challenge_method павінен быць адным з %{challenge_methods}.
+          zero: Сервер аўтарызацыі не падтрымлівае PKCE, паколькі няма прынятых значэнняў у code_challenge_method.
         invalid_grant: Прадастаўлены дазвол на аўтарызацыю несапраўдны, пратэрмінованы, быў адкліканы, не адпавядае URI перанакіравання, які выкарыстоўваецца ў запыце аўтарызацыі або быў выдадзены іншаму кліенту.
         invalid_redirect_uri: Прадстаўлены URI перанакіравання не сапраўдны.
         invalid_request:
diff --git a/config/locales/doorkeeper.bg.yml b/config/locales/doorkeeper.bg.yml
index c3977e5844..ed4761badd 100644
--- a/config/locales/doorkeeper.bg.yml
+++ b/config/locales/doorkeeper.bg.yml
@@ -83,7 +83,6 @@ bg:
         access_denied: Заявката беше отказана от собственика на ресурса или от сървъра за упълномощаване.
         credential_flow_not_configured: Resource Owner Password Credentials предизвика грешка, заради това, че настройките за Doorkeeper.configure.resource_owner_from_credentials липсват.
         invalid_client: Удостоверяването на клиента предизвика грешка, поради непознат клиент, липсващо клиентско удостоверяване, или заради това, че методът на удостоверяване не се поддържа.
-        invalid_code_challenge_method: Методът на предизвикателството на кода трябва да е S256, обикновен не се поддържа.
         invalid_grant: Предоставеното удостоверение за достъп е невалидно, изтекло, отхвърлено, не съвпада с пренасочващото URI, използвано в заявката за удостоверение, или е бил издадено от друг клиент.
         invalid_redirect_uri: Включеният пренасочващ Uri е невалиден.
         invalid_request:
diff --git a/config/locales/doorkeeper.ca.yml b/config/locales/doorkeeper.ca.yml
index 590339fe88..11a6ac94b0 100644
--- a/config/locales/doorkeeper.ca.yml
+++ b/config/locales/doorkeeper.ca.yml
@@ -83,7 +83,6 @@ ca:
         access_denied: El propietari del recurs o servidor d'autorizació ha denegat la petició.
         credential_flow_not_configured: Les credencials de contrasenya del propietari del recurs han fallat degut a que Doorkeeper.configure.resource_owner_from_credentials està sense configurar.
         invalid_client: La autentificació del client ha fallat perquè és un client desconegut o no està inclòsa l'autentificació del client o el mètode d'autenticació no està confirmat.
-        invalid_code_challenge_method: El mètode de desafiament de codi ha de ser S256, no es permet que sigui pla.
         invalid_grant: La concessió d'autorizació oferta és invàlida, ha vençut, s'ha revocat, no coincideix amb l'URI de redirecció utilizada en la petició d'autorizació, o fou emesa per a un altre client.
         invalid_redirect_uri: L'uri de redirecció inclòsa no és vàlida.
         invalid_request:
diff --git a/config/locales/doorkeeper.cs.yml b/config/locales/doorkeeper.cs.yml
index b435624334..ff8d942120 100644
--- a/config/locales/doorkeeper.cs.yml
+++ b/config/locales/doorkeeper.cs.yml
@@ -83,7 +83,6 @@ cs:
         access_denied: Vlastník zdroje či autorizační server žádost zamítl.
         credential_flow_not_configured: Proud Resource Owner Password Credentials selhal, protože Doorkeeper.configure.resource_owner_from_credentials nebylo nakonfigurováno.
         invalid_client: Ověření klienta selhalo kvůli neznámému klientovi, chybějící klientské autentizaci či nepodporované autentizační metodě.
-        invalid_code_challenge_method: Metoda code challenge musí být S256, plain není podporována.
         invalid_grant: Poskytnuté oprávnění je neplatné, vypršela jeho platnost, bylo odvoláno, neshoduje se s URI přesměrování použitým v požadavku o autorizaci, nebo bylo uděleno jinému klientu.
         invalid_redirect_uri: Zahrnutá přesměrovací URI není platná.
         invalid_request:
diff --git a/config/locales/doorkeeper.cy.yml b/config/locales/doorkeeper.cy.yml
index 32f5055b6c..bfdb77e7f0 100644
--- a/config/locales/doorkeeper.cy.yml
+++ b/config/locales/doorkeeper.cy.yml
@@ -83,7 +83,6 @@ cy:
         access_denied: Mae perchennog yr adnodd neu'r gweinydd awdurdodi wedi atal y cais.
         credential_flow_not_configured: Llif meini prawf cyfrinair perchennog yr adnodd wedi methu achos fod Doorkeeper.configure.resource_owner_from_credentials heb ei ffurfweddu.
         invalid_client: Methodd dilysu cleient oherwydd cleient anhysbys, dim dilysiad cleient wedi'i gynnwys, neu ddull dilysu heb ei gefnogi.
-        invalid_code_challenge_method: Rhaid i'r dull herio cod fod yn S256, nid oes cefnogaeth i'r plaen.
         invalid_grant: Mae'r grant awdurdodi ar yr amod yn annilys, wedi dod i ben, wedi'i ddirymu, nid yw'n cyfateb i'r URI ailgyfeirio a ddefnyddiwyd yn y cais am awdurdodiad, neu wedi'i roi i gleient arall.
         invalid_redirect_uri: Nid yw'r uri ailgyfeirio a gynhwysir yn ddilys.
         invalid_request:
diff --git a/config/locales/doorkeeper.da.yml b/config/locales/doorkeeper.da.yml
index 49917c8ebc..14c116f733 100644
--- a/config/locales/doorkeeper.da.yml
+++ b/config/locales/doorkeeper.da.yml
@@ -83,7 +83,10 @@ da:
         access_denied: Ressourceejeren eller godkendelsesserveren afviste anmodningen.
         credential_flow_not_configured: Ressourceejeradgangskodeakkreditiver-flow mislykkedes grundet ikke-opsat Doorkeeper.configure.resource_owner_from_credentials.
         invalid_client: Klientgodkendelse mislykkedes grundet en ukendt klient, ingen inkluderet klientgodkendelse eller uunderstøttet godkendelsesmetode.
-        invalid_code_challenge_method: Kodeudfordringsmetoden skal være S256, simpel (plain) er uunderstøttet.
+        invalid_code_challenge_method:
+          one: code_challenge_method skal være %{challenge_methods}.
+          other: code_challenge_method skal være en af %{challenge_methods}.
+          zero: Autorisationsserveren understøtter ikke PKCE, da der ikke er nogen accepterede code_challenge_method-værdier.
         invalid_grant: Den leverede godkendelse er ugyldig, udløbet, ophævet, matcher ikke omdirigerings-URI'en brugt i godkendelsesanmodningen eller er udstedt til en anden klient.
         invalid_redirect_uri: Inkluderede ormdirigerings-URI er ugyldig.
         invalid_request:
diff --git a/config/locales/doorkeeper.de.yml b/config/locales/doorkeeper.de.yml
index 2cf7d9c265..e75ffb9d94 100644
--- a/config/locales/doorkeeper.de.yml
+++ b/config/locales/doorkeeper.de.yml
@@ -83,7 +83,6 @@ de:
         access_denied: Diese Anfrage wurde von den Inhaber*innen oder durch den Autorisierungsserver abgelehnt.
         credential_flow_not_configured: Das Konto konnte nicht gefunden werden, da Doorkeeper.configure.resource_owner_from_credentials nicht konfiguriert ist.
         invalid_client: 'Client-Authentisierung ist fehlgeschlagen: Client unbekannt, keine Authentisierung mitgeliefert oder Authentisierungsmethode wird nicht unterstützt.'
-        invalid_code_challenge_method: Die Code-Challenge-Methode muss „S256“ sein, „plain“ wird nicht unterstützt.
         invalid_grant: Die beigefügte Autorisierung ist ungültig, abgelaufen, wurde widerrufen oder einem anderen Client ausgestellt, oder der Weiterleitungs-URI stimmt nicht mit der Autorisierungs-Anfrage überein.
         invalid_redirect_uri: Der beigefügte Weiterleitungs-URI ist ungültig.
         invalid_request:
diff --git a/config/locales/doorkeeper.el.yml b/config/locales/doorkeeper.el.yml
index 1632767bc7..34d3b8fb52 100644
--- a/config/locales/doorkeeper.el.yml
+++ b/config/locales/doorkeeper.el.yml
@@ -83,7 +83,10 @@ el:
         access_denied: Ο ιδιοκτήτης του πόρου ή του παρόχου έγκρισης απέρριψε το αίτημα.
         credential_flow_not_configured: Η ροή Resource Owner Password Credentials απέτυχε επειδή το Doorkeeper.configure.resource_owner_from_credentials δεν έχει ρυθμιστεί.
         invalid_client: Η ταυτοποίηση του πελάτη απέτυχε είτε λόγω άγνωστου πελάτη, είτε λόγω έλλειψης ταυτοποιημένου πελάτη ή λόγω μη υποστηριζόμενης μεθόδου ταυτοποίησης.
-        invalid_code_challenge_method: Η μέθοδος πρόκλησης κώδικα πρέπει να είναι S256, το απλό δεν υποστηρίζεται.
+        invalid_code_challenge_method:
+          one: Το code_challenge_method πρέπει να είναι %{challenge_methods}.
+          other: Το code_challenge_method πρέπει να είναι ένα από %{challenge_methods}.
+          zero: Ο διακομιστής εξουσιοδότησης δεν υποστηρίζει PKCE καθώς δεν υπάρχουν αποδεκτές τιμές code_challenge_method.
         invalid_grant: Η άδεια πιστοποίησης που δόθηκε είναι άκυρη, ληγμένη, έχει ανακληθεί, δεν συμφωνεί με το URI ανακατεύθυνσης που δόθηκε στο αίτημα πιστοποίησης ή εκδόθηκε προς άλλο πελάτη.
         invalid_redirect_uri: Το uri ανακατεύθυνσης που δόθηκε δεν είναι έγκυρο.
         invalid_request:
diff --git a/config/locales/doorkeeper.en-GB.yml b/config/locales/doorkeeper.en-GB.yml
index 5b4b99858c..e9e54501bc 100644
--- a/config/locales/doorkeeper.en-GB.yml
+++ b/config/locales/doorkeeper.en-GB.yml
@@ -83,7 +83,10 @@ en-GB:
         access_denied: The resource owner or authorisation server denied the request.
         credential_flow_not_configured: Resource Owner Password Credentials flow failed due to Doorkeeper.configure.resource_owner_from_credentials being unconfigured.
         invalid_client: Client authentication failed due to unknown client, no client authentication included, or unsupported authentication method.
-        invalid_code_challenge_method: The code challenge method must be S256, plain is unsupported.
+        invalid_code_challenge_method:
+          one: The code_challenge_method must be %{challenge_methods}.
+          other: The code_challenge_method must be one of %{challenge_methods}.
+          zero: The authorisation server does not support PKCE as there are no accepted code_challenge_method values.
         invalid_grant: The provided authorisation grant is invalid, expired, revoked, does not match the redirection URI used in the authorisation request, or was issued to another client.
         invalid_redirect_uri: The redirect URI included is not valid.
         invalid_request:
diff --git a/config/locales/doorkeeper.eo.yml b/config/locales/doorkeeper.eo.yml
index ede1ef815e..e6692ca9ba 100644
--- a/config/locales/doorkeeper.eo.yml
+++ b/config/locales/doorkeeper.eo.yml
@@ -83,7 +83,6 @@ eo:
         access_denied: La posedanto de la rimedo aŭ de la rajtiga servilo rifuzis vian peton.
         credential_flow_not_configured: La sendado de la identigiloj de la posedanto de la rimedo malsukcesis ĉar Doorkeeper.configure.resource_owner_from_credentials ne estis agordita.
         invalid_client: Klienta aŭtentigo malsukcesa pro nekonata kliento, neniu klienta aŭtentigo inkluzivita, aŭ nesubtenata aŭtentiga metodo.
-        invalid_code_challenge_method: La koda defia metodo devas esti S256, ebenaĵo estas nesubtenata.
         invalid_grant: La rajtiga konsento ne estas valida, ne plu estas valida, estis forigita, ne kongruas kun la plusenda URI uzita en la aŭtentiga peto, aŭ estis sendita al alia kliento.
         invalid_redirect_uri: La plusenda URI uzita ne estas valida.
         invalid_request:
diff --git a/config/locales/doorkeeper.es-AR.yml b/config/locales/doorkeeper.es-AR.yml
index a6e1a46b80..be075121b0 100644
--- a/config/locales/doorkeeper.es-AR.yml
+++ b/config/locales/doorkeeper.es-AR.yml
@@ -83,7 +83,6 @@ es-AR:
         access_denied: El propietario del recurso o servidor de autorización denegó la petición.
         credential_flow_not_configured: Las credenciales de contraseña del propietario del recurso fallaron debido a que "Doorkeeper.configure.resource_owner_from_credentials" está sin configurar.
         invalid_client: La autenticación del cliente falló debido a que es un cliente desconocido, o no está incluída la autenticación del cliente, o el método de autenticación no está soportado.
-        invalid_code_challenge_method: El método de desafío de código debe ser S256, «plain» no está soportado.
         invalid_grant: La concesión de autorización ofrecida no es válida, venció, se revocó, no coincide con la dirección web de redireccionamiento usada en la petición de autorización, o fue emitida para otro cliente.
         invalid_redirect_uri: La dirección web de redireccionamiento incluida no es válida.
         invalid_request:
diff --git a/config/locales/doorkeeper.es-MX.yml b/config/locales/doorkeeper.es-MX.yml
index eaf1bf69fb..bee17cc6a4 100644
--- a/config/locales/doorkeeper.es-MX.yml
+++ b/config/locales/doorkeeper.es-MX.yml
@@ -72,8 +72,8 @@ es-MX:
         revoke: "¿Está seguro?"
       index:
         authorized_at: Autorizado el %{date}
-        description_html: Estas son aplicaciones que pueden acceder a tu cuenta utilizando la API. Si hay alguna aplicación que no reconozcas aquí, o una aplicación esta teniendo comportamientos extraños, puedes revocar el acceso.
-        last_used_at: Usado por ultima vez el %{date}
+        description_html: Estas son aplicaciones que pueden acceder a tu cuenta mediante la API. Si hay aplicaciones que no reconoces aquí, o si alguna aplicación no funciona correctamente, puedes revocar su acceso.
+        last_used_at: Última vez utilizado el %{date}
         never_used: Nunca usado
         scopes: Permisos
         superapp: Interno
@@ -82,8 +82,11 @@ es-MX:
       messages:
         access_denied: El propietario del recurso o servidor de autorización denegó la petición.
         credential_flow_not_configured: Las credenciales de contraseña del propietario del recurso falló debido a que Doorkeeper.configure.resource_owner_from_credentials está sin configurar.
-        invalid_client: La autentificación del cliente falló ya que es un cliente desconocido, no está incluída la autentificación del cliente o el método de autentificación no es compatible.
-        invalid_code_challenge_method: El método de desafío de código debe ser S256, «plain» no está soportado.
+        invalid_client: La autenticación del cliente falló debido a un cliente desconocido, no se incluyó la autenticación del cliente o el método de autenticación no es compatible.
+        invalid_code_challenge_method:
+          one: El code_challenge_method debe ser %{challenge_methods}.
+          other: El code_challenge_method debe ser uno de %{challenge_methods}.
+          zero: El servidor de autorización no admite PKCE, ya que no hay valores code_challenge_method aceptados.
         invalid_grant: La concesión de autorización ofrecida es inválida, venció, se revocó, no coincide con la URI de redirección utilizada en la petición de autorización, o fue emitida para otro cliente.
         invalid_redirect_uri: La URI de redirección incluida no es válida.
         invalid_request:
@@ -97,7 +100,7 @@ es-MX:
           revoked: El autentificador de acceso fue revocado
           unknown: El autentificador de acceso es inválido
         resource_owner_authenticator_not_configured: El propietario del recurso falló debido a que Doorkeeper.configure.resource_owner_authenticator está sin configurar.
-        server_error: El servidor de la autorización entontró una condición inesperada que le impidió cumplir con la solicitud.
+        server_error: El servidor de autorización encontró una condición inesperada que le impidió completar la solicitud.
         temporarily_unavailable: El servidor de la autorización es actualmente incapaz de manejar la petición debido a una sobrecarga temporal o un trabajo de mantenimiento del servidor.
         unauthorized_client: El cliente no está autorizado a realizar esta petición utilizando este método.
         unsupported_grant_type: El tipo de concesión de autorización no está soportado por el servidor de autorización.
@@ -117,7 +120,7 @@ es-MX:
       access:
         read: Acceso de solo lectura
         read/write: Acceso de lectura y escritura
-        write: Acceso de sólo escritura
+        write: Acceso de solo escritura
       title:
         accounts: Cuentas
         admin/accounts: Administración de cuentas
@@ -139,7 +142,7 @@ es-MX:
         profile: Tu perfil de Mastodon
         push: Notificaciones push
         reports: Reportes
-        search: Busqueda
+        search: Búsqueda
         statuses: Publicaciones
     layouts:
       admin:
diff --git a/config/locales/doorkeeper.es.yml b/config/locales/doorkeeper.es.yml
index d582460d3f..57b8078e44 100644
--- a/config/locales/doorkeeper.es.yml
+++ b/config/locales/doorkeeper.es.yml
@@ -83,7 +83,6 @@ es:
         access_denied: El propietario del recurso o servidor de autorización denegó la petición.
         credential_flow_not_configured: Las credenciales de contraseña del propietario del recurso falló debido a que Doorkeeper.configure.resource_owner_from_credentials está sin configurar.
         invalid_client: La autentificación del cliente falló debido o a que es un cliente desconocido o no está incluída la autentificación del cliente o el método de autentificación no está confirmado.
-        invalid_code_challenge_method: El método de desafío de código debe ser S256, «plain» no está soportado.
         invalid_grant: La concesión de autorización ofrecida es inválida, venció, se revocó, no coincide con la URI de redirección utilizada en la petición de autorización, o fue emitida para otro cliente.
         invalid_redirect_uri: La URI de redirección incluida no es válida.
         invalid_request:
diff --git a/config/locales/doorkeeper.et.yml b/config/locales/doorkeeper.et.yml
index df10f9a0ce..fb1cf2a614 100644
--- a/config/locales/doorkeeper.et.yml
+++ b/config/locales/doorkeeper.et.yml
@@ -83,7 +83,6 @@ et:
         access_denied: Ressursi omanik või autoriseerimisserver lükkas taotluse tagasi.
         credential_flow_not_configured: Resource Owner Password Credentials vool ebaõnnestus, kuna Doorkeeper.configure.resource_owner_from_credentials ei ole seadistatud.
         invalid_client: Kliendi autentimine ebaõnnestus. Põhjus kas tundmatu klient, puudulik autentimine või toetamata autentimismeetod.
-        invalid_code_challenge_method: Code challenge meetod peab olema S256,, plain ei ole toetatud.
         invalid_grant: Antud autoriseerimisluba on vale, aegunud, tagasi võetud, ei kattu kasutatud ümbersuunamise URLid või oli antud teisele kliendile.
         invalid_redirect_uri: Antud ümbersuunamise URL ei ole õige.
         invalid_request:
diff --git a/config/locales/doorkeeper.eu.yml b/config/locales/doorkeeper.eu.yml
index 0dd4fe4194..7b25004385 100644
--- a/config/locales/doorkeeper.eu.yml
+++ b/config/locales/doorkeeper.eu.yml
@@ -83,7 +83,6 @@ eu:
         access_denied: Baliabidearen jabeak edo baimenaren zerbitzariak eskaera ukatu du.
         credential_flow_not_configured: Baliabidearen jabearen pasahitza kredentzialen fluxuak huts egin du Doorkeeper.configure.resource_owner_from_credentials konfiguratu gabe dagoelako.
         invalid_client: Bezeroaren autentifikazioak huts egin du bezero ezezaguna delako, ez delako bezero autentifikazioa txertatu, edo autentifikazio metodoa ez delako onartzen.
-        invalid_code_challenge_method: Kodearen erronka metodoa S256 izan behar da, arrunta ez da onartzen.
         invalid_grant: Emandako baimena baliogabea da, iraungi edo indargabetu da, ez dator bat baimen-eskaeran erabilitako birbideratze URI-arekin edo beste bezero batek sortu du.
         invalid_redirect_uri: Sartutako birbideratze URI-a baliogabea da.
         invalid_request:
diff --git a/config/locales/doorkeeper.fa.yml b/config/locales/doorkeeper.fa.yml
index be748880d9..8076819d46 100644
--- a/config/locales/doorkeeper.fa.yml
+++ b/config/locales/doorkeeper.fa.yml
@@ -83,7 +83,6 @@ fa:
         access_denied: صاحب منبع یا کارساز تأیید هویت، درخواست را رد کردند.
         credential_flow_not_configured: جریان اعتبارنامهٔ گذرواژهٔ مالک منبع به دلیل پیکربندی نشده بودن Doorkeeper.configure.resource_owner_from_credentials شکست خورد.
         invalid_client: تأیید هویت کارخواه به دلیل کارخواه ناشناخته، عدم وجود تأیید هویت کاره یا روش تأیید هویت پشتیبانی‌نشده شکست خورد.
-        invalid_code_challenge_method: روش چالش کدی باید S256 باشد. متن خام پشتیبانی نمی‌شود.
         invalid_grant: اعطای دسترسی فراهم ‌شده نامعتبر، منقضی یا نامطابق با نشانی بازگشت استفاده‌شده در درخواست تأیید هویت بوده و یا برای کارخواهی دیگر صادر شده است.
         invalid_redirect_uri: نشانی بازگشت موجود، معتبر نیست.
         invalid_request:
diff --git a/config/locales/doorkeeper.fi.yml b/config/locales/doorkeeper.fi.yml
index 39812d52e4..f28b42bd1e 100644
--- a/config/locales/doorkeeper.fi.yml
+++ b/config/locales/doorkeeper.fi.yml
@@ -83,7 +83,10 @@ fi:
         access_denied: Resurssin omistaja tai valtuutuspalvelin hylkäsi pyynnön.
         credential_flow_not_configured: Resurssin omistajan salasanatietojen luku epäonnistui, koska asetusta Doorkeeper.configure.resource_owner_from_credentials ei ole konfiguroitu.
         invalid_client: Asiakasohjelman todennus epäonnistui, koska asiakas on tuntematon, asiakkaan todennus ei ollut mukana tai todennustapaa ei tueta.
-        invalid_code_challenge_method: Koodihaastemenetelmän tulee olla S256 – selväkielistä ei tueta.
+        invalid_code_challenge_method:
+          one: Muuttujan code_challenge_method arvon on oltava %{challenge_methods}.
+          other: 'Muuttujan code_challenge_method arvon on oltava jokin seuraavista: %{challenge_methods}.'
+          zero: Valtuutuspalvelin ei tue PKCE:tä, koska hyväksyttäviä code_challenge_method-arvoja ei ole.
         invalid_grant: Valtuutuslupa on virheellinen, vanhentunut, peruttu, valtuutuspyynnössä käytettyä uudelleenohjaus-URI:tä vastaamaton tai myönnetty toiselle asiakkaalle.
         invalid_redirect_uri: Uudelleenohjaus-URI on virheellinen.
         invalid_request:
diff --git a/config/locales/doorkeeper.fo.yml b/config/locales/doorkeeper.fo.yml
index b6c1998b3a..bf6f74841f 100644
--- a/config/locales/doorkeeper.fo.yml
+++ b/config/locales/doorkeeper.fo.yml
@@ -83,7 +83,10 @@ fo:
         access_denied: Tilfarseigarin ella váttanarambætarin noktaðu umbønina.
         credential_flow_not_configured: Resource Owner Password Credentials floymurin eydnaðist ikki. Orsøkin var, at Doorkeeper.configure.resource_owner_from_credentials var ikki sett upp.
         invalid_client: Viðskiftaraváttan miseydnaðist. Orsøkin var ein ókendur viðskiftari, at eingin viðskiftaraváttan var við ella at váttanarmannagongdin er ókend.
-        invalid_code_challenge_method: Koduavbjóðingarmetodan má vera S256, einfalt format riggar ikki.
+        invalid_code_challenge_method:
+          one: Code_challenge_method má vera %{challenge_methods}.
+          other: Code_challenge_method má vera ein av %{challenge_methods}.
+          zero: Váttanarambætarin stuðlar ikki uppundir PKCE av tí at tað eru eingi góðkend code_challenge_method virði.
         invalid_grant: Veitta váttanarheimildin er antin ógildug, útgingin, tikin aftur, samsvarar ikki við endursendingar-URI'ið, sum bleiv brúkt í váttanarumbønini ella var flýggjað øðrum viðskiftara.
         invalid_redirect_uri: Endursendingar-URI'ið, sum var viðheft, er ógyldugt.
         invalid_request:
diff --git a/config/locales/doorkeeper.fr-CA.yml b/config/locales/doorkeeper.fr-CA.yml
index 9279a8a26a..a63e280a19 100644
--- a/config/locales/doorkeeper.fr-CA.yml
+++ b/config/locales/doorkeeper.fr-CA.yml
@@ -83,7 +83,8 @@ fr-CA:
         access_denied: Le/la propriétaire de la ressource ou le serveur d’autorisation a refusé la requête.
         credential_flow_not_configured: Le flux des identifiants du mot de passe du/de la propriétaire de la ressource a échoué car Doorkeeper.configure.resource_owner_from_credentials n’est pas configuré.
         invalid_client: L’authentification du client a échoué à cause d’un client inconnu, d’aucune authentification de client incluse ou d’une méthode d’authentification non prise en charge.
-        invalid_code_challenge_method: La méthode de contrôle du code doit être S256, le mode « en clair » n'est pas pris en charge.
+        invalid_code_challenge_method:
+          one: The code_challenge_method must be %{challenge_methods}.
         invalid_grant: L’autorisation accordée est invalide, expirée, révoquée, ne concorde pas avec l’URI de redirection utilisée dans la requête d’autorisation, ou a été délivrée à un autre client.
         invalid_redirect_uri: L’URI de redirection n’est pas valide.
         invalid_request:
diff --git a/config/locales/doorkeeper.fr.yml b/config/locales/doorkeeper.fr.yml
index d956225dba..fdc642d9cd 100644
--- a/config/locales/doorkeeper.fr.yml
+++ b/config/locales/doorkeeper.fr.yml
@@ -83,7 +83,8 @@ fr:
         access_denied: Le propriétaire de la ressource ou le serveur d’autorisation a refusé la requête.
         credential_flow_not_configured: Le flux des identifiants du mot de passe du propriétaire de la ressource a échoué car Doorkeeper.configure.resource_owner_from_credentials n’est pas configuré.
         invalid_client: L’authentification du client a échoué à cause d’un client inconnu, d’aucune authentification de client incluse ou d’une méthode d’authentification non prise en charge.
-        invalid_code_challenge_method: La méthode de contrôle du code doit être S256, le mode « en clair » n'est pas pris en charge.
+        invalid_code_challenge_method:
+          one: The code_challenge_method must be %{challenge_methods}.
         invalid_grant: L’autorisation accordée est invalide, expirée, annulée, ne concorde pas avec l’URL de redirection utilisée dans la requête d’autorisation, ou a été délivrée à un autre client.
         invalid_redirect_uri: L’URL de redirection n’est pas valide.
         invalid_request:
diff --git a/config/locales/doorkeeper.fy.yml b/config/locales/doorkeeper.fy.yml
index 180c7e733f..919dce5e49 100644
--- a/config/locales/doorkeeper.fy.yml
+++ b/config/locales/doorkeeper.fy.yml
@@ -83,7 +83,6 @@ fy:
         access_denied: De boarne-eigener of autorisaasjeserver hat it fersyk wegere.
         credential_flow_not_configured: De wachtwurdgegevens-flow fan de boarne-eigener is mislearre, omdat Doorkeeper.configure.resource_owner_from_credentials net ynsteld is.
         invalid_client: Clientferifikaasje is mislearre troch in ûnbekende client, ûntbrekkende client-autentikaasje of in net stipe autentikaasjemetoade.
-        invalid_code_challenge_method: De koadechallengemetoade moat S256 wezen, plain wurdt net stipe.
         invalid_grant: De opjûne autorisaasje is ûnjildich, ferrûn, ynlutsen, komt net oerien mei de redirect-URI dy’t opjûn is of útjûn waard oan in oere client.
         invalid_redirect_uri: De opjûne redirect-URI is ûnjildich.
         invalid_request:
diff --git a/config/locales/doorkeeper.ga.yml b/config/locales/doorkeeper.ga.yml
index b8ee3497b7..ecc7ea9648 100644
--- a/config/locales/doorkeeper.ga.yml
+++ b/config/locales/doorkeeper.ga.yml
@@ -83,7 +83,10 @@ ga:
         access_denied: Shéan úinéir na hacmhainne nó an freastalaí údaraithe an t-iarratas.
         credential_flow_not_configured: Theip ar shreabhadh Dintiúir Pasfhocal Úinéir Acmhainne toisc go raibh Doorkeeper.configure.resource_owner_from_credentials díchumraithe.
         invalid_client: Theip ar fhíordheimhniú cliant de bharr cliant anaithnid, níl fíordheimhniú cliant san áireamh, nó modh fíordheimhnithe nach dtacaítear leis.
-        invalid_code_challenge_method: Ní mór gur S256 an modh dúshlán cód, ach ní thacaítear leis.
+        invalid_code_challenge_method:
+          one: Ní mór don code_challenge_method a bheith %{challenge_methods}.
+          other: Ní mór don code_challenge_method a bheith ar cheann de %{challenge_methods}.
+          zero: Ní thacaíonn an freastalaí údaraithe le PKCE mar nach bhfuil aon luachanna code_challenge_method glactha ann.
         invalid_grant: Tá an deonú údaraithe ar choinníoll neamhbhailí, imithe in éag, cúlghairthe, nach ionann é agus an URI atreoraithe a úsáideadh san iarratas ar údarú, nó gur eisíodh é chuig cliant eile.
         invalid_redirect_uri: Níl an uri atreoraithe atá san áireamh bailí.
         invalid_request:
diff --git a/config/locales/doorkeeper.gd.yml b/config/locales/doorkeeper.gd.yml
index 8157a4e5fd..6487669c28 100644
--- a/config/locales/doorkeeper.gd.yml
+++ b/config/locales/doorkeeper.gd.yml
@@ -83,7 +83,6 @@ gd:
         access_denied: Dhiùlt sealbhadair a’ ghoireis no am frithealaiche ùghdarrachaidh an t-iarrtas.
         credential_flow_not_configured: Dh’fhàillig le sruth cruthachadh teisteas facail-fhaire do shealbhadair a’ ghoireis ri linn Doorkeeper.configure.resource_owner_from_credentials gun rèiteachadh.
         invalid_client: Dh’fhàillig le dearbhadh a’ chliant ri linn cliant nach aithne dhuinn, dearbhadh cliant nach deach gabhail a-staigh no dòigh dearbhaidh ris nach cuirear taic.
-        invalid_code_challenge_method: Feumaidh an dòigh an dùbhlain a bhith na S256, chan eil taic ri plain.
         invalid_grant: Chan eil an t-ùghdarrachadh a chaidh a thoirt seachad dligheach, dh’fhalbh an ùine air, chaidh a chùl-ghairm no chan eil e a-rèir URI an ath-stiùiridh a chaidh a chleachdadh san iarrtas ùghdarrachaidh no chaidh fhoillseachadh le cliant eile.
         invalid_redirect_uri: Chan eil an URI ath-stiùiridh a chaidh a ghabhail a-staigh dligheach.
         invalid_request:
diff --git a/config/locales/doorkeeper.gl.yml b/config/locales/doorkeeper.gl.yml
index 5d7148b84b..fc2d4aa9ec 100644
--- a/config/locales/doorkeeper.gl.yml
+++ b/config/locales/doorkeeper.gl.yml
@@ -83,7 +83,10 @@ gl:
         access_denied: O propietario do recurso ou o servidor autorizado denegaron a petición.
         credential_flow_not_configured: O fluxo do Contrasinal de Credenciais do Dono do Recurso fallou debido a que Doorkeeper.configure.resource_owner_from_credentials non están configuradas.
         invalid_client: A autenticación do cliente fallou por ser un cliente descoñecido, non se incluíu autenticación do cliente, ou o método de autenticación non está soportado.
-        invalid_code_challenge_method: O método de desafío para o código debe ser S256, texto claro non ten soporte.
+        invalid_code_challenge_method:
+          one: O code_challenge_method ten que ser %{challenge_methods}.
+          other: O code_challenge_method ten que ser un de entre %{challenge_methods}.
+          zero: O servidor de autorización non é compatible con PKCE xa que non se aceptaron valores code_challenge_method
         invalid_grant: A validación da autorización proporcionada non é valida, caducou, foi rexeitada, non coincide a redirección URI utilizada na petición de autorización, ou foi proporcionada para outro cliente.
         invalid_redirect_uri: A uri de redirección incluída non é válida.
         invalid_request:
diff --git a/config/locales/doorkeeper.he.yml b/config/locales/doorkeeper.he.yml
index a454c779f1..3b7622651e 100644
--- a/config/locales/doorkeeper.he.yml
+++ b/config/locales/doorkeeper.he.yml
@@ -83,7 +83,10 @@ he:
         access_denied: בעלי המשאב או שרת ההרשאה דחו את הבקשה.
         credential_flow_not_configured: התהליך "Resource Owner Password Credentials" נכשל בשל חוסר בתצורת Doorkeeper.configure.resource_owner_from_credentials.
         invalid_client: הרשאת הלקוח נכשלה עקב לקוח שאינו ידוע, חוסר בהרשאת לקוח או שיטת הרשאה שאינה נתמכת.
-        invalid_code_challenge_method: הצופן חייב להיות בשיטת S256, לא תומכים בבלתי מוצפן.
+        invalid_code_challenge_method:
+          one: הערך של code_challenge_method חייב להיות %{challenge_methods}.
+          other: 'הערך של code_challenge_method חייב להיות אחד מאלו: %{challenge_methods}.'
+          zero: שרת ההרשאה לא תומך PKCE שכן אין ערכי code_challenge_method נתמכים.
         invalid_grant: חוזה ההרשאה המצורף אינו חוקי, אינו תקף, מבוטל, או שאינו מתאים לקישורית ההפניה שבשימוש על ידי בקשת ההרשאה, או שהופק על ידי לקוח אחר.
         invalid_redirect_uri: קישורית ההפניה המצורפת אינה חוקית.
         invalid_request:
diff --git a/config/locales/doorkeeper.hu.yml b/config/locales/doorkeeper.hu.yml
index a13c362173..17569a6598 100644
--- a/config/locales/doorkeeper.hu.yml
+++ b/config/locales/doorkeeper.hu.yml
@@ -83,7 +83,6 @@ hu:
         access_denied: Az erőforrás tulajdonosa vagy az engedélyező kiszolgáló elutasította a kérést.
         credential_flow_not_configured: Az erőforrás tulajdonos jelszóadatainak átadása megszakadt, mert a Doorkeeper.configure.resource_owner_from_credentials beállítatlan.
         invalid_client: A kliens hitelesítése megszakadt, mert ismeretlen a kliens, a kliens nem küldött hitelesítést, vagy a hitelesítés módja nem támogatott.
-        invalid_code_challenge_method: A kódkihívási módszernek S256-nak kell lennie, az egyszerű kód nem támogatott.
         invalid_grant: A biztosított hitelesítés érvénytelen, lejárt, visszavont, vagy nem egyezik a hitelesítési kérésben használt URI-val, vagy más kliensnek címezték.
         invalid_redirect_uri: Az átirányító URI nem valós.
         invalid_request:
diff --git a/config/locales/doorkeeper.ia.yml b/config/locales/doorkeeper.ia.yml
index efde9be9c0..c2274b86b0 100644
--- a/config/locales/doorkeeper.ia.yml
+++ b/config/locales/doorkeeper.ia.yml
@@ -83,7 +83,6 @@ ia:
         access_denied: Le proprietario del ressource o servitor de autorisation ha refusate le requesta.
         credential_flow_not_configured: Le processo de credentiales de contrasigno del proprietario del ressource ha fallite perque Doorkeeper.configure.resource_owner_from_credentials non es configurate.
         invalid_client: Le authentication del cliente ha fallite perque le cliente es incognite, necun authentication de cliente es includite, o le methodo de authentication non es supportate.
-        invalid_code_challenge_method: Le methodo de defia de codice debe esser S256. Le methodo simple (plain) non es supportate.
         invalid_grant: Le concession de autorisation fornite es invalide, expirate, revocate, non corresponde al URI de redirection usate in le requesta de autorisation, o ha essite emittite a un altere cliente.
         invalid_redirect_uri: Le URI de redirection includite non es valide.
         invalid_request:
diff --git a/config/locales/doorkeeper.io.yml b/config/locales/doorkeeper.io.yml
index 94efbfc9d7..2f8adf8ce3 100644
--- a/config/locales/doorkeeper.io.yml
+++ b/config/locales/doorkeeper.io.yml
@@ -83,7 +83,6 @@ io:
         access_denied: Moyenproprietanto o yurizservilo refuzis la demando.
         credential_flow_not_configured: Moyenproprietantpasvortidentesesofluo faliis pro ke Doorkeeper.configure.resource_owner_from_credentials ne ajustesis.
         invalid_client: Klientpermiso falias pro nesavita kliento, neinkluzita klientpermiso o nesuportita permismetodo.
-        invalid_code_challenge_method: La kodexchalenjmetodo mustas esar S256.
         invalid_grant: Provizita yurizo esis nevalida, expiris, deaprobesis, ne parigas uzita ridirektoligilo dum yurizdemando o facesis a altra kliento.
         invalid_redirect_uri: La inkluzita ridirektoligilo esas nevalida.
         invalid_request:
diff --git a/config/locales/doorkeeper.is.yml b/config/locales/doorkeeper.is.yml
index 1fabd1b55f..bd806d07e1 100644
--- a/config/locales/doorkeeper.is.yml
+++ b/config/locales/doorkeeper.is.yml
@@ -83,7 +83,10 @@ is:
         access_denied: Eigandi tilfangs eða auðkenningarþjónn höfnuðu beininni.
         credential_flow_not_configured: Flæði á lykilorðsauðkennum eiganda tilfangs (Resource Owner) brást vegna þess að Doorkeeper.configure.resource_owner_from_credentials er óskilgreint.
         invalid_client: Auðkenning á biðlara brást vegna þess að biðlarinn er óþekktur, að auðkenning biðlarans fylgdi ekki með, eða að notuð var óstudd auðkenningaraðferð.
-        invalid_code_challenge_method: Aðferð við ráðningu kóðans verður að vera í S256, hreinn texti er ekki studdur.
+        invalid_code_challenge_method:
+          one: code_challenge_method verður að vera %{challenge_methods}.
+          other: code_challenge_method verður að vera eitt af %{challenge_methods}.
+          zero: Auðkenningarþjónninn styður ekki PKCE þar sem það eru engin samþykkt gildi fyrir code_challenge_method.
         invalid_grant: Uppgefin auðkenningarheimild er ógild, útrunnin, afturkölluð, samsvarar ekki endurbirtingarslóðinni í auðkenningarbeiðninni, eða var gefin út til annars biðlara.
         invalid_redirect_uri: Endurbeiningarslóðin sem fylgdi er ekki gild.
         invalid_request:
diff --git a/config/locales/doorkeeper.it.yml b/config/locales/doorkeeper.it.yml
index 3a24465cdc..6aa6624c05 100644
--- a/config/locales/doorkeeper.it.yml
+++ b/config/locales/doorkeeper.it.yml
@@ -83,7 +83,10 @@ it:
         access_denied: Il proprietario della risorsa o il server d'autorizzazione ha negato la richiesta.
         credential_flow_not_configured: Il processo delle Credenziali Password del Proprietario della Risorsa è fallito a causa della mancata configurazione di Doorkeeper.configure.resource_owner_from_credentials.
         invalid_client: Autenticazione del client fallita a causa di un client sconosciuto, di nessun'autenticazione del client inclusa o di un metodo d'autenticazione non supportato.
-        invalid_code_challenge_method: Il metodo di verifica del codice deve essere S256, semplice non è supportato.
+        invalid_code_challenge_method:
+          one: Il code_challenge_method deve essere %{challenge_methods}.
+          other: Il code_challenge_method deve essere uno dei %{challenge_methods}.
+          zero: Il server di autorizzazione non supporta PKCE poiché non sono presenti valori code_challenge_method accettati.
         invalid_grant: L'autorizzazione fornita non è valida, è scaduta, è stata revocata, non corrisponde all'URI di reindirizzamento utilizzato nella richiesta d'autorizzazione o è stata emessa a un altro client.
         invalid_redirect_uri: L'uri di reindirizzamento incluso non è valido.
         invalid_request:
diff --git a/config/locales/doorkeeper.ja.yml b/config/locales/doorkeeper.ja.yml
index 1f94b9ede8..a788b5bf42 100644
--- a/config/locales/doorkeeper.ja.yml
+++ b/config/locales/doorkeeper.ja.yml
@@ -83,7 +83,6 @@ ja:
         access_denied: リソースの所有者または認証サーバーが要求を拒否しました。
         credential_flow_not_configured: リソース所有者のパスワード Doorkeeper.configure.resource_owner_from_credentials が設定されていないためクレデンシャルフローに失敗しました。
         invalid_client: 不明なクライアントであるか、クライアント情報が含まれていない、またはサポートされていない認証方法のため、クライアントの認証に失敗しました。
-        invalid_code_challenge_method: code challenge methodはS256のみが利用可能です。plainはサポートされていません。
         invalid_grant: 指定された認証許可は無効であるか、期限切れ、取り消されている、リダイレクトURIの不一致、または別のクライアントに発行されています。
         invalid_redirect_uri: 無効なリダイレクトURIが含まれています。
         invalid_request:
diff --git a/config/locales/doorkeeper.ko.yml b/config/locales/doorkeeper.ko.yml
index dc1b8c08b1..32be97749c 100644
--- a/config/locales/doorkeeper.ko.yml
+++ b/config/locales/doorkeeper.ko.yml
@@ -83,7 +83,6 @@ ko:
         access_denied: 리소스 소유자 또는 인증 서버가 요청을 거부했습니다.
         credential_flow_not_configured: Doorkeeper.configure.resource_owner_from_credentials의 설정이 되어있지 않아 리소스 소유자 암호 자격증명이 실패하였습니다.
         invalid_client: 클라이언트를 확인할 수 없기 때문에 인증이 실패하였습니다. 클라이언트 자격 증명이 포함되지 않았거나 지원되지 않는 메소드입니다.
-        invalid_code_challenge_method: 코드 챌린지는 S256이어야 합니다. 평문은 지원되지 않습니다.
         invalid_grant: 제공된 권한 부여가 잘못되거나, 만료되었거나, 취소되었거나, 권한 부여 요청에 사용된 리디렉션 URI가 일치하지 않거나, 다른 클라이언트에 지정되었습니다.
         invalid_redirect_uri: 리디렉션 URI가 올바르지 않습니다
         invalid_request:
diff --git a/config/locales/doorkeeper.lt.yml b/config/locales/doorkeeper.lt.yml
index f957e4157c..abc81d3dc3 100644
--- a/config/locales/doorkeeper.lt.yml
+++ b/config/locales/doorkeeper.lt.yml
@@ -83,7 +83,6 @@ lt:
         access_denied: Išteklių savininkas (-ė) arba leidžiamų serveris atmetė užklausą.
         credential_flow_not_configured: Išteklių savininko slaptažodžio kredencialų srautas nepavyko, nes Doorkeeper.configure.resource_owner_from_credentials nėra nesukonfigūruotas.
         invalid_client: Kliento programos tapatybės nustatymas nepavyko dėl nežinomo kliento programos, neįtraukto kliento programos tapatybės nustatymo arba nepalaikomo tapatybės nustatymo metodo.
-        invalid_code_challenge_method: Kodo iššūkio metodas turi būti S256. Paprastas nepalaikomas.
         invalid_grant: Pateiktas leidimo suteikimas yra netinkamas, nebegaliojantis, panaikintas, neatitinka leidimo užklausoje naudoto nukreipimo URI arba buvo išduotas kitam kliento programui.
         invalid_redirect_uri: Įtrauktas nukreipimo URI netinkamas.
         invalid_request:
diff --git a/config/locales/doorkeeper.lv.yml b/config/locales/doorkeeper.lv.yml
index a3d8902af4..537e0291f2 100644
--- a/config/locales/doorkeeper.lv.yml
+++ b/config/locales/doorkeeper.lv.yml
@@ -83,7 +83,6 @@ lv:
         access_denied: Resursa īpašnieks vai pilnvarošanas serveris noraidīja pieprasījumu.
         credential_flow_not_configured: Resursa īpašnieka paroles akreditācijas datu plūsma neizdevās, jo Doorkeeper.configure.resource_owner_from_credentials nebija konfigurēts.
         invalid_client: Klienta autentifikācija neizdevās nezināma klienta, klienta autentifikācijas vai neatbalstītas autentifikācijas metodes dēļ.
-        invalid_code_challenge_method: Koda izaicinājuma veidam jābūt S256, vienkāršs netiek atbalstīts.
         invalid_grant: Sniegtais pilnvarošanas piešķīrums nav derīgs, tam ir beidzies derīgums, tas ir atsaukts, tas neatbilst pilnvarošanas pieprasījumā izmantotajam pārvirzīšanas URI vai tika izsniegts citam klientam.
         invalid_redirect_uri: Iekļauts novirzīšanas uri nav derīgs.
         invalid_request:
diff --git a/config/locales/doorkeeper.nl.yml b/config/locales/doorkeeper.nl.yml
index c6453761f1..1d04e50f21 100644
--- a/config/locales/doorkeeper.nl.yml
+++ b/config/locales/doorkeeper.nl.yml
@@ -83,7 +83,6 @@ nl:
         access_denied: De resource-eigenaar of autorisatie-server weigerde het verzoek.
         credential_flow_not_configured: De wachtwoordgegevens-flow van de resource-eigenaar is mislukt omdat Doorkeeper.configure.resource_owner_from_credentials niet is ingesteld.
         invalid_client: Clientverificatie is mislukt door een onbekende client, ontbrekende client-authenticatie of een niet ondersteunde authenticatie-methode.
-        invalid_code_challenge_method: De code challenge method moet S256 zijn, plain wordt niet ondersteund.
         invalid_grant: De verstrekte autorisatie is ongeldig, verlopen, ingetrokken, komt niet overeen met de redirect-URI die is opgegeven of werd uitgegeven aan een andere client.
         invalid_redirect_uri: De opgegeven redirect-URI is ongeldig.
         invalid_request:
diff --git a/config/locales/doorkeeper.nn.yml b/config/locales/doorkeeper.nn.yml
index 934bb870be..3b8a9b0663 100644
--- a/config/locales/doorkeeper.nn.yml
+++ b/config/locales/doorkeeper.nn.yml
@@ -83,7 +83,6 @@ nn:
         access_denied: Ressurseigaren eller autorisasjonstenaren avviste førespurnaden.
         credential_flow_not_configured: Flyten «Resource Owner Password Credentials» kunne ikkje fullførast sidan «Doorkeeper.configure.resource_owner_from_credentials» ikkje er konfigurert.
         invalid_client: Klientautentisering feila på grunn av ukjent klient, ingen inkludert autentisering, eller ikkje støtta autentiseringsmetode.
-        invalid_code_challenge_method: Kodeutfordringsmetoden må vera S256, klartekst er ikkje støtta.
         invalid_grant: Autoriseringa er ugyldig, utløpt, oppheva, stemmer ikkje med omdirigerings-URIen eller var tildelt ein annan klient.
         invalid_redirect_uri: Omdirigerings-URLen er ikkje gyldig.
         invalid_request:
diff --git a/config/locales/doorkeeper.pl.yml b/config/locales/doorkeeper.pl.yml
index 2ff1bb5f45..b11528aeee 100644
--- a/config/locales/doorkeeper.pl.yml
+++ b/config/locales/doorkeeper.pl.yml
@@ -83,7 +83,6 @@ pl:
         access_denied: Właściciel zasobu lub serwer autoryzujący odrzuciły żądanie.
         credential_flow_not_configured: Ścieżka "Resource Owner Password Credentials" zakończyła się błędem, ponieważ Doorkeeper.configure.resource_owner_from_credentials nie został skonfigurowany.
         invalid_client: Autoryzacja klienta nie powiodła się z powodu nieznanego klienta, braku uwierzytelnienia klienta, lub niewspieranej metody uwierzytelniania.
-        invalid_code_challenge_method: Metodą wyzwania kodowego musi być S256, plain jest nieobsługiwany.
         invalid_grant: Grant uwierzytelnienia jest niepoprawny, przeterminowany, unieważniony, nie pasuje do URI przekierowwania użytego w żądaniu uwierzytelnienia, lub został wystawiony przez innego klienta.
         invalid_redirect_uri: URI przekierowania jest nieprawidłowy.
         invalid_request:
diff --git a/config/locales/doorkeeper.pt-BR.yml b/config/locales/doorkeeper.pt-BR.yml
index a92819bf68..b3badf07c4 100644
--- a/config/locales/doorkeeper.pt-BR.yml
+++ b/config/locales/doorkeeper.pt-BR.yml
@@ -83,7 +83,6 @@ pt-BR:
         access_denied: O proprietário do recurso ou servidor de autorização recusou a solicitação.
         credential_flow_not_configured: Fluxo das Credenciais de Senha do Proprietário do Recurso falhou porque Doorkeeper.configure.resource_owner_from_credentials não foi configurado.
         invalid_client: Autenticação do cliente falhou por causa de um cliente desconhecido, nenhum cliente de autenticação foi incluído ou o método de autenticação não é suportado.
-        invalid_code_challenge_method: O método de desafio de código deve ser S256; o método 'plain' não é suportado.
         invalid_grant: A garantia de autorização está inválida, expirou ou foi revogada, não é equivalente ao link de redirecionamento usado na solicitação de autorização ou foi emitido por outro cliente.
         invalid_redirect_uri: O link de redirecionamento é inválido.
         invalid_request:
diff --git a/config/locales/doorkeeper.pt-PT.yml b/config/locales/doorkeeper.pt-PT.yml
index ae7dc28b62..eeb3ee0cdd 100644
--- a/config/locales/doorkeeper.pt-PT.yml
+++ b/config/locales/doorkeeper.pt-PT.yml
@@ -83,7 +83,6 @@ pt-PT:
         access_denied: O proprietário do recurso ou servidor de autorização negou o pedido.
         credential_flow_not_configured: Falha no fluxo de credenciais da palavra-passe do proprietário do recurso porque Doorkeeper.configure.resource_owner_from_credentials não está configurado.
         invalid_client: A autenticação do cliente falhou devido a cliente desconhecido, sem autenticação de cliente incluída ou método de autenticação não suportado.
-        invalid_code_challenge_method: O método de validação do código tem de ser S256, o método simples não é suportado.
         invalid_grant: A concessão de autorização fornecida é inválida, expirou, foi revogada, não corresponde à URI de redirecionamento usada no pedido de autorização ou foi emitida para outro cliente.
         invalid_redirect_uri: A URI de redirecionamento incluída não é válida.
         invalid_request:
diff --git a/config/locales/doorkeeper.ro.yml b/config/locales/doorkeeper.ro.yml
index 08b7c3fa8d..fde85d762b 100644
--- a/config/locales/doorkeeper.ro.yml
+++ b/config/locales/doorkeeper.ro.yml
@@ -83,7 +83,6 @@ ro:
         access_denied: Proprietarul de resurse sau serverul de autorizare a refuzat cererea.
         credential_flow_not_configured: Fluxul Resurselor de Acreditări Parole a eșuat din cauza faptului că Doorkeeper.configure.resource_owner_from_credentials nu este configurat.
         invalid_client: Autentificarea clientului a eșuat din cauza unui client necunoscut, nici o autentificare client inclusă, sau metodă de autentificare nesuportată.
-        invalid_code_challenge_method: Metoda de provocare a codului trebuie să fie S256, simplu nu este acceptată.
         invalid_grant: Acordarea autorizației furnizată este invalidă, expirată, revocată, nu corespunde URI-ului de redirecționare folosit în cererea de autorizare, sau a fost eliberat altui client.
         invalid_redirect_uri: Uri-ul de redirecționare inclus nu este valid.
         invalid_request:
diff --git a/config/locales/doorkeeper.ru.yml b/config/locales/doorkeeper.ru.yml
index 30fbfabaf6..1bd640d9aa 100644
--- a/config/locales/doorkeeper.ru.yml
+++ b/config/locales/doorkeeper.ru.yml
@@ -83,7 +83,6 @@ ru:
         access_denied: Владелец ресурса или сервер авторизации ответил отказом на ваш запрос.
         credential_flow_not_configured: Процесс Resource Owner Password Credentials завершился неудачей, поскольку параметр конфигурации Doorkeeper.configure.resource_owner_from_credentials не был задан.
         invalid_client: 'Не удалось аутентифицировать клиент по одной из следующих причин: неизвестный клиент, отсутствует аутентификация клиента, неподдерживаемый метод аутентификации.'
-        invalid_code_challenge_method: Функция хеширования для механизма PKCE должна быть установлена в значение S256, метод PLAIN не поддерживается.
         invalid_grant: Предоставленное разрешение на авторизацию либо недействительно, либо истекло, либо отозвано, либо не соответствует использованному в запросе на авторизацию URI перенаправления, либо было выдано для другого клиента.
         invalid_redirect_uri: Предоставленный URI перенаправления недействителен.
         invalid_request:
diff --git a/config/locales/doorkeeper.si.yml b/config/locales/doorkeeper.si.yml
index 0677e23c2a..ceaff56b40 100644
--- a/config/locales/doorkeeper.si.yml
+++ b/config/locales/doorkeeper.si.yml
@@ -83,7 +83,6 @@ si:
         access_denied: සම්පත් හිමිකරු හෝ අවසර සේවාදායකය ඉල්ලීම ප්‍රතික්ෂේප කළේය.
         credential_flow_not_configured: Doorkeeper.configure.resource_owner_from_credentials වින්‍යාස නොකිරීම හේතුවෙන් සම්පත් හිමිකරුගේ මුරපද අක්තපත්‍ර ප්‍රවාහය අසාර්ථක විය.
         invalid_client: නොදන්නා සේවාලාභියා නිසා සේවාලාභී සත්‍යාපනය අසාර්ථක විය, සේවාලාභී සත්‍යාපනය ඇතුළත් කර නැත, හෝ සහය නොදක්වන සත්‍යාපන ක්‍රමයක්.
-        invalid_code_challenge_method: කේත අභියෝගතා ක්‍රමය S256 විය යුතුය, plain සහාය නොදක්වයි.
         invalid_grant: සපයා ඇති අවසර දීමනාව වලංගු නැත, කල් ඉකුත් වී ඇත, අවලංගු කර ඇත, අවසර ඉල්ලීමේ භාවිතා කරන ලද යළි-යොමුවීම් URI සමඟ නොගැලපේ, නැතහොත් වෙනත් සේවාදායකයෙකුට නිකුත් කර ඇත.
         invalid_redirect_uri: ඇතුළත් කර ඇති යළි-යොමුවීම් uri වලංගු නොවේ.
         invalid_request:
diff --git a/config/locales/doorkeeper.sl.yml b/config/locales/doorkeeper.sl.yml
index 8b28d1532a..31c2e87868 100644
--- a/config/locales/doorkeeper.sl.yml
+++ b/config/locales/doorkeeper.sl.yml
@@ -83,7 +83,6 @@ sl:
         access_denied: Lastnik virov ali odobritveni strežnik je zavrnil zahtevo.
         credential_flow_not_configured: Pretok geselskih pooblastil lastnika virov ni uspel, ker Doorkeeper.configure.resource_owner_from_credentials ni nastavljen.
         invalid_client: Odobritev odjemalca ni uspela zaradi neznanega odjemalca, zaradi nevključitve odobritve odjemalca ali zaradi nepodprte metode odobritve.
-        invalid_code_challenge_method: Metoda za kodo mora biti S256, čistopis ni podprt.
         invalid_grant: Predložena odobritev je neveljavna, je potekla, je preklicana, se ne ujema z URI-jem za preusmeritev uporabljenim v zahtevi za odobritev, ali pa je bila izdana drugemu odjemalcu.
         invalid_redirect_uri: URI za preusmeritev ni veljaven.
         invalid_request:
diff --git a/config/locales/doorkeeper.sq.yml b/config/locales/doorkeeper.sq.yml
index f98cf88c63..bdf292ebec 100644
--- a/config/locales/doorkeeper.sq.yml
+++ b/config/locales/doorkeeper.sq.yml
@@ -83,7 +83,10 @@ sq:
         access_denied: I zoti i burimit ose shërbyesi i autorizimit e hodhi poshtë kërkesën.
         credential_flow_not_configured: Rrjedha për Kredenciale Fjalëkalimi të të Zotit të Burimit dështoi për shkak se Doorkeeper.configure.resource_owner_from_credentials është i paformësuar.
         invalid_client: Mirëfilltësimi i klientit dështoi për shkak klienti të panjohur, mospërfshirjeje mirëfilltësimi klienti, ose metode të pambuluar mirëfilltësimi.
-        invalid_code_challenge_method: Metoda me kod duhet të jetë e llojit S256, e thjeshta nuk mbulohet.
+        invalid_code_challenge_method:
+          one: code_challenge_method duhet të jetë %{challenge_methods}.
+          other: code_challenge_method duhet të jetë një nga %{challenge_methods}.
+          zero: Shërbyesi i autorizimeve s’mbulon PKCE, ngaqë s’ka vlera code_challenge_method të pranuara.
         invalid_grant: Autorizimi i dhënë është i pavlefshëm, ka skaduar, është shfuqizuar, s’përputhet me URI-n e ridrejtimit të përdorur te kërkesa e autorizimit, ose është emetuar për klient tjetër.
         invalid_redirect_uri: URI e ridrejtimit s’është e vlefshme.
         invalid_request:
diff --git a/config/locales/doorkeeper.sr-Latn.yml b/config/locales/doorkeeper.sr-Latn.yml
index bce2b1c083..25aba51d54 100644
--- a/config/locales/doorkeeper.sr-Latn.yml
+++ b/config/locales/doorkeeper.sr-Latn.yml
@@ -82,7 +82,6 @@ sr-Latn:
         access_denied: Vlasnik resursa ili autorizacioni server su odbili zahtev.
         credential_flow_not_configured: Tok Resource Owner Password Credentials nije uspeo pošto je Doorkeeper.configure.resource_owner_from_credentials neiskonfigurisan.
         invalid_client: Klijentska identifikacija nije uspela zbog nepoznatog klijenta, zato što klijent nije uključio identifikaciju ili zato što je iskorišćen nepodržani identifikacioni metod.
-        invalid_code_challenge_method: Metod izazova koda mora biti S256, običan nije podržan.
         invalid_grant: Zadata identifikaciona dozvola je neispravna, istekla, opozvana, ne poklapa se sa adresom preusmeravanja ili je izdata nekog drugom klijentu.
         invalid_redirect_uri: Uključena adresa preusmeravanja nije ispravna.
         invalid_request:
diff --git a/config/locales/doorkeeper.sr.yml b/config/locales/doorkeeper.sr.yml
index b6ab6e61c0..5f5d403ae2 100644
--- a/config/locales/doorkeeper.sr.yml
+++ b/config/locales/doorkeeper.sr.yml
@@ -82,7 +82,6 @@ sr:
         access_denied: Власник ресурса или ауторизациони сервер су одбили захтев.
         credential_flow_not_configured: Ток Resource Owner Password Credentials није успео пошто је Doorkeeper.configure.resource_owner_from_credentials неисконфигурисан.
         invalid_client: Клијентска идентификација није успела због непознатог клијента, зато што клијент није укључио идентификацију или зато што је искоришћен неподржани идентификациони метод.
-        invalid_code_challenge_method: Метод изазова кода мора бити S256, обичан није подржан.
         invalid_grant: Задата идентификациона дозвола је неисправна, истекла, опозвана, не поклапа се са адресом преусмеравања или је издата неког другом клијенту.
         invalid_redirect_uri: Укључена адреса преусмеравања није исправна.
         invalid_request:
diff --git a/config/locales/doorkeeper.sv.yml b/config/locales/doorkeeper.sv.yml
index 3c8b08ff26..01a441b556 100644
--- a/config/locales/doorkeeper.sv.yml
+++ b/config/locales/doorkeeper.sv.yml
@@ -83,7 +83,6 @@ sv:
         access_denied: Resursägaren eller behörighetsservern nekade begäran.
         credential_flow_not_configured: Resurs Ägare Lösenord Credentials flöde misslyckades på grund av att Doorkeeper.configure.resource_owner_from_credentials är okonfigurerad.
         invalid_client: Klientautentisering misslyckades på grund av okänd klient, ingen klientautentisering inkluderad eller icke godkänd autentiseringsmetod.
-        invalid_code_challenge_method: Kodutmaningsmetoden måste vara S256, en slät stöds inte.
         invalid_grant: Det beviljade godkännandetillskottet är ogiltigt, upphört, återkallat, matchar inte den omdirigering URI som användes i auktorisationsförfrågan eller har utfärdats till en annan klient.
         invalid_redirect_uri: Den omdirigerade uri är inte giltig.
         invalid_request:
diff --git a/config/locales/doorkeeper.th.yml b/config/locales/doorkeeper.th.yml
index 3b52e170ea..2040bc9c73 100644
--- a/config/locales/doorkeeper.th.yml
+++ b/config/locales/doorkeeper.th.yml
@@ -83,7 +83,6 @@ th:
         access_denied: เจ้าของทรัพยากรหรือเซิร์ฟเวอร์การอนุญาตปฏิเสธคำขอ
         credential_flow_not_configured: โฟลว์ข้อมูลประจำตัวรหัสผ่านเจ้าของทรัพยากรล้มเหลวเนื่องจากไม่ได้กำหนดค่า Doorkeeper.configure.resource_owner_from_credentials
         invalid_client: การรับรองความถูกต้องไคลเอ็นต์ล้มเหลวเนื่องจากไคลเอ็นต์ที่ไม่รู้จัก ไม่ได้รวมการรับรองความถูกต้องไคลเอ็นต์ หรือวิธีการรับรองความถูกต้องที่ไม่รองรับ
-        invalid_code_challenge_method: วิธีการทดสอบรหัสต้องเป็น S256 ไม่รองรับแบบธรรมดา
         invalid_grant: การให้การรับรองความถูกต้องที่ให้มาไม่ถูกต้อง หมดอายุแล้ว เพิกถอนแล้ว ไม่ตรงกับ URI การเปลี่ยนเส้นทางที่ใช้ในคำขอการรับรองความถูกต้อง หรือออกให้ไคลเอ็นต์อื่น
         invalid_redirect_uri: URI การเปลี่ยนเส้นทางที่รวมอยู่ไม่ถูกต้อง
         invalid_request:
diff --git a/config/locales/doorkeeper.tr.yml b/config/locales/doorkeeper.tr.yml
index f7f67564d2..d663f025ac 100644
--- a/config/locales/doorkeeper.tr.yml
+++ b/config/locales/doorkeeper.tr.yml
@@ -83,7 +83,6 @@ tr:
         access_denied: Kaynak sahibi veya yetkilendirme sunucusu isteği reddetti.
         credential_flow_not_configured: Kaynak Sahibi Parolası Kimlik Bilgileri akışı Doorkeeper.configure.resource_owner_from_credentials 'ın yapılandırılmamış olması nedeniyle başarısız oldu.
         invalid_client: İstemcinin kimlik doğrulaması bilinmeyen istemci, istemci kimlik doğrulamasının dahil olmaması veya desteklenmeyen kimlik doğrulama yöntemi nedeniyle başarısız oldu.
-        invalid_code_challenge_method: Kod zorluk metodu S256 olmalı, düz yöntem desteklenmiyor.
         invalid_grant: Sağlanan yetkilendirme izni geçersiz, süresi dolmuş, iptal edilmiş, yetkilendirme isteğinde kullanılan yönlendirme URL'siyle eşleşmiyor veya başka bir istemciye verilmiş.
         invalid_redirect_uri: Dahil edilmiş yönlendirme uri'si geçersiz.
         invalid_request:
diff --git a/config/locales/doorkeeper.uk.yml b/config/locales/doorkeeper.uk.yml
index 1e18eaef9a..afcafc16c0 100644
--- a/config/locales/doorkeeper.uk.yml
+++ b/config/locales/doorkeeper.uk.yml
@@ -83,7 +83,6 @@ uk:
         access_denied: Власник ресурсу або сервер авторизації відхилив Ваш запит.
         credential_flow_not_configured: Не вдалося перевірити парольні дані клієнту через неналаштований параметр Doorkeeper.configure.resource_owner_from_credentials.
         invalid_client: Не вдалося аутентифікувати клієнта (клієнт невідомий, аутентифікацію клієнта не увімкнено, або непідтримуваний метод аутентифікації).
-        invalid_code_challenge_method: Метод виклику коду повинен бути S256, простий не підтримується.
         invalid_grant: Наданий санкціонований дозвіл недійсний, прострочений, анульований, не відповідає URI перенаправлення, що використовується в запиті авторизації, або був виданий іншому клієнту.
         invalid_redirect_uri: Включений uri перенаправлення не є дійсним.
         invalid_request:
diff --git a/config/locales/doorkeeper.vi.yml b/config/locales/doorkeeper.vi.yml
index 25bf7b6689..3098f36e8c 100644
--- a/config/locales/doorkeeper.vi.yml
+++ b/config/locales/doorkeeper.vi.yml
@@ -83,7 +83,10 @@ vi:
         access_denied: Chủ sở hữu tài nguyên hoặc máy chủ đã từ chối yêu cầu.
         credential_flow_not_configured: Resource Owner Password Credentials không thành công do Doorkeeper.configure.resource_owner_from_credentials không được định cấu hình.
         invalid_client: Xác minh ứng dụng khách không thành công do máy khách mơ hồ, không bao gồm xác thực ứng dụng khách hoặc phương thức xác thực không được hỗ trợ.
-        invalid_code_challenge_method: Phương pháp thử thách mã phải là S256, phương pháp plain không được hỗ trợ.
+        invalid_code_challenge_method:
+          one: Code_challenge_method phải là %{challenge_methods}.
+          other: Code_challenge_method phải là một trong %{challenge_methods}.
+          zero: Máy chủ xác thực không hỗ trợ PKCE vì không chấp nhận giá trị code_challenge_method.
         invalid_grant: Yêu cầu không hợp lệ, hết hạn, bị gỡ hoặc không khớp với tài khoản đã cấp phép. Hoặc xung đột với ứng dụng khác.
         invalid_redirect_uri: URL chuyển hướng không hợp lệ.
         invalid_request:
diff --git a/config/locales/doorkeeper.zh-CN.yml b/config/locales/doorkeeper.zh-CN.yml
index 2c096720c2..fcba0f9c56 100644
--- a/config/locales/doorkeeper.zh-CN.yml
+++ b/config/locales/doorkeeper.zh-CN.yml
@@ -83,7 +83,10 @@ zh-CN:
         access_denied: 资源所有者或验证服务器拒绝了此请求
         credential_flow_not_configured: 由于 Doorkeeper.configure.resource_owner_from_credentials 尚未配置，应用验证授权流程失败。
         invalid_client: 由于应用信息未知、未提交认证信息或使用了不支持的认证方式，认证失败
-        invalid_code_challenge_method: 代码验证方法必须是 S256，不支持明文。
+        invalid_code_challenge_method:
+          one: code_challenge_method 必须是 %{challenge_methods}。
+          other: code_challenge_method 必须是 %{challenge_methods} 的其中之一。
+          zero: 授权服务器不支持 PKCE，因为没有被接受的 code_challenge_method 值。
         invalid_grant: 授权方式无效、过期或已被撤销、与授权请求中的回调地址不一致，或使用了其他应用的回调地址
         invalid_redirect_uri: 登录回调地址无效。
         invalid_request:
diff --git a/config/locales/doorkeeper.zh-TW.yml b/config/locales/doorkeeper.zh-TW.yml
index 5af93e1e07..6e0950fdda 100644
--- a/config/locales/doorkeeper.zh-TW.yml
+++ b/config/locales/doorkeeper.zh-TW.yml
@@ -83,7 +83,10 @@ zh-TW:
         access_denied: 資源持有者或授權伺服器拒絕請求。
         credential_flow_not_configured: 因為 Doorkeeper.configure.resource_owner_from_credentials 未設定，所以資源持有者密碼認證程序失敗。
         invalid_client: 用戶端驗證失敗，可能是因為未知的用戶端程式、未包含用戶端驗證、或使用了不支援的認證方法。
-        invalid_code_challenge_method: code challenge 方式必須為 S256 (SHA256)，不支援 plain 方式。
+        invalid_code_challenge_method:
+          one: code_challenge_method 必須是 %{challenge_methods}。
+          other: code_challenge_method 必須是 %{challenge_methods} 其中之一。
+          zero: 授權伺服器不支援 PKCE ，因為沒有被接受的  code_challenge_method 值。
         invalid_grant: 授權申請不正確、逾期、已被註銷、與授權請求內的重新導向 URI 不符、或屬於別的用戶端程式。
         invalid_redirect_uri: 包含的重新導向 URI 是不正確的。
         invalid_request:
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 17473de767..5daacf6fdf 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -802,6 +802,7 @@ nn:
         view_devops_description: Gir brukere tilgang til Sidekiq og pgHero-dashbord
         view_feeds: Sjå direktestraumar og emnestraumar
         view_feeds_description: La brukarar sjå direkte- og emnestraumane uansett innstillingar på tenaren
+      requires_2fa: Krev tofaktorinnlogging
       title: Roller
     rules:
       add_new: Legg til regel
@@ -2020,6 +2021,8 @@ nn:
     past_preamble_html: Me har endra brukarvilkåra våre sidan du var her sist. Det er fint viss du ser på dei oppdaterte vilkåra.
     review_link: Les gjennom brukarvilkåra
     title: Brukarvilkåra på %{domain} er endra
+  themes:
+    default: Mastodon
   time:
     formats:
       default: "%d.%b %Y, %H:%M"
@@ -2044,6 +2047,8 @@ nn:
     recovery_codes: Reservekoder
     recovery_codes_regenerated: Generering av reservekoder fullført
     recovery_instructions_html: Hvis du skulle miste tilgang til telefonen din, kan du bruke en av gjenopprettingskodene nedenfor til å gjenopprette tilgang til din konto. <strong>Oppbevar gjenopprettingskodene sikkert</strong>, for eksempel ved å skrive dem ut og gjemme dem på et lurt sted bare du vet om.
+    resume_app_authorization: Hald fram å godkjenna applikasojnen
+    role_requirement: "%{domain} krev at du set opp tofaktorinnlogging før du kan bruka Mastodon."
     webauthn: Sikkerhetsnøkler
   user_mailer:
     announcement_published:
diff --git a/config/locales/simple_form.ca.yml b/config/locales/simple_form.ca.yml
index 1be0bc621b..1590410556 100644
--- a/config/locales/simple_form.ca.yml
+++ b/config/locales/simple_form.ca.yml
@@ -213,6 +213,7 @@ ca:
         email: Adreça de correu electrònic
         expires_in: Expira després
         fields: Metadades del perfil
+        filter_action: Acció de filtratge
         header: Capçalera
         honeypot: "%{label} (no omplir)"
         inbox_url: Enllaç de la safata d'entrada del relay
@@ -228,6 +229,7 @@ ca:
         setting_aggregate_reblogs: Agrupar impulsos en les línies de temps
         setting_always_send_emails: Envia'm sempre notificacions per correu electrònic
         setting_auto_play_gif: Reprodueix automàticament els GIF animats
+        setting_color_scheme: Esquema de colors
         setting_contrast: Contrast
         setting_default_language: Llengua dels tuts
         setting_default_privacy: Visibilitat de la publicació
diff --git a/config/locales/simple_form.da.yml b/config/locales/simple_form.da.yml
index bb753f33fe..4a236d374a 100644
--- a/config/locales/simple_form.da.yml
+++ b/config/locales/simple_form.da.yml
@@ -224,6 +224,7 @@ da:
         email: E-mailadresse
         expires_in: Udløb efter
         fields: Profilmetadata
+        filter_action: Filterhandling
         header: Bannerbillede
         honeypot: "%{label} (udfyld ikke)"
         inbox_url: URL til videreformidlingsindbakken
diff --git a/config/locales/simple_form.nn.yml b/config/locales/simple_form.nn.yml
index c289e799b3..f30f0b6cc1 100644
--- a/config/locales/simple_form.nn.yml
+++ b/config/locales/simple_form.nn.yml
@@ -164,6 +164,7 @@ nn:
         name: Offentleg namn på rolla, dersom rolla skal visast som eit emblem
         permissions_as_keys: Brukarar med denne rolla vil ha tilgang til...
         position: Høgare rolle avgjer konfliktløysing i visse situasjonar. Visse handlingar kan berre utførast på roller med lågare prioritet
+        require_2fa: Brukarar med denne rolla må setja opp tofaktorinnlogging for å bruka Mastodon
       username_block:
         allow_with_approval: I staden for å hindra registreringar i det heile, må du godkjenna registreringar som passar
         comparison: Ver merksam på Scunthorpe-problemet når du blokkerer delvise treff
@@ -223,6 +224,7 @@ nn:
         email: E-post-adresse
         expires_in: Vert ugyldig etter
         fields: Profilmetadata
+        filter_action: Filterhandling
         header: Overskrift
         honeypot: "%{label} (ikke fyll ut)"
         inbox_url: URL-addressen til overgangsinnboksen
@@ -239,6 +241,7 @@ nn:
         setting_always_send_emails: Alltid send epostvarsel
         setting_auto_play_gif: Spel av animerte GIF-ar automatisk
         setting_boost_modal: Kontroller korleis du framhevar innlegg
+        setting_color_scheme: Fargepalett
         setting_contrast: Kontrast
         setting_default_language: Språk på innlegg
         setting_default_privacy: Innleggsvising
@@ -386,6 +389,7 @@ nn:
         name: Namn
         permissions_as_keys: Løyve
         position: Prioritet
+        require_2fa: Krev tofaktorinnlogging
       username_block:
         allow_with_approval: Tillat registreringar med godkjenning
         comparison: Samanlikningsmetode
diff --git a/config/routes/web_app.rb b/config/routes/web_app.rb
index d12885882a..514ada9f53 100644
--- a/config/routes/web_app.rb
+++ b/config/routes/web_app.rb
@@ -26,6 +26,7 @@
   /notifications_v2/(*any)
   /notifications/(*any)
   /pinned
+  /profile/(*any)
   /public
   /public/local
   /public/remote
diff --git a/db/migrate/20260217154542_add_profile_settings_to_accounts.rb b/db/migrate/20260217154542_add_profile_settings_to_accounts.rb
new file mode 100644
index 0000000000..dc30575676
--- /dev/null
+++ b/db/migrate/20260217154542_add_profile_settings_to_accounts.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddProfileSettingsToAccounts < ActiveRecord::Migration[8.0]
+  def change
+    add_column :accounts, :show_media, :boolean, null: false, default: true
+    add_column :accounts, :show_media_replies, :boolean, null: false, default: true
+    add_column :accounts, :show_featured, :boolean, null: false, default: true
+  end
+end
diff --git a/db/post_migrate/20190927124642_remove_invalid_web_push_subscription.rb b/db/post_migrate/20190927124642_remove_invalid_web_push_subscription.rb
index c2397476ad..6c58a4f6d7 100644
--- a/db/post_migrate/20190927124642_remove_invalid_web_push_subscription.rb
+++ b/db/post_migrate/20190927124642_remove_invalid_web_push_subscription.rb
@@ -5,9 +5,9 @@ class RemoveInvalidWebPushSubscription < ActiveRecord::Migration[5.2]
 
   def up
     invalid_web_push_subscriptions = Web::PushSubscription.where(endpoint: '')
-                                                          .or(Web::PushSubscription.where(key_p256dh: ''))
-                                                          .or(Web::PushSubscription.where(key_auth: ''))
-                                                          .preload(:session_activation)
+      .or(Web::PushSubscription.where(key_p256dh: ''))
+      .or(Web::PushSubscription.where(key_auth: ''))
+      .preload(:session_activation)
     invalid_web_push_subscriptions.find_each do |web_push_subscription|
       web_push_subscription.session_activation&.update!(web_push_subscription_id: nil)
       web_push_subscription.destroy!
diff --git a/db/schema.rb b/db/schema.rb
index b1ee2f7c71..16be435bbc 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.0].define(version: 2026_02_12_131934) do
+ActiveRecord::Schema[8.0].define(version: 2026_02_17_154542) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_catalog.plpgsql"
 
@@ -203,6 +203,9 @@ ActiveRecord::Schema[8.0].define(version: 2026_02_12_131934) do
     t.integer "feature_approval_policy", default: 0, null: false
     t.string "avatar_description", default: "", null: false
     t.string "header_description", default: "", null: false
+    t.boolean "show_media", default: true, null: false
+    t.boolean "show_media_replies", default: true, null: false
+    t.boolean "show_featured", default: true, null: false
     t.index "(((setweight(to_tsvector('simple'::regconfig, (display_name)::text), 'A'::\"char\") || setweight(to_tsvector('simple'::regconfig, (username)::text), 'B'::\"char\")) || setweight(to_tsvector('simple'::regconfig, (COALESCE(domain, ''::character varying))::text), 'C'::\"char\")))", name: "search_index", using: :gin
     t.index "lower((username)::text), COALESCE(lower((domain)::text), ''::text)", name: "index_accounts_on_username_and_domain_lower", unique: true
     t.index ["domain", "id"], name: "index_accounts_on_domain_and_id"
diff --git a/lib/mastodon/redis_configuration.rb b/lib/mastodon/redis_configuration.rb
index 7330f7d0e5..43562cbca8 100644
--- a/lib/mastodon/redis_configuration.rb
+++ b/lib/mastodon/redis_configuration.rb
@@ -17,15 +17,15 @@ class Mastodon::RedisConfiguration
 
   def cache
     @cache ||= setup_config(prefix: 'CACHE_')
-               .merge({
-                 namespace: 'cache',
-                 expires_in: 10.minutes,
-                 connect_timeout: 5,
-                 pool: {
-                   size: Sidekiq.server? ? Sidekiq.default_configuration[:concurrency] : Integer(ENV['MAX_THREADS'] || 5),
-                   timeout: 5,
-                 },
-               })
+      .merge({
+        namespace: 'cache',
+        expires_in: 10.minutes,
+        connect_timeout: 5,
+        pool: {
+          size: Sidekiq.server? ? Sidekiq.default_configuration[:concurrency] : Integer(ENV['MAX_THREADS'] || 5),
+          timeout: 5,
+        },
+      })
   end
 
   private
diff --git a/lib/paperclip/attachment_extensions.rb b/lib/paperclip/attachment_extensions.rb
index 7141adc9ed..bb39d076c4 100644
--- a/lib/paperclip/attachment_extensions.rb
+++ b/lib/paperclip/attachment_extensions.rb
@@ -24,7 +24,7 @@ module Paperclip
 
       unadapted_file = @queued_for_write[name]
       @queued_for_write[name] = Paperclip.io_adapters
-                                         .for(@queued_for_write[name], @options[:adapter_options])
+        .for(@queued_for_write[name], @options[:adapter_options])
       unadapted_file.close if unadapted_file.respond_to?(:close)
       @queued_for_write[name]
     rescue Paperclip::Errors::NotIdentifiedByImageMagickError => e
diff --git a/lib/paperclip/color_extractor.rb b/lib/paperclip/color_extractor.rb
index 1c9ef4bd3d..eb40d5091b 100644
--- a/lib/paperclip/color_extractor.rb
+++ b/lib/paperclip/color_extractor.rb
@@ -221,10 +221,10 @@ module Paperclip
       total_frequencies = frequencies.sum.to_f
 
       frequencies.map.with_index { |f, i| [f / total_frequencies, hex_values[i]] }
-                 .sort_by { |r| -r[0] }
-                 .reject { |r| r[1].size == 8 && r[1].end_with?('00') }
-                 .map { |r| ColorDiff::Color::RGB.new(*r[1][0..5].scan(/../).map { |c| c.to_i(16) }) }
-                 .slice(0, quantity)
+        .sort_by { |r| -r[0] }
+        .reject { |r| r[1].size == 8 && r[1].end_with?('00') }
+        .map { |r| ColorDiff::Color::RGB.new(*r[1][0..5].scan(/../).map { |c| c.to_i(16) }) }
+        .slice(0, quantity)
     end
 
     def rgb_to_hex(rgb)
diff --git a/spec/controllers/settings/two_factor_authentication/otp_authentication_controller_spec.rb b/spec/controllers/settings/two_factor_authentication/otp_authentication_controller_spec.rb
index a03c4a4adb..6a3ad54cb6 100644
--- a/spec/controllers/settings/two_factor_authentication/otp_authentication_controller_spec.rb
+++ b/spec/controllers/settings/two_factor_authentication/otp_authentication_controller_spec.rb
@@ -63,7 +63,7 @@ RSpec.describe Settings::TwoFactorAuthentication::OtpAuthenticationController do
             expect do
               post :create, session: { challenge_passed_at: Time.now.utc }
             end.to not_change { user.reload.otp_secret }
-               .and(change { session[:new_otp_secret] })
+              .and(change { session[:new_otp_secret] })
 
             expect(response).to redirect_to(new_settings_two_factor_authentication_confirmation_path)
           end
@@ -80,7 +80,7 @@ RSpec.describe Settings::TwoFactorAuthentication::OtpAuthenticationController do
             expect do
               post :create, session: { challenge_passed_at: Time.now.utc }
             end.to not_change { user.reload.otp_secret }
-               .and(change { session[:new_otp_secret] })
+              .and(change { session[:new_otp_secret] })
 
             expect(response).to redirect_to(new_settings_two_factor_authentication_confirmation_path)
           end
diff --git a/spec/controllers/settings/two_factor_authentication/webauthn_credentials_controller_spec.rb b/spec/controllers/settings/two_factor_authentication/webauthn_credentials_controller_spec.rb
index cccf3c51d3..cd0df9e917 100644
--- a/spec/controllers/settings/two_factor_authentication/webauthn_credentials_controller_spec.rb
+++ b/spec/controllers/settings/two_factor_authentication/webauthn_credentials_controller_spec.rb
@@ -200,7 +200,7 @@ RSpec.describe Settings::TwoFactorAuthentication::WebauthnCredentialsController
             expect do
               post :create, params: { credential: new_webauthn_credential, nickname: nickname }
             end.to change { user.webauthn_credentials.count }.by(1)
-                                                             .and not_change(user, :webauthn_id)
+              .and not_change(user, :webauthn_id)
 
             expect(response).to have_http_status(200)
           end
diff --git a/spec/requests/activitypub/outboxes_spec.rb b/spec/requests/activitypub/outboxes_spec.rb
index c109214635..cb6c460f9e 100644
--- a/spec/requests/activitypub/outboxes_spec.rb
+++ b/spec/requests/activitypub/outboxes_spec.rb
@@ -81,8 +81,8 @@ RSpec.describe 'ActivityPub Outboxes' do
           expect(response.parsed_body)
             .to include(
               orderedItems: be_an(Array)
-              .and(have_attributes(size: 2))
-              .and(all(satisfy { |item| targets_public_collection?(item) }))
+                .and(have_attributes(size: 2))
+                .and(all(satisfy { |item| targets_public_collection?(item) }))
             )
         end
 
@@ -133,8 +133,8 @@ RSpec.describe 'ActivityPub Outboxes' do
           expect(response.parsed_body)
             .to include(
               orderedItems: be_an(Array)
-              .and(have_attributes(size: 2))
-              .and(all(satisfy { |item| targets_public_collection?(item) }))
+                .and(have_attributes(size: 2))
+                .and(all(satisfy { |item| targets_public_collection?(item) }))
             )
         end
       end
@@ -155,8 +155,8 @@ RSpec.describe 'ActivityPub Outboxes' do
           expect(response.parsed_body)
             .to include(
               orderedItems: be_an(Array)
-              .and(have_attributes(size: 3))
-              .and(all(satisfy { |item| targets_public_collection?(item) || targets_followers_collection?(item, account) }))
+                .and(have_attributes(size: 3))
+                .and(all(satisfy { |item| targets_public_collection?(item) || targets_followers_collection?(item, account) }))
             )
         end
       end
diff --git a/spec/requests/activitypub/replies_spec.rb b/spec/requests/activitypub/replies_spec.rb
index 4cd02b187d..02832c049a 100644
--- a/spec/requests/activitypub/replies_spec.rb
+++ b/spec/requests/activitypub/replies_spec.rb
@@ -100,8 +100,8 @@ RSpec.describe 'ActivityPub Replies' do
               first: be_a(Hash).and(
                 include(
                   items: be_an(Array)
-                  .and(have_attributes(size: 1))
-                  .and(all(satisfy { |item| targets_public_collection?(item) }))
+                    .and(have_attributes(size: 1))
+                    .and(all(satisfy { |item| targets_public_collection?(item) }))
                 )
               )
             )
diff --git a/spec/services/bulk_import_service_spec.rb b/spec/services/bulk_import_service_spec.rb
index f52fc4d7d5..9adbd522dc 100644
--- a/spec/services/bulk_import_service_spec.rb
+++ b/spec/services/bulk_import_service_spec.rb
@@ -343,10 +343,10 @@ RSpec.describe BulkImportService do
         .and_return(resolve_account_service_double)
       allow(resolve_account_service_double)
         .to receive(:call)
-        .with('user@foo.bar', any_args) { Fabricate(:account, username: 'user', domain: 'foo.bar', protocol: :activitypub) }
+          .with('user@foo.bar', any_args) { Fabricate(:account, username: 'user', domain: 'foo.bar', protocol: :activitypub) }
       allow(resolve_account_service_double)
         .to receive(:call)
-        .with('unknown@unknown.bar', any_args) { Fabricate(:account, username: 'unknown', domain: 'unknown.bar', protocol: :activitypub) }
+          .with('unknown@unknown.bar', any_args) { Fabricate(:account, username: 'unknown', domain: 'unknown.bar', protocol: :activitypub) }
 
       Import::RowWorker.drain
     end
diff --git a/spec/system/admin/software_updates_spec.rb b/spec/system/admin/software_updates_spec.rb
index e62b6a8cfe..d9e4bf36fa 100644
--- a/spec/system/admin/software_updates_spec.rb
+++ b/spec/system/admin/software_updates_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe 'finding software updates through the admin interface' do
     expect(page).to have_title(I18n.t('admin.software_updates.title'))
 
     expect(page).to have_content('99.99.99')
-                .and have_no_content('3.5.0')
+      .and have_no_content('3.5.0')
 
     click_on I18n.t('admin.software_updates.release_notes')
     expect(page).to have_current_path('https://github.com/mastodon/mastodon/releases/v99', url: true)
diff --git a/spec/validators/language_validator_spec.rb b/spec/validators/language_validator_spec.rb
index d19b33f27f..b79c948d53 100644
--- a/spec/validators/language_validator_spec.rb
+++ b/spec/validators/language_validator_spec.rb
@@ -3,59 +3,33 @@
 require 'rails_helper'
 
 RSpec.describe LanguageValidator do
+  subject { record_class.new }
+
   let(:record_class) do
     Class.new do
       include ActiveModel::Validations
 
+      def self.name = 'Record'
+
       attr_accessor :locale
 
       validates :locale, language: true
     end
   end
-  let(:record) { record_class.new }
 
-  describe '#validate_each' do
-    context 'with a nil value' do
-      it 'does not add errors' do
-        record.locale = nil
+  context 'with a nil value' do
+    it { is_expected.to allow_value(nil).for(:locale) }
+  end
 
-        expect(record).to be_valid
-        expect(record.errors).to be_empty
-      end
-    end
+  context 'with an array of values' do
+    it { is_expected.to allow_value(%w(en fr)).for(:locale) }
 
-    context 'with an array of values' do
-      it 'does not add errors with array of existing locales' do
-        record.locale = %w(en fr)
+    it { is_expected.to_not allow_value(%w(en fr missing)).for(:locale).with_message(:invalid) }
+  end
 
-        expect(record).to be_valid
-        expect(record.errors).to be_empty
-      end
+  context 'with a locale string' do
+    it { is_expected.to allow_value('en').for(:locale) }
 
-      it 'adds errors with array having some non-existing locales' do
-        record.locale = %w(en fr missing)
-
-        expect(record).to_not be_valid
-        expect(record.errors.first.attribute).to eq(:locale)
-        expect(record.errors.first.type).to eq(:invalid)
-      end
-    end
-
-    context 'with a locale string' do
-      it 'does not add errors when string is an existing locale' do
-        record.locale = 'en'
-
-        expect(record).to be_valid
-        expect(record.errors).to be_empty
-      end
-
-      it 'adds errors when string is non-existing locale' do
-        record.locale = 'missing'
-
-        expect(record).to_not be_valid
-        expect(record.errors.first.attribute).to eq(:locale)
-        expect(record.errors.first.type).to eq(:invalid)
-      end
-    end
+    it { is_expected.to_not allow_value('missing').for(:locale).with_message(:invalid) }
   end
 end
diff --git a/spec/validators/note_length_validator_spec.rb b/spec/validators/note_length_validator_spec.rb
index c761c95280..b391390a55 100644
--- a/spec/validators/note_length_validator_spec.rb
+++ b/spec/validators/note_length_validator_spec.rb
@@ -3,61 +3,61 @@
 require 'rails_helper'
 
 RSpec.describe NoteLengthValidator do
-  subject { described_class.new(attributes: { note: true }, maximum: 500) }
+  subject { record_class.new }
 
-  describe '#validate' do
-    it 'adds an error when text is over configured character limit' do
-      text = 'a' * 520
-      account = instance_double(Account, note: text, errors: activemodel_errors)
+  let(:record_class) do
+    Class.new do
+      include ActiveModel::Validations
 
-      subject.validate_each(account, 'note', text)
-      expect(account.errors).to have_received(:add)
-    end
+      def self.name = 'Record'
 
-    it 'reduces calculated length of auto-linkable space-separated URLs' do
-      text = [starting_string, example_link].join(' ')
-      account = instance_double(Account, note: text, errors: activemodel_errors)
+      attr_accessor :note
 
-      subject.validate_each(account, 'note', text)
-      expect(account.errors).to_not have_received(:add)
-    end
-
-    it 'does not reduce calculated length of non-autolinkable URLs' do
-      text = [starting_string, example_link].join
-      account = instance_double(Account, note: text, errors: activemodel_errors)
-
-      subject.validate_each(account, 'note', text)
-      expect(account.errors).to have_received(:add)
-    end
-
-    it 'counts multi byte emoji as single character' do
-      text = '✨' * 500
-      account = instance_double(Account, note: text, errors: activemodel_errors)
-
-      subject.validate_each(account, 'note', text)
-      expect(account.errors).to_not have_received(:add)
-    end
-
-    it 'counts ZWJ sequence emoji as single character' do
-      text = '🏳️‍⚧️' * 500
-      account = instance_double(Account, note: text, errors: activemodel_errors)
-
-      subject.validate_each(account, 'note', text)
-      expect(account.errors).to_not have_received(:add)
-    end
-
-    private
-
-    def starting_string
-      'a' * 476
-    end
-
-    def example_link
-      "http://#{'b' * 30}.com/example"
-    end
-
-    def activemodel_errors
-      instance_double(ActiveModel::Errors, add: nil)
+      validates :note, note_length: { maximum: 100 }
     end
   end
+
+  context 'when note is too long' do
+    let(:too_long) { 'a' * 200 }
+
+    it { is_expected.to_not allow_value(too_long).for(:note).with_message(too_long_message) }
+  end
+
+  context 'when note has space separated linkable URLs' do
+    let(:text) { [starting_string, example_link].join(' ') }
+
+    it { is_expected.to allow_value(text).for(:note) }
+  end
+
+  context 'when note has non-separated URLs' do
+    let(:text) { [starting_string, example_link].join }
+
+    it { is_expected.to_not allow_value(text).for(:note).with_message(too_long_message) }
+  end
+
+  context 'with multi-byte emoji' do
+    let(:text) { '✨' * 100 }
+
+    it { is_expected.to allow_value(text).for(:note) }
+  end
+
+  context 'with ZWJ sequence emoji' do
+    let(:text) { '🏳️‍⚧️' * 100 }
+
+    it { is_expected.to allow_value(text).for(:note) }
+  end
+
+  private
+
+  def too_long_message
+    I18n.t('statuses.over_character_limit', max: 100)
+  end
+
+  def starting_string
+    'a' * 76
+  end
+
+  def example_link
+    "http://#{'b' * 30}.com/example"
+  end
 end
diff --git a/spec/validators/poll_options_validator_spec.rb b/spec/validators/poll_options_validator_spec.rb
index cc03e9d673..866405e109 100644
--- a/spec/validators/poll_options_validator_spec.rb
+++ b/spec/validators/poll_options_validator_spec.rb
@@ -3,69 +3,43 @@
 require 'rails_helper'
 
 RSpec.describe PollOptionsValidator do
-  describe '#validate' do
-    before do
-      validator.validate(poll)
+  subject { Fabricate.build :poll }
+
+  context 'when poll has unique valid options' do
+    it { is_expected.to allow_values(%w(One Two)).for(:options) }
+  end
+
+  context 'when poll has too few options' do
+    it { is_expected.to_not allow_values([]).for(:options).with_message(I18n.t('polls.errors.too_few_options')) }
+  end
+
+  context 'when poll has too many options' do
+    before { stub_const 'PollOptionsValidator::MAX_OPTIONS', 2 }
+
+    it { is_expected.to_not allow_values(%w(One Two Three)).for(:options).with_message(I18n.t('polls.errors.too_many_options', max: 2)) }
+  end
+
+  context 'when poll has duplicate options' do
+    it { is_expected.to_not allow_values(%w(One One One)).for(:options).with_message(I18n.t('polls.errors.duplicate_options')) }
+  end
+
+  describe 'poll option length limits' do
+    let(:limit) { 5 }
+
+    before { stub_const 'PollOptionsValidator::MAX_OPTION_CHARS', limit }
+
+    context 'when poll has acceptable length options' do
+      it { is_expected.to allow_values(%w(One Two)).for(:options) }
     end
 
-    let(:validator) { described_class.new }
-    let(:poll) { instance_double(Poll, options: options, expires_at: expires_at, errors: errors) }
-    let(:errors) { instance_double(ActiveModel::Errors, add: nil) }
-    let(:options) { %w(foo bar) }
-    let(:expires_at) { 1.day.from_now }
+    context 'when poll has multibyte and ZWJ emoji options' do
+      let(:options) { ['✨' * limit, '🏳️‍⚧️' * limit] }
 
-    it 'has no errors' do
-      expect(errors).to_not have_received(:add)
+      it { is_expected.to allow_values(options).for(:options) }
     end
 
-    context 'when the poll has duplicate options' do
-      let(:options) { %w(foo foo) }
-
-      it 'adds errors' do
-        expect(errors).to have_received(:add)
-      end
-    end
-
-    context 'when the poll has no options' do
-      let(:options) { [] }
-
-      it 'adds errors' do
-        expect(errors).to have_received(:add)
-      end
-    end
-
-    context 'when the poll has too many options' do
-      let(:options) { Array.new(described_class::MAX_OPTIONS + 1) { |i| "option #{i}" } }
-
-      it 'adds errors' do
-        expect(errors).to have_received(:add)
-      end
-    end
-
-    describe 'character length of poll options' do
-      context 'when poll has acceptable length options' do
-        let(:options) { %w(test this) }
-
-        it 'has no errors' do
-          expect(errors).to_not have_received(:add)
-        end
-      end
-
-      context 'when poll has multibyte and ZWJ emoji options' do
-        let(:options) { ['✨' * described_class::MAX_OPTION_CHARS, '🏳️‍⚧️' * described_class::MAX_OPTION_CHARS] }
-
-        it 'has no errors' do
-          expect(errors).to_not have_received(:add)
-        end
-      end
-
-      context 'when poll has options that are too long' do
-        let(:options) { ['ok', 'a' * (described_class::MAX_OPTION_CHARS**2)] }
-
-        it 'has errors' do
-          expect(errors).to have_received(:add)
-        end
-      end
+    context 'when poll has options that are too long' do
+      it { is_expected.to_not allow_values(%w(Airplane Two Three)).for(:options).with_message(I18n.t('polls.errors.over_character_limit', max: limit)) }
     end
   end
 end
diff --git a/spec/validators/reaction_validator_spec.rb b/spec/validators/reaction_validator_spec.rb
index c4d4a51779..d17c4b0505 100644
--- a/spec/validators/reaction_validator_spec.rb
+++ b/spec/validators/reaction_validator_spec.rb
@@ -3,41 +3,35 @@
 require 'rails_helper'
 
 RSpec.describe ReactionValidator do
-  let(:announcement) { Fabricate(:announcement) }
+  subject { Fabricate.build :announcement_reaction }
 
-  describe '#validate' do
-    it 'adds error when not a valid unicode emoji' do
-      reaction = announcement.announcement_reactions.build(name: 'F')
-      subject.validate(reaction)
-      expect(reaction.errors).to_not be_empty
-    end
+  context 'when not valid unicode emoji' do
+    it { is_expected.to_not allow_value('F').for(:name).with_message(I18n.t('reactions.errors.unrecognized_emoji')) }
+  end
 
-    it 'does not add error when non-unicode emoji is a custom emoji' do
-      custom_emoji = Fabricate(:custom_emoji)
-      reaction = announcement.announcement_reactions.build(name: custom_emoji.shortcode, custom_emoji_id: custom_emoji.id)
-      subject.validate(reaction)
-      expect(reaction.errors).to be_empty
-    end
+  context 'when non-unicode emoji is a custom emoji' do
+    let!(:custom_emoji) { Fabricate :custom_emoji }
 
-    it 'adds error when reaction limit count has already been reached' do
-      stub_const 'ReactionValidator::LIMIT', 2
-      %w(🐘 ❤️).each do |name|
-        announcement.announcement_reactions.create!(name: name, account: Fabricate(:account))
+    it { is_expected.to allow_value(custom_emoji.shortcode).for(:name) }
+  end
+
+  describe 'limiting reactions' do
+    subject { Fabricate.build :announcement_reaction, announcement: }
+
+    let(:announcement) { Fabricate :announcement }
+
+    before { stub_const 'ReactionValidator::LIMIT', 2 }
+
+    context 'when limit has been reached' do
+      before { %w(🐘 ❤️).each { |name| Fabricate :announcement_reaction, name:, announcement: } }
+
+      context 'with emoji already used' do
+        it { is_expected.to allow_value('❤️').for(:name) }
       end
 
-      reaction = announcement.announcement_reactions.build(name: '😘')
-      subject.validate(reaction)
-      expect(reaction.errors).to_not be_empty
-    end
-
-    it 'does not add error when new reaction is part of the existing ones' do
-      %w(🐘 ❤️ 🙉 😍 😋 😂 😞 👍).each do |name|
-        announcement.announcement_reactions.create!(name: name, account: Fabricate(:account))
+      context 'with emoji not already used' do
+        it { is_expected.to_not allow_value('😘').for(:name).against(:base).with_message(I18n.t('reactions.errors.limit_reached')) }
       end
-
-      reaction = announcement.announcement_reactions.build(name: '😋')
-      subject.validate(reaction)
-      expect(reaction.errors).to be_empty
     end
   end
 end
diff --git a/spec/validators/status_length_validator_spec.rb b/spec/validators/status_length_validator_spec.rb
index 050b7500bb..4efd688e4a 100644
--- a/spec/validators/status_length_validator_spec.rb
+++ b/spec/validators/status_length_validator_spec.rb
@@ -3,123 +3,88 @@
 require 'rails_helper'
 
 RSpec.describe StatusLengthValidator do
-  describe '#validate' do
-    before { stub_const("#{described_class}::MAX_CHARS", 500) } # Example values below are relative to this baseline
+  subject { Fabricate.build :status }
 
-    it 'does not add errors onto remote statuses' do
-      status = instance_double(Status, local?: false)
-      allow(status).to receive(:errors)
+  before { stub_const 'StatusLengthValidator::MAX_CHARS', 100 }
 
-      subject.validate(status)
+  let(:over_limit_text) { 'a' * described_class::MAX_CHARS * 2 }
 
-      expect(status).to_not have_received(:errors)
-    end
+  context 'when status is remote' do
+    before { subject.update! account: Fabricate(:account, domain: 'host.example') }
 
-    it 'does not add errors onto local reblogs' do
-      status = instance_double(Status, local?: false, reblog?: true)
-      allow(status).to receive(:errors)
+    it { is_expected.to allow_value(over_limit_text).for(:text) }
+    it { is_expected.to allow_value(over_limit_text).for(:spoiler_text).against(:text) }
+  end
 
-      subject.validate(status)
+  context 'when status is a local reblog' do
+    before { subject.update! reblog: Fabricate(:status) }
 
-      expect(status).to_not have_received(:errors)
-    end
+    it { is_expected.to allow_value(over_limit_text).for(:text) }
+    it { is_expected.to allow_value(over_limit_text).for(:spoiler_text).against(:text) }
+  end
 
-    it 'adds an error when content warning is over character limit' do
-      status = status_double(spoiler_text: 'a' * 520)
-      subject.validate(status)
-      expect(status.errors).to have_received(:add)
-    end
+  context 'when text is over character limit' do
+    it { is_expected.to_not allow_value(over_limit_text).for(:text).with_message(too_long_message) }
+  end
 
-    it 'adds an error when text is over character limit' do
-      status = status_double(text: 'a' * 520)
-      subject.validate(status)
-      expect(status.errors).to have_received(:add)
-    end
+  context 'when content warning text is over character limit' do
+    it { is_expected.to_not allow_value(over_limit_text).for(:spoiler_text).against(:text).with_message(too_long_message) }
+  end
 
-    it 'adds an error when text and content warning are over character limit total' do
-      status = status_double(spoiler_text: 'a' * 250, text: 'b' * 251)
-      subject.validate(status)
-      expect(status.errors).to have_received(:add)
-    end
+  context 'when text and content warning combine to exceed limit' do
+    before { subject.text = 'a' * 50 }
 
-    it 'reduces calculated length of auto-linkable space-separated URLs' do
-      text = [starting_string, example_link].join(' ')
-      status = status_double(text: text)
+    it { is_expected.to_not allow_value('a' * 55).for(:spoiler_text).against(:text).with_message(too_long_message) }
+  end
 
-      subject.validate(status)
-      expect(status.errors).to_not have_received(:add)
-    end
+  context 'when text has space separated linkable URLs' do
+    let(:text) { [starting_string, example_link].join(' ') }
 
-    it 'does not reduce calculated length of non-autolinkable URLs' do
-      text = [starting_string, example_link].join
-      status = status_double(text: text)
+    it { is_expected.to allow_value(text).for(:text) }
+  end
 
-      subject.validate(status)
-      expect(status.errors).to have_received(:add)
-    end
+  context 'when text has non-separated URLs' do
+    let(:text) { [starting_string, example_link].join }
 
-    it 'does not reduce calculated length of count overly long URLs' do
-      text = "http://example.com/valid?#{'#foo?' * 1000}"
-      status = status_double(text: text)
-      subject.validate(status)
-      expect(status.errors).to have_received(:add)
-    end
+    it { is_expected.to_not allow_value(text).for(:text).with_message(too_long_message) }
+  end
 
-    it 'counts only the front part of remote usernames' do
-      text   = ('a' * 475) + " @alice@#{'b' * 30}.com"
-      status = status_double(text: text)
+  context 'with excessively long URLs' do
+    let(:text) { "http://example.com/valid?#{'#foo?' * 1000}" }
 
-      subject.validate(status)
-      expect(status.errors).to_not have_received(:add)
-    end
+    it { is_expected.to_not allow_value(text).for(:text).with_message(too_long_message) }
+  end
 
-    it 'does count both parts of remote usernames for overly long domains' do
-      text   = "@alice@#{'b' * 500}.com"
-      status = status_double(text: text)
+  context 'when remote account usernames cause limit excess' do
+    let(:text) { ('a' * 75) + " @alice@#{'b' * 30}.com" }
 
-      subject.validate(status)
-      expect(status.errors).to have_received(:add)
-    end
+    it { is_expected.to allow_value(text).for(:text) }
+  end
 
-    it 'counts multi byte emoji as single character' do
-      text = '✨' * 500
-      status = status_double(text: text)
+  context 'when remote usernames are attached to long domains' do
+    let(:text) { "@alice@#{'b' * Extractor::MAX_DOMAIN_LENGTH * 2}.com" }
 
-      subject.validate(status)
-      expect(status.errors).to_not have_received(:add)
-    end
+    it { is_expected.to_not allow_value(text).for(:text).with_message(too_long_message) }
+  end
 
-    it 'counts ZWJ sequence emoji as single character' do
-      text = '🏳️‍⚧️' * 500
-      status = status_double(text: text)
+  context 'with special character strings' do
+    let(:multibyte_emoji) { '✨' * described_class::MAX_CHARS }
+    let(:zwj_sequence) { '🏳️‍⚧️' * described_class::MAX_CHARS }
 
-      subject.validate(status)
-      expect(status.errors).to_not have_received(:add)
-    end
+    it { is_expected.to allow_values(multibyte_emoji, zwj_sequence).for(:text) }
   end
 
   private
 
+  def too_long_message
+    I18n.t('statuses.over_character_limit', max: described_class::MAX_CHARS)
+  end
+
   def starting_string
-    'a' * 476
+    'a' * 76
   end
 
   def example_link
     "http://#{'b' * 30}.com/example"
   end
-
-  def status_double(spoiler_text: '', text: '')
-    instance_double(
-      Status,
-      spoiler_text: spoiler_text,
-      text: text,
-      errors: activemodel_errors,
-      local?: true,
-      reblog?: false
-    )
-  end
-
-  def activemodel_errors
-    instance_double(ActiveModel::Errors, add: nil)
-  end
 end
diff --git a/spec/validators/status_pin_validator_spec.rb b/spec/validators/status_pin_validator_spec.rb
index e50a952db8..05084e059f 100644
--- a/spec/validators/status_pin_validator_spec.rb
+++ b/spec/validators/status_pin_validator_spec.rb
@@ -3,55 +3,37 @@
 require 'rails_helper'
 
 RSpec.describe StatusPinValidator do
-  describe '#validate' do
-    before do
-      subject.validate(pin)
-    end
+  subject { Fabricate.build :status_pin }
 
-    let(:pin) { instance_double(StatusPin, account: account, errors: errors, status: status, account_id: pin_account_id) }
-    let(:status) { instance_double(Status, reblog?: reblog, account_id: status_account_id, visibility: visibility, direct_visibility?: visibility == 'direct') }
-    let(:account)     { instance_double(Account, status_pins: status_pins, local?: local) }
-    let(:status_pins) { instance_double(Array, count: count) }
-    let(:errors)      { instance_double(ActiveModel::Errors, add: nil) }
-    let(:pin_account_id)    { 1 }
-    let(:status_account_id) { 1 }
-    let(:visibility)  { 'public' }
-    let(:local)       { false }
-    let(:reblog)      { false }
-    let(:count)       { 0 }
+  context 'when status is a reblog' do
+    let(:status) { Fabricate.build :status, reblog: Fabricate(:status) }
 
-    context 'when pin.status.reblog?' do
-      let(:reblog) { true }
+    it { is_expected.to_not allow_value(status).for(:status).against(:base).with_message(I18n.t('statuses.pin_errors.reblog')) }
+  end
 
-      it 'calls errors.add' do
-        expect(errors).to have_received(:add).with(:base, I18n.t('statuses.pin_errors.reblog'))
-      end
-    end
+  context 'when pin account is not status account' do
+    before { subject.save }
 
-    context 'when pin.account_id != pin.status.account_id' do
-      let(:pin_account_id)    { 1 }
-      let(:status_account_id) { 2 }
+    let(:status) { Fabricate :status, account: Fabricate(:account) }
 
-      it 'calls errors.add' do
-        expect(errors).to have_received(:add).with(:base, I18n.t('statuses.pin_errors.ownership'))
-      end
-    end
+    it { is_expected.to_not allow_value(status).for(:status).against(:base).with_message(I18n.t('statuses.pin_errors.ownership')) }
+  end
 
-    context 'when pin.status.direct_visibility?' do
-      let(:visibility) { 'direct' }
+  context 'when status visibility is direct' do
+    let(:status) { Fabricate.build :status, visibility: :direct }
 
-      it 'calls errors.add' do
-        expect(errors).to have_received(:add).with(:base, I18n.t('statuses.pin_errors.direct'))
-      end
-    end
+    it { is_expected.to_not allow_value(status).for(:status).against(:base).with_message(I18n.t('statuses.pin_errors.direct')) }
+  end
 
-    context 'when pin account is local and has too many pins' do
-      let(:count) { described_class::PIN_LIMIT + 1 }
-      let(:local) { true }
+  describe 'status pin limits' do
+    before { stub_const 'StatusPinValidator::PIN_LIMIT', 2 }
 
-      it 'calls errors.add' do
-        expect(errors).to have_received(:add).with(:base, I18n.t('statuses.pin_errors.limit'))
-      end
+    context 'when account has reached the limit' do
+      before { Fabricate.times 2, :status_pin, account: }
+
+      let(:account) { subject.account }
+
+      it { is_expected.to_not allow_value(account).for(:account).against(:base).with_message(I18n.t('statuses.pin_errors.limit')) }
     end
   end
 end