Added support for icons