Several bug fixed. CSS for new icons with custom avatar.
fix old merge
Merge branch 'master' of https://github.com/ging/vish into vish-b3