Prevent icon search overlap
Merge pull request #2463 from darkwing/search-set-value

Prevent icon search overlap