diff --git a/app/soapbox/components/status.js b/app/soapbox/components/status.js
index 95c7ffb0c..71f68689b 100644
--- a/app/soapbox/components/status.js
+++ b/app/soapbox/components/status.js
@@ -346,7 +346,7 @@ class Status extends ImmutablePureComponent {
     if (featured) {
       prepend = (
         <div className='status__prepend'>
-          <div className='status__prepend-icon-wrapper'><Icon id='thumb-tack' className='status__prepend-icon' fixedWidth /></div>
+          <div className='status__prepend-icon-wrapper'><Icon id='thumbtack' className='status__prepend-icon' fixedWidth /></div>
           <FormattedMessage id='status.pinned' defaultMessage='Pinned post' />
         </div>
       );
diff --git a/app/soapbox/features/soapbox_config/forkawesome.json b/app/soapbox/features/soapbox_config/forkawesome.json
index 44cc80f25..bdac169f8 100644
--- a/app/soapbox/features/soapbox_config/forkawesome.json
+++ b/app/soapbox/features/soapbox_config/forkawesome.json
@@ -89,7 +89,7 @@
     "fa fa-star-half",
     "fa fa-heart-o",
     "fa fa-sign-out",
-    "fa fa-thumb-tack",
+    "fa fa-thumbtack",
     "fa fa-external-link",
     "fa fa-sign-in",
     "fa fa-trophy",
diff --git a/app/soapbox/features/ui/components/instance_info_panel.js b/app/soapbox/features/ui/components/instance_info_panel.js
index 8a42fbb9b..57c1bdabd 100644
--- a/app/soapbox/features/ui/components/instance_info_panel.js
+++ b/app/soapbox/features/ui/components/instance_info_panel.js
@@ -62,7 +62,7 @@ class InstanceInfoPanel extends ImmutablePureComponent {
   render() {
     const { remoteInstance, pinned } = this.props;
     const menu = this.makeMenu();
-    const icon = pinned ? 'thumb-tack' : 'globe-w';
+    const icon = pinned ? 'thumbtack' : 'globe-w';
 
     return (
       <div className='wtf-panel instance-federation-panel'>
diff --git a/app/styles/components/columns.scss b/app/styles/components/columns.scss
index 99ea5f2e5..7533d7fb3 100644
--- a/app/styles/components/columns.scss
+++ b/app/styles/components/columns.scss
@@ -584,6 +584,7 @@
 .column-header__icon {
   display: inline-block;
   margin-right: 5px;
+  font-size: 20px;
 }
 
 .column-settings__outer {
diff --git a/app/styles/components/profile-media-panel.scss b/app/styles/components/profile-media-panel.scss
index 3089bf19a..7d0b63f06 100644
--- a/app/styles/components/profile-media-panel.scss
+++ b/app/styles/components/profile-media-panel.scss
@@ -24,6 +24,7 @@
 
     &__icon {
       margin-right: 10px;
+      font-size: 20px;
     }
 
     &__label {
diff --git a/app/styles/components/promo-panel.scss b/app/styles/components/promo-panel.scss
index df2827ef6..a6f0398e5 100644
--- a/app/styles/components/promo-panel.scss
+++ b/app/styles/components/promo-panel.scss
@@ -33,5 +33,6 @@
   &__icon,
   .icon-with-counter {
     margin-right: 12px;
+    font-size: 20px;
   }
 }
diff --git a/app/styles/components/theme-toggle.scss b/app/styles/components/theme-toggle.scss
index 24b66b9b7..88fa53bc6 100644
--- a/app/styles/components/theme-toggle.scss
+++ b/app/styles/components/theme-toggle.scss
@@ -12,9 +12,14 @@
       &-track-x {
         display: flex;
         align-items: center;
+        justify-content: center;
         height: 15px;
         color: #fff;
       }
     }
   }
+
+  i.fa {
+    font-size: 20px;
+  }
 }
diff --git a/app/styles/components/wtf-panel.scss b/app/styles/components/wtf-panel.scss
index 809d065f4..f682411c6 100644
--- a/app/styles/components/wtf-panel.scss
+++ b/app/styles/components/wtf-panel.scss
@@ -24,6 +24,7 @@
 
     &__icon {
       margin-right: 10px;
+      font-size: 20px;
     }
 
     &__label {