NXP-14949: Remove old trigger style, homogenize margin between input fields