diff --git a/app/javascript/mastodon/components/account_bio.tsx b/app/javascript/mastodon/components/account_bio.tsx
index 6d4ab1ddd4..75067530c9 100644
--- a/app/javascript/mastodon/components/account_bio.tsx
+++ b/app/javascript/mastodon/components/account_bio.tsx
@@ -6,7 +6,7 @@ import { EmojiHTML } from './emoji/html';
 import { useElementHandledLink } from './status/handled_link';
 
 interface AccountBioProps {
-  className: string;
+  className?: string;
   accountId: string;
   showDropdown?: boolean;
 }
diff --git a/app/javascript/mastodon/components/form_fields/text_area_field.stories.tsx b/app/javascript/mastodon/components/form_fields/text_area_field.stories.tsx
index 448af8a28e..190239aee2 100644
--- a/app/javascript/mastodon/components/form_fields/text_area_field.stories.tsx
+++ b/app/javascript/mastodon/components/form_fields/text_area_field.stories.tsx
@@ -42,6 +42,13 @@ export const WithError: Story = {
   },
 };
 
+export const AutoSize: Story = {
+  args: {
+    autoSize: true,
+    defaultValue: 'This textarea will grow as you type more lines.',
+  },
+};
+
 export const Plain: Story = {
   render(args) {
     return <TextArea {...args} />;
diff --git a/app/javascript/mastodon/components/form_fields/text_area_field.tsx b/app/javascript/mastodon/components/form_fields/text_area_field.tsx
index 6cbced9faf..3634533f6a 100644
--- a/app/javascript/mastodon/components/form_fields/text_area_field.tsx
+++ b/app/javascript/mastodon/components/form_fields/text_area_field.tsx
@@ -3,12 +3,16 @@ import { forwardRef, useCallback } from 'react';
 
 import classNames from 'classnames';
 
+import type { TextareaAutosizeProps } from 'react-textarea-autosize';
+import TextAreaAutosize from 'react-textarea-autosize';
+
 import { FormFieldWrapper } from './form_field_wrapper';
 import type { CommonFieldWrapperProps } from './form_field_wrapper';
 import classes from './text_input.module.scss';
 
-interface Props
-  extends ComponentPropsWithoutRef<'textarea'>, CommonFieldWrapperProps {}
+type TextAreaProps =
+  | ({ autoSize?: false } & ComponentPropsWithoutRef<'textarea'>)
+  | ({ autoSize: true } & TextareaAutosizeProps);
 
 /**
  * A simple form field for multi-line text.
@@ -17,45 +21,56 @@ interface Props
  * or optional (by explicitly setting `required={false}`)
  */
 
-export const TextAreaField = forwardRef<HTMLTextAreaElement, Props>(
-  ({ id, label, hint, required, hasError, ...otherProps }, ref) => (
-    <FormFieldWrapper
-      label={label}
-      hint={hint}
-      required={required}
-      hasError={hasError}
-      inputId={id}
-    >
-      {(inputProps) => <TextArea {...otherProps} {...inputProps} ref={ref} />}
-    </FormFieldWrapper>
-  ),
-);
+export const TextAreaField = forwardRef<
+  HTMLTextAreaElement,
+  TextAreaProps & CommonFieldWrapperProps
+>(({ id, label, hint, required, hasError, ...otherProps }, ref) => (
+  <FormFieldWrapper
+    label={label}
+    hint={hint}
+    required={required}
+    hasError={hasError}
+    inputId={id}
+  >
+    {(inputProps) => <TextArea {...otherProps} {...inputProps} ref={ref} />}
+  </FormFieldWrapper>
+));
 
 TextAreaField.displayName = 'TextAreaField';
 
-export const TextArea = forwardRef<
-  HTMLTextAreaElement,
-  ComponentPropsWithoutRef<'textarea'>
->(({ className, onKeyDown, ...otherProps }, ref) => {
-  const handleSubmitHotkey = useCallback(
-    (e: React.KeyboardEvent<HTMLTextAreaElement>) => {
-      onKeyDown?.(e);
-      if (e.key === 'Enter' && (e.ctrlKey || e.metaKey)) {
-        const targetForm = e.currentTarget.form;
-        targetForm?.requestSubmit();
-      }
-    },
-    [onKeyDown],
-  );
+export const TextArea = forwardRef<HTMLTextAreaElement, TextAreaProps>(
+  ({ className, onKeyDown, autoSize, ...otherProps }, ref) => {
+    const handleSubmitHotkey = useCallback(
+      (e: React.KeyboardEvent<HTMLTextAreaElement>) => {
+        onKeyDown?.(e);
+        if (e.key === 'Enter' && (e.ctrlKey || e.metaKey)) {
+          const targetForm = e.currentTarget.form;
+          targetForm?.requestSubmit();
+        }
+      },
+      [onKeyDown],
+    );
 
-  return (
-    <textarea
-      {...otherProps}
-      onKeyDown={handleSubmitHotkey}
-      className={classNames(className, classes.input)}
-      ref={ref}
-    />
-  );
-});
+    if (autoSize) {
+      return (
+        <TextAreaAutosize
+          {...(otherProps as TextareaAutosizeProps)}
+          onKeyDown={handleSubmitHotkey}
+          className={classNames(className, classes.input)}
+          ref={ref}
+        />
+      );
+    }
+
+    return (
+      <textarea
+        {...otherProps}
+        onKeyDown={handleSubmitHotkey}
+        className={classNames(className, classes.input)}
+        ref={ref}
+      />
+    );
+  },
+);
 
 TextArea.displayName = 'TextArea';
diff --git a/app/javascript/mastodon/features/account_edit/components/bio_modal.tsx b/app/javascript/mastodon/features/account_edit/components/bio_modal.tsx
new file mode 100644
index 0000000000..fbc74e769b
--- /dev/null
+++ b/app/javascript/mastodon/features/account_edit/components/bio_modal.tsx
@@ -0,0 +1,94 @@
+import { useCallback, useId, useRef, useState } from 'react';
+import type { ChangeEventHandler, FC } from 'react';
+
+import { defineMessages, useIntl } from 'react-intl';
+
+import { TextArea } from '@/mastodon/components/form_fields';
+import { LoadingIndicator } from '@/mastodon/components/loading_indicator';
+import { insertEmojiAtPosition } from '@/mastodon/features/emoji/utils';
+import type { BaseConfirmationModalProps } from '@/mastodon/features/ui/components/confirmation_modals';
+import { ConfirmationModal } from '@/mastodon/features/ui/components/confirmation_modals';
+import { useAccount } from '@/mastodon/hooks/useAccount';
+import { useCurrentAccountId } from '@/mastodon/hooks/useAccountId';
+
+import classes from '../styles.module.scss';
+
+import { CharCounter } from './char_counter';
+import { EmojiPicker } from './emoji_picker';
+
+const messages = defineMessages({
+  addTitle: {
+    id: 'account_edit.bio_modal.add_title',
+    defaultMessage: 'Add bio',
+  },
+  editTitle: {
+    id: 'account_edit.bio_modal.edit_title',
+    defaultMessage: 'Edit bio',
+  },
+  save: {
+    id: 'account_edit.save',
+    defaultMessage: 'Save',
+  },
+});
+
+const MAX_BIO_LENGTH = 500;
+
+export const BioModal: FC<BaseConfirmationModalProps> = ({ onClose }) => {
+  const intl = useIntl();
+  const titleId = useId();
+  const counterId = useId();
+  const textAreaRef = useRef<HTMLTextAreaElement>(null);
+  const accountId = useCurrentAccountId();
+  const account = useAccount(accountId);
+
+  const [newBio, setNewBio] = useState(account?.note_plain ?? '');
+  const handleChange: ChangeEventHandler<HTMLTextAreaElement> = useCallback(
+    (event) => {
+      setNewBio(event.currentTarget.value);
+    },
+    [],
+  );
+  const handlePickEmoji = useCallback((emoji: string) => {
+    setNewBio((prev) => {
+      const position = textAreaRef.current?.selectionStart ?? prev.length;
+      return insertEmojiAtPosition(prev, emoji, position);
+    });
+  }, []);
+
+  if (!account) {
+    return <LoadingIndicator />;
+  }
+
+  return (
+    <ConfirmationModal
+      title={intl.formatMessage(
+        account.note_plain ? messages.editTitle : messages.addTitle,
+      )}
+      titleId={titleId}
+      confirm={intl.formatMessage(messages.save)}
+      onConfirm={onClose} // To be implemented
+      onClose={onClose}
+      noFocusButton
+    >
+      <div className={classes.inputWrapper}>
+        <TextArea
+          value={newBio}
+          ref={textAreaRef}
+          onChange={handleChange}
+          className={classes.inputText}
+          aria-labelledby={titleId}
+          aria-describedby={counterId}
+          // eslint-disable-next-line jsx-a11y/no-autofocus -- This is a modal, it's fine.
+          autoFocus
+          autoSize
+        />
+        <EmojiPicker onPick={handlePickEmoji} />
+      </div>
+      <CharCounter
+        currentLength={newBio.length}
+        maxLength={MAX_BIO_LENGTH}
+        id={counterId}
+      />
+    </ConfirmationModal>
+  );
+};
diff --git a/app/javascript/mastodon/features/account_edit/components/char_counter.tsx b/app/javascript/mastodon/features/account_edit/components/char_counter.tsx
new file mode 100644
index 0000000000..a1e242b519
--- /dev/null
+++ b/app/javascript/mastodon/features/account_edit/components/char_counter.tsx
@@ -0,0 +1,27 @@
+import { FormattedMessage } from 'react-intl';
+
+import classNames from 'classnames';
+
+import { polymorphicForwardRef } from '@/types/polymorphic';
+
+import classes from '../styles.module.scss';
+
+export const CharCounter = polymorphicForwardRef<
+  'p',
+  { currentLength: number; maxLength: number }
+>(({ currentLength, maxLength, as: Component = 'p' }, ref) => (
+  <Component
+    ref={ref}
+    className={classNames(
+      classes.counter,
+      currentLength > maxLength && classes.counterError,
+    )}
+  >
+    <FormattedMessage
+      id='account_edit.char_counter'
+      defaultMessage='{currentLength}/{maxLength} characters'
+      values={{ currentLength, maxLength }}
+    />
+  </Component>
+));
+CharCounter.displayName = 'CharCounter';
diff --git a/app/javascript/mastodon/features/account_edit/components/emoji_picker.tsx b/app/javascript/mastodon/features/account_edit/components/emoji_picker.tsx
new file mode 100644
index 0000000000..e69b9e8b9d
--- /dev/null
+++ b/app/javascript/mastodon/features/account_edit/components/emoji_picker.tsx
@@ -0,0 +1,27 @@
+import { useCallback } from 'react';
+import type { FC } from 'react';
+
+import { isPlainObject } from '@reduxjs/toolkit';
+
+import EmojiPickerDropdown from '../../compose/containers/emoji_picker_dropdown_container';
+
+export const EmojiPicker: FC<{ onPick: (emoji: string) => void }> = ({
+  onPick,
+}) => {
+  const handlePick = useCallback(
+    (emoji: unknown) => {
+      if (isPlainObject(emoji)) {
+        if ('native' in emoji && typeof emoji.native === 'string') {
+          onPick(emoji.native);
+        } else if (
+          'shortcode' in emoji &&
+          typeof emoji.shortcode === 'string'
+        ) {
+          onPick(`:${emoji.shortcode}:`);
+        }
+      }
+    },
+    [onPick],
+  );
+  return <EmojiPickerDropdown onPickEmoji={handlePick} />;
+};
diff --git a/app/javascript/mastodon/features/account_edit/components/name_modal.tsx b/app/javascript/mastodon/features/account_edit/components/name_modal.tsx
new file mode 100644
index 0000000000..0b38419b6f
--- /dev/null
+++ b/app/javascript/mastodon/features/account_edit/components/name_modal.tsx
@@ -0,0 +1,87 @@
+import { useCallback, useId, useRef, useState } from 'react';
+import type { ChangeEventHandler, FC } from 'react';
+
+import { defineMessages, useIntl } from 'react-intl';
+
+import { TextInput } from '@/mastodon/components/form_fields';
+import { insertEmojiAtPosition } from '@/mastodon/features/emoji/utils';
+import type { BaseConfirmationModalProps } from '@/mastodon/features/ui/components/confirmation_modals';
+import { ConfirmationModal } from '@/mastodon/features/ui/components/confirmation_modals';
+import { useAccount } from '@/mastodon/hooks/useAccount';
+import { useCurrentAccountId } from '@/mastodon/hooks/useAccountId';
+
+import classes from '../styles.module.scss';
+
+import { CharCounter } from './char_counter';
+import { EmojiPicker } from './emoji_picker';
+
+const messages = defineMessages({
+  addTitle: {
+    id: 'account_edit.name_modal.add_title',
+    defaultMessage: 'Add display name',
+  },
+  editTitle: {
+    id: 'account_edit.name_modal.edit_title',
+    defaultMessage: 'Edit display name',
+  },
+  save: {
+    id: 'account_edit.save',
+    defaultMessage: 'Save',
+  },
+});
+
+const MAX_NAME_LENGTH = 30;
+
+export const NameModal: FC<BaseConfirmationModalProps> = ({ onClose }) => {
+  const intl = useIntl();
+  const titleId = useId();
+  const counterId = useId();
+  const inputRef = useRef<HTMLInputElement>(null);
+  const accountId = useCurrentAccountId();
+  const account = useAccount(accountId);
+
+  const [newName, setNewName] = useState(account?.display_name ?? '');
+  const handleChange: ChangeEventHandler<HTMLInputElement> = useCallback(
+    (event) => {
+      setNewName(event.currentTarget.value);
+    },
+    [],
+  );
+  const handlePickEmoji = useCallback((emoji: string) => {
+    setNewName((prev) => {
+      const position = inputRef.current?.selectionStart ?? prev.length;
+      return insertEmojiAtPosition(prev, emoji, position);
+    });
+  }, []);
+
+  return (
+    <ConfirmationModal
+      title={intl.formatMessage(messages.editTitle)}
+      titleId={titleId}
+      confirm={intl.formatMessage(messages.save)}
+      onConfirm={onClose} // To be implemented
+      onClose={onClose}
+      noCloseOnConfirm
+      noFocusButton
+    >
+      <div className={classes.inputWrapper}>
+        <TextInput
+          value={newName}
+          ref={inputRef}
+          onChange={handleChange}
+          className={classes.inputText}
+          aria-labelledby={titleId}
+          aria-describedby={counterId}
+          // eslint-disable-next-line jsx-a11y/no-autofocus -- This is a modal, it's fine.
+          autoFocus
+        />
+        <EmojiPicker onPick={handlePickEmoji} />
+      </div>
+      <CharCounter
+        currentLength={newName.length}
+        maxLength={MAX_NAME_LENGTH}
+        id={counterId}
+      />
+    </ConfirmationModal>
+  );
+};
diff --git a/app/javascript/mastodon/features/account_edit/components/section.tsx b/app/javascript/mastodon/features/account_edit/components/section.tsx
new file mode 100644
index 0000000000..21046b601d
--- /dev/null
+++ b/app/javascript/mastodon/features/account_edit/components/section.tsx
@@ -0,0 +1,62 @@
+import type { FC, ReactNode } from 'react';
+
+import type { MessageDescriptor } from 'react-intl';
+import { defineMessage, FormattedMessage, useIntl } from 'react-intl';
+
+import classNames from 'classnames';
+
+import { IconButton } from '@/mastodon/components/icon_button';
+import EditIcon from '@/material-icons/400-24px/edit.svg?react';
+
+import classes from '../styles.module.scss';
+
+const buttonMessage = defineMessage({
+  id: 'account_edit.section_edit_button',
+  defaultMessage: 'Edit',
+});
+
+interface AccountEditSectionProps {
+  title: MessageDescriptor;
+  description?: MessageDescriptor;
+  showDescription?: boolean;
+  onEdit?: () => void;
+  children?: ReactNode;
+  className?: string;
+  extraButtons?: ReactNode;
+}
+
+export const AccountEditSection: FC<AccountEditSectionProps> = ({
+  title,
+  description,
+  showDescription,
+  onEdit,
+  children,
+  className,
+  extraButtons,
+}) => {
+  const intl = useIntl();
+  return (
+    <section className={classNames(className, classes.section)}>
+      <header className={classes.sectionHeader}>
+        <h3 className={classes.sectionTitle}>
+          <FormattedMessage {...title} />
+        </h3>
+        {onEdit && (
+          <IconButton
+            icon='pencil'
+            iconComponent={EditIcon}
+            onClick={onEdit}
+            title={`${intl.formatMessage(buttonMessage)} ${intl.formatMessage(title)}`}
+          />
+        )}
+        {extraButtons}
+      </header>
+      {showDescription && (
+        <p className={classes.sectionSubtitle}>
+          <FormattedMessage {...description} />
+        </p>
+      )}
+      {children}
+    </section>
+  );
+};
diff --git a/app/javascript/mastodon/features/account_edit/index.tsx b/app/javascript/mastodon/features/account_edit/index.tsx
index 838a07f131..dc48641f37 100644
--- a/app/javascript/mastodon/features/account_edit/index.tsx
+++ b/app/javascript/mastodon/features/account_edit/index.tsx
@@ -1,23 +1,92 @@
+import { useCallback } from 'react';
 import type { FC } from 'react';
 
-import { FormattedMessage, useIntl } from 'react-intl';
+import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
 import { Link } from 'react-router-dom';
 
+import type { ModalType } from '@/mastodon/actions/modal';
+import { openModal } from '@/mastodon/actions/modal';
+import { AccountBio } from '@/mastodon/components/account_bio';
+import { Avatar } from '@/mastodon/components/avatar';
 import { Column } from '@/mastodon/components/column';
 import { ColumnHeader } from '@/mastodon/components/column_header';
+import { DisplayNameSimple } from '@/mastodon/components/display_name/simple';
 import { LoadingIndicator } from '@/mastodon/components/loading_indicator';
 import BundleColumnError from '@/mastodon/features/ui/components/bundle_column_error';
 import { useAccount } from '@/mastodon/hooks/useAccount';
 import { useCurrentAccountId } from '@/mastodon/hooks/useAccountId';
+import { autoPlayGif } from '@/mastodon/initial_state';
+import { useAppDispatch } from '@/mastodon/store';
 
+import { AccountEditSection } from './components/section';
 import classes from './styles.module.scss';
 
+const messages = defineMessages({
+  displayNameTitle: {
+    id: 'account_edit.display_name.title',
+    defaultMessage: 'Display name',
+  },
+  displayNamePlaceholder: {
+    id: 'account_edit.display_name.placeholder',
+    defaultMessage:
+      'Your display name is how your name appears on your profile and in timelines.',
+  },
+  bioTitle: {
+    id: 'account_edit.bio.title',
+    defaultMessage: 'Bio',
+  },
+  bioPlaceholder: {
+    id: 'account_edit.bio.placeholder',
+    defaultMessage: 'Add a short introduction to help others identify you.',
+  },
+  customFieldsTitle: {
+    id: 'account_edit.custom_fields.title',
+    defaultMessage: 'Custom fields',
+  },
+  customFieldsPlaceholder: {
+    id: 'account_edit.custom_fields.placeholder',
+    defaultMessage:
+      'Add your pronouns, external links, or anything else you’d like to share.',
+  },
+  featuredHashtagsTitle: {
+    id: 'account_edit.featured_hashtags.title',
+    defaultMessage: 'Featured hashtags',
+  },
+  featuredHashtagsPlaceholder: {
+    id: 'account_edit.featured_hashtags.placeholder',
+    defaultMessage:
+      'Help others identify, and have quick access to, your favorite topics.',
+  },
+  profileTabTitle: {
+    id: 'account_edit.profile_tab.title',
+    defaultMessage: 'Profile tab settings',
+  },
+  profileTabSubtitle: {
+    id: 'account_edit.profile_tab.subtitle',
+    defaultMessage: 'Customize the tabs on your profile and what they display.',
+  },
+});
+
 export const AccountEdit: FC<{ multiColumn: boolean }> = ({ multiColumn }) => {
   const accountId = useCurrentAccountId();
   const account = useAccount(accountId);
   const intl = useIntl();
 
+  const dispatch = useAppDispatch();
+  const handleOpenModal = useCallback(
+    (type: ModalType, props?: Record<string, unknown>) => {
+      dispatch(openModal({ modalType: type, modalProps: props ?? {} }));
+    },
+    [dispatch],
+  );
+  const handleNameEdit = useCallback(() => {
+    handleOpenModal('ACCOUNT_EDIT_NAME');
+  }, [handleOpenModal]);
+  const handleBioEdit = useCallback(() => {
+    handleOpenModal('ACCOUNT_EDIT_BIO');
+  }, [handleOpenModal]);
+
   if (!accountId) {
     return <BundleColumnError multiColumn={multiColumn} errorType='routing' />;
   }
@@ -30,6 +99,8 @@ export const AccountEdit: FC<{ multiColumn: boolean }> = ({ multiColumn }) => {
     );
   }
 
+  const headerSrc = autoPlayGif ? account.header : account.header_static;
+
   return (
     <Column bindToDocument={!multiColumn} className={classes.column}>
       <ColumnHeader
@@ -37,7 +108,7 @@ export const AccountEdit: FC<{ multiColumn: boolean }> = ({ multiColumn }) => {
           id: 'account_edit.column_title',
           defaultMessage: 'Edit Profile',
         })}
-        className={classes.header}
+        className={classes.columnHeader}
         showBackButton
         extraButton={
           <Link to={`/@${account.acct}`} className='button'>
@@ -48,6 +119,48 @@ export const AccountEdit: FC<{ multiColumn: boolean }> = ({ multiColumn }) => {
           </Link>
         }
       />
+      <header>
+        <div className={classes.profileImage}>
+          {headerSrc && <img src={headerSrc} alt='' />}
+        </div>
+        <Avatar account={account} size={80} className={classes.avatar} />
+      </header>
+
+      <AccountEditSection
+        title={messages.displayNameTitle}
+        description={messages.displayNamePlaceholder}
+        showDescription={account.display_name.length === 0}
+        onEdit={handleNameEdit}
+      >
+        <DisplayNameSimple account={account} />
+      </AccountEditSection>
+
+      <AccountEditSection
+        title={messages.bioTitle}
+        description={messages.bioPlaceholder}
+        showDescription={!account.note_plain}
+        onEdit={handleBioEdit}
+      >
+        <AccountBio accountId={accountId} />
+      </AccountEditSection>
+
+      <AccountEditSection
+        title={messages.customFieldsTitle}
+        description={messages.customFieldsPlaceholder}
+        showDescription
+      />
+
+      <AccountEditSection
+        title={messages.featuredHashtagsTitle}
+        description={messages.featuredHashtagsPlaceholder}
+        showDescription
+      />
+
+      <AccountEditSection
+        title={messages.profileTabTitle}
+        description={messages.profileTabSubtitle}
+        showDescription
+      />
     </Column>
   );
 };
