More work on updating icons