diff --git a/src/General/Build.coffee b/src/General/Build.coffee
index 6f63830a0..180cc6671 100755
--- a/src/General/Build.coffee
+++ b/src/General/Build.coffee
@@ -353,10 +353,10 @@ Build =
     $.extend root, <%= html(
       '<a href="/${thread.board}/thread/${thread.ID}" target="_blank">' +
         '&{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>' +
+        '<span class="thread-icons"></span>' +
       '</div>' +
       '&{subject}' +
       '<div class="comment">&{thread.OP.nodes.comment}</div>'
diff --git a/src/General/css/style.css b/src/General/css/style.css
index 01859418f..d941cff79 100755
--- a/src/General/css/style.css
+++ b/src/General/css/style.css
@@ -535,15 +535,21 @@ hr ~ div.center:not(.ad-cnt) {
   height: 13px;
   padding: 20px 36px;
 }
-.thread-icons {
+.thread-icons > img {
+  width: 1em;
+  height: 1em;
+  margin: 0;
+  vertical-align: text-top;
+}
+.catalog-thread > a:not(:hover) > .menu-button > i {
+  display: none;
+}
+.catalog-thread > a > .menu-button {
   position: absolute;
   top: 1px;
   right: 1px;
 }
-.catalog-thread > a:not(:hover) .menu-button {
-  display: none;
-}
-.thread-icons > .menu-button > i {
+.catalog-thread > a > .menu-button > i {
   font-size: 14px;
 }
 .thread-stats {
diff --git a/src/Menu/Menu.coffee b/src/Menu/Menu.coffee
index b9ec9350a..f33848f9b 100755
--- a/src/Menu/Menu.coffee
+++ b/src/Menu/Menu.coffee
@@ -22,7 +22,7 @@ Menu =
     $.add @nodes.info, Menu.makeButton()
 
   catalogNode: ->
-    $.add @nodes.icons, Menu.makeButton()
+    $.add @nodes.thumb.parentNode, Menu.makeButton()
 
   makeButton: ->
     clone = Menu.button.cloneNode true
@@ -33,6 +33,6 @@ Menu =
     try
       post = Get.postFromNode @
     catch
-      fullID = @parentNode.parentNode.parentNode.dataset.fullID
+      fullID = @parentNode.parentNode.dataset.fullID
       post = g.threads[fullID].OP
     Menu.menu.toggle e, @, post