diff --git a/app/javascript/mastodon/features/account_edit/styles.module.scss b/app/javascript/mastodon/features/account_edit/styles.module.scss
index 3662b51443..8af244d38b 100644
--- a/app/javascript/mastodon/features/account_edit/styles.module.scss
+++ b/app/javascript/mastodon/features/account_edit/styles.module.scss
@@ -3,7 +3,7 @@
   border-top-width: 0;
 }
 
-.header {
+.columnHeader {
   :global(.column-header__buttons) {
     align-items: center;
     padding-inline-end: 16px;
@@ -11,16 +11,100 @@
   }
 }
 
-.nav {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: 8px;
-  padding: 24px 24px 12px;
+.profileImage {
+  height: 120px;
+  background: var(--color-bg-secondary);
+  border-bottom: 1px solid var(--color-border-primary);
+  overflow: hidden;
 
-  > h1 {
-    flex-grow: 1;
-    font-weight: 600;
-    font-size: 15px;
+  @container (width >= 500px) {
+    height: 160px;
+  }
+
+  > img {
+    object-fit: cover;
+    object-position: top center;
+    width: 100%;
+    height: 100%;
   }
 }
+
+.avatar {
+  margin-top: -64px;
+  margin-left: 18px;
+  border: 1px solid var(--color-border-primary);
+}
+
+.section {
+  padding: 20px;
+  border-bottom: 1px solid var(--color-border-primary);
+  font-size: 15px;
+}
+
+.sectionHeader {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  margin-bottom: 8px;
+
+  > button {
+    border: 1px solid var(--color-border-primary);
+    border-radius: 8px;
+    box-sizing: border-box;
+    padding: 4px;
+
+    svg {
+      width: 20px;
+      height: 20px;
+    }
+  }
+}
+
+.sectionTitle {
+  flex-grow: 1;
+  font-size: 17px;
+  font-weight: 600;
+}
+
+.sectionSubtitle {
+  color: var(--color-text-secondary);
+}
+
+.inputWrapper {
+  position: relative;
+}
+
+// Override input styles
+.inputWrapper .inputText {
+  font-size: 15px;
+  padding-right: 32px;
+}
+
+textarea.inputText {
+  min-height: 82px;
+  height: 100%;
+
+  // 160px is approx the height of the modal header and footer
+  max-height: calc(80vh - 160px);
+}
+
+.inputWrapper :global(.emoji-picker-dropdown) {
+  position: absolute;
+  bottom: 10px;
+  right: 8px;
+  height: 24px;
+  z-index: 1;
+
+  :global(.icon-button) {
+    color: var(--color-text-secondary);
+  }
+}
+
+.counter {
+  margin-top: 4px;
+  font-size: 13px;
+}
+
+.counterError {
+  color: var(--color-text-error);
+}
diff --git a/app/javascript/mastodon/features/account_timeline/modals/note_modal.tsx b/app/javascript/mastodon/features/account_timeline/modals/note_modal.tsx
index 0fa665a9cc..0d736b3467 100644
--- a/app/javascript/mastodon/features/account_timeline/modals/note_modal.tsx
+++ b/app/javascript/mastodon/features/account_timeline/modals/note_modal.tsx
@@ -153,7 +153,7 @@ const InnerNodeModal: FC<{
       onConfirm={handleSave}
       updating={state === 'saving'}
       disabled={!isDirty}
-      closeWhenConfirm={false}
+      noCloseOnConfirm
       noFocusButton
     />
   );
diff --git a/app/javascript/mastodon/features/emoji/utils.ts b/app/javascript/mastodon/features/emoji/utils.ts
index d15aa96150..670e63a3c3 100644
--- a/app/javascript/mastodon/features/emoji/utils.ts
+++ b/app/javascript/mastodon/features/emoji/utils.ts
@@ -67,6 +67,24 @@ export function emojiToUnicodeHex(emoji: string): string {
   return codes.join('-');
 }
 
+const CHARS_ALLOWED_AROUND_EMOJI =
+  // eslint-disable-next-line no-control-regex
+  /[>< …\u0009-\u000d\u0085\u00a0\u1680\u2000-\u200a\u2028\u2029\u202f\u205f\u3000]/;
+
+// TODO: Move to picker file when that's being built out.
+export function insertEmojiAtPosition(
+  text: string,
+  emoji: string,
+  position = text.length,
+): string {
+  const isShortcode = isCustomEmoji(emoji);
+  const needsSpace =
+    isShortcode &&
+    position > 0 &&
+    !CHARS_ALLOWED_AROUND_EMOJI.test(text[position - 1] ?? '');
+  return `${text.slice(0, position)}${needsSpace ? ' ' : ''}${emoji} ${text.slice(position)}`;
+}
+
 function supportsRegExpSets() {
   return 'unicodeSets' in RegExp.prototype;
 }
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 a37e080d00..2ea413208e 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,20 +11,23 @@ export interface BaseConfirmationModalProps {
 export const ConfirmationModal: React.FC<
   {
     title: React.ReactNode;
+    titleId?: string;
     message?: React.ReactNode;
     confirm: React.ReactNode;
     cancel?: React.ReactNode;
     secondary?: React.ReactNode;
     onSecondary?: () => void;
     onConfirm: () => void;
-    closeWhenConfirm?: boolean;
+    noCloseOnConfirm?: boolean;
     extraContent?: React.ReactNode;
+    children?: React.ReactNode;
     updating?: boolean;
     disabled?: boolean;
     noFocusButton?: boolean;
   } & BaseConfirmationModalProps
 > = ({
   title,
+  titleId,
   message,
   confirm,
   cancel,
@@ -32,19 +35,20 @@ export const ConfirmationModal: React.FC<
   onConfirm,
   secondary,
   onSecondary,
-  closeWhenConfirm = true,
   extraContent,
+  children,
   updating,
   disabled,
+  noCloseOnConfirm = false,
   noFocusButton = false,
 }) => {
   const handleClick = useCallback(() => {
-    if (closeWhenConfirm) {
+    if (!noCloseOnConfirm) {
       onClose();
     }
 
     onConfirm();
-  }, [onClose, onConfirm, closeWhenConfirm]);
+  }, [onClose, onConfirm, noCloseOnConfirm]);
 
   const handleSecondary = useCallback(() => {
     onClose();
@@ -55,10 +59,10 @@ export const ConfirmationModal: React.FC<
     <div className='modal-root__modal safety-action-modal'>
       <div className='safety-action-modal__top'>
         <div className='safety-action-modal__confirmation'>
-          <h1>{title}</h1>
+          <h1 id={titleId}>{title}</h1>
           {message && <p>{message}</p>}
 
-          {extraContent}
+          {extraContent ?? children}
         </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 389ad7ea83..c27597fb52 100644
--- a/app/javascript/mastodon/features/ui/components/confirmation_modals/index.ts
+++ b/app/javascript/mastodon/features/ui/components/confirmation_modals/index.ts
@@ -1,3 +1,4 @@
+export type { BaseConfirmationModalProps } from './confirmation_modal';
 export { ConfirmationModal } from './confirmation_modal';
 export { ConfirmDeleteStatusModal } from './delete_status';
 export { ConfirmDeleteListModal } from './delete_list';
diff --git a/app/javascript/mastodon/features/ui/components/confirmation_modals/quiet_post_quote_info.tsx b/app/javascript/mastodon/features/ui/components/confirmation_modals/quiet_post_quote_info.tsx
index 534d72e6ce..eecffb1d25 100644
--- a/app/javascript/mastodon/features/ui/components/confirmation_modals/quiet_post_quote_info.tsx
+++ b/app/javascript/mastodon/features/ui/components/confirmation_modals/quiet_post_quote_info.tsx
@@ -33,7 +33,7 @@ const messages = defineMessages({
 /**
  * [1] Since we only want this modal to have two buttons – "Don't ask again" and
  * "Got it" – , we have to use the `onClose` handler to handle the "Don't ask again"
- * functionality. Because of this, we need to set `closeWhenConfirm` to false and
+ * functionality. Because of this, we need to set `noCloseOnConfirm` to true and
  * close the modal manually.
  * This prevents the modal from being dismissed permanently when just confirming.
  */
@@ -65,13 +65,13 @@ export const QuietPostQuoteInfoModal: React.FC<{ status: Status }> = ({
 
   return (
     <ConfirmationModal
-      closeWhenConfirm={false} // [1]
       title={intl.formatMessage(messages.title)}
       message={intl.formatMessage(messages.message)}
       confirm={intl.formatMessage(messages.got_it)}
       cancel={intl.formatMessage(messages.dismiss)}
       onConfirm={confirm}
       onClose={dismiss}
+      noCloseOnConfirm
     />
   );
 };
diff --git a/app/javascript/mastodon/features/ui/components/modal_root.jsx b/app/javascript/mastodon/features/ui/components/modal_root.jsx
index 4aae94574b..2e3efd4372 100644
--- a/app/javascript/mastodon/features/ui/components/modal_root.jsx
+++ b/app/javascript/mastodon/features/ui/components/modal_root.jsx
@@ -88,6 +88,8 @@ export const MODAL_COMPONENTS = {
   'ANNUAL_REPORT': AnnualReportModal,
   'COMPOSE_PRIVACY': () => Promise.resolve({ default: VisibilityModal }),
   'ACCOUNT_NOTE': () => import('@/mastodon/features/account_timeline/modals/note_modal').then(module => ({ default: module.AccountNoteModal })),
+  'ACCOUNT_EDIT_NAME': () => import('@/mastodon/features/account_edit/components/name_modal').then(module => ({ default: module.NameModal })),
+  'ACCOUNT_EDIT_BIO': () => import('@/mastodon/features/account_edit/components/bio_modal').then(module => ({ default: module.BioModal })),
 };
 
 export default class ModalRoot extends PureComponent {
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 9352ae5166..23b98dcc38 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -141,8 +141,25 @@
   "account.unmute": "Unmute @{name}",
   "account.unmute_notifications_short": "Unmute notifications",
   "account.unmute_short": "Unmute",
+  "account_edit.bio.placeholder": "Add a short introduction to help others identify you.",
+  "account_edit.bio.title": "Bio",
+  "account_edit.bio_modal.add_title": "Add bio",
+  "account_edit.bio_modal.edit_title": "Edit bio",
+  "account_edit.char_counter": "{currentLength}/{maxLength} characters",
   "account_edit.column_button": "Done",
   "account_edit.column_title": "Edit Profile",
+  "account_edit.custom_fields.placeholder": "Add your pronouns, external links, or anything else you’d like to share.",
+  "account_edit.custom_fields.title": "Custom fields",
+  "account_edit.display_name.placeholder": "Your display name is how your name appears on your profile and in timelines.",
+  "account_edit.display_name.title": "Display name",
+  "account_edit.featured_hashtags.placeholder": "Help others identify, and have quick access to, your favorite topics.",
+  "account_edit.featured_hashtags.title": "Featured hashtags",
+  "account_edit.name_modal.add_title": "Add display name",
+  "account_edit.name_modal.edit_title": "Edit display name",
+  "account_edit.profile_tab.subtitle": "Customize the tabs on your profile and what they display.",
+  "account_edit.profile_tab.title": "Profile tab settings",
+  "account_edit.save": "Save",
+  "account_edit.section_edit_button": "Edit",
   "account_note.placeholder": "Click to add note",
   "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
   "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",