Icon and other changes
Icon and other changes