diff --git a/app/soapbox/features/soapbox_config/index.tsx b/app/soapbox/features/soapbox_config/index.tsx
index 760616453..e734f1b87 100644
--- a/app/soapbox/features/soapbox_config/index.tsx
+++ b/app/soapbox/features/soapbox_config/index.tsx
@@ -7,7 +7,17 @@ import { updateConfig } from 'soapbox/actions/admin';
 import { uploadMedia } from 'soapbox/actions/media';
 import snackbar from 'soapbox/actions/snackbar';
 import List, { ListItem } from 'soapbox/components/list';
-import { Column, Form, FormActions, FormGroup, Input, Textarea, Button } from 'soapbox/components/ui';
+import {
+  Column,
+  CardHeader,
+  CardTitle,
+  Form,
+  FormActions,
+  FormGroup,
+  Input,
+  Textarea,
+  Button,
+} from 'soapbox/components/ui';
 import Streamfield from 'soapbox/components/ui/streamfield/streamfield';
 import ThemeSelector from 'soapbox/features/ui/components/theme-selector';
 import { useAppSelector, useAppDispatch } from 'soapbox/hooks';
@@ -197,6 +207,10 @@ const SoapboxConfig: React.FC = () => {
             />
           </FormGroup>
 
+          <CardHeader>
+            <CardTitle title={<FormattedMessage id='soapbox_config.headings.theme' defaultMessage='Theme' />} />
+          </CardHeader>
+
           <List>
             <ListItem label={<FormattedMessage id='soapbox_config.fields.theme_label' defaultMessage='Default theme' />}>
               <ThemeSelector
@@ -222,14 +236,9 @@ const SoapboxConfig: React.FC = () => {
             </ListItem>
           </List>
 
-          <FormGroup labelText={intl.formatMessage(messages.copyrightFooterLabel)}>
-            <Input
-              type='text'
-              placeholder={intl.formatMessage(messages.copyrightFooterLabel)}
-              value={soapbox.copyright}
-              onChange={handleChange(['copyright'], (e) => e.target.value)}
-            />
-          </FormGroup>
+          <CardHeader>
+            <CardTitle title={<FormattedMessage id='soapbox_config.headings.options' defaultMessage='Options' />} />
+          </CardHeader>
 
           <List>
             <ListItem label={intl.formatMessage(messages.verifiedCanEditNameLabel)}>
@@ -246,7 +255,6 @@ const SoapboxConfig: React.FC = () => {
               />
             </ListItem>
 
-
             <ListItem label={intl.formatMessage(messages.greentextLabel)}>
               <Toggle
                 checked={soapbox.greentext === true}
@@ -286,6 +294,10 @@ const SoapboxConfig: React.FC = () => {
             )}
           </List>
 
+          <CardHeader>
+            <CardTitle title={<FormattedMessage id='soapbox_config.headings.navigation' defaultMessage='Navigation' />} />
+          </CardHeader>
+
           <Streamfield
             label={<FormattedMessage id='soapbox_config.fields.promo_panel_fields_label' defaultMessage='Promo panel items' />}
             hint={<FormattedMessage id='soapbox_config.hints.promo_panel_fields' defaultMessage='You can have custom defined links displayed on the right panel of the timelines page.' />}
@@ -306,6 +318,19 @@ const SoapboxConfig: React.FC = () => {
             onRemoveItem={deleteStreamItem(['navlinks', 'homeFooter'])}
           />
 
+          <FormGroup labelText={intl.formatMessage(messages.copyrightFooterLabel)}>
+            <Input
+              type='text'
+              placeholder={intl.formatMessage(messages.copyrightFooterLabel)}
+              value={soapbox.copyright}
+              onChange={handleChange(['copyright'], (e) => e.target.value)}
+            />
+          </FormGroup>
+
+          <CardHeader>
+            <CardTitle title={<FormattedMessage id='soapbox_config.headings.cryptocurrency' defaultMessage='Cryptocurrency' />} />
+          </CardHeader>
+
           <Streamfield
             label={<FormattedMessage id='soapbox_config.fields.crypto_addresses_label' defaultMessage='Cryptocurrency addresses' />}
             hint={<FormattedMessage id='soapbox_config.hints.crypto_addresses' defaultMessage='Add cryptocurrency addresses so users of your site can donate to you. Order matters, and you must use lowercase ticker values.' />}
@@ -327,6 +352,10 @@ const SoapboxConfig: React.FC = () => {
             />
           </FormGroup>
 
+          <CardHeader>
+            <CardTitle title={<FormattedMessage id='soapbox_config.headings.advanced' defaultMessage='Advanced' />} />
+          </CardHeader>
+
           <Accordion
             headline={intl.formatMessage(messages.rawJSONLabel)}
             expanded={jsonEditorExpanded}