Merge branch 'release-v0.5' into design-updates
updated icons, various style tweaks
Fixed merge conflicts.
re-compiled css file