Merge change I9cdaba5e into eclair

* changes:
  New assets for settings