Added support for custom icons.