diff --git a/app/assets/javascripts/select-kit/components/composer-actions.js b/app/assets/javascripts/select-kit/components/composer-actions.js
index 5740a91f5c4..556d1510576 100644
--- a/app/assets/javascripts/select-kit/components/composer-actions.js
+++ b/app/assets/javascripts/select-kit/components/composer-actions.js
@@ -35,7 +35,13 @@ export default DropdownSelectBoxComponent.extend({
   },
 
   iconForComposerAction: computed("action", function() {
-    return this.isEditing ? "pencil-alt" : "share";
+    if (this.isEditing) {
+      return "pencil-alt";
+    } else if (this.action == CREATE_TOPIC) {
+      return "plus";
+    } else {
+      return "share";
+    }
   }),
 
   contentChanged() {