refactor
change icon and update visible condition