Improvments to icon