Fix header buttons with new header style [beta]

Bug: 59734
Change-Id: I0984a7a5f111803e9b4d40593d587bd1b18cb84a
(cherry picked from commit 1de57a6972bc4e60efb5fe8ba9ecd32562d894a1)