diff --git a/src/actions/circle.ts b/src/actions/circle.ts
index 8bd0e0092..a43a9fea9 100644
--- a/src/actions/circle.ts
+++ b/src/actions/circle.ts
@@ -8,6 +8,7 @@ import type { APIEntity } from 'soapbox/types/entities';
 interface Interaction {
   acct: string;
   avatar?: string;
+  avatar_description?: string;
   replies: number;
   reblogs: number;
   favourites: number;
@@ -49,6 +50,7 @@ const processCircle = (setProgress: (progress: {
           interaction.reblogs += 1;
           interaction.acct = status.reblog.account.acct;
           interaction.avatar = status.reblog.account.avatar_static || status.reblog.account.avatar;
+          interaction.avatar_description = status.reblog.account.avatar_description;
         } else if (status.in_reply_to_account_id) {
           if (status.in_reply_to_account_id === me) return;
 
@@ -75,6 +77,7 @@ const processCircle = (setProgress: (progress: {
         interaction.favourites += 1;
         interaction.acct = status.account.acct;
         interaction.avatar = status.account.avatar_static || status.account.avatar;
+        interaction.avatar_description = status.account.avatar_description;
       });
 
       return next;
@@ -92,9 +95,9 @@ const processCircle = (setProgress: (progress: {
       if (!link) break;
     }
 
-    const result = await Promise.all(Object.entries(interactions).map(([id, { acct, avatar, favourites, reblogs, replies }]) => {
+    const result = await Promise.all(Object.entries(interactions).map(([id, { acct, avatar, avatar_description, favourites, reblogs, replies }]) => {
       const score = favourites + replies * 1.1 + reblogs * 1.3;
-      return { id, acct, avatar, score };
+      return { id, acct, avatar, avatar_description, score };
     }).toSorted((a, b) => b.score - a.score).slice(0, 49).map(async (interaction, index, array) => {
       setProgress({ state: 'fetchingAvatars', progress: 80 + (index / array.length) * 10 });
 
@@ -104,6 +107,7 @@ const processCircle = (setProgress: (progress: {
 
       interaction.acct = account.acct;
       interaction.avatar = account.avatar_static || account.avatar;
+      interaction.avatar_description = account.avatar_description;
 
       return interaction;
     }));
diff --git a/src/components/account.tsx b/src/components/account.tsx
index d171f3c5b..b408c7b42 100644
--- a/src/components/account.tsx
+++ b/src/components/account.tsx
@@ -196,7 +196,7 @@ const Account = ({
       <HStack alignItems={actionAlignment} space={3} justifyContent='between'>
         <HStack alignItems='center' space={3} className='overflow-hidden'>
           <div className='rounded-full'>
-            <Avatar src={account.avatar} size={avatarSize} />
+            <Avatar src={account.avatar} size={avatarSize} alt={account.avatar_description} />
             {emoji && (
               <Emoji
                 className='absolute -right-1.5 bottom-0 h-5 w-5'
@@ -251,7 +251,7 @@ const Account = ({
               wrapper={(children) => <HoverRefWrapper className='relative' accountId={account.id} inline>{children}</HoverRefWrapper>}
             >
               <LinkEl className='rounded-full' {...linkProps}>
-                <Avatar src={account.avatar} size={avatarSize} />
+                <Avatar src={account.avatar} size={avatarSize} alt={account.avatar_description} />
                 {emoji && (
                   <Emoji
                     className='absolute -right-1.5 bottom-0 h-5 w-5'
diff --git a/src/components/alt-indicator.tsx b/src/components/alt-indicator.tsx
new file mode 100644
index 000000000..f3e60ac50
--- /dev/null
+++ b/src/components/alt-indicator.tsx
@@ -0,0 +1,21 @@
+import clsx from 'clsx';
+import React from 'react';
+import { FormattedMessage } from 'react-intl';
+
+import { Icon } from './ui';
+
+interface IAltIndicator extends Pick<React.HTMLAttributes<HTMLSpanElement>, 'title' | 'className'> {
+  warning?: boolean;
+}
+
+const AltIndicator: React.FC<IAltIndicator> = ({ className, warning, ...props }) => (
+  <span
+    className={clsx('inline-flex items-center gap-1 rounded bg-gray-900 px-2 py-1 text-xs font-medium uppercase text-white', className)}
+    {...props}
+  >
+    {warning && <Icon className='h-4 w-4' src={require('@tabler/icons/outline/alert-triangle.svg')} />}
+    <FormattedMessage id='upload_form.description_missing.indicator' defaultMessage='Alt' />
+  </span>
+);
+
+export default AltIndicator;
diff --git a/src/components/avatar-stack.tsx b/src/components/avatar-stack.tsx
index 70d514f1e..53fa79606 100644
--- a/src/components/avatar-stack.tsx
+++ b/src/components/avatar-stack.tsx
@@ -29,6 +29,7 @@ const AvatarStack: React.FC<IAvatarStack> = ({ accountIds, limit = 3 }) => {
           <Avatar
             className='ring-1 ring-white dark:ring-primary-900'
             src={account.avatar}
+            alt={account.avatar_description}
             size={20}
           />
         </div>
diff --git a/src/components/groups/group-avatar.tsx b/src/components/groups/group-avatar.tsx
index 99cad4f71..6e444e181 100644
--- a/src/components/groups/group-avatar.tsx
+++ b/src/components/groups/group-avatar.tsx
@@ -29,6 +29,7 @@ const GroupAvatar = (props: IGroupAvatar) => {
         })
       }
       src={group.avatar}
+      alt={group.avatar_description}
       size={size}
     />
   );
diff --git a/src/components/ui/avatar/avatar.tsx b/src/components/ui/avatar/avatar.tsx
index 448ab7e52..4a37c7bf9 100644
--- a/src/components/ui/avatar/avatar.tsx
+++ b/src/components/ui/avatar/avatar.tsx
@@ -1,5 +1,6 @@
 import clsx from 'clsx';
 import React, { useState } from 'react';
+import { defineMessages, useIntl } from 'react-intl';
 
 import StillImage, { IStillImage } from 'soapbox/components/still-image';
 
@@ -7,14 +8,20 @@ import Icon from '../icon/icon';
 
 const AVATAR_SIZE = 42;
 
-interface IAvatar extends Pick<IStillImage, 'src' | 'onError' | 'className'> {
+const messages = defineMessages({
+  avatar: { id: 'account.avatar.alt', defaultMessage: 'Avatar' },
+});
+
+interface IAvatar extends Pick<IStillImage, 'alt' | 'src' | 'onError' | 'className'> {
   /** Width and height of the avatar in pixels. */
   size?: number;
 }
 
 /** Round profile avatar for accounts. */
 const Avatar = (props: IAvatar) => {
-  const { src, size = AVATAR_SIZE, className } = props;
+  const intl = useIntl();
+
+  const { alt, src, size = AVATAR_SIZE, className } = props;
 
   const [isAvatarMissing, setIsAvatarMissing] = useState<boolean>(false);
 
@@ -47,7 +54,7 @@ const Avatar = (props: IAvatar) => {
       className={clsx('rounded-full', className)}
       style={style}
       src={src}
-      alt='Avatar'
+      alt={alt || intl.formatMessage(messages.avatar)}
       onError={handleLoadFailure}
     />
   );
diff --git a/src/components/upload.tsx b/src/components/upload.tsx
index ac97d62c0..fd3785117 100644
--- a/src/components/upload.tsx
+++ b/src/components/upload.tsx
@@ -10,10 +10,11 @@ import zoomInIcon from '@tabler/icons/outline/zoom-in.svg';
 import clsx from 'clsx';
 import { List as ImmutableList } from 'immutable';
 import React, { useState } from 'react';
-import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
+import { defineMessages, useIntl } from 'react-intl';
 import { spring } from 'react-motion';
 
 import { openModal } from 'soapbox/actions/modals';
+import AltIndicator from 'soapbox/components/alt-indicator';
 import Blurhash from 'soapbox/components/blurhash';
 import { HStack, Icon, IconButton } from 'soapbox/components/ui';
 import Motion from 'soapbox/features/ui/util/optional-motion';
@@ -224,16 +225,14 @@ const Upload: React.FC<IUpload> = ({
             )}
 
             {missingDescriptionModal && !description && (
-              <span
+              <AltIndicator
+                warning
                 title={intl.formatMessage(messages.descriptionMissingTitle)}
-                className={clsx('absolute bottom-2 left-2 z-10 inline-flex items-center gap-1 rounded bg-gray-900 px-2 py-1 text-xs font-medium uppercase text-white transition-opacity duration-100 ease-linear', {
+                className={clsx('absolute bottom-2 left-2 z-10 transition-opacity duration-100 ease-linear', {
                   'opacity-0 pointer-events-none': active,
                   'opacity-100': !active,
                 })}
-              >
-                <Icon className='h-4 w-4' src={require('@tabler/icons/outline/alert-triangle.svg')} />
-                <FormattedMessage id='upload_form.description_missing.indicator' defaultMessage='Alt' />
-              </span>
+              />
             )}
 
             <div className='absolute inset-0 -z-[1] h-full w-full'>
diff --git a/src/features/account/components/header.tsx b/src/features/account/components/header.tsx
index 30f78a8b0..a5adf9925 100644
--- a/src/features/account/components/header.tsx
+++ b/src/features/account/components/header.tsx
@@ -29,7 +29,7 @@ import { Account } from 'soapbox/schemas';
 import toast from 'soapbox/toast';
 import { isDefaultHeader } from 'soapbox/utils/accounts';
 import copy from 'soapbox/utils/copy';
-import { MASTODON, parseVersion } from 'soapbox/utils/features';
+import { GOTOSOCIAL, MASTODON, parseVersion } from 'soapbox/utils/features';
 
 import type { PlfeResponse } from 'soapbox/api';
 
@@ -284,7 +284,7 @@ const Header: React.FC<IHeader> = ({ account }) => {
       return [];
     }
 
-    if (!ownAccount && features.rssFeeds && account.local) {
+    if (features.rssFeeds && account.local && (software !== GOTOSOCIAL || account.enable_rss)) {
       menu.push({
         text: intl.formatMessage(messages.subscribeFeed),
         icon: require('@tabler/icons/outline/rss.svg'),
@@ -535,7 +535,7 @@ const Header: React.FC<IHeader> = ({ account }) => {
       header = (
         <StillImage
           src={account.header}
-          alt={intl.formatMessage(messages.header)}
+          alt={account.header_description || intl.formatMessage(messages.header)}
         />
       );
 
@@ -592,7 +592,7 @@ const Header: React.FC<IHeader> = ({ account }) => {
   };
 
   const renderRssButton = () => {
-    if (ownAccount || !features.rssFeeds || !account.local) {
+    if (ownAccount || !features.rssFeeds || !account.local || (software === GOTOSOCIAL && !account.enable_rss)) {
       return null;
     }
 
@@ -637,6 +637,7 @@ const Header: React.FC<IHeader> = ({ account }) => {
             <a href={account.avatar} onClick={handleAvatarClick} target='_blank'>
               <Avatar
                 src={account.avatar}
+                alt={account.avatar_description}
                 size={96}
                 className='relative h-24 w-24 rounded-full bg-white ring-4 ring-white black:ring-black dark:bg-primary-900 dark:ring-primary-900'
               />
diff --git a/src/features/admin/components/report.tsx b/src/features/admin/components/report.tsx
index f16f69fdc..860d5b71c 100644
--- a/src/features/admin/components/report.tsx
+++ b/src/features/admin/components/report.tsx
@@ -83,7 +83,12 @@ const Report: React.FC<IReport> = ({ id }) => {
     <HStack space={3} className='p-3' key={report.id}>
       <HoverRefWrapper accountId={targetAccount.id} inline>
         <Link to={`/@${acct}`} title={acct}>
-          <Avatar src={targetAccount.avatar} size={32} className='overflow-hidden' />
+          <Avatar
+            src={targetAccount.avatar}
+            alt={account.avatar_description}
+            size={32}
+            className='overflow-hidden'
+          />
         </Link>
       </HoverRefWrapper>
 
diff --git a/src/features/chats/components/chat-list-item.tsx b/src/features/chats/components/chat-list-item.tsx
index 93c395ce3..19a90dcb5 100644
--- a/src/features/chats/components/chat-list-item.tsx
+++ b/src/features/chats/components/chat-list-item.tsx
@@ -80,7 +80,12 @@ const ChatListItem: React.FC<IChatListItemInterface> = ({ chat, onClick }) => {
     >
       <HStack alignItems='center' justifyContent='between' space={2} className='w-full'>
         <HStack alignItems='center' space={2} className='overflow-hidden'>
-          <Avatar src={chat.account?.avatar} size={40} className='flex-none' />
+          <Avatar
+            src={chat.account.avatar}
+            alt={chat.account.avatar_description}
+            size={40}
+            className='flex-none'
+          />
 
           <Stack alignItems='start' className='overflow-hidden'>
             <div className='flex w-full grow items-center space-x-1'>
diff --git a/src/features/chats/components/chat-message-list.tsx b/src/features/chats/components/chat-message-list.tsx
index d6bad1620..3f46ba1c6 100644
--- a/src/features/chats/components/chat-message-list.tsx
+++ b/src/features/chats/components/chat-message-list.tsx
@@ -179,7 +179,7 @@ const ChatMessageList: React.FC<IChatMessageList> = ({ chat }) => {
     return (
       <Stack alignItems='center' justifyContent='center' className='h-full grow'>
         <Stack alignItems='center' space={2}>
-          <Avatar src={chat.account.avatar} size={75} />
+          <Avatar src={chat.account.avatar} alt={chat.account.avatar_description} size={75} />
           <Text align='center'>
             <>
               <Text tag='span'>{intl.formatMessage(messages.blockedBy)}</Text>
diff --git a/src/features/chats/components/chat-page/components/chat-page-main.tsx b/src/features/chats/components/chat-page/components/chat-page-main.tsx
index c5c35b7c3..e83705dac 100644
--- a/src/features/chats/components/chat-page/components/chat-page-main.tsx
+++ b/src/features/chats/components/chat-page/components/chat-page-main.tsx
@@ -112,7 +112,7 @@ const ChatPageMain = () => {
             />
 
             <Link to={`/@${chat.account.acct}`}>
-              <Avatar src={chat.account.avatar} size={40} className='flex-none' />
+              <Avatar src={chat.account.avatar} alt={chat.account.avatar_description} size={40} className='flex-none' />
             </Link>
           </HStack>
 
@@ -139,7 +139,7 @@ const ChatPageMain = () => {
           <MenuList className='w-80'>
             <Stack space={4} className='px-6 py-5'>
               <HStack alignItems='center' space={3}>
-                <Avatar src={chat.account.avatar_static} size={50} />
+                <Avatar src={chat.account.avatar_static} alt={chat.account.avatar_description} size={50} />
                 <Stack>
                   <Text weight='semibold'>{chat.account.display_name}</Text>
                   <Text size='sm' theme='primary'>@{chat.account.acct}</Text>
diff --git a/src/features/chats/components/chat-search/results.tsx b/src/features/chats/components/chat-search/results.tsx
index 28bef255d..c3ea7e67b 100644
--- a/src/features/chats/components/chat-search/results.tsx
+++ b/src/features/chats/components/chat-search/results.tsx
@@ -34,7 +34,7 @@ const Results = ({ accountSearchResult, onSelect }: IResults) => {
       data-testid='account'
     >
       <HStack alignItems='center' space={2}>
-        <Avatar src={account.avatar} size={40} />
+        <Avatar src={account.avatar} alt={account.avatar_description} size={40} />
 
         <Stack alignItems='start'>
           <div className='flex grow items-center space-x-1'>
diff --git a/src/features/chats/components/chat-widget/chat-settings.tsx b/src/features/chats/components/chat-widget/chat-settings.tsx
index 937abdbd0..f4b7bf304 100644
--- a/src/features/chats/components/chat-widget/chat-settings.tsx
+++ b/src/features/chats/components/chat-widget/chat-settings.tsx
@@ -103,7 +103,7 @@ const ChatSettings = () => {
 
       <Stack space={4} className='mx-auto w-5/6'>
         <HStack alignItems='center' space={3}>
-          <Avatar src={chat.account.avatar_static} size={50} />
+          <Avatar src={chat.account.avatar_static} alt={chat.account.avatar_description} size={50} />
           <Stack>
             <Text weight='semibold'>{chat.account.display_name}</Text>
             <Text size='sm' theme='primary'>@{chat.account.acct}</Text>
diff --git a/src/features/chats/components/chat-widget/chat-window.tsx b/src/features/chats/components/chat-widget/chat-window.tsx
index 26a38d567..66432f320 100644
--- a/src/features/chats/components/chat-widget/chat-window.tsx
+++ b/src/features/chats/components/chat-widget/chat-window.tsx
@@ -66,7 +66,7 @@ const ChatWindow = () => {
             <HStack alignItems='center' space={3}>
               {isOpen && (
                 <Link to={`/@${chat.account.acct}`}>
-                  <Avatar src={chat.account.avatar} size={40} />
+                  <Avatar src={chat.account.avatar} alt={chat.account.avatar_description} size={40} />
                 </Link>
               )}
 
diff --git a/src/features/circle/index.tsx b/src/features/circle/index.tsx
index ac6a63b38..d3799d0b5 100644
--- a/src/features/circle/index.tsx
+++ b/src/features/circle/index.tsx
@@ -31,7 +31,7 @@ const Circle: React.FC = () => {
     progress: number;
   }>({ state: 'pending', progress: 0 });
   const [expanded, setExpanded] = useState(false);
-  const [users, setUsers] = useState<Array<{ id: string; avatar?: string; acct: string }>>();
+  const [users, setUsers] = useState<Array<{ id: string; avatar?: string; avatar_description?: string; acct: string }>>();
 
   const intl = useIntl();
   const dispatch = useAppDispatch();
@@ -153,7 +153,7 @@ const Circle: React.FC = () => {
               {users?.map(user => (
                 <Link key={user.id} to={`/@${user.acct}`}>
                   <HStack space={2} alignItems='center'>
-                    <Avatar size={20} src={user.avatar!} />
+                    <Avatar size={20} src={user.avatar!} alt={user.avatar_description} />
                     <Text size='sm' weight='semibold' truncate>
                       {user.acct}
                     </Text>
diff --git a/src/features/directory/components/account-card.tsx b/src/features/directory/components/account-card.tsx
index 514df696b..2bc2bf6c1 100644
--- a/src/features/directory/components/account-card.tsx
+++ b/src/features/directory/components/account-card.tsx
@@ -44,13 +44,18 @@ const AccountCard: React.FC<IAccountCard> = ({ id }) => {
 
         <img
           src={autoPlayGif ? account.header : account.header_static}
-          alt=''
+          alt={account.header_description}
           className='h-32 w-full rounded-t-lg object-cover'
         />
 
         <HoverRefWrapper key={account.id} accountId={account.id} inline>
           <Link to={`/@${account.acct}`} title={account.acct}>
-            <Avatar src={account.avatar} className='!absolute bottom-0 left-3 translate-y-1/2 bg-white ring-2 ring-white dark:bg-primary-900 dark:ring-primary-900' size={64} />
+            <Avatar
+              src={account.avatar}
+              alt={account.avatar_description}
+              className='!absolute bottom-0 left-3 translate-y-1/2 bg-white ring-2 ring-white dark:bg-primary-900 dark:ring-primary-900'
+              size={64}
+            />
           </Link>
         </HoverRefWrapper>
       </div>
diff --git a/src/features/edit-profile/components/avatar-picker.tsx b/src/features/edit-profile/components/avatar-picker.tsx
index c45e8f500..50dd9f0be 100644
--- a/src/features/edit-profile/components/avatar-picker.tsx
+++ b/src/features/edit-profile/components/avatar-picker.tsx
@@ -1,9 +1,17 @@
 import clsx from 'clsx';
 import React, { useRef } from 'react';
-import { FormattedMessage } from 'react-intl';
+import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
+import { openModal } from 'soapbox/actions/modals';
+import AltIndicator from 'soapbox/components/alt-indicator';
 import { Avatar, Icon, HStack } from 'soapbox/components/ui';
-import { useDraggedFiles } from 'soapbox/hooks';
+import { useAppDispatch, useDraggedFiles } from 'soapbox/hooks';
+
+const messages = defineMessages({
+  changeDescriptionHeading: { id: 'group.upload_avatar.alt.heading', defaultMessage: 'Change avatar description' },
+  changeDescriptionPlaceholder: { id: 'group.upload_avatar.alt.placeholder', defaultMessage: 'Image description' },
+  changeDescriptionConfirm: { id: 'group.upload_avatar.alt.confirm', defaultMessage: 'Save' },
+});
 
 interface IMediaInput {
   className?: string;
@@ -11,21 +19,44 @@ interface IMediaInput {
   accept?: string;
   onChange: (files: FileList | null) => void;
   disabled?: boolean;
+  description?: string;
+  onChangeDescription?: (value: string) => void;
 }
 
-const AvatarPicker = React.forwardRef<HTMLInputElement, IMediaInput>(({ className, src, onChange, accept, disabled }, ref) => {
+const AvatarPicker = React.forwardRef<HTMLInputElement, IMediaInput>(({
+  className, src, onChange, accept, disabled, description, onChangeDescription,
+}, ref) => {
+  const dispatch = useAppDispatch();
+  const intl = useIntl();
+
   const picker = useRef<HTMLLabelElement>(null);
 
   const { isDragging, isDraggedOver } = useDraggedFiles(picker, (files) => {
     onChange(files);
   });
 
+  const handleChangeDescriptionClick: React.MouseEventHandler<HTMLButtonElement> = (e) => {
+    e.stopPropagation();
+
+    dispatch(openModal('TEXT_FIELD', {
+      heading: intl.formatMessage(messages.changeDescriptionHeading),
+      message: intl.formatMessage(messages.changeDescriptionPlaceholder),
+      confirm: intl.formatMessage(messages.changeDescriptionConfirm),
+      onConfirm: (description: string) => {
+        onChangeDescription?.(description);
+      },
+      text: description,
+    }));
+  };
+
   return (
     <label
       ref={picker}
       className={clsx(
-        'absolute bottom-0 left-1/2 h-20 w-20 -translate-x-1/2 translate-y-1/2 cursor-pointer rounded-full bg-primary-300 ring-2',
+        'absolute bottom-0 left-1/2 h-20 w-20 -translate-x-1/2 translate-y-1/2 cursor-pointer bg-primary-300 ring-2',
         {
+          'rounded-lg': onChangeDescription,
+          'rounded-full': !onChangeDescription,
           'border-2 border-primary-600 border-dashed !z-[99] overflow-hidden': isDragging,
           'ring-white dark:ring-primary-900': !isDraggedOver,
           'ring-offset-2 ring-primary-600': isDraggedOver,
@@ -34,11 +65,13 @@ const AvatarPicker = React.forwardRef<HTMLInputElement, IMediaInput>(({ classNam
       )}
       style={{ height: 80, width: 80 }}
     >
-      {src && <Avatar src={src} size={80} />}
+      {src && <Avatar className={clsx(onChangeDescription && '!rounded-lg')} src={src} size={80} />}
       <HStack
         alignItems='center'
         justifyContent='center'
-        className={clsx('absolute left-0 top-0 h-full w-full rounded-full transition-opacity', {
+        className={clsx('absolute left-0 top-0 h-full w-full transition-opacity', {
+          'rounded-lg': onChangeDescription,
+          'rounded-full': !onChangeDescription,
           'opacity-0 hover:opacity-90 bg-primary-500': src,
         })}
       >
@@ -57,6 +90,11 @@ const AvatarPicker = React.forwardRef<HTMLInputElement, IMediaInput>(({ classNam
         disabled={disabled}
         className='hidden'
       />
+      {onChangeDescription && src && (
+        <button type='button' className='absolute left-1 top-1' onClick={handleChangeDescriptionClick}>
+          <AltIndicator warning={!description} />
+        </button>
+      )}
     </label>
   );
 });
diff --git a/src/features/edit-profile/components/header-picker.tsx b/src/features/edit-profile/components/header-picker.tsx
index bcf942142..63b88f38f 100644
--- a/src/features/edit-profile/components/header-picker.tsx
+++ b/src/features/edit-profile/components/header-picker.tsx
@@ -2,11 +2,16 @@ import clsx from 'clsx';
 import React, { useRef } from 'react';
 import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
 
+import { openModal } from 'soapbox/actions/modals';
+import AltIndicator from 'soapbox/components/alt-indicator';
 import { HStack, Icon, IconButton, Text } from 'soapbox/components/ui';
-import { useDraggedFiles } from 'soapbox/hooks';
+import { useAppDispatch, useDraggedFiles } from 'soapbox/hooks';
 
 const messages = defineMessages({
   title: { id: 'group.upload_banner.title', defaultMessage: 'Upload background picture' },
+  changeHeaderDescriptionHeading: { id: 'group.upload_banner.alt.heading', defaultMessage: 'Change header description' },
+  changeHeaderDescriptionPlaceholder: { id: 'group.upload_banner.alt.placeholder', defaultMessage: 'Image description' },
+  changeHeaderDescriptionConfirm: { id: 'group.upload_banner.alt.confirm', defaultMessage: 'Save' },
 });
 
 interface IMediaInput {
@@ -15,9 +20,14 @@ interface IMediaInput {
   onChange: (files: FileList | null) => void;
   onClear?: () => void;
   disabled?: boolean;
+  description?: string;
+  onChangeDescription?: (value: string) => void;
 }
 
-const HeaderPicker = React.forwardRef<HTMLInputElement, IMediaInput>(({ src, onChange, onClear, accept, disabled }, ref) => {
+const HeaderPicker = React.forwardRef<HTMLInputElement, IMediaInput>(({
+  src, onChange, onClear, accept, disabled, description, onChangeDescription,
+}, ref) => {
+  const dispatch = useAppDispatch();
   const intl = useIntl();
 
   const picker = useRef<HTMLLabelElement>(null);
@@ -32,6 +42,20 @@ const HeaderPicker = React.forwardRef<HTMLInputElement, IMediaInput>(({ src, onC
     onClear!();
   };
 
+  const handleChangeDescriptionClick: React.MouseEventHandler<HTMLButtonElement> = (e) => {
+    e.stopPropagation();
+
+    dispatch(openModal('TEXT_FIELD', {
+      heading: intl.formatMessage(messages.changeHeaderDescriptionHeading),
+      message: intl.formatMessage(messages.changeHeaderDescriptionPlaceholder),
+      confirm: intl.formatMessage(messages.changeHeaderDescriptionConfirm),
+      onConfirm: (description: string) => {
+        onChangeDescription?.(description);
+      },
+      text: description,
+    }));
+  };
+
   return (
     <label
       ref={picker}
@@ -82,6 +106,11 @@ const HeaderPicker = React.forwardRef<HTMLInputElement, IMediaInput>(({ src, onC
           iconClassName='h-5 w-5'
         />
       )}
+      {onChangeDescription && src && (
+        <button type='button' className='absolute left-2 top-2' onClick={handleChangeDescriptionClick}>
+          <AltIndicator warning={!description} />
+        </button>
+      )}
     </label>
   );
 });
diff --git a/src/features/edit-profile/index.tsx b/src/features/edit-profile/index.tsx
index 45a73355f..faf27797d 100644
--- a/src/features/edit-profile/index.tsx
+++ b/src/features/edit-profile/index.tsx
@@ -1,3 +1,4 @@
+import pick from 'lodash/pick';
 import React, { useState, useEffect } from 'react';
 import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
 
@@ -21,6 +22,7 @@ import { useAppDispatch, useOwnAccount, useFeatures, useInstance, useAppSelector
 import { useImageField } from 'soapbox/hooks/forms';
 import toast from 'soapbox/toast';
 import { isDefaultAvatar, isDefaultHeader } from 'soapbox/utils/accounts';
+import { GOTOSOCIAL, parseVersion } from 'soapbox/utils/features';
 
 import AvatarPicker from './components/avatar-picker';
 import HeaderPicker from './components/header-picker';
@@ -112,6 +114,12 @@ interface AccountCredentials {
   location?: string;
   /** User's birthday. */
   birthday?: string;
+  /** GoToSocial: Avatar image description. */
+  avatar_description?: string;
+  /** GoToSocial: Header image description. */
+  header_description?: string;
+  /** GoToSocial: Enable RSS feed for public posts */
+  enable_rss?: boolean;
 }
 
 /** Convert an account into an update_credentials request object. */
@@ -119,11 +127,8 @@ const accountToCredentials = (account: Account): AccountCredentials => {
   const hideNetwork = hidesNetwork(account);
 
   return {
-    discoverable: account.discoverable,
-    bot: account.bot,
-    display_name: account.display_name,
+    ...(pick(account, ['discoverable', 'bot', 'display_name', 'locked', 'location', 'avatar_description', 'header_description', 'enable_rss'])),
     note: account.source?.note ?? '',
-    locked: account.locked,
     fields_attributes: [...account.source?.fields ?? []],
     stranger_notifications: account.pleroma?.notification_settings?.block_from_strangers === true,
     accepts_email_list: account.pleroma?.accepts_email_list === true,
@@ -131,7 +136,6 @@ const accountToCredentials = (account: Account): AccountCredentials => {
     hide_follows: hideNetwork,
     hide_followers_count: hideNetwork,
     hide_follows_count: hideNetwork,
-    location: account.location,
     birthday: account.pleroma?.birthday ?? undefined,
   };
 };
@@ -168,10 +172,13 @@ const EditProfile: React.FC = () => {
   const intl = useIntl();
   const dispatch = useAppDispatch();
   const instance = useInstance();
+  const { software } = parseVersion(instance.version);
 
   const { account } = useOwnAccount();
   const features = useFeatures();
-  const maxFields = instance.pleroma.metadata.fields_limits.max_fields;
+  const maxFields = instance.configuration.accounts
+    ? instance.configuration.accounts.max_profile_fields
+    : instance.pleroma.metadata.fields_limits.max_fields;
 
   const attachmentTypes = useAppSelector(
     state => state.instance.configuration.media_attachments.supported_mime_types)
@@ -230,6 +237,10 @@ const EditProfile: React.FC = () => {
     event.preventDefault();
   };
 
+  const handleFieldChange = <T = any>(key: keyof AccountCredentials) => (value: T) => {
+    updateData(key, value);
+  };
+
   const handleCheckboxChange = (key: keyof AccountCredentials): React.ChangeEventHandler<HTMLInputElement> => e => {
     updateData(key, e.target.checked);
   };
@@ -270,12 +281,30 @@ const EditProfile: React.FC = () => {
     updateData('fields_attributes', fields);
   };
 
+  const handleAvatarChangeDescription = features.accountAvatarDescription
+    ? handleFieldChange<string>('avatar_description') : undefined;
+  const handleHeaderChangeDescription = features.accountAvatarDescription
+    ? handleFieldChange<string>('header_description') : undefined;
+
   return (
     <Column label={intl.formatMessage(messages.header)}>
       <Form onSubmit={handleSubmit}>
         <div className='relative mb-12 flex'>
-          <HeaderPicker accept={attachmentTypes} disabled={isLoading} {...header} />
-          <AvatarPicker className='!sm:left-6 !left-4 !translate-x-0' accept={attachmentTypes} disabled={isLoading} {...avatar} />
+          <HeaderPicker
+            accept={attachmentTypes}
+            disabled={isLoading}
+            description={data.header_description}
+            onChangeDescription={handleHeaderChangeDescription}
+            {...header}
+          />
+          <AvatarPicker
+            className='!sm:left-6 !left-4 !translate-x-0'
+            accept={attachmentTypes}
+            disabled={isLoading}
+            description={data.avatar_description}
+            onChangeDescription={handleAvatarChangeDescription}
+            {...avatar}
+          />
         </div>
 
         <FormGroup
@@ -396,6 +425,17 @@ const EditProfile: React.FC = () => {
               />
             </ListItem>
           )}
+
+          {features.rssFeeds && software === GOTOSOCIAL && (
+            <ListItem
+              label={<FormattedMessage id='edit_profile.fields.rss_label' defaultMessage='Enable RSS feed for public posts' />}
+            >
+              <Toggle
+                checked={data.enable_rss}
+                onChange={handleCheckboxChange('enable_rss')}
+              />
+            </ListItem>
+          )}
         </List>
 
         {features.profileFields && (
diff --git a/src/features/group/group-timeline.tsx b/src/features/group/group-timeline.tsx
index 75709d856..d04c904d1 100644
--- a/src/features/group/group-timeline.tsx
+++ b/src/features/group/group-timeline.tsx
@@ -69,7 +69,7 @@ const GroupTimeline: React.FC<IGroupTimeline> = (props) => {
             })}
           >
             <Link to={`/@${account.acct}`}>
-              <Avatar src={account.avatar} size={42} />
+              <Avatar src={account.avatar} alt={account.avatar_description} size={42} />
             </Link>
 
             <ComposeForm
diff --git a/src/features/onboarding/steps/avatar-selection-step.tsx b/src/features/onboarding/steps/avatar-selection-step.tsx
index be5d62601..5dd2cd98c 100644
--- a/src/features/onboarding/steps/avatar-selection-step.tsx
+++ b/src/features/onboarding/steps/avatar-selection-step.tsx
@@ -72,7 +72,7 @@ const AvatarSelectionStep = ({ onNext }: { onNext: () => void }) => {
       <Stack space={10}>
         <div className='relative mx-auto rounded-full bg-gray-200'>
           {account && (
-            <Avatar src={selectedFile || account.avatar} size={175} />
+            <Avatar src={selectedFile || account.avatar} alt={account.avatar_description} size={175} />
           )}
 
           {isSubmitting && (
diff --git a/src/features/onboarding/steps/cover-photo-selection-step.tsx b/src/features/onboarding/steps/cover-photo-selection-step.tsx
index a77e5a6c6..d3c160955 100644
--- a/src/features/onboarding/steps/cover-photo-selection-step.tsx
+++ b/src/features/onboarding/steps/cover-photo-selection-step.tsx
@@ -81,7 +81,7 @@ const CoverPhotoSelectionStep = ({ onNext }: { onNext: () => void }) => {
             {selectedFile || account?.header && (
               <StillImage
                 src={selectedFile || account.header}
-                alt={intl.formatMessage(messages.header)}
+                alt={account.header_description || intl.formatMessage(messages.header)}
                 className='absolute inset-0 rounded-t-md object-cover'
               />
             )}
@@ -111,7 +111,12 @@ const CoverPhotoSelectionStep = ({ onNext }: { onNext: () => void }) => {
 
           <div className='flex flex-col px-4 pb-4'>
             {account && (
-              <Avatar src={account.avatar} size={64} className='-mt-8 mb-2 ring-2 ring-white dark:ring-primary-800' />
+              <Avatar
+                src={account.avatar}
+                alt={account.avatar_description}
+                size={64}
+                className='-mt-8 mb-2 ring-2 ring-white dark:ring-primary-800'
+              />
             )}
 
             <Text weight='bold' size='sm'>{account?.display_name}</Text>
diff --git a/src/features/ui/components/compose-button.tsx b/src/features/ui/components/compose-button.tsx
index 1994899bd..051ab028e 100644
--- a/src/features/ui/components/compose-button.tsx
+++ b/src/features/ui/components/compose-button.tsx
@@ -57,7 +57,7 @@ const GroupComposeButton = () => {
       block
     >
       <HStack space={3} alignItems='center'>
-        <Avatar className='-my-1 border-2 border-white' size={30} src={group.avatar} />
+        <Avatar className='-my-1 border-2 border-white' size={30} src={group.avatar} alt={group.avatar_description} />
         <span>
           <FormattedMessage id='navigation.compose_group' defaultMessage='Compose to group' />
         </span>
diff --git a/src/features/ui/components/floating-action-button.tsx b/src/features/ui/components/floating-action-button.tsx
index 1254d7d5a..b8af9abc4 100644
--- a/src/features/ui/components/floating-action-button.tsx
+++ b/src/features/ui/components/floating-action-button.tsx
@@ -72,7 +72,7 @@ const GroupFAB: React.FC = () => {
       aria-label={intl.formatMessage(messages.publish)}
     >
       <HStack space={3} alignItems='center'>
-        <Avatar className='-my-3 -ml-2 border-white' size={42} src={group.avatar} />
+        <Avatar className='-my-3 -ml-2 border-white' size={42} src={group.avatar} alt={group.avatar_description} />
         <Icon
           src={require('@tabler/icons/outline/pencil-plus.svg')}
           className='h-6 w-6'
diff --git a/src/features/ui/components/modal-root.tsx b/src/features/ui/components/modal-root.tsx
index 30fb15e30..ea44904fe 100644
--- a/src/features/ui/components/modal-root.tsx
+++ b/src/features/ui/components/modal-root.tsx
@@ -17,6 +17,7 @@ import {
   EditBookmarkFolderModal,
   EditDomainModal,
   EditFederationModal,
+  EditRuleModal,
   EmbedModal,
   EventMapModal,
   EventParticipantsModal,
@@ -37,9 +38,9 @@ import {
   ReplyMentionsModal,
   ReportModal,
   SelectBookmarkFolderModal,
+  TextFieldModal,
   UnauthorizedModal,
   VideoModal,
-  EditRuleModal,
 } from 'soapbox/features/ui/util/async-components';
 
 import ModalLoading from './modal-loading';
@@ -82,6 +83,7 @@ const MODAL_COMPONENTS: Record<string, React.LazyExoticComponent<any>> = {
   'REPLY_MENTIONS': ReplyMentionsModal,
   'REPORT': ReportModal,
   'SELECT_BOOKMARK_FOLDER': SelectBookmarkFolderModal,
+  'TEXT_FIELD': TextFieldModal,
   'UNAUTHORIZED': UnauthorizedModal,
   'VIDEO': VideoModal,
 };
diff --git a/src/features/ui/components/modals/manage-group-modal/steps/confirmation-step.tsx b/src/features/ui/components/modals/manage-group-modal/steps/confirmation-step.tsx
index 63398bf2a..e9fa416ee 100644
--- a/src/features/ui/components/modals/manage-group-modal/steps/confirmation-step.tsx
+++ b/src/features/ui/components/modals/manage-group-modal/steps/confirmation-step.tsx
@@ -48,7 +48,7 @@ const ConfirmationStep: React.FC<IConfirmationStep> = ({ group }) => {
           </label>
 
           <label className='mx-auto -mt-10 cursor-pointer rounded-full bg-primary-500 ring-2 ring-white dark:ring-primary-900'>
-            {group.avatar && <Avatar src={group.avatar} size={80} />}
+            {group.avatar && <Avatar src={group.avatar} alt={group.avatar_description} size={80} />}
           </label>
         </Stack>
 
diff --git a/src/features/ui/components/modals/text-field-modal.tsx b/src/features/ui/components/modals/text-field-modal.tsx
new file mode 100644
index 000000000..d27809f2f
--- /dev/null
+++ b/src/features/ui/components/modals/text-field-modal.tsx
@@ -0,0 +1,62 @@
+import React, { useState } from 'react';
+import { FormattedMessage } from 'react-intl';
+
+import { Modal, Stack, Textarea } from 'soapbox/components/ui';
+
+import type { ButtonThemes } from 'soapbox/components/ui/button/useButtonStyles';
+
+interface ITextFieldModal {
+  heading: React.ReactNode;
+  placeholder?: string;
+  confirm: React.ReactNode;
+  onClose: (type: string) => void;
+  onConfirm: (value?: string) => void;
+  onCancel: () => void;
+  confirmationTheme?: ButtonThemes;
+  text?: string;
+}
+
+const TextFieldModal: React.FC<ITextFieldModal> = ({
+  heading,
+  placeholder,
+  confirm,
+  onClose,
+  onConfirm,
+  onCancel,
+  confirmationTheme,
+  text,
+}) => {
+  const [value, setValue] = useState(text);
+
+  const handleClick = () => {
+    onClose('CONFIRM');
+    onConfirm(value);
+  };
+
+  const handleCancel = () => {
+    onClose('CONFIRM');
+    if (onCancel) onCancel();
+  };
+
+  return (
+    <Modal
+      title={heading}
+      confirmationAction={handleClick}
+      confirmationText={confirm}
+      confirmationTheme={confirmationTheme}
+      cancelText={<FormattedMessage id='confirmation_modal.cancel' defaultMessage='Cancel' />}
+      cancelAction={handleCancel}
+    >
+      <Stack space={4}>
+        <Textarea
+          value={value}
+          onChange={({ target }) => setValue(target.value)}
+          autoComplete='off'
+          placeholder={placeholder}
+        />
+      </Stack>
+    </Modal>
+  );
+};
+
+export { TextFieldModal as default };
diff --git a/src/features/ui/components/user-panel.tsx b/src/features/ui/components/user-panel.tsx
index 0841d6dc2..2e4eaf0c3 100644
--- a/src/features/ui/components/user-panel.tsx
+++ b/src/features/ui/components/user-panel.tsx
@@ -36,7 +36,7 @@ const UserPanel: React.FC<IUserPanel> = ({ accountId, action, badges, domain })
         <Stack>
           <div className='relative -mx-4 -mt-4 h-24 overflow-hidden bg-gray-200'>
             {header && (
-              <StillImage src={account.header} />
+              <StillImage src={account.header} alt={account.header_description} />
             )}
           </div>
 
@@ -46,7 +46,12 @@ const UserPanel: React.FC<IUserPanel> = ({ accountId, action, badges, domain })
               title={acct}
               className='-mt-12 block'
             >
-              <Avatar src={account.avatar} size={80} className='h-20 w-20 overflow-hidden bg-gray-50 ring-2 ring-white' />
+              <Avatar
+                src={account.avatar}
+                alt={account.avatar_description}
+                size={80}
+                className='h-20 w-20 overflow-hidden bg-gray-50 ring-2 ring-white'
+              />
             </Link>
 
             {action && (
diff --git a/src/features/ui/util/async-components.ts b/src/features/ui/util/async-components.ts
index 547ca879b..4f6e55e13 100644
--- a/src/features/ui/util/async-components.ts
+++ b/src/features/ui/util/async-components.ts
@@ -161,3 +161,4 @@ export const EditRuleModal = lazy(() => import('soapbox/features/ui/components/m
 export const DraftStatuses = lazy(() => import('soapbox/features/draft-statuses'));
 export const Circle = lazy(() => import('soapbox/features/circle'));
 export const BubbleTimeline = lazy(() => import('soapbox/features/bubble-timeline'));
+export const TextFieldModal = lazy(() => import('soapbox/features/ui/components/modals/text-field-modal'));
diff --git a/src/locales/en.json b/src/locales/en.json
index cf2980d80..7e5c6c637 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -3,6 +3,7 @@
   "accordion.collapse": "Collapse",
   "accordion.expand": "Expand",
   "account.add_or_remove_from_list": "Add or Remove from lists",
+  "account.avatar.alt": "Avatar",
   "account.badges.bot": "Bot",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -652,6 +653,7 @@
   "edit_profile.fields.meta_fields.content_placeholder": "Content",
   "edit_profile.fields.meta_fields.label_placeholder": "Label",
   "edit_profile.fields.meta_fields_label": "Profile fields",
+  "edit_profile.fields.rss_label": "Enable RSS feed for public posts",
   "edit_profile.fields.stranger_notifications_label": "Block notifications from strangers",
   "edit_profile.header": "Edit profile",
   "edit_profile.hints.accepts_email_list": "Opt-in to news and marketing updates.",
@@ -857,7 +859,13 @@
   "group.tabs.members": "Members",
   "group.update.success": "Group successfully saved",
   "group.upload_avatar": "Upload avatar",
+  "group.upload_avatar.alt.confirm": "Save",
+  "group.upload_avatar.alt.heading": "Change avatar description",
+  "group.upload_avatar.alt.placeholder": "Image description",
   "group.upload_banner": "Upload photo",
+  "group.upload_banner.alt.confirm": "Save",
+  "group.upload_banner.alt.heading": "Change header description",
+  "group.upload_banner.alt.placeholder": "Image description",
   "group.upload_banner.title": "Upload background picture",
   "groups.discover.search.results.member_count": "{members, plural, one {member} other {members}}",
   "groups.empty.subtitle": "Start discovering groups to join or create your own.",
diff --git a/src/pages/home-page.tsx b/src/pages/home-page.tsx
index 175384bcb..b0dc9401f 100644
--- a/src/pages/home-page.tsx
+++ b/src/pages/home-page.tsx
@@ -64,7 +64,7 @@ const HomePage: React.FC<IHomePage> = ({ children }) => {
             <CardBody>
               <HStack alignItems='start' space={2}>
                 <Link to={`/@${acct}`}>
-                  <Avatar src={avatar} size={42} />
+                  <Avatar src={avatar} alt={account?.avatar_description} size={42} />
                 </Link>
 
                 <div className='w-full translate-y-0.5'>
diff --git a/src/schemas/account.ts b/src/schemas/account.ts
index 2dfc95f51..a2a9f4286 100644
--- a/src/schemas/account.ts
+++ b/src/schemas/account.ts
@@ -34,17 +34,20 @@ const roleSchema = z.object({
 const baseAccountSchema = z.object({
   acct: z.string().catch(''),
   avatar: z.string().catch(avatarMissing),
+  avatar_description: z.string().catch(''),
   avatar_static: z.string().url().optional().catch(undefined),
   bot: z.boolean().catch(false),
   created_at: z.string().datetime().catch(new Date().toUTCString()),
   discoverable: z.boolean().catch(false),
   display_name: z.string().catch(''),
   emojis: filteredArray(customEmojiSchema),
+  enable_rss: z.boolean().catch(false),
   fields: filteredArray(fieldSchema),
   followers_count: z.number().catch(0),
   following_count: z.number().catch(0),
   fqn: z.string().optional().catch(undefined),
   header: z.string().url().catch(headerMissing),
+  header_description: z.string().catch(''),
   header_static: z.string().url().optional().catch(undefined),
   id: z.string(),
   last_status_at: z.string().datetime().optional().catch(undefined),
diff --git a/src/schemas/group.ts b/src/schemas/group.ts
index 6cca9480e..d91b485fb 100644
--- a/src/schemas/group.ts
+++ b/src/schemas/group.ts
@@ -13,12 +13,14 @@ const headerMissing = require('soapbox/assets/images/header-missing.png');
 
 const groupSchema = z.object({
   avatar: z.string().catch(avatarMissing),
+  avatar_description: z.string().catch(''),
   avatar_static: z.string().catch(''),
   created_at: z.string().datetime().catch(new Date().toUTCString()),
   display_name: z.string().catch(''),
   domain: z.string().catch(''),
   emojis: filteredArray(customEmojiSchema),
   header: z.string().catch(headerMissing),
+  header_description: z.string().catch(''),
   header_static: z.string().catch(''),
   id: z.coerce.string(),
   locked: z.boolean().catch(false),
diff --git a/src/schemas/instance.ts b/src/schemas/instance.ts
index 81345488f..a64b6c103 100644
--- a/src/schemas/instance.ts
+++ b/src/schemas/instance.ts
@@ -30,6 +30,11 @@ const fixVersion = (version: string) => {
 };
 
 const configurationSchema = coerceObject({
+  accounts: z.object({
+    allow_custom_css: z.boolean(),
+    max_featured_tags: z.number().int(),
+    max_profile_fields: z.number().int(),
+  }).nullable().catch(null),
   chats: coerceObject({
     max_characters: z.number().catch(5000),
     max_media_attachments: z.number().catch(1),
diff --git a/src/utils/accounts.ts b/src/utils/accounts.ts
index 93334e15a..c3e0c7890 100644
--- a/src/utils/accounts.ts
+++ b/src/utils/accounts.ts
@@ -1,3 +1,5 @@
+import range from 'lodash/range';
+
 import type { Account } from 'soapbox/schemas';
 
 const getDomainFromURL = (account: Pick<Account, 'url'>): string => {
@@ -41,6 +43,7 @@ const isDefaultHeader = (url: string) => DEFAULT_HEADERS.some(header => url.ends
 const DEFAULT_AVATARS = [
   '/avatars/original/missing.png', // Mastodon
   '/images/avi.png', // Pleroma
+  ...(range(1, 6).map(i => `/assets/default_avatars/GoToSocial_icon${i}.webp`)), // GoToSocial
   '/assets/default_avatars/GoToSocial_icon2.webp', // GoToSocial
   require('soapbox/assets/images/avatar-missing.png'), // avatar not provided by backend
 ];
diff --git a/src/utils/features.ts b/src/utils/features.ts
index c7b71c6bf..b50d67979 100644
--- a/src/utils/features.ts
+++ b/src/utils/features.ts
@@ -26,6 +26,12 @@ const FIREFISH = 'Firefish';
  */
 const FRIENDICA = 'Friendica';
 
+/**
+ * GoToSocial, an ActivityPub server writter in Golang.
+ * @see {@link https://gotosocial.org/}
+ */
+const GOTOSOCIAL = 'GoToSocial';
+
 /**
  * Iceshrimp, yet another Misskey fork.
  * @see {@link https://iceshrimp.dev/}
@@ -62,6 +68,12 @@ const PLEROMA = 'Pleroma';
  */
 const TAKAHE = 'Takahe';
 
+/**
+ * Toki, a C# Fediverse server.
+ * @see {@link https://github.com/purifetchi/Toki}
+ */
+const TOKI = 'Toki';
+
 /**
  * Akkoma, a Pleroma fork.
  * @see {@link https://akkoma.dev/AkkomaGang/akkoma}
@@ -81,18 +93,6 @@ const GLITCH = 'glitch';
 // NOTE: Rebased is named 'soapbox' for legacy reasons.
 const REBASED = 'soapbox';
 
-/**
- * GoToSocial, an ActivityPub server writter in Golang.
- * @see {@link https://gotosocial.org/}
- */
-const GOTOSOCIAL = 'GoToSocial';
-
-/**
- * Toki, a C# Fediverse server.
- * @see {@link https://github.com/purifetchi/Toki}
- */
-const TOKI = 'Toki';
-
 /** Backend name reserved only for tests. */
 const UNRELEASED = 'unreleased';
 
@@ -109,6 +109,12 @@ const getInstanceFeatures = (instance: Instance) => {
      */
     accountAliases: v.software === PLEROMA,
 
+    /**
+     * Ability to set description of profile avatar and header.
+     * @see PATCH /api/v1/accounts/update_credentials
+     */
+    accountAvatarDescription: v.software === GOTOSOCIAL,
+
     /**
      * The accounts API allows an acct instead of an ID.
      * @see GET /api/v1/accounts/:acct_or_id
@@ -839,7 +845,7 @@ const getInstanceFeatures = (instance: Instance) => {
     rssFeeds: any([
       v.software === MASTODON,
       v.software === PLEROMA,
-      // v.software === GOTOSOCIAL, // TODO
+      v.software === GOTOSOCIAL,
     ]),
 
     /**
@@ -1005,12 +1011,14 @@ const parseVersion = (version: string): Backend => {
 export {
   FIREFISH,
   FRIENDICA,
+  GOTOSOCIAL,
   ICESHRIMP,
   MASTODON,
   MITRA,
   PIXELFED,
   PLEROMA,
   TAKAHE,
+  TOKI,
   AKKOMA,
   GLITCH,
   REBASED,