Added icon, clean up