Merge "Refresh several icons" into pi-dev
am: 642e63c2e0

Change-Id: I2487a06fb681680209dd5b37b7b6f376bb2d6640