Favicon merge

Merging @jasisk favicon changes into master. Please review closely that this merge is correct.