Revert "Use non-beta icons, add icon assets under scratch"

This reverts commit 811a23c17fa9a0cb52171c17561cb725a382b53f.

Wait until final release for 'new' icons

Change-Id: Iccf32bb8d616f39da6f5d01ff18d360ead73ebdc