diff --git a/app/soapbox/components/__tests__/column_back_button_slim-test.js b/app/soapbox/components/__tests__/column_back_button_slim-test.js
deleted file mode 100644
index a7865fb29..000000000
--- a/app/soapbox/components/__tests__/column_back_button_slim-test.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import React from 'react';
-import ColumnBackButtonSlim from '../column_back_button_slim';
-import { createComponent } from 'soapbox/test_helpers';
-
-describe('<ColumnBackButtonSlim />', () => {
-  it('renders correctly', () => {
-    const component = createComponent(<ColumnBackButtonSlim />);
-    const tree = component.toJSON();
-    expect(tree).toMatchSnapshot();
-  });
-});
diff --git a/app/soapbox/components/column_back_button_slim.js b/app/soapbox/components/column_back_button_slim.js
deleted file mode 100644
index 70f4081df..000000000
--- a/app/soapbox/components/column_back_button_slim.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import React from 'react';
-import { FormattedMessage } from 'react-intl';
-import ColumnBackButton from './column_back_button';
-import Icon from 'soapbox/components/icon';
-
-export default class ColumnBackButtonSlim extends ColumnBackButton {
-
-  render() {
-    return (
-      <div className='column-back-button--slim'>
-        <div role='button' tabIndex='0' onClick={this.handleClick} onKeyUp={this.handleKeyUp} className='column-back-button column-back-button--slim-button'>
-          <Icon id='chevron-left' className='column-back-button__icon' fixedWidth />
-          <FormattedMessage id='column_back_button.label' defaultMessage='Back' />
-        </div>
-      </div>
-    );
-  }
-
-}
diff --git a/app/soapbox/components/sub_navigation.js b/app/soapbox/components/sub_navigation.js
index a48d211c6..4ed61b69b 100644
--- a/app/soapbox/components/sub_navigation.js
+++ b/app/soapbox/components/sub_navigation.js
@@ -79,7 +79,7 @@ export default class SubNavigation extends React.PureComponent {
             onKeyUp={this.handleBackKeyUp}
           >
             <Icon src={require('@tabler/icons/icons/arrow-back.svg')} />
-            <FormattedMessage id='sub_navigation.back' defaultMessage='Back' />
+            <FormattedMessage id='column_back_button.label' defaultMessage='Back' />
           </button>
           {message && (
             <div className='sub-navigation__message'>
diff --git a/app/soapbox/features/admin/awaiting_approval.js b/app/soapbox/features/admin/awaiting_approval.js
index 0d95fa685..8193f9406 100644
--- a/app/soapbox/features/admin/awaiting_approval.js
+++ b/app/soapbox/features/admin/awaiting_approval.js
@@ -44,7 +44,7 @@ class AwaitingApproval extends ImmutablePureComponent {
     const showLoading = isLoading && accountIds.count() === 0;
 
     return (
-      <Column icon='user' heading={intl.formatMessage(messages.heading)} backBtnSlim>
+      <Column icon='user' heading={intl.formatMessage(messages.heading)}>
         <ScrollableList
           isLoading={isLoading}
           showLoading={showLoading}
diff --git a/app/soapbox/features/admin/index.js b/app/soapbox/features/admin/index.js
index 3d1e99dfd..b09affd66 100644
--- a/app/soapbox/features/admin/index.js
+++ b/app/soapbox/features/admin/index.js
@@ -80,7 +80,7 @@ class Dashboard extends ImmutablePureComponent {
     if (!account) return null;
 
     return (
-      <Column icon='tachometer-alt' heading={intl.formatMessage(messages.heading)} backBtnSlim>
+      <Column icon='tachometer-alt' heading={intl.formatMessage(messages.heading)}>
         <div className='dashcounters'>
           {mau && <div className='dashcounter'>
             <div>
diff --git a/app/soapbox/features/admin/moderation_log.js b/app/soapbox/features/admin/moderation_log.js
index 853cb9c1e..134699908 100644
--- a/app/soapbox/features/admin/moderation_log.js
+++ b/app/soapbox/features/admin/moderation_log.js
@@ -60,7 +60,7 @@ class ModerationLog extends ImmutablePureComponent {
     const showLoading = isLoading && items.count() === 0;
 
     return (
-      <Column icon='balance-scale' heading={intl.formatMessage(messages.heading)} backBtnSlim>
+      <Column icon='balance-scale' heading={intl.formatMessage(messages.heading)}>
         <ScrollableList
           isLoading={isLoading}
           showLoading={showLoading}
diff --git a/app/soapbox/features/aliases/index.js b/app/soapbox/features/aliases/index.js
index 1171e9f95..67759abe5 100644
--- a/app/soapbox/features/aliases/index.js
+++ b/app/soapbox/features/aliases/index.js
@@ -52,7 +52,7 @@ class Aliases extends ImmutablePureComponent {
     const emptyMessage = <FormattedMessage id='empty_column.aliases' defaultMessage="You haven't created any account alias yet." />;
 
     return (
-      <Column className='aliases-settings-panel' icon='suitcase' heading={intl.formatMessage(messages.heading)} backBtnSlim>
+      <Column className='aliases-settings-panel' icon='suitcase' heading={intl.formatMessage(messages.heading)}>
         <ColumnSubheading text={intl.formatMessage(messages.subheading_add_new)} />
         <Search />
         {
diff --git a/app/soapbox/features/blocks/index.js b/app/soapbox/features/blocks/index.js
index a25c6337c..a0dbddfe6 100644
--- a/app/soapbox/features/blocks/index.js
+++ b/app/soapbox/features/blocks/index.js
@@ -54,7 +54,7 @@ class Blocks extends ImmutablePureComponent {
     const emptyMessage = <FormattedMessage id='empty_column.blocks' defaultMessage="You haven't blocked any users yet." />;
 
     return (
-      <Column icon='ban' heading={intl.formatMessage(messages.heading)} backBtnSlim>
+      <Column icon='ban' heading={intl.formatMessage(messages.heading)}>
         <ScrollableList
           scrollKey='blocks'
           onLoadMore={this.handleLoadMore}
diff --git a/app/soapbox/features/crypto_donate/index.js b/app/soapbox/features/crypto_donate/index.js
index 052b84774..74487fab6 100644
--- a/app/soapbox/features/crypto_donate/index.js
+++ b/app/soapbox/features/crypto_donate/index.js
@@ -36,7 +36,7 @@ class CryptoDonate extends ImmutablePureComponent {
     const { explanationBoxExpanded } = this.state;
 
     return (
-      <Column icon='bitcoin' heading={intl.formatMessage(messages.heading)} backBtnSlim>
+      <Column icon='bitcoin' heading={intl.formatMessage(messages.heading)}>
         <div className='crypto-donate'>
           <div className='explanation-box'>
             <Accordion
diff --git a/app/soapbox/features/domain_blocks/index.js b/app/soapbox/features/domain_blocks/index.js
index 96969f1f8..bbbc9d60f 100644
--- a/app/soapbox/features/domain_blocks/index.js
+++ b/app/soapbox/features/domain_blocks/index.js
@@ -55,7 +55,7 @@ class Blocks extends ImmutablePureComponent {
     const emptyMessage = <FormattedMessage id='empty_column.domain_blocks' defaultMessage='There are no hidden domains yet.' />;
 
     return (
-      <Column icon='minus-circle' heading={intl.formatMessage(messages.heading)} backBtnSlim>
+      <Column icon='minus-circle' heading={intl.formatMessage(messages.heading)}>
         <ScrollableList
           scrollKey='domain_blocks'
           onLoadMore={this.handleLoadMore}
diff --git a/app/soapbox/features/edit_profile/index.js b/app/soapbox/features/edit_profile/index.js
index d0d343d13..0a607deda 100644
--- a/app/soapbox/features/edit_profile/index.js
+++ b/app/soapbox/features/edit_profile/index.js
@@ -230,7 +230,7 @@ class EditProfile extends ImmutablePureComponent {
     const canEditName = verifiedCanEditName || !verified;
 
     return (
-      <Column icon='user' heading={intl.formatMessage(messages.heading)} backBtnSlim>
+      <Column icon='user' heading={intl.formatMessage(messages.heading)}>
         <SimpleForm onSubmit={this.handleSubmit}>
           <fieldset disabled={this.state.isLoading}>
             <FieldsGroup>
diff --git a/app/soapbox/features/export_data/index.js b/app/soapbox/features/export_data/index.js
index 561d3d864..1c472edce 100644
--- a/app/soapbox/features/export_data/index.js
+++ b/app/soapbox/features/export_data/index.js
@@ -52,7 +52,7 @@ class ExportData extends ImmutablePureComponent {
     const { intl } = this.props;
 
     return (
-      <Column icon='cloud-download-alt' heading={intl.formatMessage(messages.heading)} backBtnSlim>
+      <Column icon='cloud-download-alt' heading={intl.formatMessage(messages.heading)}>
         <CSVExporter action={exportFollows} messages={followMessages} />
         <CSVExporter action={exportBlocks} messages={blockMessages} />
         <CSVExporter action={exportMutes} messages={muteMessages} />
diff --git a/app/soapbox/features/federation_restrictions/index.js b/app/soapbox/features/federation_restrictions/index.js
index 2928b0f52..1332218e8 100644
--- a/app/soapbox/features/federation_restrictions/index.js
+++ b/app/soapbox/features/federation_restrictions/index.js
@@ -50,7 +50,7 @@ class FederationRestrictions extends ImmutablePureComponent {
     const emptyMessage = disclosed ? messages.emptyMessage : messages.notDisclosed;
 
     return (
-      <Column icon='gavel' heading={intl.formatMessage(messages.heading)} backBtnSlim>
+      <Column icon='gavel' heading={intl.formatMessage(messages.heading)}>
         <div className='explanation-box'>
           <Accordion
             headline={intl.formatMessage(messages.boxTitle)}
diff --git a/app/soapbox/features/filters/index.js b/app/soapbox/features/filters/index.js
index 934aba6e8..753fda7a5 100644
--- a/app/soapbox/features/filters/index.js
+++ b/app/soapbox/features/filters/index.js
@@ -133,7 +133,7 @@ class Filters extends ImmutablePureComponent {
     const emptyMessage = <FormattedMessage id='empty_column.filters' defaultMessage="You haven't created any muted words yet." />;
 
     return (
-      <Column className='filter-settings-panel' icon='filter' heading={intl.formatMessage(messages.heading)} backBtnSlim>
+      <Column className='filter-settings-panel' icon='filter' heading={intl.formatMessage(messages.heading)}>
         <ColumnSubheading text={intl.formatMessage(messages.subheading_add_new)} />
         <SimpleForm>
           <div className='filter-settings-panel'>
diff --git a/app/soapbox/features/follow_requests/index.js b/app/soapbox/features/follow_requests/index.js
index f09624cec..74b2ac7fb 100644
--- a/app/soapbox/features/follow_requests/index.js
+++ b/app/soapbox/features/follow_requests/index.js
@@ -54,7 +54,7 @@ class FollowRequests extends ImmutablePureComponent {
     const emptyMessage = <FormattedMessage id='empty_column.follow_requests' defaultMessage="You don't have any follow requests yet. When you receive one, it will show up here." />;
 
     return (
-      <Column icon='user-plus' heading={intl.formatMessage(messages.heading)} backBtnSlim>
+      <Column icon='user-plus' heading={intl.formatMessage(messages.heading)}>
         <ScrollableList
           scrollKey='follow_requests'
           onLoadMore={this.handleLoadMore}
diff --git a/app/soapbox/features/import_data/index.js b/app/soapbox/features/import_data/index.js
index 9712b5be2..106c41cc0 100644
--- a/app/soapbox/features/import_data/index.js
+++ b/app/soapbox/features/import_data/index.js
@@ -52,7 +52,7 @@ class ImportData extends ImmutablePureComponent {
     const { intl, features } = this.props;
 
     return (
-      <Column icon='cloud-upload-alt' heading={intl.formatMessage(messages.heading)} backBtnSlim>
+      <Column icon='cloud-upload-alt' heading={intl.formatMessage(messages.heading)}>
         <CSVImporter action={importFollows} messages={followMessages} />
         <CSVImporter action={importBlocks} messages={blockMessages} />
         {features.importMutes && <CSVImporter action={importMutes} messages={muteMessages} />}
diff --git a/app/soapbox/features/lists/index.js b/app/soapbox/features/lists/index.js
index f5dbfcf8e..4a26624ba 100644
--- a/app/soapbox/features/lists/index.js
+++ b/app/soapbox/features/lists/index.js
@@ -60,7 +60,7 @@ class Lists extends ImmutablePureComponent {
     const emptyMessage = <FormattedMessage id='empty_column.lists' defaultMessage="You don't have any lists yet. When you create one, it will show up here." />;
 
     return (
-      <Column icon='list-ul' heading={intl.formatMessage(messages.heading)} backBtnSlim>
+      <Column icon='list-ul' heading={intl.formatMessage(messages.heading)}>
         <br />
         <ColumnSubheading text={intl.formatMessage(messages.add)} />
         <NewListForm />
diff --git a/app/soapbox/features/mutes/index.js b/app/soapbox/features/mutes/index.js
index 540e9f54f..26278ec26 100644
--- a/app/soapbox/features/mutes/index.js
+++ b/app/soapbox/features/mutes/index.js
@@ -54,7 +54,7 @@ class Mutes extends ImmutablePureComponent {
     const emptyMessage = <FormattedMessage id='empty_column.mutes' defaultMessage="You haven't muted any users yet." />;
 
     return (
-      <Column icon='volume-off' heading={intl.formatMessage(messages.heading)} backBtnSlim>
+      <Column icon='volume-off' heading={intl.formatMessage(messages.heading)}>
         <ScrollableList
           scrollKey='mutes'
           onLoadMore={this.handleLoadMore}
diff --git a/app/soapbox/features/preferences/index.js b/app/soapbox/features/preferences/index.js
index 2a28d9137..6bde12793 100644
--- a/app/soapbox/features/preferences/index.js
+++ b/app/soapbox/features/preferences/index.js
@@ -131,7 +131,7 @@ class Preferences extends ImmutablePureComponent {
     };
 
     return (
-      <Column icon='cog' heading={intl.formatMessage(messages.heading)} backBtnSlim>
+      <Column icon='cog' heading={intl.formatMessage(messages.heading)}>
         <SimpleForm>
           <FieldsGroup>
             <SelectDropdown
diff --git a/app/soapbox/features/scheduled_statuses/index.js b/app/soapbox/features/scheduled_statuses/index.js
index 34d0887ad..03a4496ca 100644
--- a/app/soapbox/features/scheduled_statuses/index.js
+++ b/app/soapbox/features/scheduled_statuses/index.js
@@ -51,7 +51,7 @@ class ScheduledStatuses extends ImmutablePureComponent {
     const emptyMessage = <FormattedMessage id='empty_column.scheduled_statuses' defaultMessage="You don't have any scheduled statuses yet. When you add one, it will show up here." />;
 
     return (
-      <Column icon='calendar' heading={intl.formatMessage(messages.heading)} backBtnSlim>
+      <Column icon='calendar' heading={intl.formatMessage(messages.heading)}>
         <ScrollableList
           scrollKey='scheduled_statuses'
           emptyMessage={emptyMessage}
diff --git a/app/soapbox/features/security/index.js b/app/soapbox/features/security/index.js
index 592809242..2327f70a4 100644
--- a/app/soapbox/features/security/index.js
+++ b/app/soapbox/features/security/index.js
@@ -79,7 +79,7 @@ class SecurityForm extends ImmutablePureComponent {
     const { intl } = this.props;
 
     return (
-      <Column icon='lock' heading={intl.formatMessage(messages.heading)} backBtnSlim>
+      <Column icon='lock' heading={intl.formatMessage(messages.heading)}>
         <ChangeEmailForm />
         <ChangePasswordForm />
         <SetUpMfa />
diff --git a/app/soapbox/features/security/mfa_form.js b/app/soapbox/features/security/mfa_form.js
index 3f9074f50..79c86551c 100644
--- a/app/soapbox/features/security/mfa_form.js
+++ b/app/soapbox/features/security/mfa_form.js
@@ -88,7 +88,7 @@ class MfaForm extends ImmutablePureComponent {
     const { displayOtpForm } = this.state;
 
     return (
-      <Column icon='lock' heading={intl.formatMessage(messages.heading)} backBtnSlim>
+      <Column icon='lock' heading={intl.formatMessage(messages.heading)}>
         <ColumnSubheading text={intl.formatMessage(messages.subheading)} />
         { settings.get('otpEnabled') === true && <DisableOtpForm />}
         { settings.get('otpEnabled') === false && <EnableOtpForm handleSetupProceedClick={this.handleSetupProceedClick} />}
diff --git a/app/soapbox/features/server_info/index.js b/app/soapbox/features/server_info/index.js
index c79e54f42..f6c6193ae 100644
--- a/app/soapbox/features/server_info/index.js
+++ b/app/soapbox/features/server_info/index.js
@@ -27,7 +27,7 @@ class ServerInfo extends ImmutablePureComponent {
     const { intl, instance } = this.props;
 
     return (
-      <Column icon='info' heading={intl.formatMessage(messages.heading)} backBtnSlim>
+      <Column icon='info' heading={intl.formatMessage(messages.heading)}>
         <div className='info_column_area'>
           <div className='info__brand'>
             <div className='brand'>
diff --git a/app/soapbox/features/soapbox_config/index.js b/app/soapbox/features/soapbox_config/index.js
index 70da9c18b..02de151dc 100644
--- a/app/soapbox/features/soapbox_config/index.js
+++ b/app/soapbox/features/soapbox_config/index.js
@@ -219,7 +219,7 @@ class SoapboxConfig extends ImmutablePureComponent {
     const soapbox = this.getSoapboxConfig();
 
     return (
-      <Column icon='cog' heading={intl.formatMessage(messages.heading)} backBtnSlim>
+      <Column icon='cog' heading={intl.formatMessage(messages.heading)}>
         <SimpleForm onSubmit={this.handleSubmit}>
           <fieldset disabled={this.state.isLoading}>
             <SitePreview soapbox={soapbox} />
diff --git a/app/soapbox/features/ui/components/profile_info_panel.js b/app/soapbox/features/ui/components/profile_info_panel.js
index b2e71fba1..e123b185e 100644
--- a/app/soapbox/features/ui/components/profile_info_panel.js
+++ b/app/soapbox/features/ui/components/profile_info_panel.js
@@ -170,7 +170,7 @@ class ProfileInfoPanel extends ImmutablePureComponent {
 
               {fields.map((pair, i) =>
                 isTicker(pair.get('name', '')) ? (
-                  <BundleContainer fetchComponent={CryptoAddress}>
+                  <BundleContainer fetchComponent={CryptoAddress} key={i}>
                     {Component => (
                       <Component
                         key={i}