Fix combat and entity icon updates