Tweak button args. #608