diff --git a/app/controllers/api/v1/statuses/quotes_controller.rb b/app/controllers/api/v1/statuses/quotes_controller.rb
index 962855884e..be3a4edc83 100644
--- a/app/controllers/api/v1/statuses/quotes_controller.rb
+++ b/app/controllers/api/v1/statuses/quotes_controller.rb
@@ -4,13 +4,13 @@ class Api::V1::Statuses::QuotesController < Api::V1::Statuses::BaseController
   before_action -> { doorkeeper_authorize! :read, :'read:statuses' }, only: :index
   before_action -> { doorkeeper_authorize! :write, :'write:statuses' }, only: :revoke
 
-  before_action :check_owner!
+  before_action :set_statuses, only: :index
+
   before_action :set_quote, only: :revoke
   after_action :insert_pagination_headers, only: :index
 
   def index
     cache_if_unauthenticated!
-    @statuses = load_statuses
     render json: @statuses, each_serializer: REST::StatusSerializer
   end
 
@@ -24,18 +24,26 @@ class Api::V1::Statuses::QuotesController < Api::V1::Statuses::BaseController
 
   private
 
-  def check_owner!
-    authorize @status, :list_quotes?
-  end
-
   def set_quote
     @quote = @status.quotes.find_by!(status_id: params[:id])
   end
 
-  def load_statuses
+  def set_statuses
     scope = default_statuses
     scope = scope.not_excluded_by_account(current_account) unless current_account.nil?
-    scope.merge(paginated_quotes).to_a
+    @statuses = scope.merge(paginated_quotes).to_a
+
+    # Store next page info before filtering
+    @records_continue = @statuses.size == limit_param(DEFAULT_STATUSES_LIMIT)
+    @pagination_since_id = @statuses.first.quote.id unless @statuses.empty?
+    @pagination_max_id = @statuses.last.quote.id if @records_continue
+
+    if current_account&.id != @status.account_id
+      domains = @statuses.filter_map(&:account_domain).uniq
+      account_ids = @statuses.map(&:account_id).uniq
+      relations = current_account&.relations_map(account_ids, domains) || {}
+      @statuses.reject! { |status| StatusFilter.new(status, current_account, relations).filtered? }
+    end
   end
 
   def default_statuses
@@ -58,15 +66,9 @@ class Api::V1::Statuses::QuotesController < Api::V1::Statuses::BaseController
     api_v1_status_quotes_url pagination_params(since_id: pagination_since_id) unless @statuses.empty?
   end
 
-  def pagination_max_id
-    @statuses.last.quote.id
-  end
-
-  def pagination_since_id
-    @statuses.first.quote.id
-  end
+  attr_reader :pagination_max_id, :pagination_since_id
 
   def records_continue?
-    @statuses.size == limit_param(DEFAULT_STATUSES_LIMIT)
+    @records_continue
   end
 end
diff --git a/app/javascript/mastodon/components/account_bio.tsx b/app/javascript/mastodon/components/account_bio.tsx
index b720b4746d..b5ff686f86 100644
--- a/app/javascript/mastodon/components/account_bio.tsx
+++ b/app/javascript/mastodon/components/account_bio.tsx
@@ -1,11 +1,15 @@
 import { useCallback } from 'react';
 
+import classNames from 'classnames';
+
 import { useLinks } from 'mastodon/hooks/useLinks';
 
-import { EmojiHTML } from '../features/emoji/emoji_html';
 import { useAppSelector } from '../store';
 import { isModernEmojiEnabled } from '../utils/environment';
 
+import { AnimateEmojiProvider } from './emoji/context';
+import { EmojiHTML } from './emoji/html';
+
 interface AccountBioProps {
   className: string;
   accountId: string;
@@ -44,13 +48,13 @@ export const AccountBio: React.FC<AccountBioProps> = ({
   }
 
   return (
-    <div
-      className={`${className} translate`}
+    <AnimateEmojiProvider
+      className={classNames(className, 'translate')}
       onClickCapture={handleClick}
       ref={handleNodeChange}
     >
       <EmojiHTML htmlString={note} extraEmojis={extraEmojis} />
-    </div>
+    </AnimateEmojiProvider>
   );
 };
 
diff --git a/app/javascript/mastodon/components/display_name/no-domain.tsx b/app/javascript/mastodon/components/display_name/no-domain.tsx
index 3a66fe5042..bb5a093659 100644
--- a/app/javascript/mastodon/components/display_name/no-domain.tsx
+++ b/app/javascript/mastodon/components/display_name/no-domain.tsx
@@ -2,9 +2,10 @@ import type { ComponentPropsWithoutRef, FC } from 'react';
 
 import classNames from 'classnames';
 
-import { EmojiHTML } from '@/mastodon/features/emoji/emoji_html';
 import { isModernEmojiEnabled } from '@/mastodon/utils/environment';
 
+import { AnimateEmojiProvider } from '../emoji/context';
+import { EmojiHTML } from '../emoji/html';
 import { Skeleton } from '../skeleton';
 
 import type { DisplayNameProps } from './index';
@@ -14,9 +15,10 @@ export const DisplayNameWithoutDomain: FC<
     ComponentPropsWithoutRef<'span'>
 > = ({ account, className, children, ...props }) => {
   return (
-    <span
+    <AnimateEmojiProvider
       {...props}
-      className={classNames('display-name animate-parent', className)}
+      as='span'
+      className={classNames('display-name', className)}
     >
       <bdi>
         {account ? (
@@ -27,8 +29,8 @@ export const DisplayNameWithoutDomain: FC<
                 ? account.get('display_name')
                 : account.get('display_name_html')
             }
-            shallow
             as='strong'
+            extraEmojis={account.get('emojis')}
           />
         ) : (
           <strong className='display-name__html'>
@@ -37,6 +39,6 @@ export const DisplayNameWithoutDomain: FC<
         )}
       </bdi>
       {children}
-    </span>
+    </AnimateEmojiProvider>
   );
 };
diff --git a/app/javascript/mastodon/components/display_name/simple.tsx b/app/javascript/mastodon/components/display_name/simple.tsx
index 3190c4384b..375f4932b2 100644
--- a/app/javascript/mastodon/components/display_name/simple.tsx
+++ b/app/javascript/mastodon/components/display_name/simple.tsx
@@ -1,8 +1,9 @@
 import type { ComponentPropsWithoutRef, FC } from 'react';
 
-import { EmojiHTML } from '@/mastodon/features/emoji/emoji_html';
 import { isModernEmojiEnabled } from '@/mastodon/utils/environment';
 
+import { EmojiHTML } from '../emoji/html';
+
 import type { DisplayNameProps } from './index';
 
 export const DisplayNameSimple: FC<
@@ -12,12 +13,19 @@ export const DisplayNameSimple: FC<
   if (!account) {
     return null;
   }
-  const accountName = isModernEmojiEnabled()
-    ? account.get('display_name')
-    : account.get('display_name_html');
+
   return (
     <bdi>
-      <EmojiHTML {...props} htmlString={accountName} shallow as='span' />
+      <EmojiHTML
+        {...props}
+        as='span'
+        htmlString={
+          isModernEmojiEnabled()
+            ? account.get('display_name')
+            : account.get('display_name_html')
+        }
+        extraEmojis={account.get('emojis')}
+      />
     </bdi>
   );
 };
diff --git a/app/javascript/mastodon/components/emoji/context.tsx b/app/javascript/mastodon/components/emoji/context.tsx
new file mode 100644
index 0000000000..9fda5714d9
--- /dev/null
+++ b/app/javascript/mastodon/components/emoji/context.tsx
@@ -0,0 +1,108 @@
+import type { MouseEventHandler, PropsWithChildren } from 'react';
+import {
+  createContext,
+  useCallback,
+  useContext,
+  useMemo,
+  useState,
+} from 'react';
+
+import classNames from 'classnames';
+
+import { cleanExtraEmojis } from '@/mastodon/features/emoji/normalize';
+import { autoPlayGif } from '@/mastodon/initial_state';
+import { polymorphicForwardRef } from '@/types/polymorphic';
+import type {
+  CustomEmojiMapArg,
+  ExtraCustomEmojiMap,
+} from 'mastodon/features/emoji/types';
+
+// Animation context
+export const AnimateEmojiContext = createContext<boolean | null>(null);
+
+// Polymorphic provider component
+type AnimateEmojiProviderProps = Required<PropsWithChildren> & {
+  className?: string;
+};
+
+export const AnimateEmojiProvider = polymorphicForwardRef<
+  'div',
+  AnimateEmojiProviderProps
+>(
+  (
+    {
+      children,
+      as: Wrapper = 'div',
+      className,
+      onMouseEnter,
+      onMouseLeave,
+      ...props
+    },
+    ref,
+  ) => {
+    const [animate, setAnimate] = useState(autoPlayGif ?? false);
+
+    const handleEnter: MouseEventHandler<HTMLDivElement> = useCallback(
+      (event) => {
+        onMouseEnter?.(event);
+        if (!autoPlayGif) {
+          setAnimate(true);
+        }
+      },
+      [onMouseEnter],
+    );
+    const handleLeave: MouseEventHandler<HTMLDivElement> = useCallback(
+      (event) => {
+        onMouseLeave?.(event);
+        if (!autoPlayGif) {
+          setAnimate(false);
+        }
+      },
+      [onMouseLeave],
+    );
+
+    // If there's a parent context or GIFs autoplay, we don't need handlers.
+    const parentContext = useContext(AnimateEmojiContext);
+    if (parentContext !== null || autoPlayGif === true) {
+      return (
+        <Wrapper
+          {...props}
+          className={classNames(className, 'animate-parent')}
+          ref={ref}
+        >
+          {children}
+        </Wrapper>
+      );
+    }
+
+    return (
+      <Wrapper
+        {...props}
+        className={classNames(className, 'animate-parent')}
+        onMouseEnter={handleEnter}
+        onMouseLeave={handleLeave}
+        ref={ref}
+      >
+        <AnimateEmojiContext.Provider value={animate}>
+          {children}
+        </AnimateEmojiContext.Provider>
+      </Wrapper>
+    );
+  },
+);
+AnimateEmojiProvider.displayName = 'AnimateEmojiProvider';
+
+// Handle custom emoji
+export const CustomEmojiContext = createContext<ExtraCustomEmojiMap>({});
+
+export const CustomEmojiProvider = ({
+  children,
+  emojis: rawEmojis,
+}: PropsWithChildren<{ emojis?: CustomEmojiMapArg }>) => {
+  const emojis = useMemo(() => cleanExtraEmojis(rawEmojis) ?? {}, [rawEmojis]);
+  return (
+    <CustomEmojiContext.Provider value={emojis}>
+      {children}
+    </CustomEmojiContext.Provider>
+  );
+};
diff --git a/app/javascript/mastodon/components/emoji/html.tsx b/app/javascript/mastodon/components/emoji/html.tsx
new file mode 100644
index 0000000000..a6ecc869c1
--- /dev/null
+++ b/app/javascript/mastodon/components/emoji/html.tsx
@@ -0,0 +1,61 @@
+import { useMemo } from 'react';
+import type { ComponentPropsWithoutRef, ElementType } from 'react';
+
+import classNames from 'classnames';
+
+import type { CustomEmojiMapArg } from '@/mastodon/features/emoji/types';
+import { isModernEmojiEnabled } from '@/mastodon/utils/environment';
+import { htmlStringToComponents } from '@/mastodon/utils/html';
+
+import { AnimateEmojiProvider, CustomEmojiProvider } from './context';
+import { textToEmojis } from './index';
+
+type EmojiHTMLProps<Element extends ElementType = 'div'> = Omit<
+  ComponentPropsWithoutRef<Element>,
+  'dangerouslySetInnerHTML' | 'className'
+> & {
+  htmlString: string;
+  extraEmojis?: CustomEmojiMapArg;
+  as?: Element;
+  className?: string;
+};
+
+export const ModernEmojiHTML = ({
+  extraEmojis,
+  htmlString,
+  as: asProp = 'div', // Rename for syntax highlighting
+  shallow,
+  className = '',
+  ...props
+}: EmojiHTMLProps<ElementType>) => {
+  const contents = useMemo(
+    () => htmlStringToComponents(htmlString, { onText: textToEmojis }),
+    [htmlString],
+  );
+
+  return (
+    <CustomEmojiProvider emojis={extraEmojis}>
+      <AnimateEmojiProvider {...props} as={asProp} className={className}>
+        {contents}
+      </AnimateEmojiProvider>
+    </CustomEmojiProvider>
+  );
+};
+
+export const LegacyEmojiHTML = <Element extends ElementType>(
+  props: EmojiHTMLProps<Element>,
+) => {
+  const { as: asElement, htmlString, extraEmojis, className, ...rest } = props;
+  const Wrapper = asElement ?? 'div';
+  return (
+    <Wrapper
+      {...rest}
+      dangerouslySetInnerHTML={{ __html: htmlString }}
+      className={classNames(className, 'animate-parent')}
+    />
+  );
+};
+
+export const EmojiHTML = isModernEmojiEnabled()
+  ? ModernEmojiHTML
+  : LegacyEmojiHTML;
diff --git a/app/javascript/mastodon/components/emoji/index.tsx b/app/javascript/mastodon/components/emoji/index.tsx
new file mode 100644
index 0000000000..e070eb30dd
--- /dev/null
+++ b/app/javascript/mastodon/components/emoji/index.tsx
@@ -0,0 +1,99 @@
+import type { FC } from 'react';
+import { useContext, useEffect, useState } from 'react';
+
+import { EMOJI_TYPE_CUSTOM } from '@/mastodon/features/emoji/constants';
+import { useEmojiAppState } from '@/mastodon/features/emoji/hooks';
+import { unicodeHexToUrl } from '@/mastodon/features/emoji/normalize';
+import {
+  isStateLoaded,
+  loadEmojiDataToState,
+  shouldRenderImage,
+  stringToEmojiState,
+  tokenizeText,
+} from '@/mastodon/features/emoji/render';
+
+import { AnimateEmojiContext, CustomEmojiContext } from './context';
+
+interface EmojiProps {
+  code: string;
+  showFallback?: boolean;
+  showLoading?: boolean;
+}
+
+export const Emoji: FC<EmojiProps> = ({
+  code,
+  showFallback = true,
+  showLoading = true,
+}) => {
+  const customEmoji = useContext(CustomEmojiContext);
+
+  // First, set the emoji state based on the input code.
+  const [state, setState] = useState(() =>
+    stringToEmojiState(code, customEmoji),
+  );
+
+  // If we don't have data, then load emoji data asynchronously.
+  const appState = useEmojiAppState();
+  useEffect(() => {
+    if (state !== null) {
+      void loadEmojiDataToState(state, appState.currentLocale).then(setState);
+    }
+  }, [appState.currentLocale, state]);
+
+  const animate = useContext(AnimateEmojiContext);
+  const fallback = showFallback ? code : null;
+
+  // If the code is invalid or we otherwise know it's not valid, show the fallback.
+  if (!state) {
+    return fallback;
+  }
+
+  if (!shouldRenderImage(state, appState.mode)) {
+    return code;
+  }
+
+  if (!isStateLoaded(state)) {
+    if (showLoading) {
+      return <span className='emojione emoji-loading' title={code} />;
+    }
+    return fallback;
+  }
+
+  if (state.type === EMOJI_TYPE_CUSTOM) {
+    const shortcode = `:${state.code}:`;
+    return (
+      <img
+        src={animate ? state.data.url : state.data.static_url}
+        alt={shortcode}
+        title={shortcode}
+        className='emojione custom-emoji'
+        loading='lazy'
+      />
+    );
+  }
+
+  const src = unicodeHexToUrl(state.code, appState.darkTheme);
+
+  return (
+    <img
+      src={src}
+      alt={state.data.unicode}
+      title={state.data.label}
+      className='emojione'
+      loading='lazy'
+    />
+  );
+};
+
+/**
+ * Takes a text string and converts it to an array of React nodes.
+ * @param text The text to be tokenized and converted.
+ */
+export function textToEmojis(text: string) {
+  return tokenizeText(text).map((token, index) => {
+    if (typeof token === 'string') {
+      return token;
+    }
+    return <Emoji code={token.code} key={`emoji-${token.code}-${index}`} />;
+  });
+}
diff --git a/app/javascript/mastodon/components/follow_button.tsx b/app/javascript/mastodon/components/follow_button.tsx
index 15a9046848..97aaecd1aa 100644
--- a/app/javascript/mastodon/components/follow_button.tsx
+++ b/app/javascript/mastodon/components/follow_button.tsx
@@ -8,7 +8,6 @@ import { useIdentity } from '@/mastodon/identity_context';
 import {
   fetchRelationships,
   followAccount,
-  unblockAccount,
   unmuteAccount,
 } from 'mastodon/actions/accounts';
 import { openModal } from 'mastodon/actions/modal';
