Fixed Icon bug