Revert "Expanded favicon support"

This reverts commit 203d29e2629adc143b5f57e002e4e769d852f7ec.
Revert "Revert "Expanded favicon support""

This reverts commit 759a42c4d6de6dc128e33ddd74bf187fe0feb8f6.