Favicon refactor