Merge change I793b4f62 into eclair

* changes:
  Clean up search and voice search button assets for high res.