changed icon colors and logic