Changed the icons and some wording fixes