New icon and minor code changes.