Bug 1045004 - [Search] Update X to correct design (follow up to bug 944796)
Merge pull request #22278 from pivanov/bug-1045004

Bug 1045004 - [Search] Update X to correct design (follow up to bug 944796)