am a5fa4b49: Merge "Updating layout of search buttons" into honeycomb

* commit 'a5fa4b492f87540bce227a311733789930ebcf5f':
  Updating layout of search buttons