Fix header buttons with new header style [beta]

Bug: 59734
Change-Id: I0984a7a5f111803e9b4d40593d587bd1b18cb84a