"Add the icon and use another way to paint"
Merge branch 'develop'