loading icon improvement + bug fix