Added control icons around the player
Merge branch 'master' into Robbin