add icon
Merge branch 'dev' into build
build