Updated icon, various UI elements
Merge branch 'master' into list