diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6
index e4dc398acf5..9a8aa809d29 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/composer.js.es6
@@ -388,19 +388,14 @@ export default Ember.Controller.extend({
 
   toggle() {
     this.closeAutocomplete();
-    switch (this.get('model.composeState')) {
-      case Composer.OPEN:
-        if (Ember.isEmpty(this.get('model.reply')) && Ember.isEmpty(this.get('model.title'))) {
-          this.close();
-        } else {
-          this.shrink();
-        }
-        break;
-      case Composer.DRAFT:
-        this.set('model.composeState', Composer.OPEN);
-        break;
-      case Composer.SAVING:
+    if (this.get('model.composeState') === Composer.OPEN) {
+      if (Ember.isEmpty(this.get('model.reply')) && Ember.isEmpty(this.get('model.title'))) {
         this.close();
+      } else {
+        this.shrink();
+      }
+    } else {
+      this.close();
     }
     return false;
   },
diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index bc86c2d501e..c8712e360e1 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -136,7 +136,7 @@
               </div>
               <div class='draft-text'>
                 {{#if model.topic}}
-                  {{fa-icon "reply"}} {{{draftTitle}}}
+                  {{fa-icon "mail-forward"}} {{{draftTitle}}}
                 {{else}}
                   {{i18n "composer.saved_draft"}}
                 {{/if}}
diff --git a/app/assets/stylesheets/desktop/compose.scss b/app/assets/stylesheets/desktop/compose.scss
index fbfcd4e874c..620a31a0220 100644
--- a/app/assets/stylesheets/desktop/compose.scss
+++ b/app/assets/stylesheets/desktop/compose.scss
@@ -187,11 +187,15 @@
     border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
     .draft-text {
       display: block;
+
+      i {
+        color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      }
     }
     .toggler {
       &:before {
         font-family: "FontAwesome";
-        content: "\f077";
+        content: "\f00d";
       }
     }
   }
diff --git a/app/assets/stylesheets/mobile/compose.scss b/app/assets/stylesheets/mobile/compose.scss
index 0ee62ead225..04d35906ff5 100644
--- a/app/assets/stylesheets/mobile/compose.scss
+++ b/app/assets/stylesheets/mobile/compose.scss
@@ -97,17 +97,21 @@ input {
     border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
     .draft-text {
       display: block;
-          position: absolute;
-          margin-right: 40px;
-          max-width: 80%;
-          white-space: nowrap;
-          overflow: hidden;
-          text-overflow: ellipsis;
+      position: absolute;
+      margin-right: 40px;
+      max-width: 80%;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+
+      i {
+        color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      }
     }
     .toggler {
       &:before {
         font-family: "FontAwesome";
-        content: "\f077";
+        content: "\f00d";
       }
     }
   }