Deleted old screen.
The Datepicker was calling the navigate to which reset the data.
Updated one set of icons.