diff --git a/src/General/css/style.css b/src/General/css/style.css
index 6f5499a57..df2e3b152 100755
--- a/src/General/css/style.css
+++ b/src/General/css/style.css
@@ -540,6 +540,12 @@ hr ~ div.center:not(.ad-cnt) {
   top: 1px;
   right: 1px;
 }
+.catalog-thread > a:not(:hover) .menu-button {
+  display: none;
+}
+.thread-icons > .menu-button > i {
+  font-size: 14px;
+}
 .thread-stats {
   flex-shrink: 0;
   cursor: help;
diff --git a/src/Menu/Menu.coffee b/src/Menu/Menu.coffee
index 20a2992b6..10ee67eaa 100755
--- a/src/Menu/Menu.coffee
+++ b/src/Menu/Menu.coffee
@@ -2,10 +2,18 @@ Menu =
   init: ->
     return if g.VIEW is 'catalog' or !Conf['Menu']
 
+    @button = $.el 'a',
+      className: 'menu-button'
+      href:      'javascript:;'
+    $.extend @button, <%= html('<i class="fa fa-angle-down"></i>') %>
+
     @menu = new UI.Menu 'post'
     Post.callbacks.push
       name: 'Menu'
       cb:   @node
+    CatalogThread.callbacks.push
+      name: 'Image Hover'
+      cb:   @catalogNode
 
   node: ->
     if @isClone
@@ -13,16 +21,18 @@ Menu =
       return
     $.add @nodes.info, Menu.makeButton()
 
-  makeButton: do ->
-    a = $.el 'a',
-      className: 'menu-button'
-      href:      'javascript:;'
-    $.extend a, <%= html('<i class="fa fa-angle-down"></i>') %>
-    ->
-      button = a.cloneNode true
-      $.on button, 'click', Menu.toggle
-      button
+  catalogNode: ->
+    $.add @nodes.icons, Menu.makeButton()
+
+  makeButton: ->
+    clone = Menu.button.cloneNode true
+    $.on clone, 'click', Menu.toggle
+    clone
 
   toggle: (e) ->
-    post = Get.postFromNode @
+    try
+      post = Get.postFromNode @
+    catch
+      fullID = @parentNode.parentNode.parentNode.dataset.fullID
+      post = g.threads[fullID].OP
     Menu.menu.toggle e, @, post