Update from upstream

* Use svg icons when possible.

Change-Id: I87f89678f48d50ab9a214726f957a50cfeef670c