Modified icon
Modified icon
Fixed merge conflict
Merge branch 'dev'