Broken header buttons API on stable

[david (David Taylor)]

Thanks @RGJ. This PR will backport the fix we made on latest to stable:

FIX: Header button/icon ordering