Add favicons support
Merge branch 'add-favicons'