rebuild with datepicker and timepicker icon changes