added neelesh's stuff and fixed it so there's only one icon