Added Icon and Name fix