Icons, style and fixed some tasks
Merge branch 'develop'