Hi,
I'll often switch from shuffle to 'play in order', and back again. However the only shuffle I use is 'Shuffle Songs' - because that'll keep it to the folder, or queue, or playlist I've selected.
Would it be possible to have a settings option to hide the shuffle options I'll never use - so if only 'Shuffle off' & one other are selected - when playing hitting the button will toggle between, and if more selected, the list that pops up will be quicker to navigate as it'll show fewer options.