diff --git a/4chan_x.user.js b/4chan_x.user.js
index 2337972b5..03dd6ee8b 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -2906,7 +2906,7 @@
       return $.prepend(form, controls);
     },
     resize: function() {
-      return imgExpand.style.innerHTML = ".fitheight img + img {max-height:" + d.body.clientHeight + "px;}";
+      return imgExpand.style.innerHTML = ".fitheight [md5] + img {max-height:" + d.body.clientHeight + "px;}";
     }
   };
 
@@ -3098,10 +3098,10 @@
         float: left;\
         pointer-events: none;\
       }\
-      img[md5], img + img {\
+      [md5], [md5] + img {\
         pointer-events: all;\
       }\
-      .fitwidth img + img {\
+      .fitwidth [md5] + img {\
         max-width: 100%;\
         width: -moz-calc(100%); /* hack so only firefox sees this */\
       }\
diff --git a/changelog b/changelog
index eec6756ba..ee99cdb18 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,6 @@
 master
+- mayhem
+  fix locked thread icons with fit width/screen enabled on Firefox
 
 2.21.2
 - mayhem
diff --git a/script.coffee b/script.coffee
index 53129bc54..e8fc1c143 100644
--- a/script.coffee
+++ b/script.coffee
@@ -2229,7 +2229,7 @@ imgExpand =
     $.prepend form, controls
 
   resize: ->
-    imgExpand.style.innerHTML = ".fitheight img + img {max-height:#{d.body.clientHeight}px;}"
+    imgExpand.style.innerHTML = ".fitheight [md5] + img {max-height:#{d.body.clientHeight}px;}"
 
 Main =
   init: ->
@@ -2463,10 +2463,10 @@ Main =
         float: left;
         pointer-events: none;
       }
-      img[md5], img + img {
+      [md5], [md5] + img {
         pointer-events: all;
       }
-      .fitwidth img + img {
+      .fitwidth [md5] + img {
         max-width: 100%;
         width: -moz-calc(100%); /* hack so only firefox sees this */
       }