Make the favicon a template block

This is a follow-up on #6881, since the favicon change there disappeared in the rebase.  @jdfreder or @minrk, can you review this?