Backed out revision 540b36aa0dc7 (Issue 384 - Wrong image shows up briefly for Adblock Plus icon) - doesn't seem to fix the issue