Adding basic support for custom icons