Bug 945521 - Make sure button text type is consistent with keyboard text type; r=mcomella