fix loading reset bug and add better icons