diff --git a/TODO b/TODO
index 0fbcbcea..4e4909d0 100644
--- a/TODO
+++ b/TODO
@@ -4,7 +4,6 @@ first major release.
 everything related to posts:
     - post listing
         - better thumbnail loading
-        - comment count
         - search filters
             - file_size:3K..5M
             - image_size:huge/large/medium/small
diff --git a/public_html/templates/post-list-item.tpl b/public_html/templates/post-list-item.tpl
index 0d94a4d8..b5c44144 100644
--- a/public_html/templates/post-list-item.tpl
+++ b/public_html/templates/post-list-item.tpl
@@ -5,22 +5,29 @@
 
 		<img class="thumb" src="/data/thumbnails/160x160/posts/<%= post.name %>" alt="<%= post.idMarkdown %>"/>
 
-		<% if (post.favoriteCount || post.score) { %>
+		<% if (post.favoriteCount || post.score || post.commentCount) { %>
 			<div class="info">
 				<ul>
 					<% if (post.favoriteCount) { %>
 						<li>
-							<i class="fa fa-heart-o"></i>
+							<i class="fa fa-heart"></i>
 							<%= post.favoriteCount %>
 						</li>
 					<% } %>
 
 					<% if (post.score) { %>
 						<li>
-							<i class="fa fa-thumbs-o-up"></i>
+							<i class="fa fa-thumbs-up"></i>
 							<%= post.score %>
 						</li>
 					<% } %>
+
+					<% if (post.commentCount) { %>
+						<li>
+							<i class="fa fa-comments"></i>
+							<%= post.commentCount %>
+						</li>
+					<% } %>
 				</ul>
 			</div>
 		<% } %>
diff --git a/src/Controllers/ViewProxies/PostViewProxy.php b/src/Controllers/ViewProxies/PostViewProxy.php
index c93c5c3a..c4a3f738 100644
--- a/src/Controllers/ViewProxies/PostViewProxy.php
+++ b/src/Controllers/ViewProxies/PostViewProxy.php
@@ -63,6 +63,7 @@ class PostViewProxy extends AbstractViewProxy
 		$result->originalFileSize = $post->getOriginalFileSize();
 		$result->favoriteCount = $post->getFavoriteCount();
 		$result->score = $post->getScore();
+		$result->commentCount = $post->getCommentCount();
 
 		if (!empty($config[self::FETCH_TAGS]))
 			$result->tags = $this->tagViewProxy->fromArray($post->getTags());