[REV] Update for ICP and some old UI bug