iOS "Shuffle" and "Repeat" Button UX

I have a rather simple issue that involves making the iOS "Shuffle" and "Repeat" state more obvious at-glance.

A standard design for a touch screen toggle switch is for the button to be grey when disabled and colored when enabled. This is plain to see in the Apple Music app and in the iOS Control Center, as the buttons have a large background that is clearly on or off.

See below an image of the iOS playback settings popover, with "Shuffle" and "Repeat" enabled.

When I first used VLC on iOS and opened this menu, I thought the "Shuffle" button was meant to indicate the desired state upon pressing the button. Every time I open this menu, I am briefly confused.

I thought about why, and I'm pretty sure it's the style of the icon, which is similar to the other navigation buttons. Many of the buttons are a desired destination, not the current state for a toggle. I would recommend changing the icons for the toggles to have a "hollow" background when disabled, and/or changing the label of the button to "Shuffle: On" and "Repeat: All", which makes it much clearer that the button is displaying the current state.

The toggle designs pictured below are more obvious to me:

Thank you for considering my feedback!