icon as package + cleanup