Collapsable search + last icon corrections