AOO-401 Q A //fix search button size
Merge remote-tracking branch 'origin/master'