diff --git a/src/General/Build.coffee b/src/General/Build.coffee
index ce82962a5..a92fbe0a7 100644
--- a/src/General/Build.coffee
+++ b/src/General/Build.coffee
@@ -214,22 +214,4 @@ Build =
     $.addClass root, thread.OP.highlights... if thread.OP.highlights
     $.addClass root, 'noFile' unless thread.OP.file
 
-    if thread.isSticky
-      $.add $('.catalog-icons', root), $.el 'img',
-        src: "#{staticPath}sticky#{gifIcon}"
-        className: 'stickyIcon'
-        title: 'Sticky'
-
-    if thread.isClosed
-      $.add $('.catalog-icons', root), $.el 'img',
-        src: "#{staticPath}closed#{gifIcon}"
-        className: 'closedIcon'
-        title: 'Closed'
-
-    if data.bumplimit
-      $.addClass $('.post-count', root), 'warning'
-
-    if data.imagelimit
-      $.addClass $('.file-count', root), 'warning'
-
     root
diff --git a/src/General/Build/CatalogThread.html b/src/General/Build/CatalogThread.html
index 852c2992a..70aacb3ba 100644
--- a/src/General/Build/CatalogThread.html
+++ b/src/General/Build/CatalogThread.html
@@ -3,7 +3,12 @@
 </a>
 <div class="catalog-stats">
   <span title="Posts / Files / Page">
-    <span class="post-count">${postCount}</span> / <span class="file-count">${fileCount}</span> / <span class="page-count">${pageCount}</span>
+    <span class="post-count?{data.bumplimit}{ warning}">${postCount}</span> / 
+    <span class="file-count?{data.imagelimit}{ warning}">${fileCount}</span> / 
+    <span class="page-count">${pageCount}</span>
+  </span>
+  <span class="catalog-icons">
+    ?{thread.isSticky}{<img src="${staticPath}sticky${gifIcon}" class="stickyIcon" title="Sticky">}
+    ?{thread.isClosed}{<img src="${staticPath}closed${gifIcon}" class="closedIcon" title="Closed">}
   </span>
-  <span class="catalog-icons"></span>
 </div>