icon and bug fixes