diff --git a/app/soapbox/features/admin/awaiting_approval.js b/app/soapbox/features/admin/awaiting_approval.js
index bdd909b3b..fa0e538ff 100644
--- a/app/soapbox/features/admin/awaiting_approval.js
+++ b/app/soapbox/features/admin/awaiting_approval.js
@@ -47,7 +47,7 @@ class AwaitingApproval extends ImmutablePureComponent {
     const showLoading = isLoading && accountIds.count() === 0;
 
     return (
-      <Column icon='user' heading={intl.formatMessage(messages.heading)}>
+      <Column icon='user' label={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 61e6e1211..9ca0264a4 100644
--- a/app/soapbox/features/admin/index.js
+++ b/app/soapbox/features/admin/index.js
@@ -84,7 +84,7 @@ class Dashboard extends ImmutablePureComponent {
     if (!account) return null;
 
     return (
-      <Column icon='tachometer-alt' heading={intl.formatMessage(messages.heading)}>
+      <Column icon='tachometer-alt' label={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 12c3cee82..a4f50ddbb 100644
--- a/app/soapbox/features/admin/moderation_log.js
+++ b/app/soapbox/features/admin/moderation_log.js
@@ -62,7 +62,7 @@ class ModerationLog extends ImmutablePureComponent {
     const showLoading = isLoading && items.count() === 0;
 
     return (
-      <Column icon='balance-scale' heading={intl.formatMessage(messages.heading)}>
+      <Column icon='balance-scale' label={intl.formatMessage(messages.heading)}>
         <ScrollableList
           isLoading={isLoading}
           showLoading={showLoading}
diff --git a/app/soapbox/features/admin/reports.js b/app/soapbox/features/admin/reports.js
index dbc3d5649..e7402ad2e 100644
--- a/app/soapbox/features/admin/reports.js
+++ b/app/soapbox/features/admin/reports.js
@@ -64,7 +64,7 @@ class Reports extends ImmutablePureComponent {
     const showLoading = isLoading && reports.count() === 0;
 
     return (
-      <Column icon='gavel' heading={intl.formatMessage(messages.heading)} menu={this.makeColumnMenu()}>
+      <Column icon='gavel' label={intl.formatMessage(messages.heading)} menu={this.makeColumnMenu()}>
         <ScrollableList
           isLoading={isLoading}
           showLoading={showLoading}
diff --git a/app/soapbox/features/admin/user_index.js b/app/soapbox/features/admin/user_index.js
index 87c24f867..d93f99d28 100644
--- a/app/soapbox/features/admin/user_index.js
+++ b/app/soapbox/features/admin/user_index.js
@@ -102,7 +102,7 @@ class UserIndex extends ImmutablePureComponent {
     const showLoading = isLoading && accountIds.isEmpty();
 
     return (
-      <Column heading={intl.formatMessage(messages.heading)}>
+      <Column label={intl.formatMessage(messages.heading)}>
         <SimpleForm style={{ paddingBottom: 0 }}>
           <TextInput
             onChange={this.handleQueryChange}
diff --git a/app/soapbox/features/aliases/index.js b/app/soapbox/features/aliases/index.js
index c9bd35749..5d8fe3b60 100644
--- a/app/soapbox/features/aliases/index.js
+++ b/app/soapbox/features/aliases/index.js
@@ -70,7 +70,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)}>
+      <Column className='aliases-settings-panel' icon='suitcase' label={intl.formatMessage(messages.heading)}>
         <ColumnSubheading text={intl.formatMessage(messages.subheading_add_new)} />
         <Search />
         {
diff --git a/app/soapbox/features/backups/index.js b/app/soapbox/features/backups/index.js
index 2bd342222..ac0fb29fd 100644
--- a/app/soapbox/features/backups/index.js
+++ b/app/soapbox/features/backups/index.js
@@ -70,7 +70,7 @@ class Backups extends ImmutablePureComponent {
     );
 
     return (
-      <Column icon='cloud-download' heading={intl.formatMessage(messages.heading)} menu={this.makeColumnMenu()}>
+      <Column icon='cloud-download' label={intl.formatMessage(messages.heading)} menu={this.makeColumnMenu()}>
         <ScrollableList
           isLoading={isLoading}
           showLoading={showLoading}
diff --git a/app/soapbox/features/directory/index.js b/app/soapbox/features/directory/index.js
index ada1010cf..99eccf947 100644
--- a/app/soapbox/features/directory/index.js
+++ b/app/soapbox/features/directory/index.js
@@ -89,7 +89,7 @@ class Directory extends React.PureComponent {
     const { order, local }  = this.getParams(this.props, this.state);
 
     return (
-      <Column icon='address-book-o' heading={intl.formatMessage(messages.title)}>
+      <Column icon='address-book-o' label={intl.formatMessage(messages.title)}>
         <div className='directory__filter-form'>
           <div className='directory__filter-form__column' role='group'>
             <RadioButton name='order' value='active' label={intl.formatMessage(messages.recentlyActive)} checked={order === 'active'} onChange={this.handleChangeOrder} />
diff --git a/app/soapbox/features/domain_blocks/index.js b/app/soapbox/features/domain_blocks/index.js
index c4a5777a2..3ab084564 100644
--- a/app/soapbox/features/domain_blocks/index.js
+++ b/app/soapbox/features/domain_blocks/index.js
@@ -57,7 +57,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)}>
+      <Column icon='minus-circle' label={intl.formatMessage(messages.heading)}>
         <ScrollableList
           scrollKey='domain_blocks'
           onLoadMore={this.handleLoadMore}
diff --git a/app/soapbox/features/export_data/index.js b/app/soapbox/features/export_data/index.js
index 0d86bfd69..4a73f700b 100644
--- a/app/soapbox/features/export_data/index.js
+++ b/app/soapbox/features/export_data/index.js
@@ -55,7 +55,7 @@ class ExportData extends ImmutablePureComponent {
     const { intl } = this.props;
 
     return (
-      <Column icon='cloud-download-alt' heading={intl.formatMessage(messages.heading)}>
+      <Column icon='cloud-download-alt' label={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 dc83d0e27..bb5ccdab2 100644
--- a/app/soapbox/features/federation_restrictions/index.js
+++ b/app/soapbox/features/federation_restrictions/index.js
@@ -53,7 +53,7 @@ class FederationRestrictions extends ImmutablePureComponent {
     const emptyMessage = disclosed ? messages.emptyMessage : messages.notDisclosed;
 
     return (
-      <Column icon='gavel' heading={intl.formatMessage(messages.heading)}>
+      <Column icon='gavel' label={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 717e6d365..e54b5668e 100644
--- a/app/soapbox/features/filters/index.js
+++ b/app/soapbox/features/filters/index.js
@@ -135,7 +135,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)}>
+      <Column className='filter-settings-panel' icon='filter' label={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 1bf817597..3c3f8f75e 100644
--- a/app/soapbox/features/follow_requests/index.js
+++ b/app/soapbox/features/follow_requests/index.js
@@ -57,7 +57,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)}>
+      <Column icon='user-plus' labellabel={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 5ca07e832..6a3a267e2 100644
--- a/app/soapbox/features/import_data/index.js
+++ b/app/soapbox/features/import_data/index.js
@@ -55,7 +55,7 @@ class ImportData extends ImmutablePureComponent {
     const { intl, features } = this.props;
 
     return (
-      <Column icon='cloud-upload-alt' heading={intl.formatMessage(messages.heading)}>
+      <Column icon='cloud-upload-alt' label={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 eddfbcc0f..85b444301 100644
--- a/app/soapbox/features/lists/index.js
+++ b/app/soapbox/features/lists/index.js
@@ -63,7 +63,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)}>
+      <Column icon='list-ul' label={intl.formatMessage(messages.heading)}>
         <br />
         <ColumnSubheading text={intl.formatMessage(messages.add)} />
         <NewListForm />
diff --git a/app/soapbox/features/migration/index.js b/app/soapbox/features/migration/index.js
index a999ca030..1903682b9 100644
--- a/app/soapbox/features/migration/index.js
+++ b/app/soapbox/features/migration/index.js
@@ -62,7 +62,7 @@ class Migration extends ImmutablePureComponent {
     const { intl } = this.props;
 
     return (
-      <Column heading={intl.formatMessage(messages.heading)}>
+      <Column label={intl.formatMessage(messages.heading)}>
         <SimpleForm onSubmit={this.handleSubmit}>
           <fieldset disabled={this.state.isLoading}>
             <FieldsGroup>
diff --git a/app/soapbox/features/pinned_statuses/index.js b/app/soapbox/features/pinned_statuses/index.js
index 04a46d8e1..a045641a4 100644
--- a/app/soapbox/features/pinned_statuses/index.js
+++ b/app/soapbox/features/pinned_statuses/index.js
@@ -52,7 +52,7 @@ class PinnedStatuses extends ImmutablePureComponent {
     }
 
     return (
-      <Column heading={intl.formatMessage(messages.heading)}>
+      <Column label={intl.formatMessage(messages.heading)}>
         <StatusList
           statusIds={statusIds}
           scrollKey='pinned_statuses'
diff --git a/app/soapbox/features/scheduled_statuses/index.js b/app/soapbox/features/scheduled_statuses/index.js
index 314663f57..b8a63497e 100644
--- a/app/soapbox/features/scheduled_statuses/index.js
+++ b/app/soapbox/features/scheduled_statuses/index.js
@@ -50,7 +50,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)}>
+      <Column icon='calendar' label={intl.formatMessage(messages.heading)}>
         <ScrollableList
           scrollKey='scheduled_statuses'
           emptyMessage={emptyMessage}
diff --git a/app/soapbox/features/server_info/index.js b/app/soapbox/features/server_info/index.js
index ca532a966..a7d19c72a 100644
--- a/app/soapbox/features/server_info/index.js
+++ b/app/soapbox/features/server_info/index.js
@@ -28,7 +28,7 @@ class ServerInfo extends ImmutablePureComponent {
     const { intl, instance } = this.props;
 
     return (
-      <Column icon='info' heading={intl.formatMessage(messages.heading)}>
+      <Column icon='info' label={intl.formatMessage(messages.heading)}>
         <div className='info_column_area'>
           <div className='info__brand'>
             <div className='brand'>