Reworked logic to display repeat/shuffle/crossfade icons to be simpler (just one line) and eliminate cf icon flicker upon screen redraw