Merge "tweak header css for more distinction" into honeycomb