NXP-15023: Move delete icon to the right, update arrow background and fix detail in choices