Improve the favicon support