merging
Merge branch 'master' of https://github.com/lilisun/pentimento
target icon and volume styling