top and bottom buttons, fixes #6559
Merge branch 'dev' into test