diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index b1e4ae6e5..34878f603 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -976,7 +976,7 @@
         title: type,
         className: "" + typeLC + "Icon"
       });
-      root = type === 'Closed' && this.isSticky ? $('.stickyIcon', this.OP.nodes.info) : g.VIEW === 'index' ? $('.page-num', this.OP.nodes.info) : $('[title="Quote this post"]', this.OP.nodes.info);
+      root = type === 'Closed' && this.isSticky ? $('.stickyIcon', this.OP.nodes.info) : g.VIEW === 'index' ? $('.page-num', this.OP.nodes.info) : $('[title="Reply to this post"]', this.OP.nodes.info);
       $.after(root, [$.tn(' '), icon]);
       if (!this.catalogView) {
         return;
@@ -3780,7 +3780,7 @@
       container = $.el('div', {
         id: "pc" + postID,
         className: "postContainer " + (isOP ? 'op' : 'reply') + "Container",
-        innerHTML: (isOP ? '' : "<div class=sideArrows>&gt;&gt;</div>") + ("<div id=p" + postID + " class='post " + (isOP ? 'op' : 'reply') + (capcode === 'admin_highlight' ? ' highlightPost' : '') + "'>") + (isOP ? fileHTML : '') + "<div class=postInfo>" + ("<input type=checkbox name=" + postID + " value=delete> ") + ("<span class=subject>" + (subject || '') + "</span> ") + ("<span class='nameBlock" + capcodeClass + "'>") + emailStart + ("<span class=name>" + (name || '') + "</span>") + tripcode + capcodeStart + emailEnd + capcodeIcon + userID + flag + ' </span> ' + ("<span class=dateTime data-utc=" + dateUTC + ">" + date + "</span> ") + "<span class='postNum'>" + ("<a href=" + (Build.path(boardID, threadID, postID)) + " title='Highlight this post'>No.</a>") + ("<a href='" + (g.VIEW === 'thread' && g.THREADID === threadID ? "javascript:quote(" + postID + ")" : Build.path(boardID, threadID, postID, 'q')) + "' title='Quote this post'>" + postID + "</a>") + pageIcon + sticky + closed + replyLink + '</span>' + '</div>' + (isOP ? '' : fileHTML) + ("<blockquote class=postMessage>" + (comment || '') + "</blockquote> ") + '</div>'
+        innerHTML: (isOP ? '' : "<div class=sideArrows>&gt;&gt;</div>") + ("<div id=p" + postID + " class='post " + (isOP ? 'op' : 'reply') + (capcode === 'admin_highlight' ? ' highlightPost' : '') + "'>") + (isOP ? fileHTML : '') + "<div class=postInfo>" + ("<input type=checkbox name=" + postID + " value=delete> ") + ("<span class=subject>" + (subject || '') + "</span> ") + ("<span class='nameBlock" + capcodeClass + "'>") + emailStart + ("<span class=name>" + (name || '') + "</span>") + tripcode + capcodeStart + emailEnd + capcodeIcon + userID + flag + ' </span> ' + ("<span class=dateTime data-utc=" + dateUTC + ">" + date + "</span> ") + "<span class='postNum'>" + ("<a href=" + (Build.path(boardID, threadID, postID)) + " title='Link to this post'>No.</a>") + ("<a href='" + (g.VIEW === 'thread' && g.THREADID === threadID ? "javascript:quote(" + postID + ")" : Build.path(boardID, threadID, postID, 'q')) + "' title='Reply to this post'>" + postID + "</a>") + pageIcon + sticky + closed + replyLink + '</span>' + '</div>' + (isOP ? '' : fileHTML) + ("<blockquote class=postMessage>" + (comment || '') + "</blockquote> ") + '</div>'
       });
       _ref = $$('.quotelink', container);
       for (_i = 0, _len = _ref.length; _i < _len; _i++) {
@@ -6051,7 +6051,7 @@
       })) {
         $.addClass(this.nodes.root, 'your-post');
       }
-      return $.on($('a[title="Quote this post"]', this.nodes.info), 'click', QR.quote);
+      return $.on($('a[title="Reply to this post"]', this.nodes.info), 'click', QR.quote);
     },
     persist: function() {
       if (!QR.postingIsEnabled) {
diff --git a/builds/crx/script.js b/builds/crx/script.js
index cb4c21075..6a3e9dace 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -1032,7 +1032,7 @@
         title: type,
         className: "" + typeLC + "Icon"
       });
