Made some changes to the icons and added some code validation