Adding greater support for Favicons.