fix set node icon bug
Merge branch 'master' into dev