Fix for search field reset icon (without conflict)
Compiled @caouecs pull request