Merge change 4440 into donut

* changes:
  Properly create Image for the icons so that they are transparent.