fine control for menu & search button

Change-Id: I6b6b835925523341a567110ded4e6a54061f3bfe

Conflicts:

	res/values/strings.xml