Tweaking icons a little
Merge branch 'master' into RB-1.0