diff --git a/app/assets/javascripts/discourse/views/quote-button.js.es6 b/app/assets/javascripts/discourse/views/quote-button.js.es6
index 03a3edc7eb7..fe68d4db560 100644
--- a/app/assets/javascripts/discourse/views/quote-button.js.es6
+++ b/app/assets/javascripts/discourse/views/quote-button.js.es6
@@ -27,7 +27,6 @@ export default Discourse.View.extend({
     @method render
   **/
   render: function(buffer) {
-    buffer.push('<i class="fa fa-quote-right"></i>&nbsp;&nbsp;');
     buffer.push(I18n.t("post.quote_reply"));
   },
 
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index c60febdd671..47c5dcea195 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -81,3 +81,22 @@ aside.quote {
     content: "\f061";
   }
 }
+
+.quote-button {
+  display: none;
+  position: absolute;
+  background-color: scale-color($primary, $lightness: 50%);
+  color: $secondary;
+  padding: 10px;
+  z-index: 401;
+
+  &:before {
+    font-family: "FontAwesome";
+    content: "\f10e\00a0\00a0";
+  }
+
+  &:hover {
+    background-color: scale-color($primary, $lightness: 40%);
+    cursor: pointer;
+  }
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 0a1c1af056b..d8653437add 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -513,20 +513,6 @@ button.expand-post {
   margin-top: 10px;
 }
 
-.quote-button {
-  display: none;
-  position: absolute;
-  background-color: scale-color($primary, $lightness: 50%);
-  color: $secondary;
-  padding: 10px;
-  z-index: 401;
-
-  &:hover {
-    background-color: scale-color($primary, $lightness: 40%);
-    cursor: pointer;
-  }
-}
-
 .quote-button.visible {
   display: block;
 }
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index 3c2eae94c36..0e04d1da2ce 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -334,20 +334,6 @@ span.post-count {
   }
 }
 
-.quote-button {
-  display: none;
-  position: absolute;
-  background-color: scale-color($primary, $lightness: 50%);
-  color: $primary;
-  padding: 10px;
-  z-index: 401;
-
-  &:hover {
-    background-color: scale-color($primary, $lightness: 50%);
-    cursor: pointer;
-  }
-}
-
 .quote-button.visible {
   display: block;
 }