diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index fa9f0540fd8..6f6e32370b6 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -104,8 +104,11 @@
                                      icon=model.saveIcon
                                      label=model.saveLabel
                                      disableSubmit=disableSubmit}}
-
+            {{#if site.mobileView}}
               <a href {{action "cancel"}} class='cancel' tabindex="6" title="{{i18n 'cancel'}}">{{d-icon "times"}}</a>
+            {{else}}
+              <a href {{action "cancel"}} class='cancel' tabindex="6" >{{i18n 'cancel'}}</a>
+            {{/if}}
 
               {{#if site.mobileView}}
                 {{#if whisperOrUnlistTopic}}
diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index 237c2ccf267..036fbb02fa0 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -260,10 +260,9 @@
       flex: 0 0 auto;
     }
     .cancel {
-      margin-left: .65em;
-      font-size: 1.75em;
+      margin-left: 1.25em;
       line-height: normal;
-      color: $primary-low-mid;
+      color: $primary-high;
       transition: color 250ms;
       &:hover {
         color: $danger;
diff --git a/app/assets/stylesheets/mobile/compose.scss b/app/assets/stylesheets/mobile/compose.scss
index 05a71110da9..a5183ee8528 100644
--- a/app/assets/stylesheets/mobile/compose.scss
+++ b/app/assets/stylesheets/mobile/compose.scss
@@ -67,6 +67,11 @@
         #file-uploading {
           margin-left: 15px;
         }
+        .cancel {
+          font-size: 1.75em;
+          color: $primary-low-mid;
+          margin-left: .65em;          
+        }
       }
       .composer-bottom-right {
         margin-left: auto;