added support for custom icons