Added support for default icon