improved support for icon packaging