diff --git a/4chan_x.user.js b/4chan_x.user.js
index 897cb7668..5560803f3 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -2696,24 +2696,11 @@
     unreadSFW: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAN9JREFUOMtj+P//PwMlmIEqBkDBfxie2NdVVVFaMikzPXsuCIPYIDFkNWANSAb815t+GI5B/Jj8iQfjapafBWEQG5saDBegK0ja8Ok9EH/AJofXBTBFlUf+/wPi/7jkcYYBCLef/v9/9pX//+cAMYiNLo/uAgZQYMVVLzsLcnYF0GaQ5otv/v+/9BpiEEgMJAdSA1JLlAGXgAZcfoNswGfcBpQDowoW2vi8AFIDUothwOQJvVXIgYUrEEFsqFoGYqLxA7HRiNUAWEIiyQBkGpaUsclhMwCWFpBpvHJUyY0AmdYZKFRtAsoAAAAASUVORK5CYII%3D',
     unreadNSFW: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAOBJREFUOMtj+P//PwMlmIEqBkDBfxie2DWxqqykYlJ6dtZcEAaxQWLIasAakAz4n3bGGI5B/JiJ8QfjlsefBWEQG5saDBegKyj5lPQeiD9gk8PrApiinv+V/4D4Py55nGEAwrP+t/9f/X82EM8Bs9Hl0V3AAAqsuGXxZ0HO7vlf8Q+k+eb/i0B8CWwQSAwkB1IDUkuUAbeAmm/9v4ww4DMeA8pKyifBQhufF0BqQGoxDJjcO7kKObBwBSKIDVXLQEw0fiA2GrEaAEtIJBmATMOSMjY5bAbA0gIyjVeOKrkRAMefDK/b7ecEAAAAAElFTkSuQmCC',
     update: function() {
-      var clone, favicon, href, l;
+      var clone, favicon, l;
       l = unread.replies.length;
-      if (g.dead) {
-        if (l > 0) {
-          href = Favicon.unreadDead;
-        } else {
-          href = Favicon.dead;
-        }
-      } else {
-        if (l > 0) {
-          href = Favicon.unread;
-        } else {
-          href = Favicon["default"];
-        }
-      }
       favicon = $('link[rel="shortcut icon"]', d.head);
+      favicon.href = g.dead ? l ? Favicon.unreadDead : Favicon.dead : l ? Favicon.unread : Favicon["default"];
       clone = favicon.cloneNode(true);
-      clone.href = href;
       return $.replace(favicon, clone);
     }
   };
diff --git a/script.coffee b/script.coffee
index 49088534c..10317a696 100644
--- a/script.coffee
+++ b/script.coffee
@@ -1987,6 +1987,7 @@ Favicon =
     {href} = favicon
     Favicon.default = href
     Favicon.unread = if /ws/.test href then Favicon.unreadSFW else Favicon.unreadNSFW
+
   dead: 'data:image/gif;base64,R0lGODlhEAAQAKECAAAAAP8AAP///////yH5BAEKAAIALAAAAAAQABAAAAIvlI+pq+D9DAgUoFkPDlbs7lFZKIJOJJ3MyraoB14jFpOcVMpzrnF3OKlZYsMWowAAOw=='
   empty: 'data:image/gif;base64,R0lGODlhEAAQAJEAAAAAAP///9vb2////yH5BAEAAAMALAAAAAAQABAAAAIvnI+pq+D9DBAUoFkPFnbs7lFZKIJOJJ3MyraoB14jFpOcVMpzrnF3OKlZYsMWowAAOw=='
   unreadDead: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAANhJREFUOMutU0EKwjAQzEPFgyBFei209gOKINh6tL3qO3yAB9OHWPTeMZsmJaRpiNjAkE1mMt1stgwA+wdsFgM1oHE4FXmSpWUcRzWBYtozNfKAYdCHCrQuosX9tlk+CBS7NKMMbMF7vXoJtC7Om8HwhXzbCWCSn6qBJHd74FIBVS1jm7czYFSsq7gvpY0s6+ThJwc4743EHnGkIW2YAW+AphkMPj6DJE1LXW3fFUhD2pHBsTznLKCIFCstC3nGNvQZnQa6kX4yMGfdyi7OZaB7wZy93Cx/4xfgv/s+XYFMrAAAAABJRU5ErkJggg%3D%3D'
@@ -1995,21 +1996,22 @@ Favicon =
 
   update: ->
     l = unread.replies.length
-    if g.dead
-      if l > 0
-        href = Favicon.unreadDead
+
+    favicon = $ 'link[rel="shortcut icon"]', d.head
+    favicon.href =
+      if g.dead
+        if l
+          Favicon.unreadDead
+        else
+          Favicon.dead
       else
-        href = Favicon.dead
-    else
-      if l > 0
-        href = Favicon.unread
-      else
-        href = Favicon.default
+        if l
+          Favicon.unread
+        else
+          Favicon.default
 
     #XXX `favicon.href = href` doesn't work on Firefox
-    favicon = $ 'link[rel="shortcut icon"]', d.head
     clone = favicon.cloneNode true
-    clone.href = href
     $.replace favicon, clone
 
 redirect = ->