Added support for custom iconsets and api units