-      root = type === 'Closed' && this.isSticky ? $('.stickyIcon', this.OP.nodes.info) : g.VIEW === 'index' ? $('.page-num', this.OP.nodes.info) : $('[title="Quote this post"]', this.OP.nodes.info);
+      root = type === 'Closed' && this.isSticky ? $('.stickyIcon', this.OP.nodes.info) : g.VIEW === 'index' ? $('.page-num', this.OP.nodes.info) : $('[title="Reply to this post"]', this.OP.nodes.info);
       $.after(root, [$.tn(' '), icon]);
       if (!this.catalogView) {
         return;
@@ -3839,7 +3839,7 @@
       container = $.el('div', {
         id: "pc" + postID,
         className: "postContainer " + (isOP ? 'op' : 'reply') + "Container",
-        innerHTML: (isOP ? '' : "<div class=sideArrows>&gt;&gt;</div>") + ("<div id=p" + postID + " class='post " + (isOP ? 'op' : 'reply') + (capcode === 'admin_highlight' ? ' highlightPost' : '') + "'>") + (isOP ? fileHTML : '') + "<div class=postInfo>" + ("<input type=checkbox name=" + postID + " value=delete> ") + ("<span class=subject>" + (subject || '') + "</span> ") + ("<span class='nameBlock" + capcodeClass + "'>") + emailStart + ("<span class=name>" + (name || '') + "</span>") + tripcode + capcodeStart + emailEnd + capcodeIcon + userID + flag + ' </span> ' + ("<span class=dateTime data-utc=" + dateUTC + ">" + date + "</span> ") + "<span class='postNum'>" + ("<a href=" + (Build.path(boardID, threadID, postID)) + " title='Highlight this post'>No.</a>") + ("<a href='" + (g.VIEW === 'thread' && g.THREADID === threadID ? "javascript:quote(" + postID + ")" : Build.path(boardID, threadID, postID, 'q')) + "' title='Quote this post'>" + postID + "</a>") + pageIcon + sticky + closed + replyLink + '</span>' + '</div>' + (isOP ? '' : fileHTML) + ("<blockquote class=postMessage>" + (comment || '') + "</blockquote> ") + '</div>'
+        innerHTML: (isOP ? '' : "<div class=sideArrows>&gt;&gt;</div>") + ("<div id=p" + postID + " class='post " + (isOP ? 'op' : 'reply') + (capcode === 'admin_highlight' ? ' highlightPost' : '') + "'>") + (isOP ? fileHTML : '') + "<div class=postInfo>" + ("<input type=checkbox name=" + postID + " value=delete> ") + ("<span class=subject>" + (subject || '') + "</span> ") + ("<span class='nameBlock" + capcodeClass + "'>") + emailStart + ("<span class=name>" + (name || '') + "</span>") + tripcode + capcodeStart + emailEnd + capcodeIcon + userID + flag + ' </span> ' + ("<span class=dateTime data-utc=" + dateUTC + ">" + date + "</span> ") + "<span class='postNum'>" + ("<a href=" + (Build.path(boardID, threadID, postID)) + " title='Link to this post'>No.</a>") + ("<a href='" + (g.VIEW === 'thread' && g.THREADID === threadID ? "javascript:quote(" + postID + ")" : Build.path(boardID, threadID, postID, 'q')) + "' title='Reply to this post'>" + postID + "</a>") + pageIcon + sticky + closed + replyLink + '</span>' + '</div>' + (isOP ? '' : fileHTML) + ("<blockquote class=postMessage>" + (comment || '') + "</blockquote> ") + '</div>'
       });
       _ref = $$('.quotelink', container);
       for (_i = 0, _len = _ref.length; _i < _len; _i++) {
@@ -6104,7 +6104,7 @@
       })) {
         $.addClass(this.nodes.root, 'your-post');
       }
-      return $.on($('a[title="Quote this post"]', this.nodes.info), 'click', QR.quote);
+      return $.on($('a[title="Reply to this post"]', this.nodes.info), 'click', QR.quote);
     },
     persist: function() {
       if (!QR.postingIsEnabled) {
diff --git a/css/style.css b/css/style.css
index feeb2444e..545a7422b 100644
--- a/css/style.css
+++ b/css/style.css
@@ -725,8 +725,7 @@ a.hide-announcement {
 
 /* QR */
 :root.hide-original-post-form #postForm,
-:root.hide-original-post-form .postingMode,
-:root.hide-original-post-form #togglePostForm,
+:root.hide-original-post-form #togglePostFormLink,
 #qr.autohide:not(.has-focus):not(:hover) > form {
   display: none;
 }
diff --git a/src/General/Build.coffee b/src/General/Build.coffee
index 04b0a7824..ee3023c23 100755
--- a/src/General/Build.coffee
+++ b/src/General/Build.coffee
@@ -214,13 +214,13 @@ Build =
           ' </span> ' +
           "<span class=dateTime data-utc=#{dateUTC}>#{date}</span> " +
           "<span class='postNum'>" +
-            "<a href=#{Build.path boardID, threadID, postID} title='Highlight this post'>No.</a>" +
+            "<a href=#{Build.path boardID, threadID, postID} title='Link to this post'>No.</a>" +
             "<a href='#{
               if g.VIEW is 'thread' and g.THREADID is threadID
                 "javascript:quote(#{postID})"
               else
                 Build.path boardID, threadID, postID, 'q'
-              }' title='Quote this post'>#{postID}</a>" +
+              }' title='Reply to this post'>#{postID}</a>" +
             pageIcon + sticky + closed + replyLink +
           '</span>' +
         '</div>' +
diff --git a/src/General/lib/thread.class b/src/General/lib/thread.class
index aa1f1c19a..da2bdb4cf 100755
--- a/src/General/lib/thread.class
+++ b/src/General/lib/thread.class
@@ -49,7 +49,7 @@ class Thread
     else if g.VIEW is 'index'
       $ '.page-num', @OP.nodes.info
     else
-      $ '[title="Quote this post"]', @OP.nodes.info
+      $ '[title="Reply to this post"]', @OP.nodes.info
     $.after root, [$.tn(' '), icon]
 
     return unless @catalogView
diff --git a/src/Posting/QR.coffee b/src/Posting/QR.coffee
index 196ed41ee..dfe7e325a 100644
--- a/src/Posting/QR.coffee
+++ b/src/Posting/QR.coffee
@@ -82,7 +82,7 @@ QR =
   node: ->
     if QR.db.get {boardID: @board.ID, threadID: @thread.ID, postID: @ID}
       $.addClass @nodes.root, 'your-post'
-    $.on $('a[title="Quote this post"]', @nodes.info), 'click', QR.quote
+    $.on $('a[title="Reply to this post"]', @nodes.info), 'click', QR.quote
 
   persist: ->
     return unless QR.postingIsEnabled