Use color-coded icons for control buttons
Improve color-coding for control button icons