Merge change I8061e6ac into eclair

* changes:
  Fix 2209086: Updated assets and fixed widget dimension calculation.