Merge "Icon updates (1 of many)" into pi-dev