diff --git a/stylesheets/style.css b/stylesheets/style.css
index f5e58238..ac9281a5 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -314,7 +314,7 @@ div.post img.icon {
   padding: 0;
 }
 
-div.post i.fa {
+div.post i.fa, div.thread i.fa {
   margin: 0 4px;
   font-size: 16px;
 }
diff --git a/templates/post/mod_attributes.html b/templates/post/mod_attributes.html
new file mode 100644
index 00000000..0eb89747
--- /dev/null
+++ b/templates/post/mod_attributes.html
@@ -0,0 +1,28 @@
+{% if post.sticky %}
+	{% if config.font_awesome %}
+		<i class="fa fa-thumb-tack" title="Sticky"></i>
+	{% else %}
+		<img class="icon" title="Sticky" src="{{ config.image_sticky }}" alt="Sticky" />
+	{% endif %}
+{% endif %}
+{% if post.locked %}
+	{% if config.font_awesome %}
+		<i class="fa fa-lock" title="Locked"></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="fa fa-anchor" title="Bumplocked"></i>
+	{% else %}
+		<img class="icon" title="Bumplocked" src="{{ config.image_bumplocked }}" alt="Bumplocked" />
+	{% endif %}
+{% endif %}
+{% if post.cycle %}
+	{% if config.font_awesome %}
+		<i class="fa fa-refresh" title="Cyclical ({{ config.cycle_limit }})"></i>
+	{% else %}
+		<img class="icon" title="Cyclical ({{ config.cycle_limit }})" src="{{ config.image_sticky }}" alt="Cyclical" />
+	{% endif %}
+{% endif %}
diff --git a/templates/post_thread.html b/templates/post_thread.html
index 77462bd5..ff693e22 100644
--- a/templates/post_thread.html
+++ b/templates/post_thread.html
@@ -17,34 +17,7 @@
 	{% include 'post/poster_id.html' %}&nbsp;
 	<a class="post_no" id="post_no_{{ post.id }}" onclick="highlightReply({{ post.id }})" href="{% if isnoko50 %}{{ post.link('', config.file_page50) }}{% else %}{{ post.link }}{% endif %}">No.</a>
 	<a class="post_no" onclick="citeReply({{ post.id }})" href="{% if isnoko50 %}{{ post.link('q', config.file_page50) }}{% else %}{{ post.link('q') }}{% endif %}">{{ post.id }}</a>
-	{% if post.sticky %}
-		{% if config.font_awesome %}
-			<i class="fa fa-thumb-tack" title="Sticky"></i>
-		{% else %}
-			<img class="icon" title="Sticky" src="{{ config.image_sticky }}" alt="Sticky" />
-		{% endif %}
-	{% endif %}
-	{% if post.locked %}
-		{% if config.font_awesome %}
-			<i class="fa fa-lock" title="Locked"></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="fa fa-anchor" title="Bumplocked"></i>
-		{% else %}
-			<img class="icon" title="Bumplocked" src="{{ config.image_bumplocked }}" alt="Bumplocked" />
-		{% endif %}
-	{% endif %}
-	{% if post.cycle %}
-		{% if config.font_awesome %}
-			<i class="fa fa-refresh" title="Cyclical ({{ config.cycle_limit }})"></i>
-		{% else %}
-			<img class="icon" title="Cyclical ({{ config.cycle_limit }})" src="{{ config.image_sticky }}" alt="Cyclical" />
-		{% endif %}
-	{% endif %}
+	{% include 'post/mod_attributes.html' %}
 	{% if index %}
 		<a href="{{ post.root }}{{ board.dir }}{{ config.dir.res }}{{ config.file_page|sprintf(post.id) }}">[{% trans %}Reply{% endtrans %}]</a>
 	{% endif %}
diff --git a/templates/themes/catalog/catalog.html b/templates/themes/catalog/catalog.html
index 7060c4cd..903bd619 100644
--- a/templates/themes/catalog/catalog.html
+++ b/templates/themes/catalog/catalog.html
@@ -44,6 +44,7 @@
 				 data-id="{{ post.id }}"
 				 data-sticky="{% if post.sticky %}true{% else %}false{% endif %}"
 				 data-locked="{% if post.locked %}true{% else %}false{% endif %}"
+				 data-cycle="{% if post.cycle %}true{% else %}false{% endif %}"
 			>
                                 <div class="thread grid-li grid-size-small">  
                                         <a href="{{post.link}}">  
@@ -55,7 +56,7 @@
                                                  id="img-{{ post.id }}" data-subject="{% if post.subject %}{{ post.subject|e }}{% endif %}" data-name="{{ post.name|e }}" data-muhdifference="{{ post.muhdifference }}" class="{{post.board}} thread-image" title="{{post.bump|date('%b %d %H:%M')}}">
                                         </a>
                                                 <div class="replies">
-                                                        <strong>R: {{ post.reply_count }} / I: {{ post.image_count }}{% if post.sticky %} (sticky){% endif %}</strong>
+                                                        <strong>R: {{ post.reply_count }} / I: {{ post.image_count }} / P: {{ (loop.index // config.threads_per_page) + 1 }} {% include 'post/mod_attributes.html' %} </strong>
                                                         {% if post.subject %}
 								<p class="intro">
 									<span class="subject">