Refactor FaviconHelper