diff --git a/src/css/burichan.css b/src/css/burichan.css
index 25c74aa1e..2d1eec4f5 100644
--- a/src/css/burichan.css
+++ b/src/css/burichan.css
@@ -31,10 +31,10 @@
 }
 
 /* Catalog */
-:root.burichan .catalog-thread:hover .post {
+:root.burichan .catalog-thread > .postContainer:hover > .post {
   background-color: #D6DAF0;
 }
-:root.burichan.werkTyme .catalog-thread:not(:hover), :root.burichan .catalog-thread:hover .post {
+:root.burichan.werkTyme .catalog-thread:not(:hover), :root.burichan .catalog-thread > .postContainer:hover > .post {
   border-color: #B7C5D9;
 }
 
diff --git a/src/css/futaba.css b/src/css/futaba.css
index afc6efcdc..30a8b78ce 100644
--- a/src/css/futaba.css
+++ b/src/css/futaba.css
@@ -31,10 +31,10 @@
 }
 
 /* Catalog */
-:root.futaba .catalog-thread:hover .post {
+:root.futaba .catalog-thread > .postContainer:hover > .post {
   background-color: #F0E0D6;
 }
-:root.futaba.werkTyme .catalog-thread:not(:hover), :root.futaba .catalog-thread:hover .post {
+:root.futaba.werkTyme .catalog-thread:not(:hover), :root.futaba .catalog-thread > .postContainer:hover > .post {
   border-color: #D9BFB7;
 }
 
diff --git a/src/css/photon.css b/src/css/photon.css
index 518dd65d8..19ce2c89f 100644
--- a/src/css/photon.css
+++ b/src/css/photon.css
@@ -31,10 +31,10 @@
 }
 
 /* Catalog */
-:root.photon .catalog-thread:hover .post {
+:root.photon .catalog-thread > .postContainer:hover > .post {
   background-color: #DDD;
 }
-:root.photon.werkTyme .catalog-thread:not(:hover), :root.photon .catalog-thread:hover .post {
+:root.photon.werkTyme .catalog-thread:not(:hover), :root.photon .catalog-thread > .postContainer:hover > .post {
   border-color: #CCC;
 }
 :root.photon .catalog-code {
diff --git a/src/css/style.css b/src/css/style.css
index 323fdfde8..6c9dcceba 100644
--- a/src/css/style.css
+++ b/src/css/style.css
@@ -722,27 +722,44 @@ div[data-checked="false"] > .suboption-list {
 div.catalog-thread {
   margin: 4px;
 }
-.catalog-thread > .postContainer {
-  overflow: hidden;
-}
-.catalog-small .catalog-thread,
-.catalog-small .catalog-thread > .postContainer {
+.catalog-small .catalog-thread {
   width: 165px;
   height: 320px;
 }
-.catalog-large .catalog-thread,
-.catalog-large .catalog-thread > .postContainer {
+.catalog-large .catalog-thread {
   width: 270px;
   height: 410px;
 }
-.catalog-thread .post {
-  margin: -1px;
-  border: 1px solid transparent;
+.catalog-thread > .postContainer {
+  position: absolute;
+  top: -4px;
+  left: 0;
+  right: 0;
+  bottom: 0;
 }
-.catalog-thread:not(.noFile) .post {
-  margin-top: -21px;
+.catalog-thread > .postContainer:not(:hover) {
+  overflow: hidden;
+}
+.catalog-thread > .postContainer:hover {
+  z-index: 1;
+}
+.catalog-thread .post {
+  position: absolute;
+  top: 4px;
+  left: 0;
+  right: 0;
+  margin: -21px -1px -1px;
+  border: 1px solid transparent;
   padding-top: 20px;
 }
+.catalog-thread.noFile .post {
+  margin-top: -5px;
+  padding-top: 4px;
+}
+.catalog-thread > .postContainer:hover .post {
+  margin-left: -61px;
+  margin-right: -61px;
+}
 .catalog-link {
   display: block;
   position: relative;
@@ -790,8 +807,8 @@ div.catalog-thread {
 .catalog-thread blockquote {
   margin: 0;
 }
-#delform .catalog-thread:not(:hover) .file,
-#delform .catalog-thread:not(:hover) .postInfo,
+#delform .catalog-thread > .postContainer:not(:hover) .file,
+#delform .catalog-thread > .postContainer:not(:hover) .postInfo,
 #delform .catalog-thread > .postContainer > :not(.post),
 #delform .catalog-thread .file > :not(.fileText),
 #delform .catalog-thread .file > .fileText > :not(:first-child),
@@ -803,9 +820,9 @@ div.catalog-thread {
 }
 .catalog-thread .file {
   position: absolute;
-  left: -60px;
-  right: -60px;
-  top: -20px;
+  left: 0;
+  right: 0;
+  top: 0;
 }
 .catalog-thread .fileText {
   padding: 2px;
@@ -830,16 +847,6 @@ div.catalog-thread {
   display: inline-block;
   font-style: italic;
 }
-.catalog-thread:hover {
-  z-index: 1;
-}
-.catalog-thread:hover > .postContainer {
-  overflow: visible;
-}
-.catalog-thread:hover .post {
-  margin-left: -61px;
-  margin-right: -61px;
-}
 .catalog-thread .prettyprinted {
   max-width: 100%;
   box-sizing: border-box;
diff --git a/src/css/tomorrow.css b/src/css/tomorrow.css
index 8f23c7562..1bd661125 100644
--- a/src/css/tomorrow.css
+++ b/src/css/tomorrow.css
@@ -30,10 +30,10 @@
 }
 
 /* Catalog */
-:root.tomorrow .catalog-thread:hover .post {
+:root.tomorrow .catalog-thread > .postContainer:hover > .post {
   background-color: #282A2E;
 }
-:root.tomorrow.werkTyme .catalog-thread:not(:hover), :root.tomorrow .catalog-thread:hover .post {
+:root.tomorrow.werkTyme .catalog-thread:not(:hover), :root.tomorrow .catalog-thread > .postContainer:hover > .post {
   border-color: #111;
 }
 :root.tomorrow .catalog-code {
diff --git a/src/css/yotsuba-b.css b/src/css/yotsuba-b.css
index 69ee75534..689a271ac 100644
--- a/src/css/yotsuba-b.css
+++ b/src/css/yotsuba-b.css
@@ -31,10 +31,10 @@
 }
 
 /* Catalog */
-:root.yotsuba-b .catalog-thread:hover .post {
+:root.yotsuba-b .catalog-thread > .postContainer:hover > .post {
   background-color: #D6DAF0;
 }
-:root.yotsuba-b.werkTyme .catalog-thread:not(:hover), :root.yotsuba-b .catalog-thread:hover .post {
+:root.yotsuba-b.werkTyme .catalog-thread:not(:hover), :root.yotsuba-b .catalog-thread > .postContainer:hover > .post {
   border-color: #B7C5D9;
 }
 
diff --git a/src/css/yotsuba.css b/src/css/yotsuba.css
index e0f984c4d..8a5b3fe5d 100644
--- a/src/css/yotsuba.css
+++ b/src/css/yotsuba.css
@@ -31,10 +31,10 @@
 }
 
 /* Catalog */
-:root.yotsuba .catalog-thread:hover .post {
+:root.yotsuba .catalog-thread > .postContainer:hover > .post {
   background-color: #F0E0D6;
 }
-:root.yotsuba.werkTyme .catalog-thread:not(:hover), :root.yotsuba .catalog-thread:hover .post {
+:root.yotsuba.werkTyme .catalog-thread:not(:hover), :root.yotsuba .catalog-thread > .postContainer:hover > .post {
   border-color: #D9BFB7;
 }