Merge "Refresh several icons" into pi-dev