NXP-15390: Make button styles more robust