Merge branch 'icon-size'