change icons and add logic