Icon updates and bug