Fix extra button sometimes looking empty
Merge branch 'master' into beta