Icon changes and bug fix