@@ -59,7 +58,8 @@ export const FollowButton: React.FC<{
   accountId?: string;
   compact?: boolean;
   labelLength?: 'auto' | 'short' | 'long';
-}> = ({ accountId, compact, labelLength = 'auto' }) => {
+  className?: string;
+}> = ({ accountId, compact, labelLength = 'auto', className }) => {
   const intl = useIntl();
   const dispatch = useAppDispatch();
   const { signedIn } = useIdentity();
@@ -96,12 +96,24 @@ export const FollowButton: React.FC<{
       return;
     } else if (relationship.muting) {
       dispatch(unmuteAccount(accountId));
-    } else if (account && (relationship.following || relationship.requested)) {
+    } else if (account && relationship.following) {
       dispatch(
         openModal({ modalType: 'CONFIRM_UNFOLLOW', modalProps: { account } }),
       );
+    } else if (account && relationship.requested) {
+      dispatch(
+        openModal({
+          modalType: 'CONFIRM_WITHDRAW_REQUEST',
+          modalProps: { account },
+        }),
+      );
     } else if (relationship.blocking) {
-      dispatch(unblockAccount(accountId));
+      dispatch(
+        openModal({
+          modalType: 'CONFIRM_UNBLOCK',
+          modalProps: { account },
+        }),
+      );
     } else {
       dispatch(followAccount(accountId));
     }
@@ -144,7 +156,7 @@ export const FollowButton: React.FC<{
         href='/settings/profile'
         target='_blank'
         rel='noopener'
-        className={classNames('button button-secondary', {
+        className={classNames(className, 'button button-secondary', {
           'button--compact': compact,
         })}
       >
@@ -158,13 +170,12 @@ export const FollowButton: React.FC<{
       onClick={handleClick}
       disabled={
         relationship?.blocked_by ||
-        relationship?.blocking ||
         (!(relationship?.following || relationship?.requested) &&
           (account?.suspended || !!account?.moved))
       }
       secondary={following}
       compact={compact}
-      className={following ? 'button--destructive' : undefined}
+      className={classNames(className, { 'button--destructive': following })}
     >
       {label}
     </Button>
diff --git a/app/javascript/mastodon/components/status_content.jsx b/app/javascript/mastodon/components/status_content.jsx
index af0059c7d6..d766793d87 100644
--- a/app/javascript/mastodon/components/status_content.jsx
+++ b/app/javascript/mastodon/components/status_content.jsx
@@ -13,10 +13,12 @@ import ChevronRightIcon from '@/material-icons/400-24px/chevron_right.svg?react'
 import { Icon }  from 'mastodon/components/icon';
 import { Poll } from 'mastodon/components/poll';
 import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
-import { autoPlayGif, languages as preloadedLanguages } from 'mastodon/initial_state';
-import { EmojiHTML } from '../features/emoji/emoji_html';
+import { languages as preloadedLanguages } from 'mastodon/initial_state';
+
 import { isModernEmojiEnabled } from '../utils/environment';
 
+import { EmojiHTML } from './emoji/html';
+
 const MAX_HEIGHT = 706; // 22px * 32 (+ 2px padding at the top)
 
 /**
diff --git a/app/javascript/mastodon/containers/compose_container.jsx b/app/javascript/mastodon/containers/compose_container.jsx
index a2513cc552..3e6d20c74c 100644
--- a/app/javascript/mastodon/containers/compose_container.jsx
+++ b/app/javascript/mastodon/containers/compose_container.jsx
@@ -5,7 +5,7 @@ import { fetchServer } from 'mastodon/actions/server';
 import { hydrateStore } from 'mastodon/actions/store';
 import { Router } from 'mastodon/components/router';
 import Compose from 'mastodon/features/standalone/compose';
-import initialState from 'mastodon/initial_state';
+import { initialState } from 'mastodon/initial_state';
 import { IntlProvider } from 'mastodon/locales';
 import { store } from 'mastodon/store';
 
diff --git a/app/javascript/mastodon/containers/mastodon.jsx b/app/javascript/mastodon/containers/mastodon.jsx
index 086a7681c4..ee861366a5 100644
--- a/app/javascript/mastodon/containers/mastodon.jsx
+++ b/app/javascript/mastodon/containers/mastodon.jsx
@@ -13,7 +13,7 @@ import ErrorBoundary from 'mastodon/components/error_boundary';
 import { Router } from 'mastodon/components/router';
 import UI from 'mastodon/features/ui';
 import { IdentityContext, createIdentityContext } from 'mastodon/identity_context';
-import initialState, { title as siteTitle } from 'mastodon/initial_state';
+import { initialState, title as siteTitle } from 'mastodon/initial_state';
 import { IntlProvider } from 'mastodon/locales';
 import { store } from 'mastodon/store';
 import { isProduction } from 'mastodon/utils/environment';
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 f58f1f4a8c..776157ccf5 100644
--- a/app/javascript/mastodon/features/account_timeline/components/account_header.tsx
+++ b/app/javascript/mastodon/features/account_timeline/components/account_header.tsx
@@ -8,6 +8,7 @@ import { NavLink } from 'react-router-dom';
 
 import { AccountBio } from '@/mastodon/components/account_bio';
 import { DisplayName } from '@/mastodon/components/display_name';
+import { AnimateEmojiProvider } from '@/mastodon/components/emoji/context';
 import CheckIcon from '@/material-icons/400-24px/check.svg?react';
 import LockIcon from '@/material-icons/400-24px/lock.svg?react';
 import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
@@ -33,7 +34,6 @@ import { initMuteModal } from 'mastodon/actions/mutes';
 import { initReport } from 'mastodon/actions/reports';
 import { Avatar } from 'mastodon/components/avatar';
 import { Badge, AutomatedBadge, GroupBadge } from 'mastodon/components/badge';
-import { Button } from 'mastodon/components/button';
 import { CopyIconButton } from 'mastodon/components/copy_icon_button';
 import {
   FollowersCounter,
@@ -383,7 +383,7 @@ export const AccountHeader: React.FC<{
   const isRemote = account?.acct !== account?.username;
   const remoteDomain = isRemote ? account?.acct.split('@')[1] : null;
 
-  const menu = useMemo(() => {
+  const menuItems = useMemo(() => {
     const arr: MenuItem[] = [];
 
     if (!account) {
@@ -605,6 +605,15 @@ export const AccountHeader: React.FC<{
     handleUnblockDomain,
   ]);
 
+  const menu = accountId !== me && (
+    <Dropdown
+      disabled={menuItems.length === 0}
+      items={menuItems}
+      icon='ellipsis-v'
+      iconComponent={MoreHorizIcon}
+    />
+  );
+
   if (!account) {
     return null;
   }
@@ -718,21 +727,16 @@ export const AccountHeader: React.FC<{
     );
   }
 
-  if (relationship?.blocking) {
+  const isMovedAndUnfollowedAccount = account.moved && !relationship?.following;
+
+  if (!isMovedAndUnfollowedAccount) {
     actionBtn = (
-      <Button
-        text={intl.formatMessage(messages.unblock, {
-          name: account.username,
-        })}
-        onClick={handleBlock}
+      <FollowButton
+        accountId={accountId}
+        className='account__header__follow-button'
+        labelLength='long'
       />
     );
-  } else {
-    actionBtn = <FollowButton accountId={accountId} />;
-  }
-
-  if (account.moved && !relationship?.following) {
-    actionBtn = '';
   }
 
   if (account.locked) {
@@ -777,8 +781,8 @@ export const AccountHeader: React.FC<{
         <MovedNote accountId={account.id} targetAccountId={account.moved} />
       )}
 
-      <div
-        className={classNames('account__header animate-parent', {
+      <AnimateEmojiProvider
+        className={classNames('account__header', {
           inactive: !!account.moved,
         })}
       >
@@ -814,18 +818,11 @@ export const AccountHeader: React.FC<{
               />
             </a>
 
-            <div className='account__header__tabs__buttons'>
+            <div className='account__header__buttons account__header__buttons--desktop'>
+              {!hidden && actionBtn}
               {!hidden && bellBtn}
               {!hidden && shareBtn}
-              {accountId !== me && (
-                <Dropdown
-                  disabled={menu.length === 0}
-                  items={menu}
-                  icon='ellipsis-v'
-                  iconComponent={MoreHorizIcon}
-                />
-              )}
-              {!hidden && actionBtn}
+              {menu}
             </div>
           </div>
 
@@ -855,6 +852,12 @@ export const AccountHeader: React.FC<{
             <FamiliarFollowers accountId={accountId} />
           )}
 
+          <div className='account__header__buttons account__header__buttons--mobile'>
+            {!hidden && actionBtn}
+            {!hidden && bellBtn}
+            {menu}
+          </div>
+
           {!(suspended || hidden) && (
             <div className='account__header__extra'>
               <div
@@ -967,7 +970,7 @@ export const AccountHeader: React.FC<{
             </div>
           )}
         </div>
-      </div>
+      </AnimateEmojiProvider>
 
       {!(hideTabs || hidden) && (
         <div className='account__section-headline'>
diff --git a/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx b/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx
index bb0815087b..fbe37f58a2 100644
--- a/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx
+++ b/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx
@@ -25,6 +25,7 @@ import StatusContent from 'mastodon/components/status_content';
 import { Dropdown } from 'mastodon/components/dropdown_menu';
 import { makeGetStatus } from 'mastodon/selectors';
 import { LinkedDisplayName } from '@/mastodon/components/display_name';
+import { AnimateEmojiProvider } from '@/mastodon/components/emoji/context';
 
 const messages = defineMessages({
   more: { id: 'status.more', defaultMessage: 'More' },
@@ -136,9 +137,9 @@ export const Conversation = ({ conversation, scrollKey }) => {
               {unread && <span className='conversation__unread' />} <RelativeTimestamp timestamp={lastStatus.get('created_at')} />
             </div>
 
-            <div className='conversation__content__names animate-parent'>
+            <AnimateEmojiProvider className='conversation__content__names'>
               <FormattedMessage id='conversation.with' defaultMessage='With {names}' values={{ names: <span>{names}</span> }} />
-            </div>
+            </AnimateEmojiProvider>
           </div>
 
           <StatusContent
diff --git a/app/javascript/mastodon/features/emoji/constants.ts b/app/javascript/mastodon/features/emoji/constants.ts
index 09022371b2..42d22e4054 100644
--- a/app/javascript/mastodon/features/emoji/constants.ts
+++ b/app/javascript/mastodon/features/emoji/constants.ts
@@ -23,8 +23,6 @@ export const EMOJI_MODE_TWEMOJI = 'twemoji';
 export const EMOJI_TYPE_UNICODE = 'unicode';
 export const EMOJI_TYPE_CUSTOM = 'custom';
 
-export const EMOJI_STATE_MISSING = 'missing';
-
 export const EMOJIS_WITH_DARK_BORDER = [
   '🎱', // 1F3B1
   '🐜', // 1F41C
diff --git a/app/javascript/mastodon/features/emoji/database.ts b/app/javascript/mastodon/features/emoji/database.ts
index 0e8ada1d0e..b7f8a32f76 100644
--- a/app/javascript/mastodon/features/emoji/database.ts
+++ b/app/javascript/mastodon/features/emoji/database.ts
@@ -197,11 +197,18 @@ function toLoadedLocale(localeString: string) {
     log(`Locale ${locale} is different from provided ${localeString}`);
   }
   if (!loadedLocales.has(locale)) {
-    throw new Error(`Locale ${locale} is not loaded in emoji database`);
+    throw new LocaleNotLoadedError(locale);
   }
   return locale;
 }
 
+export class LocaleNotLoadedError extends Error {
+  constructor(locale: Locale) {
+    super(`Locale ${locale} is not loaded in emoji database`);
+    this.name = 'LocaleNotLoadedError';
+  }
+}
+
 async function hasLocale(locale: Locale, db: Database): Promise<boolean> {
   if (loadedLocales.has(locale)) {
     return true;
diff --git a/app/javascript/mastodon/features/emoji/emoji_html.tsx b/app/javascript/mastodon/features/emoji/emoji_html.tsx
deleted file mode 100644
index b4c352073c..0000000000
--- a/app/javascript/mastodon/features/emoji/emoji_html.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-import type { ComponentPropsWithoutRef, ElementType } from 'react';
-
-import classNames from 'classnames';
-
-import { isModernEmojiEnabled } from '@/mastodon/utils/environment';
-
-import { useEmojify } from './hooks';
-import type { CustomEmojiMapArg } from './types';
-
-type EmojiHTMLProps<Element extends ElementType = 'div'> = Omit<
-  ComponentPropsWithoutRef<Element>,
-  'dangerouslySetInnerHTML' | 'className'
-> & {
-  htmlString: string;
-  extraEmojis?: CustomEmojiMapArg;
-  as?: Element;
-  shallow?: boolean;
-  className?: string;
-};
-
-export const ModernEmojiHTML = ({
-  extraEmojis,
-  htmlString,
-  as: Wrapper = 'div', // Rename for syntax highlighting
-  shallow,
-  className = '',
-  ...props
-}: EmojiHTMLProps<ElementType>) => {
-  const emojifiedHtml = useEmojify({
-    text: htmlString,
-    extraEmojis,
-    deep: !shallow,
-  });
-
-  if (emojifiedHtml === null) {
-    return null;
-  }
-
-  return (
-    <Wrapper
-      {...props}
-      className={classNames(className, 'animate-parent')}
-      dangerouslySetInnerHTML={{ __html: emojifiedHtml }}
-    />
-  );
-};
-
-export const EmojiHTML = <Element extends ElementType>(
-  props: EmojiHTMLProps<Element>,
-) => {
-  if (isModernEmojiEnabled()) {
-    return <ModernEmojiHTML {...props} />;
-  }
-  const {
-    as: asElement,
-    htmlString,
-    extraEmojis,
-    className,
-    shallow: _,
-    ...rest
-  } = props;
-  const Wrapper = asElement ?? 'div';
-  return (
-    <Wrapper
-      {...rest}
-      dangerouslySetInnerHTML={{ __html: htmlString }}
-      className={classNames(className, 'animate-parent')}
-    />
-  );
-};
diff --git a/app/javascript/mastodon/features/emoji/index.ts b/app/javascript/mastodon/features/emoji/index.ts
index 99c16fe361..d128da6b53 100644
--- a/app/javascript/mastodon/features/emoji/index.ts
+++ b/app/javascript/mastodon/features/emoji/index.ts
@@ -1,4 +1,4 @@
-import initialState from '@/mastodon/initial_state';
+import { initialState } from '@/mastodon/initial_state';
 import { loadWorker } from '@/mastodon/utils/workers';
 
 import { toSupportedLocale } from './locale';
diff --git a/app/javascript/mastodon/features/emoji/loader.ts b/app/javascript/mastodon/features/emoji/loader.ts
index 72f57b6f6c..3196b28b9c 100644
--- a/app/javascript/mastodon/features/emoji/loader.ts
+++ b/app/javascript/mastodon/features/emoji/loader.ts
@@ -1,8 +1,6 @@
 import { flattenEmojiData } from 'emojibase';
 import type { CompactEmoji, FlatCompactEmoji } from 'emojibase';
 
-import type { ApiCustomEmojiJSON } from '@/mastodon/api_types/custom_emoji';
-
 import {
   putEmojiData,
   putCustomEmojiData,
@@ -10,7 +8,7 @@ import {
   putLatestEtag,
 } from './database';
 import { toSupportedLocale, toSupportedLocaleOrCustom } from './locale';
-import type { LocaleOrCustom } from './types';
+import type { CustomEmojiData, LocaleOrCustom } from './types';
 import { emojiLogger } from './utils';
 
 const log = emojiLogger('loader');
@@ -27,7 +25,7 @@ export async function importEmojiData(localeString: string) {
 }
 
 export async function importCustomEmojiData() {
-  const emojis = await fetchAndCheckEtag<ApiCustomEmojiJSON[]>('custom');
+  const emojis = await fetchAndCheckEtag<CustomEmojiData[]>('custom');
   if (!emojis) {
     return;
   }
diff --git a/app/javascript/mastodon/features/emoji/normalize.test.ts b/app/javascript/mastodon/features/emoji/normalize.test.ts
index f0ea140590..b4c7669961 100644
--- a/app/javascript/mastodon/features/emoji/normalize.test.ts
+++ b/app/javascript/mastodon/features/emoji/normalize.test.ts
@@ -5,11 +5,8 @@ import { flattenEmojiData } from 'emojibase';
 import unicodeRawEmojis from 'emojibase-data/en/data.json';
 
 import {
-  twemojiHasBorder,
   twemojiToUnicodeInfo,
   unicodeToTwemojiHex,
-  CODES_WITH_DARK_BORDER,
-  CODES_WITH_LIGHT_BORDER,
   emojiToUnicodeHex,
 } from './normalize';
 
@@ -57,26 +54,6 @@ describe('unicodeToTwemojiHex', () => {
   });
 });
 
-describe('twemojiHasBorder', () => {
-  test.concurrent.for(
-    svgFileNames
-      .filter((file) => file.endsWith('_border'))
-      .map((file) => {
-        const hexCode = file.replace('_border', '');
-        return [
-          hexCode,
-          CODES_WITH_LIGHT_BORDER.includes(hexCode.toUpperCase()),
-          CODES_WITH_DARK_BORDER.includes(hexCode.toUpperCase()),
-        ] as const;
-      }),
-  )('twemojiHasBorder for %s', ([hexCode, isLight, isDark], { expect }) => {
-    const result = twemojiHasBorder(hexCode);
-    expect(result).toHaveProperty('hexCode', hexCode);
-    expect(result).toHaveProperty('hasLightBorder', isLight);
-    expect(result).toHaveProperty('hasDarkBorder', isDark);
-  });
-});
-
 describe('twemojiToUnicodeInfo', () => {
   const unicodeCodeSet = new Set(unicodeEmojis.map((emoji) => emoji.hexcode));
 
diff --git a/app/javascript/mastodon/features/emoji/normalize.ts b/app/javascript/mastodon/features/emoji/normalize.ts
index 959732f985..65667dfe6d 100644
--- a/app/javascript/mastodon/features/emoji/normalize.ts
+++ b/app/javascript/mastodon/features/emoji/normalize.ts
@@ -1,5 +1,7 @@
 import { isList } from 'immutable';
 
+import { assetHost } from '@/mastodon/utils/config';
+
 import {
   VARIATION_SELECTOR_CODE,
   KEYCAP_CODE,
@@ -9,11 +11,7 @@ import {
   EMOJIS_WITH_DARK_BORDER,
   EMOJIS_WITH_LIGHT_BORDER,
 } from './constants';
-import type {
-  CustomEmojiMapArg,
-  ExtraCustomEmojiMap,
-  TwemojiBorderInfo,
-} from './types';
+import type { CustomEmojiMapArg, ExtraCustomEmojiMap } from './types';
 
 // Misc codes that have special handling
 const SKIER_CODE = 0x26f7;
@@ -67,21 +65,17 @@ export const CODES_WITH_DARK_BORDER =
 export const CODES_WITH_LIGHT_BORDER =
   EMOJIS_WITH_LIGHT_BORDER.map(emojiToUnicodeHex);
 
-export function twemojiHasBorder(twemojiHex: string): TwemojiBorderInfo {
-  const normalizedHex = twemojiHex.toUpperCase();
-  let hasLightBorder = false;
-  let hasDarkBorder = false;
-  if (CODES_WITH_LIGHT_BORDER.includes(normalizedHex)) {
-    hasLightBorder = true;
+export function unicodeHexToUrl(unicodeHex: string, darkMode: boolean): string {
+  const normalizedHex = unicodeToTwemojiHex(unicodeHex);
+  let url = `${assetHost}/emoji/${normalizedHex}`;
+  if (darkMode && CODES_WITH_LIGHT_BORDER.includes(normalizedHex)) {
+    url += '_border';
   }
   if (CODES_WITH_DARK_BORDER.includes(normalizedHex)) {
-    hasDarkBorder = true;
+    url += '_border';
   }
-  return {
-    hexCode: twemojiHex,
-    hasLightBorder,
-    hasDarkBorder,
-  };
+  url += '.svg';
+  return url;
 }
 
 interface TwemojiSpecificEmoji {
diff --git a/app/javascript/mastodon/features/emoji/render.test.ts b/app/javascript/mastodon/features/emoji/render.test.ts
index e9609e15dc..108cf74750 100644
--- a/app/javascript/mastodon/features/emoji/render.test.ts
+++ b/app/javascript/mastodon/features/emoji/render.test.ts
@@ -1,10 +1,6 @@
 import { customEmojiFactory, unicodeEmojiFactory } from '@/testing/factories';
 
-import {
-  EMOJI_MODE_NATIVE,
-  EMOJI_MODE_NATIVE_WITH_FLAGS,
-  EMOJI_MODE_TWEMOJI,
-} from './constants';
+import { EMOJI_MODE_TWEMOJI } from './constants';
 import * as db from './database';
 import {
   emojifyElement,
@@ -12,7 +8,7 @@ import {
   testCacheClear,
   tokenizeText,
 } from './render';
-import type { EmojiAppState, ExtraCustomEmojiMap } from './types';
+import type { EmojiAppState } from './types';
 
 function mockDatabase() {
   return {
@@ -40,18 +36,6 @@ const expectedSmileImage =
   '<img draggable="false" class="emojione" alt="😊" title="smiling face with smiling eyes" src="/emoji/1f60a.svg">';
 const expectedFlagImage =
   '<img draggable="false" class="emojione" alt="🇪🇺" title="flag-eu" src="/emoji/1f1ea-1f1fa.svg">';
-const expectedCustomEmojiImage =
-  '<img draggable="false" class="emojione custom-emoji" alt=":custom:" title=":custom:" src="emoji/custom/static" data-original="emoji/custom" data-static="emoji/custom/static">';
-const expectedRemoteCustomEmojiImage =
-  '<img draggable="false" class="emojione custom-emoji" alt=":remote:" title=":remote:" src="remote.social/static" data-original="remote.social/custom" data-static="remote.social/static">';
-
-const mockExtraCustom: ExtraCustomEmojiMap = {
-  remote: {
-    shortcode: 'remote',
-    static_url: 'remote.social/static',
-    url: 'remote.social/custom',
-  },
-};
 
 function testAppState(state: Partial<EmojiAppState> = {}) {
   return {
@@ -86,64 +70,10 @@ describe('emojifyElement', () => {
       'en',
     );
     expect(searchCustomEmojisByShortcodes).toHaveBeenCalledExactlyOnceWith([
-      'custom',
+      ':custom:',
     ]);
   });
 
-  test('emojifies custom emoji in native mode', async () => {
-    const { searchEmojisByHexcodes } = mockDatabase();
-    const actual = await emojifyElement(
-      testElement(),
-      testAppState({ mode: EMOJI_MODE_NATIVE }),
-    );
-    assert(actual);
-    expect(actual.innerHTML).toBe(
-      `<p>Hello 😊🇪🇺!</p><p>${expectedCustomEmojiImage}</p>`,
-    );
-    expect(searchEmojisByHexcodes).not.toHaveBeenCalled();
-  });
-
-  test('emojifies flag emoji in native-with-flags mode', async () => {
-    const { searchEmojisByHexcodes } = mockDatabase();
-    const actual = await emojifyElement(
-      testElement(),
-      testAppState({ mode: EMOJI_MODE_NATIVE_WITH_FLAGS }),
-    );
-    assert(actual);
-    expect(actual.innerHTML).toBe(
-      `<p>Hello 😊${expectedFlagImage}!</p><p>${expectedCustomEmojiImage}</p>`,
-    );
-    expect(searchEmojisByHexcodes).toHaveBeenCalledOnce();
-  });
-
-  test('emojifies everything in twemoji mode', async () => {
-    const { searchCustomEmojisByShortcodes, searchEmojisByHexcodes } =
-      mockDatabase();
-    const actual = await emojifyElement(testElement(), testAppState());
-    assert(actual);
-    expect(actual.innerHTML).toBe(
-      `<p>Hello ${expectedSmileImage}${expectedFlagImage}!</p><p>${expectedCustomEmojiImage}</p>`,
-    );
-    expect(searchEmojisByHexcodes).toHaveBeenCalledOnce();
-    expect(searchCustomEmojisByShortcodes).toHaveBeenCalledOnce();
-  });
-
-  test('emojifies with provided custom emoji', async () => {
-    const { searchCustomEmojisByShortcodes, searchEmojisByHexcodes } =
-      mockDatabase();
-    const actual = await emojifyElement(
-      testElement('<p>hi :remote:</p>'),
-      testAppState(),
-      mockExtraCustom,
-    );
-    assert(actual);
-    expect(actual.innerHTML).toBe(
-      `<p>hi ${expectedRemoteCustomEmojiImage}</p>`,
-    );
-    expect(searchEmojisByHexcodes).not.toHaveBeenCalled();
-    expect(searchCustomEmojisByShortcodes).not.toHaveBeenCalled();
-  });
-
   test('returns null when no emoji are found', async () => {
     mockDatabase();
     const actual = await emojifyElement(
@@ -165,28 +95,9 @@ describe('emojifyText', () => {
     const actual = await emojifyText('Hello 😊🇪🇺!', testAppState());
     expect(actual).toBe(`Hello ${expectedSmileImage}${expectedFlagImage}!`);
   });
-
-  test('renders custom emojis', async () => {
-    mockDatabase();
-    const actual = await emojifyText('Hello :custom:!', testAppState());
-    expect(actual).toBe(`Hello ${expectedCustomEmojiImage}!`);
-  });
-
-  test('renders provided extra emojis', async () => {
-    const actual = await emojifyText(
-      'remote emoji :remote:',
-      testAppState(),
-      mockExtraCustom,
-    );
-    expect(actual).toBe(`remote emoji ${expectedRemoteCustomEmojiImage}`);
-  });
 });
 
 describe('tokenizeText', () => {
-  test('returns empty array for string with only whitespace', () => {
-    expect(tokenizeText('   \n')).toEqual([]);
-  });
-
   test('returns an array of text to be a single token', () => {
     expect(tokenizeText('Hello')).toEqual(['Hello']);
   });
@@ -212,7 +123,7 @@ describe('tokenizeText', () => {
       'Hello ',
       {
         type: 'custom',
-        code: 'smile',
+        code: ':smile:',
       },
       '!!',
     ]);
@@ -223,7 +134,7 @@ describe('tokenizeText', () => {
       'Hello ',
       {
         type: 'custom',
-        code: 'smile_123',
+        code: ':smile_123:',
       },
       '!!',
     ]);
@@ -239,7 +150,7 @@ describe('tokenizeText', () => {
       ' ',
       {
         type: 'custom',
-        code: 'smile',
+        code: ':smile:',
       },
       '!!',
     ]);
diff --git a/app/javascript/mastodon/features/emoji/render.ts b/app/javascript/mastodon/features/emoji/render.ts
index 8d2299fd89..e0c8fd8dce 100644
--- a/app/javascript/mastodon/features/emoji/render.ts
+++ b/app/javascript/mastodon/features/emoji/render.ts
@@ -1,6 +1,5 @@
 import { autoPlayGif } from '@/mastodon/initial_state';
 import { createLimitedCache } from '@/mastodon/utils/cache';
-import { assetHost } from '@/mastodon/utils/config';
 import * as perf from '@/mastodon/utils/performance';
 
 import {
@@ -8,38 +7,130 @@ import {
   EMOJI_MODE_NATIVE_WITH_FLAGS,
   EMOJI_TYPE_UNICODE,
   EMOJI_TYPE_CUSTOM,
-  EMOJI_STATE_MISSING,
 } from './constants';
 import {
+  loadCustomEmojiByShortcode,
+  loadEmojiByHexcode,
+  LocaleNotLoadedError,
   searchCustomEmojisByShortcodes,
   searchEmojisByHexcodes,
 } from './database';
-import {
-  emojiToUnicodeHex,
-  twemojiHasBorder,
-  unicodeToTwemojiHex,
-} from './normalize';
+import { importEmojiData } from './loader';
+import { emojiToUnicodeHex, unicodeHexToUrl } from './normalize';
 import type {
-  CustomEmojiToken,
   EmojiAppState,
   EmojiLoadedState,
   EmojiMode,
   EmojiState,
+  EmojiStateCustom,
   EmojiStateMap,
-  EmojiToken,
+  EmojiStateUnicode,
   ExtraCustomEmojiMap,
   LocaleOrCustom,
-  UnicodeEmojiToken,
 } from './types';
 import {
   anyEmojiRegex,
   emojiLogger,
+  isCustomEmoji,
+  isUnicodeEmoji,
   stringHasAnyEmoji,
   stringHasUnicodeFlags,
 } from './utils';
 
 const log = emojiLogger('render');
 
+/**
+ * Parses emoji string to extract emoji state.
+ * @param code Hex code or custom shortcode.
+ * @param customEmoji Extra custom emojis.
+ */
+export function stringToEmojiState(
+  code: string,
+  customEmoji: ExtraCustomEmojiMap = {},
+): EmojiState | null {
+  if (isUnicodeEmoji(code)) {
+    return {
+      type: EMOJI_TYPE_UNICODE,
+      code: emojiToUnicodeHex(code),
+    };
+  }
+
+  if (isCustomEmoji(code)) {
+    const shortCode = code.slice(1, -1);
+    return {
+      type: EMOJI_TYPE_CUSTOM,
+      code: shortCode,
+      data: customEmoji[shortCode],
+    };
+  }
+
+  return null;
+}
+
+/**
+ * Loads emoji data into the given state if not already loaded.
+ * @param state Emoji state to load data for.
+ * @param locale Locale to load data for. Only for Unicode emoji.
+ * @param retry Internal. Whether this is a retry after loading the locale.
+ */
+export async function loadEmojiDataToState(
+  state: EmojiState,
+  locale: string,
+  retry = false,
+): Promise<EmojiLoadedState | null> {
+  if (isStateLoaded(state)) {
+    return state;
+  }
+
+  // First, try to load the data from IndexedDB.
+  try {
+    // This is duplicative, but that's because TS can't distinguish the state type easily.
+    if (state.type === EMOJI_TYPE_UNICODE) {
+      const data = await loadEmojiByHexcode(state.code, locale);
+      if (data) {
+        return {
+          ...state,
+          data,
+        };
+      }
+    } else {
+      const data = await loadCustomEmojiByShortcode(state.code);
+      if (data) {
+        return {
+          ...state,
+          data,
+        };
+      }
+    }
+    // If not found, assume it's not an emoji and return null.
+    log(
+      'Could not find emoji %s of type %s for locale %s',
+      state.code,
+      state.type,
+      locale,
+    );
+    return null;
+  } catch (err: unknown) {
+    // If the locale is not loaded, load it and retry once.
+    if (!retry && err instanceof LocaleNotLoadedError) {
+      log(
+        'Error loading emoji %s for locale %s, loading locale and retrying.',
+        state.code,
+        locale,
+      );
+      await importEmojiData(locale); // Use this from the loader file as it can be awaited.
+      return loadEmojiDataToState(state, locale, true);
+    }
+
+    console.warn('Error loading emoji data, not retrying:', state, locale, err);
+    return null;
+  }
+}
+
+export function isStateLoaded(state: EmojiState): state is EmojiLoadedState {
+  return !!state.data;
+}
+
 /**
  * Emojifies an element. This modifies the element in place, replacing text nodes with emojified versions.
  */
@@ -177,7 +268,11 @@ async function textToElementArray(
       if (token.type === EMOJI_TYPE_CUSTOM) {
         const extraEmojiData = extraEmojis[token.code];
         if (extraEmojiData) {
-          state = { type: EMOJI_TYPE_CUSTOM, data: extraEmojiData };
+          state = {
+            type: EMOJI_TYPE_CUSTOM,
+            data: extraEmojiData,
+            code: token.code,
+          };
         } else {
           state = emojiForLocale(token.code, EMOJI_TYPE_CUSTOM);
         }
@@ -189,7 +284,7 @@ async function textToElementArray(
       }
 
       // If the state is valid, create an image element. Otherwise, just append as text.
-      if (state && typeof state !== 'string') {
+      if (state && typeof state !== 'string' && isStateLoaded(state)) {
         const image = stateToImage(state, appState);
         renderedFragments.push(image);
         continue;
@@ -202,11 +297,11 @@ async function textToElementArray(
   return renderedFragments;
 }
 
-type TokenizedText = (string | EmojiToken)[];
+type TokenizedText = (string | EmojiState)[];
 
 export function tokenizeText(text: string): TokenizedText {
   if (!text.trim()) {
-    return [];
+    return [text];
   }
 
   const tokens = [];
@@ -222,14 +317,14 @@ export function tokenizeText(text: string): TokenizedText {
       // Custom emoji
       tokens.push({
         type: EMOJI_TYPE_CUSTOM,
-        code: code.slice(1, -1), // Remove the colons
-      } satisfies CustomEmojiToken);
+        code,
+      } satisfies EmojiStateCustom);
     } else {
       // Unicode emoji
       tokens.push({
         type: EMOJI_TYPE_UNICODE,
         code: code,
-      } satisfies UnicodeEmojiToken);
+      } satisfies EmojiStateUnicode);
     }
     lastIndex = match.index + code.length;
   }
@@ -304,13 +399,11 @@ async function loadMissingEmojiIntoCache(
     const emojis = await searchEmojisByHexcodes(missingEmojis, currentLocale);
     const cache = cacheForLocale(currentLocale);
     for (const emoji of emojis) {
-      cache.set(emoji.hexcode, { type: EMOJI_TYPE_UNICODE, data: emoji });
-    }
-    const notFoundEmojis = missingEmojis.filter((code) =>
-      emojis.every((emoji) => emoji.hexcode !== code),
-    );
-    for (const code of notFoundEmojis) {
-      cache.set(code, EMOJI_STATE_MISSING); // Mark as missing if not found, as it's probably not a valid emoji.
+      cache.set(emoji.hexcode, {
+        type: EMOJI_TYPE_UNICODE,
+        data: emoji,
+        code: emoji.hexcode,
+      });
     }
     localeCacheMap.set(currentLocale, cache);
   }
@@ -320,19 +413,17 @@ async function loadMissingEmojiIntoCache(
     const emojis = await searchCustomEmojisByShortcodes(missingEmojis);
     const cache = cacheForLocale(EMOJI_TYPE_CUSTOM);
     for (const emoji of emojis) {
-      cache.set(emoji.shortcode, { type: EMOJI_TYPE_CUSTOM, data: emoji });
-    }
-    const notFoundEmojis = missingEmojis.filter((code) =>
-      emojis.every((emoji) => emoji.shortcode !== code),
-    );
-    for (const code of notFoundEmojis) {
-      cache.set(code, EMOJI_STATE_MISSING); // Mark as missing if not found, as it's probably not a valid emoji.
+      cache.set(emoji.shortcode, {
+        type: EMOJI_TYPE_CUSTOM,
+        data: emoji,
+        code: emoji.shortcode,
+      });
     }
     localeCacheMap.set(EMOJI_TYPE_CUSTOM, cache);
   }
 }
 
-function shouldRenderImage(token: EmojiToken, mode: EmojiMode): boolean {
+export function shouldRenderImage(token: EmojiState, mode: EmojiMode): boolean {
   if (token.type === EMOJI_TYPE_UNICODE) {
     // If the mode is native or native with flags for non-flag emoji
     // we can just append the text node directly.
@@ -354,18 +445,9 @@ function stateToImage(state: EmojiLoadedState, appState: EmojiAppState) {
   image.classList.add('emojione');
 
   if (state.type === EMOJI_TYPE_UNICODE) {
-    const emojiInfo = twemojiHasBorder(unicodeToTwemojiHex(state.data.hexcode));
-    let fileName = emojiInfo.hexCode;
-    if (
-      (appState.darkTheme && emojiInfo.hasDarkBorder) ||
-      (!appState.darkTheme && emojiInfo.hasLightBorder)
-    ) {
-      fileName = `${emojiInfo.hexCode}_border`;
-    }
-
     image.alt = state.data.unicode;
     image.title = state.data.label;
-    image.src = `${assetHost}/emoji/${fileName}.svg`;
+    image.src = unicodeHexToUrl(state.data.hexcode, appState.darkTheme);
   } else {
     // Custom emoji
     const shortCode = `:${state.data.shortcode}:`;
diff --git a/app/javascript/mastodon/features/emoji/types.ts b/app/javascript/mastodon/features/emoji/types.ts
index 85bbe6d1a5..043b21361b 100644
--- a/app/javascript/mastodon/features/emoji/types.ts
+++ b/app/javascript/mastodon/features/emoji/types.ts
@@ -10,7 +10,6 @@ import type {
   EMOJI_MODE_NATIVE,
   EMOJI_MODE_NATIVE_WITH_FLAGS,
   EMOJI_MODE_TWEMOJI,
-  EMOJI_STATE_MISSING,
   EMOJI_TYPE_CUSTOM,
   EMOJI_TYPE_UNICODE,
 } from './constants';
@@ -29,45 +28,40 @@ export interface EmojiAppState {
   darkTheme: boolean;
 }
 
-export interface UnicodeEmojiToken {
-  type: typeof EMOJI_TYPE_UNICODE;
-  code: string;
-}
-export interface CustomEmojiToken {
-  type: typeof EMOJI_TYPE_CUSTOM;
-  code: string;
-}
-export type EmojiToken = UnicodeEmojiToken | CustomEmojiToken;
-
 export type CustomEmojiData = ApiCustomEmojiJSON;
 export type UnicodeEmojiData = FlatCompactEmoji;
 export type AnyEmojiData = CustomEmojiData | UnicodeEmojiData;
 
-export type EmojiStateMissing = typeof EMOJI_STATE_MISSING;
+type CustomEmojiRenderFields = Pick<
+  CustomEmojiData,
+  'shortcode' | 'static_url' | 'url'
+>;
+
 export interface EmojiStateUnicode {
   type: typeof EMOJI_TYPE_UNICODE;
-  data: UnicodeEmojiData;
+  code: string;
+  data?: UnicodeEmojiData;
 }
 export interface EmojiStateCustom {
   type: typeof EMOJI_TYPE_CUSTOM;
-  data: CustomEmojiRenderFields;
+  code: string;
+  data?: CustomEmojiRenderFields;
 }
-export type EmojiState =
-  | EmojiStateMissing
-  | EmojiStateUnicode
-  | EmojiStateCustom;
-export type EmojiLoadedState = EmojiStateUnicode | EmojiStateCustom;
+export type EmojiState = EmojiStateUnicode | EmojiStateCustom;
+export type EmojiLoadedState =
+  | Required<EmojiStateUnicode>
+  | Required<EmojiStateCustom>;
 
 export type EmojiStateMap = LimitedCache<string, EmojiState>;
 
 export type CustomEmojiMapArg =
   | ExtraCustomEmojiMap
   | ImmutableList<CustomEmoji>;
-export type CustomEmojiRenderFields = Pick<
-  CustomEmojiData,
-  'shortcode' | 'static_url' | 'url'
+
+export type ExtraCustomEmojiMap = Record<
+  string,
+  Pick<CustomEmojiData, 'shortcode' | 'static_url' | 'url'>
 >;
-export type ExtraCustomEmojiMap = Record<string, CustomEmojiRenderFields>;
 
 export interface TwemojiBorderInfo {
   hexCode: string;
diff --git a/app/javascript/mastodon/features/emoji/utils.ts b/app/javascript/mastodon/features/emoji/utils.ts
index ce35919929..e811565c27 100644
--- a/app/javascript/mastodon/features/emoji/utils.ts
+++ b/app/javascript/mastodon/features/emoji/utils.ts
@@ -10,6 +10,13 @@ export function stringHasUnicodeEmoji(input: string): boolean {
   return new RegExp(EMOJI_REGEX, supportedFlags()).test(input);
 }
 
+export function isUnicodeEmoji(input: string): boolean {
+  return (
+    input.length > 0 &&
+    new RegExp(`^(${EMOJI_REGEX})+$`, supportedFlags()).test(input)
+  );
+}
+
 export function stringHasUnicodeFlags(input: string): boolean {
   if (supportsRegExpSets()) {
     return new RegExp(
@@ -27,6 +34,11 @@ export function stringHasUnicodeFlags(input: string): boolean {
 
 // Constant as this is supported by all browsers.
 const CUSTOM_EMOJI_REGEX = /:([a-z0-9_]+):/i;
+
+export function isCustomEmoji(input: string): boolean {
+  return new RegExp(`^${CUSTOM_EMOJI_REGEX.source}$`, 'i').test(input);
+}
+
 export function stringHasCustomEmoji(input: string) {
   return CUSTOM_EMOJI_REGEX.test(input);
 }
diff --git a/app/javascript/mastodon/features/notifications_v2/components/embedded_status.tsx b/app/javascript/mastodon/features/notifications_v2/components/embedded_status.tsx
index a17425169b..8e5e72b6aa 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/embedded_status.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/embedded_status.tsx
@@ -6,6 +6,7 @@ import { useHistory } from 'react-router-dom';
 
 import type { List as ImmutableList, RecordOf } from 'immutable';
 
+import { AnimateEmojiProvider } from '@/mastodon/components/emoji/context';
 import BarChart4BarsIcon from '@/material-icons/400-24px/bar_chart_4_bars.svg?react';
 import PhotoLibraryIcon from '@/material-icons/400-24px/photo_library.svg?react';
 import { toggleStatusSpoilers } from 'mastodon/actions/statuses';
@@ -96,8 +97,8 @@ export const EmbeddedStatus: React.FC<{ statusId: string }> = ({
   ).size;
 
   return (
-    <div
-      className='notification-group__embedded-status animate-parent'
+    <AnimateEmojiProvider
+      className='notification-group__embedded-status'
       role='button'
       tabIndex={-1}
       onMouseDown={handleMouseDown}
@@ -148,6 +149,6 @@ export const EmbeddedStatus: React.FC<{ statusId: string }> = ({
           )}
         </div>
       )}
-    </div>
+    </AnimateEmojiProvider>
   );
 };
diff --git a/app/javascript/mastodon/features/picture_in_picture/components/footer.tsx b/app/javascript/mastodon/features/picture_in_picture/components/footer.tsx
index d1671b4bda..e848e69299 100644
--- a/app/javascript/mastodon/features/picture_in_picture/components/footer.tsx
+++ b/app/javascript/mastodon/features/picture_in_picture/components/footer.tsx
@@ -2,25 +2,19 @@ import { useCallback, useMemo } from 'react';
 
 import { defineMessages, useIntl } from 'react-intl';
 
-import classNames from 'classnames';
 import { useHistory } from 'react-router-dom';
 
 import OpenInNewIcon from '@/material-icons/400-24px/open_in_new.svg?react';
-import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
 import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
 import ReplyAllIcon from '@/material-icons/400-24px/reply_all.svg?react';
 import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
 import StarBorderIcon from '@/material-icons/400-24px/star.svg?react';
-import RepeatActiveIcon from '@/svg-icons/repeat_active.svg?react';
-import RepeatDisabledIcon from '@/svg-icons/repeat_disabled.svg?react';
-import RepeatPrivateIcon from '@/svg-icons/repeat_private.svg?react';
-import RepeatPrivateActiveIcon from '@/svg-icons/repeat_private_active.svg?react';
 import { replyCompose } from 'mastodon/actions/compose';
-import { toggleReblog, toggleFavourite } from 'mastodon/actions/interactions';
+import { toggleFavourite } from 'mastodon/actions/interactions';
 import { openModal } from 'mastodon/actions/modal';
 import { IconButton } from 'mastodon/components/icon_button';
+import { BoostButton } from 'mastodon/components/status/boost_button';
 import { useIdentity } from 'mastodon/identity_context';
-import { me } from 'mastodon/initial_state';
 import type { Account } from 'mastodon/models/account';
 import type { Status } from 'mastodon/models/status';
 import { makeGetStatus } from 'mastodon/selectors';
@@ -120,29 +114,6 @@ export const Footer: React.FC<{
     }
   }, [dispatch, status, signedIn]);
 
-  const handleReblogClick = useCallback(
-    (e: React.MouseEvent) => {
-      if (!status) {
-        return;
-      }
-
-      if (signedIn) {
-        dispatch(toggleReblog(status.get('id'), e.shiftKey));
-      } else {
-        dispatch(
-          openModal({
-            modalType: 'INTERACTION',
-            modalProps: {
-              accountId: status.getIn(['account', 'id']),
-              url: status.get('uri'),
-            },
-          }),
-        );
-      }
-    },
-    [dispatch, status, signedIn],
-  );
-
   const handleOpenClick = useCallback(
     (e: React.MouseEvent) => {
       if (e.button !== 0 || !status) {
@@ -160,13 +131,6 @@ export const Footer: React.FC<{
     return null;
   }
 
-  const publicStatus = ['public', 'unlisted'].includes(
-    status.get('visibility') as string,
-  );
-  const reblogPrivate =
-    status.getIn(['account', 'id']) === me &&
-    status.get('visibility') === 'private';
-
   let replyIcon, replyIconComponent, replyTitle;
 
   if (status.get('in_reply_to_id', null) === null) {
@@ -179,24 +143,6 @@ export const Footer: React.FC<{
     replyTitle = intl.formatMessage(messages.replyAll);
   }
 
-  let reblogTitle, reblogIconComponent;
-
-  if (status.get('reblogged')) {
-    reblogTitle = intl.formatMessage(messages.cancel_reblog_private);
-    reblogIconComponent = publicStatus
-      ? RepeatActiveIcon
-      : RepeatPrivateActiveIcon;
-  } else if (publicStatus) {
-    reblogTitle = intl.formatMessage(messages.reblog);
-    reblogIconComponent = RepeatIcon;
-  } else if (reblogPrivate) {
-    reblogTitle = intl.formatMessage(messages.reblog_private);
-    reblogIconComponent = RepeatPrivateIcon;
-  } else {
-    reblogTitle = intl.formatMessage(messages.cannot_reblog);
-    reblogIconComponent = RepeatDisabledIcon;
-  }
-
   const favouriteTitle = intl.formatMessage(
     status.get('favourited') ? messages.removeFavourite : messages.favourite,
   );
@@ -222,19 +168,7 @@ export const Footer: React.FC<{
         counter={status.get('replies_count') as number}
       />
 
-      <IconButton
-        className={classNames('status__action-bar-button', { reblogPrivate })}
-        disabled={!publicStatus && !reblogPrivate}
-        active={status.get('reblogged') as boolean}
-        title={reblogTitle}
-        icon='retweet'
-        iconComponent={reblogIconComponent}
-        onClick={handleReblogClick}
-        counter={
-          (status.get('reblogs_count') as number) +
-          (status.get('quotes_count') as number)
-        }
-      />
+      <BoostButton counters status={status} />
 
       <IconButton
         className='status__action-bar-button star-icon'
diff --git a/app/javascript/mastodon/features/quotes/index.tsx b/app/javascript/mastodon/features/quotes/index.tsx
index d0290e1118..56cf2f71f1 100644
--- a/app/javascript/mastodon/features/quotes/index.tsx
+++ b/app/javascript/mastodon/features/quotes/index.tsx
@@ -12,6 +12,8 @@ import { ColumnHeader } from 'mastodon/components/column_header';
 import { Icon } from 'mastodon/components/icon';
 import { LoadingIndicator } from 'mastodon/components/loading_indicator';
 import StatusList from 'mastodon/components/status_list';
+import { useIdentity } from 'mastodon/identity_context';
+import { domain } from 'mastodon/initial_state';
 import { useAppDispatch, useAppSelector } from 'mastodon/store';
 
 import Column from '../ui/components/column';
@@ -31,9 +33,18 @@ export const Quotes: React.FC<{
 
   const statusId = params?.statusId;
 
+  const { accountId: me } = useIdentity();
+
   const isCorrectStatusId: boolean = useAppSelector(
     (state) => state.status_lists.getIn(['quotes', 'statusId']) === statusId,
   );
+  const quotedAccountId = useAppSelector(
+    (state) =>
+      state.statuses.getIn([statusId, 'account']) as string | undefined,
+  );
+  const quotedAccount = useAppSelector((state) =>
+    quotedAccountId ? state.accounts.get(quotedAccountId) : undefined,
+  );
   const statusIds = useAppSelector((state) =>
     state.status_lists.getIn(['quotes', 'items'], emptyList),
   );
@@ -74,6 +85,32 @@ export const Quotes: React.FC<{
     />
   );
 
+  let prependMessage;
+
+  if (me === quotedAccountId) {
+    prependMessage = null;
+  } else if (quotedAccount?.username === quotedAccount?.acct) {
+    // Local account, we know this to be exhaustive
+    prependMessage = (
+      <div className='follow_requests-unlocked_explanation'>
+        <FormattedMessage
+          id='status.quotes.local_other_disclaimer'
+          defaultMessage='Quotes rejected by the author will not be shown.'
+        />
+      </div>
+    );
+  } else {
+    prependMessage = (
+      <div className='follow_requests-unlocked_explanation'>
+        <FormattedMessage
+          id='status.quotes.remote_other_disclaimer'
+          defaultMessage='Only quotes from {domain} are guaranteed to be shown here. Quotes rejected by the author will not be shown.'
+          values={{ domain: <strong>{domain}</strong> }}
+        />
+      </div>
+    );
+  }
+
   return (
     <Column bindToDocument={!multiColumn}>
       <ColumnHeader
@@ -100,6 +137,7 @@ export const Quotes: React.FC<{
         isLoading={isLoading}
         emptyMessage={emptyMessage}
         bindToDocument={!multiColumn}
+        prepend={prependMessage}
       />
 
       <Helmet>
diff --git a/app/javascript/mastodon/features/standalone/status/index.tsx b/app/javascript/mastodon/features/standalone/status/index.tsx
index a7850eae1c..a53d6e6b23 100644
--- a/app/javascript/mastodon/features/standalone/status/index.tsx
+++ b/app/javascript/mastodon/features/standalone/status/index.tsx
@@ -11,7 +11,7 @@ import { hydrateStore } from 'mastodon/actions/store';
 import { Router } from 'mastodon/components/router';
 import { DetailedStatus } from 'mastodon/features/status/components/detailed_status';
 import { useRenderSignal } from 'mastodon/hooks/useRenderSignal';
-import initialState from 'mastodon/initial_state';
+import { initialState } from 'mastodon/initial_state';
 import { IntlProvider } from 'mastodon/locales';
 import { makeGetStatus, makeGetPictureInPicture } from 'mastodon/selectors';
 import { store, useAppSelector, useAppDispatch } from 'mastodon/store';
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.tsx b/app/javascript/mastodon/features/status/components/detailed_status.tsx
index 957364fd7a..b09e109afb 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.tsx
+++ b/app/javascript/mastodon/features/status/components/detailed_status.tsx
@@ -31,7 +31,7 @@ import { VisibilityIcon } from 'mastodon/components/visibility_icon';
 import { Audio } from 'mastodon/features/audio';
 import scheduleIdleTask from 'mastodon/features/ui/util/schedule_idle_task';
 import { Video } from 'mastodon/features/video';
-import { me } from 'mastodon/initial_state';
+import { useIdentity } from 'mastodon/identity_context';
 
 import Card from './card';
 
@@ -75,6 +75,8 @@ export const DetailedStatus: React.FC<{
   const [showDespiteFilter, setShowDespiteFilter] = useState(false);
   const nodeRef = useRef<HTMLDivElement>();
 
+  const { signedIn } = useIdentity();
+
   const handleOpenVideo = useCallback(
     (options: VideoModalOptions) => {
       const lang = (status.getIn(['translation', 'language']) ||
@@ -283,7 +285,7 @@ export const DetailedStatus: React.FC<{
 
   if (['private', 'direct'].includes(status.get('visibility') as string)) {
     quotesLink = '';
-  } else if (status.getIn(['account', 'id']) === me) {
+  } else if (signedIn) {
     quotesLink = (
       <Link
         to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/quotes`}
diff --git a/app/javascript/mastodon/features/ui/components/confirmation_modals/confirmation_modal.tsx b/app/javascript/mastodon/features/ui/components/confirmation_modals/confirmation_modal.tsx
index 19ffe2bae5..47f9fca890 100644
--- a/app/javascript/mastodon/features/ui/components/confirmation_modals/confirmation_modal.tsx
+++ b/app/javascript/mastodon/features/ui/components/confirmation_modals/confirmation_modal.tsx
@@ -11,7 +11,7 @@ export interface BaseConfirmationModalProps {
 export const ConfirmationModal: React.FC<
   {
     title: React.ReactNode;
-    message: React.ReactNode;
+    message?: React.ReactNode;
     confirm: React.ReactNode;
     cancel?: React.ReactNode;
     secondary?: React.ReactNode;
@@ -48,7 +48,7 @@ export const ConfirmationModal: React.FC<
       <div className='safety-action-modal__top'>
         <div className='safety-action-modal__confirmation'>
           <h1>{title}</h1>
-          <p>{message}</p>
+          {message && <p>{message}</p>}
         </div>
       </div>
 
diff --git a/app/javascript/mastodon/features/ui/components/confirmation_modals/index.ts b/app/javascript/mastodon/features/ui/components/confirmation_modals/index.ts
index 63c93b54b6..9aff30eeac 100644
--- a/app/javascript/mastodon/features/ui/components/confirmation_modals/index.ts
+++ b/app/javascript/mastodon/features/ui/components/confirmation_modals/index.ts
@@ -5,7 +5,9 @@ export {
   ConfirmReplyModal,
   ConfirmEditStatusModal,
 } from './discard_draft_confirmation';
+export { ConfirmWithdrawRequestModal } from './withdraw_follow_request';
 export { ConfirmUnfollowModal } from './unfollow';
+export { ConfirmUnblockModal } from './unblock';
 export { ConfirmClearNotificationsModal } from './clear_notifications';
 export { ConfirmLogOutModal } from './log_out';
 export { ConfirmFollowToListModal } from './follow_to_list';
diff --git a/app/javascript/mastodon/features/ui/components/confirmation_modals/unblock.tsx b/app/javascript/mastodon/features/ui/components/confirmation_modals/unblock.tsx
new file mode 100644
index 0000000000..e2154ef48d
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/components/confirmation_modals/unblock.tsx
@@ -0,0 +1,45 @@
+import { useCallback } from 'react';
+
+import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
+
+import { unblockAccount } from 'mastodon/actions/accounts';
+import type { Account } from 'mastodon/models/account';
+import { useAppDispatch } from 'mastodon/store';
+
+import type { BaseConfirmationModalProps } from './confirmation_modal';
+import { ConfirmationModal } from './confirmation_modal';
+
+const messages = defineMessages({
+  unblockConfirm: {
+    id: 'confirmations.unblock.confirm',
+    defaultMessage: 'Unblock',
+  },
+});
+
+export const ConfirmUnblockModal: React.FC<
+  {
+    account: Account;
+  } & BaseConfirmationModalProps
+> = ({ account, onClose }) => {
+  const intl = useIntl();
+  const dispatch = useAppDispatch();
+
+  const onConfirm = useCallback(() => {
+    dispatch(unblockAccount(account.id));
+  }, [dispatch, account.id]);
+
+  return (
+    <ConfirmationModal
+      title={
+        <FormattedMessage
+          id='confirmations.unblock.title'
+          defaultMessage='Unblock {name}?'
+          values={{ name: `@${account.acct}` }}
+        />
+      }
+      confirm={intl.formatMessage(messages.unblockConfirm)}
+      onConfirm={onConfirm}
+      onClose={onClose}
+    />
+  );
+};
diff --git a/app/javascript/mastodon/features/ui/components/confirmation_modals/unfollow.tsx b/app/javascript/mastodon/features/ui/components/confirmation_modals/unfollow.tsx
index 58e39da07b..45b8d458b1 100644
--- a/app/javascript/mastodon/features/ui/components/confirmation_modals/unfollow.tsx
+++ b/app/javascript/mastodon/features/ui/components/confirmation_modals/unfollow.tsx
@@ -10,10 +10,6 @@ import type { BaseConfirmationModalProps } from './confirmation_modal';
 import { ConfirmationModal } from './confirmation_modal';
 
 const messages = defineMessages({
-  unfollowTitle: {
-    id: 'confirmations.unfollow.title',
-    defaultMessage: 'Unfollow user?',
-  },
   unfollowConfirm: {
     id: 'confirmations.unfollow.confirm',
     defaultMessage: 'Unfollow',
@@ -34,12 +30,11 @@ export const ConfirmUnfollowModal: React.FC<
 
   return (
     <ConfirmationModal
-      title={intl.formatMessage(messages.unfollowTitle)}
-      message={
+      title={
         <FormattedMessage
-          id='confirmations.unfollow.message'
-          defaultMessage='Are you sure you want to unfollow {name}?'
-          values={{ name: <strong>@{account.acct}</strong> }}
+          id='confirmations.unfollow.title'
+          defaultMessage='Unfollow {name}?'
+          values={{ name: `@${account.acct}` }}
         />
       }
       confirm={intl.formatMessage(messages.unfollowConfirm)}
diff --git a/app/javascript/mastodon/features/ui/components/confirmation_modals/withdraw_follow_request.tsx b/app/javascript/mastodon/features/ui/components/confirmation_modals/withdraw_follow_request.tsx
new file mode 100644
index 0000000000..a0bd236637
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/components/confirmation_modals/withdraw_follow_request.tsx
@@ -0,0 +1,45 @@
+import { useCallback } from 'react';
+
+import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
+
+import { unfollowAccount } from 'mastodon/actions/accounts';
+import type { Account } from 'mastodon/models/account';
+import { useAppDispatch } from 'mastodon/store';
+
+import type { BaseConfirmationModalProps } from './confirmation_modal';
+import { ConfirmationModal } from './confirmation_modal';
+
+const messages = defineMessages({
+  withdrawConfirm: {
+    id: 'confirmations.withdraw_request.confirm',
+    defaultMessage: 'Withdraw request',
+  },
+});
+
+export const ConfirmWithdrawRequestModal: React.FC<
+  {
+    account: Account;
+  } & BaseConfirmationModalProps
+> = ({ account, onClose }) => {
+  const intl = useIntl();
+  const dispatch = useAppDispatch();
+
+  const onConfirm = useCallback(() => {
+    dispatch(unfollowAccount(account.id));
+  }, [dispatch, account.id]);
+
+  return (
+    <ConfirmationModal
+      title={
+        <FormattedMessage
+          id='confirmations.withdraw_request.title'
+          defaultMessage='Withdraw request to follow {name}?'
+          values={{ name: `@${account.acct}` }}
+        />
+      }
+      confirm={intl.formatMessage(messages.withdrawConfirm)}
+      onConfirm={onConfirm}
+      onClose={onClose}
+    />
+  );
+};
diff --git a/app/javascript/mastodon/features/ui/components/modal_root.jsx b/app/javascript/mastodon/features/ui/components/modal_root.jsx
index caaa4e590b..944feb325e 100644
--- a/app/javascript/mastodon/features/ui/components/modal_root.jsx
+++ b/app/javascript/mastodon/features/ui/components/modal_root.jsx
@@ -32,7 +32,9 @@ import {
   ConfirmDeleteListModal,
   ConfirmReplyModal,
   ConfirmEditStatusModal,
+  ConfirmUnblockModal,
   ConfirmUnfollowModal,
+  ConfirmWithdrawRequestModal,
   ConfirmClearNotificationsModal,
   ConfirmLogOutModal,
   ConfirmFollowToListModal,
@@ -57,7 +59,9 @@ export const MODAL_COMPONENTS = {
   'CONFIRM_DELETE_LIST': () => Promise.resolve({ default: ConfirmDeleteListModal }),
   'CONFIRM_REPLY': () => Promise.resolve({ default: ConfirmReplyModal }),
   'CONFIRM_EDIT_STATUS': () => Promise.resolve({ default: ConfirmEditStatusModal }),
+  'CONFIRM_UNBLOCK': () => Promise.resolve({ default: ConfirmUnblockModal }),
   'CONFIRM_UNFOLLOW': () => Promise.resolve({ default: ConfirmUnfollowModal }),
+  'CONFIRM_WITHDRAW_REQUEST': () => Promise.resolve({ default: ConfirmWithdrawRequestModal }),
   'CONFIRM_CLEAR_NOTIFICATIONS': () => Promise.resolve({ default: ConfirmClearNotificationsModal }),
   'CONFIRM_LOG_OUT': () => Promise.resolve({ default: ConfirmLogOutModal }),
   'CONFIRM_FOLLOW_TO_LIST': () => Promise.resolve({ default: ConfirmFollowToListModal }),
diff --git a/app/javascript/mastodon/features/ui/index.jsx b/app/javascript/mastodon/features/ui/index.jsx
index efec38caf4..04c7f33dfd 100644
--- a/app/javascript/mastodon/features/ui/index.jsx
+++ b/app/javascript/mastodon/features/ui/index.jsx
@@ -27,7 +27,7 @@ import { uploadCompose, resetCompose, changeComposeSpoilerness } from '../../act
 import { clearHeight } from '../../actions/height_cache';
 import { fetchServer, fetchServerTranslationLanguages } from '../../actions/server';
 import { expandHomeTimeline } from '../../actions/timelines';
-import initialState, { me, owner, singleUserMode, trendsEnabled, trendsAsLanding, disableHoverCards, autoPlayGif } from '../../initial_state';
+import { initialState, me, owner, singleUserMode, trendsEnabled, trendsAsLanding, disableHoverCards, autoPlayGif } from '../../initial_state';
 
 import BundleColumnError from './components/bundle_column_error';
 import { NavigationBar } from './components/navigation_bar';
diff --git a/app/javascript/mastodon/features/ui/util/focusUtils.ts b/app/javascript/mastodon/features/ui/util/focusUtils.ts
index 9bcd3f8943..e46ede3553 100644
--- a/app/javascript/mastodon/features/ui/util/focusUtils.ts
+++ b/app/javascript/mastodon/features/ui/util/focusUtils.ts
@@ -1,4 +1,4 @@
-import initialState from '@/mastodon/initial_state';
+import { initialState } from '@/mastodon/initial_state';
 
 interface FocusColumnOptions {
   index?: number;
diff --git a/app/javascript/mastodon/initial_state.js b/app/javascript/mastodon/initial_state.js
deleted file mode 100644
index 4a078b86f5..0000000000
--- a/app/javascript/mastodon/initial_state.js
+++ /dev/null
@@ -1,145 +0,0 @@
-// @ts-check
-
-/**
- * @typedef {[code: string, name: string, localName: string]} InitialStateLanguage
- */
-
-/**
- * @typedef InitialStateMeta
- * @property {string} access_token
- * @property {boolean=} advanced_layout
- * @property {boolean} auto_play_gif
- * @property {boolean} activity_api_enabled
- * @property {string} admin
- * @property {boolean=} boost_modal
- * @property {boolean=} delete_modal
- * @property {boolean=} missing_alt_text_modal
- * @property {boolean=} disable_swiping
- * @property {boolean=} disable_hover_cards
- * @property {string=} disabled_account_id
- * @property {string} display_media
- * @property {string} domain
- * @property {boolean=} expand_spoilers
- * @property {boolean} limited_federation_mode
- * @property {string} locale
- * @property {string | null} mascot
- * @property {string=} me
- * @property {string=} moved_to_account_id
- * @property {string=} owner
- * @property {boolean} profile_directory
- * @property {boolean} registrations_open
- * @property {boolean} reduce_motion
- * @property {string} repository
- * @property {boolean} search_enabled
- * @property {boolean} trends_enabled
- * @property {boolean} single_user_mode
- * @property {string} source_url
- * @property {string} streaming_api_base_url
- * @property {boolean} timeline_preview
- * @property {string} title
- * @property {boolean} show_trends
- * @property {boolean} trends_as_landing_page
- * @property {boolean} use_blurhash
- * @property {boolean=} use_pending_items
- * @property {string} version
- * @property {string} sso_redirect
- * @property {string} status_page_url
- * @property {boolean} terms_of_service_enabled
- * @property {string?} emoji_style
- */
-
-/**
- * @typedef Role
- * @property {string} id
- * @property {string} name
- * @property {string} permissions
- * @property {string} color
- * @property {boolean} highlighted
- */
-
-/**
- * @typedef InitialState
- * @property {Record<string, import("./api_types/accounts").ApiAccountJSON>} accounts
- * @property {InitialStateLanguage[]} languages
- * @property {boolean=} critical_updates_pending
- * @property {InitialStateMeta} meta
- * @property {Role?} role
- * @property {string[]} features
- */
-
-const element = document.getElementById('initial-state');
-/** @type {InitialState | undefined} */
-const initialState = element?.textContent && JSON.parse(element.textContent);
-
-/** @type {string} */
-const initialPath = document.querySelector("head meta[name=initialPath]")?.getAttribute("content") ?? '';
-/** @type {boolean} */
-export const hasMultiColumnPath = initialPath === '/'
-  || initialPath === '/getting-started'
-  || initialPath === '/home'
-  || initialPath.startsWith('/deck');
-
-/**
- * @template {keyof InitialStateMeta} K
- * @param {K} prop
- * @returns {InitialStateMeta[K] | undefined}
- */
-const getMeta = (prop) => initialState?.meta && initialState.meta[prop];
-
-export const activityApiEnabled = getMeta('activity_api_enabled');
-export const autoPlayGif = getMeta('auto_play_gif');
-export const boostModal = getMeta('boost_modal');
-export const deleteModal = getMeta('delete_modal');
-export const missingAltTextModal = getMeta('missing_alt_text_modal');
-export const disableSwiping = getMeta('disable_swiping');
-export const disableHoverCards = getMeta('disable_hover_cards');
-export const disabledAccountId = getMeta('disabled_account_id');
-export const displayMedia = getMeta('display_media');
-export const domain = getMeta('domain');
-export const emojiStyle = getMeta('emoji_style') || 'auto';
-export const expandSpoilers = getMeta('expand_spoilers');
-export const forceSingleColumn = !getMeta('advanced_layout');
-export const limitedFederationMode = getMeta('limited_federation_mode');
-export const mascot = getMeta('mascot');
-export const me = getMeta('me');
-export const movedToAccountId = getMeta('moved_to_account_id');
-export const owner = getMeta('owner');
-export const profile_directory = getMeta('profile_directory');
-export const reduceMotion = getMeta('reduce_motion');
-export const registrationsOpen = getMeta('registrations_open');
-export const repository = getMeta('repository');
-export const searchEnabled = getMeta('search_enabled');
-export const trendsEnabled = getMeta('trends_enabled');
-export const showTrends = getMeta('show_trends');
-export const singleUserMode = getMeta('single_user_mode');
-export const source_url = getMeta('source_url');
-export const timelinePreview = getMeta('timeline_preview');
-export const title = getMeta('title');
-export const trendsAsLanding = getMeta('trends_as_landing_page');
-export const useBlurhash = getMeta('use_blurhash');
-export const usePendingItems = getMeta('use_pending_items');
-export const version = getMeta('version');
-export const criticalUpdatesPending = initialState?.critical_updates_pending;
-export const statusPageUrl = getMeta('status_page_url');
-export const sso_redirect = getMeta('sso_redirect');
-export const termsOfServiceEnabled = getMeta('terms_of_service_enabled');
-
-const displayNames = Intl.DisplayNames && new Intl.DisplayNames(getMeta('locale'), {
-  type: 'language',
-  fallback: 'none',
-  languageDisplay: 'standard',
-});
-
-export const languages = initialState?.languages?.map(lang => {
-  // zh-YUE is not a valid CLDR unicode_language_id
-  return [lang[0], displayNames?.of(lang[0].replace('zh-YUE', 'yue')) || lang[1], lang[2]];
-});
-
-/**
- * @returns {string | undefined}
- */
-export function getAccessToken() {
-  return getMeta('access_token');
-}
-
-export default initialState;
diff --git a/app/javascript/mastodon/initial_state.ts b/app/javascript/mastodon/initial_state.ts
new file mode 100644
index 0000000000..b6d7d55483
--- /dev/null
+++ b/app/javascript/mastodon/initial_state.ts
@@ -0,0 +1,141 @@
+import type { ApiAccountJSON } from './api_types/accounts';
+
+type InitialStateLanguage = [code: string, name: string, localName: string];
+
+interface InitialStateMeta {
+  access_token: string;
+  advanced_layout?: boolean;
+  auto_play_gif: boolean;
+  activity_api_enabled: boolean;
+  admin: string;
+  boost_modal?: boolean;
+  delete_modal?: boolean;
+  missing_alt_text_modal?: boolean;
+  disable_swiping?: boolean;
+  disable_hover_cards?: boolean;
+  disabled_account_id?: string;
+  display_media: string;
+  domain: string;
+  expand_spoilers?: boolean;
+  limited_federation_mode: boolean;
+  locale: string;
+  mascot: string | null;
+  me?: string;
+  moved_to_account_id?: string;
+  owner?: string;
+  profile_directory: boolean;
+  registrations_open: boolean;
+  reduce_motion: boolean;
+  repository: string;
+  search_enabled: boolean;
+  trends_enabled: boolean;
+  single_user_mode: boolean;
+  source_url: string;
+  streaming_api_base_url: string;
+  timeline_preview: boolean;
+  title: string;
+  show_trends: boolean;
+  trends_as_landing_page: boolean;
+  use_blurhash: boolean;
+  use_pending_items?: boolean;
+  version: string;
+  sso_redirect: string;
+  status_page_url: string;
+  terms_of_service_enabled: boolean;
+  emoji_style?: string;
+}
+
+interface Role {
+  id: string;
+  name: string;
+  permissions: string;
+  color: string;
+  highlighted: boolean;
+}
+
+export interface InitialState {
+  accounts: Record<string, ApiAccountJSON>;
+  languages: InitialStateLanguage[];
+  critical_updates_pending?: boolean;
+  meta: InitialStateMeta;
+  role?: Role;
+  features: string[];
+}
+
+const element = document.getElementById('initial-state');
+export const initialState: InitialState | undefined = element?.textContent
+  ? (JSON.parse(element.textContent) as InitialState)
+  : undefined;
+
+const initialPath: string =
+  document
+    .querySelector('head meta[name=initialPath]')
+    ?.getAttribute('content') ?? '';
+export const hasMultiColumnPath: boolean =
+  initialPath === '/' ||
+  initialPath === '/getting-started' ||
+  initialPath === '/home' ||
+  initialPath.startsWith('/deck');
+
+function getMeta<K extends keyof InitialStateMeta>(
+  prop: K,
+): InitialStateMeta[K] | undefined {
+  return initialState?.meta[prop];
+}
+
+export const activityApiEnabled = getMeta('activity_api_enabled');
+export const autoPlayGif = getMeta('auto_play_gif');
+export const boostModal = getMeta('boost_modal');
+export const deleteModal = getMeta('delete_modal');
+export const missingAltTextModal = getMeta('missing_alt_text_modal');
+export const disableSwiping = getMeta('disable_swiping');
+export const disableHoverCards = getMeta('disable_hover_cards');
+export const disabledAccountId = getMeta('disabled_account_id');
+export const displayMedia = getMeta('display_media');
+export const domain = getMeta('domain');
+export const emojiStyle = getMeta('emoji_style') ?? 'auto';
+export const expandSpoilers = getMeta('expand_spoilers');
+export const forceSingleColumn = !getMeta('advanced_layout');
+export const limitedFederationMode = getMeta('limited_federation_mode');
+export const mascot = getMeta('mascot');
+export const me = getMeta('me');
+export const movedToAccountId = getMeta('moved_to_account_id');
+export const owner = getMeta('owner');
+export const profile_directory = getMeta('profile_directory');
+export const reduceMotion = getMeta('reduce_motion');
+export const registrationsOpen = getMeta('registrations_open');
+export const repository = getMeta('repository');
+export const searchEnabled = getMeta('search_enabled');
+export const trendsEnabled = getMeta('trends_enabled');
+export const showTrends = getMeta('show_trends');
+export const singleUserMode = getMeta('single_user_mode');
+export const source_url = getMeta('source_url');
+export const timelinePreview = getMeta('timeline_preview');
+export const title = getMeta('title');
+export const trendsAsLanding = getMeta('trends_as_landing_page');
+export const useBlurhash = getMeta('use_blurhash');
+export const usePendingItems = getMeta('use_pending_items');
+export const version = getMeta('version');
+export const criticalUpdatesPending = initialState?.critical_updates_pending;
+export const statusPageUrl = getMeta('status_page_url');
+export const sso_redirect = getMeta('sso_redirect');
+export const termsOfServiceEnabled = getMeta('terms_of_service_enabled');
+
+const displayNames = new Intl.DisplayNames(getMeta('locale'), {
+  type: 'language',
+  fallback: 'none',
+  languageDisplay: 'standard',
+});
+
+export const languages = initialState?.languages.map((lang) => {
+  // zh-YUE is not a valid CLDR unicode_language_id
+  return [
+    lang[0],
+    displayNames.of(lang[0].replace('zh-YUE', 'yue')) ?? lang[1],
+    lang[2],
+  ];
+});
+
+export function getAccessToken(): string | undefined {
+  return getMeta('access_token');
+}
diff --git a/app/javascript/mastodon/locales/an.json b/app/javascript/mastodon/locales/an.json
index bd4c061266..6733b1b929 100644
--- a/app/javascript/mastodon/locales/an.json
+++ b/app/javascript/mastodon/locales/an.json
@@ -133,7 +133,6 @@
   "confirmations.mute.confirm": "Silenciar",
   "confirmations.redraft.confirm": "Borrar y tornar ta borrador",
   "confirmations.unfollow.confirm": "Deixar de seguir",
-  "confirmations.unfollow.message": "Yes seguro que quiers deixar de seguir a {name}?",
   "conversation.delete": "Borrar conversación",
   "conversation.mark_as_read": "Marcar como leyiu",
   "conversation.open": "Veyer conversación",
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index affadf671f..514a8d7f28 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -252,8 +252,6 @@
   "confirmations.revoke_quote.message": "لا يمكن التراجع عن هذا الإجراء.",
   "confirmations.revoke_quote.title": "أتريد إزالة المنشور؟",
   "confirmations.unfollow.confirm": "إلغاء المتابعة",
-  "confirmations.unfollow.message": "متأكد من أنك تريد إلغاء متابعة {name} ؟",
-  "confirmations.unfollow.title": "إلغاء متابعة المستخدم؟",
   "content_warning.hide": "إخفاء المنشور",
   "content_warning.show": "إظهار على أي حال",
   "content_warning.show_more": "إظهار المزيد",
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
index 892a5f7ae8..50b0122297 100644
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@@ -155,8 +155,6 @@
   "confirmations.redraft.confirm": "Desaniciar y reeditar",
   "confirmations.redraft.title": "¿Desaniciar y reeditar la publicación?",
   "confirmations.unfollow.confirm": "Dexar de siguir",
-  "confirmations.unfollow.message": "¿De xuru que quies dexar de siguir a {name}?",
-  "confirmations.unfollow.title": "¿Dexar de siguir al usuariu?",
   "content_warning.hide": "Esconder la publicación",
   "content_warning.show": "Amosar de toes toes",
   "content_warning.show_more": "Amosar más",
diff --git a/app/javascript/mastodon/locales/az.json b/app/javascript/mastodon/locales/az.json
index a6b11dd910..720719d84d 100644
--- a/app/javascript/mastodon/locales/az.json
+++ b/app/javascript/mastodon/locales/az.json
@@ -248,8 +248,6 @@
   "confirmations.revoke_quote.message": "Bu əməliyyatın geri dönüşü yoxdur.",
   "confirmations.revoke_quote.title": "Göndəriş silinsin?",
   "confirmations.unfollow.confirm": "İzləmədən çıxar",
-  "confirmations.unfollow.message": "{name} izləmədən çıxmaq istədiyinizə əminsiniz?",
-  "confirmations.unfollow.title": "İstifadəçi izləmədən çıxarılsın?",
   "content_warning.hide": "Paylaşımı gizlət",
   "content_warning.show": "Yenə də göstər",
   "content_warning.show_more": "Daha çox göstər",
diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index 56430cee50..e51b5a56b1 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -258,8 +258,6 @@
   "confirmations.revoke_quote.message": "Гэтае дзеянне немагчыма адмяніць.",
   "confirmations.revoke_quote.title": "Выдаліць допіс?",
   "confirmations.unfollow.confirm": "Адпісацца",
-  "confirmations.unfollow.message": "Вы ўпэўненыя, што хочаце адпісацца ад {name}?",
-  "confirmations.unfollow.title": "Адпісацца ад карыстальніка?",
   "content_warning.hide": "Схаваць допіс",
   "content_warning.show": "Усё адно паказаць",
   "content_warning.show_more": "Паказаць усё роўна",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 259d6e71e0..6025639884 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -248,8 +248,6 @@
   "confirmations.revoke_quote.message": "Действието е неотменимо.",
   "confirmations.revoke_quote.title": "Премахвате ли публикацията?",
   "confirmations.unfollow.confirm": "Без следване",
-  "confirmations.unfollow.message": "Наистина ли искате вече да не следвате {name}?",
-  "confirmations.unfollow.title": "Спирате ли да следвате потребителя?",
   "content_warning.hide": "Скриване на публ.",
   "content_warning.show": "Нека се покаже",
   "content_warning.show_more": "Показване на още",
diff --git a/app/javascript/mastodon/locales/bn.json b/app/javascript/mastodon/locales/bn.json
index e6c4ae0e7d..526248e76c 100644
--- a/app/javascript/mastodon/locales/bn.json
+++ b/app/javascript/mastodon/locales/bn.json
@@ -152,7 +152,6 @@
   "confirmations.mute.confirm": "সরিয়ে ফেলুন",
   "confirmations.redraft.confirm": "মুছে ফেলুন এবং আবার সম্পাদন করুন",
   "confirmations.unfollow.confirm": "অনুসরণ বন্ধ করো",
-  "confirmations.unfollow.message": "তুমি কি নিশ্চিত {name} কে আর অনুসরণ করতে চাও না?",
   "conversation.delete": "কথোপকথন মুছে ফেলুন",
   "conversation.mark_as_read": "পঠিত হিসেবে চিহ্নিত করুন",
   "conversation.open": "কথপোকথন দেখান",
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index b3e9d22027..c33d64a54e 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -217,8 +217,6 @@
   "confirmations.revoke_quote.confirm": "Dilemel an embannadur",
   "confirmations.revoke_quote.title": "Dilemel an embannadur?",
   "confirmations.unfollow.confirm": "Diheuliañ",
-  "confirmations.unfollow.message": "Ha sur oc'h e fell deoc'h paouez da heuliañ {name} ?",
-  "confirmations.unfollow.title": "Paouez da heuliañ an implijer·ez?",
   "content_warning.hide": "Kuzhat an embannadur",
   "content_warning.show": "Diskwel memes tra",
   "content_warning.show_more": "Diskouez muioc'h",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 712adc59bb..1d33a2fec5 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -248,8 +248,6 @@
   "confirmations.revoke_quote.message": "Aquesta acció no es pot desfer.",
   "confirmations.revoke_quote.title": "Eliminar la publicació?",
   "confirmations.unfollow.confirm": "Deixa de seguir",
-  "confirmations.unfollow.message": "Segur que vols deixar de seguir {name}?",
-  "confirmations.unfollow.title": "Deixar de seguir l'usuari?",
   "content_warning.hide": "Amaga la publicació",
   "content_warning.show": "Mostra-la igualment",
   "content_warning.show_more": "Mostra'n més",
diff --git a/app/javascript/mastodon/locales/ckb.json b/app/javascript/mastodon/locales/ckb.json
index 00e9462569..ea27df8492 100644
--- a/app/javascript/mastodon/locales/ckb.json
+++ b/app/javascript/mastodon/locales/ckb.json
@@ -160,7 +160,6 @@
   "confirmations.redraft.confirm": "سڕینەوە & دووبارە ڕەشکردنەوە",
   "confirmations.redraft.message": "دڵنیای دەتەوێت ئەم پۆستە بسڕیتەوە و دووبارە دایبڕێژیتەوە؟ فەڤۆریت و بووستەکان لەدەست دەچن، وەڵامەکانی پۆستە ئەسڵیەکەش هەتیو دەبن.",
   "confirmations.unfollow.confirm": "بەدوادانەچو",
-  "confirmations.unfollow.message": "ئایا دڵنیایت لەوەی دەتەوێت پەیڕەوی {name}?",
   "conversation.delete": "سڕینەوەی گفتوگۆ",
   "conversation.mark_as_read": "نیشانەکردن وەک خوێندراوە",
   "conversation.open": "نیشاندان گفتوگۆ",
diff --git a/app/javascript/mastodon/locales/co.json b/app/javascript/mastodon/locales/co.json
index c8df1d444c..ce58faf5e0 100644
--- a/app/javascript/mastodon/locales/co.json
+++ b/app/javascript/mastodon/locales/co.json
@@ -87,7 +87,6 @@
   "confirmations.mute.confirm": "Piattà",
   "confirmations.redraft.confirm": "Sguassà è riscrive",
   "confirmations.unfollow.confirm": "Disabbunassi",
-  "confirmations.unfollow.message": "Site sicuru·a ch'ùn vulete più siguità @{name}?",
   "conversation.delete": "Sguassà a cunversazione",
   "conversation.mark_as_read": "Marcà cum'è lettu",
   "conversation.open": "Vede a cunversazione",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index 5ec5fa7bb5..7b69cdc654 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -258,8 +258,6 @@
   "confirmations.revoke_quote.message": "Tuto akci nelze vrátit zpět.",
   "confirmations.revoke_quote.title": "Odstranit příspěvek?",
   "confirmations.unfollow.confirm": "Přestat sledovat",
-  "confirmations.unfollow.message": "Opravdu chcete {name} přestat sledovat?",
-  "confirmations.unfollow.title": "Přestat sledovat uživatele?",
   "content_warning.hide": "Skrýt příspěvek",
   "content_warning.show": "Přesto zobrazit",
   "content_warning.show_more": "Zobrazit více",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index 941bc016c9..843e2ae187 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -258,8 +258,6 @@
   "confirmations.revoke_quote.message": "Does dim modd dadwneud y weithred hon.",
   "confirmations.revoke_quote.title": "Dileu'r postiad?",
   "confirmations.unfollow.confirm": "Dad-ddilyn",
-  "confirmations.unfollow.message": "Ydych chi'n siŵr eich bod am ddad-ddilyn {name}?",
-  "confirmations.unfollow.title": "Dad-ddilyn defnyddiwr?",
   "content_warning.hide": "Cuddio'r postiad",
   "content_warning.show": "Dangos beth bynnag",
   "content_warning.show_more": "Dangos rhagor",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index 0180e2bf7e..5c4dc9ff1d 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -257,9 +257,12 @@
   "confirmations.revoke_quote.confirm": "Fjern indlæg",
   "confirmations.revoke_quote.message": "Denne handling kan ikke fortrydes.",
   "confirmations.revoke_quote.title": "Fjern indlæg?",
+  "confirmations.unblock.confirm": "Fjern blokering",
+  "confirmations.unblock.title": "Fjern blokering af {name}?",
   "confirmations.unfollow.confirm": "Følg ikke længere",
-  "confirmations.unfollow.message": "Er du sikker på, at du ikke længere vil følge {name}?",
-  "confirmations.unfollow.title": "Følg ikke længere bruger?",
+  "confirmations.unfollow.title": "Følg ikke længere {name}?",
+  "confirmations.withdraw_request.confirm": "Annullér anmodning",
+  "confirmations.withdraw_request.title": "Annullér anmodning om at følge {name}?",
   "content_warning.hide": "Skjul indlæg",
   "content_warning.show": "Vis alligevel",
   "content_warning.show_more": "Vis flere",
@@ -920,6 +923,8 @@
   "status.quote_private": "Private indlæg kan ikke citeres",
   "status.quotes": "{count, plural, one {citat} other {citater}}",
   "status.quotes.empty": "Ingen har citeret dette indlæg endnu. Når det sker, vil det fremgå her.",
+  "status.quotes.local_other_disclaimer": "Citater afvist af forfatteren vil ikke blive vist.",
+  "status.quotes.remote_other_disclaimer": "Kun citater fra {domain} vises med garanti her. Citater afvist af forfatteren vil ikke blive vist.",
   "status.read_more": "Læs mere",
   "status.reblog": "Fremhæv",
   "status.reblog_or_quote": "Fremhæv eller citér",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 80c3820508..2ee15010cc 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -257,9 +257,12 @@
   "confirmations.revoke_quote.confirm": "Beitrag entfernen",
   "confirmations.revoke_quote.message": "Diese Aktion kann nicht rückgängig gemacht werden.",
   "confirmations.revoke_quote.title": "Beitrag entfernen?",
+  "confirmations.unblock.confirm": "Nicht mehr blockieren",
+  "confirmations.unblock.title": "{name} nicht mehr blockieren?",
   "confirmations.unfollow.confirm": "Entfolgen",
-  "confirmations.unfollow.message": "Möchtest du {name} wirklich entfolgen?",
-  "confirmations.unfollow.title": "Profil entfolgen?",
+  "confirmations.unfollow.title": "{name} entfolgen?",
+  "confirmations.withdraw_request.confirm": "Anfrage zurückziehen",
+  "confirmations.withdraw_request.title": "Anfrage zum Folgen von {name} zurückziehen?",
   "content_warning.hide": "Beitrag ausblenden",
   "content_warning.show": "Trotzdem anzeigen",
   "content_warning.show_more": "Beitrag anzeigen",
@@ -920,6 +923,8 @@
   "status.quote_private": "Private Beiträge können nicht zitiert werden",
   "status.quotes": "{count, plural, one {Mal zitiert} other {Mal zitiert}}",
   "status.quotes.empty": "Diesen Beitrag hat bisher noch niemand zitiert. Sobald es jemand tut, wird das Profil hier erscheinen.",
+  "status.quotes.local_other_disclaimer": "Durch Autor*in abgelehnte Zitate werden nicht angezeigt.",
+  "status.quotes.remote_other_disclaimer": "Nur Zitate von {domain} werden hier garantiert angezeigt. Durch Autor*in abgelehnte Zitate werden nicht angezeigt.",
   "status.read_more": "Gesamten Beitrag anschauen",
   "status.reblog": "Teilen",
   "status.reblog_or_quote": "Teilen oder zitieren",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index f52a480c90..6df9c3c1e2 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -257,9 +257,12 @@
   "confirmations.revoke_quote.confirm": "Αφαίρεση ανάρτησης",
   "confirmations.revoke_quote.message": "Αυτή η ενέργεια δεν μπορεί να αναιρεθεί.",
   "confirmations.revoke_quote.title": "Αφαίρεση ανάρτησης;",
+  "confirmations.unblock.confirm": "Άρση αποκλεισμού",
+  "confirmations.unblock.title": "Άρση αποκλεισμού {name};",
   "confirmations.unfollow.confirm": "Άρση ακολούθησης",
-  "confirmations.unfollow.message": "Σίγουρα θες να πάψεις να ακολουθείς τον/την {name};",
-  "confirmations.unfollow.title": "Άρση ακολούθησης;",
+  "confirmations.unfollow.title": "Κατάργηση ακολούθησης του/της {name};",
+  "confirmations.withdraw_request.confirm": "Απόσυρση αιτήματος",
+  "confirmations.withdraw_request.title": "Απόσυρση αιτήματος για να ακολουθήσετε τον/την {name};",
   "content_warning.hide": "Απόκρυψη ανάρτησης",
   "content_warning.show": "Εμφάνιση ούτως ή άλλως",
   "content_warning.show_more": "Εμφάνιση περισσότερων",
@@ -920,6 +923,8 @@
   "status.quote_private": "Ιδιωτικές αναρτήσεις δεν μπορούν να παρατεθούν",
   "status.quotes": "{count, plural, one {# παράθεση} other {# παραθέσεις}}",
   "status.quotes.empty": "Κανείς δεν έχει παραθέσει αυτή την ανάρτηση ακόμα. Μόλις το κάνει, θα εμφανιστεί εδώ.",
+  "status.quotes.local_other_disclaimer": "Οι παραθέσεις που απορρίφθηκαν από τον συντάκτη δε θα εμφανιστούν.",
+  "status.quotes.remote_other_disclaimer": "Μόνο παραθέσεις από το {domain} είναι εγγυημένες ότι θα εμφανιστούν εδώ. Παραθέσεις που απορρίφθηκαν από τον συντάκτη δε θα εμφανιστούν.",
   "status.read_more": "Διάβασε περισότερα",
   "status.reblog": "Ενίσχυση",
   "status.reblog_or_quote": "Ενίσχυση ή παράθεση",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index bea3c988af..908c0509ef 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -245,8 +245,6 @@
   "confirmations.remove_from_followers.message": "{name} will stop following you. Are you sure you want to proceed?",
   "confirmations.remove_from_followers.title": "Remove follower?",
   "confirmations.unfollow.confirm": "Unfollow",
-  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
-  "confirmations.unfollow.title": "Unfollow user?",
   "content_warning.hide": "Hide post",
   "content_warning.show": "Show anyway",
   "content_warning.show_more": "Show more",
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 9dc405ab14..a88a2f1801 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -257,9 +257,12 @@
   "confirmations.revoke_quote.confirm": "Remove post",
   "confirmations.revoke_quote.message": "This action cannot be undone.",
   "confirmations.revoke_quote.title": "Remove post?",
+  "confirmations.unblock.confirm": "Unblock",
+  "confirmations.unblock.title": "Unblock {name}?",
   "confirmations.unfollow.confirm": "Unfollow",
-  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
-  "confirmations.unfollow.title": "Unfollow user?",
+  "confirmations.unfollow.title": "Unfollow {name}?",
+  "confirmations.withdraw_request.confirm": "Withdraw request",
+  "confirmations.withdraw_request.title": "Withdraw request to follow {name}?",
   "content_warning.hide": "Hide post",
   "content_warning.show": "Show anyway",
   "content_warning.show_more": "Show more",
@@ -920,6 +923,8 @@
   "status.quote_private": "Private posts cannot be quoted",
   "status.quotes": "{count, plural, one {quote} other {quotes}}",
   "status.quotes.empty": "No one has quoted this post yet. When someone does, it will show up here.",
+  "status.quotes.local_other_disclaimer": "Quotes rejected by the author will not be shown.",
+  "status.quotes.remote_other_disclaimer": "Only quotes from {domain} are guaranteed to be shown here. Quotes rejected by the author will not be shown.",
   "status.read_more": "Read more",
   "status.reblog": "Boost",
   "status.reblog_or_quote": "Boost or quote",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index a1f2185528..6ce220a538 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -248,8 +248,6 @@
   "confirmations.revoke_quote.message": "Ĉi tiu ago ne povas esti malfarita.",
   "confirmations.revoke_quote.title": "Ĉu forigi afiŝon?",
   "confirmations.unfollow.confirm": "Ne plu sekvi",
-  "confirmations.unfollow.message": "Ĉu vi certas, ke vi volas ĉesi sekvi {name}?",
-  "confirmations.unfollow.title": "Ĉu ĉesi sekvi uzanton?",
   "content_warning.hide": "Kaŝi afiŝon",
   "content_warning.show": "Montri ĉiukaze",
   "content_warning.show_more": "Montri pli",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 8f49351a91..485ac9036a 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -257,9 +257,12 @@
   "confirmations.revoke_quote.confirm": "Eliminar mensaje",
   "confirmations.revoke_quote.message": "Esta acción no se puede deshacer.",
   "confirmations.revoke_quote.title": "¿Eliminar mensaje?",
+  "confirmations.unblock.confirm": "Desbloquear",
+  "confirmations.unblock.title": "¿Desbloquear a {name}?",
   "confirmations.unfollow.confirm": "Dejar de seguir",
-  "confirmations.unfollow.message": "¿Estás seguro que querés dejar de seguir a {name}?",
-  "confirmations.unfollow.title": "¿Dejar de seguir al usuario?",
+  "confirmations.unfollow.title": "¿Dejar de seguir a {name}?",
+  "confirmations.withdraw_request.confirm": "Retirar solicitud",
+  "confirmations.withdraw_request.title": "¿Retirar solicitud de seguimiento a {name}?",
   "content_warning.hide": "Ocultar mensaje",
   "content_warning.show": "Mostrar de todos modos",
   "content_warning.show_more": "Mostrar más",
@@ -920,6 +923,8 @@
   "status.quote_private": "No se pueden citar los mensajes privados",
   "status.quotes": "{count, plural, one {# voto} other {# votos}}",
   "status.quotes.empty": "Todavía nadie citó este mensaje. Cuando alguien lo haga, se mostrará acá.",
+  "status.quotes.local_other_disclaimer": "Las citas rechazadas por el autor no se mostrarán.",
+  "status.quotes.remote_other_disclaimer": "Solo se muestran las citas de {domain}. Las citas rechazadas por el autor no se mostrarán.",
   "status.read_more": "Leé más",
   "status.reblog": "Adherir",
   "status.reblog_or_quote": "Adherir o citar",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index d06d67c4d8..3875b0187d 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -257,9 +257,12 @@
   "confirmations.revoke_quote.confirm": "Eliminar publicación",
   "confirmations.revoke_quote.message": "Esta acción no se puede deshacer.",
   "confirmations.revoke_quote.title": "¿Deseas eliminar la publicación?",
+  "confirmations.unblock.confirm": "Desbloquear",
+  "confirmations.unblock.title": "¿Desbloquear a {name}?",
   "confirmations.unfollow.confirm": "Dejar de seguir",
-  "confirmations.unfollow.message": "¿Estás seguro de que quieres dejar de seguir a {name}?",
-  "confirmations.unfollow.title": "¿Dejar de seguir al usuario?",
+  "confirmations.unfollow.title": "¿Dejar de seguir a {name}?",
+  "confirmations.withdraw_request.confirm": "Retirar solicitud",
+  "confirmations.withdraw_request.title": "¿Retirar solicitud de seguimiento a {name}?",
   "content_warning.hide": "Ocultar publicación",
   "content_warning.show": "Mostrar de todos modos",
   "content_warning.show_more": "Mostrar más",
@@ -920,6 +923,8 @@
   "status.quote_private": "Las publicaciones privadas no pueden citarse",
   "status.quotes": "{count, plural,one {cita} other {citas}}",
   "status.quotes.empty": "Nadie ha citado esta publicación todavía. Cuando alguien lo haga, aparecerá aquí.",
+  "status.quotes.local_other_disclaimer": "Las citas rechazadas por el autor no se mostrarán.",
+  "status.quotes.remote_other_disclaimer": "Solo se muestran las citas de {domain}. Las citas rechazadas por el autor no se mostrarán.",
   "status.read_more": "Leer más",
   "status.reblog": "Impulsar",
   "status.reblog_or_quote": "Impulsar o citar",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 9d1f34c91b..3123f55b85 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -257,9 +257,12 @@
   "confirmations.revoke_quote.confirm": "Eliminar publicación",
   "confirmations.revoke_quote.message": "Esta acción no tiene vuelta atrás.",
   "confirmations.revoke_quote.title": "¿Eliminar la publicación?",
+  "confirmations.unblock.confirm": "Desbloquear",
+  "confirmations.unblock.title": "¿Desbloquear a {name}?",
   "confirmations.unfollow.confirm": "Dejar de seguir",
-  "confirmations.unfollow.message": "¿Seguro que quieres dejar de seguir a {name}?",
-  "confirmations.unfollow.title": "¿Dejar de seguir al usuario?",
+  "confirmations.unfollow.title": "¿Dejar de seguir a {name}?",
+  "confirmations.withdraw_request.confirm": "Retirar solicitud",
+  "confirmations.withdraw_request.title": "¿Retirar solicitud de seguimiento a {name}?",
   "content_warning.hide": "Ocultar publicación",
   "content_warning.show": "Mostrar de todos modos",
   "content_warning.show_more": "Mostrar más",
@@ -920,6 +923,8 @@
   "status.quote_private": "Las publicaciones privadas no pueden ser citadas",
   "status.quotes": "{count, plural,one {cita} other {citas}}",
   "status.quotes.empty": "Nadie ha citado esta publicación todavía. Cuando alguien lo haga, aparecerá aquí.",
+  "status.quotes.local_other_disclaimer": "Las citas rechazadas por el autor no se mostrarán.",
+  "status.quotes.remote_other_disclaimer": "Solo se muestran las citas de {domain}. Las citas rechazadas por el autor no se mostrarán.",
   "status.read_more": "Leer más",
   "status.reblog": "Impulsar",
   "status.reblog_or_quote": "Impulsar o citar",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index 1811f7b939..9175a6cc29 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -258,8 +258,6 @@
   "confirmations.revoke_quote.message": "Seda tegevust ei saa tagasi pöörata.",
   "confirmations.revoke_quote.title": "Kas eemaldame postituse?",
   "confirmations.unfollow.confirm": "Ära jälgi",
-  "confirmations.unfollow.message": "Oled kindel, et ei soovi rohkem jälgida kasutajat {name}?",
-  "confirmations.unfollow.title": "Ei jälgi enam kasutajat?",
   "content_warning.hide": "Peida postitus",
   "content_warning.show": "Näita ikkagi",
   "content_warning.show_more": "Näita rohkem",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index f4101a5ba0..945ae1cd27 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -240,8 +240,6 @@
   "confirmations.remove_from_followers.message": "{name}-k zu jarraitzeari utziko dio. Seguru zaude jarraitu nahi duzula?",
   "confirmations.remove_from_followers.title": "Jarraitzailea kendu nahi duzu?",
   "confirmations.unfollow.confirm": "Utzi jarraitzeari",
-  "confirmations.unfollow.message": "Ziur {name} jarraitzeari utzi nahi diozula?",
-  "confirmations.unfollow.title": "Erabiltzailea jarraitzeari utzi?",
   "content_warning.hide": "Tuta ezkutatu",
   "content_warning.show": "Erakutsi hala ere",
   "content_warning.show_more": "Erakutsi gehiago",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index 91afee6e24..48d686a4d6 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -248,8 +248,6 @@
   "confirmations.revoke_quote.message": "این اقدام قابل بازگشت نیست.",
   "confirmations.revoke_quote.title": "آیا فرسته را حذف کنم؟",
   "confirmations.unfollow.confirm": "پی‌نگرفتن",
-  "confirmations.unfollow.message": "مطمئنید که می‌خواهید به پی‌گیری از {name} پایان دهید؟",
-  "confirmations.unfollow.title": "ناپی‌گیری کاربر؟",
   "content_warning.hide": "نهفتن فرسته",
   "content_warning.show": "در هر صورت نشان داده شود",
   "content_warning.show_more": "نمایش بیش‌تر",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 553727da95..27b5c209e6 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -257,9 +257,12 @@
   "confirmations.revoke_quote.confirm": "Poista julkaisu",
   "confirmations.revoke_quote.message": "Tätä toimea ei voi peruuttaa.",
   "confirmations.revoke_quote.title": "Poistetaanko julkaisu?",
+  "confirmations.unblock.confirm": "Kumoa esto",
+  "confirmations.unblock.title": "Kumotaanko käyttäjän {name} esto?",
   "confirmations.unfollow.confirm": "Lopeta seuraaminen",
-  "confirmations.unfollow.message": "Haluatko varmasti lopettaa profiilin {name} seuraamisen?",
-  "confirmations.unfollow.title": "Lopetetaanko käyttäjän seuraaminen?",
+  "confirmations.unfollow.title": "Lopetetaanko käyttäjän {name} seuraaminen?",
+  "confirmations.withdraw_request.confirm": "Peruuta pyyntö",
+  "confirmations.withdraw_request.title": "Peruutetaanko pyyntö seurata käyttäjää {name}?",
   "content_warning.hide": "Piilota julkaisu",
   "content_warning.show": "Näytä kuitenkin",
   "content_warning.show_more": "Näytä lisää",
@@ -920,6 +923,8 @@
   "status.quote_private": "Yksityisiä julkaisuja ei voi lainata",
   "status.quotes": "{count, plural, one {lainaus} other {lainausta}}",
   "status.quotes.empty": "Kukaan ei ole vielä lainannut tätä julkaisua. Kun joku tekee niin, se tulee tähän näkyviin.",
+  "status.quotes.local_other_disclaimer": "Tekijän hylkäämiä lainauksia ei näytetä.",
+  "status.quotes.remote_other_disclaimer": "Vain palvelimen {domain} lainaukset näkyvät taatusti tässä. Tekijän hylkäämiä lainauksia ei näytetä.",
   "status.read_more": "Näytä enemmän",
   "status.reblog": "Tehosta",
   "status.reblog_or_quote": "Tehosta tai lainaa",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index 7b956dc38a..52a385e952 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -258,8 +258,6 @@
   "confirmations.revoke_quote.message": "Hendan atgerðin kann ikki angrast.",
   "confirmations.revoke_quote.title": "Strika post?",
   "confirmations.unfollow.confirm": "Fylg ikki",
-  "confirmations.unfollow.message": "Ert tú vís/ur í, at tú vil steðga við at fylgja {name}?",
-  "confirmations.unfollow.title": "Gevst at fylgja brúkara?",
   "content_warning.hide": "Fjal post",
   "content_warning.show": "Vís kortini",
   "content_warning.show_more": "Vís meiri",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index 81ea95a974..63e8fdf2ab 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -252,8 +252,6 @@
   "confirmations.revoke_quote.message": "Cette action ne peut pas être annulée.",
   "confirmations.revoke_quote.title": "Retirer la publication ?",
   "confirmations.unfollow.confirm": "Ne plus suivre",
-  "confirmations.unfollow.message": "Voulez-vous vraiment arrêter de suivre {name}?",
-  "confirmations.unfollow.title": "Se désabonner de l'utilisateur·rice ?",
   "content_warning.hide": "Masquer le message",
   "content_warning.show": "Montrer quand même",
   "content_warning.show_more": "Montrer plus",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 4ecfcfab7f..e16e177ca4 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -252,8 +252,6 @@
   "confirmations.revoke_quote.message": "Cette action ne peut pas être annulée.",
   "confirmations.revoke_quote.title": "Retirer la publication ?",
   "confirmations.unfollow.confirm": "Ne plus suivre",
-  "confirmations.unfollow.message": "Voulez-vous vraiment vous désabonner de {name} ?",
-  "confirmations.unfollow.title": "Se désabonner de l'utilisateur·rice ?",
   "content_warning.hide": "Masquer le message",
   "content_warning.show": "Montrer quand même",
   "content_warning.show_more": "Montrer plus",
diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json
index cb68231583..032cdd870f 100644
--- a/app/javascript/mastodon/locales/fy.json
+++ b/app/javascript/mastodon/locales/fy.json
@@ -245,8 +245,6 @@
   "confirmations.remove_from_followers.message": "{name} sil jo net mear folgje. Binne jo wis dat jo trochgean wolle?",
   "confirmations.remove_from_followers.title": "Folger fuortsmite?",
   "confirmations.unfollow.confirm": "Net mear folgje",
-  "confirmations.unfollow.message": "Binne jo wis dat jo {name} net mear folgje wolle?",
-  "confirmations.unfollow.title": "Brûker net mear folgje?",
   "content_warning.hide": "Berjocht ferstopje",
   "content_warning.show": "Dochs toane",
   "content_warning.show_more": "Mear toane",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index 5a25ef9f47..cec7a6e8f3 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -258,8 +258,6 @@
   "confirmations.revoke_quote.message": "Ní féidir an gníomh seo a chealú.",
   "confirmations.revoke_quote.title": "Bain postáil?",
   "confirmations.unfollow.confirm": "Ná lean",
-  "confirmations.unfollow.message": "An bhfuil tú cinnte gur mhaith leat {name} a dhíleanúint?",
-  "confirmations.unfollow.title": "Dílean ​​an t-úsáideoir?",
   "content_warning.hide": "Folaigh postáil",
   "content_warning.show": "Taispeáin ar aon nós",
   "content_warning.show_more": "Taispeáin níos mó",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index 4c3ab7d2a5..b677f8ec50 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -252,8 +252,6 @@
   "confirmations.revoke_quote.message": "Cha ghabh seo a neo-dhèanamh.",
   "confirmations.revoke_quote.title": "A bheil thu airson am post a thoirt air falbh?",
   "confirmations.unfollow.confirm": "Na lean tuilleadh",
-  "confirmations.unfollow.message": "A bheil thu cinnteach nach eil thu airson {name} a leantainn tuilleadh?",
-  "confirmations.unfollow.title": "A bheil thu airson sgur de leantainn a chleachdaiche?",
   "content_warning.hide": "Falaich am post",
   "content_warning.show": "Seall e co-dhiù",
   "content_warning.show_more": "Seall barrachd dheth",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 3f20dfb82d..a7e1cfd8c3 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -257,9 +257,12 @@
   "confirmations.revoke_quote.confirm": "Eliminar publicación",
   "confirmations.revoke_quote.message": "Esta acción non se pode desfacer.",
   "confirmations.revoke_quote.title": "Eliminar publicación?",
+  "confirmations.unblock.confirm": "Desbloquear",
+  "confirmations.unblock.title": "Desbloquear a {name}?",
   "confirmations.unfollow.confirm": "Deixar de seguir",
-  "confirmations.unfollow.message": "Tes certeza de querer deixar de seguir a {name}?",
-  "confirmations.unfollow.title": "Deixar de seguir á usuaria?",
+  "confirmations.unfollow.title": "Deixa de seguir a {name}?",
+  "confirmations.withdraw_request.confirm": "Retirar solicitude",
+  "confirmations.withdraw_request.title": "Retirar a petición de seguimento para {name}?",
   "content_warning.hide": "Agochar publicación",
   "content_warning.show": "Mostrar igualmente",
   "content_warning.show_more": "Mostrar máis",
@@ -920,6 +923,8 @@
   "status.quote_private": "As publicacións privadas non se poden citar",
   "status.quotes": "{count, plural, one {cita} other {citas}}",
   "status.quotes.empty": "Aínda ninguén citou esta publicación. Cando alguén o faga aparecerá aquí.",
+  "status.quotes.local_other_disclaimer": "Non se mostrarán as citas rexeitadas pola autora.",
+  "status.quotes.remote_other_disclaimer": "Só se garante que se mostren as citas do dominio {domain}. Non se mostrarán as citas rexeitadas pola persoa autora.",
   "status.read_more": "Ler máis",
   "status.reblog": "Promover",
   "status.reblog_or_quote": "Promover ou citar",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index e7839cdea5..f67ee0fd69 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -257,9 +257,12 @@
   "confirmations.revoke_quote.confirm": "הסרת הודעה",
   "confirmations.revoke_quote.message": "פעולה זו אינה הפיכה.",
   "confirmations.revoke_quote.title": "הסרת הודעה?",
+  "confirmations.unblock.confirm": "הסרת חסימה",
+  "confirmations.unblock.title": "הסרת חסימה מ־{name}?",
   "confirmations.unfollow.confirm": "הפסקת מעקב",
-  "confirmations.unfollow.message": "להפסיק מעקב אחרי {name}?",
-  "confirmations.unfollow.title": "לבטל מעקב אחר המשתמש.ת?",
+  "confirmations.unfollow.title": "בטול מעקב אחרי {name}?",
+  "confirmations.withdraw_request.confirm": "משיכת בקשה",
+  "confirmations.withdraw_request.title": "משיכת בקשת מעקב אחרי {name}?",
   "content_warning.hide": "הסתרת חיצרוץ",
   "content_warning.show": "להציג בכל זאת",
   "content_warning.show_more": "הצג עוד",
@@ -920,6 +923,8 @@
   "status.quote_private": "הודעות פרטיות לא ניתנות לציטוט",
   "status.quotes": "{count, plural,one {ציטוט}other {ציטוטים}}",
   "status.quotes.empty": "עוד לא ציטטו את ההודעה הזו. כאשר זה יקרה, הציטוטים יופיעו כאן.",
+  "status.quotes.local_other_disclaimer": "ציטוטים שיידחו על ידי המחברים המקוריים לא יוצגו.",
+  "status.quotes.remote_other_disclaimer": "רק ציטוטים מהשרת {domain} מובטחים שיופיעו פה. ציטוטים שנדחו על ידי המצוטטים לא יופיעו.",
   "status.read_more": "לקרוא עוד",
   "status.reblog": "הדהוד",
   "status.reblog_or_quote": "להדהד או לצטט",
diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json
index bc71c80068..63c9be8a8d 100644
--- a/app/javascript/mastodon/locales/hi.json
+++ b/app/javascript/mastodon/locales/hi.json
@@ -168,7 +168,6 @@
   "confirmations.redraft.confirm": "मिटायें और पुनःप्रारूपण करें",
   "confirmations.redraft.message": "क्या आप वाकई इस स्टेटस को हटाना चाहते हैं और इसे फिर से ड्राफ्ट करना चाहते हैं? पसंदीदा और बूस्ट खो जाएंगे, और मूल पोस्ट के उत्तर अनाथ हो जाएंगे।",
   "confirmations.unfollow.confirm": "अनफॉलो करें",
-  "confirmations.unfollow.message": "क्या आप वाकई {name} को अनफॉलो करना चाहते हैं?",
   "conversation.delete": "वार्तालाप हटाएँ",
   "conversation.mark_as_read": "पढ़ा गया के रूप में चिह्नित करें",
   "conversation.open": "वार्तालाप देखें",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index 0cde3da84b..3f8842d91f 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -146,7 +146,6 @@
   "confirmations.mute.confirm": "Utišaj",
   "confirmations.redraft.confirm": "Izbriši i ponovno uredi",
   "confirmations.unfollow.confirm": "Prestani pratiti",
-  "confirmations.unfollow.message": "Jeste li sigurni da želite prestati pratiti {name}?",
   "conversation.delete": "Izbriši razgovor",
   "conversation.mark_as_read": "Označi kao pročitano",
   "conversation.open": "Prikaži razgovor",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 1d3764e8e8..1aba0615b4 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -252,8 +252,6 @@
   "confirmations.revoke_quote.message": "Ez a művelet nem vonható vissza.",
   "confirmations.revoke_quote.title": "Bejegyzés eltávolítása?",
   "confirmations.unfollow.confirm": "Követés visszavonása",
-  "confirmations.unfollow.message": "Biztos, hogy vissza szeretnéd vonni {name} követését?",
-  "confirmations.unfollow.title": "Megszünteted a felhasználó követését?",
   "content_warning.hide": "Bejegyzés elrejtése",
   "content_warning.show": "Megjelenítés mindenképp",
   "content_warning.show_more": "Több megjelenítése",
diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json
index bd9fd71c23..0c77efd6cd 100644
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@@ -124,7 +124,6 @@
   "confirmations.mute.confirm": "Լռեցնել",
   "confirmations.redraft.confirm": "Ջնջել եւ խմբագրել նորից",
   "confirmations.unfollow.confirm": "Ապահետեւել",
-  "confirmations.unfollow.message": "Վստա՞հ ես, որ ուզում ես այլեւս չհետեւել {name}֊ին։",
   "conversation.delete": "Ջնջել խօսակցութիւնը",
   "conversation.mark_as_read": "Նշել որպէս ընթերցուած",
   "conversation.open": "Դիտել խօսակցութիւնը",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index f9325b623c..50b836ad62 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -258,8 +258,6 @@
   "confirmations.revoke_quote.message": "Iste action non pote esser disfacite.",
   "confirmations.revoke_quote.title": "Remover message?",
   "confirmations.unfollow.confirm": "Non plus sequer",
-  "confirmations.unfollow.message": "Es tu secur que tu vole cessar de sequer {name}?",
-  "confirmations.unfollow.title": "Cessar de sequer le usator?",
   "content_warning.hide": "Celar le message",
   "content_warning.show": "Monstrar in omne caso",
   "content_warning.show_more": "Monstrar plus",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index 253a9d93c4..c8d7d8ef00 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -189,8 +189,6 @@
   "confirmations.redraft.message": "Apakah anda yakin ingin menghapus postingan ini dan menyusun ulang postingan ini? Favorit dan peningkatan akan hilang, dan balasan ke postingan asli tidak akan terhubung ke postingan manapun.",
   "confirmations.redraft.title": "Delete & redraft post?",
   "confirmations.unfollow.confirm": "Berhenti mengikuti",
-  "confirmations.unfollow.message": "Apakah Anda ingin berhenti mengikuti {name}?",
-  "confirmations.unfollow.title": "Unfollow user?",
   "content_warning.hide": "Hide post",
   "content_warning.show": "Show anyway",
   "conversation.delete": "Hapus percakapan",
diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json
index bbb85ee2ad..e978cfafc4 100644
--- a/app/javascript/mastodon/locales/ie.json
+++ b/app/javascript/mastodon/locales/ie.json
@@ -168,7 +168,6 @@
   "confirmations.redraft.confirm": "Deleter & redacter",
   "confirmations.redraft.message": "Esque tu vermen vole deleter ti-ci posta e redacter it? Favorites e boosts va esser perdit, e responses al posta original va esser orfanat.",
   "confirmations.unfollow.confirm": "Dessequer",
-  "confirmations.unfollow.message": "Esque tu vermen vole dessequer {name}?",
   "conversation.delete": "Deleter conversation",
   "conversation.mark_as_read": "Marcar quam leet",
   "conversation.open": "Vider conversation",
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index 15c10af863..0779589706 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -218,8 +218,6 @@
   "confirmations.redraft.message": "Ka vu certe volas efacar ca posto e riskisigar ol? Favoriziti e repeti esos perdita, e respondi al posto originala esos orfanigita.",
   "confirmations.redraft.title": "Ka efacar & riskisar posto?",
   "confirmations.unfollow.confirm": "Desequez",
-  "confirmations.unfollow.message": "Ka vu certe volas desequar {name}?",
-  "confirmations.unfollow.title": "Ka dessequar uzanto?",
   "content_warning.hide": "Celez posto",
   "content_warning.show": "Montrez nur",
   "content_warning.show_more": "Montrar plu",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index 012b3c313e..4dbdee7c8c 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -257,9 +257,12 @@
   "confirmations.revoke_quote.confirm": "Fjarlægja færslu",
   "confirmations.revoke_quote.message": "Þessa aðgerð er ekki hægt að afturkalla.",
   "confirmations.revoke_quote.title": "Fjarlægja færslu?",
+  "confirmations.unblock.confirm": "Aflétta útilokun",
+  "confirmations.unblock.title": "Aflétta útilokun á {name}?",
   "confirmations.unfollow.confirm": "Hætta að fylgja",
-  "confirmations.unfollow.message": "Ertu viss um að þú viljir hætta að fylgjast með {name}?",
-  "confirmations.unfollow.title": "Hætta að fylgjast með viðkomandi?",
+  "confirmations.unfollow.title": "Hætta að fylgjast með {name}?",
+  "confirmations.withdraw_request.confirm": "Taka beiðni til baka",
+  "confirmations.withdraw_request.title": "Taka aftur beiðni um að fylgjast með {name}?",
   "content_warning.hide": "Fela færslu",
   "content_warning.show": "Birta samt",
   "content_warning.show_more": "Sýna meira",
@@ -920,6 +923,8 @@
   "status.quote_private": "Ekki er hægt að vitna í einkafærslur",
   "status.quotes": "{count, plural, one {tilvitnun} other {tilvitnanir}}",
   "status.quotes.empty": "Enginn hefur ennþá vitnað í þessa færslu. Þegar einhver gerir það, mun það birtast hér.",
+  "status.quotes.local_other_disclaimer": "Tilvitnanir sem höfundur hafnar verða ekki birtar.",
+  "status.quotes.remote_other_disclaimer": "Aðeins tilvitnanir frá {domain} munu birtast hér. Tilvitnanir sem höfundur hafnar verða ekki birtar.",
   "status.read_more": "Lesa meira",
   "status.reblog": "Endurbirting",
   "status.reblog_or_quote": "Endurbirta eða vitna í færslu",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index aa5f47a4c1..af4b5d4866 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -252,8 +252,6 @@
   "confirmations.revoke_quote.message": "Questa azione non può essere annullata.",
   "confirmations.revoke_quote.title": "Rimuovere il post?",
   "confirmations.unfollow.confirm": "Smetti di seguire",
-  "confirmations.unfollow.message": "Sei sicuro di voler smettere di seguire {name}?",
-  "confirmations.unfollow.title": "Smettere di seguire l'utente?",
   "content_warning.hide": "Nascondi post",
   "content_warning.show": "Mostra comunque",
   "content_warning.show_more": "Mostra di più",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 6acfbac133..ee4cc5c7b3 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -248,8 +248,6 @@
   "confirmations.revoke_quote.confirm": "投稿を削除",
   "confirmations.revoke_quote.title": "投稿を削除しますか?",
   "confirmations.unfollow.confirm": "フォロー解除",
-  "confirmations.unfollow.message": "本当に{name}さんのフォローを解除しますか？",
-  "confirmations.unfollow.title": "フォローを解除しようとしています",
   "content_warning.hide": "内容を隠す",
   "content_warning.show": "承知して表示",
   "content_warning.show_more": "続きを表示",
diff --git a/app/javascript/mastodon/locales/ka.json b/app/javascript/mastodon/locales/ka.json
index a6a3758a0b..2b495ab0b1 100644
--- a/app/javascript/mastodon/locales/ka.json
+++ b/app/javascript/mastodon/locales/ka.json
@@ -71,7 +71,6 @@
   "confirmations.mute.confirm": "დადუმება",
   "confirmations.redraft.confirm": "გაუქმება და გადანაწილება",
   "confirmations.unfollow.confirm": "ნუღარ მიჰყვები",
-  "confirmations.unfollow.message": "დარწმუნებული ხართ, აღარ გსურთ მიჰყვებოდეთ {name}-ს?",
   "embed.instructions": "ეს სტატუსი ჩასვით თქვენს ვებ-საიტზე შემდეგი კოდის კოპირებით.",
   "embed.preview": "ესაა თუ როგორც გამოჩნდება:",
   "emoji_button.activity": "აქტივობა",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index d508320d3b..0add265b63 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -194,7 +194,6 @@
   "confirmations.revoke_quote.confirm": "Kkes tasuffeɣt",
   "confirmations.revoke_quote.title": "Kkes tasuffeɣt?",
   "confirmations.unfollow.confirm": "Ur ḍḍafaṛ ara",
-  "confirmations.unfollow.message": "Tetḥeqqeḍ belli tebɣiḍ ur teṭafaṛeḍ ara {name}?",
   "content_warning.hide": "Ffer tasuffeɣt",
   "content_warning.show": "Ssken-d akken tebɣu tili",
   "content_warning.show_more": "Sken-d ugar",
diff --git a/app/javascript/mastodon/locales/kk.json b/app/javascript/mastodon/locales/kk.json
index c549bddd3f..8e29c3fbee 100644
--- a/app/javascript/mastodon/locales/kk.json
+++ b/app/javascript/mastodon/locales/kk.json
@@ -140,7 +140,6 @@
   "confirmations.mute.confirm": "Үнсіз қылу",
   "confirmations.redraft.confirm": "Өшіруді құптау",
   "confirmations.unfollow.confirm": "Оқымау",
-  "confirmations.unfollow.message": "\"{name} атты қолданушыға енді жазылғыңыз келмей ме?",
   "conversation.delete": "Пікірталасты өшіру",
   "conversation.mark_as_read": "Оқылды деп белгіле",
   "conversation.open": "Пікірталасты қарау",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 0a20036907..f468179454 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -252,8 +252,6 @@
   "confirmations.revoke_quote.message": "이 작업은 되돌릴 수 없습니다.",
   "confirmations.revoke_quote.title": "게시물을 지울까요?",
   "confirmations.unfollow.confirm": "팔로우 해제",
-  "confirmations.unfollow.message": "정말로 {name} 님을 팔로우 해제하시겠습니까?",
-  "confirmations.unfollow.title": "사용자를 언팔로우 할까요?",
   "content_warning.hide": "게시물 숨기기",
   "content_warning.show": "무시하고 보기",
   "content_warning.show_more": "더 보기",
diff --git a/app/javascript/mastodon/locales/ku.json b/app/javascript/mastodon/locales/ku.json
index a6a9a8f1e0..d641c89623 100644
--- a/app/javascript/mastodon/locales/ku.json
+++ b/app/javascript/mastodon/locales/ku.json
@@ -169,7 +169,6 @@
   "confirmations.redraft.confirm": "Jê bibe & ji nû ve serrast bike",
   "confirmations.redraft.message": "Bi rastî tu dixwazî şandî ye jê bibî û ji nû ve reşnivîsek çê bikî? Bijarte û şandî wê wenda bibin û bersivên ji bo şandiyê resen wê sêwî bimînin.",
   "confirmations.unfollow.confirm": "Neşopîne",
-  "confirmations.unfollow.message": "Ma tu dixwazî ku dev ji şopa {name} berdî?",
   "content_warning.show_more": "Bêtir nîşan bide",
   "conversation.delete": "Axaftinê jê bibe",
   "conversation.mark_as_read": "Wekî xwendî nîşan bide",
diff --git a/app/javascript/mastodon/locales/kw.json b/app/javascript/mastodon/locales/kw.json
index 6af6652a54..d21d75c182 100644
--- a/app/javascript/mastodon/locales/kw.json
+++ b/app/javascript/mastodon/locales/kw.json
@@ -86,7 +86,6 @@
   "confirmations.mute.confirm": "Tawhe",
   "confirmations.redraft.confirm": "Dilea & daskynskrifa",
   "confirmations.unfollow.confirm": "Anholya",
-  "confirmations.unfollow.message": "Owgh hwi sur a vynnes anholya {name}?",
   "conversation.delete": "Dilea kesklapp",
   "conversation.mark_as_read": "Merkya vel redys",
   "conversation.open": "Gweles kesklapp",
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index d8d0a06718..147e362f3b 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -214,8 +214,6 @@
   "confirmations.revoke_quote.confirm": "Kita puvlikasyon",
   "confirmations.revoke_quote.title": "Kitar puvlikasyon?",
   "confirmations.unfollow.confirm": "Desige",
-  "confirmations.unfollow.message": "Estas siguro ke keres deshar de segir a {name}?",
-  "confirmations.unfollow.title": "Desige utilizador?",
   "content_warning.hide": "Eskonde puvlikasyon",
   "content_warning.show": "Amostra entanto",
   "content_warning.show_more": "Amostra mas",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index f02af533fd..bf13549d46 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -232,8 +232,6 @@
   "confirmations.remove_from_followers.message": "{name} nustos jus sekti. Ar tikrai norite tęsti?",
   "confirmations.remove_from_followers.title": "Šalinti sekėją?",
   "confirmations.unfollow.confirm": "Nebesekti",
-  "confirmations.unfollow.message": "Ar tikrai nori nebesekti {name}?",
-  "confirmations.unfollow.title": "Nebesekti naudotoją?",
   "content_warning.hide": "Slėpti įrašą",
   "content_warning.show": "Rodyti vis tiek",
   "content_warning.show_more": "Rodyti daugiau",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index eb0a6cbe8a..9d289c5c53 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -243,8 +243,6 @@
   "confirmations.revoke_quote.message": "Šo darbību nevar atsaukt.",
   "confirmations.revoke_quote.title": "Noņemt ierakstu?",
   "confirmations.unfollow.confirm": "Pārstāt sekot",
-  "confirmations.unfollow.message": "Vai tiešam vairs nevēlies sekot lietotājam {name}?",
-  "confirmations.unfollow.title": "Pārtraukt sekošanu lietotājam?",
   "content_warning.hide": "Paslēpt ierakstu",
   "content_warning.show": "Tomēr rādīt",
   "content_warning.show_more": "Rādīt vairāk",
diff --git a/app/javascript/mastodon/locales/mk.json b/app/javascript/mastodon/locales/mk.json
index 83153d4d73..21f7d2d5d0 100644
--- a/app/javascript/mastodon/locales/mk.json
+++ b/app/javascript/mastodon/locales/mk.json
@@ -82,7 +82,6 @@
   "confirmations.logout.message": "Дали сте сигурни дека сакате да се одјавите?",
   "confirmations.mute.confirm": "Заќути",
   "confirmations.unfollow.confirm": "Одследи",
-  "confirmations.unfollow.message": "Сигурни сте дека ќе го отследите {name}?",
   "conversation.delete": "Избриши разговор",
   "conversation.mark_as_read": "Означете како прочитано",
   "conversation.open": "Прегледај разговор",
diff --git a/app/javascript/mastodon/locales/ml.json b/app/javascript/mastodon/locales/ml.json
index 16c183b492..017ef1ce3f 100644
--- a/app/javascript/mastodon/locales/ml.json
+++ b/app/javascript/mastodon/locales/ml.json
@@ -139,7 +139,6 @@
   "confirmations.mute.confirm": "നിശ്ശബ്ദമാക്കുക",
   "confirmations.redraft.confirm": "മായിച്ച് മാറ്റങ്ങൾ വരുത്തി വീണ്ടും എഴുതുക",
   "confirmations.unfollow.confirm": "പിന്തുടരുന്നത് നിര്‍ത്തുക",
-  "confirmations.unfollow.message": "നിങ്ങൾ {name} യെ പിന്തുടരുന്നത് നിർത്തുവാൻ തീർച്ചയായും തീരുമാനിച്ചുവോ?",
   "conversation.delete": "സംഭാഷണം മായിക്കുക",
   "conversation.mark_as_read": "വായിച്ചതായി അടയാളപ്പെടുത്തുക",
   "conversation.open": "സംഭാഷണം കാണുക",
diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json
index da72a2fc14..1530736f65 100644
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@@ -222,8 +222,6 @@
   "confirmations.redraft.message": "Adakah anda pasti anda ingin memadam hantaran ini dan gubal semula? Sukaan dan galakan akan hilang, dan balasan ke hantaran asal akan menjadi yatim.",
   "confirmations.redraft.title": "Padam & gubah semula hantaran?",
   "confirmations.unfollow.confirm": "Nyahikut",
-  "confirmations.unfollow.message": "Adakah anda pasti anda ingin nyahikuti {name}?",
-  "confirmations.unfollow.title": "Berhenti mengikut pengguna?",
   "content_warning.hide": "Sorok hantaran",
   "content_warning.show": "Tunjuk saja",
   "content_warning.show_more": "Tunjuk lebih",
diff --git a/app/javascript/mastodon/locales/my.json b/app/javascript/mastodon/locales/my.json
index 66af87dc62..56da51abe9 100644
--- a/app/javascript/mastodon/locales/my.json
+++ b/app/javascript/mastodon/locales/my.json
@@ -152,7 +152,6 @@
   "confirmations.redraft.confirm": "ဖျက်ပြီး ပြန်လည်ရေးမည်။",
   "confirmations.redraft.message": "သင် ဒီပိုစ့်ကိုဖျက်ပြီး ပြန်တည်းဖြတ်မှာ သေချာပြီလား။ ကြယ်ပွင့်​တွေ နဲ့ ပြန်မျှ​ဝေမှု​တွေကိုဆုံးရှုံးမည်။မူရင်းပို့စ်ဆီကို ပြန်စာ​တွေမှာလည်း​ \nပိုစ့်ကို​တွေ့ရမည်မဟုတ်​တော့ပါ။.",
   "confirmations.unfollow.confirm": "စောင့်ကြည့်ခြင်းအား ပယ်ဖျက်မည်",
-  "confirmations.unfollow.message": "{name} ကို စောင်ကြည့်ခြင်းအား ပယ်ဖျက်မည်မှာသေချာပါသလား။",
   "conversation.delete": "ဤစကားပြောဆိုမှုကို ဖျက်ပစ်မည်",
   "conversation.mark_as_read": "ဖတ်ပြီးသားအဖြစ်မှတ်ထားပါ",
   "conversation.open": "Conversation ကိုကြည့်မည်",
diff --git a/app/javascript/mastodon/locales/nan.json b/app/javascript/mastodon/locales/nan.json
index 0ee1958d5b..a4ffafbe5c 100644
--- a/app/javascript/mastodon/locales/nan.json
+++ b/app/javascript/mastodon/locales/nan.json
@@ -258,8 +258,6 @@
   "confirmations.revoke_quote.message": "Tsit ê動作bē當復原。",
   "confirmations.revoke_quote.title": "Kám beh thâi掉PO文？",
   "confirmations.unfollow.confirm": "取消跟tuè",
-  "confirmations.unfollow.message": "Lí kám確定無愛跟tuè {name}？",
-  "confirmations.unfollow.title": "Kám beh取消跟tuè tsit ê用者？",
   "content_warning.hide": "Am-khàm PO文",
   "content_warning.show": "Mā tio̍h顯示",
   "content_warning.show_more": "其他內容",
diff --git a/app/javascript/mastodon/locales/ne.json b/app/javascript/mastodon/locales/ne.json
index 297feb2ce1..c686ccfbb5 100644
--- a/app/javascript/mastodon/locales/ne.json
+++ b/app/javascript/mastodon/locales/ne.json
@@ -143,8 +143,6 @@
   "confirmations.redraft.confirm": "मेटाएर पुन: ड्राफ्ट गर्नुहोस्",
   "confirmations.redraft.title": "पोस्ट मेटाएर पुन: ड्राफ्ट गर्ने?",
   "confirmations.unfollow.confirm": "अनफलो गर्नुहोस्",
-  "confirmations.unfollow.message": "के तपाइँ पक्का हुनुहुन्छ कि तपाइँ {name}लाई अनफलो गर्न चाहनुहुन्छ?",
-  "confirmations.unfollow.title": "प्रयोगकर्तालाई अनफलो गर्ने?",
   "disabled_account_banner.account_settings": "खाता सेटिङहरू",
   "empty_column.direct": "तपाईंले अहिलेसम्म कुनै पनि प्राइवेट उल्लेखहरू प्राप्त गर्नुभएको छैन। तपाईंले कुनै प्राप्त गरेपछि त्यो यहाँ देखिनेछ।",
   "empty_column.follow_requests": "तपाईंले अहिलेसम्म कुनै पनि फलो अनुरोधहरू प्राप्त गर्नुभएको छैन। तपाईंले कुनै प्राप्त गरेपछि त्यो यहाँ देखिनेछ।",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 289b49c39b..54f14fde27 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -42,7 +42,7 @@
   "account.follow": "Volgen",
   "account.follow_back": "Terugvolgen",
   "account.follow_back_short": "Terugvolgen",
-  "account.follow_request": "Verzoeken om te volgen",
+  "account.follow_request": "Volgverzoek",
   "account.follow_request_cancel": "Verzoek annuleren",
   "account.follow_request_cancel_short": "Annuleren",
   "account.follow_request_short": "Verzoek",
@@ -257,9 +257,12 @@
   "confirmations.revoke_quote.confirm": "Bericht verwijderen",
   "confirmations.revoke_quote.message": "Deze actie kan niet ongedaan worden gemaakt.",
   "confirmations.revoke_quote.title": "Bericht verwijderen?",
+  "confirmations.unblock.confirm": "Deblokkeren",
+  "confirmations.unblock.title": "{name} deblokkeren?",
   "confirmations.unfollow.confirm": "Ontvolgen",
-  "confirmations.unfollow.message": "Weet je het zeker dat je {name} wilt ontvolgen?",
-  "confirmations.unfollow.title": "Gebruiker ontvolgen?",
+  "confirmations.unfollow.title": "{name} ontvolgen?",
+  "confirmations.withdraw_request.confirm": "Verzoek intrekken",
+  "confirmations.withdraw_request.title": "Verzoek intrekken om {name} te volgen?",
   "content_warning.hide": "Bericht verbergen",
   "content_warning.show": "Alsnog tonen",
   "content_warning.show_more": "Meer tonen",
@@ -920,6 +923,8 @@
   "status.quote_private": "Citeren van berichten aan alleen volgers is niet mogelijk",
   "status.quotes": "{count, plural, one {citaat} other {citaten}}",
   "status.quotes.empty": "Niemand heeft dit bericht nog geciteerd. Wanneer iemand dat doet, wordt dat hier getoond.",
+  "status.quotes.local_other_disclaimer": "Citaten afgewezen door de auteur worden niet getoond.",
+  "status.quotes.remote_other_disclaimer": "Alleen citaten van {domain} worden hier gegarandeerd weergegeven. Citaten afgewezen door de auteur worden niet getoond.",
   "status.read_more": "Meer lezen",
   "status.reblog": "Boosten",
   "status.reblog_or_quote": "Boosten of citeren",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index 4a38a01e78..f13b1297a7 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -252,8 +252,6 @@
   "confirmations.revoke_quote.message": "Du kan ikkje angra denne handlinga.",
   "confirmations.revoke_quote.title": "Fjern innlegget?",
   "confirmations.unfollow.confirm": "Slutt å fylgja",
-  "confirmations.unfollow.message": "Er du sikker på at du vil slutta å fylgja {name}?",
-  "confirmations.unfollow.title": "Slutt å fylgja brukaren?",
   "content_warning.hide": "Gøym innlegg",
   "content_warning.show": "Vis likevel",
   "content_warning.show_more": "Vis meir",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index 7c574e7d8c..2ef8a7085a 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -238,8 +238,6 @@
   "confirmations.remove_from_followers.message": "{name} vil ikke lenger følge deg. Er du sikker på at du vil fortsette?",
   "confirmations.remove_from_followers.title": "Fjern følger?",
   "confirmations.unfollow.confirm": "Slutt å følge",
-  "confirmations.unfollow.message": "Er du sikker på at du vil slutte å følge {name}?",
-  "confirmations.unfollow.title": "Slutt å følge bruker?",
   "content_warning.hide": "Skjul innlegg",
   "content_warning.show": "Vis likevel",
   "content_warning.show_more": "Vis mer",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index 87793d14fe..cdd109a715 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -152,7 +152,6 @@
   "confirmations.mute.confirm": "Rescondre",
   "confirmations.redraft.confirm": "Escafar & tornar formular",
   "confirmations.unfollow.confirm": "Quitar de sègre",
-  "confirmations.unfollow.message": "Volètz vertadièrament quitar de sègre {name} ?",
   "conversation.delete": "Suprimir la conversacion",
   "conversation.mark_as_read": "Marcar coma legida",
   "conversation.open": "Veire la conversacion",
diff --git a/app/javascript/mastodon/locales/pa.json b/app/javascript/mastodon/locales/pa.json
index 83614973fe..760dff557f 100644
--- a/app/javascript/mastodon/locales/pa.json
+++ b/app/javascript/mastodon/locales/pa.json
@@ -169,8 +169,6 @@
   "confirmations.remove_from_followers.confirm": "ਫ਼ਾਲੋਅਰ ਨੂੰ ਹਟਾਓ",
   "confirmations.remove_from_followers.title": "ਫ਼ਾਲੋਅਰ ਨੂੰ ਹਟਾਉਣਾ ਹੈ?",
   "confirmations.unfollow.confirm": "ਅਣ-ਫ਼ਾਲੋ",
-  "confirmations.unfollow.message": "ਕੀ ਤੁਸੀਂ {name} ਨੂੰ ਅਣ-ਫ਼ਾਲੋ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?",
-  "confirmations.unfollow.title": "ਵਰਤੋਂਕਾਰ ਨੂੰ ਅਣ-ਫ਼ਾਲੋ ਕਰਨਾ ਹੈ?",
   "content_warning.hide": "ਪੋਸਟ ਨੂੰ ਲੁਕਾਓ",
   "content_warning.show": "ਕਿਵੇਂ ਵੀ ਵੇਖਾਓ",
   "content_warning.show_more": "ਹੋਰ ਵੇਖਾਓ",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index ef6769d6f7..d121bea1ae 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -248,8 +248,6 @@
   "confirmations.revoke_quote.message": "Tej akcji nie można cofnąć.",
   "confirmations.revoke_quote.title": "Usuń post?",
   "confirmations.unfollow.confirm": "Nie obserwuj",
-  "confirmations.unfollow.message": "Czy na pewno nie chcesz obserwować {name}?",
-  "confirmations.unfollow.title": "Cofnąć obserwację?",
   "content_warning.hide": "Ukryj wpis",
   "content_warning.show": "Pokaż mimo to",
   "content_warning.show_more": "Pokaż więcej",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index fb3b403d45..5457e91dba 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -250,8 +250,6 @@
   "confirmations.revoke_quote.message": "Essa ação não pode ser desfeita.",
   "confirmations.revoke_quote.title": "Remover publicação?",
   "confirmations.unfollow.confirm": "Deixar de seguir",
-  "confirmations.unfollow.message": "Você tem certeza de que deseja deixar de seguir {name}?",
-  "confirmations.unfollow.title": "Deixar de seguir o usuário?",
   "content_warning.hide": "Ocultar post",
   "content_warning.show": "Mostrar mesmo assim",
   "content_warning.show_more": "Mostrar mais",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index 7646bd226d..751db6fdd4 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -258,8 +258,6 @@
   "confirmations.revoke_quote.message": "Esta ação é irreversível.",
   "confirmations.revoke_quote.title": "Remover publicação?",
   "confirmations.unfollow.confirm": "Deixar de seguir",
-  "confirmations.unfollow.message": "De certeza que queres deixar de seguir {name}?",
-  "confirmations.unfollow.title": "Deixar de seguir o utilizador?",
   "content_warning.hide": "Ocultar publicação",
   "content_warning.show": "Mostrar mesmo assim",
   "content_warning.show_more": "Mostrar mais",
diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json
index 9259226ee6..9bf8150ba0 100644
--- a/app/javascript/mastodon/locales/ro.json
+++ b/app/javascript/mastodon/locales/ro.json
@@ -177,7 +177,6 @@
   "confirmations.mute.confirm": "Ignoră",
   "confirmations.redraft.confirm": "Șterge și scrie din nou",
   "confirmations.unfollow.confirm": "Dezabonează-te",
-  "confirmations.unfollow.message": "Ești sigur că vrei să te dezabonezi de la {name}?",
   "conversation.delete": "Șterge conversația",
   "conversation.mark_as_read": "Marchează ca citit",
   "conversation.open": "Vizualizează conversația",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index e8c96ac25f..5571a68d76 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -252,8 +252,6 @@
   "confirmations.revoke_quote.message": "Это действие нельзя будет отменить.",
   "confirmations.revoke_quote.title": "Удалить публикацию?",
   "confirmations.unfollow.confirm": "Отписаться",
-  "confirmations.unfollow.message": "Вы уверены, что хотите отписаться от {name}?",
-  "confirmations.unfollow.title": "Отписаться?",
   "content_warning.hide": "Скрыть пост",
   "content_warning.show": "Всё равно показать",
   "content_warning.show_more": "Развернуть",
diff --git a/app/javascript/mastodon/locales/sa.json b/app/javascript/mastodon/locales/sa.json
index 1cd3cdb616..e7352f1c80 100644
--- a/app/javascript/mastodon/locales/sa.json
+++ b/app/javascript/mastodon/locales/sa.json
@@ -136,7 +136,6 @@
   "confirmations.mute.confirm": "निःशब्दम्",
   "confirmations.redraft.confirm": "मार्जय पुनश्च लिख्यताम्",
   "confirmations.unfollow.confirm": "अनुसरणं नश्यताम्",
-  "confirmations.unfollow.message": "निश्चयेनैवाऽनुसरणं नश्यतां {name} मित्रस्य?",
   "conversation.delete": "वार्तालापं मार्जय",
   "conversation.mark_as_read": "पठितमित्यङ्क्यताम्",
   "conversation.open": "वार्तालापो दृश्यताम्",
diff --git a/app/javascript/mastodon/locales/sc.json b/app/javascript/mastodon/locales/sc.json
index 781ea7c014..254af6a601 100644
--- a/app/javascript/mastodon/locales/sc.json
+++ b/app/javascript/mastodon/locales/sc.json
@@ -217,8 +217,6 @@
   "confirmations.redraft.message": "Seguru chi boles cantzellare e torrare a fàghere custa publicatzione? As a pèrdere is preferidos e is cumpartziduras, e is rispostas a su messàgiu originale ant a abarrare òrfanas.",
   "confirmations.redraft.title": "Boles cantzellare e torrare a iscrìere sa publicatzione?",
   "confirmations.unfollow.confirm": "Non sigas prus",
-  "confirmations.unfollow.message": "Seguru chi non boles sighire prus a {name}?",
-  "confirmations.unfollow.title": "Boles tzessare de sighire s'utente?",
   "content_warning.hide": "Cua sa publicatzione",
   "content_warning.show": "Ammustra·dda su pròpiu",
   "conversation.delete": "Cantzella arresonada",
diff --git a/app/javascript/mastodon/locales/sco.json b/app/javascript/mastodon/locales/sco.json
index de24b5cdee..354c3393ed 100644
--- a/app/javascript/mastodon/locales/sco.json
+++ b/app/javascript/mastodon/locales/sco.json
@@ -140,7 +140,6 @@
   "confirmations.mute.confirm": "Wheesht",
   "confirmations.redraft.confirm": "Delete an stert anew",
   "confirmations.unfollow.confirm": "Unfollae",
-  "confirmations.unfollow.message": "Ye shuir thit ye'r wantin tae unfollae {name}?",
   "conversation.delete": "Delete the conversation",
   "conversation.mark_as_read": "Mairk as seen",
   "conversation.open": "Luik at conversation",
diff --git a/app/javascript/mastodon/locales/si.json b/app/javascript/mastodon/locales/si.json
index 92216ed074..e326d3fa6a 100644
--- a/app/javascript/mastodon/locales/si.json
+++ b/app/javascript/mastodon/locales/si.json
@@ -236,8 +236,6 @@
   "confirmations.remove_from_followers.message": "{name} ඔබව අනුගමනය කිරීම නවත්වනු ඇත. ඔබට ඉදිරියට යාමට අවශ්‍ය බව විශ්වාසද?",
   "confirmations.remove_from_followers.title": "අනුගාමිකයා ඉවත් කරන්නද?",
   "confirmations.unfollow.confirm": "අනුගමනය නොකරන්න",
-  "confirmations.unfollow.message": "ඔබට {name}අනුගමනය කිරීම නවත්වන්න අවශ්‍ය බව ඔබට විශ්වාසද?",
-  "confirmations.unfollow.title": "පරිශීලකයා අනුගමනය නොකරන්නද?",
   "content_warning.hide": "සටහන සඟවන්න",
   "content_warning.show": "කෙසේ වෙතත් පෙන්වන්න",
   "content_warning.show_more": "තවත් පෙන්වන්න",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index 9a408657b1..ffc3697393 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -213,8 +213,6 @@
   "confirmations.redraft.title": "Vymazať a prepísať príspevok?",
   "confirmations.remove_from_followers.confirm": "Odstrániť nasledovateľa",
   "confirmations.unfollow.confirm": "Prestať sledovať",
-  "confirmations.unfollow.message": "Určite chcete prestať sledovať {name}?",
-  "confirmations.unfollow.title": "Prestať sledovať užívateľa?",
   "content_warning.hide": "Skryť príspevok",
   "content_warning.show": "Aj tak zobraziť",
   "content_warning.show_more": "Ukázať viac",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index a87648bf7a..43f6c511d3 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -218,8 +218,6 @@
   "confirmations.redraft.message": "Ali ste prepričani, da želite izbrisati to objavo in jo preoblikovati? Izkazi priljubljenosti in izpostavitve bodo izgubljeni, odgovori na izvirno objavo pa bodo osiroteli.",
   "confirmations.redraft.title": "Želite izbrisati in preoblikovati objavo?",
   "confirmations.unfollow.confirm": "Ne sledi več",
-  "confirmations.unfollow.message": "Ali ste prepričani, da ne želite več slediti {name}?",
-  "confirmations.unfollow.title": "Želite nehati spremljati uporabnika?",
   "content_warning.hide": "Skrij objavo",
   "content_warning.show": "Vseeno pokaži",
   "content_warning.show_more": "Pokaži več",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index 8ad097427b..3f61ff0a29 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -240,8 +240,6 @@
   "confirmations.remove_from_followers.message": "{name} do të reshtë së ndjekuri ju. Jeni i sigurt se doni të vazhdohet?",
   "confirmations.remove_from_followers.title": "Të hiqet ndjekësi?",
   "confirmations.unfollow.confirm": "Resht së ndjekuri",
-  "confirmations.unfollow.message": "Jeni i sigurt se doni të mos ndiqet më {name}?",
-  "confirmations.unfollow.title": "Të ndalet ndjekja e përdoruesit?",
   "content_warning.hide": "Fshihe postimin",
   "content_warning.show": "Shfaqe, sido qoftë",
   "content_warning.show_more": "Shfaq më tepër",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index 0db607b12c..f91044899e 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -171,7 +171,6 @@
   "confirmations.redraft.confirm": "Izbriši i prepravi",
   "confirmations.redraft.message": "Da li ste sigurni da želite da izbrišete ovu objavu i da je prepravite? Podržavanja i oznake kao omiljenih će biti izgubljeni, a odgovori će ostati bez originalne objave.",
   "confirmations.unfollow.confirm": "Otprati",
-  "confirmations.unfollow.message": "Da li ste sigurni da želite da otpratite korisnika {name}?",
   "conversation.delete": "Izbriši razgovor",
   "conversation.mark_as_read": "Označi kao pročitano",
   "conversation.open": "Prikaži razgovor",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index 48e6b49968..117c25949d 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -171,7 +171,6 @@
   "confirmations.redraft.confirm": "Избриши и преправи",
   "confirmations.redraft.message": "Да ли сте сигурни да желите да избришете ову објаву и да је преправите? Подржавања и ознаке као омиљених ће бити изгубљени, а одговори ће остати без оригиналне објаве.",
   "confirmations.unfollow.confirm": "Отпрати",
-  "confirmations.unfollow.message": "Да ли сте сигурни да желите да отпратите корисника {name}?",
   "conversation.delete": "Избриши разговор",
   "conversation.mark_as_read": "Означи као прочитано",
   "conversation.open": "Прикажи разговор",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index 97a4b6fd4f..e341889041 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -249,8 +249,6 @@
   "confirmations.revoke_quote.message": "Denna åtgärd kan inte ångras.",
   "confirmations.revoke_quote.title": "Ta bort inlägg?",
   "confirmations.unfollow.confirm": "Avfölj",
-  "confirmations.unfollow.message": "Är du säker på att du vill avfölja {name}?",
-  "confirmations.unfollow.title": "Avfölj användare?",
   "content_warning.hide": "Dölj inlägg",
   "content_warning.show": "Visa ändå",
   "content_warning.show_more": "Visa mer",
diff --git a/app/javascript/mastodon/locales/ta.json b/app/javascript/mastodon/locales/ta.json
index 8ebbd17117..7664174c17 100644
--- a/app/javascript/mastodon/locales/ta.json
+++ b/app/javascript/mastodon/locales/ta.json
@@ -128,7 +128,6 @@
   "confirmations.mute.confirm": "அமைதியாக்கு",
   "confirmations.redraft.confirm": "பதிவை நீக்கி மறுவரைவு செய்",
   "confirmations.unfollow.confirm": "விலகு",
-  "confirmations.unfollow.message": "{name}-ஐப் பின்தொடர்வதை நிச்சயமாக நீங்கள் நிறுத்த விரும்புகிறீர்களா?",
   "conversation.delete": "உரையாடலை அழி",
   "conversation.mark_as_read": "படிக்கபட்டதாகக் குறி",
   "conversation.open": "உரையாடலைக் காட்டு",
diff --git a/app/javascript/mastodon/locales/te.json b/app/javascript/mastodon/locales/te.json
index 015fe3f12a..c4442f7436 100644
--- a/app/javascript/mastodon/locales/te.json
+++ b/app/javascript/mastodon/locales/te.json
@@ -74,7 +74,6 @@
   "confirmations.mute.confirm": "మ్యూట్ చేయి",
   "confirmations.redraft.confirm": "తొలగించు & తిరగరాయు",
   "confirmations.unfollow.confirm": "అనుసరించవద్దు",
-  "confirmations.unfollow.message": "{name}ను మీరు ఖచ్చితంగా అనుసరించవద్దనుకుంటున్నారా?",
   "embed.instructions": "దిగువ కోడ్ను కాపీ చేయడం ద్వారా మీ వెబ్సైట్లో ఈ స్టేటస్ ని పొందుపరచండి.",
   "embed.preview": "అది ఈ క్రింది విధంగా కనిపిస్తుంది:",
   "emoji_button.activity": "కార్యకలాపాలు",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index ed71791f73..1fcaad9b64 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -225,8 +225,6 @@
   "confirmations.redraft.message": "คุณแน่ใจหรือไม่ว่าต้องการลบโพสต์นี้แล้วร่างโพสต์ใหม่? รายการโปรดและการดันจะสูญหาย และการตอบกลับโพสต์ดั้งเดิมจะไม่มีความเกี่ยวพัน",
   "confirmations.redraft.title": "ลบแล้วร่างโพสต์ใหม่?",
   "confirmations.unfollow.confirm": "เลิกติดตาม",
-  "confirmations.unfollow.message": "คุณแน่ใจหรือไม่ว่าต้องการเลิกติดตาม {name}?",
-  "confirmations.unfollow.title": "เลิกติดตามผู้ใช้?",
   "content_warning.hide": "ซ่อนโพสต์",
   "content_warning.show": "แสดงต่อไป",
   "content_warning.show_more": "แสดงเพิ่มเติม",
diff --git a/app/javascript/mastodon/locales/tok.json b/app/javascript/mastodon/locales/tok.json
index 3eaf22911c..d21058a67b 100644
--- a/app/javascript/mastodon/locales/tok.json
+++ b/app/javascript/mastodon/locales/tok.json
@@ -247,8 +247,6 @@
   "confirmations.revoke_quote.confirm": "o weka e toki tan lipu Mastodon",
   "confirmations.revoke_quote.title": "sina wile weka ala weka e toki?",
   "confirmations.unfollow.confirm": "o kute ala",
-  "confirmations.unfollow.message": "sina o wile ala wile pini kute e jan {name}?",
-  "confirmations.unfollow.title": "sina wile ala wile pini kute?",
   "content_warning.hide": "o len",
   "content_warning.show": "o lukin a",
   "content_warning.show_more": "o lukin",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 335fa07d80..d8f07d12c9 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -258,8 +258,6 @@
   "confirmations.revoke_quote.message": "Bu işlem geri alınamaz.",
   "confirmations.revoke_quote.title": "Gönderiyi silmek ister misiniz?",
   "confirmations.unfollow.confirm": "Takibi bırak",
-  "confirmations.unfollow.message": "{name} adlı kullanıcıyı takibi bırakmak istediğinden emin misin?",
-  "confirmations.unfollow.title": "Kullanıcıyı takipten çık?",
   "content_warning.hide": "Gönderiyi gizle",
   "content_warning.show": "Yine de göster",
   "content_warning.show_more": "Daha fazla göster",
diff --git a/app/javascript/mastodon/locales/tt.json b/app/javascript/mastodon/locales/tt.json
index d1ef3cd3b0..6123b19997 100644
--- a/app/javascript/mastodon/locales/tt.json
+++ b/app/javascript/mastodon/locales/tt.json
@@ -146,7 +146,6 @@
   "confirmations.mute.confirm": "Тавышсыз",
   "confirmations.redraft.confirm": "Бетерү & эшкәртү",
   "confirmations.unfollow.confirm": "Язылуны туктату",
-  "confirmations.unfollow.message": "Сез язылудан баш тартырга телисез {name}?",
   "conversation.delete": "Сөйләшүне бетерегез",
   "conversation.mark_as_read": "Укылганны Ничек билгеләргә",
   "conversation.open": "Сөйләшүне карау",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 99dd177b2b..45f5b3f458 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -230,8 +230,6 @@
   "confirmations.revoke_quote.message": "Цю дію не можна скасувати.",
   "confirmations.revoke_quote.title": "Видалити публікацію?",
   "confirmations.unfollow.confirm": "Відписатися",
-  "confirmations.unfollow.message": "Ви впевнені, що хочете відписатися від {name}?",
-  "confirmations.unfollow.title": "Відписатися від користувача?",
   "content_warning.hide": "Сховати допис",
   "content_warning.show": "Усе одно показати",
   "content_warning.show_more": "Показати більше",
diff --git a/app/javascript/mastodon/locales/ur.json b/app/javascript/mastodon/locales/ur.json
index e06ec34e6e..0448f69c63 100644
--- a/app/javascript/mastodon/locales/ur.json
+++ b/app/javascript/mastodon/locales/ur.json
@@ -122,7 +122,6 @@
   "confirmations.mute.confirm": "خاموش",
   "confirmations.redraft.confirm": "ڈیلیٹ کریں اور دوبارہ ڈرافٹ کریں",
   "confirmations.unfollow.confirm": "پیروی ترک کریں",
-  "confirmations.unfollow.message": "کیا واقعی آپ {name} کی پیروی ترک کرنا چاہتے ہیں؟",
   "conversation.delete": "گفتگو کو ڈیلیٹ کریں",
   "conversation.mark_as_read": "بطور پڑھا ہوا دکھائیں",
   "conversation.open": "گفتگو دیکھیں",
diff --git a/app/javascript/mastodon/locales/uz.json b/app/javascript/mastodon/locales/uz.json
index 2e4038edd3..2a8b817576 100644
--- a/app/javascript/mastodon/locales/uz.json
+++ b/app/javascript/mastodon/locales/uz.json
@@ -133,7 +133,6 @@
   "confirmations.mute.confirm": "Ovozsiz",
   "confirmations.redraft.confirm": "O'chirish va qayta loyihalash",
   "confirmations.unfollow.confirm": "Kuzatishni To'xtatish",
-  "confirmations.unfollow.message": "Haqiqatan ham {name} obunasini bekor qilmoqchimisiz?",
   "conversation.delete": "Suhbatni o'chirish",
   "conversation.mark_as_read": "O'qilgan deb belgilang",
   "conversation.open": "Suhbatni ko'rish",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 72a1cd23ae..08b224e3d6 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -257,9 +257,12 @@
   "confirmations.revoke_quote.confirm": "Gỡ tút",
   "confirmations.revoke_quote.message": "Hành động này không thể hoàn tác.",
   "confirmations.revoke_quote.title": "Gỡ tút?",
+  "confirmations.unblock.confirm": "Bỏ chặn",
+  "confirmations.unblock.title": "Bỏ chặn {name}?",
   "confirmations.unfollow.confirm": "Bỏ theo dõi",
-  "confirmations.unfollow.message": "Bạn có chắc muốn bỏ theo dõi {name}?",
-  "confirmations.unfollow.title": "Bỏ theo dõi",
+  "confirmations.unfollow.title": "Bỏ theo dõi {name}?",
+  "confirmations.withdraw_request.confirm": "Thu hồi yêu cầu",
+  "confirmations.withdraw_request.title": "Thu hồi yêu cầu theo dõi {name}?",
   "content_warning.hide": "Thu gọn",
   "content_warning.show": "Vẫn xem",
   "content_warning.show_more": "Mở rộng",
@@ -920,6 +923,8 @@
   "status.quote_private": "Không thể trích dẫn nhắn riêng",
   "status.quotes": "{count, plural, other {trích dẫn}}",
   "status.quotes.empty": "Tút này chưa có ai trích dẫn. Nếu có, nó sẽ hiển thị ở đây.",
+  "status.quotes.local_other_disclaimer": "Những trích dẫn bị tác giả từ chối sẽ không được hiển thị.",
+  "status.quotes.remote_other_disclaimer": "Chỉ những trích dẫn từ {domain} mới được hiển thị ở đây. Những trích dẫn bị tác giả từ chối sẽ không được hiển thị.",
   "status.read_more": "Đọc tiếp",
   "status.reblog": "Đăng lại",
   "status.reblog_or_quote": "Đăng lại hoặc trích dẫn",
diff --git a/app/javascript/mastodon/locales/zgh.json b/app/javascript/mastodon/locales/zgh.json
index 0f0be9da42..7317cd7282 100644
--- a/app/javascript/mastodon/locales/zgh.json
+++ b/app/javascript/mastodon/locales/zgh.json
@@ -48,7 +48,6 @@
   "confirmations.logout.message": "ⵉⵙ ⵏⵉⵜ ⵜⵅⵙⴷ ⴰⴷ ⵜⴼⴼⵖⴷ?",
   "confirmations.mute.confirm": "ⵥⵥⵉⵥⵏ",
   "confirmations.unfollow.confirm": "ⴽⴽⵙ ⴰⴹⴼⴼⵓⵕ",
-  "confirmations.unfollow.message": "ⵉⵙ ⵏⵉⵜ ⵜⵅⵙⴷ ⴰⴷ ⵜⴽⴽⵙⴷ ⴰⴹⴼⴼⵓⵕ ⵉ {name}?",
   "conversation.delete": "ⴽⴽⵙ ⴰⵎⵙⴰⵡⴰⵍ",
   "conversation.with": "ⴰⴽⴷ {names}",
   "embed.instructions": "Embed this status on your website by copying the code below.",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index a73a218fa5..1397f28f93 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "当 @{name} 发布嘟文时不要通知我",
   "account.domain_blocking": "正在屏蔽中的域名",
   "account.edit_profile": "修改个人资料",
+  "account.edit_profile_short": "编辑",
   "account.enable_notifications": "当 @{name} 发布嘟文时通知我",
   "account.endorse": "在个人资料中推荐此用户",
   "account.familiar_followers_many": "被 {name1}、{name2}、及 {othersCount, plural, other {其他你认识的 # 人}} 关注",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "暂无嘟文",
   "account.follow": "关注",
   "account.follow_back": "回关",
+  "account.follow_back_short": "回关",
+  "account.follow_request": "请求关注",
+  "account.follow_request_cancel": "取消请求",
+  "account.follow_request_cancel_short": "取消",
+  "account.follow_request_short": "请求",
   "account.followers": "关注者",
   "account.followers.empty": "目前无人关注此用户。",
   "account.followers_counter": "{count, plural, other {{counter} 关注者}}",
@@ -251,9 +257,12 @@
   "confirmations.revoke_quote.confirm": "移除嘟文",
   "confirmations.revoke_quote.message": "此操作无法撤销。",
   "confirmations.revoke_quote.title": "移除嘟文？",
+  "confirmations.unblock.confirm": "取消屏蔽",
+  "confirmations.unblock.title": "取消屏蔽 {name} 吗？",
   "confirmations.unfollow.confirm": "取消关注",
-  "confirmations.unfollow.message": "你确定要取消关注 {name} 吗？",
-  "confirmations.unfollow.title": "确定要取消关注用户？",
+  "confirmations.unfollow.title": "取关 {name} 吗？",
+  "confirmations.withdraw_request.confirm": "撤回请求",
+  "confirmations.withdraw_request.title": "撤回关注 {name} 的请求吗？",
   "content_warning.hide": "隐藏嘟文",
   "content_warning.show": "仍要显示",
   "content_warning.show_more": "展开",
@@ -914,6 +923,8 @@
   "status.quote_private": "不能引用私人嘟文",
   "status.quotes": "{count, plural, other {引用嘟文}}",
   "status.quotes.empty": "还没有人引用过此条嘟文。引用此嘟文的人会显示在这里。",
+  "status.quotes.local_other_disclaimer": "遭作者拒绝的引用将不会显示。",
+  "status.quotes.remote_other_disclaimer": "此处仅保证会显示来自 {domain} 的引用。遭作者拒绝的引用将不会显示。",
   "status.read_more": "查看更多",
   "status.reblog": "转嘟",
   "status.reblog_or_quote": "转嘟或引用",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index 5a113ae8ae..3626f7da54 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -191,8 +191,6 @@
   "confirmations.redraft.confirm": "刪除並編輯",
   "confirmations.redraft.message": "你確定要移除並重新起草這篇帖文嗎？你將會失去最愛和轉推，而回覆也會與原始帖文斷開連接。",
   "confirmations.unfollow.confirm": "取消追蹤",
-  "confirmations.unfollow.message": "真的不要繼續追蹤 {name} 了嗎？",
-  "confirmations.unfollow.title": "取消追蹤使用者？",
   "content_warning.hide": "隱藏嘟文",
   "content_warning.show": "仍要顯示",
   "content_warning.show_more": "顯示更多",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index d0da9aa718..5e34081094 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -257,9 +257,12 @@
   "confirmations.revoke_quote.confirm": "移除嘟文",
   "confirmations.revoke_quote.message": "此動作無法復原。",
   "confirmations.revoke_quote.title": "您是否確定移除嘟文？",
+  "confirmations.unblock.confirm": "解除封鎖",
+  "confirmations.unblock.title": "解除封鎖 {name}？",
   "confirmations.unfollow.confirm": "取消跟隨",
-  "confirmations.unfollow.message": "您確定要取消跟隨 {name} 嗎？",
-  "confirmations.unfollow.title": "是否取消跟隨該使用者？",
+  "confirmations.unfollow.title": "取消跟隨 {name}？",
+  "confirmations.withdraw_request.confirm": "收回跟隨請求",
+  "confirmations.withdraw_request.title": "收回對 {name} 之跟隨請求？",
   "content_warning.hide": "隱藏嘟文",
   "content_warning.show": "仍要顯示",
   "content_warning.show_more": "顯示更多",
@@ -920,6 +923,8 @@
   "status.quote_private": "無法引用私人嘟文",
   "status.quotes": "{count, plural, other {# 則引用嘟文}}",
   "status.quotes.empty": "目前尚無人引用此嘟文。當有人引用時，它將於此顯示。",
+  "status.quotes.local_other_disclaimer": "被作者拒絕之引用嘟文將不被顯示。",
+  "status.quotes.remote_other_disclaimer": "僅有來自 {domain} 之引用嘟文保證將於此顯示。被作者拒絕之引用嘟文將不被顯示。",
   "status.read_more": "閱讀更多",
   "status.reblog": "轉嘟",
   "status.reblog_or_quote": "轉嘟或引用",
diff --git a/app/javascript/mastodon/utils/environment.ts b/app/javascript/mastodon/utils/environment.ts
index 2d544417e3..c666e2c94d 100644
--- a/app/javascript/mastodon/utils/environment.ts
+++ b/app/javascript/mastodon/utils/environment.ts
@@ -1,4 +1,4 @@
-import initialState from '../initial_state';
+import { initialState } from '../initial_state';
 
 export function isDevelopment() {
   if (typeof process !== 'undefined')
diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss
index 781e8511f5..37b6287504 100644
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@@ -13,6 +13,7 @@ $content-width: 840px;
   box-sizing: border-box;
   width: 100%;
   min-height: 100vh;
+  min-height: 100dvh;
   padding: env(safe-area-inset-top) env(safe-area-inset-right)
     env(safe-area-inset-bottom) env(safe-area-inset-left);
 
@@ -25,6 +26,7 @@ $content-width: 840px;
 
   .sidebar-wrapper {
     min-height: 100vh;
+    min-height: 100dvh;
     overflow: hidden;
     pointer-events: none;
     flex: 1 1 auto;
diff --git a/app/javascript/styles/mastodon/basics.scss b/app/javascript/styles/mastodon/basics.scss
index 0dce0b9b3e..3d8bba7c00 100644
--- a/app/javascript/styles/mastodon/basics.scss
+++ b/app/javascript/styles/mastodon/basics.scss
@@ -69,6 +69,7 @@ body {
     &.layout-single-column {
       height: auto;
       min-height: 100vh;
+      min-height: 100dvh;
       overflow-y: scroll;
     }
 
@@ -185,7 +186,8 @@ button {
   }
 
   & > noscript {
-    height: 100vh;
+    min-height: 100vh;
+    min-height: 100dvh;
   }
 }
 
@@ -193,6 +195,7 @@ button {
   &,
   & > div {
     min-height: 100vh;
+    min-height: 100dvh;
   }
 }
 
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 614b268ec7..bf518d72fc 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -2277,6 +2277,7 @@
   position: relative;
   border-radius: var(--avatar-border-radius);
   background: var(--surface-background-color);
+  flex-shrink: 0;
 
   img {
     width: 100%;
@@ -2988,6 +2989,7 @@ a.account__display-name {
     width: 100%;
     height: 100%;
     min-height: 100vh;
+    min-height: 100dvh;
     padding-bottom: env(safe-area-inset-bottom);
 
     &__pane {
@@ -3320,6 +3322,7 @@ a.account__display-name {
 
   .columns-area__panels {
     min-height: 100vh;
+    min-height: 100dvh;
     gap: 0;
   }
 
@@ -6402,7 +6405,10 @@ a.status-card {
       line-height: 24px;
       color: $primary-text-color;
       font-weight: 500;
-      margin-bottom: 8px;
+
+      &:not(:only-child) {
+        margin-bottom: 8px;
+      }
     }
 
     strong {
@@ -8407,47 +8413,6 @@ noscript {
     overflow: hidden;
     margin-inline-start: -2px; // aligns the pfp with content below
 
-    &__buttons {
-      display: flex;
-      align-items: center;
-      gap: 8px;
-      padding-top: 55px;
-      overflow: hidden;
-
-      .button {
-        flex-shrink: 1;
-        white-space: nowrap;
-        min-width: 80px;
-      }
-
-      .icon-button {
-        border: 1px solid var(--background-border-color);
-        border-radius: 4px;
-        box-sizing: content-box;
-        padding: 5px;
-
-        .icon {
-          width: 24px;
-          height: 24px;
-        }
-
-        &.copied {
-          border-color: $valid-value-color;
-        }
-      }
-
-      .optional {
-        @container account-header (max-width: 372px) {
-          display: none;
-        }
-
-        // Fallback for older browsers with no container queries support
-        @media screen and (max-width: (372px + 55px)) {
-          display: none;
-        }
-      }
-    }
-
     &__name {
       margin-top: 16px;
       margin-bottom: 16px;
@@ -8496,6 +8461,69 @@ noscript {
     }
   }
 
+  &__follow-button {
+    flex-grow: 1;
+  }
+
+  &__buttons {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+
+    $button-breakpoint: 420px;
+    $button-fallback-breakpoint: #{$button-breakpoint} + 55px;
+
+    &--desktop {
+      margin-top: 55px;
+
+      @container (width < #{$button-breakpoint}) {
+        display: none;
+      }
+
+      @supports (not (container-type: inline-size)) {
+        @media (max-width: #{$button-fallback-breakpoint}) {
+          display: none;
+        }
+      }
+    }
+
+    &--mobile {
+      margin-block: 16px;
+
+      @container (width >= #{$button-breakpoint}) {
+        display: none;
+      }
+
+      @supports (not (container-type: inline-size)) {
+        @media (min-width: (#{$button-fallback-breakpoint} + 1px)) {
+          display: none;
+        }
+      }
+    }
+
+    .button {
+      flex-shrink: 1;
+      white-space: nowrap;
+      min-width: 80px;
+    }
+
+    .icon-button {
+      border: 1px solid var(--background-border-color);
+      border-radius: 4px;
+      box-sizing: content-box;
+      padding: 5px;
+
+      .icon {
+        width: 24px;
+        height: 24px;
+      }
+
+      &.copied {
+        border-color: $valid-value-color;
+      }
+    }
+  }
+
   &__bio {
     .account__header__content {
       color: $primary-text-color;
@@ -10912,6 +10940,7 @@ noscript {
     font-weight: 500;
     color: $primary-text-color;
     text-decoration: none;
+    min-width: 0;
 
     &:hover,
     &:focus,
diff --git a/app/javascript/types/polymorphic.ts b/app/javascript/types/polymorphic.ts
new file mode 100644
index 0000000000..e58aa7b75e
--- /dev/null
+++ b/app/javascript/types/polymorphic.ts
@@ -0,0 +1,75 @@
+import { forwardRef } from 'react';
+import type {
+  ElementType,
+  ComponentPropsWithRef,
+  ForwardRefRenderFunction,
+  ReactElement,
+  Ref,
+  ForwardRefExoticComponent,
+} from 'react';
+
+// This complicated type file is based on the following posts:
+// - https://www.tsteele.dev/posts/react-polymorphic-forwardref
+// - https://www.kripod.dev/blog/behind-the-as-prop-polymorphism-done-well/
+// - https://github.com/radix-ui/primitives/blob/7101e7d6efb2bff13cc6761023ab85aeec73539e/packages/react/polymorphic/src/forwardRefWithAs.ts
+// Whenever we upgrade to React 19 or later, we can remove all this because ref is a prop there.
+
+// Utils
+interface AsProp<As extends ElementType> {
+  as?: As;
+}
+type PropsOf<As extends ElementType> = ComponentPropsWithRef<As>;
+
+/**
+ * Extract the element instance type (e.g. HTMLButtonElement) from ComponentPropsWithRef<As>:
+ * - For intrinsic elements, look up in JSX.IntrinsicElements
+ * - For components, infer from `ComponentPropsWithRef`
+ */
+type ElementRef<As extends ElementType> =
+  As extends keyof React.JSX.IntrinsicElements
+    ? React.JSX.IntrinsicElements[As] extends { ref?: Ref<infer Inst> }
+      ? Inst
+      : never
+    : ComponentPropsWithRef<As> extends { ref?: Ref<infer Inst> }
+      ? Inst
+      : never;
+
+/**
+ * Merge additional props with intrinsic/element props for `as`.
+ * Additional props win on conflicts.
+ */
+type PolymorphicProps<
+  As extends ElementType,
+  AdditionalProps extends object = object,
+> = AdditionalProps &
+  AsProp<As> &
+  Omit<PropsOf<As>, keyof AdditionalProps | 'ref'>;
+
+/**
+ * Signature of a component created with `polymorphicForwardRef`.
+ */
+type PolymorphicWithRef<
+  DefaultAs extends ElementType,
+  AdditionalProps extends object = object,
+> = <As extends ElementType = DefaultAs>(
+  props: PolymorphicProps<As, AdditionalProps> & { ref?: Ref<ElementRef<As>> },
+) => ReactElement | null;
+
+/**
+ * The type of `polymorphicForwardRef`.
+ */
+type PolyRefFunction = <
+  DefaultAs extends ElementType,
+  AdditionalProps extends object = object,
+>(
+  render: ForwardRefRenderFunction<
+    ElementRef<DefaultAs>,
+    PolymorphicProps<DefaultAs, AdditionalProps>
+  >,
+) => PolymorphicWithRef<DefaultAs, AdditionalProps> &
+  ForwardRefExoticComponent<PolymorphicProps<DefaultAs, AdditionalProps>>;
+
+/**
+ * Polymorphic `forwardRef` function.
+ */
+export const polymorphicForwardRef = forwardRef as PolyRefFunction;
diff --git a/app/lib/activitypub/activity/quote_request.rb b/app/lib/activitypub/activity/quote_request.rb
index 6d386f45dc..27dea05bf6 100644
--- a/app/lib/activitypub/activity/quote_request.rb
+++ b/app/lib/activitypub/activity/quote_request.rb
@@ -36,6 +36,9 @@ class ActivityPub::Activity::QuoteRequest < ActivityPub::Activity
 
     # Ensure the user is notified
     LocalNotificationWorker.perform_async(quoted_status.account_id, status.quote.id, 'Quote', 'quote')
+
+    # Ensure local followers get to see the post updated with approval
+    DistributionWorker.perform_async(status.id, { 'update' => true, 'skip_notifications' => true })
   end
 
   def import_instrument(quoted_status)
diff --git a/app/models/account.rb b/app/models/account.rb
index 8490e99da1..76c7c3bd24 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -442,6 +442,7 @@ class Account < ApplicationRecord
 
   before_validation :prepare_contents, if: :local?
   before_create :generate_keys
+  before_create :set_id_scheme
   before_destroy :clean_feed_manager
 
   def ensure_keys!
@@ -466,6 +467,12 @@ class Account < ApplicationRecord
     self.public_key  = keypair.public_key.to_pem
   end
 
+  def set_id_scheme
+    return unless local? && Mastodon::Feature.numeric_ap_ids_enabled?
+
+    self.id_scheme = :numeric_ap_id
+  end
+
   def normalize_domain
     return if local?
 
diff --git a/app/policies/status_policy.rb b/app/policies/status_policy.rb
index c8146c7e7c..f598709ff5 100644
--- a/app/policies/status_policy.rb
+++ b/app/policies/status_policy.rb
@@ -37,10 +37,6 @@ class StatusPolicy < ApplicationPolicy
     owned?
   end
 
-  def list_quotes?
-    owned?
-  end
-
   alias unreblog? destroy?
 
   def update?
diff --git a/config/routes.rb b/config/routes.rb
index 0a6178399e..412372600e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -123,14 +123,14 @@ Rails.application.routes.draw do
 
   scope path: 'ap', as: 'ap' do
     resources :accounts, path: 'users', only: [:show], param: :id, concerns: :account_resources do
-      resources :statuses, module: :activitypub, only: [:show] do
+      resources :statuses, only: [:show] do
         member do
           get :activity
         end
 
-        resources :replies, only: [:index]
-        resources :likes, only: [:index]
-        resources :shares, only: [:index]
+        resources :replies, only: [:index], module: :activitypub
+        resources :likes, only: [:index], module: :activitypub
+        resources :shares, only: [:index], module: :activitypub
       end
     end
   end
diff --git a/eslint.config.mjs b/eslint.config.mjs
index e4c40ca039..8ed0339b99 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -198,6 +198,7 @@ export default tseslint.config([
     'tmp/**/*',
     'vendor/**/*',
     'streaming/**/*',
+    '.bundle/**/*',
   ]),
   react.configs.flat.recommended,
   react.configs.flat['jsx-runtime'],
diff --git a/spec/requests/activitypub/replies_spec.rb b/spec/requests/activitypub/replies_spec.rb
index 313cab2a44..4cd02b187d 100644
--- a/spec/requests/activitypub/replies_spec.rb
+++ b/spec/requests/activitypub/replies_spec.rb
@@ -220,6 +220,12 @@ RSpec.describe 'ActivityPub Replies' do
       it_behaves_like 'allowed access'
     end
 
+    context 'with no signature and requesting the numeric AP path' do
+      subject { get ap_account_status_replies_path(account_id: status.account_id, status_id: status.id, only_other_accounts: only_other_accounts) }
+
+      it_behaves_like 'allowed access'
+    end
+
     context 'with signature' do
       subject { get account_status_replies_path(account_username: status.account.username, status_id: status.id, only_other_accounts: only_other_accounts), headers: nil, sign_with: remote_querier }
 
diff --git a/spec/requests/api/v1/statuses/quotes_spec.rb b/spec/requests/api/v1/statuses/quotes_spec.rb
index 9456556ce9..01e9e17b07 100644
--- a/spec/requests/api/v1/statuses/quotes_spec.rb
+++ b/spec/requests/api/v1/statuses/quotes_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe 'API V1 Statuses Quotes' do
     let!(:accepted_quote) { Fabricate(:quote, quoted_status: status, state: :accepted) }
     let!(:rejected_quote) { Fabricate(:quote, quoted_status: status, state: :rejected) }
     let!(:pending_quote) { Fabricate(:quote, quoted_status: status, state: :pending) }
-    let!(:another_accepted_quote) { Fabricate(:quote, quoted_status: status, state: :accepted) }
+    let!(:accepted_private_quote) { Fabricate(:quote, status: Fabricate(:status, visibility: :private), quoted_status: status, state: :accepted) }
 
     context 'with an OAuth token' do
       let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
@@ -30,7 +30,7 @@ RSpec.describe 'API V1 Statuses Quotes' do
         expect(response)
           .to have_http_status(200)
           .and include_pagination_headers(
-            prev: api_v1_status_quotes_url(limit: 2, since_id: another_accepted_quote.id),
+            prev: api_v1_status_quotes_url(limit: 2, since_id: accepted_private_quote.id),
             next: api_v1_status_quotes_url(limit: 2, max_id: accepted_quote.id)
           )
         expect(response.content_type)
@@ -39,7 +39,7 @@ RSpec.describe 'API V1 Statuses Quotes' do
         expect(response.parsed_body)
           .to contain_exactly(
             include(id: accepted_quote.status.id.to_s),
-            include(id: another_accepted_quote.status.id.to_s)
+            include(id: accepted_private_quote.status.id.to_s)
           )
 
         expect(response.parsed_body)
@@ -52,12 +52,29 @@ RSpec.describe 'API V1 Statuses Quotes' do
       context 'with a different user than the post owner' do
         let(:status) { Fabricate(:status) }
 
-        it 'returns http forbidden' do
+        it 'returns http success and statuses but not private ones' do
           subject
 
-          expect(response).to have_http_status(403)
+          expect(response)
+            .to have_http_status(200)
+            .and include_pagination_headers(
+              prev: api_v1_status_quotes_url(limit: 2, since_id: accepted_private_quote.id),
+              next: api_v1_status_quotes_url(limit: 2, max_id: accepted_quote.id)
+            )
           expect(response.content_type)
             .to start_with('application/json')
+
+          expect(response.parsed_body)
+            .to contain_exactly(
+              include(id: accepted_quote.status.id.to_s)
+            )
+
+          expect(response.parsed_body)
+            .to_not include(
+              include(id: rejected_quote.status.id.to_s),
+              include(id: pending_quote.status.id.to_s),
+              include(id: accepted_private_quote.id.to_s)
+            )
         end
       end
     end
diff --git a/spec/requests/statuses_spec.rb b/spec/requests/statuses_spec.rb
index a5e4482dfa..d12f4f28cf 100644
--- a/spec/requests/statuses_spec.rb
+++ b/spec/requests/statuses_spec.rb
@@ -360,6 +360,30 @@ RSpec.describe 'Statuses' do
               .to include(content: include(status.text))
           end
         end
+
+        context 'with JSON and querying the new paths' do
+          subject do
+            get ap_account_status_path(account_id: status.account_id, id: status.id),
+                headers: { 'Accept' => 'application/activity+json' },
+                sign_with: remote_account
+          end
+
+          let(:format) { 'json' }
+
+          it 'renders ActivityPub Note object successfully', :aggregate_failures do
+            subject
+
+            expect(response)
+              .to have_http_status(200)
+              .and have_cacheable_headers.with_vary('Accept, Accept-Language, Cookie')
+            expect(response.headers).to include(
+              'Content-Type' => include('application/activity+json'),
+              'Link' => include('activity+json')
+            )
+            expect(response.parsed_body)
+              .to include(content: include(status.text))
+          end
+        end
       end
 
       context 'when status has private visibility' do
diff --git a/yarn.lock b/yarn.lock
index 2f327a2e37..b2b6f67838 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7671,14 +7671,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fs-extra@npm:^11.3.0":
-  version: 11.3.0
-  resolution: "fs-extra@npm:11.3.0"
+"fs-extra@npm:^11.3.2":
+  version: 11.3.2
+  resolution: "fs-extra@npm:11.3.2"
   dependencies:
     graceful-fs: "npm:^4.2.0"
     jsonfile: "npm:^6.0.1"
     universalify: "npm:^2.0.0"
-  checksum: 10c0/5f95e996186ff45463059feb115a22fb048bdaf7e487ecee8a8646c78ed8fdca63630e3077d4c16ce677051f5e60d3355a06f3cd61f3ca43f48cc58822a44d0a
+  checksum: 10c0/f5d629e1bb646d5dedb4d8b24c5aad3deb8cc1d5438979d6f237146cd10e113b49a949ae1b54212c2fbc98e2d0995f38009a9a1d0520f0287943335e65fe919b
   languageName: node
   linkType: hard
 
@@ -13850,17 +13850,17 @@ __metadata:
   linkType: hard
 
 "vite-plugin-static-copy@npm:^3.1.1":
-  version: 3.1.2
-  resolution: "vite-plugin-static-copy@npm:3.1.2"
+  version: 3.1.3
+  resolution: "vite-plugin-static-copy@npm:3.1.3"
   dependencies:
     chokidar: "npm:^3.6.0"
-    fs-extra: "npm:^11.3.0"
+    fs-extra: "npm:^11.3.2"
     p-map: "npm:^7.0.3"
     picocolors: "npm:^1.1.1"
-    tinyglobby: "npm:^0.2.14"
+    tinyglobby: "npm:^0.2.15"
   peerDependencies:
     vite: ^5.0.0 || ^6.0.0 || ^7.0.0
-  checksum: 10c0/1a65f4c9d291cc27483a5b225b1ac5610edc3aa2f13fa3a76a77327874c83bbee52e1011ee0bf5b0168b9b7b974213d49fe800e44af398cfbcb6607814b45c5b
+  checksum: 10c0/f58bf609246c440b4e3c0db10abf5965658c34ee03e72b94d4fc6ff35fa4568b5baa0fe36057234a4b1e84a9b4b3c2cdbff9f943b9e69d883d3a05353cbf9090
   languageName: node
   linkType: hard