Prevent icon search overlap

Resolves #2461