Improved handling icons.