Merge "Refresh several icons" into pi-dev am: 642e63c2e0
am: ef75735861

Change-Id: I73ccb073d5c239b454d142ecc800007bce23d626