Added Icon + cleanup