The default button control now adjusts it's position so it lines up.
Merge remote-tracking branch 'github/master'