NXP-10148: styling refinements