Merge changes I61331a6e,I5728222b

* changes:
  new battery assets
  Use new nav button assets.