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

Change-Id: Ib9b7b0bd3a58f601224bb1a47c3e05b7fcf51892