Merge branch 'fix-icon'