base

Merge change 21045 into donut

* changes:
  Last minute change: Replace default app icon with a prettier one - droid on a software box sort of thing. :)