Button Changes, Fixes #6508