Merge "update promise icon status" into ub-now-mister-ugly