Attempt #5355 of making search button looking good
Merge master to staging for version team city build 1.0.76