Updated icons and removed redundancies