Revert "Expanded favicon support"

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

This reverts commit 3fb3d7120a952a2d8c043933d35d30ec9258c37e.