Improve icons and their fallbacks