diff --git a/src/General/Build.coffee b/src/General/Build.coffee
index c646250d6..8720bd583 100755
--- a/src/General/Build.coffee
+++ b/src/General/Build.coffee
@@ -312,25 +312,33 @@ Build =
   fullThread: (board, data) -> Build.postFromObject data, board.ID
 
   threadCatalog: (thread) ->
+    {staticPath, gifIcon} = Build
     for data in Index.liveThreadData
       break if data.no is thread.ID
 
     if data.spoiler and !Conf['Reveal Spoiler Thumbnails']
-      src = "#{Build.staticPath}spoiler"
+      src = "#{staticPath}spoiler"
       if spoilerRange = Build.spoilerRange[thread.board]
         # Randomize the spoiler image.
         src += "-#{thread.board}" + Math.floor 1 + spoilerRange * Math.random()
       src += '.png'
-      imgWidth = imgHeight = 100
+      imgClass = 'spoiler-file'
     else if data.filedeleted
-      src = "#{Build.staticPath}filedeleted-res#{Build.gifIcon}"
-      imgWidth  = 127
-      imgHeight = 13
-    else
+      src = "#{staticPath}filedeleted-res#{gifIcon}"
+      imgClass = 'deleted-file'
+    else if thread.OP.file
       src = thread.OP.file.thumbURL
       max = Math.max data.tn_w, data.tn_h
       imgWidth  = data.tn_w * 150 / max
       imgHeight = data.tn_h * 150 / max
+    else
+      src = "#{staticPath}nofile.png"
+      imgClass = 'no-file'
+
+    thumb = if imgClass
+      <%= html('<img src="${src}" class="thumb ${imgClass}">') %>
+    else
+      <%= html('<img src="${src}" class="thumb" width="${imgWidth}" height="${imgHeight}">') %>
 
     postCount = data.replies + 1
     fileCount = data.images  + !!data.ext
@@ -345,7 +353,8 @@ Build =
       className: 'catalog-thread'
     $.extend root, <%= html(
       '<a href="/${thread.board}/thread/${thread.ID}" target="_blank">' +
-        '<img src="${src}" class="thumb" width="${imgWidth}" height="${imgHeight}">' +
+        '&{thumb}' +
+        '<div class="thread-icons"></div>' +
       '</a>' +
       '<div class="thread-stats" title="Post count / File count / Page count">' +
         '<span class="post-count">${postCount}</span> / <span class="file-count">${fileCount}</span> / <span class="page-count">${pageCount}</span>' +
@@ -354,6 +363,17 @@ Build =
       '<div class="comment">&{thread.OP.nodes.comment}</div>'
     ) %>
 
+    if thread.isSticky
+      $.add $('.thread-icons', root), $.el 'img',
+        src: "#{staticPath}sticky#{gifIcon}"
+        className: 'stickyIcon'
+        title: 'Sticky'
+    if thread.isClosed
+      $.add $('.thread-icons', root), $.el 'img',
+        src: "#{staticPath}closed#{gifIcon}"
+        className: 'closedIcon'
+        title: 'Closed'
+
     if data.bumplimit
       $.addClass $('.post-count', root), 'warning'
     if data.imagelimit
diff --git a/src/General/css/style.css b/src/General/css/style.css
index 120967692..4bd92933f 100755
--- a/src/General/css/style.css
+++ b/src/General/css/style.css
@@ -509,11 +509,34 @@ hr ~ div.center:not(.ad-cnt) {
   overflow: hidden;
   word-break: break-word;
 }
+.catalog-thread > a {
+  display: inline-block;
+  position: relative;
+}
 .thumb {
   max-width: 150px;
   max-height: 150px;
   box-shadow: 0 0 5px rgba(0, 0, 0, .25);
 }
+.thunb.spoiler-file {
+  width: 100px;
+  height: 100px;
+}
+.thumb.deleted-file {
+  width: 127px;
+  height: 13px;
+  padding: 20px 11px;
+}
+.thumb.no-file {
+  width: 77px;
+  height: 13px;
+  padding: 20px 36px;
+}
+.thread-icons {
+  position: absolute;
+  top: 1px;
+  right: 1px;
+}
 .thread-stats {
   cursor: help;
   font-size: 10px;