Fix some icon refresh issues