Added full support for custom icons.