Added icon, fixed some more duplicates