NXP-14413: improve CSS