Add support for Icons