Finished UI changes using white glyphs, and blue buttons.
Merge branch 'refs/heads/dev' into test