Revert "Revert "Revert "R4: Further de-crappification of player"""

This reverts commit 7b1dec5908c760c3bf308ee361505538890ed57d.
Revert "R4: Make tune in icon less dumb"

This reverts commit 088ba52efe7bd1b240a17acba0144a869ede444c.