NXP-15486: Fix borders of buttons groups