Bad visibility of shuffle/repeat button states

[ondra5]

It's pretty hard to see whether shuffle/repeat is enabled, since the difference in color is pretty much non-existent, would it be possible to for example change the color of the button from monochrome to green when the option is active?
I'm using the default theme with the default icons (it doesn't get much better if I use adwaita icons).

In the first image, shuffle all is enabled

In the second image, shuffle all is disabled

[rlkeeney]

@ondra5 I can barely see the icon and not well enough to guess what it is.

[Kylemaul]

I will add that the scrollbar thumbs are next to invisible as well. I like that they hide when not in use, but its tedious to have to search for them when you need them. Clarification--keep hiding them when not in use, but, change their graphic to use system or higher contrast coloring when shown.