Improved favicon support

Generated by commit dd5325c89c7685b74634390133b61caf7d92627c