Added Icon and cleaned