Merge change 6022

* changes:
  Update rollo with icon images.