Updated icons and changed wording