NXP-12934: Fix grid to allow more space to button