diff --git a/js/forum/dist/app.js b/js/forum/dist/app.js
index 3c04be7fe..dc256fd28 100644
--- a/js/forum/dist/app.js
+++ b/js/forum/dist/app.js
@@ -18998,7 +18998,7 @@ System.register('flarum/components/AvatarEditor', ['flarum/Component', 'flarum/h
                 { className: user.avatarUrl() ? "Dropdown-toggle" : "Dropdown-toggle AvatarEditor--noAvatar",
                   'data-toggle': 'dropdown',
                   onclick: this.quickUpload.bind(this) },
-                this.loading ? LoadingIndicator.component() : user.avatarUrl() ? icon('pencil') : icon('upload')
+                this.loading ? LoadingIndicator.component() : user.avatarUrl() ? icon('pencil') : icon('plus-circle')
               ),
               m(
                 'ul',
diff --git a/js/forum/src/components/AvatarEditor.js b/js/forum/src/components/AvatarEditor.js
index 5986e0356..bdf55f7da 100644
--- a/js/forum/src/components/AvatarEditor.js
+++ b/js/forum/src/components/AvatarEditor.js
@@ -38,9 +38,9 @@ export default class AvatarEditor extends Component {
       <div className={'AvatarEditor Dropdown ' + this.props.className + (this.loading ? ' loading' : '')}>
         {avatar(user)}
         <a className={ user.avatarUrl() ? "Dropdown-toggle" : "Dropdown-toggle AvatarEditor--noAvatar" }
-           data-toggle="dropdown"
-           onclick={this.quickUpload.bind(this)}>
-          {this.loading ? LoadingIndicator.component() : (user.avatarUrl() ? icon('pencil') : icon('upload'))}
+          data-toggle="dropdown"
+          onclick={this.quickUpload.bind(this)}>
+          {this.loading ? LoadingIndicator.component() : (user.avatarUrl() ? icon('pencil') : icon('plus-circle'))}
         </a>
         <ul className="Dropdown-menu Menu">
           {listItems(this.controlItems().toArray())}