Add volume icons
Merge branch 'master' into chewbacca
Add volume indicator