added icons folder, improved icon+filename