changed icons, added toggling