Improved support for icons