[Button setup] Some tweaks and corrected values.
Merge remote-tracking branch 'origin/master'