Merge "Update nav bar buttons to spec." into tm-qpr-dev