diff --git a/app/soapbox/features/forms/index.js b/app/soapbox/features/forms/index.js
index 9a8ead991..9872b3dbf 100644
--- a/app/soapbox/features/forms/index.js
+++ b/app/soapbox/features/forms/index.js
@@ -217,7 +217,7 @@ export class IconPicker extends ImmutablePureComponent {
         <div className='label_input__icon_picker'>
           {label && (<label>{label}</label>)}
           <div className='label_input__wrapper'>
-            <FontIconPicker icons={icons} onChange={onChange} value={value} noSelectedPlaceholder={placeholder} />
+            <FontIconPicker icons={icons} onChange={onChange} value={value !== '' ? "fa fa-" + value : value} noSelectedPlaceholder={placeholder} />
           </div>
         </div>
       </div>
diff --git a/app/soapbox/features/soapbox_config/index.js b/app/soapbox/features/soapbox_config/index.js
index 77f8b7ef1..104baad97 100644
--- a/app/soapbox/features/soapbox_config/index.js
+++ b/app/soapbox/features/soapbox_config/index.js
@@ -59,7 +59,6 @@ class SoapboxConfig extends ImmutablePureComponent {
     soapbox: this.props.soapbox,
     rawJSON: JSON.stringify(this.props.soapbox, null, 2),
     jsonValid: true,
-    iconValue: 'fa fa-pleroma',
   }
 
   setConfig = (path, value) => {
@@ -143,10 +142,6 @@ class SoapboxConfig extends ImmutablePureComponent {
     );
   };
 
-  handleIconChange = (value) => {
-    this.setState({ iconValue: value });
-  }
-
   handleHomeFooterItemChange = (index, key, field) => {
     return this.handleItemChange(
       ['navlinks', 'homeFooter', index], key, field, templates.footerItem
@@ -263,7 +258,7 @@ class SoapboxConfig extends ImmutablePureComponent {
                           label={intl.formatMessage(messages.promoItemIcon)}
                           placeholder={intl.formatMessage(messages.promoItemIcon)}
                           value={field.get('icon')}
-                          onChange={this.handleIconChange}
+                          onChange={this.handlePromoItemChange(i, 'icon', field)}
                         />
                         <TextInput
                           label={intl.formatMessage(messages.promoItemLabel)}