Fixes #7403 - Some buttons not showing properly on host page