More UI
Merge branch 'feature/assets'
Add icons
Merge branch 'feature/assets'
More more UI
Merge branch 'master' into feature/assets