Moved icon
Merge branch 'dev'