Merge "GM2 icon updates" into pi-dev