Add Icon and Fix Something
Merge branch 'FixSomething'