Fix 'None' icon dir issue
Merge branch 'develop'