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

Change-Id: I05b3e5a4ea7a179b559a88e49ba00599e9b53aec