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