Revert "Bug 896500 - Merge old userbar into header bar in prep for new UI"

This reverts commit 843470a665a8c618546f93c35199aabb02be89af.
Bug 896500 - Merge old userbar into header bar in prep for new UI
Fix Bug 896471 - Incorporate new header ui icon sets