diff --git a/post_reply.html b/post_reply.html
index 9b10a8f4..82758279 100644
--- a/post_reply.html
+++ b/post_reply.html
@@ -38,16 +38,8 @@
 	{% if config.poster_ids %}
 		 ID: {{ post.ip|poster_id(post.thread) }}
 	{% endif %}
-	 <a class="post_no" {% if not index %}onclick="highlightReply({{ post.id }})" {% endif %}href="{{ post.link }}">No.</a>
-	<a class="post_no"
-		{% if not index %}
-			 onclick="citeReply({{ post.id }});"
-		{% endif %}
-		 href="{% if index %}
-			{{ post.link('q') }}
-		{% else %}
-			javascript:void(0);
-		{% endif %}">
+	 <a class="post_no" onclick="return document.querySelectorAll('div.banner').length ? highlightReply({{ post.id }}) : true;" href="{{ post.link }}">No.</a>
+	<a class="post_no" onclick="return document.querySelectorAll('div.banner').length ? citeReply({{ post.id }}) : true;" href="{{ post.link('q') }}">
 		{{ post.id }}
 	</a>
 	</p>
diff --git a/post_thread.html b/post_thread.html
index abb232fa..c12fcbd4 100644
--- a/post_thread.html
+++ b/post_thread.html
@@ -108,35 +108,27 @@
 	{% if config.poster_ids %}
 		 ID: {{ post.ip|poster_id(post.id) }}
 	{% endif %}
-	 <a class="post_no" href="{{ post.link }}">No.</a>
-	<a class="post_no"
-		{% if not index %}
-			 onclick="citeReply({{ post.id }});"
-		{% endif %}
-		 href="{% if index %}
-			{{ post.link('q') }}
-		{% else %}
-			javascript:void(0);
-		{% endif %}">
-		{{ post.id }}
-	</a>
+         <a class="post_no" onclick="return document.querySelectorAll('div.banner').length ? highlightReply({{ post.id }}) : true;" href="{{ post.link }}">No.</a>
+        <a class="post_no" onclick="return document.querySelectorAll('div.banner').length ? citeReply({{ post.id }}) : true;" href="{{ post.link('q') }}">
+                {{ post.id }}
+        </a>
 	{% if post.sticky %}
 		{% if config.font_awesome %}
-			<i class="icon-pushpin icon"></i>
+			<i class="fa fa-thumb-tack"></i>
 		{% else %}
 			<img class="icon" title="Sticky" src="{{ config.image_sticky }}" alt="Sticky" />
 		{% endif %}
 	{% endif %}
 	{% if post.locked %}
 		{% if config.font_awesome %}
-			<i class="icon-lock icon"></i>
+			<i class="fa fa-lock"></i>
 		{% else %}
 			<img class="icon" title="Locked" src="{{ config.image_locked }}" alt="Locked" />
 		{% endif %}
 	{% endif %}
 	{% if post.bumplocked and (config.mod.view_bumplock < 0 or (post.mod and post.mod|hasPermission(config.mod.view_bumplock, board.uri))) %}
 		{% if config.font_awesome %}
-			<i class="icon-anchor icon"></i>
+			<i class="fa fa-anchor"></i>
 		{% else %}
 			<img class="icon" title="Bumplocked" src="{{ config.image_bumplocked }}" alt="Bumplocked" />
 		{% endif %}